qilisdk 0.1.5__tar.gz → 0.1.6__tar.gz

{qilisdk-0.1.5 → qilisdk-0.1.6}/CHANGELOG.md

@@ -1,3 +1,50 @@
+# qilisdk 0.1.6 (2025-10-31)
+
+## Features
+
+- Added ``job_name`` to speqtrum's ``submit`` method to allow the user to give a custom name to their job. ([PR #86](https://github.com/qilimanjaro-tech/qilisdk/pulls/86))
+- SpeQtrum jobs now retain their concrete result types from submission through retrieval, so every handle produced by `submit` returns the right `FunctionalResult` whether you are sampling, evolving in time, or orchestrating a variational loop. Waiting for a fresh job still takes a single call, but the typed detail that comes back no longer needs manual casting:
+
+  ```python
+  job_handle = speqtrum.submit(Sampling(circuit), device="cuda_state_vector")
+  job = speqtrum.wait_for_job(job_handle)
+  results = job.get_results()  # Your IDE will now know this is a SamplingResult
+  ```
+
+  The same strong typing applies when inspecting historical runs. Recreate a handle with the appropriate class method, pass it to `get_job`, and the returned `TypedJobDetail` exposes the precise payload you expect:
+
+  ```python
+  job_handle = JobHandle.sampling(1200853)
+  job = speqtrum.get_job(job_handle)
+  results = job.get_results()  # Your IDE will now know this is a SamplingResult
+  ```
+
+  Variational programs are the only scenario that needs an extra hint: because they wrap another functional, recreate the handle with the inner functional’s result type so the execution results can be validated against your expectations:
+
+  ```python
+  job_handle = JobHandle.variational_program(1200853, result_type=SamplingResult)
+  job = speqtrum.get_job(job_handle)
+  results = job.get_results()  # Your IDE will now know this is a VariationalProgramResult
+  optimal = results.optimal_execution_results  # Your IDE will now know this is a SamplingResult
+  ```
+
+  Passing a bare integer job identifier to `wait_for_job` or `get_job` remains valid for quick checks and backwards-compatibility, but doing so skips the handle metadata and yields an untyped `JobDetail`, so you will need to inspect or cast the result manually. ([PR #87](https://github.com/qilimanjaro-tech/qilisdk/pulls/87))
+
+## Bugfixes
+
+- Fixed the `HardwareEfficientAnsatz` so the first layer of single-qubit gates is not duplicated, restoring the expected gate and parameter counts. ([PR #90](https://github.com/qilimanjaro-tech/qilisdk/pulls/90))
+- Fixed the scheduler so numpy floats are accepted without errors. Fixed the QuTiP backend by aligning the schedule-to-backend mapping structure. ([PR #91](https://github.com/qilimanjaro-tech/qilisdk/pulls/91))
+
+## Improved Documentation
+
+- Updating the documentation and README to correspond to the latest version of QiliSDK. ([PR #80](https://github.com/qilimanjaro-tech/qilisdk/pulls/80))
+- Added extra doc-strings, and fixed outdated doc-strings. ([PR #84](https://github.com/qilimanjaro-tech/qilisdk/pulls/84))
+
+## Misc
+
+- [PR #88](https://github.com/qilimanjaro-tech/qilisdk/pulls/88), [PR #92](https://github.com/qilimanjaro-tech/qilisdk/pulls/92)
+
+
 # qilisdk 0.1.5 (2025-10-17)
 
 ## Features

{qilisdk-0.1.5 → qilisdk-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qilisdk
-Version: 0.1.5
+Version: 0.1.6
 Summary: QiliSDK is a Python framework for writing digital and analog quantum algorithms and executing them across multiple quantum backends. Its modular design streamlines the development process and enables easy integration with a variety of quantum platforms.
 Project-URL: Homepage, https://github.com/qilimanjaro-tech/qilisdk
 Project-URL: Documentation, https://qilimanjaro-tech.github.io/qilisdk/
@@ -29,11 +29,11 @@ Requires-Dist: loguru>=0.7.3
 Requires-Dist: matplotlib>=3.10.7
 Requires-Dist: numpy>=1.26.4
 Requires-Dist: pydantic-settings>=2.11.0
-Requires-Dist: pydantic>=2.12.2
-Requires-Dist: ruamel-yaml>=0.18.15
+Requires-Dist: pydantic>=2.12.3
+Requires-Dist: ruamel-yaml>=0.18.16
 Requires-Dist: scipy>=1.15.3
 Provides-Extra: cuda
-Requires-Dist: cuda-quantum-cu12==0.12.0; extra == 'cuda'
+Requires-Dist: cuda-quantum-cu12==0.12.0.post1; extra == 'cuda'
 Provides-Extra: qutip
 Requires-Dist: qutip-qip>=0.4.1; extra == 'qutip'
 Requires-Dist: qutip>=5.2.1; extra == 'qutip'
@@ -58,15 +58,15 @@ Description-Content-Type: text/markdown
   - [Table of Contents](#table-of-contents)
   - [Installation](#installation)
     - [Base Installation](#base-installation)
-    - [Optional Extras](#optional-extras)
+    - [Optional Dependencies: speqtrum, cuda, qutip](#optional-dependencies-speqtrum-cuda-qutip)
   - [Usage](#usage)
     - [Digital Quantum Circuits](#digital-quantum-circuits)
-    - [Hamiltonian and Analog Operations](#hamiltonian-and-analog-operations)
+    - [Hamiltonians](#hamiltonians)
     - [Optimizers](#optimizers)
-    - [Quantum-as-a-Service (QaaS)](#quantum-as-a-service-qaas)
-    - [CUDA-Accelerated Simulation](#cuda-accelerated-simulation)
-    - [Time Evolution](#time-evolution)
-    - [Variational Quantum Eigensolver (VQE)](#variational-quantum-eigensolver-vqe)
+    - [Qilimanjaro SpeQtrum](#qilimanjaro-speqtrum)
+    - [Sample a quantum Circuit Using a CUDA-Accelerated Simulator](#sample-a-quantum-circuit-using-a-cuda-accelerated-simulator)
+    - [Time Evolution using Qutip](#time-evolution-using-qutip)
+    - [Variational Programs](#variational-programs)
     - [Open QASM Serialization](#open-qasm-serialization)
     - [YAML Serialization](#yaml-serialization)
   - [Development](#development)
@@ -94,7 +94,7 @@ Install the core QiliSDK package using pip:
 pip install qilisdk
 ```
 
-### Optional Dependencies
+### Optional Dependencies: speqtrum, cuda, qutip
 
 QiliSDK supports optional modules for additional functionality:
 
@@ -197,7 +197,7 @@ print("Optimal cost:", result.optimal_cost)
 print("Optimal Parameters:", result.optimal_parameters)
 ```
 
-### SpeQtrum
+### Qilimanjaro SpeQtrum
 
 QiliSDK includes a client for interacting with Qilimanjaro's SpeQtrum platform. This module supports secure login and a unified interface for both digital circuits and analog evolutions:
 
@@ -215,8 +215,8 @@ client = SpeQtrum()
 # # Execute a pre-built circuit (see Digital Quantum Circuits section)
 job_id = client.submit(Sampling(circuit, 1000), device="cuda_state_vector")
 print("job id:", job_id)
-print("job status:", client.get_job_details(job_id).status)
-print("job result:", client.get_job_details(job_id).result)
+print("job status:", client.get_job(job_id).status)
+print("job result:", client.get_job(job_id).result)
 ```
 
 ### Sample a quantum Circuit Using a CUDA-Accelerated Simulator
@@ -246,7 +246,7 @@ For analog simulations, the new `TimeEvolution` and `Schedule` classes allow you
 ```python
 import numpy as np
 from qilisdk.analog import Schedule, X, Z, Y
-from qilisdk.common import ket, tensor_prod
+from qilisdk.core import ket, tensor_prod
 from qilisdk.backends import QutipBackend
 from qilisdk.functionals import TimeEvolution
 
@@ -299,8 +299,8 @@ Here you find an example of building a Variational Quantum Eigensolver (VQE). To
 ```python
 from qilisdk.digital.gates import U2, CNOT
 from qilisdk.optimizers import SciPyOptimizer
-from qilisdk.common.model import Model
-from qilisdk.common.variables import LEQ, BinaryVariable
+from qilisdk.core.model import Model
+from qilisdk.core.variables import LEQ, BinaryVariable
 from qilisdk.digital.ansatz import HardwareEfficientAnsatz
 from qilisdk.functionals import VariationalProgram, Sampling
 from qilisdk.backends import CudaBackend

{qilisdk-0.1.5 → qilisdk-0.1.6}/README.md

@@ -13,15 +13,15 @@
   - [Table of Contents](#table-of-contents)
   - [Installation](#installation)
     - [Base Installation](#base-installation)
-    - [Optional Extras](#optional-extras)
+    - [Optional Dependencies: speqtrum, cuda, qutip](#optional-dependencies-speqtrum-cuda-qutip)
   - [Usage](#usage)
     - [Digital Quantum Circuits](#digital-quantum-circuits)
-    - [Hamiltonian and Analog Operations](#hamiltonian-and-analog-operations)
+    - [Hamiltonians](#hamiltonians)
     - [Optimizers](#optimizers)
-    - [Quantum-as-a-Service (QaaS)](#quantum-as-a-service-qaas)
-    - [CUDA-Accelerated Simulation](#cuda-accelerated-simulation)
-    - [Time Evolution](#time-evolution)
-    - [Variational Quantum Eigensolver (VQE)](#variational-quantum-eigensolver-vqe)
+    - [Qilimanjaro SpeQtrum](#qilimanjaro-speqtrum)
+    - [Sample a quantum Circuit Using a CUDA-Accelerated Simulator](#sample-a-quantum-circuit-using-a-cuda-accelerated-simulator)
+    - [Time Evolution using Qutip](#time-evolution-using-qutip)
+    - [Variational Programs](#variational-programs)
     - [Open QASM Serialization](#open-qasm-serialization)
     - [YAML Serialization](#yaml-serialization)
   - [Development](#development)
@@ -49,7 +49,7 @@ Install the core QiliSDK package using pip:
 pip install qilisdk
 ```
 
-### Optional Dependencies
+### Optional Dependencies: speqtrum, cuda, qutip
 
 QiliSDK supports optional modules for additional functionality:
 
@@ -152,7 +152,7 @@ print("Optimal cost:", result.optimal_cost)
 print("Optimal Parameters:", result.optimal_parameters)
 ```
 
-### SpeQtrum
+### Qilimanjaro SpeQtrum
 
 QiliSDK includes a client for interacting with Qilimanjaro's SpeQtrum platform. This module supports secure login and a unified interface for both digital circuits and analog evolutions:
 
@@ -170,8 +170,8 @@ client = SpeQtrum()
 # # Execute a pre-built circuit (see Digital Quantum Circuits section)
 job_id = client.submit(Sampling(circuit, 1000), device="cuda_state_vector")
 print("job id:", job_id)
-print("job status:", client.get_job_details(job_id).status)
-print("job result:", client.get_job_details(job_id).result)
+print("job status:", client.get_job(job_id).status)
+print("job result:", client.get_job(job_id).result)
 ```
 
 ### Sample a quantum Circuit Using a CUDA-Accelerated Simulator
@@ -201,7 +201,7 @@ For analog simulations, the new `TimeEvolution` and `Schedule` classes allow you
 ```python
 import numpy as np
 from qilisdk.analog import Schedule, X, Z, Y
-from qilisdk.common import ket, tensor_prod
+from qilisdk.core import ket, tensor_prod
 from qilisdk.backends import QutipBackend
 from qilisdk.functionals import TimeEvolution
 
@@ -254,8 +254,8 @@ Here you find an example of building a Variational Quantum Eigensolver (VQE). To
 ```python
 from qilisdk.digital.gates import U2, CNOT
 from qilisdk.optimizers import SciPyOptimizer
-from qilisdk.common.model import Model
-from qilisdk.common.variables import LEQ, BinaryVariable
+from qilisdk.core.model import Model
+from qilisdk.core.variables import LEQ, BinaryVariable
 from qilisdk.digital.ansatz import HardwareEfficientAnsatz
 from qilisdk.functionals import VariationalProgram, Sampling
 from qilisdk.backends import CudaBackend

{qilisdk-0.1.5 → qilisdk-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qilisdk"
-version = "0.1.5"
+version = "0.1.6"
 description = "QiliSDK is a Python framework for writing digital and analog quantum algorithms and executing them across multiple quantum backends. Its modular design streamlines the development process and enables easy integration with a variety of quantum platforms."
 readme = "README.md"
 authors = [{name = "Qilimanjaro Quantum Tech", email = "info@qilimanjaro.tech"}]
@@ -25,9 +25,9 @@ classifiers = [
 dependencies = [
     "dill>=0.3.9",
     "numpy>=1.26.4",
-    "ruamel-yaml>=0.18.15",
+    "ruamel-yaml>=0.18.16",
     "scipy>=1.15.3",
-    "pydantic>=2.12.2",
+    "pydantic>=2.12.3",
     "pydantic-settings>=2.11.0",
     "loguru>=0.7.3",
     "matplotlib>=3.10.7",
@@ -35,7 +35,7 @@ dependencies = [
 
 [project.optional-dependencies]
 cuda = [
-    "cuda-quantum-cu12==0.12.0",
+    "cuda-quantum-cu12==0.12.0.post1",
 ]
 speqtrum = [
     "httpx>=0.28.1",
@@ -49,13 +49,13 @@ qutip = [
 
 [dependency-groups]
 dev = [
-    "hypothesis>=6.142.1",
+    "hypothesis>=6.142.3",
     "ipykernel>=7.0.1",
     "mypy>=1.18.2",
     "pre-commit>=4.3.0",
     "pytest>=8.4.2",
     "pytest-sugar>=1.1.1",
-    "ruff>=0.14.1",
+    "ruff>=0.14.2",
     "towncrier>=25.8.0",
     "loguru-caplog>=0.2.0",
     "pytest-cov>=7.0.0",

{qilisdk-0.1.5 → qilisdk-0.1.6}/src/qilisdk/analog/hamiltonian.py

@@ -24,9 +24,9 @@ from typing import TYPE_CHECKING, Callable, ClassVar
 import numpy as np
 from scipy.sparse import csr_matrix, identity, kron, spmatrix
 
-from qilisdk.common.parameterizable import Parameterizable
-from qilisdk.common.qtensor import QTensor
-from qilisdk.common.variables import BaseVariable, Parameter, Term
+from qilisdk.core.parameterizable import Parameterizable
+from qilisdk.core.qtensor import QTensor
+from qilisdk.core.variables import BaseVariable, Parameter, Term
 from qilisdk.yaml import yaml
 
 from .exceptions import InvalidHamiltonianOperation

{qilisdk-0.1.5 → qilisdk-0.1.6}/src/qilisdk/analog/linear_schedule.py

@@ -15,7 +15,7 @@ from __future__ import annotations
 
 from qilisdk.analog.hamiltonian import Hamiltonian
 from qilisdk.analog.schedule import Schedule
-from qilisdk.common.variables import Number, Parameter, Term
+from qilisdk.core.variables import Number, Parameter, Term
 from qilisdk.yaml import yaml
 
 
@@ -85,7 +85,9 @@ class LinearSchedule(Schedule):
         if next_idx is None or prev_idx is None or prev_expr is None or next_expr is None:
             raise ValueError("Something unexpected happened while retrieving the coefficient.")
         alpha: float = (t - prev_idx) / (next_idx - prev_idx)
-        return (1 - alpha) * prev_expr + alpha * next_expr
+        e1 = next_expr * alpha
+        e2 = prev_expr * (1 - alpha)
+        return e1 + e2
 
     def get_coefficient(self, time_step: float, hamiltonian_key: str) -> Number:
         """
@@ -98,6 +100,7 @@ class LinearSchedule(Schedule):
         Returns:
             Number: Evaluated coefficient value.
         """
+        time_step = float(time_step)
         val = self.get_coefficient_expression(time_step=time_step, hamiltonian_key=hamiltonian_key)
         return val.evaluate({}) if isinstance(val, Term) else (val.evaluate() if isinstance(val, Parameter) else val)
 

{qilisdk-0.1.5 → qilisdk-0.1.6}/src/qilisdk/analog/schedule.py

@@ -18,8 +18,8 @@ from typing import Callable
 from loguru import logger
 
 from qilisdk.analog.hamiltonian import Hamiltonian
-from qilisdk.common.parameterizable import Parameterizable
-from qilisdk.common.variables import BaseVariable, Number, Parameter, Term
+from qilisdk.core.parameterizable import Parameterizable
+from qilisdk.core.variables import BaseVariable, Number, Parameter, Term
 from qilisdk.utils.visualization import ScheduleStyle
 from qilisdk.yaml import yaml
 
@@ -110,7 +110,7 @@ class Schedule(Parameterizable):
                                 f"The schedule can only contain Parameters, but a generic variable was provided ({time_step})"
                             )
                         self._parameters[v.label] = v
-                if isinstance(coeff, BaseVariable):
+                elif isinstance(coeff, BaseVariable):
                     if not isinstance(coeff, Parameter):
                         raise ValueError(
                             f"The schedule can only contain Parameters, but a generic variable was provided ({time_step})"
@@ -256,12 +256,12 @@ class Schedule(Parameterizable):
         self._hamiltonians[label] = hamiltonian
         self._schedule[0][label] = 0
         self._nqubits = max(self._nqubits, hamiltonian.nqubits)
-        for l, param in hamiltonian.parameters.items():
+        for _, param in hamiltonian.parameters.items():
             self._parameters[param.label] = param
 
         if schedule is not None:
             for t in range(int(self.T / self.dt)):
-                time_step = schedule(t, **kwargs)
+                time_step = schedule(float(t), **kwargs)
                 if isinstance(time_step, Term):
                     for v in time_step.variables():
                         if not isinstance(v, Parameter):
@@ -422,6 +422,7 @@ class Schedule(Parameterizable):
         Returns:
             Number: The coefficient of the Hamiltonian at the specified time, or 0 if not defined.
         """
+        time_step = float(time_step)
         val = self.get_coefficient_expression(time_step=time_step, hamiltonian_key=hamiltonian_key)
         return val.evaluate({}) if isinstance(val, Term) else (val.evaluate() if isinstance(val, Parameter) else val)
 
@@ -502,3 +503,5 @@ class Schedule(Parameterizable):
         renderer.plot()
         if filepath:
             renderer.save(filepath)
+        else:
+            renderer.show()

{qilisdk-0.1.5 → qilisdk-0.1.6}/src/qilisdk/backends/cuda_backend.py

@@ -24,7 +24,7 @@ from loguru import logger
 
 from qilisdk.analog.hamiltonian import Hamiltonian, PauliI, PauliOperator, PauliX, PauliY, PauliZ
 from qilisdk.backends.backend import Backend
-from qilisdk.common.qtensor import QTensor
+from qilisdk.core.qtensor import QTensor
 from qilisdk.digital.exceptions import UnsupportedGateError
 from qilisdk.digital.gates import RX, RY, RZ, SWAP, U1, U2, U3, Adjoint, BasicGate, Controlled, H, I, M, S, T, X, Y, Z
 from qilisdk.functionals.sampling_result import SamplingResult

{qilisdk-0.1.5 → qilisdk-0.1.6}/src/qilisdk/backends/qutip_backend.py

@@ -25,7 +25,7 @@ from qutip_qip.operations.gateclass import SingleQubitGate, is_qutip5
 
 from qilisdk.analog.hamiltonian import Hamiltonian, PauliI, PauliOperator
 from qilisdk.backends.backend import Backend
-from qilisdk.common.qtensor import QTensor, tensor_prod
+from qilisdk.core.qtensor import QTensor, tensor_prod
 from qilisdk.digital import RX, RY, RZ, SWAP, U1, U2, U3, Circuit, H, I, M, S, T, X, Y, Z
 from qilisdk.digital.exceptions import UnsupportedGateError
 from qilisdk.digital.gates import Adjoint, BasicGate, Controlled
@@ -33,7 +33,6 @@ from qilisdk.functionals.sampling_result import SamplingResult
 from qilisdk.functionals.time_evolution_result import TimeEvolutionResult
 
 if TYPE_CHECKING:
-    from qilisdk.common.variables import Number
     from qilisdk.functionals.sampling import Sampling
     from qilisdk.functionals.time_evolution import TimeEvolution
 
@@ -183,28 +182,10 @@ class QutipBackend(Backend):
                 )
             )
 
-        def get_hamiltonian_schedule(
-            hamiltonian: str, dt: float, schedule: dict[int, dict[str, Number]], T: float
-        ) -> Callable:
-            def get_coeff(t: float) -> Number:
-                if int(t / dt) in schedule:
-                    return schedule[int(t / dt)][hamiltonian]
-                time_step = int(t / dt)
-                while time_step > 0:
-                    time_step -= 1
-                    if time_step in schedule:
-                        return schedule[time_step][hamiltonian]
-                return 0
-
-            return get_coeff
-            # return lambda t: schedule[int(t / dt)][ham] if int(t / dt) < int(T / dt) else schedule[int(T / dt)][ham]
-
         H_t = [
             [
                 qutip_hamiltonians[i],
-                get_hamiltonian_schedule(
-                    h, functional.schedule.dt, functional.schedule.schedule, functional.schedule.T
-                ),
+                np.array([functional.schedule.get_coefficient(t, h) for t in tlist]),
             ]
             for i, h in enumerate(functional.schedule.hamiltonians)
         ]

{qilisdk-0.1.5/src/qilisdk/common → qilisdk-0.1.6/src/qilisdk/core}/model.py

@@ -103,8 +103,8 @@ class Constraint:
     Example:
         .. code-block:: python
 
-            from qilisdk.common.model import Constraint
-            from qilisdk.common.variables import BinaryVariable, LEQ
+            from qilisdk.core.model import Constraint
+            from qilisdk.core.variables import BinaryVariable, LEQ
 
             x = BinaryVariable("x")
             constraint = Constraint("limit", LEQ(x, 1))
@@ -195,8 +195,8 @@ class Objective:
     Example:
         .. code-block:: python
 
-            from qilisdk.common.model import Objective, ObjectiveSense
-            from qilisdk.common.variables import BinaryVariable
+            from qilisdk.core.model import Objective, ObjectiveSense
+            from qilisdk.core.variables import BinaryVariable
 
             x = BinaryVariable("x")
             obj = Objective("profit", 3 * x, sense=ObjectiveSense.MAXIMIZE)
@@ -275,7 +275,7 @@ class Model:
     Example:
         .. code-block:: python
 
-            from qilisdk.common import BinaryVariable, LEQ, Model
+            from qilisdk.core import BinaryVariable, LEQ, Model
 
             num_items = 4
             values = [1, 3, 5, 2]
@@ -517,8 +517,8 @@ class QUBO(Model):
     Example:
         .. code-block:: python
 
-            from qilisdk.common.model import QUBO
-            from qilisdk.common.variables import BinaryVariable
+            from qilisdk.core.model import QUBO
+            from qilisdk.core.variables import BinaryVariable
 
             x0, x1 = BinaryVariable("x0"), BinaryVariable("x1")
             qubo = QUBO("Example")

{qilisdk-0.1.5/src/qilisdk/common → qilisdk-0.1.6/src/qilisdk/core}/qtensor.py

@@ -66,7 +66,7 @@ class QTensor:
         .. code-block:: python
 
             import numpy as np
-            from qilisdk.common import QTensor
+            from qilisdk.core import QTensor
 
             ket = QTensor(np.array([[1.0], [0.0]]))
             density = ket * ket.adjoint()

{qilisdk-0.1.5/src/qilisdk/common → qilisdk-0.1.6/src/qilisdk/core}/variables.py

@@ -23,7 +23,7 @@ from typing import TYPE_CHECKING, Iterator, Mapping, Sequence, TypeVar
 import numpy as np
 from loguru import logger
 
-from qilisdk.common.exceptions import EvaluationError, InvalidBoundsError, NotSupportedOperation, OutOfBoundsException
+from qilisdk.core.exceptions import EvaluationError, InvalidBoundsError, NotSupportedOperation, OutOfBoundsException
 from qilisdk.yaml import yaml
 
 if TYPE_CHECKING:
@@ -890,6 +890,9 @@ class BaseVariable(ABC):
         if isinstance(other, Term):
             return other + self
 
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return Term(elements=[self, other], operation=Operation.ADD)
 
     __radd__ = __add__
@@ -901,6 +904,9 @@ class BaseVariable(ABC):
         if isinstance(other, Term):
             return other * self
 
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return Term(elements=[self, other], operation=Operation.MUL)
 
     def __rmul__(self, other: Number | BaseVariable | Term) -> Term:
@@ -909,6 +915,9 @@ class BaseVariable(ABC):
         if isinstance(other, Term):
             return other * self
 
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return Term(elements=[other, self], operation=Operation.MUL)
 
     __imul__ = __mul__
@@ -916,11 +925,19 @@ class BaseVariable(ABC):
     def __sub__(self, other: Number | BaseVariable | Term) -> Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return self + -1 * other
 
     def __rsub__(self, other: Number | BaseVariable | Term) -> Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return -1 * self + other
 
     __isub__ = __sub__
@@ -935,6 +952,8 @@ class BaseVariable(ABC):
         if other == 0:
             raise ValueError("Division by zero is not allowed")
 
+        if isinstance(other, np.generic):
+            other = other.item()
         other = 1 / other
         return self * other
 
@@ -979,7 +998,7 @@ class BinaryVariable(BaseVariable):
     Example:
         .. code-block:: python
 
-            from qilisdk.common.variables import BinaryVariable
+            from qilisdk.core.variables import BinaryVariable
 
             x = BinaryVariable("x")
     """
@@ -1048,7 +1067,7 @@ class Variable(BaseVariable):
     Example:
         .. code-block:: python
 
-            from qilisdk.common.variables import Domain, Variable
+            from qilisdk.core.variables import Domain, Variable
 
             price = Variable("price", domain=Domain.REAL, bounds=(0, 10))
             binary_term = price.to_binary()
@@ -1183,7 +1202,7 @@ class Parameter(BaseVariable):
     Example:
         .. code-block:: python
 
-            from qilisdk.common.variables import Parameter
+            from qilisdk.core.variables import Parameter
 
             theta = Parameter("theta", value=0.5)
             theta.set_value(0.75)
@@ -1665,6 +1684,10 @@ class Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
         out = self.to_list() if self.operation == Operation.ADD else [copy.copy(self)]
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         out.append(other)
         return Term(out, Operation.ADD)
 
@@ -1674,6 +1697,9 @@ class Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
         out = self.to_list() if self.operation == Operation.ADD else [copy.copy(self)]
+
+        if isinstance(other, np.generic):
+            other = other.item()
         out.insert(0, other)
         return Term(out, Operation.ADD)
 
@@ -1683,6 +1709,10 @@ class Term:
         out = self.to_list() if self.operation == Operation.MUL else [copy.copy(self)]
         if len(out) == 0:
             out = [0]
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         out.append(other)
         return Term(out, Operation.MUL)._unfold_parentheses()
 
@@ -1694,6 +1724,10 @@ class Term:
         out = self.to_list() if self.operation == Operation.MUL else [copy.copy(self)]
         if len(out) == 0:
             out = [0]
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         out.insert(0, other)
         return Term(out, Operation.MUL)._unfold_parentheses()
 
@@ -1703,6 +1737,10 @@ class Term:
     def __sub__(self, other: Number | BaseVariable | Term) -> Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return self + -1 * other
 
     def __rsub__(self, other: Number | BaseVariable | Term) -> Term:

{qilisdk-0.1.5 → qilisdk-0.1.6}/src/qilisdk/cost_functions/cost_function.py

@@ -21,7 +21,7 @@ from qilisdk.functionals.sampling_result import SamplingResult
 from qilisdk.functionals.time_evolution_result import TimeEvolutionResult
 
 if TYPE_CHECKING:
-    from qilisdk.common.variables import Number
+    from qilisdk.core.variables import Number
 
 TResult = TypeVar("TResult", bound=FunctionalResult)
 

{qilisdk-0.1.5 → qilisdk-0.1.6}/src/qilisdk/cost_functions/model_cost_function.py

@@ -17,24 +17,24 @@ from typing import TYPE_CHECKING
 
 import numpy as np
 
-from qilisdk.common.model import QUBO, Model
-from qilisdk.common.qtensor import QTensor, expect_val, ket
+from qilisdk.core.model import QUBO, Model
+from qilisdk.core.qtensor import QTensor, expect_val, ket
 from qilisdk.cost_functions.cost_function import CostFunction
 
 if TYPE_CHECKING:
-    from qilisdk.common.variables import Number
+    from qilisdk.core.variables import Number
     from qilisdk.functionals.sampling_result import SamplingResult
     from qilisdk.functionals.time_evolution_result import TimeEvolutionResult
 
 
 class ModelCostFunction(CostFunction):
     """
-    Evaluate the cost of functional results with respect to a :class:`~qilisdk.common.model.Model`.
+    Evaluate the cost of functional results with respect to a :class:`~qilisdk.core.model.Model`.
 
     Example:
         .. code-block:: python
 
-            from qilisdk.common import BinaryVariable, Model, LEQ
+            from qilisdk.core import BinaryVariable, Model, LEQ
             from qilisdk.cost_functions import ModelCostFunction
 
             model = Model("demo")

{qilisdk-0.1.5 → qilisdk-0.1.6}/src/qilisdk/cost_functions/observable_cost_function.py

@@ -18,11 +18,11 @@ from typing import TYPE_CHECKING
 import numpy as np
 
 from qilisdk.analog.hamiltonian import Hamiltonian, PauliOperator
-from qilisdk.common.qtensor import QTensor, expect_val, ket, tensor_prod
+from qilisdk.core.qtensor import QTensor, expect_val, ket, tensor_prod
 from qilisdk.cost_functions.cost_function import CostFunction
 
 if TYPE_CHECKING:
-    from qilisdk.common.variables import Number
+    from qilisdk.core.variables import Number
     from qilisdk.functionals.sampling_result import SamplingResult
     from qilisdk.functionals.time_evolution_result import TimeEvolutionResult