classiq 0.93.0__py3-none-any.whl → 0.99.0__py3-none-any.whl

classiq/_internals/jobs.py

@@ -1,7 +1,7 @@
 import json
 import logging
-from collections.abc import Iterable
-from typing import Callable, Optional, TypeVar
+from collections.abc import Callable, Iterable
+from typing import TypeVar
 
 import httpx
 import pydantic
@@ -37,7 +37,7 @@ def _join_url_path(*parts: str) -> str:
 
 def _general_job_description_parser(
     json_response: JSONObject,
-) -> Optional[GeneralJobDescription]:
+) -> GeneralJobDescription | None:
     job_description = GeneralJobDescription.model_validate(json_response)
     if job_description.status.is_final():
         return job_description
@@ -54,7 +54,7 @@ class JobPoller:
         self,
         base_url: str,
         use_versioned_url: bool = True,
-        additional_headers: Optional[dict[str, str]] = None,
+        additional_headers: dict[str, str] | None = None,
     ) -> None:
         self._additional_headers = additional_headers
         client_instance = client()
@@ -80,7 +80,7 @@ class JobPoller:
         http_client: httpx.AsyncClient,
         http_method: str,
         url: str,
-        body: Optional[dict] = None,
+        body: dict | None = None,
     ) -> httpx.Response:
         return await client().request(
             http_client=http_client,
@@ -111,8 +111,8 @@ class JobPoller:
         self,
         http_client: httpx.AsyncClient,
         poll_url: str,
-        timeout_sec: Optional[float],
-        response_parser: Callable[[JSONObject], Optional[T]] = _general_job_description_parser,  # type: ignore[assignment]
+        timeout_sec: float | None,
+        response_parser: Callable[[JSONObject], T | None] = _general_job_description_parser,  # type: ignore[assignment]
     ) -> T:
         async def poller() -> JSONObject:
             nonlocal self, poll_url
@@ -132,9 +132,9 @@ class JobPoller:
     async def poll(
         self,
         job_id: JobID,
-        timeout_sec: Optional[float],
-        response_parser: Callable[[JSONObject], Optional[T]] = _general_job_description_parser,  # type: ignore[assignment]
-        http_client: Optional[httpx.AsyncClient] = None,
+        timeout_sec: float | None,
+        response_parser: Callable[[JSONObject], T | None] = _general_job_description_parser,  # type: ignore[assignment]
+        http_client: httpx.AsyncClient | None = None,
     ) -> T:
         poll_url = self._make_poll_url(job_id=job_id)
         async with client().use_client_or_create(http_client) as async_client:
@@ -153,8 +153,8 @@ class JobPoller:
     async def run(
         self,
         body: dict,
-        timeout_sec: Optional[float],
-        http_client: Optional[httpx.AsyncClient] = None,
+        timeout_sec: float | None,
+        http_client: httpx.AsyncClient | None = None,
     ) -> GeneralJobDescription:
         async with client().use_client_or_create(http_client) as async_client:
             submit_response = await self._submit(http_client=async_client, body=body)
@@ -173,8 +173,8 @@ class JobPoller:
     async def run_pydantic(
         self,
         model: pydantic.BaseModel,
-        timeout_sec: Optional[float],
-        http_client: Optional[httpx.AsyncClient] = None,
+        timeout_sec: float | None,
+        http_client: httpx.AsyncClient | None = None,
     ) -> GeneralJobDescription:
         # TODO: we can't use model.dict() - it doesn't serialize complex class.
         # This was added because JSON serializer doesn't serialize complex and UUID,

classiq/_internals/type_validation.py

@@ -1,4 +1,4 @@
-from typing import Any, TypeVar, Union, overload
+from typing import Any, TypeVar, overload
 
 T = TypeVar("T")
 U = TypeVar("U")
@@ -20,7 +20,7 @@ def validate_type(
     expected_type: tuple[type[T], type[U]],
     operation: str,
     exception_type: type[Exception],
-) -> Union[T, U]: ...
+) -> T | U: ...
 
 
 @overload
