chore: Simplify pytket import path

docs/source/examples/example_workers/qsci_worker/tkr_qsci_worker_impl/impl.py

@@ -3,7 +3,7 @@
 from typing import NamedTuple, cast
 
 import numpy as np
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.backends.backendresult import BackendResult
 from pytket.circuit import Qubit
 from pytket.pauli import QubitPauliString

docs/source/examples/example_workers/qsci_worker/tkr_qsci_worker_impl/qsci/state_prep.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 from numpy.typing import NDArray
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.circuit import PauliExpBox, Qubit
 from pytket.extensions.qiskit.backends.aer import AerStateBackend
 from pytket.pauli import Pauli, QubitPauliString

docs/source/examples/example_workers/qsci_worker/tkr_qsci_worker_impl/qsci/utils.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 from numpy.typing import NDArray
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.circuit import PauliExpBox
 from pytket.pauli import Pauli
 from pytket.utils.operators import QubitPauliOperator

docs/source/examples/example_workers/substitution_worker/tkr_substitution_worker_impl/impl.py

@@ -1,6 +1,6 @@
 import logging
 
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from sympy import Symbol
 
 from tierkreis import Worker

docs/source/examples/hamiltonian.ipynb

@@ -28,7 +28,7 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from pytket._tket.circuit import Circuit, fresh_symbol\n",
+        "from pytket import Circuit, fresh_symbol\n",
         "\n",
         "\n",
         "def build_ansatz() -> Circuit:\n",
@@ -81,7 +81,7 @@
         "    b: TKR[float]\n",
         "    c: TKR[float]\n",
         "    ham: TKR[list[tuple[Literal[\"pytket._tket.pauli.QubitPauliString\"], float]]]\n",
-        "    ansatz: TKR[Literal[\"pytket._tket.circuit.Circuit\"]]\n",
+        "    ansatz: TKR[Literal[\"pytket.Circuit\"]]\n",
         "\n",
         "\n",
         "simulation_graph = GraphBuilder(SymbolicExecutionInputs, TKR[float])\n",
@@ -119,7 +119,7 @@
         "\n",
         "\n",
         "class SubmitInputs(NamedTuple):\n",
-        "    circuit: TKR[Literal[\"pytket._tket.circuit.Circuit\"]]\n",
+        "    circuit: TKR[Literal[\"pytket.Circuit\"]]\n",
         "    pauli_string: TKR[Literal[\"pytket._tket.pauli.QubitPauliString\"]]\n",
         "    n_shots: TKR[int]\n",
         "\n",

docs/source/examples/hpc.ipynb

@@ -40,7 +40,7 @@
         "    a: TKR[float]\n",
         "    b: TKR[float]\n",
         "    c: TKR[float]\n",
-        "    ansatz: TKR[OpaqueType[\"pytket._tket.circuit.Circuit\"]]  # noqa: F821\n",
+        "    ansatz: TKR[OpaqueType[\"pytket.Circuit\"]]  # noqa: F821\n",
         "\n",
         "\n",
         "class SymbolicCircuitsOutputs(NamedTuple):\n",
@@ -107,7 +107,7 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from pytket._tket.circuit import Circuit, fresh_symbol\n",
+        "from pytket import Circuit, fresh_symbol\n",
         "\n",
         "\n",
         "def build_ansatz() -> Circuit:\n",

docs/source/examples/parallelism.ipynb

@@ -48,7 +48,7 @@
         ")\n",
         "\n",
         "type BackendResult = OpaqueType[\"pytket.backends.backendresult.BackendResult\"]  # noqa: F821\n",
-        "type Circuit = OpaqueType[\"pytket._tket.circuit.Circuit\"]  # noqa: F821\n",
+        "type Circuit = OpaqueType[\"pytket.Circuit\"]  # noqa: F821\n",
         "\n",
         "\n",
         "class SimulateJobInputsSingle(NamedTuple):\n",

docs/source/examples/qsci.ipynb

