pumaguard 20.post244__py3-none-any.whl → 20.post247__py3-none-any.whl

pumaguard/pumaguard-ui/.last_build_id

@@ -1 +1 @@
-0ae99f9305ff2c86009e63f124cd92f1
+01c252faf73780a4cebf82557c853a5d

pumaguard/pumaguard-ui/flutter_bootstrap.js

@@ -34,6 +34,6 @@ addEventListener("message", eventListener);
 if (!window._flutter) {
   window._flutter = {};
 }
-_flutter.buildConfig = {"engineRevision":"a5cb96369ef86c7e85abf5d662a1ca5d89775053","builds":[{"compileTarget":"dart2js","renderer":"canvaskit","mainJsPath":"main.dart.js"},{}],"useLocalCanvasKit":true};
+_flutter.buildConfig = {"engineRevision":"1527ae0ec577a4ef50e65f6fefcfc1326707d9bf","builds":[{"compileTarget":"dart2js","renderer":"canvaskit","mainJsPath":"main.dart.js"},{}],"useLocalCanvasKit":true};
 
 _flutter.loader.load();

pumaguard/pumaguard-ui/main.dart.js

@@ -88888,7 +88888,7 @@ A.MN.prototype={
 K(a){var s,r=null,q=A.awp(B.ae,r,r,B.nE)
 q=A.qy(B.mB,r,new A.mb(r,r,r,r,2,r,new A.cM(A.hF(12),B.u)),q,"Roboto",!0)
 s=A.awp(B.al,r,r,B.nE)
-return new A.Av(new A.va(new A.abI(),r,r,r,r,t.Gj),r,r,new A.zF(B.Hi,"PumaGuard v20-244-gf7678e7",q,A.qy(B.mB,r,new A.mb(r,r,r,r,2,r,new A.cM(A.hF(12),B.u)),s,"Roboto",!0),B.AQ,!1,r),r,t.Bp)}}
+return new A.Av(new A.va(new A.abI(),r,r,r,r,t.Gj),r,r,new A.zF(B.Hi,"PumaGuard v20-247-gf025667",q,A.qy(B.mB,r,new A.mb(r,r,r,r,2,r,new A.cM(A.hF(12),B.u)),s,"Roboto",!0),B.AQ,!1,r),r,t.Bp)}}
 A.abI.prototype={
 $1(a){return new A.m5()},
 $S:541}
@@ -89168,7 +89168,7 @@ q=A.aL("System Information",h,h,h,A.r(q).ok.r,h,h)
 s=i.d
 s=s==null?h:s.b
 s=i.tE("Backend Version",s==null?"Unknown":s)
-n=i.tE("UI Version","v20-244-gf7678e7")
+n=i.tE("UI Version","v20-247-gf025667")
 l=i.d
 k=l==null
 j=k?h:l.d

pumaguard/web_routes/dhcp.py

@@ -0,0 +1,178 @@
+"""DHCP event routes for camera detection notifications."""
+
+from __future__ import (
+    annotations,
+)
+
+import logging
+from typing import (
+    TYPE_CHECKING,
+)
+
+from flask import (
+    jsonify,
+    request,
+)
+
+if TYPE_CHECKING:
+    from flask import (
+        Flask,
+    )
+
+    from pumaguard.web_ui import (
+        WebUI,
+    )
+
+logger = logging.getLogger(__name__)
+
+
+def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
+    """Register DHCP event endpoints for camera detection."""
+
+    @app.route("/api/dhcp/event", methods=["POST"])
+    def dhcp_event():
+        """
+        Receive DHCP event notifications from dnsmasq script.
+
+        Expected JSON payload:
+        {
+            "action": "add|old|del",
+            "mac_address": "xx:xx:xx:xx:xx:xx",
+            "ip_address": "192.168.52.xxx",
+            "hostname": "device-hostname",
+            "timestamp": "ISO8601 timestamp"
+        }
+        """
+        try:
+            data = request.get_json()
+
+            if not data:
+                return jsonify({"error": "No JSON data provided"}), 400
+
+            action = data.get("action")
+            mac_address = data.get("mac_address")
+            ip_address = data.get("ip_address")
+            hostname = data.get("hostname")
+            timestamp = data.get("timestamp")
+
+            # Log the DHCP event (MAC address redacted)
+            logger.info(
+                "DHCP event received: action=%s, hostname=%s, "
+                "mac=%s, ip=%s, timestamp=%s",
+                action,
+                hostname,
+                "***",
+                ip_address,
+                timestamp,
+            )
+
+            # Store camera information in webui.cameras dictionary
+            if action in ["add", "old"]:
+                # Camera connected or renewed lease
+                logger.info(
+                    "Camera '%s' connected at IP %s", hostname, ip_address
+                )
+                # Store camera info indexed by MAC address
+                webui.cameras[mac_address] = {
+                    "hostname": hostname,
+                    "ip_address": ip_address,
+                    "mac_address": mac_address,
+                    "last_seen": timestamp,
+                    "status": "connected",
+                }
+            elif action == "del":
+                # Camera disconnected
+                logger.info("Camera '%s' disconnected", hostname)
+                # Update camera status to disconnected (keep history)
+                if mac_address in webui.cameras:
+                    webui.cameras[mac_address]["status"] = "disconnected"
+                    webui.cameras[mac_address]["last_seen"] = timestamp
+
+            return (
+                jsonify(
+                    {
+                        "status": "success",
+                        "message": "DHCP event processed",
+                        "data": {
+                            "action": action,
+                            "hostname": hostname,
+                            "ip_address": ip_address,
+                        },
+                    }
+                ),
+                200,
+            )
+
+        except Exception as e:  # pylint: disable=broad-except
+            logger.error("Error processing DHCP event: %s", str(e))
+            return (
+                jsonify(
+                    {
+                        "error": "Failed to process DHCP event",
+                    }
+                ),
+                500,
+            )
+
+    @app.route("/api/dhcp/cameras", methods=["GET"])
+    def get_cameras():
+        """
+        Get list of known cameras.
+
+        Returns all detected cameras with their connection status.
+        """
+        cameras_list = list(webui.cameras.values())
+
+        return (
+            jsonify(
+                {
+                    "cameras": cameras_list,
+                    "count": len(cameras_list),
+                }
+            ),
+            200,
+        )
+
+    @app.route("/api/dhcp/cameras/<mac_address>", methods=["GET"])
+    def get_camera(mac_address: str):
+        """
+        Get specific camera by MAC address.
+
+        Args:
+            mac_address: MAC address of the camera (e.g., aa:bb:cc:dd:ee:ff)
+        """
+        # Normalize MAC address format (lowercase, colons)
+        mac_address = mac_address.lower()
+
+        if mac_address in webui.cameras:
+            return jsonify(webui.cameras[mac_address]), 200
+        return (
+            jsonify(
+                {
+                    "error": "Camera not found",
+                    "mac_address": mac_address,
+                }
+            ),
+            404,
+        )
+
+    @app.route("/api/dhcp/cameras", methods=["DELETE"])
+    def clear_cameras():
+        """
+        Clear all camera records.
+
+        This removes all stored camera information from memory.
+        """
+        count = len(webui.cameras)
+        webui.cameras.clear()
+        logger.info("Cleared %d camera records", count)
+
+        return (
+            jsonify(
+                {
+                    "status": "success",
+                    "message": f"Cleared {count} camera record(s)",
+                }
+            ),
+            200,
+        )

pumaguard/web_ui.py

