pumaguard 20.post157__py3-none-any.whl → 20.post159__py3-none-any.whl

pumaguard/presets.py

@@ -34,6 +34,19 @@ def get_xdg_config_home() -> Path:
     return Path.home() / ".config"
 
 
+def get_xdg_data_home() -> Path:
+    """
+    Get the XDG data home directory according to XDG Base Directory spec.
+
+    Returns:
+        Path to XDG_DATA_HOME (defaults to ~/.local/share if not set)
+    """
+    xdg_data = os.environ.get("XDG_DATA_HOME")
+    if xdg_data:
+        return Path(xdg_data)
+    return Path.home() / ".local" / "share"
+
+
 def get_default_settings_file() -> str:
     """
     Get the default settings file path using XDG standards.
@@ -128,6 +141,31 @@ class Preset:
         else:
             self.tf_compat = "2.17"
 
+        # Classification product directories (XDG data location by default)
+        data_root = get_xdg_data_home() / "pumaguard"
+        self.classification_root_dir = str(data_root / "classified")
+        self.classified_puma_dir = str(
+            Path(self.classification_root_dir) / "puma"
+        )
+        self.classified_other_dir = str(
+            Path(self.classification_root_dir) / "other"
+        )
+        self.intermediate_dir = str(
+            Path(self.classification_root_dir) / "intermediate"
+        )
+
+        # Ensure directories exist
+        for d in [
+            self.classification_root_dir,
+            self.classified_puma_dir,
+            self.classified_other_dir,
+            self.intermediate_dir,
+        ]:
+            try:
+                Path(d).mkdir(parents=True, exist_ok=True)
+            except OSError as exc:  # pragma: no cover (rare failure)
+                logger.error("Could not create directory %s: %s", d, exc)
+
     def load(self, filename: str):
         """
         Load settings from YAML file.

pumaguard/pumaguard-ui/flutter_bootstrap.js

@@ -38,6 +38,6 @@ _flutter.buildConfig = {"engineRevision":"13e658725ddaa270601426d1485636157e38c3
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "3370573590"
+    serviceWorkerVersion: "2968416529"
   }
 });

pumaguard/pumaguard-ui/flutter_service_worker.js

@@ -34,7 +34,7 @@ const RESOURCES = {"flutter.js": "24bc71911b75b5f8135c949e27a2984e",
 "canvaskit/skwasm.js.symbols": "3a4aadf4e8141f284bd524976b1d6bdc",
 "favicon.png": "5dcef449791fa27946b3d35ad8803796",
 "main.dart.wasm": "b7e85784e7cc42b937c6ddffca885d19",
-"flutter_bootstrap.js": "bf49cbb2b275f239c83088ec2fb67975",
+"flutter_bootstrap.js": "80cc003c2d58f860e024eb2075e631d5",
 "version.json": "d3ae24eea88b92d3d617cfcd1d6d057d",
 "main.dart.js": "8d76816e4e65d2d9504d5fd4013ba7cf"};
 // The application shell files that are downloaded before a service worker can

pumaguard/server.py

@@ -6,11 +6,15 @@ that the new images show pumas.
 import argparse
 import logging
 import os
+import shutil
 import signal
 import subprocess
 import sys
 import threading
 import time
+from pathlib import (
+    Path,
+)
 
 from PIL import (
     Image,
@@ -257,7 +261,9 @@ class FolderObserver:
             return
         logger.debug("Classifying: %s", filepath)
         prediction = classify_image_two_stage(
-            presets=self.presets, image_path=filepath
+            presets=self.presets,
+            image_path=filepath,
+            intermediate_dir=self.presets.intermediate_dir,
         )
         logger.info("Chance of puma in %s: %.2f%%", filepath, prediction * 100)
         if prediction > 0.5:
@@ -267,6 +273,25 @@ class FolderObserver:
                     self.presets.sound_path, self.presets.deterrent_sound_file
                 )
                 playsound(sound_file_path)
