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

zebra_day/templates/modern/printers.html

@@ -32,7 +32,7 @@
 {% if printers %}
 <div class="card">
     <div class="card-header">
-        <h3 class="card-title">Printers{% if lab %} in {{ lab }}{% endif %}</h3>
+        <h3 class="card-title">Printers{% if lab %} in {{ lab_name | default(lab) }}{% endif %}</h3>
         <a href="/config?action=scan&lab={{ lab | default('') }}" class="btn btn-outline btn-sm">
             <i class="fas fa-sync"></i> Rescan
         </a>
@@ -42,6 +42,7 @@
             <thead>
                 <tr>
                     <th>Printer</th>
+                    <th>Location</th>
                     <th>IP Address</th>
                     <th>Status</th>
                     <th>Label Styles</th>
@@ -53,7 +54,17 @@
                 <tr>
                     <td>
                         <strong>{{ printer.name }}</strong><br>
-                        <small class="text-muted">{{ printer.model | default('Unknown model') }}</small>
+                        <small class="text-muted">{{ printer.manufacturer | default('zebra') | title }} {{ printer.model | default('Unknown model') }}</small>
+                        {% if printer.id != printer.name %}
+                        <br><small class="text-muted">ID: {{ printer.id }}</small>
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if printer.lab_location %}
+                        <span class="badge badge-info">{{ printer.lab_location }}</span>
+                        {% else %}
+                        <span class="text-muted">—</span>
+                        {% endif %}
                     </td>
                     <td>
                         {% if printer.ip_address != 'dl_png' %}
@@ -64,9 +75,9 @@
                     </td>
                     <td>
                         {% if printer.status == 'online' %}
-                        <span class="badge badge-success">Online</span>
+                        <span class="badge badge-success"><i class="fas fa-check-circle"></i> Online</span>
                         {% else %}
-                        <span class="badge badge-error">Offline</span>
+                        <span class="badge badge-error"><i class="fas fa-times-circle"></i> Offline</span>
                         {% endif %}
                     </td>
                     <td>
@@ -78,10 +89,10 @@
                         {% endif %}
                     </td>
                     <td>
-                        <a href="/printers/{{ lab }}/{{ printer.name }}" class="btn btn-sm btn-outline">
+                        <a href="/printers/{{ lab }}/{{ printer.id }}" class="btn btn-sm btn-outline">
                             <i class="fas fa-info-circle"></i> Details
                         </a>
-                        <a href="/print?lab={{ lab }}&printer={{ printer.name }}" class="btn btn-sm btn-primary">
+                        <a href="/print?lab={{ lab }}&printer={{ printer.id }}" class="btn btn-sm btn-primary">
                             <i class="fas fa-print"></i> Print
                         </a>
                     </td>

zebra_day/templates/modern/template_editor.html

@@ -113,11 +113,14 @@
         var lab = labSelect.value;
 
         printerSelect.innerHTML = '<option value="">Select printer...</option>';
