boulder-opal-scale-up-sdk 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

boulderopalscaleupsdk/protobuf/v1/job_pb2.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: boulderopalscaleupsdk/protobuf/v1/job.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+boulderopalscaleupsdk/protobuf/v1/job.proto\x12!boulderopalscaleupsdk.protobuf.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x1cgoogle/protobuf/struct.proto\"*\n\x11GetSummaryRequest\x12\x15\n\x06job_id\x18\x01 \x01(\tR\x05jobId\"W\n\x12GetSummaryResponse\x12\x41\n\x10job_summary_data\x18\x01 \x01(\x0b\x32\x17.google.protobuf.StructR\x0ejobSummaryData\"#\n\nGetRequest\x12\x15\n\x06job_id\x18\x01 \x01(\tR\x05jobId\"A\n\x0bGetResponse\x12\x32\n\x08job_data\x18\x01 \x01(\x0b\x32\x17.google.protobuf.StructR\x07jobData\"\x92\x01\n\x0bListRequest\x12\x1f\n\x0b\x64\x65vice_name\x18\x01 \x01(\tR\ndeviceName\x12\x19\n\x08job_name\x18\x02 \x01(\tR\x07jobName\x12\x12\n\x04page\x18\x03 \x01(\x05R\x04page\x12\x14\n\x05limit\x18\x04 \x01(\x05R\x05limit\x12\x1d\n\nsort_order\x18\x05 \x01(\x05R\tsortOrder\"\\\n\x0cListResponse\x12+\n\x04jobs\x18\x01 \x03(\x0b\x32\x17.google.protobuf.StructR\x04jobs\x12\x1f\n\x0btotal_pages\x18\x02 \x01(\x05R\ntotalPages2\xb9\x03\n\x11JobManagerService\x12\x80\x01\n\x04List\x12..boulderopalscaleupsdk.protobuf.v1.ListRequest\x1a/.boulderopalscaleupsdk.protobuf.v1.ListResponse\"\x17\x82\xd3\xe4\x93\x02\x11\"\x0c/v1/job/list:\x01*\x12\x80\x01\n\x03Get\x12-.boulderopalscaleupsdk.protobuf.v1.GetRequest\x1a..boulderopalscaleupsdk.protobuf.v1.GetResponse\"\x1a\x82\xd3\xe4\x93\x02\x14\"\x0f/v1/job/get_job:\x01*\x12\x9d\x01\n\nGetSummary\x12\x34.boulderopalscaleupsdk.protobuf.v1.GetSummaryRequest\x1a\x35.boulderopalscaleupsdk.protobuf.v1.GetSummaryResponse\"\"\x82\xd3\xe4\x93\x02\x1c\"\x17/v1/job/get_job_summary:\x01*B\xa7\x02\n%com.boulderopalscaleupsdk.protobuf.v1B\x08JobProtoP\x01ZNgithub.com/qctrl/boulder-opal-scale-up/proto/boulderopalscaleupsdk/protobuf/v1\xa2\x02\x03\x42PX\xaa\x02!Boulderopalscaleupsdk.Protobuf.V1\xca\x02!Boulderopalscaleupsdk\\Protobuf\\V1\xe2\x02-Boulderopalscaleupsdk\\Protobuf\\V1\\GPBMetadata\xea\x02#Boulderopalscaleupsdk::Protobuf::V1b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'boulderopalscaleupsdk.protobuf.v1.job_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n%com.boulderopalscaleupsdk.protobuf.v1B\010JobProtoP\001ZNgithub.com/qctrl/boulder-opal-scale-up/proto/boulderopalscaleupsdk/protobuf/v1\242\002\003BPX\252\002!Boulderopalscaleupsdk.Protobuf.V1\312\002!Boulderopalscaleupsdk\\Protobuf\\V1\342\002-Boulderopalscaleupsdk\\Protobuf\\V1\\GPBMetadata\352\002#Boulderopalscaleupsdk::Protobuf::V1'
+  _globals['_JOBMANAGERSERVICE'].methods_by_name['List']._loaded_options = None
+  _globals['_JOBMANAGERSERVICE'].methods_by_name['List']._serialized_options = b'\202\323\344\223\002\021\"\014/v1/job/list:\001*'
+  _globals['_JOBMANAGERSERVICE'].methods_by_name['Get']._loaded_options = None
+  _globals['_JOBMANAGERSERVICE'].methods_by_name['Get']._serialized_options = b'\202\323\344\223\002\024\"\017/v1/job/get_job:\001*'
+  _globals['_JOBMANAGERSERVICE'].methods_by_name['GetSummary']._loaded_options = None
+  _globals['_JOBMANAGERSERVICE'].methods_by_name['GetSummary']._serialized_options = b'\202\323\344\223\002\034\"\027/v1/job/get_job_summary:\001*'
+  _globals['_GETSUMMARYREQUEST']._serialized_start=142
+  _globals['_GETSUMMARYREQUEST']._serialized_end=184
+  _globals['_GETSUMMARYRESPONSE']._serialized_start=186
+  _globals['_GETSUMMARYRESPONSE']._serialized_end=273
+  _globals['_GETREQUEST']._serialized_start=275
+  _globals['_GETREQUEST']._serialized_end=310
+  _globals['_GETRESPONSE']._serialized_start=312
+  _globals['_GETRESPONSE']._serialized_end=377
+  _globals['_LISTREQUEST']._serialized_start=380
+  _globals['_LISTREQUEST']._serialized_end=526
+  _globals['_LISTRESPONSE']._serialized_start=528
+  _globals['_LISTRESPONSE']._serialized_end=620
+  _globals['_JOBMANAGERSERVICE']._serialized_start=623
+  _globals['_JOBMANAGERSERVICE']._serialized_end=1064
+# @@protoc_insertion_point(module_scope)