@@ -101,7 +101,7 @@
     "    perform_state_preparation,\n",
     ")\n",
     "from example_workers.qsci_worker.tkr_qsci_worker_impl.qsci.utils import rhf2ghf\n",
-    "from pytket._tket.circuit import Circuit\n",
+    "from pytket import Circuit\n",
     "from pytket.pauli import QubitPauliString\n",
     "from pytket.utils.operators import CoeffTypeAccepted, QubitPauliOperator\n",
     "\n",
@@ -349,11 +349,11 @@
     "\n",
     "\n",
     "def _compile_and_run() -> GraphBuilder[\n",
-    "    TKR[OpaqueType[\"pytket._tket.circuit.Circuit\"]],  # noqa: F821\n",
+    "    TKR[OpaqueType[\"pytket.Circuit\"]],  # noqa: F821\n",
     "    TKR[OpaqueType[\"pytket.backends.backendresult.BackendResult\"]],  # noqa: F821\n",
     "]:\n",
     "    g = GraphBuilder(\n",
-    "        TKR[OpaqueType[\"pytket._tket.circuit.Circuit\"]],\n",
+    "        TKR[OpaqueType[\"pytket.Circuit\"]],\n",
     "        TKR[OpaqueType[\"pytket.backends.backendresult.BackendResult\"]],\n",
     "    )\n",
     "\n",

docs/source/examples/storage_and_executors.ipynb

@@ -35,7 +35,7 @@
    "source": [
     "from tierkreis.controller.data.models import OpaqueType\n",
     "\n",
-    "Circuit = OpaqueType[\"pytket._tket.circuit.Circuit\"]\n",
+    "Circuit = OpaqueType[\"pytket.Circuit\"]\n",
     "BackendResult = OpaqueType[\"pytket.backends.backendresult.BackendResult\"]"
    ]
   },

docs/source/examples/types_and_defaults.ipynb

@@ -42,7 +42,7 @@
     "\n",
     "\n",
     "class IBMInput(NamedTuple):\n",
-    "    circuit: TKR[OpaqueType[\"pytket._tket.circuit.Circuit\"]]  # noqa: F821\n",
+    "    circuit: TKR[OpaqueType[\"pytket.Circuit\"]]  # noqa: F821\n",
     "    n_shots: TKR[int]\n",
     "\n",
     "\n",
