Albrja/mic-6086/mypy-cli_options (#266)

Albrja/mic-6086/mypy-cli_options

Fix mypy errors in psimulate/cluster/cli_options.py
- *Category*: Type-hinting
- *JIRA issue*: https://jira.ihme.washington.edu/browse/MIC-6086

Author: albrja

CHANGELOG.rst

@@ -1,3 +1,7 @@
+**2.1.14 - 06/16/25**
+
+  - Type-hinting: Fix mypy errors in psimulate/cluster/cli_options.py
+
 **2.1.13 - 06/11/25**
 
   - Type-hinting: Fix mypy errors in utilities.py

pyproject.toml

@@ -31,7 +31,6 @@ exclude = [
     # You will need to remove the mypy: ignore-errors comment from the file heading as well
     "docs/source/conf.py",
     "setup.py",
-    "src/vivarium_cluster_tools/psimulate/cluster/cli_options.py",
     "src/vivarium_cluster_tools/psimulate/cluster/interface.py",
     "src/vivarium_cluster_tools/psimulate/redis_dbs/launcher.py",
     "src/vivarium_cluster_tools/psimulate/redis_dbs/registry.py",
@@ -61,5 +60,5 @@ disable_error_code = []
 
 # handle mypy errors when 3rd party packages are not typed.
 [[tool.mypy.overrides]]
-module = ["drmaa"]
+module = ["drmaa", "requests"]
 ignore_missing_imports = true

src/vivarium_cluster_tools/psimulate/cluster/cli_options.py

@@ -1,4 +1,3 @@
-# mypy: ignore-errors
 """
 ===================
 Cluster CLI options
@@ -7,6 +6,10 @@
 Command line options for configuring the cluster environment in psimulate runs.
 
 """
+from __future__ import annotations
+
+from collections.abc import Callable
+
 import click
 
 _RUNTIME_FORMAT = "hh:mm:ss"
@@ -26,8 +29,8 @@
 
 
 def _validate_and_split_hardware(
-    ctx: click.Context, param: click.core.Option, value: str | None
-) -> list[str | None]:
+    ctx: click.Context, param: click.Parameter, value: str | None
+) -> list[str]:
     hardware = value.split(",") if value else []
     bad_requests = set(hardware) - set(_AVAILABLE_HARDWARE)
     if bad_requests:
@@ -54,7 +57,7 @@ def _validate_and_split_hardware(
 )
 
 
-def with_queue_and_max_runtime(func):
+def with_queue_and_max_runtime(func: Callable[..., str]) -> Callable[..., str]:
     """Provide a single decorator for both queue and max runtime
     since they are tightly coupled.
 
@@ -91,7 +94,9 @@ def with_queue_and_max_runtime(func):
 )
 
 
-def _queue_and_runtime_callback(ctx: click.Context, param: str, value: str) -> str:
+def _queue_and_runtime_callback(
+    ctx: click.Context, param: click.Parameter, value: str
+) -> str:
     if param.name == "queue" and "max_runtime" in ctx.params:
         runtime_string, queue = _validate_runtime_and_queue(ctx.params["max_runtime"], value)
         ctx.params["max_runtime"], value = runtime_string, queue
@@ -103,7 +108,7 @@ def _queue_and_runtime_callback(ctx: click.Context, param: str, value: str) -> s
     return value
 
 
-def _validate_runtime_and_queue(runtime_string: str, queue: str):
+def _validate_runtime_and_queue(runtime_string: str, queue: str | None) -> tuple[str, str]:
     try:
         hours, minutes, seconds = runtime_string.split(":")
     except ValueError: