zebra-day 1.0.2__tar.gz → 2.0.0__tar.gz

{zebra_day-1.0.2/zebra_day.egg-info → zebra_day-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zebra_day
-Version: 1.0.2
+Version: 2.0.0
 Summary: A Python library to manage a Zebra printer fleet and an API for ZPL print requests.
 Home-page: https://github.com/Daylily-Informatics/zebra_day
 Author: John Major
@@ -60,7 +60,7 @@ Dynamic: license-file
 
 <img src=zebra_day/imgs/bar_red.png>
 
-## zebra_day Overview [1.0.2](https://github.com/Daylily-Informatics/zebra_day/releases/tag/1.0.2)
+## zebra_day Overview [2.0.0](https://github.com/Daylily-Informatics/zebra_day/releases/tag/2.0.0)
 
 ### Build, Deploy, Run, Monitor, Teardown
 
@@ -86,13 +86,13 @@ zday gui start            # Start web UI in background
 zday gui stop             # Stop web UI
 zday gui status           # Check if web UI is running
 
-# Health Checks
-curl http://localhost:8118/healthz    # Basic health check
-curl http://localhost:8118/readyz     # Readiness check (printer mgr initialized)
+# Health Checks (use https:// if certificates are configured, http:// otherwise)
+curl https://localhost:8118/healthz    # Basic health check
+curl https://localhost:8118/readyz     # Readiness check (printer mgr initialized)
 
 # API Documentation
-# Visit http://localhost:8118/docs for interactive OpenAPI docs
-# Visit http://localhost:8118/redoc for alternative API documentation
+# Visit https://localhost:8118/docs for interactive OpenAPI docs
+# Visit https://localhost:8118/redoc for alternative API documentation
 ```
 
 <ul>
@@ -181,7 +181,7 @@ zday status       # Show printer fleet status, service health
 zday bootstrap    # First-time setup: scan network, initialize config
 
 # GUI server management
-zday gui start [--auth none|cognito] [--host HOST] [--port PORT]
+zday gui start [--auth none|cognito] [--host HOST] [--port PORT] [--cert FILE] [--key FILE] [--no-https]
 zday gui stop
 zday gui status
 zday gui logs [--tail N] [--follow]
@@ -213,6 +213,64 @@ The old commands `zday_start` and `zday_quickstart` still work but are deprecate
 | `zday_start` | `zday gui start` |
 | `zday_start --auth cognito` | `zday gui start --auth cognito` |
 
+### Local HTTPS Setup
+
+The zebra_day web UI supports HTTPS for secure local development. By default, HTTPS is enabled if certificates are found.
+
+#### One-Time Setup (mkcert)
+
+```bash
+# Install mkcert
+# macOS
+brew install mkcert
+
+# Ubuntu/Debian
+sudo apt install mkcert
+
+# Create and install local CA (one-time, requires password)
+mkcert -install
+```
+
+#### Generate Certificates for zebra_day
+
+```bash
+# Create certificate directory
+mkdir -p ~/.config/zebra_day/certs
+
+# Generate locally-trusted certificates
+mkcert -cert-file ~/.config/zebra_day/certs/server.crt \
+       -key-file ~/.config/zebra_day/certs/server.key \
+       localhost 127.0.0.1 ::1
+```
+
+#### HTTPS Options
+
+| Method | Description |
+|--------|-------------|
+| **Auto-detect** | If certs exist in `~/.config/zebra_day/certs/`, HTTPS is enabled automatically |
+| **Explicit paths** | `zday gui start --cert /path/to/cert.crt --key /path/to/key.key` |
+| **Environment vars** | Set `SSL_CERT_PATH` and `SSL_KEY_PATH` |
+| **Force HTTP** | `zday gui start --no-https` |
+
+#### Verify HTTPS
+
+```bash
+# Start server (will use HTTPS if certs are found)
+zday gui start
+
+# Test connection
+curl https://localhost:8118/healthz
+```
+
+#### Troubleshooting
+
+| Issue | Solution |
+|-------|----------|
+| Browser shows "Not Secure" | Run `mkcert -install` to trust the local CA |
+| Certificate not found | Check paths: `ls ~/.config/zebra_day/certs/` |
+| Permission denied | Ensure cert files are readable: `chmod 644 ~/.config/zebra_day/certs/*` |
+| Want HTTP only | Use `--no-https` flag: `zday gui start --no-https` |
+
 ### It Is 3+ Things
 
   (1) Zebra Printer Management & Configuration
@@ -502,10 +560,12 @@ zebra_day 0.6.0+ includes a redesigned modern UI alongside the preserved legacy
 
 | Interface | URL | Description |
 |-----------|-----|-------------|
-| **Modern UI** | `http://localhost:8118/` | New dashboard with stats, quick actions, improved navigation |
-| **Legacy UI** | `http://localhost:8118/legacy` | Original interface, fully functional |
-| **API Docs** | `http://localhost:8118/docs` | Interactive OpenAPI/Swagger documentation |
-| **ReDoc** | `http://localhost:8118/redoc` | Alternative API documentation |
+| **Modern UI** | `https://localhost:8118/` | New dashboard with stats, quick actions, improved navigation |
+| **Legacy UI** | `https://localhost:8118/legacy` | Original interface, fully functional |
+| **API Docs** | `https://localhost:8118/docs` | Interactive OpenAPI/Swagger documentation |
+| **ReDoc** | `https://localhost:8118/redoc` | Alternative API documentation |
+
+> **Note:** Use `http://` instead of `https://` if running without certificates (`--no-https`).
 
 Both interfaces provide full functionality. The modern UI offers:
 - Dashboard with printer fleet statistics
@@ -579,7 +639,7 @@ When `--auth cognito` is enabled:
 
 Include the JWT token in the Authorization header:
 ```bash
-curl -H "Authorization: Bearer YOUR_JWT_TOKEN" http://localhost:8118/api/v1/printers
+curl -H "Authorization: Bearer YOUR_JWT_TOKEN" https://localhost:8118/api/v1/printers
 ```
 
 ### Secrets
@@ -784,3 +844,4 @@ Tthen run `sudo docker compose up --build -d` to run it then reach it at http://
  
  
  
+ 

{zebra_day-1.0.2 → zebra_day-2.0.0}/README.md

@@ -1,6 +1,6 @@
 <img src=zebra_day/imgs/bar_red.png>
 
-## zebra_day Overview [1.0.2](https://github.com/Daylily-Informatics/zebra_day/releases/tag/1.0.2)
+## zebra_day Overview [2.0.0](https://github.com/Daylily-Informatics/zebra_day/releases/tag/2.0.0)
 
 ### Build, Deploy, Run, Monitor, Teardown
 
@@ -26,13 +26,13 @@ zday gui start            # Start web UI in background
 zday gui stop             # Stop web UI
 zday gui status           # Check if web UI is running
 
-# Health Checks
-curl http://localhost:8118/healthz    # Basic health check
-curl http://localhost:8118/readyz     # Readiness check (printer mgr initialized)
+# Health Checks (use https:// if certificates are configured, http:// otherwise)
+curl https://localhost:8118/healthz    # Basic health check
+curl https://localhost:8118/readyz     # Readiness check (printer mgr initialized)
 
 # API Documentation
-# Visit http://localhost:8118/docs for interactive OpenAPI docs
-# Visit http://localhost:8118/redoc for alternative API documentation
+# Visit https://localhost:8118/docs for interactive OpenAPI docs
+# Visit https://localhost:8118/redoc for alternative API documentation
 ```
 
 <ul>
@@ -121,7 +121,7 @@ zday status       # Show printer fleet status, service health
 zday bootstrap    # First-time setup: scan network, initialize config
 
 # GUI server management
-zday gui start [--auth none|cognito] [--host HOST] [--port PORT]
+zday gui start [--auth none|cognito] [--host HOST] [--port PORT] [--cert FILE] [--key FILE] [--no-https]
 zday gui stop
 zday gui status
 zday gui logs [--tail N] [--follow]
@@ -153,6 +153,64 @@ The old commands `zday_start` and `zday_quickstart` still work but are deprecate
 | `zday_start` | `zday gui start` |
 | `zday_start --auth cognito` | `zday gui start --auth cognito` |
 
+### Local HTTPS Setup
+
+The zebra_day web UI supports HTTPS for secure local development. By default, HTTPS is enabled if certificates are found.
+
+#### One-Time Setup (mkcert)
+
+```bash
+# Install mkcert
+# macOS
+brew install mkcert
+
+# Ubuntu/Debian
+sudo apt install mkcert
+
+# Create and install local CA (one-time, requires password)
+mkcert -install
+```
+
+#### Generate Certificates for zebra_day
+
+```bash
+# Create certificate directory
+mkdir -p ~/.config/zebra_day/certs
+
+# Generate locally-trusted certificates
+mkcert -cert-file ~/.config/zebra_day/certs/server.crt \
+       -key-file ~/.config/zebra_day/certs/server.key \
+       localhost 127.0.0.1 ::1
+```
+
+#### HTTPS Options
+
+| Method | Description |
+|--------|-------------|
+| **Auto-detect** | If certs exist in `~/.config/zebra_day/certs/`, HTTPS is enabled automatically |
+| **Explicit paths** | `zday gui start --cert /path/to/cert.crt --key /path/to/key.key` |
+| **Environment vars** | Set `SSL_CERT_PATH` and `SSL_KEY_PATH` |
+| **Force HTTP** | `zday gui start --no-https` |
+
+#### Verify HTTPS
+
+```bash
+# Start server (will use HTTPS if certs are found)
+zday gui start
+
+# Test connection
+curl https://localhost:8118/healthz
+```
+
+#### Troubleshooting
+
+| Issue | Solution |
+|-------|----------|
+| Browser shows "Not Secure" | Run `mkcert -install` to trust the local CA |
+| Certificate not found | Check paths: `ls ~/.config/zebra_day/certs/` |
+| Permission denied | Ensure cert files are readable: `chmod 644 ~/.config/zebra_day/certs/*` |
+| Want HTTP only | Use `--no-https` flag: `zday gui start --no-https` |
+
 ### It Is 3+ Things
 
   (1) Zebra Printer Management & Configuration
@@ -442,10 +500,12 @@ zebra_day 0.6.0+ includes a redesigned modern UI alongside the preserved legacy
 
 | Interface | URL | Description |
 |-----------|-----|-------------|
-| **Modern UI** | `http://localhost:8118/` | New dashboard with stats, quick actions, improved navigation |
-| **Legacy UI** | `http://localhost:8118/legacy` | Original interface, fully functional |
-| **API Docs** | `http://localhost:8118/docs` | Interactive OpenAPI/Swagger documentation |
-| **ReDoc** | `http://localhost:8118/redoc` | Alternative API documentation |
+| **Modern UI** | `https://localhost:8118/` | New dashboard with stats, quick actions, improved navigation |
+| **Legacy UI** | `https://localhost:8118/legacy` | Original interface, fully functional |
+| **API Docs** | `https://localhost:8118/docs` | Interactive OpenAPI/Swagger documentation |
+| **ReDoc** | `https://localhost:8118/redoc` | Alternative API documentation |
+
+> **Note:** Use `http://` instead of `https://` if running without certificates (`--no-https`).
 
 Both interfaces provide full functionality. The modern UI offers:
 - Dashboard with printer fleet statistics
@@ -519,7 +579,7 @@ When `--auth cognito` is enabled:
 
 Include the JWT token in the Authorization header:
 ```bash
-curl -H "Authorization: Bearer YOUR_JWT_TOKEN" http://localhost:8118/api/v1/printers
+curl -H "Authorization: Bearer YOUR_JWT_TOKEN" https://localhost:8118/api/v1/printers
 ```
 
 ### Secrets
@@ -724,3 +784,4 @@ Tthen run `sudo docker compose up --build -d` to run it then reach it at http://
  
  
  
+ 

{zebra_day-1.0.2 → zebra_day-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "zebra_day"
-version = "1.0.2"
+version = "2.0.0"
 description = "A Python library to manage a Zebra printer fleet and an API for ZPL print requests."
 readme = "README.md"
 license = {text = "MIT"}

zebra_day-2.0.0/tests/test_auth.py

@@ -0,0 +1,58 @@
+"""
+Tests for the zebra_day authentication module.
+"""
+import pytest
+
+from zebra_day.web import auth
+
+
+class TestCognitoAvailability:
+    """Tests for Cognito availability functions."""
+
+    def test_is_cognito_available_returns_bool(self):
+        """Test is_cognito_available returns a boolean."""
+        result = auth.is_cognito_available()
+        assert isinstance(result, bool)
+
+    def test_get_cognito_import_error_returns_string_or_none(self):
+        """Test get_cognito_import_error returns string or None."""
+        result = auth.get_cognito_import_error()
+        assert result is None or isinstance(result, str)
+
+    def test_cognito_available_matches_import_error(self):
+        """Test that availability and import error are consistent."""
+        is_available = auth.is_cognito_available()
+        import_error = auth.get_cognito_import_error()
+        
+        if is_available:
+            assert import_error is None
+        else:
+            assert import_error is not None
+
+
+class TestPublicPaths:
+    """Tests for PUBLIC_PATHS configuration."""
+
+    def test_public_paths_is_list(self):
+        """Test PUBLIC_PATHS is a list."""
+        assert isinstance(auth.PUBLIC_PATHS, list)
+
+    def test_public_paths_contains_healthz(self):
+        """Test PUBLIC_PATHS includes /healthz."""
+        assert "/healthz" in auth.PUBLIC_PATHS
+
+    def test_public_paths_contains_docs(self):
+        """Test PUBLIC_PATHS includes /docs."""
+        assert "/docs" in auth.PUBLIC_PATHS
+
+
+class TestSetupCognitoAuth:
+    """Tests for setup_cognito_auth function."""
+
+    def test_setup_cognito_raises_import_error_when_unavailable(self):
+        """Test setup_cognito_auth raises ImportError when daylily-cognito not installed."""
+        if not auth.is_cognito_available():
+            with pytest.raises(ImportError) as exc_info:
+                auth.setup_cognito_auth(None)
+            assert "daylily-cognito" in str(exc_info.value)
+

zebra_day-2.0.0/tests/test_cli.py

@@ -0,0 +1,110 @@
+"""
+Tests for the zebra_day CLI commands.
+"""
+import pytest
+from typer.testing import CliRunner
+
+from zebra_day.cli import app, _get_version
+
+
+runner = CliRunner()
+
+
+class TestCLIVersion:
+    """Tests for the version command."""
+
+    def test_get_version_returns_string(self):
+        """Test _get_version returns a string."""
+        version = _get_version()
+        assert isinstance(version, str)
+        assert len(version) > 0
+
+    def test_version_command(self):
+        """Test version command outputs version."""
+        result = runner.invoke(app, ["version"])
+        assert result.exit_code == 0
+        assert "zebra_day" in result.output
+
+
+class TestCLIInfo:
+    """Tests for the info command."""
+
+    def test_info_command(self):
+        """Test info command runs and shows table."""
+        result = runner.invoke(app, ["info"])
+        assert result.exit_code == 0
+        assert "Version" in result.output
+        assert "Config Dir" in result.output
+
+
+class TestCLIStatus:
+    """Tests for the status command."""
+
+    def test_status_command(self):
+        """Test status command runs."""
+        result = runner.invoke(app, ["status"])
+        assert result.exit_code == 0
+        # Status shows printer counts
+        assert "Labs" in result.output or "Printer" in result.output
+
+
+class TestCLITemplateList:
+    """Tests for template list command."""
+
+    def test_template_list_command(self):
+        """Test template list command runs."""
+        result = runner.invoke(app, ["template", "list"])
+        assert result.exit_code == 0
+        # Should show templates or empty list
+        assert "Template" in result.output or "Stable" in result.output or result.exit_code == 0
+
+
+class TestCLIPrinterList:
+    """Tests for printer list command."""
+
+    def test_printer_list_command(self):
+        """Test printer list command runs."""
+        result = runner.invoke(app, ["printer", "list"])
+        assert result.exit_code == 0
+
+
+class TestCLIHelp:
+    """Tests for CLI help output."""
+
+    def test_main_help(self):
+        """Test main help shows subcommands."""
+        result = runner.invoke(app, ["--help"])
+        assert result.exit_code == 0
+        assert "gui" in result.output
+        assert "printer" in result.output
+        assert "template" in result.output
+
+    def test_gui_help(self):
+        """Test gui subcommand help."""
+        result = runner.invoke(app, ["gui", "--help"])
+        assert result.exit_code == 0
+        assert "start" in result.output
+        assert "stop" in result.output
+
+    def test_printer_help(self):
+        """Test printer subcommand help."""
+        result = runner.invoke(app, ["printer", "--help"])
+        assert result.exit_code == 0
+        assert "list" in result.output
+
+    def test_template_help(self):
+        """Test template subcommand help."""
+        result = runner.invoke(app, ["template", "--help"])
+        assert result.exit_code == 0
+        assert "list" in result.output
+
+
+class TestCLIGuiStatus:
+    """Tests for GUI status command."""
+
+    def test_gui_status_command(self):
+        """Test gui status command runs."""
+        result = runner.invoke(app, ["gui", "status"])
+        # exit_code 0 = running, exit_code 1 = not running (both valid)
+        assert result.exit_code in (0, 1)
+

{zebra_day-1.0.2 → zebra_day-2.0.0}/tests/test_core_functions.py

@@ -106,15 +106,23 @@ class TestConfigJsonRoundtrip:
         zd_pm = zd.zpl()
         zd_pm.clear_printers_json()
 
-        # Add test data
+        # Add test data with v2 schema structure
         zd_pm.printers["labs"]["roundtrip_test"] = {
-            "TestPrinter": {
-                "ip_address": "10.0.0.99",
-                "label_zpl_styles": ["tube_2inX1in"],
-                "print_method": "socket",
-                "model": "ZD421",
-                "serial": "TEST123",
-                "arp_data": "na",
+            "lab_name": "Roundtrip Test Lab",
+            "available_locations": ["Bench A", "Bench B"],
+            "printers": {
+                "TestPrinter": {
+                    "ip_address": "10.0.0.99",
+                    "printer_name": "Test Printer Display Name",
+                    "lab_location": "Bench A",
+                    "manufacturer": "zebra",
+                    "label_zpl_styles": ["tube_2inX1in"],
+                    "print_method": "socket",
+                    "model": "ZD421",
+                    "serial": "TEST123",
+                    "arp_data": "na",
+                    "notes": ""
+                }
             }
         }
 
@@ -134,7 +142,9 @@ class TestConfigJsonRoundtrip:
 
             assert "labs" in loaded
             assert "roundtrip_test" in loaded["labs"]
-            assert loaded["labs"]["roundtrip_test"]["TestPrinter"]["ip_address"] == "10.0.0.99"
+            # v2 schema: printers are nested
+            assert loaded["labs"]["roundtrip_test"]["printers"]["TestPrinter"]["ip_address"] == "10.0.0.99"
+            assert loaded["labs"]["roundtrip_test"]["printers"]["TestPrinter"]["printer_name"] == "Test Printer Display Name"
 
             # Load into new instance
             zd_pm2 = zd.zpl()
@@ -164,9 +174,11 @@ class TestConfigJsonRoundtrip:
         zd_pm.create_new_printers_json_with_single_test_printer()
 
         assert "scan-results" in zd_pm.printers["labs"]
-        assert "Download-Label-png" in zd_pm.printers["labs"]["scan-results"]
+        # v2 schema: printers are nested under 'printers' key
+        assert "printers" in zd_pm.printers["labs"]["scan-results"]
+        assert "Download-Label-png" in zd_pm.printers["labs"]["scan-results"]["printers"]
         assert (
-            zd_pm.printers["labs"]["scan-results"]["Download-Label-png"]["ip_address"]
+            zd_pm.printers["labs"]["scan-results"]["printers"]["Download-Label-png"]["ip_address"]
             == "dl_png"
         )
 

zebra_day-2.0.0/tests/test_exceptions.py

@@ -0,0 +1,113 @@
+"""
+Tests for the zebra_day exceptions module.
+"""
+import pytest
+
+from zebra_day import exceptions
+
+
+class TestZebraDayError:
+    """Tests for base ZebraDayError."""
+
+    def test_can_raise_base_error(self):
+        """Test ZebraDayError can be raised."""
+        with pytest.raises(exceptions.ZebraDayError):
+            raise exceptions.ZebraDayError("test error")
+
+    def test_base_error_has_message(self):
+        """Test ZebraDayError preserves message."""
+        err = exceptions.ZebraDayError("test message")
+        assert "test message" in str(err)
+
+
+class TestPrinterConnectionError:
+    """Tests for PrinterConnectionError."""
+
+    def test_printer_connection_error_includes_ip(self):
+        """Test PrinterConnectionError includes IP address."""
+        err = exceptions.PrinterConnectionError("192.168.1.100", "timeout")
+        assert "192.168.1.100" in str(err)
+        assert err.printer_ip == "192.168.1.100"
+
+    def test_printer_connection_error_includes_message(self):
+        """Test PrinterConnectionError includes message."""
+        err = exceptions.PrinterConnectionError("192.168.1.100", "connection refused")
+        assert "connection refused" in str(err)
+
+
+class TestPrinterNotFoundError:
+    """Tests for PrinterNotFoundError."""
+
+    def test_printer_not_found_includes_name(self):
+        """Test PrinterNotFoundError includes printer name."""
+        err = exceptions.PrinterNotFoundError("my-printer")
+        assert "my-printer" in str(err)
+        assert err.printer_name == "my-printer"
+
+    def test_printer_not_found_includes_lab(self):
+        """Test PrinterNotFoundError includes lab when provided."""
+        err = exceptions.PrinterNotFoundError("my-printer", lab="lab-1")
+        assert "my-printer" in str(err)
+        assert "lab-1" in str(err)
+        assert err.lab == "lab-1"
+
+
+class TestConfigError:
+    """Tests for ConfigError and subclasses."""
+
+    def test_config_error(self):
+        """Test ConfigError basic usage."""
+        err = exceptions.ConfigError("config problem", config_path="/path/to/config")
+        assert "config problem" in str(err)
+        assert err.config_path == "/path/to/config"
+
+    def test_config_file_not_found_error(self):
+        """Test ConfigFileNotFoundError includes path."""
+        err = exceptions.ConfigFileNotFoundError("/path/to/config.json")
+        assert "/path/to/config.json" in str(err)
+        assert err.config_path == "/path/to/config.json"
+
+    def test_config_parse_error(self):
+        """Test ConfigParseError includes details."""
+        err = exceptions.ConfigParseError("/path/to/config.json", "invalid JSON")
+        assert "/path/to/config.json" in str(err)
+        assert "invalid JSON" in str(err)
+
+
+class TestLabelTemplateError:
+    """Tests for LabelTemplateError and subclasses."""
+
+    def test_label_template_error(self):
+        """Test LabelTemplateError basic usage."""
+        err = exceptions.LabelTemplateError("my_template", "invalid syntax")
+        assert "my_template" in str(err)
+        assert "invalid syntax" in str(err)
+        assert err.template_name == "my_template"
+
+    def test_label_template_not_found_error(self):
+        """Test LabelTemplateNotFoundError includes name."""
+        err = exceptions.LabelTemplateNotFoundError("missing_template")
+        assert "missing_template" in str(err)
+        assert "not found" in str(err)
+
+
+class TestZPLRenderError:
+    """Tests for ZPLRenderError."""
+
+    def test_zpl_render_error(self):
+        """Test ZPLRenderError basic usage."""
+        err = exceptions.ZPLRenderError("invalid ZPL code")
+        assert "invalid ZPL code" in str(err)
+        assert "render error" in str(err).lower()
+
+
+class TestNetworkScanError:
+    """Tests for NetworkScanError."""
+
+    def test_network_scan_error(self):
+        """Test NetworkScanError basic usage."""
+        err = exceptions.NetworkScanError("192.168.1", "timeout during scan")
+        assert "192.168.1" in str(err)
+        assert "timeout" in str(err)
+        assert err.ip_stub == "192.168.1"
+