@@ -34,7 +34,7 @@ def validate_type(
 
 def validate_type(
     obj: Any,
-    expected_type: Union[tuple[type, ...], type],
+    expected_type: tuple[type, ...] | type,
     operation: str,
     exception_type: type[Exception],
 ) -> Any:

classiq/analyzer/analyzer.py

@@ -4,9 +4,7 @@ import json
 import webbrowser
 from collections.abc import Sequence
 from importlib.util import find_spec
-from typing import Any, Optional, Union
-
-import plotly.graph_objects as go
+from typing import TYPE_CHECKING, Optional
 
 from classiq.interface.analyzer import analysis_params
 from classiq.interface.backend.quantum_backend_providers import AnalyzerProviderVendor
@@ -21,12 +19,12 @@ from classiq.analyzer.analyzer_utilities import (
     ProviderNameEnum,
 )
 
-find_ipywidgets = find_spec("ipywidgets")
-VBox = Any
+if TYPE_CHECKING:
+    import plotly.graph_objects as go
+    from ipywidgets import VBox  # type: ignore[import]
 
+find_ipywidgets = find_spec("ipywidgets")
 if find_ipywidgets is not None:
-    from ipywidgets import VBox  # type: ignore[import, no-redef]
-
     from classiq._analyzer_extras.interactive_hardware import InteractiveHardware
 
 
@@ -53,7 +51,7 @@ class Analyzer(AnalyzerUtilities):
             hardware_graphs=dict(),
         )
 
-        self.hardware_comparison_table: Optional[go.Figure] = None
+        self.hardware_comparison_table: Optional["go.Figure"] = None
 
         self.transpilation_params = analysis_params.AnalysisHardwareTranspilationParams(
             hardware_data=self.circuit.hardware_data,
@@ -62,7 +60,7 @@ class Analyzer(AnalyzerUtilities):
         )
 
     def get_available_devices(
-        self, providers: Optional[list[ProviderNameEnum]] = None
+        self, providers: list[ProviderNameEnum] | None = None
     ) -> dict[ProviderNameEnum, list[DeviceName]]:
         """Deprecated. Use get_all_hardware_devices instead.
 
@@ -85,9 +83,9 @@ class Analyzer(AnalyzerUtilities):
 
     def plot_hardware_connectivity(
         self,
-        provider: Optional[ProviderNameEnum] = None,
-        device: Optional[DeviceName] = None,
-    ) -> VBox:
+        provider: ProviderNameEnum | None = None,
+        device: DeviceName | None = None,
+    ) -> "VBox":
         """plot the hardware_connectivity graph. It is required to required  install the
         analyzer_sdk extra.
 
@@ -115,8 +113,8 @@ class Analyzer(AnalyzerUtilities):
 
     def get_hardware_comparison_table(
         self,
-        providers: Optional[Sequence[Union[str, AnalyzerProviderVendor]]] = None,
-        devices: Optional[list[str]] = None,
+        providers: Sequence[str | AnalyzerProviderVendor] | None = None,
+        devices: list[str] | None = None,
     ) -> None:
         """create a comparison table between the transpiled circuits result on different hardware.
         The  comparison table included the depth, multi qubit gates count,and total gates count of the circuits.
@@ -129,6 +127,8 @@ class Analyzer(AnalyzerUtilities):
         Returns:
             None.
         """
