More mypy fixes

lsst-dm · Oct 24, 2023 · 8303518 · 8303518
1 parent 72c22ae
commit 8303518
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/lsst/cmservice/db/row.py b/src/lsst/cmservice/db/row.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Sequence
+from typing import Any, Sequence, TypeVar
 
 from fastapi import HTTPException
 from sqlalchemy import select
@@ -9,6 +9,8 @@
 
 from ..common.enums import StatusEnum
 
+T = TypeVar("T")
+
 DELETEABLE_STATES = [
     StatusEnum.failed,
     StatusEnum.rejected,
@@ -30,10 +32,10 @@ class RowMixin:
 
     @classmethod
     async def get_rows(
-        cls,
+        cls: type[T],
         session: async_scoped_session,
         **kwargs: Any,
-    ) -> Sequence[RowMixin]:
+    ) -> Sequence[T]:
         """Get rows associated to a particular table
 
         Parameters

diff --git a/src/lsst/cmservice/handlers/elements.py b/src/lsst/cmservice/handlers/elements.py
@@ -165,7 +165,7 @@ async def split(
         parent: ElementMixin,
         **kwargs: Any,
     ) -> AsyncGenerator:
-        raise NotImplementedError()
+        yield
 
 
 class NoSplit(Splitter):

diff --git a/src/lsst/cmservice/handlers/jobs.py b/src/lsst/cmservice/handlers/jobs.py
@@ -184,6 +184,8 @@ def _get_wms_svc(self, **kwargs: Any) -> BaseWmsService:
         if self._wms_svc is None:
             assert self.wms_svc_class_name
             self._wms_svc_class = doImport(self.wms_svc_class_name)
+            if isinstance(self._wms_svc_class, types.ModuleType):
+                raise RuntimeError(f"Site class={self.wms_svc_class_name} is not a BaseWmsService subclass")
             self._wms_svc = self._wms_svc_class(kwargs)
         return self._wms_svc