boulderopalscaleupsdk/protobuf/v1/job_pb2.pyi

@@ -0,0 +1,54 @@
+from google.api import annotations_pb2 as _annotations_pb2
+from google.protobuf import struct_pb2 as _struct_pb2
+from google.protobuf.internal import containers as _containers
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class GetSummaryRequest(_message.Message):
+    __slots__ = ("job_id",)
+    JOB_ID_FIELD_NUMBER: _ClassVar[int]
+    job_id: str
+    def __init__(self, job_id: _Optional[str] = ...) -> None: ...
+
+class GetSummaryResponse(_message.Message):
+    __slots__ = ("job_summary_data",)
+    JOB_SUMMARY_DATA_FIELD_NUMBER: _ClassVar[int]
+    job_summary_data: _struct_pb2.Struct
+    def __init__(self, job_summary_data: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ...) -> None: ...
+
+class GetRequest(_message.Message):
+    __slots__ = ("job_id",)
+    JOB_ID_FIELD_NUMBER: _ClassVar[int]
+    job_id: str
+    def __init__(self, job_id: _Optional[str] = ...) -> None: ...
+
+class GetResponse(_message.Message):
+    __slots__ = ("job_data",)
+    JOB_DATA_FIELD_NUMBER: _ClassVar[int]
+    job_data: _struct_pb2.Struct
+    def __init__(self, job_data: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ...) -> None: ...
+
+class ListRequest(_message.Message):
+    __slots__ = ("device_name", "job_name", "page", "limit", "sort_order")
+    DEVICE_NAME_FIELD_NUMBER: _ClassVar[int]
+    JOB_NAME_FIELD_NUMBER: _ClassVar[int]
+    PAGE_FIELD_NUMBER: _ClassVar[int]
+    LIMIT_FIELD_NUMBER: _ClassVar[int]
+    SORT_ORDER_FIELD_NUMBER: _ClassVar[int]
+    device_name: str
+    job_name: str
+    page: int
+    limit: int
+    sort_order: int
+    def __init__(self, device_name: _Optional[str] = ..., job_name: _Optional[str] = ..., page: _Optional[int] = ..., limit: _Optional[int] = ..., sort_order: _Optional[int] = ...) -> None: ...
+
+class ListResponse(_message.Message):
+    __slots__ = ("jobs", "total_pages")
+    JOBS_FIELD_NUMBER: _ClassVar[int]
+    TOTAL_PAGES_FIELD_NUMBER: _ClassVar[int]
+    jobs: _containers.RepeatedCompositeFieldContainer[_struct_pb2.Struct]
+    total_pages: int
+    def __init__(self, jobs: _Optional[_Iterable[_Union[_struct_pb2.Struct, _Mapping]]] = ..., total_pages: _Optional[int] = ...) -> None: ...