+        import plotly.graph_objects as go
+
         if providers is None:
             providers = list(AnalyzerProviderVendor)
         params = analysis_params.AnalysisHardwareListParams(
@@ -142,8 +142,8 @@ class Analyzer(AnalyzerUtilities):
 
     def plot_hardware_comparison_table(
         self,
-        providers: Optional[list[Union[str, AnalyzerProviderVendor]]] = None,
-        devices: Optional[list[str]] = None,
+        providers: list[str | AnalyzerProviderVendor] | None = None,
+        devices: list[str] | None = None,
     ) -> None:
         """plot the comparison table. if it has not been created it, it first creates the table using all the
         available hardware.
@@ -156,8 +156,8 @@ class Analyzer(AnalyzerUtilities):
 
     def _hardware_comparison_condition(
         self,
-        providers: Optional[Sequence[Union[str, AnalyzerProviderVendor]]] = None,
-        devices: Optional[list[str]] = None,
+        providers: Sequence[str | AnalyzerProviderVendor] | None = None,
+        devices: list[str] | None = None,
     ) -> None:
         if (
             providers is not None

classiq/analyzer/rb.py

@@ -1,10 +1,7 @@
 from enum import Enum as PythonEnum
-from typing import Optional, Union
+from typing import TYPE_CHECKING, Optional
 
-import matplotlib.pyplot as plt
 import numpy as np
-import pandas as pd
-import plotly.graph_objects as go
 
 from classiq.interface.analyzer.analysis_params import AnalysisRBParams
 from classiq.interface.analyzer.result import RbResults
@@ -13,6 +10,11 @@ from classiq.interface.exceptions import ClassiqAnalyzerError
 from classiq._internals.api_wrapper import ApiWrapper
 from classiq.executor import BackendPreferencesAndResult
 
+if TYPE_CHECKING:
+    import matplotlib.pyplot as plt
+    import pandas as pd
+    import plotly.graph_objects as go
+
 
 class RBAnalysis:
     def __init__(self, experiments_data: list[AnalysisRBParams]) -> None:
@@ -21,6 +23,7 @@ class RBAnalysis:
         Args:
             experiments_data: List of results from varius RB experiments.
         """
+        import pandas as pd
 
         self.experiments_data = experiments_data
         self._total_results: pd.DataFrame = pd.DataFrame()
@@ -43,12 +46,14 @@ class RBAnalysis:
         _, rb_result_keys = temp_res.popitem()
         return list(rb_result_keys.__dict__.keys())
 
-    async def show_multiple_hardware_data_async(self) -> pd.DataFrame:
+    async def show_multiple_hardware_data_async(self) -> "pd.DataFrame":
         """Run the RB analysis.
 
         Returns:
             The RB result.
         """
+        import pandas as pd
+
         results = await self._get_multiple_hardware_results_async()
         indices = RBAnalysis._get_df_indices(results)
         result_df = pd.DataFrame(index=indices)
@@ -57,12 +62,14 @@ class RBAnalysis:
         self._total_results = result_df
         return result_df
 
-    def plot_multiple_hardware_results(self) -> go.Figure:
+    def plot_multiple_hardware_results(self) -> "go.Figure":
         """Plot Bar graph of the results.
 
         Returns:
             None.
         """
+        import plotly.graph_objects as go
+
         df = self._total_results.loc[["mean_fidelity", "average_error"]].transpose()
         hardware = list(df.index)
         params = list(df.columns)
@@ -78,7 +85,7 @@ class RBAnalysis:
         return fig
 
 
-def _strict_string(arg: Union[PythonEnum, str]) -> str:
+def _strict_string(arg: PythonEnum | str) -> str:
     if isinstance(arg, PythonEnum):
         return arg.value
     return arg
@@ -110,8 +117,10 @@ def order_executor_data_by_hardware(
 
 
 def fit_to_exponential_function(
-    result: RbResults, num_clifford: list[int], ax: Optional[plt.Axes] = None
+    result: RbResults, num_clifford: list[int], ax: Optional["plt.Axes"] = None
 ) -> None:
+    import matplotlib.pyplot as plt
+
     if ax is None:
         plt.figure()
         ax = plt.gca()

classiq/analyzer/show_interactive_hack.py

@@ -122,7 +122,7 @@ async def handle_remote_app(circuit: QuantumProgram, display_url: bool = True) -
             "for QASM programs. Try adding QASM to the output formats "
             "synthesis preferences"
         )
-    circuit_dataid = await ApiWrapper.call_analyzer_app(circuit)
+    circuit_dataid = DataID(id=circuit.program_id)
 
     renderer = get_visualization_renderer()
     if display_url:

classiq/applications/__init__.py

@@ -1,6 +1,6 @@
-from classiq.applications import chemistry, combinatorial_optimization, qsp, qsvm
+from classiq.applications import chemistry, combinatorial_optimization, qsp
 
-__all__ = ["chemistry", "combinatorial_optimization", "qsp", "qsvm"]
+__all__ = ["chemistry", "combinatorial_optimization", "qsp"]
 
 
 _NON_IMPORTED_PUBLIC_SUBMODULES = ["qnn"]

classiq/applications/chemistry/__init__.py

@@ -1,38 +1,8 @@
-from classiq.interface.chemistry.fermionic_operator import (
-    FermionicOperator,
-    SummedFermionicOperator,
-)
-from classiq.interface.chemistry.ground_state_problem import (
-    GroundStateProblem,
-    HamiltonianProblem,
-    MoleculeProblem,
-)
-from classiq.interface.chemistry.molecule import Molecule
 from classiq.interface.chemistry.operator import PauliOperator, PauliOperators
 
-from . import ground_state_problem
-from .ansatz_parameters import HEAParameters, HVAParameters, UCCParameters
-from .chemistry_execution_parameters import ChemistryExecutionParameters
-from .chemistry_model_constructor import (
-    construct_chemistry_model,
-    molecule_problem_to_qmod,
-)
-
 __all__ = [
-    "ChemistryExecutionParameters",
-    "FermionicOperator",
-    "GroundStateProblem",
-    "HEAParameters",
-    "HVAParameters",
-    "HamiltonianProblem",
-    "Molecule",
-    "MoleculeProblem",
     "PauliOperator",
     "PauliOperators",
-    "SummedFermionicOperator",
-    "UCCParameters",
-    "construct_chemistry_model",
-    "molecule_problem_to_qmod",
 ]
 
 

classiq/applications/chemistry/op_utils.py

@@ -1,4 +1,4 @@
-from typing import Optional, cast
+from typing import cast
 
 import numpy as np
 from openfermion.ops.operators.qubit_operator import QubitOperator
@@ -10,7 +10,7 @@ from classiq.qmod.builtins.enums import Pauli
 from classiq.qmod.builtins.structs import IndexedPauli, SparsePauliOp, SparsePauliTerm
 
 
-def _get_n_qubits(qubit_op: QubitOperator, n_qubits: Optional[int]) -> int:
+def _get_n_qubits(qubit_op: QubitOperator, n_qubits: int | None) -> int:
     min_n_qubits = cast(int, count_qubits(qubit_op))
     if n_qubits is None:
         return min_n_qubits
@@ -23,7 +23,7 @@ def _get_n_qubits(qubit_op: QubitOperator, n_qubits: Optional[int]) -> int:
 
 
 def qubit_op_to_pauli_terms(
-    qubit_op: QubitOperator, n_qubits: Optional[int] = None
+    qubit_op: QubitOperator, n_qubits: int | None = None
 ) -> SparsePauliOp:
     n_qubits = _get_n_qubits(qubit_op, n_qubits)
     return SparsePauliOp(
@@ -49,7 +49,7 @@ _XZ_TO_PAULIS = {(0, 0): "I", (1, 0): "X", (0, 1): "Z", (1, 1): "Y"}
 
 
 def qubit_op_to_xz_matrix(
-    qubit_op: QubitOperator, n_qubits: Optional[int] = None
+    qubit_op: QubitOperator, n_qubits: int | None = None
 ) -> np.ndarray:
     n_qubits = _get_n_qubits(qubit_op, n_qubits)
     xz_mat = np.zeros((len(qubit_op.terms), 2 * n_qubits), dtype=np.int8)

classiq/applications/chemistry/problems.py

@@ -1,5 +1,5 @@
 from collections.abc import Sequence
-from typing import Optional, cast
+from typing import cast
 
 from openfermion import MolecularData
 from openfermion.ops import FermionOperator
@@ -31,7 +31,7 @@ class FermionHamiltonianProblem:
         self,
         fermion_hamiltonian: FermionOperator,
         n_particles: tuple[int, int],
-        n_orbitals: Optional[int] = None,
+        n_orbitals: int | None = None,
     ) -> None:
         """
         Initializes a `FermionHamiltonianProblem` from the fermion hamiltonian, number
@@ -115,7 +115,7 @@ class FermionHamiltonianProblem:
         cls,
         molecule: MolecularData,
         first_active_index: int = 0,
-        remove_orbitlas: Optional[Sequence[int]] = None,
+        remove_orbitlas: Sequence[int] | None = None,
         op_compression_tol: float = 1e-13,
     ) -> "FermionHamiltonianProblem":
         """

classiq/applications/chemistry/ucc.py

@@ -1,7 +1,6 @@
 from collections.abc import Sequence
 from itertools import chain, combinations, product
 from math import factorial
-from typing import Union
 
 from openfermion.ops.operators.fermion_operator import FermionOperator
 from openfermion.ops.operators.qubit_operator import QubitOperator
@@ -17,7 +16,7 @@ from classiq.qmod.builtins.structs import (
 def get_ucc_hamiltonians(
     problem: FermionHamiltonianProblem,
     mapper: FermionToQubitMapper,
-    excitations: Union[int, Sequence[int]],
+    excitations: int | Sequence[int],
 ) -> list[SparsePauliOp]:
     """
     Computes the UCC hamiltonians of the given problem in the desired excitations,

classiq/applications/chemistry/z2_symmetries.py

@@ -1,6 +1,6 @@
 from collections.abc import Sequence
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 from openfermion.ops.operators.fermion_operator import FermionOperator
@@ -38,7 +38,7 @@ class Z2SymTaperMapper(FermionToQubitMapper):
         generators: Sequence[QubitOperator],
         x_ops: Sequence[QubitOperator],
         method: MappingMethod = MappingMethod.JORDAN_WIGNER,
-        sector: Optional[Sequence[int]] = None,
+        sector: Sequence[int] | None = None,
         tol: float = 1e-14,
     ) -> None:
         """
@@ -192,7 +192,7 @@ class Z2SymTaperMapper(FermionToQubitMapper):
         generators = _get_z2_symmetries_generators(qubit_op, n_qubits)
         x_ops = _get_x_ops_for_generators(generators, n_qubits)
 
-        sector: Optional[list[int]] = None
+        sector: list[int] | None = None
         if sector_from_hartree_fock:
             from classiq.applications.chemistry.hartree_fock import get_hf_state
 
@@ -252,7 +252,7 @@ def _get_x_ops_for_generators(
         # we look for a column in the Z-part of the matrix which is populated only with
         # 0s except for a 1 in the current generator: a X operation in this column's
         # qubit will anti-commute with the current generator and commute with all others
-        found_col: Optional[int] = None
+        found_col: int | None = None
         for col in range(n_qubits):
             if (
                 generators[row, n_qubits + col] == 1

classiq/applications/combinatorial_helpers/allowed_constraints.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from sympy import Add, Expr, LessThan, Symbol
 
 from classiq.interface.combinatorial_optimization.encoding_types import EncodingType
@@ -8,7 +6,7 @@ _INEQUALITY_UPPER_LIMIT = 1
 
 
 def is_constraint_sum_less_than_one(
-    expression: Expr, encoding_type: Optional[EncodingType] = None
+    expression: Expr, encoding_type: EncodingType | None = None
 ) -> bool:
     # tests the case: x_1 + ... + x_n <= 1
     return (

classiq/applications/combinatorial_helpers/arithmetic/arithmetic_expression.py

@@ -2,7 +2,6 @@ from typing import Any
 
 import sympy
 from pyomo.core.expr.sympy_tools import PyomoSympyBimap
-from scipy.optimize import differential_evolution
 from sympy import Expr
 
 from classiq.applications.combinatorial_helpers import encoding_utils
@@ -17,6 +16,8 @@ def sympy_lambdify(*args: Any, **kwargs: Any) -> Any:
 def multivariate_extremum(
     expr: Expr, symbols_map: PyomoSympyBimap, is_min: bool
 ) -> float:
+    from scipy.optimize import differential_evolution
+
     if expr.is_number:
         return float(expr)
 

classiq/applications/combinatorial_helpers/combinatorial_problem_utils.py

@@ -1,6 +1,6 @@
 import itertools
+from collections.abc import Callable
 from functools import partial
-from typing import Callable, Union
 
 import numpy as np
 import pyomo.environ as pyo
@@ -96,7 +96,7 @@ def _decode_vector_str(
     )  # reverse qubit order
 
 
-def _evaluate_operator(operator: SparsePauliOp, state: Union[list[int], str]) -> float:
+def _evaluate_operator(operator: SparsePauliOp, state: list[int] | str) -> float:
     if isinstance(state, list):
         state = "".join([str(x) for x in state])
 

classiq/applications/combinatorial_helpers/encoding_mapping.py

@@ -1,6 +1,5 @@
 import itertools
 from dataclasses import dataclass, field
-from typing import Optional, Union
 
 import pyomo.environ as pyo
 from pyomo.core.base.var import VarData
@@ -47,7 +46,7 @@ class EncodingMapping:
         self,
         original_var: VarData,
         encoding_expr: pyo.Expression,
-        encodings_vars: Union[list[VarData], None] = None,
+        encodings_vars: list[VarData] | None = None,
     ) -> None:
         if encodings_vars is None:
             encodings_vars = list(identify_variables(encoding_expr))
@@ -73,7 +72,7 @@ class EncodingMapping:
     def get_encoding_vars(self, original_var: VarData) -> list[VarData]:
         return self.get_var_expr_mapping(original_var).encodings_vars
 
-    def get_original_var(self, encoding_var: VarData) -> Optional[VarData]:
+    def get_original_var(self, encoding_var: VarData) -> VarData | None:
         for original_var in self.original_vars:
             if pyomo_utils.contains(encoding_var, self.get_encoding_vars(original_var)):
                 return original_var

classiq/applications/combinatorial_helpers/encoding_utils.py

@@ -1,6 +1,6 @@
 import math
 from itertools import filterfalse
-from typing import Any, Union, cast
+from typing import Any, cast
 
 import numpy as np
 import pyomo.environ as pyo
@@ -97,7 +97,7 @@ def encode_constraints(
 
 def deal_with_trivial_boolean_constraint(
     constraint: _ComponentBase,
-    constraint_expression: Union[bool, Expr],
+    constraint_expression: bool | Expr,
     model: pyo.ConcreteModel,
 ) -> None:
     # using '==' on purpose since comparing against sympy's True

classiq/applications/combinatorial_helpers/optimization_model.py

@@ -1,7 +1,6 @@
 import copy
 from functools import cached_property
 from itertools import filterfalse
-from typing import Optional, Union
 
 import pyomo.environ as pyo
 import sympy
@@ -49,8 +48,8 @@ class OptimizationModel:
         self,
         model: ConcreteModel,
         qsolver: QSolver,
-        penalty_energy: Optional[float],
-        encoding_type: Optional[EncodingType] = None,
+        penalty_energy: float | None,
+        encoding_type: EncodingType | None = None,
     ) -> None:
         assert model.nobjectives() == 1, "model must have a single objective"
         model_copy = copy.deepcopy(model)
@@ -130,7 +129,7 @@ class OptimizationModel:
 
     def _get_penalty_term(
         self, constraints: list[_GeneralConstraintData]
-    ) -> Union[int, Expression]:
+    ) -> int | Expression:
         normalized_penalty_term = penalty.get_penalty_expression(constraints)
         return self.penalty_energy * normalized_penalty_term * self.sign
 

classiq/applications/combinatorial_helpers/pauli_helpers/pauli_sparsing.py

@@ -1,4 +1,4 @@
-from typing import Any, Union
+from typing import Any
 
 import numpy as np
 
@@ -23,7 +23,7 @@ class SparsePauliOp:
         new_coeffs = np.concatenate([self.coeffs, other.coeffs])
         return SparsePauliOp(new_paulis, new_coeffs)
 
-    def __mul__(self, other: Union[int, float, complex]) -> "SparsePauliOp":
+    def __mul__(self, other: int | float | complex) -> "SparsePauliOp":
         """Scalar multiplication of a SparsePauliOp."""
         if not isinstance(other, (int, float, complex)):
             raise ValueError("Can only multiply by scalar values.")

classiq/applications/combinatorial_helpers/pyomo_utils.py

@@ -8,7 +8,7 @@ from enum import Enum
 from functools import reduce
 from operator import mul
 from types import CodeType
-from typing import Any, Optional, TypeVar, Union
+from typing import Any, TypeVar
 
 import pydantic
 import pyomo.core.expr.numeric_expr as pyo_expr
@@ -132,7 +132,7 @@ def _delete_element_by_value(dict_: dict, value: Any) -> None:
             del dict_[k]
 
 
-def get_name(component: Union[IndexedComponent, ComponentData]) -> str:
+def get_name(component: IndexedComponent | ComponentData) -> str:
     if isinstance(component, IndexedComponent):
         return component._name  # constraint.name returns "'{name}'"
     else:
@@ -141,8 +141,8 @@ def get_name(component: Union[IndexedComponent, ComponentData]) -> str:
 
 class FixedSympy2PyomoVisitor(Sympy2PyomoVisitor):
     def beforeChild(  # noqa: N802
-        self, node: Optional[sympy.Expr], child: sympy.Expr, child_idx: Optional[int]
-    ) -> tuple[bool, Union[int, float, None]]:
+        self, node: sympy.Expr | None, child: sympy.Expr, child_idx: int | None
+    ) -> tuple[bool, int | float | None]:
         if not child._args:
             item = self.object_map.getPyomoSymbol(child, None)
             if item is None:
@@ -300,7 +300,7 @@ def _get_array_sizes(vars: list[VarData]) -> dict[str, tuple[int, ...]]:
 
 def _get_indices_dimensions(
     indices: set[tuple[int, ...]], *, strict: bool
-) -> Optional[tuple[int, ...]]:
+) -> tuple[int, ...] | None:
     indices_list = list(indices)
     if len(indices) == 0:
         return None
@@ -365,7 +365,7 @@ def _get_qmod_field_type(var_name: str, var_data: VarData) -> type[QVar]:
 
 
 def evaluate_objective(
-    var_mapping: dict[Any, Union[str, tuple[str, tuple[int, ...]]]],
+    var_mapping: dict[Any, str | tuple[str, tuple[int, ...]]],
     sympy_expr: sympy.Expr,
     code_expr: CodeType,
     struct_obj: Any,
@@ -411,7 +411,7 @@ def is_index_var(var: VarData) -> bool:
     )
 
 
-def index_as_tuple(index: Union[int, tuple[int, ...]]) -> tuple[int, ...]:
+def index_as_tuple(index: int | tuple[int, ...]) -> tuple[int, ...]:
     if isinstance(index, int):
         return (index,)
     return index
@@ -435,7 +435,7 @@ def add_var_domain_constraints(model: ConcreteModel) -> Iterator[None]:
     model.del_component("var_domain_constraints")
 
 
-def _get_var_domain_constraint(var: VarData) -> Optional[ExpressionBase]:
+def _get_var_domain_constraint(var: VarData) -> ExpressionBase | None:
     bounds = var.bounds
     if (
         type(bounds) is not tuple

classiq/applications/combinatorial_helpers/sympy_utils.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import pyomo.core as pyo
 from pyomo.core.base.var import VarData
 from pyomo.core.expr.sympy_tools import Pyomo2SympyVisitor, PyomoSympyBimap
@@ -14,7 +12,7 @@ def sympyify_vars(variables: list[VarData]) -> PyomoSympyBimap:
 
 
 def sympyify_expression(
-    expression: pyo.Expression, symbols_map: Optional[PyomoSympyBimap] = None
+    expression: pyo.Expression, symbols_map: PyomoSympyBimap | None = None
 ) -> Expr:
     if symbols_map is None:
         symbols_map = PyomoSympyBimap()