Address additional type issues; Scope intentional type ignores

Author: tcjennings

src/lsst/cmservice/common/panda.py

@@ -71,7 +71,7 @@ def refresh_panda_token(url: str, data: dict[str, str]) -> str | None:
     os.environ["PANDA_AUTH_ID_TOKEN"] = config.panda.id_token
     # - update token expiry
     decoded_token = decode_id_token(config.panda.id_token)
-    config.panda.token_expiry = float(decoded_token["exp"])  # type: ignore
+    config.panda.token_expiry = float(decoded_token["exp"])  # type: ignore[assignment]
     if TYPE_CHECKING:
         # the validation machinery of the pyantic field handles conversion
         # from float to datetime.
@@ -126,7 +126,7 @@ def get_panda_token() -> str | None:
     try:
         if config.panda.token_expiry is None:
             decoded_token = decode_id_token(config.panda.id_token)
-            config.panda.token_expiry = float(decoded_token["exp"])  # type: ignore
+            config.panda.token_expiry = float(decoded_token["exp"])  # type: ignore[assignment]
         if TYPE_CHECKING:
             # the validation machinery of the pyantic field handles conversion
             # from float to datetime.

src/lsst/cmservice/db/row.py

@@ -83,15 +83,24 @@ async def get_rows(
         parent_class = kwargs.get("parent_class")
 
         q = select(cls)
-        # FIXME: Being a mixin leads to loose typing here.
-        # Is there a better way?
         if hasattr(cls, "parent_id"):
+            # FIXME All of these tests assert that parent_class is not None
+            #       otherwise it would raise an AttributeError; the constraint
+            #       might as well be satisfied by the first id matching without
+            #       also evaluating additional options. If the gimmick is that
+            #       the method can be invoked with one of parent_id, _name, or
+            #       the parent class, it is invalidated by the fact that
+            #       parent_class is used in all three cases, so defining any of
+            #       the others adds no value.
+            if TYPE_CHECKING:
+                assert parent_class is not None
             if parent_class is not None:
-                q = q.where(parent_class.id == cls.parent_id)  # type: ignore
+                parent_id_ = getattr(cls, "parent_id")
+                q = q.where(parent_class.id == parent_id_)
             if parent_name is not None:
-                q = q.where(parent_class.fullname == parent_name)  # type: ignore
+                q = q.where(parent_class.fullname == parent_name)
             if parent_id is not None:
-                q = q.where(parent_class.id == parent_id)  # type: ignore
+                q = q.where(parent_class.id == parent_id)
         q = q.offset(skip).limit(limit)
         results = await session.scalars(q)
         return results.all()

tests/common/test_config.py

@@ -74,7 +74,7 @@ def test_config_datetime() -> None:
         assert config.panda.token_expiry is None
 
     # test validation and coercion on assignment
-    config.panda.token_expiry = 1740147265  # type: ignore
+    config.panda.token_expiry = 1740147265  # type: ignore[assignment]
     assert isinstance(config.panda.token_expiry, datetime)
     assert config.panda.token_expiry.tzinfo is UTC