pumaguard 21.post12__py3-none-any.whl → 21.post15__py3-none-any.whl

pumaguard/server.py

@@ -20,6 +20,9 @@ from PIL import (
     Image,
 )
 
+from pumaguard import (
+    __version__,
+)
 from pumaguard.lock_manager import (
     acquire_lock,
 )
@@ -430,6 +433,8 @@ def main(options: argparse.Namespace, presets: Preset):
     signal.signal(signal.SIGTERM, handle_termination)
     signal.signal(signal.SIGINT, handle_termination)
 
+    logger.info("Pumaguard version %s started", __version__)
+
     try:
         while True:
             time.sleep(1)

pumaguard/web_routes/dhcp.py

@@ -4,7 +4,13 @@ from __future__ import (
     annotations,
 )
 
+import json
 import logging
+import queue
+import threading
+from collections.abc import (
+    Callable,
+)
 from datetime import (
     datetime,
     timezone,
@@ -14,8 +20,10 @@ from typing import (
 )
 
 from flask import (
+    Response,
     jsonify,
     request,
+    stream_with_context,
 )
 
 if TYPE_CHECKING:
@@ -30,8 +38,44 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
-    """Register DHCP event endpoints for camera detection."""
+def register_dhcp_routes(
+    app: "Flask", webui: "WebUI"
+) -> Callable[[str, dict], None]:
+    """
+    Register DHCP event endpoints for camera detection.
+
+    Returns:
+        Callback function to notify SSE clients of camera changes
+    """
+
+    # Queue for SSE notifications
+    sse_clients: list[queue.Queue] = []
+    sse_clients_lock = threading.Lock()
+
+    def notify_camera_change(event_type: str, camera_data: dict) -> None:
+        """Notify all SSE clients about a camera status change."""
+        message = {
+            "type": event_type,
+            "data": camera_data,
+            "timestamp": datetime.now(timezone.utc).strftime(
+                "%Y-%m-%dT%H:%M:%SZ"
+            ),
+        }
+
+        with sse_clients_lock:
+            disconnected_clients = []
+            for client_queue in sse_clients:
+                try:
+                    # Non-blocking put with timeout
+                    client_queue.put(message, block=False)
+                except queue.Full:
+                    # Client queue is full, mark for removal
+                    disconnected_clients.append(client_queue)
+
+            # Remove disconnected clients
+            for client_queue in disconnected_clients:
+                sse_clients.remove(client_queue)
+                logger.debug("Removed disconnected SSE client")
 
     @app.route("/api/dhcp/event", methods=["POST"])
     def dhcp_event():
@@ -85,6 +129,11 @@ def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
                     "status": "connected",
                 }
 
+                # Notify SSE clients
+                notify_camera_change(
+                    "camera_connected", dict(webui.cameras[mac_address])
+                )
+
                 # Update settings with camera list
                 # Convert cameras dict to list for settings persistence
                 camera_list = []
@@ -118,6 +167,11 @@ def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
                     webui.cameras[mac_address]["status"] = "disconnected"
                     webui.cameras[mac_address]["last_seen"] = timestamp
 
+                    # Notify SSE clients
+                    notify_camera_change(
+                        "camera_disconnected", dict(webui.cameras[mac_address])
+                    )
+
                     # Update settings with updated camera list
                     camera_list = []
                     for _, cam_info in webui.cameras.items():
@@ -287,6 +341,11 @@ def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
                     "Failed to save camera list to settings: %s", str(e)
                 )
 
