WIP

Author: GDYendell

pyproject.toml

@@ -60,7 +60,7 @@ name = "Martin Gaughran"
 version_file = "src/fastcs/_version.py"
 
 [tool.pyright]
-typeCheckingMode = "standard"
+typeCheckingMode = "strict"
 reportMissingImports = false # Ignore missing stubs in imported modules
 
 [tool.pytest.ini_options]

src/fastcs/controller.py

@@ -40,7 +40,7 @@ class method and a controller instance, so that it can be called from any
         for attr_name in dir(self):
             attr = getattr(self, attr_name)
             if isinstance(attr, Attribute):
-                setattr(self, attr_name, copy(attr))
+                setattr(self, attr_name, copy(attr))  # type: ignore
             elif isinstance(attr, Put | Scan | Command):
                 setattr(self, attr_name, attr.bind(self))
 

src/fastcs/cs_methods.py

@@ -2,7 +2,7 @@
 from collections.abc import Callable, Coroutine
 from inspect import Signature, getdoc, signature
 from types import MethodType
-from typing import Any, Generic, TypeVar
+from typing import Any, Concatenate, Generic, ParamSpec, TypeVar
 
 from fastcs.controller import BaseController
 
@@ -124,24 +124,21 @@ def __call__(self):
         raise method_not_bound_error
 
 
-class BoundScan(Method[BaseController]):
-    def __init__(self, fn: BoundScanCallback, period: float):
-        super().__init__(fn)
+P = ParamSpec("P")
+R = TypeVar("R")
+
 
+class BoundScan(Method[BaseController], Generic[P]):
+    def __init__(self, fn: Callable[Concatenate[ControllerType, P], R], period: float):
+        self._fn = fn
         self._period = period
 
     @property
     def period(self):
         return self._period
 
-    def _validate(self, fn: BoundScanCallback) -> None:
-        super()._validate(fn)
-
-        if not len(self.parameters) == 0:
-            raise FastCSException("Scan method cannot have arguments")
-
-    def __call__(self):
-        return self._fn()
+    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
+        return self._fn(*args, **kwargs)
 
 
 class BoundPut(Method[BaseController]):