fixing imports and string dependencies

Author: weinbe58

src/bloqade/analog/__init__.py

@@ -3,24 +3,24 @@
 except ImportError:
     __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 
-from bloqade_analog.ir import var, cast, Variable, Literal, start
-from bloqade_analog.ir import to_waveform as waveform
-from bloqade_analog.serialize import load, save, loads, dumps
+from bloqade.analog.ir import var, cast, Variable, Literal, start
+from bloqade.analog.ir import to_waveform as waveform
+from bloqade.analog.serialize import load, save, loads, dumps
 
-from bloqade_analog.factory import (
+from bloqade.analog.factory import (
     get_capabilities,
     piecewise_linear,
     piecewise_constant,
     linear,
     constant,
     rydberg_h,
 )
-import bloqade_analog.ir as _ir
-from bloqade_analog.constants import RB_C6
+import bloqade.analog.ir as _ir
+from bloqade.analog.constants import RB_C6
 
 import importlib.metadata
 
-__version__ = importlib.metadata.version("bloqade_analog")
+__version__ = importlib.metadata.version("bloqade.analog")
 
 
 def tree_depth(depth: int = None):

src/bloqade/analog/atom_arrangement.py

@@ -1,4 +1,4 @@
-from bloqade_analog.ir.location import (
+from bloqade.analog.ir.location import (
     AtomArrangement,
     Chain,
     Square,

src/bloqade/analog/builder/args.py

@@ -1,9 +1,9 @@
 from beartype import beartype
 from beartype.typing import List, Optional, Union
-from bloqade_analog.ir.scalar import Variable
-from bloqade_analog.builder.base import Builder
-from bloqade_analog.builder.pragmas import Parallelizable
-from bloqade_analog.builder.backend import BackendRoute
+from bloqade.analog.ir.scalar import Variable
+from bloqade.analog.builder.base import Builder
+from bloqade.analog.builder.pragmas import Parallelizable
+from bloqade.analog.builder.backend import BackendRoute
 
 
 class Args(Parallelizable, BackendRoute, Builder):

src/bloqade/analog/builder/assign.py

@@ -1,9 +1,9 @@
 from itertools import repeat
 from beartype.typing import Optional, List, Dict, Set, Sequence, Union
-from bloqade_analog.builder.typing import ParamType
-from bloqade_analog.builder.base import Builder
-from bloqade_analog.builder.pragmas import Parallelizable, AddArgs, BatchAssignable
-from bloqade_analog.builder.backend import BackendRoute
+from bloqade.analog.builder.typing import ParamType
+from bloqade.analog.builder.base import Builder
+from bloqade.analog.builder.pragmas import Parallelizable, AddArgs, BatchAssignable
+from bloqade.analog.builder.backend import BackendRoute
 from numbers import Real
 from decimal import Decimal
 import numpy as np
@@ -69,7 +69,7 @@ class Assign(BatchAssignable, AddArgs, Parallelizable, BackendRoute, AssignBase)
     def __init__(
         self, assignments: Dict[str, ParamType], parent: Optional[Builder] = None
     ) -> None:
-        from bloqade_analog.compiler.analysis.common.scan_variables import ScanVariables
+        from bloqade.analog.compiler.analysis.common.scan_variables import ScanVariables
 
         super().__init__(parent)
 
@@ -85,7 +85,7 @@ class BatchAssign(AddArgs, Parallelizable, BackendRoute, AssignBase):
     def __init__(
         self, assignments: Dict[str, List[ParamType]], parent: Optional[Builder] = None
     ) -> None:
-        from bloqade_analog.compiler.analysis.common.scan_variables import ScanVariables
+        from bloqade.analog.compiler.analysis.common.scan_variables import ScanVariables
 
         super().__init__(parent)
 
@@ -120,7 +120,7 @@ def __init__(
         batch_params: Sequence[Dict[str, ParamType]],
         parent: Optional[Builder] = None,
     ) -> None:
-        from bloqade_analog.compiler.analysis.common.scan_variables import ScanVariables
+        from bloqade.analog.compiler.analysis.common.scan_variables import ScanVariables
 
         super().__init__(parent)
 

src/bloqade/analog/builder/backend/__init__.py

@@ -1,6 +1,6 @@
-from bloqade_analog.builder.backend.quera import QuEraService
-from bloqade_analog.builder.backend.braket import BraketService
-from bloqade_analog.builder.backend.bloqade import BloqadeService
+from bloqade.analog.builder.backend.quera import QuEraService
+from bloqade.analog.builder.backend.braket import BraketService
+from bloqade.analog.builder.backend.bloqade import BloqadeService
 
 
 class BackendRoute(QuEraService, BraketService, BloqadeService):

src/bloqade/analog/builder/backend/bloqade.py

@@ -1,4 +1,4 @@
-from bloqade_analog.builder.base import Builder
+from bloqade.analog.builder.base import Builder
 
 
 class BloqadeService(Builder):

src/bloqade/analog/builder/backend/braket.py

@@ -1,9 +1,9 @@
 from beartype.typing import TYPE_CHECKING
-from bloqade_analog.builder.base import Builder
+from bloqade.analog.builder.base import Builder
 
 
 if TYPE_CHECKING:
-    from bloqade_analog.ir.routine.braket import (
+    from bloqade.analog.ir.routine.braket import (
         BraketHardwareRoutine,
         BraketLocalEmulatorRoutine,
     )

src/bloqade/analog/builder/backend/quera.py

@@ -1,5 +1,5 @@
 from typing import Optional
-from bloqade_analog.builder.base import Builder
+from bloqade.analog.builder.base import Builder
 
 
 class QuEraService(Builder):

src/bloqade/analog/builder/base.py

@@ -1,7 +1,7 @@
 from typing import Optional, Union, List
 from numbers import Real
 
-from bloqade_analog.builder.parse.trait import Parse, Show
+from bloqade.analog.builder.parse.trait import Parse, Show
 
 ParamType = Union[Real, List[Real]]
 

src/bloqade/analog/builder/coupling.py

@@ -1,5 +1,5 @@
-from bloqade_analog.builder.base import Builder
-from bloqade_analog.builder.field import Rabi, Detuning
+from bloqade.analog.builder.base import Builder
+from bloqade.analog.builder.field import Rabi, Detuning
 
 
 class LevelCoupling(Builder):
@@ -98,7 +98,7 @@ def __bloqade_ir__(self):
         Note:
             This method is used internally by the Bloqade framework.
         """
-        from bloqade_analog.ir.control.sequence import rydberg
+        from bloqade.analog.ir.control.sequence import rydberg
 
         return rydberg
 
@@ -140,6 +140,6 @@ def __bloqade_ir__(self):
         Note:
             This method is used internally by the Bloqade framework.
         """
-        from bloqade_analog.ir.control.sequence import hyperfine
+        from bloqade.analog.ir.control.sequence import hyperfine
 
         return hyperfine