+            # Notify SSE clients
+            notify_camera_change(
+                "camera_added", dict(webui.cameras[mac_address])
+            )
+
             return (
                 jsonify(
                     {
@@ -386,3 +445,79 @@ def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
                 ),
                 500,
             )
+
+    @app.route("/api/dhcp/cameras/events", methods=["GET"])
+    def camera_events():
+        """
+        Server-Sent Events (SSE) endpoint for real-time camera status updates.
+
+        This endpoint provides a stream of camera status changes including:
+        - camera_connected: A camera has connected
+        - camera_disconnected: A camera has disconnected
+        - camera_added: A camera was manually added
+        - camera_status_changed: Camera status changed (from heartbeat)
+
+        The stream sends JSON-formatted events with the following structure:
+        {
+            "type": "event_type",
+            "data": {...camera data...},
+            "timestamp": "ISO8601 timestamp"
+        }
+        """
+
+        def event_stream():
+            # Create a queue for this client
+            client_queue: queue.Queue = queue.Queue(maxsize=10)
+
+            with sse_clients_lock:
+                sse_clients.append(client_queue)
+
+            logger.info(
+                "SSE client connected, total clients: %d", len(sse_clients)
+            )
+
+            try:
+                # Send initial connection message
+                # Send initial connection message
+                initial_msg = {
+                    "type": "connected",
+                    "timestamp": datetime.now(timezone.utc).strftime(
+                        "%Y-%m-%dT%H:%M:%SZ"
+                    ),
+                }
+                yield f"data: {json.dumps(initial_msg)}\n\n"
+
+                # Stream events to client
+                while True:
+                    try:
+                        # Wait for messages with timeout for periodic keepalive
+                        message = client_queue.get(timeout=30)
+                        yield f"data: {json.dumps(message)}\n\n"
+                    except queue.Empty:
+                        # Send keepalive comment to prevent connection timeout
+                        yield ": keepalive\n\n"
+            except GeneratorExit:
+                # Client disconnected
+                logger.info("SSE client disconnected")
+            finally:
+                # Remove this client from the list
+                with sse_clients_lock:
+                    if client_queue in sse_clients:
+                        sse_clients.remove(client_queue)
+                logger.info(
+                    "SSE client removed, remaining clients: %d",
+                    len(sse_clients),
+                )
+
+        return Response(
+            stream_with_context(event_stream()),
+            mimetype="text/event-stream",
+            headers={
+                "Cache-Control": "no-cache",
+                "X-Accel-Buffering": "no",
+                "Connection": "keep-alive",
+            },
+        )
+
+    # Return the notification callback so it can be wired to heartbeat
+    return notify_camera_change

pumaguard/web_ui.py

@@ -164,7 +164,7 @@ class WebUI:
         # Format: {mac_address: CameraInfo}
         self.cameras: dict[str, CameraInfo] = {}
 
-        # Camera heartbeat monitoring
+        # Camera heartbeat monitoring (callback set after routes registered)
         self.heartbeat: CameraHeartbeat = CameraHeartbeat(
             webui=self,
             interval=presets.camera_heartbeat_interval,
@@ -173,6 +173,8 @@ class WebUI:
             tcp_port=presets.camera_heartbeat_tcp_port,
             tcp_timeout=presets.camera_heartbeat_tcp_timeout,
             icmp_timeout=presets.camera_heartbeat_icmp_timeout,
+            # Will be set after routes are registered
+            status_change_callback=None,
         )
 
         # Load cameras from persisted settings
@@ -284,7 +286,11 @@ class WebUI:
 
         register_diagnostics_routes(self.app, self)
 
-        register_dhcp_routes(self.app, self)
+        # Register DHCP routes and get the SSE notification callback
+        camera_notification_callback = register_dhcp_routes(self.app, self)
+
+        # Wire the callback to the heartbeat monitor
+        self.heartbeat.status_change_callback = camera_notification_callback
 
         @self.app.route("/<path:path>")
         def serve_static(path: str):

{pumaguard-21.post12.dist-info → pumaguard-21.post15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pumaguard
-Version: 21.post12
+Version: 21.post15
 Author-email: Nicolas Bock <nicolasbock@gmail.com>
 Project-URL: Homepage, http://pumaguard.rtfd.io/
 Project-URL: Repository, https://github.com/PEEC-Nature-Youth-Group/pumaguard

{pumaguard-21.post12.dist-info → pumaguard-21.post15.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pumaguard/__init__.py,sha256=QUsYaH1hG9RKygFZfaS5tpe9pgN_1Kf7EMroQCVlQfE,421
-pumaguard/camera_heartbeat.py,sha256=vfdprxBnVDF-_iA9MUaI2tVh4AbeqP1j09xKqT2N25Y,10291
+pumaguard/camera_heartbeat.py,sha256=-prAAzR29Cqhp2AL3xEgB4o6RmXEON2ezgkcG_1MkN8,11343
 pumaguard/classify.py,sha256=QnHfnIlkzSxHGy0dgqT6IeTbRBboRT3c3B_YC3YpqfI,1057
 pumaguard/lock_manager.py,sha256=sYLl8Z7miOr_9R7ehoSFlKf8tToHNNUT6aH9Mlw2M9g,1608
 pumaguard/main.py,sha256=1Wazv1wjwb46yNlqgWt88HQwKSxGmY24X5OsUv8gYyE,7029
@@ -7,12 +7,12 @@ pumaguard/model-registry.yaml,sha256=V-pTaqJrk_jJo568okBDaVhs51qTHttSqKe6PqdX6Bc
 pumaguard/model_cli.py,sha256=nzDv0lXSvRKpLxs579tiHInJPPV-AFO4jzeLk5t2GaA,1394
 pumaguard/model_downloader.py,sha256=zJQgCMOF2AfhB30VsfOMYtgRxcxVxkZBAdtG8KznPyY,12895
 pumaguard/presets.py,sha256=RziRfHRcRAA4ykNm9m2dfk7ko3xdpoS6natlAlzLJH4,28164
-pumaguard/server.py,sha256=zmzSXabt6K26u8kwBPdm1gI6aMAwJo3gCaSaX5Sh0vk,14705
+pumaguard/server.py,sha256=MhZhQxGBTNiCSegxmVCfcGbIs3XX5BVZvTBxRrvsLL4,14810
 pumaguard/sound.py,sha256=-ceyO9xjfuVSal-CvaM_o2l45gYWUUV3bJN-Eni2XQQ,4732
 pumaguard/stats.py,sha256=ZwocfnFCQ-ky7me-YTTrEoJqsIHOWAgSzeoJHItsIU4,927
 pumaguard/utils.py,sha256=w1EgOLSZGyjq_b49hvVZhBESy-lVP0yRtNHe-sXBoIU,19735
 pumaguard/verify.py,sha256=vfw3PRzDt1uuH5FKV9F5vb1PH7KQ6AEgVNhJ6jck_hQ,5513
-pumaguard/web_ui.py,sha256=N51XEKBuCJfBWUsm4EqvzpS1EG5ey6Z2kBlKnCitRqQ,17332
+pumaguard/web_ui.py,sha256=HPecXKkWCA-HXiCRGrSwaP79HKYDvh07Ymk3xJwDQXc,17697
 pumaguard/completions/pumaguard-classify-completions.sh,sha256=5QySg-2Jdinj15qpUYa5UzHbTgYzi2gmPVYYyyXny4c,1353
 pumaguard/completions/pumaguard-completions.sh,sha256=bRx3Q3_gM__3w0PyfQSCVdxylhhr3QlzaLCav24dfNc,1196
 pumaguard/completions/pumaguard-server-completions.sh,sha256=33c6GjbTImBOHn0SSNUOJoxqJ2mMHuDv3P3GQJGGHhA,1161
@@ -23,7 +23,7 @@ pumaguard/pumaguard-ui/flutter.js,sha256=7V1ZIKmGiouT15CpquQWWmKWJyjUq77FoU9gDXP
 pumaguard/pumaguard-ui/flutter_bootstrap.js,sha256=Nyt0e7m8U4hq4CmcHhK1ij4hNgUqANM1o4YieKUx4rA,9692
 pumaguard/pumaguard-ui/flutter_service_worker.js,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pumaguard/pumaguard-ui/index.html,sha256=901-ZY0WysVAZWPwj2xGatoezwm9TX9IV_jpMrlsaXg,1205
-pumaguard/pumaguard-ui/main.dart.js,sha256=x084j40pcRNTCBLkRa8waf0hqNWcfy-jeKkV7g19zKE,2729035
+pumaguard/pumaguard-ui/main.dart.js,sha256=o1zAaTzulSMEVOFIRcvGflrS4F0MiKGCyTgn0w-iZAM,2743113
 pumaguard/pumaguard-ui/manifest.json,sha256=Hhnw_eLUivdrOlL7O9KGBsGXCKKt3lix17Fh3GB0g-s,920
 pumaguard/pumaguard-ui/version.json,sha256=uXZ6musTJUZaO0N2bEbr3cy9rpx2aesAS2YFMcu2WF8,94
 pumaguard/pumaguard-ui/assets/AssetManifest.bin,sha256=Qzp1G9iPlHSW-PnHyszTxZO31_NjmTlvSBWY_REPH_8,562
@@ -59,14 +59,14 @@ pumaguard/pumaguard-ui/icons/Icon-maskable-192.png,sha256=0shC4iqfTsnZlrIzc6kFyI
 pumaguard/pumaguard-ui/icons/Icon-maskable-512.png,sha256=au4Gzcq2sq73Sxc0xHePRCHS2hALD_nlKyG1UkAgKSk,20998
 pumaguard/web_routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pumaguard/web_routes/artifacts.py,sha256=IpnMLdbgAYkwU3TuYJE-JHGnC_x5_XNCrc-1M_n2YKk,3879
-pumaguard/web_routes/dhcp.py,sha256=YoF-987Ro1DqVBu1szloIkW-XQx81-WMKgqk83dNoRc,12607
+pumaguard/web_routes/dhcp.py,sha256=Fr3Zx8vA_6q1v3F37v4TlDlDM-wjBwo9FpfxOZ72zuo,17265
 pumaguard/web_routes/diagnostics.py,sha256=EIIbjuixJyGXdnVQf8RQ6xQxJar0UHZO8dF-9zQLY9g,3294
 pumaguard/web_routes/directories.py,sha256=yy5TghCEyB4reRGAcVHIEfr2vlHnuiDChIXl9ZFquRM,2410
 pumaguard/web_routes/folders.py,sha256=Z63ap6dRi6NWye70HYurpCnsSXmFgzTbTsFKYdZ1Bjk,6305
 pumaguard/web_routes/photos.py,sha256=Tac_CbaZSeZzOfaJ73vlp3iyZbvfD7ei1YM3tsb0nTY,5106
 pumaguard/web_routes/settings.py,sha256=GA7MERNRRnR2lfrG-aSRx8bJO5OTqVzyQTYSqPYP8wc,11754
 pumaguard/web_routes/sync.py,sha256=Zvv6VARGE5xP29C5gWH3ul81PISRxoF8n472DITItE0,6378
-pumaguard-21.post12.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pumaguard-21.post15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 pumaguard-sounds/cougar_call.mp3,sha256=jdPzi7Qneect3ez2G6XAeHWtetU5vSOSB6pceuB26Wc,129048
 pumaguard-sounds/cougarsounds.wav,sha256=hwVmmQ75dkOP3qd07YAvVOSm1neYtxLSzxw3Ulvs2cM,96346
 pumaguard-sounds/dark-engine-logo-141942.mp3,sha256=Vw-qyLTMPJZvsgQcZtH0DpGcP1dd7nJq-9BnHuNPGug,372819
@@ -84,8 +84,8 @@ pumaguard-sounds/mixkit-vintage-telephone-ringtone-1356.wav,sha256=zWWY2uFF0-l7P
 pumaguard-sounds/pumaguard-warning.mp3,sha256=wcCfHsulPo5P5s8MjpQAG2NYHQDsRpjqoMig1-o_MDI,232249
 pumaguard-sounds/short-round-110940.mp3,sha256=vdskGD94SeH1UJyJyR0Ek_7xGXPIZfnPdoBvxGnUt98,450816
 pumaguard-ui/ios/Flutter/ephemeral/flutter_lldb_helper.py,sha256=Bc_jl3_e5ZPvrSBJpPYtN05VxpztyKq-7lVms3rLg4Q,1276
-pumaguard-21.post12.dist-info/METADATA,sha256=dVEczrWr1qlnND546UgF_cpmQS_yW-9gNNBJY4GcjKI,8617
-pumaguard-21.post12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pumaguard-21.post12.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
-pumaguard-21.post12.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
-pumaguard-21.post12.dist-info/RECORD,,
+pumaguard-21.post15.dist-info/METADATA,sha256=B-FrBx-CPyu_8heSlsv7pJY2wBPuiv6C80HQhWorBFg,8617
+pumaguard-21.post15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pumaguard-21.post15.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
+pumaguard-21.post15.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
+pumaguard-21.post15.dist-info/RECORD,,