fix: resolve 27 mypy type errors, fix 3 test failures

Mypy fixes (27 errors → 0):
- Replace datetime.UTC with datetime.timezone.utc (7 occurrences)
- Add explicit type annotations to avoid Returning Any errors (5 files)
- Rename output param to dest in template.py to avoid module shadowing
- Remove stale type: ignore comments (3 occurrences)
- Add ConfigBackend protocol annotation for polymorphic backend vars
- Add explicit Path/str casts for return values

Test fixes (3 failures → 0):
- Move --json flag before subcommand in test_cli_dynamo.py (global flag)
- Add scan_http_port param to fake_probe in test_web_server.py
- Emit JSON error via emit_json() instead of suppressed output.error()

Result: 334/334 tests pass, mypy 0 errors across 32 files

Author: iamh2o

tests/test_cli_dynamo.py

@@ -195,7 +195,7 @@ def test_status_success(self, aws_env):
     def test_status_json(self, aws_env):
         with mock_aws():
             _provision_resources()
-            result = runner.invoke(app, ["dynamo", "status", "--json"])
+            result = runner.invoke(app, ["--json", "dynamo", "status"])
             assert result.exit_code == 0, result.output
             data = json.loads(result.output)
             assert data["table_name"] == "test-zebra-config"
@@ -410,7 +410,7 @@ def test_status_json_no_prompt_fails(self, aws_env, monkeypatch):
         monkeypatch.setattr("zebra_day.cli.dynamo._is_interactive", lambda: True)
         with mock_aws():
             _provision_resources()
-            result = runner.invoke(app, ["dynamo", "status", "--json"])
+            result = runner.invoke(app, ["--json", "dynamo", "status"])
             assert result.exit_code == 1
             assert "ZEBRA_DAY_S3_BACKUP_BUCKET" in result.output
 

tests/test_web_server.py

@@ -585,6 +585,7 @@ def fake_probe(
             lab: str,
             cancel_event=None,
             progress_callback=None,
+            scan_http_port=None,
         ):
             total = 255
             ip = f"{ip_stub}.1"

zebra_day/backends/dynamo.py

