Merge branch 'codex/zebra-day-3-bloom-cutover'

Author: iamh2o

bloom_lims/cli/server.py

@@ -9,14 +9,15 @@
     from cli_core_yo.registry import CommandRegistry
     from cli_core_yo.spec import CliSpec
 
+import json
 import os
 import subprocess
 import sys
 import time
 from pathlib import Path
 
 import typer
-from cli_core_yo.certs import ensure_certs
+from cli_core_yo.certs import resolve_https_certs, shared_dayhoff_certs_dir
 from cli_core_yo.server import (
     display_host,
     latest_log,
@@ -40,6 +41,7 @@
 
 PROJECT_ROOT = Path(__file__).resolve().parents[2]
 TAPDB_LOG_DIR = Path.home() / ".config" / "tapdb" / "logs"
+SERVER_META_FILE = "server-meta.json"
 
 
 class LogService(str, Enum):
@@ -66,7 +68,12 @@ def _pid_file() -> Path:
     return _state_dir() / "server.pid"
 
 
+def _runtime_meta_file() -> Path:
+    return _state_dir() / SERVER_META_FILE
+
+
 def _ensure_dir() -> None:
+    _state_dir().mkdir(parents=True, exist_ok=True)
     _log_dir().mkdir(parents=True, exist_ok=True)
 
 
@@ -83,7 +90,7 @@ def server_status_label() -> str:
     pid, _ = active_server_pid()
     if pid is None:
         return "Stopped"
-    return f"Running (PID {pid})"
+    return f"Running ({_runtime_scheme().upper()}, PID {pid})"
 
 
 def _runtime_host_and_port(default_port: int, default_host: str) -> tuple[str, int]:
@@ -98,6 +105,43 @@ def _runtime_host_and_port(default_port: int, default_host: str) -> tuple[str, i
     return host, port
 
 
+def _deployment_shared_certs_dir() -> Path:
+    from bloom_lims.config import _resolve_deployment_code
+
+    return shared_dayhoff_certs_dir(_resolve_deployment_code())
+
+
+def _write_runtime_meta(*, ssl_enabled: bool) -> None:
+    _runtime_meta_file().write_text(
+        json.dumps({"ssl_enabled": ssl_enabled}, sort_keys=True),
+        encoding="utf-8",
+    )
+
+
+def _read_runtime_meta() -> dict[str, object]:
+    meta_file = _runtime_meta_file()
+    if not meta_file.exists():
+        return {}
+    try:
+        payload = json.loads(meta_file.read_text(encoding="utf-8"))
+    except Exception:
+        return {}
+    return payload if isinstance(payload, dict) else {}
+
+
+def _clear_runtime_meta() -> None:
+    _runtime_meta_file().unlink(missing_ok=True)
+
+
+def _runtime_scheme() -> str:
+    meta = _read_runtime_meta()
+    if str(meta.get("ssl_enabled")).lower() in {"false", "0", "no"}:
+        return "http"
+    if str(meta.get("ssl_enabled")).lower() in {"true", "1", "yes"}:
+        return "https"
+    return "https"
+
+
 @server_app.command("start")
 def start(
     port: int = typer.Option(
@@ -113,13 +157,33 @@ def start(
         "-b/-f",
         help="Run in background",
     ),
+    ssl: bool = typer.Option(
+        True,
+        "--ssl/--no-ssl",
+        help="Serve over HTTPS with deployment-scoped certs",
+    ),
+    cert: str | None = typer.Option(None, "--cert", help="TLS certificate file"),
+    key: str | None = typer.Option(None, "--key", help="TLS private key file"),
 ) -> None:
     """Start the BLOOM web UI."""
     _ensure_dir()
     host, port = _runtime_host_and_port(port, host)
     shown_host = display_host(host)
-    protocol = "https"
-    cert_file, key_file = ensure_certs(PROJECT_ROOT / "certs")
+    if not ssl and (cert or key):
+        console.print("[red]✗[/red] --cert and --key require HTTPS; omit them with --no-ssl")
+        raise typer.Exit(1)
+
+    protocol = "https" if ssl else "http"
+    cert_file = key_file = None
+    if ssl:
+        resolved = resolve_https_certs(
+            cert_path=cert,
+            key_path=key,
+            shared_certs_dir=_deployment_shared_certs_dir(),
+            fallback_certs_dir=PROJECT_ROOT / "certs",
+        )
+        cert_file = resolved.cert_path
+        key_file = resolved.key_path
 
     try:
         settings = get_settings()
@@ -184,10 +248,12 @@ def start(
     ]
     if reload:
         cmd.append("--reload")
-    cmd.extend(["--ssl-keyfile", str(key_file), "--ssl-certfile", str(cert_file)])
+    if ssl and cert_file and key_file:
+        cmd.extend(["--ssl-keyfile", str(key_file), "--ssl-certfile", str(cert_file)])
 
     env = os.environ.copy()
     env["PYTHONUNBUFFERED"] = "1"
+    _write_runtime_meta(ssl_enabled=ssl)
 
     if background:
         log_file = new_log_path(_log_dir())
@@ -202,6 +268,7 @@ def start(
             )
             time.sleep(2)
             if proc.poll() is not None:
+                _clear_runtime_meta()
                 console.print("[red]✗[/red] Server failed to start. Check logs:")
                 console.print(f"   [dim]{log_file}[/dim]")
                 raise typer.Exit(1)
@@ -221,13 +288,17 @@ def start(
         subprocess.run(cmd, env=env, cwd=PROJECT_ROOT)
     except KeyboardInterrupt:
         console.print("\n[yellow]⚠[/yellow] Server stopped")
+    except Exception:
+        _clear_runtime_meta()
+        raise
 
 
 @server_app.command("stop")
 def stop() -> None:
     """Stop the BLOOM web UI."""
     stopped, msg = stop_pid(_pid_file())
     if stopped:
+        _clear_runtime_meta()
         console.print(f"[green]✓[/green] {msg}")
     elif "Permission" in msg:
         console.print(f"[red]✗[/red] {msg}")
@@ -245,7 +316,7 @@ def status() -> None:
     log_file = _latest_server_log()
     if pid:
         console.print(f"[green]●[/green] Server is [green]running[/green] (PID {pid})")
-        console.print(f"   URL: [cyan]https://{shown_host}:{port}[/cyan]")
+        console.print(f"   URL: [cyan]{_runtime_scheme()}://{shown_host}:{port}[/cyan]")
         if log_file:
             console.print(f"   Logs: [dim]{log_file}[/dim]")
         return

bloom_lims/config.py

@@ -482,6 +482,27 @@ def validate_enabled_contract(self) -> "DeweySettings":
         return self
 
 
+class ZebraDaySettings(BaseModel):
+    """zebra_day integration settings."""
+
+    base_url: str = Field(default="", description="zebra_day API base URL")
+    token: str = Field(default="", description="zebra_day internal API bearer token")
+    timeout_seconds: int = Field(default=10, description="zebra_day API timeout seconds")
+    verify_ssl: bool = Field(
+        default=True, description="Verify zebra_day TLS certificates"
+    )
+
+    @field_validator("base_url")
+    @classmethod
+    def validate_base_url(cls, value: str) -> str:
+        normalized = str(value or "").strip()
+        if not normalized:
+            return ""
+        if not normalized.startswith(("https://", "http://")):
+            raise ValueError("zebra_day.base_url must use an absolute http:// or https:// URL")
+        return normalized.rstrip("/")
+
+
 class LoggingSettings(BaseModel):
     """Logging configuration."""
 
@@ -640,6 +661,7 @@ class BloomSettings(BaseSettings):
     auth: AuthSettings = Field(default_factory=AuthSettings)
     atlas: AtlasSettings = Field(default_factory=AtlasSettings)
     dewey: DeweySettings = Field(default_factory=DeweySettings)
+    zebra_day: ZebraDaySettings = Field(default_factory=ZebraDaySettings)
     aws: AWSSettings = Field(default_factory=AWSSettings)
     ui: UISettings = Field(default_factory=UISettings)
     deployment: DeploymentSettings = Field(default_factory=DeploymentSettings)

bloom_lims/core/action_execution.py

@@ -319,8 +319,11 @@ def _build_action_ds(
     action_ds["curr_user_id"] = actor_user_id
     action_ds["lab"] = prefs.get("print_lab", "BLOOM")
     action_ds["printer_name"] = prefs.get("printer_name", "")
-    action_ds["label_style"] = prefs.get("label_style", "")
-    action_ds["label_zpl_style"] = prefs.get("label_style", "")
+    resolved_label_style = prefs.get("label_zpl_style", "") or prefs.get(
+        "label_style", ""
+    )
+    action_ds["label_style"] = resolved_label_style
+    action_ds["label_zpl_style"] = resolved_label_style
     action_ds["alt_a"] = prefs.get("alt_a", "")
     action_ds["alt_b"] = prefs.get("alt_b", "")
     action_ds["alt_c"] = prefs.get("alt_c", "")

bloom_lims/docs/printer_config.md

@@ -1,19 +1,17 @@
 # Zebra Printer Configuration
-Bloom relies on [zebra_day](https://github.com/Daylily-Informatics/zebra_day) to administer the lab printer fleet and broker print requests. Please see that repository for printer-specific setup details. The notes below are a Bloom-focused quick reference.
+Bloom relies on [zebra_day](https://github.com/Daylily-Informatics/zebra_day) as the authoritative printer-fleet service. Bloom fetches shared printer, template, and label-profile state from the zebra_day API and submits print jobs back to zebra_day for delivery. Please see that repository for printer-specific setup details. The notes below are a Bloom-focused quick reference.
 
 
 ## Printer Setup
-* From the venv you are running Bloom from, the `zebra_day` package should be pre-installed.  To start the admin web interface, from your venv, run `zday_start`.  This will start the admin web interface on port 8118 on the machine you are running Bloom from.
+* Bloom does not start or manage zebra_day. Configure the running zebra_day service with `bloom.zebra_day.base_url` and `bloom.zebra_day.token` or the equivalent `BLOOM_ZEBRA_DAY__*` environment variables.
 
 ### Detect Printers On Your Local Network
 _this MUST be done at least once when setting up a new bloom install_ && _done again when adding new printers_
-* `zebra_day` can scan the local network (barring firewal rules blocking this) and update the venv printer config file with detected printers. Open the `Scan Network For Zebra Printers` page @ `http://localhost:8118/build_new_printers_config_json`. You IP prefix should be auto detected, else enter the first three sections (ie `192.168.1`). Enter a few character 'Lab Code' (only alphanumeric, no whitespace, etc.), this will be the code under which detected printers are added to the json config. The scan might take a few minutes to complete.
+* Use the zebra_day admin UI to discover printers, assign printer IDs, and manage default label profiles. Bloom reads those shared records remotely; it no longer rebuilds local printer JSON.
 
 ![Printer Scan](./imgs/bc_scan.png)
 
-* The scan will return all detected printers. The `Lab Code` + `Printer Name` will uniquely identify each printer config.  There are several label styles included with `zebra_day`, you may specify a label style with each print request. Make sure the label stock matches the label style. See `zebra_day` docs for more information on label styles. I will use the common `2x1in` label style for the rest of this document. From the `zebra_day` admin web interface, you can print a test label to verify the printer is working.
-
-* The printers visible in the Scan Report will be the printers available in the bloom UI.  NOTE- you may change names of the printers, see the zebra_day docs for more information.
+* The printers visible in zebra_day are the printers available in the Bloom UI. Bloom stores the selected zebra_day `printer_id` as the user preference value and uses zebra_day label-profile names for `label_zpl_style`.
 
 ![Printer Test](./imgs/printer_fleet_status.png)
 

bloom_lims/domain/base.py

@@ -12,7 +12,6 @@
 import os
 import re
 
-import zebra_day.print_mgr as zdpm
 from daylily_tapdb import MissingSeededTemplateError
 from sqlalchemy import (
     DateTime,
@@ -51,8 +50,12 @@ def __init__(
         self.logger = logging.getLogger(__name__ + ".BloomObj")
         self.logger.debug("Instantiating BloomObj")
 
-        # Zebra Day Print Manager
-        self.zpld = zdpm.zpl()
+        self.printer_labs = []
+        self.selected_lab = ""
+        self.site_printers = []
+        self.printer_options = []
+        self.zpl_label_styles = []
+        self.selected_label_style = "tube_2inX1in"
         if cfg_printers:
             self._config_printers()
 
@@ -338,47 +341,31 @@ def _fetch_fedex_tracking_ops_meta(self, tracking_number):
             return [data]
         return [dict(data)]
 
-    def _rebuild_printer_json(self, lab="BLOOM"):
-        self.zpld.probe_zebra_printers_add_to_printers_json(lab=lab)
-        self.zpld.save_printer_json(self.zpld.printers_filename.split("zebra_day")[-1])
-        self._config_printers()
-
     def _config_printers(self):
-        if len(self.zpld.printers["labs"].keys()) == 0:
-            self.logger.warning(
-                "No printers found, attempting to rebuild printer json\n\n"
-            )
-            self.logger.warning(
-                'This may take a few minutes, lab code will be set to "BLOOM" ... please sit tight...\n\n'
-            )
-            self._rebuild_printer_json()
-
-        self.printer_labs = self.zpld.printers["labs"].keys()
-        self.selected_lab = sorted(self.printer_labs)[0]
-        self.site_printers = self.zpld.printers["labs"][self.selected_lab].keys()
-        _zpl_label_styles = []
-        for zpl_f in os.listdir(
-            os.path.dirname(self.zpld.printers_filename) + "/label_styles/"
-        ):
-            if zpl_f.endswith(".zpl"):
-                _zpl_label_styles.append(zpl_f.removesuffix(".zpl"))
-        self.zpl_label_styles = sorted(_zpl_label_styles)
-        self.selected_label_style = "tube_2inX1in"
+        from bloom_lims.integrations.zebra_day import ZebraDayService
+
+        printer_info = ZebraDayService().build_printer_preferences()
+        self.printer_labs = list(printer_info.get("print_lab", []))
+        self.selected_lab = str(printer_info.get("selected_lab", "") or "")
+        self.printer_options = list(printer_info.get("printer_options", []))
+        self.site_printers = [item["value"] for item in self.printer_options]
+        self.zpl_label_styles = list(printer_info.get("label_zpl_style", []))
+        self.selected_label_style = (
+            self.zpl_label_styles[0] if self.zpl_label_styles else "tube_2inX1in"
+        )
 
     def set_printers_lab(self, lab):
         self.selected_lab = lab
 
     def get_lab_printers(self, lab):
-        self.selected_lab = lab
-        try:
-            self.site_printers = self.zpld.printers["labs"][self.selected_lab].keys()
-        except Exception as e:
-            self.logger.error(f"Error getting printers for lab {lab}")
-            self.logger.error(e)
-            self.logger.error(
-                "\n\n\nAttempting to rebuild printer json !!! THIS WILL TAKE TIME !!!\n\n\n"
-            )
-            self._rebuild_printer_json()
+        from bloom_lims.integrations.zebra_day import ZebraDayService
+
+        printer_info = ZebraDayService().build_printer_preferences(lab)
+        self.selected_lab = str(printer_info.get("selected_lab", "") or "")
+        self.printer_labs = list(printer_info.get("print_lab", []))
+        self.printer_options = list(printer_info.get("printer_options", []))
+        self.site_printers = [item["value"] for item in self.printer_options]
+        self.zpl_label_styles = list(printer_info.get("label_zpl_style", []))
 
     def print_label(
         self,
@@ -394,18 +381,19 @@ def print_label(
         alt_f="",
         print_n=1,
     ):
-        self.zpld.print_zpl(
+        from bloom_lims.integrations.zebra_day import ZebraDayService
+
+        ZebraDayService().submit_print_job(
             lab=lab,
-            printer_name=printer_name,
-            uid_barcode=euid,
+            printer_id=printer_name,
+            euid=euid,
             alt_a=alt_a,
             alt_b=alt_b,
             alt_c=alt_c,
             alt_d=alt_d,
             alt_e=alt_e,
             alt_f=alt_f,
             label_zpl_style=label_zpl_style,
-            client_ip="pkg",
             print_n=print_n,
         )
 
@@ -1603,7 +1591,9 @@ def do_action_print_barcode_label(self, euid, action_ds={}):
 
         lab = action_ds.get("lab", "")
         printer_name = action_ds.get("printer_name", "")
-        label_zpl_style = action_ds.get("label_style", "")
+        label_zpl_style = action_ds.get("label_zpl_style", "") or action_ds.get(
+            "label_style", ""
+        )
         alt_a = (
             action_ds.get("alt_a", "")
             if not PGLOBAL

bloom_lims/etc/bloom-config-template.yaml

@@ -163,6 +163,15 @@ dewey:
   timeout_seconds: 10
   verify_ssl: true
 
+# -----------------------------------------------------------------------------
+# zebra_day Integration
+# -----------------------------------------------------------------------------
+zebra_day:
+  base_url: ""                  # e.g., https://zebra-day.example.org
+  token: ""                     # Bearer token used for zebra_day shared printer/config APIs
+  timeout_seconds: 10
+  verify_ssl: true
+
 # -----------------------------------------------------------------------------
 # Logging Configuration
 # -----------------------------------------------------------------------------