pumaguard 20.post192__py3-none-any.whl → 20.post229__py3-none-any.whl

pumaguard/main.py

@@ -50,6 +50,12 @@ def create_global_parser() -> argparse.ArgumentParser:
         choices=["bash"],
         help="Print out bash completion script",
     )
+    global_parser.add_argument(
+        "--log-file",
+        help="Path to log file (default: ~/.cache/pumaguard/pumaguard.log)",
+        type=str,
+        default=None,
+    )
     global_parser.add_argument(
         "--model-path",
         help="Where the models are stored (default = %(default)s)",
@@ -183,19 +189,7 @@ def main():
     logging.basicConfig(level=logging.INFO)
     logger = logging.getLogger("PumaGuard")
 
-    # Store logs in XDG cache directory
-    log_dir = get_xdg_cache_home() / "pumaguard"
-    log_dir.mkdir(parents=True, exist_ok=True)
-    log_file = log_dir / "pumaguard.log"
-
-    file_handler = logging.FileHandler(str(log_file))
-    file_handler.setLevel(logging.DEBUG)
-    formatter = logging.Formatter(
-        "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-    )
-    file_handler.setFormatter(formatter)
-    logger.addHandler(file_handler)
-
+    # Parse args early to get log file location
     global_args_parser = create_global_parser()
     parser = argparse.ArgumentParser(
         description="""The goal of this project is to accurately classify
@@ -205,11 +199,31 @@ def main():
                     dataset and validated using a separate set of images.""",
         parents=[global_args_parser],
     )
-
     configure_subparsers(parser, global_args_parser)
-
     args = parser.parse_args()
 
+    # Determine log file location
+    if args.log_file:
+        log_file = args.log_file
+        # Ensure parent directory exists
+        log_dir = os.path.dirname(log_file)
+        if log_dir:
+            os.makedirs(log_dir, exist_ok=True)
+    else:
+        # Store logs in XDG cache directory (default)
+        log_dir = get_xdg_cache_home() / "pumaguard"
+        log_dir.mkdir(parents=True, exist_ok=True)
+        log_file = str(log_dir / "pumaguard.log")
+
+    file_handler = logging.FileHandler(log_file)
+    file_handler.setLevel(logging.DEBUG)
+    formatter = logging.Formatter(
+        "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    )
+    file_handler.setFormatter(formatter)
+    logger.addHandler(file_handler)
+    logger.info("Logging to: %s", log_file)
+
     if args.debug:
         logger.setLevel(logging.DEBUG)
 

pumaguard/model_downloader.py

@@ -23,7 +23,7 @@ import yaml
 
 logger = logging.getLogger("PumaGuard")
 
-MODEL_TAG = "e053533cdcb35d681972cb3a1b96d4c023c84516"
+MODEL_TAG = "82ec09d65cabd06d46aeefed3a0317200888367d"
 MODEL_BASE_URI = (
     "https://github.com/PEEC-Nature-Youth-Group/pumaguard-models/raw"
 )

pumaguard/presets.py

@@ -120,7 +120,7 @@ class Preset:
         self.settings_file = get_default_settings_file()
         self.yolo_min_size = 0.02
         self.yolo_conf_thresh = 0.25
-        self.yolo_max_dets = 12
+        self.yolo_max_dets = 2
         self.yolo_model_filename = "yolov8s_101425.pt"
         self.classifier_model_filename = "colorbw_111325.h5"
         self.alpha = 1e-5
@@ -130,7 +130,7 @@ class Preset:
         self.sound_path = os.path.join(
             os.path.dirname(__file__), "../pumaguard-sounds"
         )
-        self.deterrent_sound_file = "cougar_call.mp3"
+        self.deterrent_sound_file = "deterrent_puma.mp3"
         self.verification_path = "data/stable/stable_test"
         self.batch_size = 16
         self.notebook_number = 1
@@ -196,7 +196,22 @@ class Preset:
             )
             return
         except yaml.constructor.ConstructorError as e:
-            raise PresetError(str(e)) from e
+            error_msg = str(e)
+            if "python/tuple" in error_msg:
+                raise PresetError(
+                    f"{error_msg}\n\n"
+                    "Your settings file contains Python-specific tuple "
+                    "formatting that is no longer supported.\n"
+                    f"Please update {filename} to use YAML list syntax.\n"
+                    "For example, change:\n"
+                    "  image-dimensions: !!python/tuple [512, 512]\n"
+                    "to:\n"
+                    "  image-dimensions:\n"
+                    "    - 512\n"
+                    "    - 512\n"
+                    "Or delete the file to use defaults."
+                ) from e
+            raise PresetError(error_msg) from e
 
         self.yolo_min_size = settings.get("YOLO-min-size", 0.02)
         self.yolo_conf_thresh = settings.get("YOLO-conf-thresh", 0.25)
@@ -308,7 +323,7 @@ class Preset:
             "color-mode": self.color_mode,
             "file-stabilization-extra-wait": self.file_stabilization_extra_wait,
             "epochs": self.epochs,
-            "image-dimensions": self.image_dimensions,
+            "image-dimensions": list(self.image_dimensions),
             "lion-directories": self.lion_directories,
             "validation-lion-directories": self.validation_lion_directories,
             "model-function": self.model_function_name,