@@ -39,6 +39,9 @@ from pumaguard.presets import (
 from pumaguard.web_routes.artifacts import (
     register_artifacts_routes,
 )
+from pumaguard.web_routes.dhcp import (
+    register_dhcp_routes,
+)
 from pumaguard.web_routes.diagnostics import (
     register_diagnostics_routes,
 )
@@ -66,6 +69,16 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
+class CameraInfo(TypedDict):
+    """Type definition for camera information stored in webui.cameras."""
+
+    hostname: str
+    ip_address: str
+    mac_address: str
+    last_seen: str
+    status: str
+
+
 class PhotoDict(TypedDict):
     """Type definition for photo metadata dictionary."""
 
@@ -144,6 +157,10 @@ class WebUI:
         self.image_directories: list[str] = []
         self.classification_directories: list[str] = []
 
+        # Camera tracking - stores detected cameras by MAC address
+        # Format: {mac_address: CameraInfo}
+        self.cameras: dict[str, CameraInfo] = {}
+
         # mDNS/Zeroconf support
         self.zeroconf: Zeroconf | None = None
         self.service_info: ServiceInfo | None = None
@@ -241,6 +258,8 @@ class WebUI:
 
         register_diagnostics_routes(self.app, self)
 
+        register_dhcp_routes(self.app, self)
+
         @self.app.route("/<path:path>")
         def serve_static(path: str):
             """

{pumaguard-20.post244.dist-info → pumaguard-20.post247.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pumaguard
-Version: 20.post244
+Version: 20.post247
 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-20.post244.dist-info → pumaguard-20.post247.dist-info}/RECORD

@@ -11,18 +11,18 @@ pumaguard/sound.py,sha256=fUp0FWmuj99ZMDacZAayYZOurFfvp68aFxqj0VvbqGw,4723
 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=2TuJs3Wcn9HHr9FQBl2HHtS9Ki-qg0ufXc35Up3TQiY,15665
+pumaguard/web_ui.py,sha256=_DiEELlJwuL4DjlUoxGFnHecRmIc21J6zvQwEcXpFdA,16140
 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
 pumaguard/completions/pumaguard-train-completions.sh,sha256=lI8LG-QrncvhUqCeKtfrSU1MSRBn52KnDsiJJQm37W4,1184
-pumaguard/pumaguard-ui/.last_build_id,sha256=44nL03JzUFDZwdvMJrofy7jk3ZWVr-aW8se0TOV0weg,32
+pumaguard/pumaguard-ui/.last_build_id,sha256=MqeXJXz-uOBq3M0XNvGxIcX4cKB19A_LfS3HU_820DM,32
 pumaguard/pumaguard-ui/favicon.png,sha256=erJSX0uGtl0-THA1ihfloar29Df5nLzARtrXPVm7kBU,917
 pumaguard/pumaguard-ui/flutter.js,sha256=7V1ZIKmGiouT15CpquQWWmKWJyjUq77FoU9gDXPFO9M,9412
-pumaguard/pumaguard-ui/flutter_bootstrap.js,sha256=RYi4PhelQMs063sa3jCr0BLWDMAzY7lKs-ksCptkaQM,9692
+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=Iuyy0NCeH642Ig0EqaARkXzSwo4Kp-05uuU3bUk_GjE,2727567
+pumaguard/pumaguard-ui/main.dart.js,sha256=uoSU-v_5ZgHKWW3pWQoEZg2hQXQoTKymXVCSXmJ61hQ,2727567
 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
@@ -58,13 +58,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=wgRwN-pMix5FxJ-UWG38Hn5FiZpMvUxW0rpff_hYjUA,5176
 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=kjSqoX6E38UJ_J_YZRQr7QmACR7bDwFcUarqnowjHP4,11655
 pumaguard/web_routes/sync.py,sha256=Zvv6VARGE5xP29C5gWH3ul81PISRxoF8n472DITItE0,6378
-pumaguard-20.post244.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pumaguard-20.post247.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
@@ -82,8 +83,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-20.post244.dist-info/METADATA,sha256=E5fBahqRasHj0DrWgqy9M-sArwNjzVkw823cpyCuX0k,8618
-pumaguard-20.post244.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pumaguard-20.post244.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
-pumaguard-20.post244.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
-pumaguard-20.post244.dist-info/RECORD,,
+pumaguard-20.post247.dist-info/METADATA,sha256=c7Jd4SrpH9_78yrulTC-8HsivfMx5as13QBC-0uqWeE,8618
+pumaguard-20.post247.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pumaguard-20.post247.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
+pumaguard-20.post247.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
+pumaguard-20.post247.dist-info/RECORD,,