+        # Move original file into classification folder
+        try:
+            dest_root = (
+                self.presets.classified_puma_dir
+                if prediction > 0.5
+                else self.presets.classified_other_dir
+            )
+            Path(dest_root).mkdir(parents=True, exist_ok=True)
+            dest_path = Path(dest_root) / Path(filepath).name
+            shutil.move(filepath, dest_path)
+            logger.info(
+                "Moved %s to classification folder %s", filepath, dest_path
+            )
+        except Exception as exc:  # pylint: disable=broad-except
+            logger.error(
+                "Failed to move %s into classification folder: %s",
+                filepath,
+                exc,
+            )
         lock.release()
         logger.debug("Exiting (%s)", me.name)
 

pumaguard/utils.py

@@ -410,7 +410,10 @@ def cache_model_two_stage(
 
 
 def classify_image_two_stage(
-    presets: Preset, image_path: str, print_progress: bool = True
+    presets: Preset,
+    image_path: str,
+    print_progress: bool = True,
+    intermediate_dir: str | None = None,
 ) -> float:
     """
     Classify the image using two-stage approach: YOLO detection + EfficientNet
@@ -420,9 +423,16 @@ def classify_image_two_stage(
         presets (Preset): An instance of the Preset class containing settings.
         image_path (str): The file path to the image to be classified.
 
+    Args:
+        presets (Preset): Settings preset.
+        image_path (str): Path to image file.
+        print_progress (bool): Whether to print model download progress.
+        intermediate_dir (str | None): If provided, store visualization and
+        CSV summaries inside this directory instead of CWD.
+
     Returns:
-        float: Maximum puma probability from all detections (0.0 if no
-        detections)
+        float: Maximum puma probability from all detections
+        (0.0 if no detections)
     """
 
     def expand_box(xyxy, crop_expand, width, height):
@@ -577,7 +587,10 @@ def classify_image_two_stage(
             axc.set_title(f"det {idx} — {det_probs[idx]:.3f} → {lbl}")
             idx += 1
 
+    # Determine output paths
     out_png = f"{image_file.stem}_viz.png"
+    if intermediate_dir:
+        out_png = str(Path(intermediate_dir) / out_png)
     plt.tight_layout()
     plt.savefig(out_png, dpi=160)
     plt.close(fig)
@@ -616,8 +629,17 @@ def classify_image_two_stage(
         )
 
     # Write CSV outputs
+    # Per-image CSV names (avoid overwriting)
     det_csv = "test_detections_predictions.csv"
     img_csv = "test_image_summary.csv"
+    if intermediate_dir:
+        det_csv = str(
+            Path(intermediate_dir)
+            / f"{image_file.stem}_detections_predictions.csv"
+        )
+        img_csv = str(
+            Path(intermediate_dir) / f"{image_file.stem}_image_summary.csv"
+        )
 
     # Write detection predictions CSV
     if all_rows:

{pumaguard-20.post157.dist-info → pumaguard-20.post159.dist-info}/METADATA

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

@@ -5,11 +5,11 @@ pumaguard/main.py,sha256=_dxt9P_SNIoFJA6HqU9KGeC9519c7CN4CA8_D-gPyEQ,6284
 pumaguard/model-registry.yaml,sha256=V-pTaqJrk_jJo568okBDaVhs51qTHttSqKe6PqdX6Bc,10318
 pumaguard/model_cli.py,sha256=nzDv0lXSvRKpLxs579tiHInJPPV-AFO4jzeLk5t2GaA,1394
 pumaguard/model_downloader.py,sha256=dymLuHAeIETALNouBG2KlLxUcxZNJ1lOQv5v9-V7_lk,12078
-pumaguard/presets.py,sha256=x14iLg-TQ8oL13PYaF9A9fl-Qw-LleD4D23X7nIPX8U,24483
-pumaguard/server.py,sha256=e8R5g0VzcnjpH3gU1nPUZUXcDaQVbRuVY3lipljahzI,12293
+pumaguard/presets.py,sha256=T8-GsqWrOCnwwT6Fu2WWCf46pyhudQcgps4XqtGtEgE,25795
+pumaguard/server.py,sha256=UcD7KYviWvetZy-wU8KcH6mTLR2Kj-s8bxDm2byCj1I,13168
 pumaguard/sound.py,sha256=dBylHyuS8ro9tFJH5y3s6Bn2kSGnfrOyGeGYZlgYTsU,369
 pumaguard/stats.py,sha256=ZwocfnFCQ-ky7me-YTTrEoJqsIHOWAgSzeoJHItsIU4,927
-pumaguard/utils.py,sha256=gC4UsHORhm13l9cQeE2bsU0D0x3pcLBJ0SLbeJ4KahI,18956
+pumaguard/utils.py,sha256=w1EgOLSZGyjq_b49hvVZhBESy-lVP0yRtNHe-sXBoIU,19735
 pumaguard/verify.py,sha256=vfw3PRzDt1uuH5FKV9F5vb1PH7KQ6AEgVNhJ6jck_hQ,5513
 pumaguard/web_ui.py,sha256=E_cEV3cA1srlwMXc3eFQW6UiNE1BKd0oJlKIoduARSI,34761
 pumaguard/completions/pumaguard-classify-completions.sh,sha256=5QySg-2Jdinj15qpUYa5UzHbTgYzi2gmPVYYyyXny4c,1353
@@ -19,8 +19,8 @@ pumaguard/completions/pumaguard-train-completions.sh,sha256=lI8LG-QrncvhUqCeKtfr
 pumaguard/pumaguard-ui/.last_build_id,sha256=2z9bkdHZlfzXSpHBHs18Lo4GUD8oTSkZDZxqAeZW6KE,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=W3_JVqt6kt-z9ZzdKicFFOw-8uiRaL-Ca_X4KaRBPEc,9858
-pumaguard/pumaguard-ui/flutter_service_worker.js,sha256=sXnvixBj7TMPqXyzAijqWX9Wpj_EDDuP5vNnOyHuVsg,8435
+pumaguard/pumaguard-ui/flutter_bootstrap.js,sha256=9b5W1CTbXpXNCEPNFJFB80dD4NSyvDMAS4ygtFd8Cp4,9858
+pumaguard/pumaguard-ui/flutter_service_worker.js,sha256=AdfZnbMTG01__3IF0v_fh-D9rTHOtL8IyQan5s-HiLU,8435
 pumaguard/pumaguard-ui/index.html,sha256=901-ZY0WysVAZWPwj2xGatoezwm9TX9IV_jpMrlsaXg,1205
 pumaguard/pumaguard-ui/main.dart.js,sha256=fFz7OvGMIyrSvIBcp1jK3P3x1xCh3i3anBpMHuaVgDo,2613988
 pumaguard/pumaguard-ui/main.dart.mjs,sha256=u8D9JVFd7gNLKK-L2s_IjAfLkymktS1DXV25sXo4BsQ,33768
@@ -51,7 +51,7 @@ pumaguard/pumaguard-ui/icons/Icon-192.png,sha256=Pc6ZB3YC9wQhwcayokC8m4PWTYZoHUX
 pumaguard/pumaguard-ui/icons/Icon-512.png,sha256=usyyBa5F8LQhvhZXJZtJQ6xAyVCUq4d_O8vhLNVE3L4,8252
 pumaguard/pumaguard-ui/icons/Icon-maskable-192.png,sha256=0shC4iqfTsnZlrIzc6kFyI2aIDsiDFwVGIWtYh-XS1w,5594
 pumaguard/pumaguard-ui/icons/Icon-maskable-512.png,sha256=au4Gzcq2sq73Sxc0xHePRCHS2hALD_nlKyG1UkAgKSk,20998
-pumaguard-20.post157.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pumaguard-20.post159.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
@@ -69,8 +69,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.post157.dist-info/METADATA,sha256=ACEPHCv3lm21RctPD-e4fuxcW0aUAr_SjYGw9HJej38,7751
-pumaguard-20.post157.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pumaguard-20.post157.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
-pumaguard-20.post157.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
-pumaguard-20.post157.dist-info/RECORD,,
+pumaguard-20.post159.dist-info/METADATA,sha256=xuIjZT7SYWmnOnjMFB4dfHWkYG0SeVKkVpTsy0DvrjE,7751
+pumaguard-20.post159.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pumaguard-20.post159.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
+pumaguard-20.post159.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
+pumaguard-20.post159.dist-info/RECORD,,