feat: Improve typing of decorators (#121)

integration/test_properties.py

@@ -2,6 +2,7 @@
 
 
 from datetime import datetime
+from typing import OrderedDict
 
 from pytket import Circuit
 
@@ -64,21 +65,25 @@ def test_property_creation_and_filtering(
         circuit=my_circ,
         name=circuit_name,
         project=my_new_project,
-        properties={
-            test_property_name_1: True,
-            test_property_name_2: "test_string",
-            test_property_name_3: 42,
-            test_property_name_4: 3.15,
-        },
+        properties=OrderedDict(
+            {
+                test_property_name_1: True,
+                test_property_name_2: "test_string",
+                test_property_name_3: 42,
+                test_property_name_4: 3.15,
+            }
+        ),
     )
 
     qnx.circuits.upload(
         circuit=my_circ,
         name=circuit_name,
         project=my_new_project,
-        properties={
-            test_property_name_1: False,
-        },
+        properties=OrderedDict(
+            {
+                test_property_name_1: False,
+            }
+        ),
     )
 
     my_circuit_refs = qnx.circuits.get_all(

qnexus/context.py

@@ -4,7 +4,7 @@
 from contextlib import contextmanager
 from contextvars import ContextVar, Token
 from functools import wraps
-from typing import Callable
+from typing import Callable, ParamSpec, TypeVar
 
 from qnexus.models.annotations import PropertiesDict
 from qnexus.models.references import ProjectRef
@@ -142,7 +142,11 @@ def using_properties(**properties: int | float | str | bool):
         _QNEXUS_PROPERTIES.reset(token)
 
 
-def merge_project_from_context(func: Callable):
+P = ParamSpec("P")
+T = TypeVar("T")
+
+
+def merge_project_from_context(func: Callable[P, T]) -> Callable[P, T]:
     """Decorator to merge a project from the context.
     ProjectRef in kwargs takes precedence (will be selected)."""
 
@@ -156,7 +160,7 @@ def get_project_from_context(*args, **kwargs):
     return get_project_from_context
 
 
-def merge_properties_from_context(func: Callable):
+def merge_properties_from_context(func: Callable[P, T]) -> Callable[P, T]:
     """Decorator to take the union of properties from the context with
     any provided in kwargs. Properties in kwargs take precendence."""