@@ -58,9 +58,7 @@ def __init__(
         self.s3_prefix = s3_prefix.rstrip("/") + "/" if s3_prefix else "zebra-day/"
         self.client_id = client_id or f"{platform.node()}.{getpass.getuser()}"
         self.cost_center = cost_center or os.environ.get("LSMC_COST_CENTER", "global")
-        self.project = project or os.environ.get(
-            "LSMC_PROJECT", f"zebra-day+{self.region}"
-        )
+        self.project = project or os.environ.get("LSMC_PROJECT", f"zebra-day+{self.region}")
 
         session_kwargs: dict[str, Any] = {"region_name": self.region}
         if profile:
@@ -80,7 +78,7 @@ def __init__(
     # ------------------------------------------------------------------
 
     @classmethod
-    def from_env(cls, *, allow_missing_bucket: bool = False) -> "DynamoBackend":
+    def from_env(cls, *, allow_missing_bucket: bool = False) -> DynamoBackend:
         """Create a DynamoBackend from environment variables.
 
         Args:
@@ -182,7 +180,11 @@ def check_aws_permissions(self) -> dict[str, Any]:
             code = exc.response["Error"]["Code"]
             if code == "ResourceNotFoundException":
                 result["checks"].append(
-                    {"action": "dynamodb:DescribeTable", "ok": True, "detail": "table not found (will be created)"}
+                    {
+                        "action": "dynamodb:DescribeTable",
+                        "ok": True,
+                        "detail": "table not found (will be created)",
+                    }
                 )
             else:
                 result["checks"].append(
@@ -201,11 +203,19 @@ def check_aws_permissions(self) -> dict[str, Any]:
                 code = exc.response["Error"]["Code"]
                 if code in ("404", "NoSuchBucket"):
                     result["checks"].append(
-                        {"action": "s3:HeadBucket", "ok": True, "detail": "bucket not found (will be created)"}
+                        {
+                            "action": "s3:HeadBucket",
+                            "ok": True,
+                            "detail": "bucket not found (will be created)",
+                        }
                     )
                 elif code == "403":
                     result["checks"].append(
-                        {"action": "s3:HeadBucket", "ok": False, "detail": "access denied — check S3 permissions"}
+                        {
+                            "action": "s3:HeadBucket",
+                            "ok": False,
+                            "detail": "access denied — check S3 permissions",
+                        }
                     )
                     result["all_ok"] = False
                 else:
@@ -288,7 +298,7 @@ def write_meta(self) -> None:
         """Write the META#table_info item (used by `zday dynamo init`)."""
         from zebra_day import __version__
 
-        now = datetime.datetime.now(datetime.UTC).isoformat()
+        now = datetime.datetime.now(datetime.timezone.utc).isoformat()
         self._table.put_item(
             Item={
                 "PK": "META",
@@ -324,12 +334,13 @@ def load_config(self) -> dict:
 
         config_data = item.get("config_data", "{}")
         if isinstance(config_data, str):
-            return json.loads(config_data)
+            result: dict[str, Any] = json.loads(config_data)
+            return result
         return dict(config_data)
 
     def save_config(self, config: dict) -> None:
         """Save the printer configuration to DynamoDB with optimistic locking."""
-        now = datetime.datetime.now(datetime.UTC).isoformat()
+        now = datetime.datetime.now(datetime.timezone.utc).isoformat()
         config_json = json.dumps(config, default=str)
 
         # Get current version
@@ -398,7 +409,7 @@ def list_templates(self) -> list[str]:
     def save_template(self, name: str, zpl_content: str) -> None:
         """Save or overwrite a template in DynamoDB with optimistic locking."""
         stem = self._normalize_stem(name)
-        now = datetime.datetime.now(datetime.UTC).isoformat()
+        now = datetime.datetime.now(datetime.timezone.utc).isoformat()
         current_version = self._get_item_version("TEMPLATE", stem)
         content = str(zpl_content)
 
@@ -451,7 +462,6 @@ def template_exists(self, name: str) -> bool:
         )
         return "Item" in resp
 
-
     # ------------------------------------------------------------------
     # S3 Backup
     # ------------------------------------------------------------------
@@ -460,7 +470,7 @@ def backup_to_s3(self, *, triggered_by: str = "manual", force: bool = False) ->
         """Write a full snapshot to S3. Returns the S3 key prefix of the backup."""
         from zebra_day import __version__
 
-        now = datetime.datetime.now(datetime.UTC)
+        now = datetime.datetime.now(datetime.timezone.utc)
         ts = now.strftime("%Y-%m-%dT%H-%M-%SZ")
         prefix = f"{self.s3_prefix}backups/{ts}/"
 
@@ -551,7 +561,7 @@ def restore_from_s3(self, s3_prefix: str) -> None:
         config = json.loads(resp["Body"].read().decode())
 
         # Write config to DDB (bypass optimistic locking for restore)
-        now = datetime.datetime.now(datetime.UTC).isoformat()
+        now = datetime.datetime.now(datetime.timezone.utc).isoformat()
         self._table.put_item(
             Item={
                 "PK": "CONFIG",
@@ -680,4 +690,4 @@ def _normalize_stem(name: str) -> str:
             raw = raw[:-4]
         if not raw:
             raise ValueError("Template name cannot be empty")
-        return raw
+        return raw

zebra_day/backends/local.py

@@ -130,7 +130,7 @@ def save_template(self, name: str, zpl_content: str) -> None:
 
         # Backup existing
         if target.exists():
-            ts = datetime.datetime.now(datetime.UTC).strftime("%Y-%m-%d_%H%M%S.%fZ")
+            ts = datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%d_%H%M%S.%fZ")
             backup = target.parent / f"{stem}.bak.{ts}.zpl"
             shutil.copy2(target, backup)
 
@@ -156,9 +156,7 @@ def template_exists(self, name: str) -> bool:
     # Path resolution (local-only helpers used by zpl() for compat)
     # ------------------------------------------------------------------
 
-    def resolve_template_path(
-        self, template: str, *, include_legacy_drafts: bool = False
-    ) -> Path:
+    def resolve_template_path(self, template: str, *, include_legacy_drafts: bool = False) -> Path:
         """Resolve a template name to an on-disk .zpl path.
 
         Resolution order:
@@ -264,4 +262,3 @@ def _migrate_json_to_yaml(self, json_path: Path, yaml_path: Path) -> None:
         backup_dir = xdg.get_config_backups_dir()
         backup_name = f"{datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}_migrated_from.json"
         shutil.copy2(json_path, backup_dir / backup_name)
-

zebra_day/cli/__init__.py

@@ -144,7 +144,7 @@ def _root_callback(
     """Initialize RuntimeContext for the current invocation."""
     _reset()
     debug = os.environ.get("CLI_CORE_YO_DEBUG") == "1"
-    xdg_paths = app._cli_core_yo_xdg_paths  # type: ignore[attr-defined]
+    xdg_paths = app._cli_core_yo_xdg_paths
     initialize(spec, xdg_paths, json_mode=json_flag, debug=debug)
 
 

zebra_day/cli/dynamo.py

@@ -37,7 +37,7 @@ def _prompt_s3_bucket() -> str:
 
     Raises ``typer.Exit(1)`` if the user provides an empty value.
     """
-    bucket = typer.prompt("S3 bucket name for backups").strip()
+    bucket: str = str(typer.prompt("S3 bucket name for backups")).strip()
     if not bucket:
         output.error("No S3 bucket name provided.")
         raise typer.Exit(1)
@@ -58,9 +58,7 @@ def _ensure_s3_bucket(backend, *, create_if_missing: bool = False) -> None:
         backend._s3.head_bucket(Bucket=backend.s3_bucket)
     except Exception:
         if create_if_missing:
-            output.action(
-                f"Bucket '{backend.s3_bucket}' not found — creating..."
-            )
+            output.action(f"Bucket '{backend.s3_bucket}' not found — creating...")
             backend.create_s3_bucket()
             output.success(
                 f"S3 bucket '{backend.s3_bucket}' created "
@@ -92,7 +90,15 @@ def _get_backend_from_env(
     backend = DynamoBackend.from_env(allow_missing_bucket=True)
 
     if not backend.s3_bucket:
-        if not get_context().json_mode and _is_interactive():
+        if get_context().json_mode:
+            output.emit_json(
+                {
+                    "error": "ZEBRA_DAY_S3_BACKUP_BUCKET is required when using "
+                    "DynamoDB backend. Set it to the S3 bucket name for config backups."
+                }
+            )
+            raise typer.Exit(1)
+        elif _is_interactive():
             output.warning("ZEBRA_DAY_S3_BACKUP_BUCKET is not set.")
             bucket = _prompt_s3_bucket()
             backend.s3_bucket = bucket
@@ -165,9 +171,7 @@ def _get_backend(
 
     # S3 bucket resolution: flag > config file > env var > interactive prompt
     resolved_bucket = (
-        s3_bucket
-        or file_cfg.get("s3_bucket")
-        or os.environ.get("ZEBRA_DAY_S3_BACKUP_BUCKET")
+        s3_bucket or file_cfg.get("s3_bucket") or os.environ.get("ZEBRA_DAY_S3_BACKUP_BUCKET")
     )
     if not resolved_bucket:
         if _is_interactive():
@@ -208,6 +212,7 @@ def _get_backend(
 # init
 # -----------------------------------------------------------------
 
+
 @dynamo_app.command("init")
 def init_cmd(
     table_name: str = typer.Option(
@@ -216,18 +221,14 @@ def init_cmd(
     region: str = typer.Option(
         None, "--region", "-r", help="AWS region [default: env or us-east-1]"
     ),
-    s3_bucket: str = typer.Option(
-        None, "--s3-bucket", "-b", help="S3 bucket for backups"
-    ),
-    s3_prefix: str = typer.Option(
-        "zebra-day/", "--s3-prefix", help="S3 key prefix"
-    ),
+    s3_bucket: str = typer.Option(None, "--s3-bucket", "-b", help="S3 bucket for backups"),
+    s3_prefix: str = typer.Option("zebra-day/", "--s3-prefix", help="S3 key prefix"),
     s3_config_file: str = typer.Option(
-        None, "--s3-config-file", help="JSON file with S3 bucket config (keys: s3_bucket, s3_prefix, region)"
-    ),
-    profile: str = typer.Option(
-        None, "--profile", "-p", help="AWS profile name"
+        None,
+        "--s3-config-file",
+        help="JSON file with S3 bucket config (keys: s3_bucket, s3_prefix, region)",
     ),
+    profile: str = typer.Option(None, "--profile", "-p", help="AWS profile name"),
     cost_center: str = typer.Option(
         None, "--cost-center", help="lsmc-cost-center tag [default: env or 'global']"
     ),
@@ -274,8 +275,7 @@ def init_cmd(
 
         if not perm_result["all_ok"]:
             output.error(
-                "Permission checks failed. "
-                "Fix the issues above or use --skip-checks to bypass."
+                "Permission checks failed. Fix the issues above or use --skip-checks to bypass."
             )
             raise typer.Exit(1)
         output.success("All permission checks passed")
@@ -286,7 +286,10 @@ def init_cmd(
         backend.create_table()
         output.success(f"Table '{backend.table_name}' created and active")
     except Exception as exc:
-        if "ResourceInUseException" in str(type(exc).__name__) or "already exists" in str(exc).lower():
+        if (
+            "ResourceInUseException" in str(type(exc).__name__)
+            or "already exists" in str(exc).lower()
+        ):
             output.warning(f"Table '{backend.table_name}' already exists")
         else:
             output.error(f"Failed to create table: {exc}")
@@ -308,7 +311,7 @@ def init_cmd(
 
     # Print env var instructions
     output.heading("Set these environment variables")
-    output.detail(f"export ZEBRA_DAY_CONFIG_BACKEND=dynamodb")
+    output.detail("export ZEBRA_DAY_CONFIG_BACKEND=dynamodb")
     output.detail(f"export ZEBRA_DAY_DYNAMO_TABLE={backend.table_name}")
     output.detail(f"export ZEBRA_DAY_DYNAMO_REGION={backend.region}")
     output.detail(f"export ZEBRA_DAY_S3_BACKUP_BUCKET={backend.s3_bucket}")
@@ -319,6 +322,7 @@ def init_cmd(
 # status
 # -----------------------------------------------------------------
 
+
 @dynamo_app.command("status")
 def status_cmd(
     create_s3_if_missing: bool = typer.Option(
@@ -337,7 +341,9 @@ def status_cmd(
     try:
         status = backend.get_status()
     except Exception as exc:
-        if "not found" in str(exc).lower() or "ResourceNotFoundException" in str(type(exc).__name__):
+        if "not found" in str(exc).lower() or "ResourceNotFoundException" in str(
+            type(exc).__name__
+        ):
             output.error("Table not found. Run 'zday dynamo init' first.")
             raise typer.Exit(1)
         raise
@@ -356,7 +362,12 @@ def status_cmd(
     tbl.add_column("Value")
     tbl.add_row("Table", status["table_name"])
     tbl.add_row("Region", status["region"])
-    tbl.add_row("Status", f"[green]{status['table_status']}[/green]" if status["table_status"] == "ACTIVE" else status["table_status"])
+    tbl.add_row(
+        "Status",
+        f"[green]{status['table_status']}[/green]"
+        if status["table_status"] == "ACTIVE"
+        else status["table_status"],
+    )
     tbl.add_row("Items", str(status["item_count"]))
     tbl.add_row("Templates", str(template_count))
     tbl.add_row("Config Version", str(status["config_version"]))
@@ -373,6 +384,7 @@ def status_cmd(
 # bootstrap
 # -----------------------------------------------------------------
 
+
 @dynamo_app.command("bootstrap")
 def bootstrap_cmd(
     config_file: str = typer.Option(
@@ -447,22 +459,22 @@ def bootstrap_cmd(
     # Force backup
     prefix = backend.backup_to_s3(triggered_by="bootstrap", force=True)
     output.success(f"Backup written to s3://{backend.s3_bucket}/{prefix}")
-    output.success(f"Bootstrap complete: {config_items_written} config + {templates_written} templates")
-
+    output.success(
+        f"Bootstrap complete: {config_items_written} config + {templates_written} templates"
+    )
 
 
 # -----------------------------------------------------------------
 # export
 # -----------------------------------------------------------------
 
+
 @dynamo_app.command("export")
 def export_cmd(
     output_dir: str = typer.Option(
         "./zebra-day-export", "--output-dir", "-o", help="Target directory"
     ),
-    fmt: str = typer.Option(
-        "json", "--format", "-f", help="Config format: json or yaml"
-    ),
+    fmt: str = typer.Option("json", "--format", "-f", help="Config format: json or yaml"),
 ):
     """Pull DynamoDB config and templates to local files."""
     try:
@@ -506,6 +518,7 @@ def export_cmd(
 # backup
 # -----------------------------------------------------------------
 
+
 @dynamo_app.command("backup")
 def backup_cmd(
     create_s3_if_missing: bool = typer.Option(
@@ -533,14 +546,13 @@ def backup_cmd(
 # restore
 # -----------------------------------------------------------------
 
+
 @dynamo_app.command("restore")
 def restore_cmd(
     s3_key: str = typer.Option(
         None, "--s3-key", "-k", help="S3 key prefix of the backup to restore"
     ),
-    list_backups: bool = typer.Option(
-        False, "--list", "-l", help="List available backups"
-    ),
+    list_backups: bool = typer.Option(False, "--list", "-l", help="List available backups"),
     yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation prompt"),
 ):
     """Restore DynamoDB from an S3 backup."""
@@ -597,6 +609,7 @@ def restore_cmd(
 # destroy
 # -----------------------------------------------------------------
 
+
 @dynamo_app.command("destroy")
 def destroy_cmd(
     yes: bool = typer.Option(False, "--yes", "-y", help="Required safety gate"),