boulderopalscaleupsdk/protobuf/v1/job_pb2_grpc.py

@@ -0,0 +1,138 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+
+from boulderopalscaleupsdk.protobuf.v1 import job_pb2 as boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2
+
+
+class JobManagerServiceStub(object):
+    """Job manager service.
+    """
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.List = channel.unary_unary(
+                '/boulderopalscaleupsdk.protobuf.v1.JobManagerService/List',
+                request_serializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.ListRequest.SerializeToString,
+                response_deserializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.ListResponse.FromString,
+                )
+        self.Get = channel.unary_unary(
+                '/boulderopalscaleupsdk.protobuf.v1.JobManagerService/Get',
+                request_serializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetRequest.SerializeToString,
+                response_deserializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetResponse.FromString,
+                )
+        self.GetSummary = channel.unary_unary(
+                '/boulderopalscaleupsdk.protobuf.v1.JobManagerService/GetSummary',
+                request_serializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetSummaryRequest.SerializeToString,
+                response_deserializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetSummaryResponse.FromString,
+                )
+
+
+class JobManagerServiceServicer(object):
+    """Job manager service.
+    """
+
+    def List(self, request, context):
+        """Fetch all the jobs that have been run on the device.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Get(self, request, context):
+        """Fetch the results of a specific job executed on the device previously.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def GetSummary(self, request, context):
+        """Fetch the results view of a previously executed job.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_JobManagerServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'List': grpc.unary_unary_rpc_method_handler(
+                    servicer.List,
+                    request_deserializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.ListRequest.FromString,
+                    response_serializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.ListResponse.SerializeToString,
+            ),
+            'Get': grpc.unary_unary_rpc_method_handler(
+                    servicer.Get,
+                    request_deserializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetRequest.FromString,
+                    response_serializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetResponse.SerializeToString,
+            ),
+            'GetSummary': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetSummary,
+                    request_deserializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetSummaryRequest.FromString,
+                    response_serializer=boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetSummaryResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'boulderopalscaleupsdk.protobuf.v1.JobManagerService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class JobManagerService(object):
+    """Job manager service.
+    """
+
+    @staticmethod
+    def List(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/boulderopalscaleupsdk.protobuf.v1.JobManagerService/List',
+            boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.ListRequest.SerializeToString,
+            boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.ListResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def Get(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/boulderopalscaleupsdk.protobuf.v1.JobManagerService/Get',
+            boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetRequest.SerializeToString,
+            boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def GetSummary(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/boulderopalscaleupsdk.protobuf.v1.JobManagerService/GetSummary',
+            boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetSummaryRequest.SerializeToString,
+            boulderopalscaleupsdk_dot_protobuf_dot_v1_dot_job__pb2.GetSummaryResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

boulderopalscaleupsdk/routines/__init__.py

@@ -13,9 +13,18 @@
 
 """Routine library."""
 
-__all__ = ["ResonatorMapping", "Routine", "TransmonDiscovery", "TransmonRetuning"]
+__all__ = [
+    "OneQubitCalibration",
+    "ResonatorMapping",
+    "Routine",
+    "TransmonCoherence",
+    "TransmonDiscovery",
+    "TransmonRetuning",
+]
 
 from .common import Routine
+from .one_qubit_calibration import OneQubitCalibration
 from .resonator_mapping import ResonatorMapping
+from .transmon_coherence import TransmonCoherence
 from .transmon_discovery import TransmonDiscovery
 from .transmon_retuning import TransmonRetuning

boulderopalscaleupsdk/routines/one_qubit_calibration.py

@@ -0,0 +1,36 @@
+# Copyright 2025 Q-CTRL. All rights reserved.
+#
+# Licensed under the Q-CTRL Terms of service (the "License"). Unauthorized
+# copying or use of this file, via any medium, is strictly prohibited.
+# Proprietary and confidential. You may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#    https://q-ctrl.com/terms
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS. See the
+# License for the specific language.
+
+from typing import Literal
+
+from pydantic import PrivateAttr
+
+from .common import Routine
+
+
+class OneQubitCalibration(Routine):
+    """
+    Parameters for running one qubit calibration routine.
+
+    Attributes
+    ----------
+    transmon : str
+        The reference for the transmon to target.
+    gate : "sx" or "x"
+        The gate to calibrate.
+    """
+
+    _routine_name: str = PrivateAttr("one_qubit_calibration")
+
+    transmon: str
+    gate: Literal["x", "sx"]

boulderopalscaleupsdk/routines/resonator_mapping.py

@@ -20,7 +20,7 @@ class ResonatorMapping(Routine):
     """
     Parameters for running a resonator mapping routine.
 
