DM-48063 : fix typing

Author: tcjennings

src/lsst/cmservice/handlers/jobs.py

@@ -68,6 +68,8 @@ async def _write_script(
         parent: ElementMixin,
         **kwargs: Any,
     ) -> StatusEnum:
+        if TYPE_CHECKING:
+            assert isinstance(parent, Job)
         # Database operations
         await session.refresh(parent, attribute_names=["c_"])
         data_dict = await script.data_dict(session)
@@ -90,7 +92,7 @@ async def _write_script(
         # yaml template, NOT the yaml template itself!
         workflow_config: dict[str, Any] = {}
         workflow_config["project"] = "DEFAULT"
-        workflow_config["campaign"] = parent.c_.name  # type: ignore
+        workflow_config["campaign"] = parent.c_.name
         workflow_config["pipeline_yaml"] = pipeline_yaml
         workflow_config["lsst_version"] = lsst_version
         workflow_config["lsst_distrib_dir"] = lsst_distrib_dir
@@ -170,7 +172,7 @@ async def _write_script(
             in_collection = input_colls
 
         payload = {
-            "name": parent.c_.name,  # type: ignore
+            "name": parent.c_.name,
             "butler_config": butler_repo,
             "output_run_collection": run_coll,
             "input_collection": in_collection,
@@ -216,7 +218,9 @@ async def _check_slurm_job(
         if fake_status is not None:
             wms_job_id = "fake_job"
         else:  # pragma: no cover
-            bps_dict = await parse_bps_stdout(script.log_url)  # type: ignore
+            if TYPE_CHECKING:
+                assert script.log_url is not None
+            bps_dict = await parse_bps_stdout(script.log_url)
             wms_job_id = self.get_job_id(bps_dict)
         await parent.update_values(session, wms_job_id=wms_job_id)
         return slurm_status
@@ -243,7 +247,9 @@ async def _check_htcondor_job(
             if fake_status is not None:
                 wms_job_id = "fake_job"
             else:  # pragma: no cover
-                bps_dict = await parse_bps_stdout(script.log_url)  # type: ignore
+                if TYPE_CHECKING:
+                    assert script.log_url is not None
+                bps_dict = await parse_bps_stdout(script.log_url)
                 wms_job_id = self.get_job_id(bps_dict)
             await parent.update_values(session, wms_job_id=wms_job_id)
         return htcondor_status

src/lsst/cmservice/handlers/scripts.py

@@ -2,7 +2,7 @@
 
 import os
 import textwrap
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from anyio import Path
 from sqlalchemy.ext.asyncio import async_scoped_session
@@ -470,6 +470,8 @@ async def _write_script(
         **kwargs: Any,
     ) -> StatusEnum:
         test_type_and_raise(parent, Step, "PrepareStepScriptHandler._write_script parent")
+        if TYPE_CHECKING:
+            assert isinstance(parent, Step)
 
         resolved_cols = await script.resolve_collections(session)
         data_dict = await script.data_dict(session)
@@ -482,7 +484,7 @@ async def _write_script(
 
         prereq_colls: list[str] = []
 
-        all_prereqs = await parent.get_all_prereqs(session)  # type: ignore
+        all_prereqs = await parent.get_all_prereqs(session)
         for prereq_step in all_prereqs:
             prereq_step_colls = await prereq_step.resolve_collections(session)
             prereq_colls.append(prereq_step_colls["step_public_output"])