classiq 0.60.1__py3-none-any.whl → 0.62.0__py3-none-any.whl

classiq/execution/jobs.py

@@ -112,7 +112,15 @@ class ExecutionJob:
         )
         return cls(details)
 
-    from_id = syncify_function(from_id_async)
+    # `syncify_function` doesn't work well for class methods, so I wrote `from_id`
+    # explicitly
+    @classmethod
+    def from_id(
+        cls,
+        id: str,
+        _http_client: Optional[httpx.AsyncClient] = None,
+    ) -> "ExecutionJob":
+        return syncify_function(cls.from_id_async)(id, _http_client=_http_client)
 
     @property
     def _job_id(self) -> JobID:

classiq/executor.py

@@ -62,8 +62,8 @@ def set_quantum_program_execution_preferences(
 
 
 __all__ = [
+    "OperatorsEstimation",
     "QuantumCode",
     "QuantumInstructionSet",
-    "OperatorsEstimation",
     "set_quantum_program_execution_preferences",
 ]

classiq/interface/_version.py

@@ -3,5 +3,5 @@ from packaging.version import Version
 # This file was generated automatically
 # Please don't track in version control (DONTTRACK)
 
-SEMVER_VERSION = '0.60.1'
+SEMVER_VERSION = '0.62.0'
 VERSION = str(Version(SEMVER_VERSION))

classiq/interface/backend/backend_preferences.py

@@ -161,6 +161,20 @@ class ClassiqBackendPreferences(BackendPreferences):
     def is_nvidia_backend(self) -> bool:
         return self.backend_name in list(ClassiqNvidiaBackendNames)
 
+    # CAD-25390
+    @pydantic.field_validator("backend_name")
+    @classmethod
+    def _validate_nvidia_name_backwards_compatibility(cls, backend_name: str) -> str:
+        if backend_name == "nvidia_state_vector_simulator":
+            warnings.warn(
+                "The name 'nvidia_state_vector_simulator' is deprecated and "
+                "will be removed soon, no earlier than January 12th 2025. "
+                "Please use ClassiqNvidiaBackendNames.SIMULATOR instead",
+                ClassiqDeprecationWarning,
+                stacklevel=2,
+            )
+        return backend_name
+
 
 class AwsBackendPreferences(BackendPreferences):
     """
@@ -196,13 +210,17 @@ class AwsBackendPreferences(BackendPreferences):
     backend_service_provider: ProviderTypeVendor.AMAZON_BRAKET = pydantic.Field(
         default=ProviderVendor.AMAZON_BRAKET
     )
-    aws_role_arn: pydantic_backend.PydanticAwsRoleArn = pydantic.Field(
+    aws_role_arn: Optional[pydantic_backend.PydanticAwsRoleArn] = pydantic.Field(
         description="ARN of the role to be assumed for execution on your Braket account."
     )
-    s3_bucket_name: str = pydantic.Field(description="S3 Bucket Name")
-    s3_folder: pydantic_backend.PydanticS3BucketKey = pydantic.Field(
+    s3_bucket_name: Optional[str] = pydantic.Field(description="S3 Bucket Name")
+    s3_folder: Optional[pydantic_backend.PydanticS3BucketKey] = pydantic.Field(
         description="S3 Folder Path Within The S3 Bucket"
     )
+    run_through_classiq: bool = pydantic.Field(
+        default=False,
+        description="Run through Classiq's credentials while using user's allocated budget.",
+    )
 
     @pydantic.field_validator("s3_bucket_name", mode="before")
     @classmethod
@@ -513,25 +531,25 @@ BackendPreferencesTypes = Union[
 ]
 
 __all__ = [
+    "AQTBackendPreferences",
+    "AliceBobBackendNames",
+    "AliceBobBackendPreferences",
+    "AmazonBraketBackendNames",
+    "AwsBackendPreferences",
     "AzureBackendPreferences",
     "AzureCredential",
     "AzureQuantumBackendNames",
     "ClassiqBackendPreferences",
+    "ClassiqNvidiaBackendNames",
     "ClassiqSimulatorBackendNames",
+    "GCPBackendPreferences",
     "IBMBackendPreferences",
     "IBMBackendProvider",
-    "AwsBackendPreferences",
-    "AmazonBraketBackendNames",
-    "IonqBackendPreferences",
-    "IonqBackendNames",
-    "ClassiqNvidiaBackendNames",
+    "IQCCBackendPreferences",
     "IntelBackendNames",
-    "GCPBackendPreferences",
-    "AliceBobBackendPreferences",
-    "AliceBobBackendNames",
-    "OQCBackendPreferences",
-    "OQCBackendNames",
     "IntelBackendPreferences",
-    "AQTBackendPreferences",
-    "IQCCBackendPreferences",
+    "IonqBackendNames",
+    "IonqBackendPreferences",
+    "OQCBackendNames",
+    "OQCBackendPreferences",
 ]

classiq/interface/backend/quantum_backend_providers.py

@@ -170,7 +170,8 @@ class ClassiqNvidiaBackendNames(StrEnum):
     Classiq's Nvidia simulator backend names.
     """
 
-    SIMULATOR = "nvidia_state_vector_simulator"
+    SIMULATOR = "nvidia_simulator"
+    SIMULATOR_STATEVECTOR = "nvidia_simulator_statevector"
 
 
 class IntelBackendNames(StrEnum):
@@ -186,6 +187,7 @@ class GoogleNvidiaBackendNames(StrEnum):
     """
 
     CUQUANTUM = "cuquantum"
+    CUQUANTUM_STATEVECTOR = "cuquantum_statevector"
 
 
 class AliceBobBackendNames(StrEnum):

classiq/interface/executor/execution_preferences.py

@@ -65,7 +65,7 @@ class ExecutionPreferences(pydantic.BaseModel):
 
 __all__ = [
     "ExecutionPreferences",
-    "OptimizerType",
     "NoiseProperties",
+    "OptimizerType",
     "QaeWithQpeEstimationMethod",
 ]

classiq/interface/generator/application_apis/chemistry_declarations.py

@@ -61,7 +61,7 @@ MOLECULE_GROUND_STATE_SOLUTION_POST_PROCESS = ClassicalFunctionDeclaration(
 )
 
 __all__ = [
-    "MOLECULE_PROBLEM_TO_HAMILTONIAN",
     "FOCK_HAMILTONIAN_PROBLEM_TO_HAMILTONIAN",
     "MOLECULE_GROUND_STATE_SOLUTION_POST_PROCESS",
+    "MOLECULE_PROBLEM_TO_HAMILTONIAN",
 ]

classiq/interface/generator/application_apis/finance_declarations.py

@@ -98,8 +98,8 @@ GAUSSIAN_FINANCE_POST_PROCESS = ClassicalFunctionDeclaration(
 )
 
 __all__ = [
-    "LOG_NORMAL_FINANCE_FUNCTION",
     "GAUSSIAN_FINANCE_FUNCTION",
-    "LOG_NORMAL_FINANCE_POST_PROCESS",
     "GAUSSIAN_FINANCE_POST_PROCESS",
+    "LOG_NORMAL_FINANCE_FUNCTION",
+    "LOG_NORMAL_FINANCE_POST_PROCESS",
 ]

classiq/interface/generator/arith/arithmetic.py

@@ -9,6 +9,9 @@ from classiq.interface.generator.arith import arithmetic_expression_parser
 from classiq.interface.generator.arith.arithmetic_expression_abc import (
     ArithmeticExpressionABC,
 )
+from classiq.interface.generator.arith.arithmetic_expression_validator import (
+    is_constant,
+)
 from classiq.interface.generator.arith.arithmetic_param_getters import (
     id2op,
     operation_allows_target,
@@ -17,7 +20,9 @@ from classiq.interface.generator.arith.arithmetic_result_builder import (
     ArithmeticResultBuilder,
 )
 from classiq.interface.generator.arith.register_user_input import RegisterArithmeticInfo
+from classiq.interface.generator.expressions.expression import Expression
 from classiq.interface.model.quantum_type import (
+    QuantumNumeric,
     QuantumType,
     quantum_var_to_register,
     register_info_to_quantum_type,
@@ -28,6 +33,10 @@ ARITHMETIC_EXPRESSION_RESULT_NAME: Final[str] = "expression_result"
 ARITHMETIC_EXPRESSION_GARBAGE_NAME: Final[str] = "expression_garbage"
 
 
+def is_zero(expr: str) -> bool:
+    return is_constant(expr) and float(expr) == 0
+
+
 class Arithmetic(ArithmeticExpressionABC):
     target: Optional[RegisterArithmeticInfo] = None
     inputs_to_save: set[str] = pydantic.Field(default_factory=set)
@@ -99,7 +108,13 @@ def get_arithmetic_params(
 
 def compute_arithmetic_result_type(
     expr_str: str, var_types: dict[str, QuantumType], machine_precision: int
-) -> QuantumType:
+) -> QuantumNumeric:
+    if is_zero(expr_str):
+        return QuantumNumeric(
+            size=Expression(expr="1"),
+            is_signed=Expression(expr="False"),
+            fraction_digits=Expression(expr="0"),
+        )
     arith_param = get_arithmetic_params(expr_str, var_types, machine_precision)
     return register_info_to_quantum_type(
         arith_param.outputs[ARITHMETIC_EXPRESSION_RESULT_NAME]

classiq/interface/generator/arith/arithmetic_expression_validator.py

@@ -3,6 +3,7 @@ import re
 from _ast import AST
 from typing import Any, Optional, Union
 
+from sympy import Expr
 from typing_extensions import TypeAlias, get_args
 
 from classiq.interface.exceptions import ClassiqArithmeticError, ClassiqValueError
@@ -54,11 +55,11 @@ SupportedNodesTypes = Union[
 DEFAULT_SUPPORTED_NODE_TYPES = get_args(SupportedNodesTypes)
 
 
-def _is_constant(expr: str) -> bool:
+def is_constant(expr: Union[str, Expr]) -> bool:
     try:
         float(expr)
         return True
-    except ValueError:
+    except (ValueError, TypeError):
         return False
 
 
@@ -94,7 +95,7 @@ class ExpressionValidator(ast.NodeVisitor):
     @staticmethod
     def _get_adjusted_expression(expression: str) -> str:
         # This works around the simplification of the trivial expressions such as a + 0, 1 * a, etc.
-        if IDENITIFIER_REGEX.fullmatch(expression) or _is_constant(expression):
+        if IDENITIFIER_REGEX.fullmatch(expression) or is_constant(expression):
             return f"0 + {expression}"
         return expression
 

classiq/interface/generator/copy.py

@@ -0,0 +1,47 @@
+from typing import Optional
+
+import pydantic
+
+from classiq.interface.generator.arith import argument_utils
+from classiq.interface.generator.arith.register_user_input import RegisterArithmeticInfo
+from classiq.interface.generator.function_params import FunctionParams
+
+
+class Copy(FunctionParams):
+    source: argument_utils.RegisterOrConst
+    target: RegisterArithmeticInfo
+    output_size: Optional[pydantic.PositiveInt] = pydantic.Field(default=None)
+
+    @property
+    def source_size(self) -> int:
+        return argument_utils.size(self.source)
+
+    @property
+    def source_reg_size(self) -> int:
+        return (
+            self.source.size if isinstance(self.source, RegisterArithmeticInfo) else 0
+        )
+
+    @property
+    def source_fraction_places(self) -> int:
+        return argument_utils.fraction_places(self.source)
+
+    @property
+    def offset(self) -> int:
+        return self.target.fraction_places - self.source_fraction_places
+
+    @property
+    def source_name(self) -> str:
+        return "source"
+
+    @property
+    def target_name(self) -> str:
+        return "target"
+
+    def _create_ios(self) -> None:
+        self._inputs = {
+            self.target_name: self.target,
+        }
+        if isinstance(self.source, RegisterArithmeticInfo):
+            self._inputs[self.source_name] = self.source
+        self._outputs = {**self._inputs}

classiq/interface/generator/expressions/expression_constants.py

@@ -20,3 +20,6 @@ BOOLEAN_LITERALS = {"True", "False"}
 FORBIDDEN_LITERALS: set[str] = set(keyword.kwlist) - SUPPORTED_FUNC_NAMES
 CPARAM_EXECUTION_SUFFIX: Final[str] = "_param"
 RESERVED_EXPRESSIONS: frozenset[str] = frozenset({"i"})
+CPARAM_EXECUTION_SUFFIX_PATTERN = (
+    rf"({CPARAM_EXECUTION_SUFFIX}|^({'|'.join(RESERVED_EXPRESSIONS)}))(_\d+)*$"
+)

classiq/interface/generator/function_param_list_without_self_reference.py

@@ -28,6 +28,7 @@ from classiq.interface.generator.arith.unary_ops import BitwiseInvert, Negation,
 from classiq.interface.generator.commuting_pauli_exponentiation import (
     CommutingPauliExponentiation,
 )
+from classiq.interface.generator.copy import Copy
 from classiq.interface.generator.entangler_params import (
     GridEntangler,
     HypercubeEntangler,
@@ -148,6 +149,7 @@ function_param_library_without_self_reference: FunctionParamLibrary = (
                 PiecewiseLinearAmplitudeLoading,
                 PiecewiseLinearRotationAmplitudeLoading,
                 HadamardTransform,
+                Copy,
             },
             standard_gate_function_param_library.param_list,
             oracle_function_param_library.param_list,

classiq/interface/generator/generated_circuit_data.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Literal, Optional, Union
+from typing import Literal, Optional, Union
 
 import pydantic
 from pydantic import ConfigDict
@@ -12,6 +12,12 @@ from classiq.interface.generator.synthesis_metadata.synthesis_execution_data imp
     ExecutionData,
 )
 
+from classiq.model_expansions.capturing.mangling_utils import (
+    demangle_capture_name,
+    demangle_name,
+    is_captured_var_name,
+)
+
 _logger = logging.getLogger(__name__)
 ParameterName = str
 IOQubitMapping: TypeAlias = dict[str, tuple[int, ...]]
@@ -52,6 +58,16 @@ class GeneratedRegister(pydantic.BaseModel):
     def width(self) -> int:
         return len(self)
 
+    @property
+    def is_captured(self) -> bool:
+        return is_captured_var_name(self.name)
+
+    @staticmethod
+    def demangle_name(name: str) -> str:
+        if is_captured_var_name(name):
+            return demangle_capture_name(name)
+        return demangle_name(name)
+
 
 class GeneratedFunction(pydantic.BaseModel):
     name: str
@@ -157,32 +173,54 @@ class FunctionDebugInfoInterface(pydantic.BaseModel):
             for key, value in parameters.items()
         ]
 
-    def update(self, **kwargs: Any) -> None:
-        for key, value in kwargs.items():
-            setattr(self, key, value)
-
-    def propagate_absolute_qubits(self) -> None:
+    def propagate_absolute_qubits(self) -> "FunctionDebugInfoInterface":
         if self.absolute_qubits is None:
-            return
-
-        for register in self.registers:
-            register.qubit_indexes_absolute = list(
-                _get_absolute_from_relative(
-                    self.absolute_qubits, tuple(register.qubit_indexes_relative)
+            return self
+
+        updated_registers = [
+            register.model_copy(
+                update=dict(
+                    qubit_indexes_absolute=list(
+                        _get_absolute_from_relative(
+                            self.absolute_qubits, tuple(register.qubit_indexes_relative)
+                        )
+                    )
                 )
             )
+            for register in self.registers
+        ]
+        updated_generated_function = (
+            self.generated_function.model_copy(update=dict(registers=updated_registers))
+            if self.generated_function
+            else None
+        )
 
+        updated_children: list[FunctionDebugInfoInterface] = []
         for child in self.children:
-            child.absolute_qubits = _get_absolute_from_relative(
-                self.absolute_qubits, child.relative_qubits
+            updated_child = child.model_copy(
+                update=dict(
+                    absolute_qubits=_get_absolute_from_relative(
+                        self.absolute_qubits, child.relative_qubits
+                    )
+                )
             )
-            child.propagate_absolute_qubits()
+            updated_children.append(updated_child.propagate_absolute_qubits())
 
-    def inverse(self) -> None:
-        self.is_inverse = not self.is_inverse
-        for child in self.children:
-            child.inverse()
-        self.children = self.children[::-1]
+        return self.model_copy(
+            update=dict(
+                generated_function=updated_generated_function,
+                children=updated_children,
+            )
+        )
+
+    def inverse(self) -> "FunctionDebugInfoInterface":
+        inverted_children = [child.inverse() for child in self.children[::-1]]
+        return self.model_copy(
+            update=dict(
+                is_inverse=not self.is_inverse,
+                children=inverted_children,
+            )
+        )
 
 
 def _get_absolute_from_relative(

classiq/interface/generator/model/__init__.py

@@ -10,8 +10,8 @@ from classiq.interface.generator.model.preferences import (
 
 __all__: list[str] = [
     "Constraints",
-    "Preferences",
     "CustomHardwareSettings",
     "OptimizationParameter",
+    "Preferences",
     "TranspilerBasisGates",
 ]

classiq/interface/generator/model/preferences/preferences.py

@@ -156,7 +156,7 @@ class Preferences(pydantic.BaseModel, extra="forbid"):
     )
     synthesize_all_separately: bool = pydantic.Field(
         default=False,
-        description="If true, all functions will be synthesized separately",
+        description="If true, a heuristic is used to determine if a function should be synthesized separately",
     )
     output_format: PydanticConstrainedQuantumFormatList = pydantic.Field(
         default=[QuantumFormat.QASM],

classiq/interface/generator/model/quantum_register.py

@@ -250,11 +250,11 @@ def get_type_and_size_dict(
 
 
 __all__ = [
+    "AuxQReg",
     "QReg",
-    "QSInt",
-    "QUInt",
     "QSFixed",
+    "QSInt",
     "QUFixed",
+    "QUInt",
     "ZeroQReg",
-    "AuxQReg",
 ]

classiq/interface/generator/standard_gates/controlled_standard_gates.py

@@ -26,26 +26,6 @@ class ControlledGate(_StandardGate):  # type: ignore[misc]
     num_ctrl_qubits: pydantic.PositiveInt = pydantic.Field(
         default=DEFAULT_NUM_CTRL_QUBITS
     )
-
-    def _create_ios(self) -> None:
-        _StandardGate._create_ios(self)
-        control = RegisterUserInput(
-            name=CONTROLLED_GATE_CONTROL, size=self.num_ctrl_qubits
-        )
-        self._inputs[CONTROLLED_GATE_CONTROL] = control
-        self._outputs[CONTROLLED_GATE_CONTROL] = control
-
-    def to_control_state(self) -> ControlState:
-        return ControlState(
-            name=CONTROLLED_GATE_CONTROL, num_ctrl_qubits=self.num_ctrl_qubits
-        )
-
-
-class ControlledGateWithState(ControlledGate):  # type: ignore[misc]
-    """
-    Base model for controlled Gates with control over the controlled_state
-    """
-
     ctrl_state: CtrlState = pydantic.Field(
         description="The control state in decimal or as a bit string (e.g. '1011'). If not specified, the control "
         "state is 2**num_ctrl_qubits - 1.\n"
@@ -82,12 +62,20 @@ class ControlledGateWithState(ControlledGate):  # type: ignore[misc]
         )
         return ControlState(name=CONTROLLED_GATE_CONTROL, ctrl_state=ctrl_state_str)
 
+    def _create_ios(self) -> None:
+        _StandardGate._create_ios(self)
+        control = RegisterUserInput(
+            name=CONTROLLED_GATE_CONTROL, size=self.num_ctrl_qubits
+        )
+        self._inputs[CONTROLLED_GATE_CONTROL] = control
+        self._outputs[CONTROLLED_GATE_CONTROL] = control
+
 
 def _num_to_control_string(ctrl_state_int: int, num_ctrl_qubits: int) -> str:
     return format(ctrl_state_int, f"0{num_ctrl_qubits}b")
 
 
-class CXGate(ControlledGateWithState):  # type: ignore[misc]
+class CXGate(ControlledGate):  # type: ignore[misc]
     """
     The Controlled-X Gate
     """
@@ -98,7 +86,7 @@ class CXGate(ControlledGateWithState):  # type: ignore[misc]
         return 2
 
 
-class CCXGate(ControlledGateWithState):  # type: ignore[misc]
+class CCXGate(ControlledGate):  # type: ignore[misc]
     """
     The Double Controlled-X Gate
     """
@@ -109,7 +97,7 @@ class CCXGate(ControlledGateWithState):  # type: ignore[misc]
         return 2
 
 
-class C3XGate(ControlledGateWithState):  # type: ignore[misc]
+class C3XGate(ControlledGate):  # type: ignore[misc]
     """
     The X Gate controlled on 3 qubits
     """
@@ -121,7 +109,7 @@ class C3XGate(ControlledGateWithState):  # type: ignore[misc]
         return 2
 
 
-class C4XGate(ControlledGateWithState):  # type: ignore[misc]
+class C4XGate(ControlledGate):  # type: ignore[misc]
     """
     The X Gate controlled on 4 qubits
     """
@@ -133,7 +121,7 @@ class C4XGate(ControlledGateWithState):  # type: ignore[misc]
         return 2
 
 
-class CYGate(ControlledGateWithState):  # type: ignore[misc]
+class CYGate(ControlledGate):  # type: ignore[misc]
     """
     The Controlled-Y Gate
     """
@@ -142,7 +130,7 @@ class CYGate(ControlledGateWithState):  # type: ignore[misc]
         return 2
 
 
-class CZGate(ControlledGateWithState):  # type: ignore[misc]
+class CZGate(ControlledGate):  # type: ignore[misc]
     """
     The Controlled-Z Gate
     """
@@ -151,7 +139,7 @@ class CZGate(ControlledGateWithState):  # type: ignore[misc]
         return 2
 
 
-class CHGate(ControlledGateWithState):  # type: ignore[misc]
+class CHGate(ControlledGate):  # type: ignore[misc]
     """
     The Controlled-H Gate
     """
@@ -160,7 +148,7 @@ class CHGate(ControlledGateWithState):  # type: ignore[misc]
         return 2
 
 
-class CSXGate(ControlledGateWithState):  # type: ignore[misc]
+class CSXGate(ControlledGate):  # type: ignore[misc]
     """
     The Controlled-SX Gate
     """
@@ -169,25 +157,25 @@ class CSXGate(ControlledGateWithState):  # type: ignore[misc]
         return 4
 
 
-class CRXGate(ControlledGateWithState, angles=["theta"]):  # type: ignore[misc]
+class CRXGate(ControlledGate, angles=["theta"]):  # type: ignore[misc]
     """
     The Controlled-RX Gate
     """
 
 
-class CRYGate(ControlledGateWithState, angles=["theta"]):  # type: ignore[misc]
+class CRYGate(ControlledGate, angles=["theta"]):  # type: ignore[misc]
     """
     The Controlled-RY Gate
     """
 
 
-class CRZGate(ControlledGateWithState, angles=["theta"]):  # type: ignore[misc]
+class CRZGate(ControlledGate, angles=["theta"]):  # type: ignore[misc]
     """
     The Controlled-RZ Gate
     """
 
 
-class CPhaseGate(ControlledGateWithState, angles=["theta"]):  # type: ignore[misc]
+class CPhaseGate(ControlledGate, angles=["theta"]):  # type: ignore[misc]
     """
     The Controlled-Phase Gate
     """

classiq/interface/generator/types/compilation_metadata.py

@@ -1,5 +1,6 @@
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, NonNegativeInt
 
 
 class CompilationMetadata(BaseModel):
     should_synthesize_separately: bool = Field(default=False)
+    occurrences_number: NonNegativeInt = Field(default=1)

classiq/interface/ide/visual_model.py

@@ -42,6 +42,7 @@ class OperationLink(pydantic.BaseModel):
     inner_label: Optional[str] = None
     qubits: tuple[int, ...]
     type: str
+    is_captured: bool = False
 
     model_config = ConfigDict(frozen=True)
 

classiq/interface/interface_version.py

@@ -1 +1 @@
-INTERFACE_VERSION = "5"
+INTERFACE_VERSION = "6"

classiq/interface/model/model.py

@@ -180,9 +180,8 @@ class Model(VersionedModel, ASTNode):
             )
         return constants
 
-    def json_no_preferences_and_constraints(self) -> str:
-        return self.model_dump_json(
-            indent=2,
+    def dump_no_preferences_and_constraints(self) -> dict[str, Any]:
+        return self.model_dump(
             exclude={
                 "constraints",
                 "execution_preferences",

classiq/interface/model/quantum_function_call.py

@@ -7,7 +7,6 @@ from typing import (
 
 import pydantic
 
-from classiq.interface.ast_node import ASTNode
 from classiq.interface.exceptions import ClassiqError, ClassiqValueError
 from classiq.interface.generator.expressions.expression import Expression
 from classiq.interface.generator.functions.port_declaration import (
@@ -21,7 +20,10 @@ from classiq.interface.model.port_declaration import AnonPortDeclaration
 from classiq.interface.model.quantum_function_declaration import (
     QuantumFunctionDeclaration,
 )
-from classiq.interface.model.quantum_lambda_function import QuantumOperand
+from classiq.interface.model.quantum_lambda_function import (
+    OperandIdentifier,
+    QuantumOperand,
+)
 from classiq.interface.model.quantum_statement import HandleMetadata, QuantumOperation
 
 ArgValue = Union[
@@ -31,11 +33,6 @@ ArgValue = Union[
 ]
 
 
-class OperandIdentifier(ASTNode):
-    name: str
-    index: Expression
-
-
 class QuantumFunctionCall(QuantumOperation):
     kind: Literal["QuantumFunctionCall"]