-    Parameters
+    Attributes
     ----------
     feedlines : list[str] or None
         The feedlines to target in the routine.

boulderopalscaleupsdk/routines/transmon_coherence.py

@@ -0,0 +1,34 @@
+# Copyright 2025 Q-CTRL. All rights reserved.
+#
+# Licensed under the Q-CTRL Terms of service (the "License"). Unauthorized
+# copying or use of this file, via any medium, is strictly prohibited.
+# Proprietary and confidential. You may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#    https://q-ctrl.com/terms
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS. See the
+# License for the specific language.
+
+from pydantic import PrivateAttr
+
+from .common import Routine
+
+
+class TransmonCoherence(Routine):
+    """
+    Parameters for running a transmon coherence routine.
+
+    Attributes
+    ----------
+    transmon : str
+        The reference for the transmon to target.
+    run_mixer_calibration : bool, optional
+        Whether to run mixer calibrations before running each program. Defaults to False.
+    """
+
+    _routine_name: str = PrivateAttr("transmon_coherence")
+
+    transmon: str
+    run_mixer_calibration: bool = False

boulderopalscaleupsdk/routines/transmon_discovery.py

@@ -22,24 +22,20 @@ class TransmonDiscovery(Routine):
     """
     Parameters for running a transmon discovery routine.
 
-    Parameters
+    Attributes
     ----------
     transmon : str
         The reference for the transmon to target.
-    recycle_delay_ns : int, optional
-        The delay between consecutive shots, in nanoseconds. Defaults to 100,000.
-    readout_waveform : ConstantWaveform or None, optional
-        The readout pulse used in transmon spectroscopy.
-        Defaults to a constant waveform with a duration of 10,000 ns
-        and an amplitude of 0.01.
     spectroscopy_waveform : ConstantWaveform or None, optional
         The drive pulse used during transmon spectroscopy and transmon anharmonicity.
         Defaults to a 10,000 ns pulse whose amplitude is defined by the logic of the experiment.
+    force_rerun : bool, optional
+        Whether to rerun the entire routine regardless transmon's current calibration status.
+        Defaults to False.
     """
 
     _routine_name: str = PrivateAttr("transmon_discovery")
 
     transmon: str
-    recycle_delay_ns: int = 100_000
-    readout_waveform: ConstantWaveform | None = None
     spectroscopy_waveform: ConstantWaveform | None = None
+    force_rerun: bool = False

boulderopalscaleupsdk/routines/transmon_retuning.py

@@ -11,21 +11,31 @@
 # distributed under the License is distributed on an "AS IS" BASIS. See the
 # License for the specific language.
 
-
 from pydantic import PrivateAttr
 
