pumaguard 21__py3-none-any.whl → 21.post4__py3-none-any.whl

pumaguard/sound.py

@@ -6,7 +6,9 @@ import logging
 import subprocess
 import sys
 import threading
-from typing import Optional
+from typing import (
+    Optional,
+)
 
 logger = logging.getLogger(__name__)
 

pumaguard/web_routes/dhcp.py

@@ -5,6 +5,10 @@ from __future__ import (
 )
 
 import logging
+from datetime import (
+    datetime,
+    timezone,
+)
 from typing import (
     TYPE_CHECKING,
 )
@@ -80,6 +84,32 @@ def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
                     "last_seen": timestamp,
                     "status": "connected",
                 }
+
+                # Update settings with camera list
+                # Convert cameras dict to list for settings persistence
+                camera_list = []
+                for _, cam_info in webui.cameras.items():
+                    camera_list.append(
+                        {
+                            "hostname": cam_info["hostname"],
+                            "ip_address": cam_info["ip_address"],
+                            "mac_address": cam_info["mac_address"],
+                            "last_seen": cam_info["last_seen"],
+                            "status": cam_info["status"],
+                        }
+                    )
+
+                webui.presets.cameras = camera_list
+
+                # Persist to settings file
+                try:
+                    webui.presets.save()
+                    logger.info("Camera list saved to settings")
+                except Exception as e:  # pylint: disable=broad-except
+                    logger.error(
+                        "Failed to save camera list to settings: %s", str(e)
+                    )
+
             elif action == "del":
                 # Camera disconnected
                 logger.info("Camera '%s' disconnected", hostname)
@@ -88,6 +118,31 @@ def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
                     webui.cameras[mac_address]["status"] = "disconnected"
                     webui.cameras[mac_address]["last_seen"] = timestamp
 
