zebra-day 2.0.0__py3-none-any.whl → 2.1.4__py3-none-any.whl

zebra_day/__init__.py

@@ -1,8 +1,14 @@
 """
 zebra_day - A Python library to manage Zebra printer fleets and ZPL print requests.
 """
+
 from __future__ import annotations
 
+try:
+    from zebra_day._version import __version__
+except ImportError:
+    __version__ = "0.0.0.dev0"
+
 from zebra_day.exceptions import (
     ConfigError,
     ConfigFileNotFoundError,
@@ -18,10 +24,9 @@ from zebra_day.exceptions import (
 from zebra_day.logging_config import configure_logging, get_logger
 
 __all__ = [
-    # Logging
+    "__version__",
     "configure_logging",
     "get_logger",
-    # Exceptions
     "ZebraDayError",
     "PrinterConnectionError",
     "PrinterNotFoundError",

zebra_day/_version.py

@@ -0,0 +1 @@
+__version__ = "2.1.4"

zebra_day/cli/__init__.py

@@ -1,19 +1,21 @@
 """zebra_day CLI - Zebra Printer Fleet Management CLI using Typer."""
 
+from __future__ import annotations
+
 import os
+import socket
 import sys
-from pathlib import Path
-from typing import Optional
+from typing import Any
 
 import typer
 from rich.console import Console
 from rich.table import Table
 
 from zebra_day import paths as xdg
+from zebra_day.cli.cognito import cognito_app
 from zebra_day.cli.gui import gui_app
 from zebra_day.cli.printer import printer_app
 from zebra_day.cli.template import template_app
-from zebra_day.cli.cognito import cognito_app
 
 console = Console()
 
@@ -35,6 +37,7 @@ def _get_version() -> str:
     """Get zebra_day version."""
     try:
         from importlib.metadata import version
+
         return version("zebra_day")
     except Exception:
         return "dev"
@@ -92,7 +95,7 @@ def status(
     """Show printer fleet status, network connectivity, and service health."""
     import json as json_mod
 
-    status_data = {
+    status_data: dict[str, dict[str, Any]] = {
         "gui_server": {"running": False, "pid": None, "url": None},
         "printers": {"configured": 0, "labs": []},
         "config": {"exists": False, "path": None},
@@ -117,14 +120,12 @@ def status(
         status_data["config"]["exists"] = True
         try:
             import zebra_day.print_mgr as zdpm
+
             zp = zdpm.zpl()
             if hasattr(zp, "printers") and "labs" in zp.printers:
                 labs = list(zp.printers["labs"].keys())
                 status_data["printers"]["labs"] = labs
-                total_printers = sum(
-                    len([k for k in zp.printers["labs"][lab].keys()])
-                    for lab in labs
-                )
+                total_printers = sum(len(list(zp.printers["labs"][lab].keys())) for lab in labs)
                 status_data["printers"]["configured"] = total_printers
         except Exception:
             pass
@@ -136,25 +137,29 @@ def status(
     # Human-readable output
     console.print("\n[bold]Service Status[/bold]")
     if status_data["gui_server"]["running"]:
-        console.print(f"  [green]●[/green] GUI Server: [green]Running[/green] (PID {status_data['gui_server']['pid']})")
+        console.print(
+            f"  [green]●[/green] GUI Server: [green]Running[/green] (PID {status_data['gui_server']['pid']})"
+        )
         console.print(f"    URL: [cyan]{status_data['gui_server']['url']}[/cyan]")
     else:
         console.print("  [dim]○[/dim] GUI Server: [dim]Not running[/dim]")
 
     console.print("\n[bold]Printer Fleet[/bold]")
     if status_data["config"]["exists"]:
-        console.print(f"  [green]●[/green] Config: [green]Loaded[/green]")
+        console.print("  [green]●[/green] Config: [green]Loaded[/green]")
         console.print(f"    Printers: {status_data['printers']['configured']}")
         console.print(f"    Labs: {', '.join(status_data['printers']['labs']) or 'none'}")
     else:
         console.print("  [yellow]○[/yellow] Config: [yellow]Not found[/yellow]")
-        console.print(f"    Run [cyan]zday bootstrap[/cyan] to initialize")
+        console.print("    Run [cyan]zday bootstrap[/cyan] to initialize")
     console.print()
 
 
 @app.command("bootstrap")
 def bootstrap(
-    ip_stub: Optional[str] = typer.Option(None, "--ip-stub", "-i", help="IP stub for printer scan (e.g., 192.168.1)"),
+    ip_stub: str | None = typer.Option(
+        None, "--ip-stub", "-i", help="IP stub for printer scan (e.g., 192.168.1)"
+    ),
     skip_scan: bool = typer.Option(False, "--skip-scan", "-s", help="Skip printer network scan"),
     json_output: bool = typer.Option(False, "--json", "-j", help="Output as JSON"),
 ):
@@ -166,20 +171,16 @@ def bootstrap(
     3. Scan the network for Zebra printers (unless --skip-scan)
     """
     import json as json_mod
-    import time
-    import socket
-
-    result = {
-        "config_dir": str(xdg.get_config_dir()),
-        "data_dir": str(xdg.get_data_dir()),
-        "printers_found": 0,
-        "labs": [],
-    }
+
+    config_dir = str(xdg.get_config_dir())
+    data_dir = str(xdg.get_data_dir())
+    printers_found = 0
+    labs: list[str] = []
 
     if not json_output:
         console.print("\n[bold cyan]zebra_day Bootstrap[/bold cyan]\n")
-        console.print("[green]✓[/green] Config directory: " + result["config_dir"])
-        console.print("[green]✓[/green] Data directory: " + result["data_dir"])
+        console.print("[green]✓[/green] Config directory: " + config_dir)
+        console.print("[green]✓[/green] Data directory: " + data_dir)
 
     if skip_scan:
         if not json_output:
@@ -202,24 +203,74 @@ def bootstrap(
 
         try:
             import zebra_day.print_mgr as zdpm
+
             zp = zdpm.zpl()
             zp.probe_zebra_printers_add_to_printers_json(ip_stub=ip_stub)
 
             if hasattr(zp, "printers") and "labs" in zp.printers:
                 for lab in zp.printers["labs"]:
-                    printers_in_lab = len([k for k in zp.printers["labs"][lab].keys()])
-                    result["printers_found"] += printers_in_lab
-                    result["labs"].append(lab)
+                    printers_in_lab = len(list(zp.printers["labs"][lab].keys()))
+                    printers_found += printers_in_lab
+                    labs.append(lab)
 
             if not json_output:
-                console.print(f"[green]✓[/green] Scan complete: {result['printers_found']} printer(s) found")
-                if result["labs"]:
-                    console.print(f"    Labs: {', '.join(result['labs'])}")
+                console.print(f"[green]✓[/green] Scan complete: {printers_found} printer(s) found")
+                if labs:
+                    console.print(f"    Labs: {', '.join(labs)}")
         except Exception as e:
             if not json_output:
                 console.print(f"[yellow]⚠[/yellow] Scan error: {e}")
 
+    # Generate HTTPS certificates if mkcert is available
+    certs_generated = False
+    cert_path_str = None
+
+    if not json_output:
+        console.print("\n[cyan]→[/cyan] Checking HTTPS certificates...")
+
+    try:
+        from zebra_day import mkcert
+
+        if not mkcert.is_mkcert_installed():
+            if not json_output:
+                console.print("[yellow]⚠[/yellow]  mkcert not installed")
+                console.print(
+                    "   Install with: [dim]brew install mkcert[/dim] (macOS) or "
+                    "[dim]sudo apt install mkcert[/dim] (Ubuntu)"
+                )
+        elif not mkcert.is_ca_installed():
+            if not json_output:
+                console.print("[yellow]⚠[/yellow]  mkcert CA not installed")
+                console.print("   Run: [dim]mkcert -install[/dim] (one-time, requires password)")
+        elif mkcert.certificates_exist():
+            if not json_output:
+                console.print(f"[green]✓[/green] Certificates exist: {mkcert.CERT_FILE}")
+            certs_generated = True
+            cert_path_str = str(mkcert.CERT_FILE)
+        else:
+            if not json_output:
+                console.print("   Generating certificates...")
+            if mkcert.generate_certificates():
+                if not json_output:
+                    console.print(f"[green]✓[/green] Certificates generated: {mkcert.CERT_FILE}")
+                certs_generated = True
+                cert_path_str = str(mkcert.CERT_FILE)
+            else:
+                if not json_output:
+                    console.print("[yellow]⚠[/yellow]  Failed to generate certificates")
+    except Exception as e:
+        if not json_output:
+            console.print(f"[yellow]⚠[/yellow] Certificate check error: {e}")
+
     if json_output:
+        result = {
+            "config_dir": config_dir,
+            "data_dir": data_dir,
+            "printers_found": printers_found,
+            "labs": labs,
+            "https_certs_generated": certs_generated,
+            "cert_path": cert_path_str,
+        }
         console.print(json_mod.dumps(result, indent=2))
     else:
         console.print("\n[bold green]✓ Bootstrap complete![/bold green]")
@@ -237,4 +288,3 @@ def main():
 
 if __name__ == "__main__":
     raise SystemExit(main())
-

zebra_day/cli/cognito.py

@@ -5,7 +5,6 @@ basic status and info commands.
 """
 
 import os
-from typing import Optional
 
 import typer
 from rich.console import Console
@@ -18,6 +17,7 @@ def _is_cognito_available() -> bool:
     """Check if daylily-cognito is installed."""
     try:
         from daylily_cognito.cli import cognito_app as _  # noqa: F401
+
         return True
     except ImportError:
         return False
@@ -28,7 +28,8 @@ def _get_cognito_app() -> typer.Typer:
     if _is_cognito_available():
         # Import and return the full cognito CLI from daylily-cognito
         from daylily_cognito.cli import cognito_app
-        return cognito_app
+
+        return cognito_app  # type: ignore[no-any-return]
     else:
         # Return a minimal fallback app
         return _create_fallback_app()
@@ -36,7 +37,9 @@ def _get_cognito_app() -> typer.Typer:
 
 def _create_fallback_app() -> typer.Typer:
     """Create a fallback cognito app with basic commands."""
-    app = typer.Typer(help="Cognito authentication management (limited - daylily-cognito not installed)")
+    app = typer.Typer(
+        help="Cognito authentication management (limited - daylily-cognito not installed)"
+    )
 
     @app.command("status")
     def status():
@@ -76,7 +79,9 @@ def _create_fallback_app() -> typer.Typer:
             console.print("  Start server with: [cyan]zday gui start --auth cognito[/cyan]")
         else:
             console.print("\n[yellow]⚠[/yellow] Cognito is not fully configured")
-            console.print("  Set environment variables or install daylily-cognito for full management")
+            console.print(
+                "  Set environment variables or install daylily-cognito for full management"
+            )
 
     @app.command("info")
     def info():
@@ -85,7 +90,7 @@ def _create_fallback_app() -> typer.Typer:
         console.print("To enable Cognito authentication for zebra_day:\n")
 
         console.print("[bold]1. Install auth dependencies:[/bold]")
-        console.print("   [cyan]pip install -e \".[auth]\"[/cyan]\n")
+        console.print('   [cyan]pip install -e ".[auth]"[/cyan]\n')
 
         console.print("[bold]2. Set environment variables:[/bold]")
         console.print("   [cyan]export COGNITO_USER_POOL_ID=your-pool-id[/cyan]")
@@ -96,21 +101,23 @@ def _create_fallback_app() -> typer.Typer:
         console.print("   [cyan]zday gui start --auth cognito[/cyan]\n")
 
         if not _is_cognito_available():
-            console.print("[dim]For full Cognito management (create, teardown), install daylily-cognito:[/dim]")
+            console.print(
+                "[dim]For full Cognito management (create, teardown), install daylily-cognito:[/dim]"
+            )
             console.print("[dim]  pip install daylily-cognito[/dim]")
 
     @app.command("create")
     def create():
         """Create/configure a Cognito user pool (requires daylily-cognito)."""
         console.print("[yellow]⚠[/yellow] This command requires daylily-cognito")
-        console.print("  Install with: [cyan]pip install -e \".[auth]\"[/cyan]")
+        console.print('  Install with: [cyan]pip install -e ".[auth]"[/cyan]')
         raise typer.Exit(1)
 
     @app.command("teardown")
     def teardown():
         """Remove Cognito configuration (requires daylily-cognito)."""
         console.print("[yellow]⚠[/yellow] This command requires daylily-cognito")
-        console.print("  Install with: [cyan]pip install -e \".[auth]\"[/cyan]")
+        console.print('  Install with: [cyan]pip install -e ".[auth]"[/cyan]')
         raise typer.Exit(1)
 
     return app
@@ -118,4 +125,3 @@ def _create_fallback_app() -> typer.Typer:
 
 # Export the cognito app - either the full version from daylily-cognito or the fallback
 cognito_app = _get_cognito_app()
-

zebra_day/cli/gui.py

@@ -7,7 +7,6 @@ import sys
 import time
 from datetime import datetime
 from pathlib import Path
-from typing import Optional, Literal
 
 import typer
 from rich.console import Console
@@ -39,13 +38,13 @@ def _get_log_file() -> Path:
     return LOG_DIR / f"gui_{ts}.log"
 
 
-def _get_latest_log() -> Optional[Path]:
+def _get_latest_log() -> Path | None:
     """Get the most recent log file."""
     logs = sorted(LOG_DIR.glob("gui_*.log"), reverse=True)
     return logs[0] if logs else None
 
 
-def _get_pid() -> Optional[int]:
+def _get_pid() -> int | None:
     """Get the running server PID if exists."""
     if PID_FILE.exists():
         try:
@@ -61,14 +60,13 @@ def _check_auth_dependencies() -> bool:
     """Check if auth dependencies are available."""
     try:
         import jose  # noqa: F401
+
         return True
     except ImportError:
         return False
 
 
-def _resolve_ssl_paths(
-    cert: Optional[str], key: Optional[str]
-) -> tuple[Optional[str], Optional[str], bool]:
+def _resolve_ssl_paths(cert: str | None, key: str | None) -> tuple[str | None, str | None, bool]:
     """
     Resolve SSL certificate and key paths.
 
@@ -109,10 +107,14 @@ def start(
     host: str = typer.Option("0.0.0.0", "--host", "-h", help="Host to bind to"),
     auth: str = typer.Option("none", "--auth", "-a", help="Authentication mode: none or cognito"),
     reload: bool = typer.Option(False, "--reload", "-r", help="Enable auto-reload (foreground)"),
-    background: bool = typer.Option(True, "--background/--foreground", "-b/-f", help="Run in background"),
-    cert: Optional[str] = typer.Option(None, "--cert", help="Path to SSL certificate file"),
-    key: Optional[str] = typer.Option(None, "--key", help="Path to SSL private key file"),
-    no_https: bool = typer.Option(False, "--no-https", help="Disable HTTPS even if certificates are available"),
+    background: bool = typer.Option(
+        True, "--background/--foreground", "-b/-f", help="Run in background"
+    ),
+    cert: str | None = typer.Option(None, "--cert", help="Path to SSL certificate file"),
+    key: str | None = typer.Option(None, "--key", help="Path to SSL private key file"),
+    no_https: bool = typer.Option(
+        False, "--no-https", help="Disable HTTPS even if certificates are available"
+    ),
 ):
     """Start the zebra_day web UI server.
 
@@ -141,7 +143,7 @@ def start(
     if auth == "cognito":
         if not _check_auth_dependencies():
             console.print("[red]✗[/red]  Authentication requested but python-jose is not installed")
-            console.print("   Install with: [cyan]pip install -e \".[auth]\"[/cyan]")
+            console.print('   Install with: [cyan]pip install -e ".[auth]"[/cyan]')
             raise typer.Exit(1)
 
         # Check required env vars
@@ -168,14 +170,16 @@ def start(
     protocol = "https" if use_https else "http"
 
     if use_https:
-        console.print(f"[green]✓[/green]  HTTPS enabled")
+        console.print("[green]✓[/green]  HTTPS enabled")
         console.print(f"   Certificate: [dim]{cert_path}[/dim]")
         console.print(f"   Private key: [dim]{key_path}[/dim]")
     else:
         console.print("[yellow]⚠[/yellow]  Running in HTTP mode (insecure)")
         console.print("   For HTTPS, generate certificates with mkcert:")
         console.print(f"   [dim]mkdir -p {DEFAULT_CERT_DIR}[/dim]")
-        console.print(f"   [dim]mkcert -cert-file {DEFAULT_CERT_FILE} -key-file {DEFAULT_KEY_FILE} localhost 127.0.0.1 ::1[/dim]")
+        console.print(
+            f"   [dim]mkcert -cert-file {DEFAULT_CERT_FILE} -key-file {DEFAULT_KEY_FILE} localhost 127.0.0.1 ::1[/dim]"
+        )
 
     # Build command with SSL parameters
     ssl_args = ""
@@ -232,7 +236,9 @@ def start(
         console.print(f"   URL: [cyan]{protocol}://{host}:{port}[/cyan]")
         console.print(f"   Logs: [dim]{log_file}[/dim]")
     else:
-        console.print(f"[green]✓[/green]  Starting server on [cyan]{protocol}://{host}:{port}[/cyan]")
+        console.print(
+            f"[green]✓[/green]  Starting server on [cyan]{protocol}://{host}:{port}[/cyan]"
+        )
         console.print("   Press Ctrl+C to stop\n")
         try:
             result = subprocess.run(cmd, cwd=Path.cwd(), env=env)
@@ -268,7 +274,7 @@ def stop():
         console.print("[yellow]⚠[/yellow]  Server was not running")
     except PermissionError:
         console.print(f"[red]✗[/red]  Permission denied stopping PID {pid}")
-        raise typer.Exit(1)
+        raise typer.Exit(1) from None
 
 
 @gui_app.command("status")
@@ -335,4 +341,3 @@ def restart(
     stop()
     time.sleep(1)
     start(port=port, host=host, auth=auth, reload=False, background=True)
-

zebra_day/cli/printer.py

@@ -2,14 +2,11 @@
 
 import json
 import socket
-from typing import Optional
 
 import typer
 from rich.console import Console
 from rich.table import Table
 
-from zebra_day import paths as xdg
-
 printer_app = typer.Typer(help="Printer fleet management commands")
 console = Console()
 
@@ -19,7 +16,7 @@ def _get_local_ip() -> str:
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         s.connect(("8.8.8.8", 80))
-        ip = s.getsockname()[0]
+        ip: str = s.getsockname()[0]
         s.close()
         return ip
     except Exception:
@@ -28,9 +25,13 @@ def _get_local_ip() -> str:
 
 @printer_app.command("scan")
 def scan(
-    ip_stub: Optional[str] = typer.Option(None, "--ip-stub", "-i", help="IP stub to scan (e.g., 192.168.1)"),
+    ip_stub: str | None = typer.Option(
+        None, "--ip-stub", "-i", help="IP stub to scan (e.g., 192.168.1)"
+    ),
     wait: float = typer.Option(0.25, "--wait", "-w", help="Seconds to wait per IP probe"),
-    lab: str = typer.Option("scan-results", "--lab", "-l", help="Lab name to assign found printers"),
+    lab: str = typer.Option(
+        "scan-results", "--lab", "-l", help="Lab name to assign found printers"
+    ),
     json_output: bool = typer.Option(False, "--json", "-j", help="Output as JSON"),
 ):
     """Scan network for Zebra printers."""
@@ -45,6 +46,7 @@ def scan(
 
     try:
         import zebra_day.print_mgr as zdpm
+
         zp = zdpm.zpl()
         zp.probe_zebra_printers_add_to_printers_json(
             ip_stub=ip_stub,
@@ -56,12 +58,14 @@ def scan(
         if hasattr(zp, "printers") and "labs" in zp.printers and lab in zp.printers["labs"]:
             for name, info in zp.printers["labs"][lab].items():
                 if isinstance(info, dict) and info.get("ip_address") not in ["dl_png"]:
-                    found.append({
-                        "name": name,
-                        "ip": info.get("ip_address"),
-                        "model": info.get("model", "unknown"),
-                        "serial": info.get("serial", "unknown"),
-                    })
+                    found.append(
+                        {
+                            "name": name,
+                            "ip": info.get("ip_address"),
+                            "model": info.get("model", "unknown"),
+                            "serial": info.get("serial", "unknown"),
+                        }
+                    )
 
         if json_output:
             console.print(json.dumps(found, indent=2))
@@ -82,17 +86,18 @@ def scan(
             console.print(json.dumps({"error": str(e)}))
         else:
             console.print(f"[red]✗[/red] Scan error: {e}")
-        raise typer.Exit(1)
+        raise typer.Exit(1) from None
 
 
 @printer_app.command("list")
 def list_printers(
-    lab: Optional[str] = typer.Option(None, "--lab", "-l", help="Filter by lab name"),
+    lab: str | None = typer.Option(None, "--lab", "-l", help="Filter by lab name"),
     json_output: bool = typer.Option(False, "--json", "-j", help="Output as JSON"),
 ):
     """List configured printers."""
     try:
         import zebra_day.print_mgr as zdpm
+
         zp = zdpm.zpl()
 
         printers = []
@@ -102,13 +107,15 @@ def list_printers(
                     continue
                 for name, info in lab_printers.items():
                     if isinstance(info, dict):
-                        printers.append({
-                            "lab": lab_name,
-                            "name": name,
-                            "ip": info.get("ip_address", "unknown"),
-                            "model": info.get("model", "unknown"),
-                            "styles": info.get("label_zpl_styles", []),
-                        })
+                        printers.append(
+                            {
+                                "lab": lab_name,
+                                "name": name,
+                                "ip": info.get("ip_address", "unknown"),
+                                "model": info.get("model", "unknown"),
+                                "styles": info.get("label_zpl_styles", []),
+                            }
+                        )
 
         if json_output:
             console.print(json.dumps(printers, indent=2))
@@ -128,7 +135,7 @@ def list_printers(
         for p in printers:
             styles = ", ".join(p["styles"][:2])
             if len(p["styles"]) > 2:
-                styles += f" (+{len(p['styles'])-2})"
+                styles += f" (+{len(p['styles']) - 2})"
             table.add_row(p["lab"], p["name"], p["ip"], p["model"], styles)
         console.print(table)
 
@@ -137,7 +144,7 @@ def list_printers(
             console.print(json.dumps({"error": str(e)}))
         else:
             console.print(f"[red]✗[/red] Error: {e}")
-        raise typer.Exit(1)
+        raise typer.Exit(1) from None
 
 
 @printer_app.command("test")
@@ -149,10 +156,11 @@ def test_print(
     """Send a test print to a specific printer."""
     try:
         import zebra_day.print_mgr as zdpm
+
         zp = zdpm.zpl()
 
         console.print(f"[cyan]→[/cyan] Sending test print to {printer_name}...")
-        result = zp.print_zpl(
+        zp.print_zpl(
             lab=lab,
             printer_name=printer_name,
             uid_barcode="TEST-PRINT",
@@ -160,9 +168,8 @@ def test_print(
             alt_b="zebra_day CLI",
             label_zpl_style=label_style,
         )
-        console.print(f"[green]✓[/green] Test print sent successfully")
+        console.print("[green]✓[/green] Test print sent successfully")
 
     except Exception as e:
         console.print(f"[red]✗[/red] Print error: {e}")
-        raise typer.Exit(1)
-
+        raise typer.Exit(1) from None