-from boulderopalscaleupsdk.routines import Routine
+from boulderopalscaleupsdk.experiments import ConstantWaveform
+
+from .common import Routine
 
 
 class TransmonRetuning(Routine):
     """
     Parameters for running a transmon retuning routine.
 
-    Parameters
+    Attributes
     ----------
     transmon : str
         The reference for the transmon to target.
+    spectroscopy_waveform : ConstantWaveform or None, optional
+        The drive pulse used during transmon spectroscopy.
+        Defaults to a 10,000 ns pulse whose amplitude is defined by the logic of the experiment.
+    force_rerun : bool, optional
+        Whether to rerun the entire routine regardless transmon's current calibration status.
+        Defaults to False.
     """
 
     _routine_name: str = PrivateAttr("transmon_retuning")
+
     transmon: str
+    spectroscopy_waveform: ConstantWaveform | None = None
+    force_rerun: bool = False

boulderopalscaleupsdk/third_party/quantum_machines/__init__.py

@@ -34,7 +34,7 @@ from unittest.mock import patch
 
 from packaging.version import Version
 
-if os.environ.get("QCTRL_SU_DISABLE_QM_LOGGING", "False") == "True":
+if os.getenv("QCTRL_SU_DISABLE_QM_LOGGING", "False") == "True":
     # Disable QM logging and telemetry
     os.environ["QM_DISABLE_STREAMOUTPUT"] = "true"  # Used in 1.1.0
     _qm_logger = logging.getLogger("qm")

boulderopalscaleupsdk/third_party/quantum_machines/config.py

@@ -84,13 +84,12 @@ For information about PyPA's version specifiers:
 
 # ruff: noqa: UP007, N815, E741
 from collections.abc import MutableMapping