@@ -102,7 +102,7 @@
    "source": [
     "from uuid import UUID\n",
     "\n",
-    "from pytket._tket.circuit import Circuit\n",
+    "from pytket import Circuit\n",
     "\n",
     "from tierkreis.consts import PACKAGE_PATH\n",
     "from tierkreis.controller import run_graph\n",
@@ -158,7 +158,7 @@
    "outputs": [],
    "source": [
     "class IBMInputOptional(NamedTuple):\n",
-    "    circuit: TKR[OpaqueType[\"pytket._tket.circuit.Circuit\"]]  # noqa: F821\n",
+    "    circuit: TKR[OpaqueType[\"pytket.Circuit\"]]  # noqa: F821\n",
     "    n_shots: TKR[int]\n",
     "    optimisation_level: TKR[int] | None = None  # Optional input\n",
     "\n",

docs/source/worker/complex_types.md

@@ -118,13 +118,13 @@ The stub generation process does not provide any introspection for these types b
 For instance if one wants to use a `pytket` `Circuit` as an input or an output then the resulting type will look as follows:
 
 ```python
-TKR[OpaqueType["pytket._tket.circuit.Circuit"]]
+TKR[OpaqueType["pytket.Circuit"]]
 ```
 
 and a list of `Circuit`s would be typed as:
 
 ```python
-TKR[list[OpaqueType["pytket._tket.circuit.Circuit"]]]
+TKR[list[OpaqueType["pytket.Circuit"]]]
 ```
 
 ## Pydantic BaseModels

docs/source/worker/native_workers/ibmq_worker.md

@@ -37,7 +37,7 @@ The full api is available in the {py:mod}`API Docs <ibmq_worker>`.
 
 ```python
 class IBMQInput(NamedTuple):
-    circuit: TKR[OpaqueType["pytket._tket.circuit.Circuit"]]  # noqa: F821
+    circuit: TKR[OpaqueType["pytket.Circuit"]]  # noqa: F821
     n_shots: TKR[int]
     backend: TKR[str]
 

docs/source/worker/native_workers/pytket_worker.md

@@ -60,7 +60,7 @@ For debugging purposes this also showcases how to use the `InMemoryExecutor` whi
 
 ```python
 class IBMInput(NamedTuple):
-    circuit: TKR[OpaqueType["pytket._tket.circuit.Circuit"]]  # noqa: F821
+    circuit: TKR[OpaqueType["pytket.Circuit"]]  # noqa: F821
     n_shots: TKR[int]
     backend: TKR[str]
 

docs/source/worker/native_workers/quantinuum_worker.md

@@ -38,7 +38,7 @@ The full api is available in the {py:mod}`API Docs <quantinuum_worker>`.
 
 ```python
 class QuantinuumInput(NamedTuple):
-    circuit: TKR[OpaqueType["pytket._tket.circuit.Circuit"]]  # noqa: F821
+    circuit: TKR[OpaqueType["pytket.Circuit"]]  # noqa: F821
     n_shots: TKR[int]
     backend: TKR[str]
 

tierkreis_workers/aer_worker/tkr_aer_worker_impl/impl.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Any
 
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.backends.backendresult import BackendResult
 from pytket.extensions.qiskit.backends.aer import AerBackend
 from pytket.extensions.qiskit.qiskit_convert import tk_to_qiskit

tierkreis_workers/ibmq_worker/tkr_ibmq_worker_impl/impl.py

@@ -1,6 +1,6 @@
 from collections.abc import Sequence
 
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.architecture import Architecture
 from pytket.backends.backendinfo import BackendInfo
 from pytket.backends.backendresult import BackendResult

tierkreis_workers/nexus_worker/tkr_nexus_worker_impl/impl.py

@@ -4,7 +4,7 @@
 from time import sleep
 
 import qnexus as qnx
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.backends.backendresult import BackendResult
 from pytket.backends.status import StatusEnum
 from qnexus import BackendConfig

tierkreis_workers/pytket_worker/tkr_pytket_worker_impl/compile_circuit.py

@@ -2,7 +2,7 @@
 from enum import Enum, auto
 from typing import assert_never
 
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.architecture import Architecture, FullyConnected
 from pytket.circuit import OpType
 from pytket.mapping import LexiLabellingMethod, LexiRouteRoutingMethod

tierkreis_workers/pytket_worker/tkr_pytket_worker_impl/impl.py

@@ -1,7 +1,7 @@
 from collections import Counter
 
 import qnexus as qnx
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket._tket.unit_id import Bit
 from pytket.backends.backendinfo import BackendInfo
 from pytket.backends.backendresult import BackendResult

tierkreis_workers/pytket_worker/tkr_pytket_worker_impl/test_main.py

@@ -1,4 +1,4 @@
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket._tket.unit_id import Bit
 from pytket.backends.backendresult import BackendResult
 from pytket.extensions.qiskit.backends.aer import AerBackend

tierkreis_workers/quantinuum_worker/tkr_quantinuum_worker_impl/impl.py

@@ -1,7 +1,7 @@
 import time
 
 import qnexus as qnx
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.backends.backendinfo import BackendInfo
 from pytket.backends.backendresult import BackendResult
 from pytket.extensions.quantinuum.backends.quantinuum import QuantinuumBackend

tierkreis_workers/qulacs_worker/tkr_qulacs_worker_impl/impl.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from pytket._tket.circuit import Circuit
+from pytket import Circuit
 from pytket.backends.backend import Backend
 from pytket.backends.backendresult import BackendResult
 from pytket.extensions.qulacs.backends.qulacs_backend import QulacsBackend