Merge branch 'main' into actions-tests

mkdocs.yaml

@@ -103,7 +103,6 @@ plugins:
           import:
             - https://docs.python.org/3/objects.inv
             - https://docs.pydantic.dev/latest/objects.inv
-            - https://qutip.readthedocs.io/en/qutip-4.7.x/objects.inv
             - https://pandas.pydata.org/docs/objects.inv
             - https://matplotlib.org/stable/objects.inv
             - https://numpy.org/doc/stable/objects.inv

pyproject.toml

@@ -8,8 +8,16 @@ name = "oqd-core"
 version = "0.1.0"
 requires-python = ">=3.10"
 readme = "README.md"
-license = {text = "Apache 2.0"}
-keywords = ["quantum", "computing", "analog", "digital", "compiler", "transpilation", "atomic",]
+license = { text = "Apache 2.0" }
+keywords = [
+  "quantum",
+  "computing",
+  "analog",
+  "digital",
+  "compiler",
+  "transpilation",
+  "atomic",
+]
 classifiers = [
   "Development Status :: 3 - Alpha",
 
@@ -33,11 +41,11 @@ dependencies = [
 
 [project.optional-dependencies]
 docs = [
-    "pymdown-extensions",
-    "mkdocstrings",
-    "mkdocs-material",
-    "mkdocstrings-python",
-    "mdx_truly_sane_lists",
+  "pymdown-extensions",
+  "mkdocstrings",
+  "mkdocs-material",
+  "mkdocstrings-python",
+  "mdx_truly_sane_lists",
 ]
 test = ["pytest"]
 

src/oqd_core/interface/atomic/circuit.py

@@ -19,6 +19,7 @@
 
 ########################################################################################
 from oqd_core.interface.atomic.system import System
+from oqd_core.interface.atomic.protocol import ProtocolSubTypes
 
 ########################################################################################
 
@@ -40,4 +41,4 @@ class AtomicCircuit(TypeReflectBaseModel):
     """
 
     system: System
-    protocol: Protocol
+    protocol: ProtocolSubTypes

src/oqd_core/interface/atomic/protocol.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import List, Union
 
 from oqd_compiler_infrastructure import TypeReflectBaseModel
@@ -87,7 +89,7 @@ class ParallelProtocol(Protocol):
         sequence: List of pulses or subprotocols to compose together in a parallel fashion.
     """
 
-    sequence: List[Union[Pulse, Protocol]]
+    sequence: List[Union[Pulse, ProtocolSubTypes]]
 
 
 class SequentialProtocol(Protocol):
@@ -98,4 +100,7 @@ class SequentialProtocol(Protocol):
         sequence: List of pulses or subprotocols to compose together in a sequntial fashion.
     """
 
-    sequence: List[Union[Pulse, Protocol]]
+    sequence: List[Union[Pulse, ProtocolSubTypes]]
+
+
+ProtocolSubTypes = Union[SequentialProtocol, ParallelProtocol]

src/oqd_core/interface/digital/circuit.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from pydantic import field_validator, model_validator, ConfigDict
 from typing import List, Union
 
 from oqd_compiler_infrastructure import VisitableBaseModel
@@ -32,15 +33,14 @@
 
 
 class DigitalCircuit(VisitableBaseModel):
+    model_config = ConfigDict(extra="forbid")
+
     qreg: List[QuantumRegister] = []
     creg: List[ClassicalRegister] = []
 
     declarations: List = []
     sequence: List[Union[Gate, Statement]] = []
 
-    class Config:
-        extra = "forbid"
-
     @field_validator("creg", mode="before")
     @classmethod
     def convert_creg(cls, v):

src/oqd_core/interface/math.py

@@ -51,6 +51,8 @@ class MathExpr(TypeReflectBaseModel):
 
     @classmethod
     def cast(cls, value: Any):
+        if isinstance(value, dict):
+            return value
         if isinstance(value, MathExpr):
             return value
         if isinstance(value, (int, float)):
@@ -123,8 +125,23 @@ def is_varname(value: str) -> str:
 
 
 VarName = Annotated[str, AfterValidator(is_varname)]
-CastMathExpr = Annotated[MathExpr, BeforeValidator(MathExpr.cast)]
-Functions = Literal["sin", "cos", "tan", "exp", "log", "sinh", "cosh", "tanh"]
+Functions = Literal[
+    "sin",
+    "cos",
+    "tan",
+    "exp",
+    "log",
+    "sinh",
+    "cosh",
+    "tanh",
+    "atan",
+    "acos",
+    "asin",
+    "atanh",
+    "asinh",
+    "acosh",
+    "heaviside",
+]
 
 
 ########################################################################################
@@ -327,3 +344,5 @@ class MathPow(MathBinaryOp):
 """
 Alias for the union of concrete MathExpr subtypes
 """
+
+CastMathExpr = Annotated[MathExprSubtypes, BeforeValidator(MathExpr.cast)]