-from typing import Annotated, Any, Literal, Self, TypeVar, Union
+from typing import Annotated, Literal, NamedTuple, Self, TypeVar, Union
 
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 from pydantic import (
     BaseModel,
-    BeforeValidator,
     Discriminator,
     Field,
     PrivateAttr,
@@ -125,8 +124,18 @@ class Constants(BaseSettings):
 CONST = Constants()
 
 
-StandardPort = tuple[str, int, int]
-PortReferenceType = Union[tuple[str, int], StandardPort]
+class NativeOPXPortType(NamedTuple):
+    controller_id: str
+    port_id: int
+
+
+class NativeOPX1000PortType(NamedTuple):
+    controller_id: str
+    fem_id: int
+    port_id: int
+
+
+QMPortTypes = NativeOPXPortType | NativeOPX1000PortType
 
 
 class AnalogOutputFilterConfigType(BaseModel):
@@ -134,24 +143,19 @@ class AnalogOutputFilterConfigType(BaseModel):
     feedback: list[float] = []
 
 
-def ensure_int(value: Any) -> Any:
-    match value:
-        case int():
-            return value
-        case str():
-            return int(value)
-        case _:
-            raise ValueError("Field must be convertible to int.")
-
-
-IntLike = Annotated[int, BeforeValidator(ensure_int)]
+class AnalogOutputFilterConfigType123(BaseModel):
+    feedforward: list[float] = []
+    feedback: list[float] = []
+    exponential: list[tuple[float, int]] = []
+    exponential_dc_gain: float | None = None
+    high_pass: float | None = None
 
 
 class AnalogOutputPortConfigType(BaseModel):
     offset: Number | None = None
     filter: AnalogOutputFilterConfigType | None = None
     delay: int | None = None
-    crosstalk: Mapping[IntLike, Number] = {}
+    crosstalk: Mapping[int, Number] = {}
     shareable: bool | None = None
 
 
@@ -175,13 +179,12 @@ class DigitalInputPortConfigType(BaseModel):
     threshold: Number | None = None
 
 
-class AnalogOutputPortConfigTypeOctoDac(BaseModel):
+class LfAnalogOutputPortConfigType(BaseModel):
     offset: Number | None = None
-    filter: AnalogOutputFilterConfigType | None = None
+    filter: AnalogOutputFilterConfigType | AnalogOutputFilterConfigType123 | None = None
     delay: int | None = None
     crosstalk: Mapping[int, Number] = {}
     shareable: bool | None = None
-    connectivity: tuple[str, str] | None = None
     sampling_rate: float | None = None
     upsampling_mode: Literal["mw", "pulse"] | None = None
     output_mode: Literal["direct", "amplified"] | None = None
@@ -189,10 +192,10 @@ class AnalogOutputPortConfigTypeOctoDac(BaseModel):
 
 class LfFemConfigType(BaseModel):
     type: Literal["LF"] | None = None
-    analog_outputs: Mapping[int | str, AnalogOutputPortConfigTypeOctoDac] = {}
-    analog_inputs: Mapping[int | str, AnalogInputPortConfigType] = {}
-    digital_outputs: Mapping[int | str, DigitalOutputPortConfigType] = {}
-    digital_inputs: Mapping[int | str, DigitalInputPortConfigType] = {}
+    analog_outputs: Mapping[int, LfAnalogOutputPortConfigType] = {}
+    analog_inputs: Mapping[int, AnalogInputPortConfigType] = {}
+    digital_outputs: Mapping[int, DigitalOutputPortConfigType] = {}
+    digital_inputs: Mapping[int, DigitalInputPortConfigType] = {}
 
 
 Band = Literal[1, 2, 3]
@@ -216,16 +219,16 @@ class MwFemAnalogOutputPortConfigType(BaseModel):
     band: Band | None = None
     delay: int | None = None
     shareable: bool | None = None
-    upconverters: Mapping[IntLike, MwUpconverterConfigType] = {}
+    upconverters: Mapping[int, MwUpconverterConfigType] | None = None
     upconverter_frequency: float | None = None
 
 
 class MwFemConfigType(BaseModel):
     type: Literal["MW"] | None = None
-    analog_outputs: Mapping[int | str, MwFemAnalogOutputPortConfigType] = {}
-    analog_inputs: Mapping[int | str, MwFemAnalogInputPortConfigType] = {}
-    digital_outputs: Mapping[int | str, DigitalOutputPortConfigType] = {}
-    digital_inputs: Mapping[int | str, DigitalInputPortConfigType] = {}
+    analog_outputs: Mapping[int, MwFemAnalogOutputPortConfigType] = {}
+    analog_inputs: Mapping[int, MwFemAnalogInputPortConfigType] = {}
+    digital_outputs: Mapping[int, DigitalOutputPortConfigType] = {}
+    digital_inputs: Mapping[int, DigitalInputPortConfigType] = {}
 
 
 class ControllerConfigType(BaseModel):
@@ -247,8 +250,8 @@ class OctaveRFOutputConfigType(BaseModel):
     ] = "always_off"
     gain: int | float = Field(default=0, ge=-20, le=20, multiple_of=0.5)
     input_attenuators: Literal["ON", "OFF"] = "OFF"