-        if (lab && labsDict[lab]) {
-            for (var printer in labsDict[lab]) {
+        if (lab && labsDict[lab] && labsDict[lab].printers) {
+            // v2 schema: printers are nested under 'printers' key
+            var printers = labsDict[lab].printers;
+            for (var printerId in printers) {
+                var printerInfo = printers[printerId];
                 var option = document.createElement('option');
-                option.value = printer;
-                option.text = printer;
+                option.value = printerId;
+                option.text = printerInfo.printer_name || printerId;
                 printerSelect.appendChild(option);
             }
         }

zebra_day/web/__init__.py

@@ -3,7 +3,7 @@ zebra_day web application module.
 
 FastAPI-based web interface for managing Zebra printers and label templates.
 """
+
 from zebra_day.web.app import create_app
 
 __all__ = ["create_app"]
-

zebra_day/web/app.py

@@ -3,20 +3,21 @@ FastAPI application factory for zebra_day.
 
 This module provides the main FastAPI application for the zebra_day web interface.
 """
+
 from __future__ import annotations
 
 import os
 import subprocess
+from importlib.resources import files
 from pathlib import Path
-from typing import Literal, Optional
+from typing import Literal
 
-from fastapi import FastAPI, Request
+from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
-from importlib.resources import files
 
-from zebra_day.logging_config import get_logger
 from zebra_day import paths as xdg
+from zebra_day.logging_config import get_logger
 from zebra_day.web.middleware import RequestLoggingMiddleware, print_rate_limiter
 
 _log = get_logger(__name__)
@@ -39,7 +40,7 @@ def create_app(
     *,
     debug: bool = False,
     css_theme: str = "lsmc.css",
-    auth: Optional[Literal["none", "cognito"]] = None,
+    auth: Literal["none", "cognito"] | None = None,
 ) -> FastAPI:
     """
     Create and configure the FastAPI application.
@@ -76,7 +77,7 @@ def create_app(
         from zebra_day.web.auth import CognitoAuthMiddleware, setup_cognito_auth
 
         cognito_auth = setup_cognito_auth(app)
-        app.add_middleware(CognitoAuthMiddleware, cognito_auth=cognito_auth)
+        app.add_middleware(CognitoAuthMiddleware, cognito_auth=cognito_auth)  # type: ignore[arg-type]
         app.state.cognito_auth = cognito_auth
         app.state.auth_mode = "cognito"
         _log.info("Cognito authentication middleware enabled")
@@ -96,9 +97,14 @@ def create_app(
     app.mount("/static", StaticFiles(directory=str(_STATIC_PATH)), name="static")
 
     # Also mount package directories that need to be served
-    files_dir = _PKG_PATH / "files"
-    if files_dir.exists():
-        app.mount("/files", StaticFiles(directory=str(files_dir)), name="files")
+    # Package files directory (for templates, previews generated in-package)
+    pkg_files_dir = _PKG_PATH / "files"
+    pkg_files_dir.mkdir(parents=True, exist_ok=True)
+    app.mount("/files", StaticFiles(directory=str(pkg_files_dir)), name="files")
+
+    # XDG generated files directory (for PNG downloads from dl_png printer)
+    xdg_generated_dir = xdg.get_generated_files_dir()
+    app.mount("/generated", StaticFiles(directory=str(xdg_generated_dir)), name="generated")
 
     etc_dir = _PKG_PATH / "etc"
     if etc_dir.exists():
@@ -109,7 +115,7 @@ def create_app(
     app.state.templates = templates
 
     # Register routers
-    from zebra_day.web.routers import ui, api
+    from zebra_day.web.routers import api, ui
 
     app.include_router(ui.router)
     app.include_router(api.router, prefix="/api/v1", tags=["api"])
@@ -141,11 +147,30 @@ def create_app(
     return app
 
 
+def get_default_cert_paths() -> tuple[Path | None, Path | None]:
+    """
+    Get default certificate paths from XDG config directory.
+
+    Returns:
+        Tuple of (cert_path, key_path) or (None, None) if not found.
+    """
+    config_dir = xdg.get_config_dir()
+    cert_dir = config_dir / "certs"
+    cert_file = cert_dir / "server.crt"
+    key_file = cert_dir / "server.key"
+
+    if cert_file.exists() and key_file.exists():
+        return cert_file, key_file
+    return None, None
+
+
 def run_server(
     host: str = "0.0.0.0",
     port: int = 8118,
     reload: bool = False,
     auth: Literal["none", "cognito"] = "none",
+    ssl_certfile: str | None = None,
+    ssl_keyfile: str | None = None,
 ):
     """
     Run the FastAPI server using uvicorn.
@@ -155,17 +180,74 @@ def run_server(
         port: Port to listen on
         reload: Enable auto-reload for development
         auth: Authentication mode - "none" (public) or "cognito" (AWS Cognito)
+        ssl_certfile: Path to SSL certificate file (PEM format)
+        ssl_keyfile: Path to SSL private key file (PEM format)
+
+    If ssl_certfile and ssl_keyfile are not provided, the server will:
+    1. Check SSL_CERT_PATH and SSL_KEY_PATH environment variables
+    2. Check for certificates in ~/.config/zebra_day/certs/
+    3. Fall back to HTTP with a warning if no certificates are found
     """
     import uvicorn
 
     # Store auth mode in environment for factory function
     os.environ["ZEBRA_DAY_AUTH_MODE"] = auth
 
-    uvicorn.run(
-        "zebra_day.web.app:create_app",
-        host=host,
-        port=port,
-        reload=reload,
-        factory=True,
-    )
+    # Resolve SSL certificate paths
+    cert_path = ssl_certfile
+    key_path = ssl_keyfile
+
+    # Check environment variables if not provided
+    if not cert_path:
+        cert_path = os.environ.get("SSL_CERT_PATH")
+    if not key_path:
+        key_path = os.environ.get("SSL_KEY_PATH")
+
+    # Check default XDG paths if still not found
+    if not cert_path or not key_path:
+        default_cert, default_key = get_default_cert_paths()
+        if default_cert and default_key:
+            cert_path = str(default_cert)
+            key_path = str(default_key)
+
+    # Validate certificate files exist
+    use_ssl = False
+    if cert_path and key_path:
+        cert_exists = Path(cert_path).exists()
+        key_exists = Path(key_path).exists()
+        if cert_exists and key_exists:
+            use_ssl = True
+            _log.info("HTTPS enabled with certificates:")
+            _log.info("  Certificate: %s", cert_path)
+            _log.info("  Private key: %s", key_path)
+        else:
+            if not cert_exists:
+                _log.warning("SSL certificate not found: %s", cert_path)
+            if not key_exists:
+                _log.warning("SSL private key not found: %s", key_path)
+            _log.warning("Falling back to HTTP (insecure)")
+    else:
+        _log.warning(
+            "No SSL certificates configured. Running in HTTP mode (insecure). "
+            "For HTTPS, run: mkcert -install && mkcert -cert-file ~/.config/zebra_day/certs/server.crt "
+            "-key-file ~/.config/zebra_day/certs/server.key localhost 127.0.0.1 ::1"
+        )
+
+    # Build uvicorn config
+    uvicorn_kwargs: dict[str, str | int | bool | None] = {
+        "host": host,
+        "port": port,
+        "reload": reload,
+        "factory": True,
+    }
+
+    if use_ssl:
+        uvicorn_kwargs["ssl_certfile"] = cert_path
+        uvicorn_kwargs["ssl_keyfile"] = key_path
+        protocol = "https"
+    else:
+        protocol = "http"
+
+    _log.info("Starting server at %s://%s:%d", protocol, host, port)
 
+    uvicorn.run("zebra_day.web.app:create_app", **uvicorn_kwargs)  # type: ignore[arg-type]

zebra_day/web/auth.py

@@ -5,10 +5,10 @@ Provides optional Cognito authentication support via the daylily-cognito library
 
 from __future__ import annotations
 
-import os
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
-from fastapi import Depends, HTTPException, Request, status
+from fastapi import HTTPException, Request, status
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.responses import Response
 
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 _log = get_logger(__name__)
 
 # Endpoints that should never require authentication
-PUBLIC_PATHS: List[str] = [
+PUBLIC_PATHS: list[str] = [
     "/healthz",
     "/readyz",
     "/docs",
@@ -30,7 +30,7 @@ PUBLIC_PATHS: List[str] = [
 
 # Try to import daylily-cognito components
 _COGNITO_AVAILABLE = False
-_COGNITO_IMPORT_ERROR: Optional[str] = None
+_COGNITO_IMPORT_ERROR: str | None = None
 
 try:
     from daylily_cognito import CognitoAuth, CognitoConfig, create_auth_dependency
@@ -38,9 +38,9 @@ try:
     _COGNITO_AVAILABLE = True
 except ImportError as e:
     _COGNITO_IMPORT_ERROR = str(e)
-    CognitoAuth = None  # type: ignore[misc, assignment]
-    CognitoConfig = None  # type: ignore[misc, assignment]
-    create_auth_dependency = None  # type: ignore[misc, assignment]
+    CognitoAuth = None
+    CognitoConfig = None
+    create_auth_dependency = None
 
 
 def is_cognito_available() -> bool:
@@ -48,7 +48,7 @@ def is_cognito_available() -> bool:
     return _COGNITO_AVAILABLE
 
 
-def get_cognito_import_error() -> Optional[str]:
+def get_cognito_import_error() -> str | None:
     """Get the import error message if daylily-cognito is not available."""
     return _COGNITO_IMPORT_ERROR
 
@@ -59,7 +59,7 @@ class CognitoAuthMiddleware(BaseHTTPMiddleware):
     Exempts health check endpoints and other public paths.
     """
 
-    def __init__(self, app: "FastAPI", cognito_auth: Any) -> None:
+    def __init__(self, app: FastAPI, cognito_auth: Any) -> None:
         super().__init__(app)
         self.cognito_auth = cognito_auth
         self.get_current_user = create_auth_dependency(cognito_auth, optional=False)
@@ -70,11 +70,13 @@ class CognitoAuthMiddleware(BaseHTTPMiddleware):
 
         # Allow public endpoints without authentication
         if any(path.startswith(public) for public in PUBLIC_PATHS):
-            return await call_next(request)
+            response = await call_next(request)
+            return response  # type: ignore[no-any-return]
 
         # Allow static files without authentication
         if path.startswith("/static") or path.startswith("/files") or path.startswith("/etc"):
-            return await call_next(request)
+            response = await call_next(request)
+            return response  # type: ignore[no-any-return]
 
         # Check for Authorization header
         auth_header = request.headers.get("Authorization")
@@ -116,10 +118,11 @@ class CognitoAuthMiddleware(BaseHTTPMiddleware):
                 headers={"WWW-Authenticate": "Bearer"},
             )
 
-        return await call_next(request)
+        response = await call_next(request)
+        return response  # type: ignore[no-any-return]
 
 
-def setup_cognito_auth(app: "FastAPI") -> Any:
+def setup_cognito_auth(app: FastAPI) -> Any:
     """Configure Cognito authentication for the FastAPI app.
 
     Reads configuration from environment variables:
@@ -169,4 +172,3 @@ def setup_cognito_auth(app: "FastAPI") -> Any:
     )
 
     return cognito_auth
-

zebra_day/web/middleware.py

@@ -3,12 +3,13 @@ Middleware for the zebra_day FastAPI application.
 
 Provides request logging and rate limiting functionality.
 """
+
 from __future__ import annotations
 
 import asyncio
 import time
 from collections import defaultdict
-from typing import Callable
+from collections.abc import Callable
 
 from fastapi import Request, Response
 from starlette.middleware.base import BaseHTTPMiddleware
@@ -33,7 +34,7 @@ class RequestLoggingMiddleware(BaseHTTPMiddleware):
         client_ip = request.client.host if request.client else "unknown"
         method = request.method
         path = request.url.path
-        query = str(request.query_params) if request.query_params else ""
+        str(request.query_params) if request.query_params else ""
 
         # Extract relevant parameters for print operations
         lab = request.query_params.get("lab", "")
@@ -86,7 +87,7 @@ class RequestLoggingMiddleware(BaseHTTPMiddleware):
         else:
             _log.info("Request completed", extra=log_context)
 
-        return response
+        return response  # type: ignore[no-any-return]
 
 
 class PrintRateLimiter:
@@ -136,7 +137,10 @@ class PrintRateLimiter:
 
             # Check rate limit
             if len(self._request_times[client_ip]) >= self.max_requests:
-                return False, f"Rate limit exceeded: {self.max_requests} requests per {self.window_seconds}s"
+                return (
+                    False,
+                    f"Rate limit exceeded: {self.max_requests} requests per {self.window_seconds}s",
+                )
 
             # Try to acquire semaphore (non-blocking check)
             if self._semaphore.locked() and self._semaphore._value == 0:
@@ -156,4 +160,3 @@ class PrintRateLimiter:
 
 # Global rate limiter instance
 print_rate_limiter = PrintRateLimiter()
-

zebra_day/web/routers/__init__.py

@@ -1,2 +1 @@
 """FastAPI routers for zebra_day web application."""
-