Merge branch 'main' into CalMacCQ-patch-1

Author: CalMacCQ

docs/changelog.md

@@ -4,11 +4,12 @@
 
 # Changelog
 
-## 0.40.0rc0 (November 2024)
+## 0.40.0rc0 (Unreleased)
 
 - Update pytket-qir version requirement to 0.17.
 - Updated pytket version requirement to 1.34.
 - Updated pytket-pecos version requirement to 0.1.31.
+- Allow circuits containing `OpType.ClExpr` operations.
 
 
 ## 0.39.0 (November 2024)

pytket/extensions/quantinuum/backends/api_wrappers.py

@@ -22,7 +22,7 @@
 import json
 import time
 from http import HTTPStatus
-from typing import Optional
+from typing import Any, Optional, cast
 
 import nest_asyncio  # type: ignore
 from requests import Session
@@ -513,6 +513,20 @@ def get_calendar(self, start_date: str, end_date: str) -> list[dict[str, str]]:
         jr: list[dict[str, str]] = res.json()
         return jr
 
+    def get_machine_list(self) -> list[dict[str, Any]]:
+        """Returns a given list of the available machines
+        :return: list of machines
+        """
+        id_token = self.login()
+        res = self.session.get(
+            f"{self.url}machine/?config=true",
+            headers={"Authorization": id_token},
+        )
+        self._response_check(res, "get machine list")
+        jr = res.json()
+
+        return cast(list[dict[str, Any]], jr)
+
 
 OFFLINE_MACHINE_LIST = [
     {
@@ -616,8 +630,8 @@ def __init__(self, machine_list: Optional[list] = None):
         self._cred_store = None
         self.submitted: list = []
 
-    def _get_machine_list(self) -> Optional[list]:
-        """returns the given list of the avilable machines
+    def get_machine_list(self) -> list[dict[str, Any]]:
+        """Returns a given list of the available machines
         :return: list of machines
         """
 

pytket/extensions/quantinuum/backends/quantinuum.py

@@ -113,6 +113,7 @@
     OpType.SetBits,
     OpType.CopyBits,
     OpType.ClassicalExpBox,
+    OpType.ClExpr,
     OpType.WASM,
 }
 
@@ -365,17 +366,7 @@ def _available_devices(
         :param api_handler: Instance of API handler
         :return: Dictionaries of machine name and number of qubits.
         """
-        id_token = api_handler.login()
-        if api_handler.online:
-            res = requests.get(
-                f"{api_handler.url}machine/?config=true",
-                headers={"Authorization": id_token},
-            )
-            api_handler._response_check(res, "get machine list")
-            jr = res.json()
-        else:
-            jr = api_handler._get_machine_list()  # type: ignore
-        return jr  # type: ignore
+        return api_handler.get_machine_list()
 
     @classmethod
     def _dict_to_backendinfo(