DM-48065 : fix typing

Author: tcjennings

tests/cli/test_others.py

@@ -22,21 +22,21 @@ async def test_others_cli(uvicorn: UvicornProcess, api_version: str) -> None:
     assert len(check) == 0
 
     result = runner.invoke(client_top, "product_set list --output yaml")
-    check = check_and_parse_result(result, list[models.ProductSet])  # type: ignore
-    assert len(check) == 0
+    products = check_and_parse_result(result, list[models.ProductSet])
+    assert len(products) == 0
 
     result = runner.invoke(client_top, "script_dependency list --output yaml")
-    check = check_and_parse_result(result, list[models.Dependency])  # type: ignore
-    assert len(check) == 0
+    dependencies = check_and_parse_result(result, list[models.Dependency])
+    assert len(dependencies) == 0
 
     result = runner.invoke(client_top, "script_error list --output yaml")
-    check = check_and_parse_result(result, list[models.ScriptError])  # type: ignore
-    assert len(check) == 0
+    scripts = check_and_parse_result(result, list[models.ScriptError])
+    assert len(scripts) == 0
 
     result = runner.invoke(client_top, "task_set list --output yaml")
-    check = check_and_parse_result(result, list[models.TaskSet])  # type: ignore
-    assert len(check) == 0
+    tasks = check_and_parse_result(result, list[models.TaskSet])
+    assert len(tasks) == 0
 
     result = runner.invoke(client_top, "wms_task_report list --output yaml")
-    check = check_and_parse_result(result, list[models.WmsTaskReport])  # type: ignore
-    assert len(check) == 0
+    reports = check_and_parse_result(result, list[models.WmsTaskReport])
+    assert len(reports) == 0

tests/cli/util_functions.py

@@ -10,6 +10,7 @@
 from lsst.cmservice.common.enums import LevelEnum, StatusEnum
 
 T = TypeVar("T")
+E = TypeVar("E", models.Group, models.Campaign, models.Step, models.Job)
 
 
 def check_and_parse_result(
@@ -412,15 +413,15 @@ def check_scripts(
 def check_get_methods(
     runner: CliRunner,
     client_top: BaseCommand,
-    entry: models.ElementMixin,
+    entry: E,
     entry_class_name: str,
     entry_class: TypeAlias = models.ElementMixin,
 ) -> None:
     result = runner.invoke(client_top, f"{entry_class_name} get all --output yaml --row_id {entry.id}")
     check_get = check_and_parse_result(result, entry_class)
 
     assert check_get.id == entry.id, "pulled row should be identical"
-    assert check_get.level == entry.level, "pulled row db_id should be identical"  # type: ignore
+    assert check_get.level == entry.level, "pulled row db_id should be identical"
 
     result = runner.invoke(client_top, f"{entry_class_name} get by_name --output yaml --name {entry.name}")
     check_get = check_and_parse_result(result, entry_class)