-    I_connection: PortReferenceType | None = None
-    Q_connection: PortReferenceType | None = None
+    I_connection: NativeOPXPortType | None = None
+    Q_connection: NativeOPXPortType | None = None
 
 
 _RF_SOURCES = Literal[
@@ -270,7 +273,7 @@ class OctaveRFInputConfigType(BaseModel):
 
 
 class OctaveSingleIfOutputConfigType(BaseModel):
-    port: PortReferenceType | None = None
+    port: NativeOPXPortType | None = None
     name: str | None = None
 
 
@@ -279,7 +282,7 @@ class OctaveIfOutputsConfigType(BaseModel):
     IF_out2: OctaveSingleIfOutputConfigType | None = None
 
 
-FEM_IDX = Literal[1, 2, 3, 4, 5, 6, 7, 8, "1", "2", "3", "4", "5", "6", "7", "8"]
+FEM_IDX = Annotated[int, Field(ge=1, le=8)]
 
 
 class OPX1000ControllerConfigType(BaseModel):
@@ -296,13 +299,13 @@ LoopbackType = tuple[
 class OctaveConfig(BaseModel):
     """Octave configuration for qm-qua 1.1.7."""
 
-    RF_outputs: Mapping[IntLike, OctaveRFOutputConfigType] = {}
+    RF_outputs: Mapping[int, OctaveRFOutputConfigType] = {}
     """
     RF Outputs in Octave's up-converter chain.
     OPX/AnalogOutput -> Octave/IFInput -> Octave/RFOutput -> Fridge.
     """
 
-    RF_inputs: Mapping[IntLike, OctaveRFInputConfigType] = {}
+    RF_inputs: Mapping[int, OctaveRFInputConfigType] = {}
     """RF Inputs in Octave's down-converter chain. See IF_Outputs."""
 
     IF_outputs: OctaveIfOutputsConfigType | None = None
@@ -367,7 +370,7 @@ class OctaveConfig121(OctaveConfig):
 class DigitalInputConfigType(BaseModel):
     delay: int | None = None
     buffer: int | None = None
-    port: PortReferenceType | None = None
+    port: QMPortTypes | None = None
 
 
 class IntegrationWeightConfigType(BaseModel):
@@ -413,16 +416,16 @@ class PulseConfigType(BaseModel):
 
 
 class SingleInputConfigType(BaseModel):
-    port: PortReferenceType | None = None
+    port: QMPortTypes | None = None
 
 
 class MwInputConfigType(BaseModel):
-    port: PortReferenceType | None = None
-    upconverter: int | None = None
+    port: NativeOPX1000PortType | None = None
+    upconverter: int = Field(default=1, description="The index of the upconverter to use.")
 
 
 class MwOutputConfigType(BaseModel):
-    port: PortReferenceType | None = None
+    port: NativeOPX1000PortType | None = None
 
 
 class HoldOffsetConfigType(BaseModel):
@@ -436,14 +439,14 @@ class StickyConfigType(BaseModel):
 
 
 class MixInputConfigType(BaseModel):
-    I: PortReferenceType | None = None
-    Q: PortReferenceType | None = None
+    I: QMPortTypes | None = None
+    Q: QMPortTypes | None = None
     mixer: str | None = None
     lo_frequency: float | None = None
 
 
 class InputCollectionConfigType(BaseModel):
-    inputs: Mapping[str, PortReferenceType] = {}
+    inputs: Mapping[str, QMPortTypes] = {}
 
 
 class OscillatorConfigType(BaseModel):
@@ -472,15 +475,15 @@ class ElementConfig(BaseModel):
     multipleInputs: InputCollectionConfigType | None = None
     time_of_flight: int | None = None
     smearing: int | None = None
-    outputs: Mapping[str, PortReferenceType] = {}
+    outputs: Mapping[str, QMPortTypes] = {}
     digitalInputs: Mapping[str, DigitalInputConfigType] | None = None
-    digitalOutputs: Mapping[str, PortReferenceType] | None = None
+    digitalOutputs: Mapping[str, QMPortTypes] | None = None
     outputPulseParameters: OutputPulseParameterConfigType | None = None
     hold_offset: HoldOffsetConfigType | None = None
     sticky: StickyConfigType | None = None
     thread: str | None = None
-    RF_inputs: Mapping[str, tuple[str, int]] | None = None
-    RF_outputs: Mapping[str, tuple[str, int]] | None = None
+    RF_inputs: Mapping[str, NativeOPXPortType] | None = None
+    RF_outputs: Mapping[str, NativeOPXPortType] | None = None
 
     @model_validator(mode="after")
     def validator_oscillators(self) -> Self:
@@ -499,7 +502,7 @@ class ElementConfig121(ElementConfig):
 
     @model_validator(mode="after")
     def validate_outputs(self) -> Self:
-        if self.RF_outputs:
+        if self.RF_outputs or self.MWOutput:
             if self.smearing is None:
                 raise ValueError("Element with output must have smearing defined.")
             if self.time_of_flight is None:
@@ -529,7 +532,7 @@ class _BaseQuaConfig(BaseModel):
     qm_version: str
     """The qm-qua package version used."""
 
-    version: str = "1"
+    version: int = 1
     """The configuration version. This is a field used in Qua's configuration API."""
 
     oscillators: Mapping[str, OscillatorConfigType] = {}