+                    # Update settings with updated camera list
+                    camera_list = []
+                    for _, cam_info in webui.cameras.items():
+                        camera_list.append(
+                            {
+                                "hostname": cam_info["hostname"],
+                                "ip_address": cam_info["ip_address"],
+                                "mac_address": cam_info["mac_address"],
+                                "last_seen": cam_info["last_seen"],
+                                "status": cam_info["status"],
+                            }
+                        )
+
+                    webui.presets.cameras = camera_list
+
+                    # Persist to settings file
+                    try:
+                        webui.presets.save()
+                        logger.info("Camera list updated in settings")
+                    except Exception as e:  # pylint: disable=broad-except
+                        logger.error(
+                            "Failed to save camera list to settings: %s",
+                            str(e),
+                        )
+
             return (
                 jsonify(
                     {
@@ -156,6 +211,104 @@ def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
             404,
         )
 
+    @app.route("/api/dhcp/cameras", methods=["POST"])
+    def add_camera():
+        """
+        Manually add a camera (for testing purposes).
+
+        Expected JSON payload:
+        {
+            "hostname": "camera-name",
+            "ip_address": "192.168.52.100",
+            "mac_address": "aa:bb:cc:dd:ee:ff",
+            "status": "connected"  // optional, defaults to "connected"
+        }
+        """
+        try:
+            data = request.get_json()
+
+            if not data:
+                return jsonify({"error": "No JSON data provided"}), 400
+
+            hostname = data.get("hostname")
+            ip_address = data.get("ip_address")
+            mac_address = data.get("mac_address")
+            status = data.get("status", "connected")
+
+            # Validate required fields
+            if not hostname or not ip_address or not mac_address:
+                return (
+                    jsonify(
+                        {
+                            "error": "Missing required fields: hostname, "
+                            "ip_address, mac_address"
+                        }
+                    ),
+                    400,
+                )
+
+            # Generate timestamp
+            timestamp = datetime.now(timezone.utc).strftime(
+                "%Y-%m-%dT%H:%M:%SZ"
+            )
+
+            # Add camera to webui.cameras
+            webui.cameras[mac_address] = {
+                "hostname": hostname,
+                "ip_address": ip_address,
+                "mac_address": mac_address,
+                "last_seen": timestamp,
+                "status": status,
+            }
+
+            # Update settings with camera list
+            camera_list = []
+            for _, cam_info in webui.cameras.items():
+                camera_list.append(
+                    {
+                        "hostname": cam_info["hostname"],
+                        "ip_address": cam_info["ip_address"],
+                        "mac_address": cam_info["mac_address"],
+                        "last_seen": cam_info["last_seen"],
+                        "status": cam_info["status"],
+                    }
+                )
+
+            webui.presets.cameras = camera_list
+
+            # Persist to settings file
+            try:
+                webui.presets.save()
+                logger.info(
+                    "Manually added camera '%s' at %s", hostname, ip_address
+                )
+            except Exception as e:  # pylint: disable=broad-except
+                logger.error(
+                    "Failed to save camera list to settings: %s", str(e)
+                )
+
+            return (
+                jsonify(
+                    {
+                        "status": "success",
+                        "message": "Camera added successfully",
+                        "camera": webui.cameras[mac_address],
+                    }
+                ),
+                201,
+            )
+
+        except Exception as e:  # pylint: disable=broad-except
+            logger.error("Error adding camera: %s", str(e))
+            return (
+                jsonify(
+                    {
+                        "error": "Failed to add camera",
+                    }
+                ),
+                500,
+            )
+
     @app.route("/api/dhcp/cameras", methods=["DELETE"])
     def clear_cameras():
         """
@@ -167,6 +320,14 @@ def register_dhcp_routes(app: "Flask", webui: "WebUI") -> None:
         webui.cameras.clear()
         logger.info("Cleared %d camera records", count)
 
+        # Update settings
+        webui.presets.cameras = []
+        try:
+            webui.presets.save()
+            logger.info("Camera list cleared from settings")
+        except Exception as e:  # pylint: disable=broad-except
+            logger.error("Failed to save camera list to settings: %s", str(e))
+
         return (
             jsonify(
                 {

pumaguard/web_routes/settings.py

@@ -48,7 +48,21 @@ def register_settings_routes(app: "Flask", webui: "WebUI") -> None:
 
     @app.route("/api/settings", methods=["GET"])
     def get_settings():
-        return jsonify(dict(webui.presets))
+        settings_dict = dict(webui.presets)
+        # Add cameras from webui.cameras (runtime state)
+        camera_list = []
+        for _, cam_info in webui.cameras.items():
+            camera_list.append(
+                {
+                    "hostname": cam_info["hostname"],
+                    "ip_address": cam_info["ip_address"],
+                    "mac_address": cam_info["mac_address"],
+                    "last_seen": cam_info["last_seen"],
+                    "status": cam_info["status"],
+                }
+            )
+        settings_dict["cameras"] = camera_list
+        return jsonify(settings_dict)
 
     @app.route("/api/settings", methods=["PUT"])
     def update_settings():

pumaguard/web_ui.py

@@ -161,6 +161,18 @@ class WebUI:
         # Format: {mac_address: CameraInfo}
         self.cameras: dict[str, CameraInfo] = {}
 
+        # Load cameras from persisted settings
+        for camera in presets.cameras:
+            mac = camera.get("mac_address")
+            if mac:
+                self.cameras[mac] = CameraInfo(
+                    hostname=camera.get("hostname", ""),
+                    ip_address=camera.get("ip_address", ""),
+                    mac_address=mac,
+                    last_seen=camera.get("last_seen", ""),
+                    status=camera.get("status", "disconnected"),
+                )
+
         # mDNS/Zeroconf support
         self.zeroconf: Zeroconf | None = None
         self.service_info: ServiceInfo | None = None

{pumaguard-21.dist-info → pumaguard-21.post4.dist-info}/METADATA

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

@@ -5,13 +5,13 @@ pumaguard/main.py,sha256=1Wazv1wjwb46yNlqgWt88HQwKSxGmY24X5OsUv8gYyE,7029
 pumaguard/model-registry.yaml,sha256=V-pTaqJrk_jJo568okBDaVhs51qTHttSqKe6PqdX6Bc,10318
 pumaguard/model_cli.py,sha256=nzDv0lXSvRKpLxs579tiHInJPPV-AFO4jzeLk5t2GaA,1394
 pumaguard/model_downloader.py,sha256=zJQgCMOF2AfhB30VsfOMYtgRxcxVxkZBAdtG8KznPyY,12895
-pumaguard/presets.py,sha256=2owFBEqpeAjrFLSYtF9o3wQCc8aDjpwnU5j_YXSyIZ0,27757
+pumaguard/presets.py,sha256=CUTOfrk2d1yprDox7h_S_HUiQUq8cVHJPz6Ua9LsFCM,27884
 pumaguard/server.py,sha256=zmzSXabt6K26u8kwBPdm1gI6aMAwJo3gCaSaX5Sh0vk,14705
-pumaguard/sound.py,sha256=fUp0FWmuj99ZMDacZAayYZOurFfvp68aFxqj0VvbqGw,4723
+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=_DiEELlJwuL4DjlUoxGFnHecRmIc21J6zvQwEcXpFdA,16140
+pumaguard/web_ui.py,sha256=2NtiW35rlLXhWXPAIShsK-pH8HUvog6rDQykeTD8Dy0,16636
 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
@@ -22,7 +22,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=NMSeX3a-fd8kOCqxj6hsYyLWGiTwnLS66BQmEWXTC3E,2727541
+pumaguard/pumaguard-ui/main.dart.js,sha256=Tz84jjODZPfwWO-wvAwzM1DUew3Kv1hjCzLnDZhzBeE,2733274
 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,14 +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/dhcp.py,sha256=hQfYLiDmJeDvGzPmx74LovzbhNN2ywPZfP7avXTJ-FA,10971
 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/settings.py,sha256=Rvt1wWqWi0ZsrmylacrgbPEXOjmaGIsLcMwVGVov5e0,12232
 pumaguard/web_routes/sync.py,sha256=Zvv6VARGE5xP29C5gWH3ul81PISRxoF8n472DITItE0,6378
-pumaguard-21.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pumaguard-21.post4.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
@@ -83,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-21.dist-info/METADATA,sha256=QrHSYlqLKczr0NSv-i9MKDtjjYzQKsJBeNIvvMPrOJM,8610
-pumaguard-21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pumaguard-21.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
-pumaguard-21.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
-pumaguard-21.dist-info/RECORD,,
+pumaguard-21.post4.dist-info/METADATA,sha256=q1BEufOhEsWa4cm7W1ufv3CSDO69IMujgirdajdIdA8,8616
+pumaguard-21.post4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pumaguard-21.post4.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
+pumaguard-21.post4.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
+pumaguard-21.post4.dist-info/RECORD,,