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

zebra_day/templates/modern/printer_detail.html

@@ -5,7 +5,7 @@
 {% block content %}
 <div class="page-header">
     <h1 class="page-title">{{ printer_name }}</h1>
-    <p class="page-subtitle">Printer details for {{ lab }}</p>
+    <p class="page-subtitle">Printer details for {{ lab_name | default(lab) }}</p>
 </div>
 
 <!-- Breadcrumb -->
@@ -14,7 +14,7 @@
     <span class="text-muted"> / </span>
     <a href="/printers">Printers</a>
     <span class="text-muted"> / </span>
-    <a href="/printers/{{ lab }}">{{ lab }}</a>
+    <a href="/printers/{{ lab }}">{{ lab_name | default(lab) }}</a>
     <span class="text-muted"> / </span>
     <span>{{ printer_name }}</span>
 </div>
@@ -32,53 +32,149 @@
         </div>
         <table class="table" style="background: transparent; box-shadow: none;">
             <tbody>
-                {% for key, value in printer_info.items() %}
                 <tr>
-                    <td style="width: 40%;"><strong>{{ key }}</strong></td>
+                    <td style="width: 40%;"><strong>Printer ID</strong></td>
+                    <td>{{ printer_id }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Display Name</strong></td>
+                    <td>{{ printer_info.printer_name | default('Not set', true) }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Location</strong></td>
+                    <td>{{ printer_info.lab_location | default('Not set', true) }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Manufacturer</strong></td>
+                    <td>{{ printer_info.manufacturer | default('zebra') | title }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Model</strong></td>
+                    <td>{{ printer_info.model | default('Unknown') }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Serial</strong></td>
+                    <td>{{ printer_info.serial | default('Unknown') }}</td>
+                </tr>
+                <tr>
+                    <td><strong>IP Address</strong></td>
                     <td>
-                        {% if key == 'ip_address' and value != 'dl_png' %}
-                        <a href="http://{{ value }}" target="_blank">{{ value }}</a>
-                        {% elif key == 'status' %}
-                        {% if value == 'online' %}
-                        <span class="badge badge-success">Online</span>
+                        {% if printer_info.ip_address != 'dl_png' %}
+                        <a href="http://{{ printer_info.ip_address }}" target="_blank">{{ printer_info.ip_address }}</a>
                         {% else %}
-                        <span class="badge badge-error">Offline</span>
+                        {{ printer_info.ip_address }}
                         {% endif %}
-                        {% elif key == 'label_zpl_styles' %}
-                        {% for style in value %}
+                    </td>
+                </tr>
+                <tr>
+                    <td><strong>Print Method</strong></td>
+                    <td>{{ printer_info.print_method | default('socket') }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Label Styles</strong></td>
+                    <td>
+                        {% for style in printer_info.label_zpl_styles %}
                         <span class="badge badge-primary">{{ style }}</span>
                         {% endfor %}
+                    </td>
+                </tr>
+                <tr>
+                    <td><strong>Default Label Style</strong></td>
+                    <td>
+                        {% if printer_info.default_label_style %}
+                        <span class="badge badge-success">{{ printer_info.default_label_style }}</span>
                         {% else %}
-                        {{ value }}
+                        <span class="text-muted">{{ printer_info.label_zpl_styles[0] if printer_info.label_zpl_styles else 'None' }} (first in list)</span>
                         {% endif %}
                     </td>
                 </tr>
-                {% endfor %}
+                {% if printer_info.notes %}
+                <tr>
+                    <td><strong>Notes</strong></td>
+                    <td>{{ printer_info.notes }}</td>
+                </tr>
+                {% endif %}
             </tbody>
         </table>
     </div>
-    
-    <!-- Quick Actions -->
+
+    <!-- Edit Printer Settings -->
     <div class="card">
         <div class="card-header">
-            <h3 class="card-title">Quick Actions</h3>
-        </div>
-        <div class="quick-actions">
-            <a href="/print?lab={{ lab }}&printer={{ printer_name }}" class="action-card">
-                <i class="fas fa-print"></i>
-                <div>
-                    <strong>Print Label</strong>
-                    <small class="text-muted d-block">Send a print request</small>
-                </div>
-            </a>
-            <a href="/templates" class="action-card">
-                <i class="fas fa-file-code"></i>
-                <div>
-                    <strong>View Templates</strong>
-                    <small class="text-muted d-block">Available label styles</small>
-                </div>
-            </a>
+            <h3 class="card-title">Edit Settings</h3>
         </div>
+        <form id="printer-edit-form" class="form-group">
+            <div class="form-group">
+                <label class="form-label">Display Name</label>
+                <input type="text" name="printer_name" class="form-control"
+                       value="{{ printer_info.printer_name | default('', true) }}"
+                       placeholder="e.g., Lab 3 - Bench A">
+                <small class="text-muted">User-friendly name for this printer</small>
+            </div>
+            <div class="form-group">
+                <label class="form-label">Location</label>
+                {% if available_locations %}
+                <select name="lab_location" class="form-control">
+                    <option value="">-- Select Location --</option>
+                    {% for loc in available_locations %}
+                    <option value="{{ loc }}" {% if printer_info.lab_location == loc %}selected{% endif %}>{{ loc }}</option>
+                    {% endfor %}
+                </select>
+                {% else %}
+                <input type="text" name="lab_location" class="form-control"
+                       value="{{ printer_info.lab_location | default('', true) }}"
+                       placeholder="No locations defined for this lab">
+                <small class="text-muted">Define locations at the lab level first</small>
+                {% endif %}
+            </div>
+            <div class="form-group">
+                <label class="form-label">Default Label Style</label>
+                <select name="default_label_style" class="form-control">
+                    <option value="">-- Use first in list --</option>
+                    {% for style in printer_info.label_zpl_styles %}
+                    <option value="{{ style }}" {% if printer_info.default_label_style == style %}selected{% endif %}>{{ style }}</option>
+                    {% endfor %}
+                </select>
+                <small class="text-muted">Style used when printing without specifying a template</small>
+            </div>
+            <div class="form-group">
+                <label class="form-label">Notes</label>
+                <textarea name="notes" class="form-control" rows="2" placeholder="Optional notes">{{ printer_info.notes | default('', true) }}</textarea>
+            </div>
+            <button type="submit" class="btn btn-primary">
+                <i class="fas fa-save"></i> Save Changes
+            </button>
+        </form>
+    </div>
+</div>
+
+<!-- Quick Actions -->
+<div class="card mt-lg">
+    <div class="card-header">
+        <h3 class="card-title">Quick Actions</h3>
+    </div>
+    <div class="grid grid-3">
+        <a href="/print?lab={{ lab }}&printer={{ printer_id }}" class="action-card">
+            <i class="fas fa-print"></i>
+            <div>
+                <strong>Print Label</strong>
+                <small class="text-muted d-block">Send a print request</small>
+            </div>
+        </a>
+        <a href="/templates" class="action-card">
+            <i class="fas fa-file-code"></i>
+            <div>
+                <strong>View Templates</strong>
+                <small class="text-muted d-block">Available label styles</small>
+            </div>
+        </a>
+        <a href="/printers/{{ lab }}" class="action-card">
+            <i class="fas fa-arrow-left"></i>
+            <div>
+                <strong>Back to Lab</strong>
+                <small class="text-muted d-block">View all printers</small>
+            </div>
+        </a>
     </div>
 </div>
 
@@ -103,7 +199,7 @@
     <p class="text-muted mb-lg">Send a test label to verify the printer is working correctly.</p>
     <div class="grid grid-3">
         {% for style in printer_info.label_zpl_styles[:6] %}
-        <a href="/print?lab={{ lab }}&printer={{ printer_name }}&template={{ style }}&test=1" class="action-card">
+        <a href="/print?lab={{ lab }}&printer={{ printer_id }}&template={{ style }}&test=1" class="action-card">
             <i class="fas fa-tag"></i>
             <div>
                 <strong>{{ style }}</strong>
@@ -113,5 +209,36 @@
         {% endfor %}
     </div>
 </div>
+
+<script>
+document.getElementById('printer-edit-form').addEventListener('submit', async (e) => {
+    e.preventDefault();
+    const form = e.target;
+    const data = {
+        printer_name: form.printer_name.value || null,
+        lab_location: form.lab_location.value || null,
+        default_label_style: form.default_label_style.value || null,
+        notes: form.notes.value || ''
+    };
+
+    try {
+        const response = await fetch('/api/v1/labs/{{ lab }}/printers/{{ printer_id }}', {
+            method: 'PATCH',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(data)
+        });
+
+        if (response.ok) {
+            showToast('success', 'Saved', 'Printer settings updated successfully');
+            setTimeout(() => window.location.reload(), 1000);
+        } else {
+            const err = await response.json();
+            showToast('error', 'Error', err.detail || 'Failed to save settings');
+        }
+    } catch (err) {
+        showToast('error', 'Error', 'Network error: ' + err.message);
+    }
+});
+</script>
 {% endblock %}
 

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/app.py

@@ -141,11 +141,30 @@ def create_app(
     return app
 
 
+def get_default_cert_paths() -> tuple[Optional[Path], Optional[Path]]:
+    """
+    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: Optional[str] = None,
+    ssl_keyfile: Optional[str] = None,
 ):
     """
     Run the FastAPI server using uvicorn.
@@ -155,17 +174,75 @@ 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 = {
+        "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)
 

zebra_day/web/routers/api.py

@@ -39,17 +39,30 @@ class PrintResponse(BaseModel):
 
 
 class PrinterInfo(BaseModel):
-    """Printer information model."""
-    name: str
+    """Printer information model (v2.0.0 schema)."""
+    id: str = Field(..., description="Printer identifier/key in JSON")
     ip_address: str
+    printer_name: Optional[str] = Field(None, description="User-friendly display name")
+    lab_location: Optional[str] = Field(None, description="Location within the lab")
+    manufacturer: str = Field("zebra", description="Printer manufacturer")
     model: str
     serial: str
     label_zpl_styles: List[str]
+    default_label_style: Optional[str] = Field(None, description="Default label style to use when none specified")
     print_method: str
+    notes: Optional[str] = Field("", description="Optional notes")
+
+
+class LabInfo(BaseModel):
+    """Lab information model (v2.0.0 schema)."""
+    id: str = Field(..., description="Lab identifier/key in JSON")
+    lab_name: str = Field(..., description="Human-readable lab name")
+    available_locations: List[str] = Field(default_factory=list, description="Valid location options for printers")
+    printers: List[PrinterInfo]
 
 
 class LabPrinters(BaseModel):
-    """Lab and its printers."""
+    """Lab and its printers (deprecated, use LabInfo)."""
     lab: str
     printers: List[PrinterInfo]
 
@@ -63,6 +76,44 @@ async def list_labs(request: Request) -> List[str]:
     return list(zp.printers.get("labs", {}).keys())
 
 
+@router.get("/labs/{lab}", response_model=LabInfo)
+async def get_lab(request: Request, lab: str) -> LabInfo:
+    """Get lab details including available locations and printers."""
+    zp = request.app.state.zp
+    labs = zp.printers.get("labs", {})
+
+    if lab not in labs:
+        raise HTTPException(status_code=404, detail=f"Lab '{lab}' not found")
+
+    lab_data = labs[lab]
+    lab_printers = lab_data.get("printers", {})
+
+    printers = []
+    for printer_id, info in lab_printers.items():
+        printers.append(
+            PrinterInfo(
+                id=printer_id,
+                ip_address=info.get("ip_address", ""),
+                printer_name=info.get("printer_name"),
+                lab_location=info.get("lab_location"),
+                manufacturer=info.get("manufacturer", "zebra"),
+                model=info.get("model", ""),
+                serial=info.get("serial", ""),
+                label_zpl_styles=info.get("label_zpl_styles", []),
+                default_label_style=info.get("default_label_style"),
+                print_method=info.get("print_method", ""),
+                notes=info.get("notes", ""),
+            )
+        )
+
+    return LabInfo(
+        id=lab,
+        lab_name=lab_data.get("lab_name", lab),
+        available_locations=lab_data.get("available_locations", []),
+        printers=printers,
+    )
+
+
 @router.get("/labs/{lab}/printers", response_model=List[PrinterInfo])
 async def list_printers(request: Request, lab: str) -> List[PrinterInfo]:
     """List all printers in a lab."""
@@ -72,16 +123,24 @@ async def list_printers(request: Request, lab: str) -> List[PrinterInfo]:
     if lab not in labs:
         raise HTTPException(status_code=404, detail=f"Lab '{lab}' not found")
 
+    # Access printers via nested 'printers' key (v2 schema)
+    lab_printers = labs[lab].get("printers", {})
+
     printers = []
-    for name, info in labs[lab].items():
+    for printer_id, info in lab_printers.items():
         printers.append(
             PrinterInfo(
-                name=name,
+                id=printer_id,
                 ip_address=info.get("ip_address", ""),
+                printer_name=info.get("printer_name"),
+                lab_location=info.get("lab_location"),
+                manufacturer=info.get("manufacturer", "zebra"),
                 model=info.get("model", ""),
                 serial=info.get("serial", ""),
                 label_zpl_styles=info.get("label_zpl_styles", []),
+                default_label_style=info.get("default_label_style"),
                 print_method=info.get("print_method", ""),
+                notes=info.get("notes", ""),
             )
         )
     return printers
@@ -161,3 +220,94 @@ async def get_config(request: Request) -> Dict[str, Any]:
     zp = request.app.state.zp
     return zp.printers
 
+
+# ----- Lab Settings Endpoints -----
+
+class LabUpdateRequest(BaseModel):
+    """Request model for updating lab settings."""
+    lab_name: Optional[str] = Field(None, description="Human-readable lab name")
+    available_locations: Optional[List[str]] = Field(None, description="List of valid locations")
+
+
+class PrinterUpdateRequest(BaseModel):
+    """Request model for updating printer settings."""
+    printer_name: Optional[str] = Field(None, description="User-friendly display name")
+    lab_location: Optional[str] = Field(None, description="Location within the lab")
+    notes: Optional[str] = Field(None, description="Optional notes")
+    label_zpl_styles: Optional[List[str]] = Field(None, description="Allowed ZPL styles")
+    default_label_style: Optional[str] = Field(None, description="Default label style to use when none specified")
+
+
+@router.patch("/labs/{lab}", response_model=LabInfo)
+async def update_lab(request: Request, lab: str, update: LabUpdateRequest) -> LabInfo:
+    """Update lab settings (lab_name, available_locations)."""
+    zp = request.app.state.zp
+    labs = zp.printers.get("labs", {})
+
+    if lab not in labs:
+        raise HTTPException(status_code=404, detail=f"Lab '{lab}' not found")
+
+    lab_data = labs[lab]
+
+    if update.lab_name is not None:
+        lab_data["lab_name"] = update.lab_name
+    if update.available_locations is not None:
+        lab_data["available_locations"] = update.available_locations
+
+    # Save changes
+    zp.save_printer_json(zp.printers_filename, relative=False)
+
+    # Return updated lab info
+    return await get_lab(request, lab)
+
+
+@router.patch("/labs/{lab}/printers/{printer_id}")
+async def update_printer(
+    request: Request, lab: str, printer_id: str, update: PrinterUpdateRequest
+) -> PrinterInfo:
+    """Update printer settings (printer_name, lab_location, notes)."""
+    zp = request.app.state.zp
+    labs = zp.printers.get("labs", {})
+
+    if lab not in labs:
+        raise HTTPException(status_code=404, detail=f"Lab '{lab}' not found")
+
+    lab_printers = labs[lab].get("printers", {})
+    if printer_id not in lab_printers:
+        raise HTTPException(status_code=404, detail=f"Printer '{printer_id}' not found in lab '{lab}'")
+
+    printer_data = lab_printers[printer_id]
+
+    if update.printer_name is not None:
+        printer_data["printer_name"] = update.printer_name if update.printer_name else None
+    if update.lab_location is not None:
+        printer_data["lab_location"] = update.lab_location if update.lab_location else None
+    if update.notes is not None:
+        printer_data["notes"] = update.notes
+    if update.label_zpl_styles is not None:
+        printer_data["label_zpl_styles"] = update.label_zpl_styles
+    if update.default_label_style is not None:
+        # Validate that the style exists in label_zpl_styles (if it's not empty string)
+        if update.default_label_style and update.default_label_style not in printer_data.get("label_zpl_styles", []):
+            raise HTTPException(
+                status_code=400,
+                detail=f"Default label style '{update.default_label_style}' must be one of: {printer_data.get('label_zpl_styles', [])}"
+            )
+        printer_data["default_label_style"] = update.default_label_style if update.default_label_style else None
+
+    # Save changes
+    zp.save_printer_json(zp.printers_filename, relative=False)
+
+    return PrinterInfo(
+        id=printer_id,
+        ip_address=printer_data.get("ip_address", ""),
+        printer_name=printer_data.get("printer_name"),
+        lab_location=printer_data.get("lab_location"),
+        manufacturer=printer_data.get("manufacturer", "zebra"),
+        model=printer_data.get("model", ""),
+        serial=printer_data.get("serial", ""),
+        label_zpl_styles=printer_data.get("label_zpl_styles", []),
+        default_label_style=printer_data.get("default_label_style"),
+        print_method=printer_data.get("print_method", ""),
+        notes=printer_data.get("notes", ""),
+    )