britekit 0.0.6__tar.gz → 0.0.7__tar.gz

{britekit-0.0.6 → britekit-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: britekit
-Version: 0.0.6
+Version: 0.0.7
 Summary: Core functions for bioacoustic recognizers.
 Project-URL: Documentation, https://github.com/jhuus/BriteKit#readme
 Project-URL: Issues, https://github.com/jhuus/BriteKit/issues

{britekit-0.0.6 → britekit-0.0.7}/britekit/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2025-present Jan Huus <jhuus1@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.6"
+__version__ = "0.0.7"

{britekit-0.0.6 → britekit-0.0.7}/britekit/commands/_tune.py

@@ -9,6 +9,7 @@ from typing import Optional
 
 import click
 
+from britekit.core.config_loader import get_config
 from britekit.core import util
 
 
@@ -57,6 +58,7 @@ def tune(
     from britekit.core.tuner import Tuner
 
     try:
+        cfg, _ = get_config(cfg_path)
         if extract and skip_training:
             logging.error(
                 "Performing spectrogram extract is incompatible with skipping training."

{britekit-0.0.6 → britekit-0.0.7}/src/britekit/core/tuner.py

@@ -1,7 +1,6 @@
 # Defer some imports to improve initialization performance.
 import copy
 import logging
-import os
 from pathlib import Path
 import random
 import re
@@ -263,6 +262,21 @@ class Tuner:
             self.trial_num += 1
             self.trial_metrics[self.trial_num] = {}
 
+    @staticmethod
+    def _find_latest_version_dir(root):
+        root = Path(root)
+        version_dirs = []
+        for d in root.iterdir():
+            if d.is_dir() and d.name.startswith("version"):
+                m = re.search(r"\d+", d.name)
+                if m:
+                    version_dirs.append((int(m.group()), d))
+
+        assert version_dirs, "Failed to find training log directory"
+
+        # Sort numerically by the extracted version number
+        return max(version_dirs, key=lambda x: x[0])[1].name
+
     def _run_test(self):
         """
         Run inference with the generated checkpoints and return the selected metric.
@@ -270,10 +284,11 @@ class Tuner:
         from britekit.core.analyzer import Analyzer
         from britekit.testing.per_segment_tester import PerSegmentTester
 
-        train_dir = sorted(os.listdir(self.train_log_dir), key=natural_key)[-1]
+        train_dir = self._find_latest_version_dir(self.train_log_dir)
         self.cfg.misc.ckpt_folder = str(
             Path(self.train_log_dir) / train_dir / "checkpoints"
         )
+        print(f"{self.cfg.misc.ckpt_folder=}")
         self.cfg.infer.min_score = 0
 
         # suppress console output during inference and test analysis

{britekit-0.0.6 → britekit-0.0.7}/src/britekit/models/base_model.py

@@ -11,7 +11,6 @@ import torch
 from torch import nn
 import torch.nn.functional as F
 from torch.optim.lr_scheduler import CosineAnnealingLR, LinearLR, SequentialLR
-from torchmetrics.functional import accuracy
 
 from britekit.core.config_loader import get_config
 from britekit.core import util
@@ -195,7 +194,9 @@ class BaseModel(pl.LightningModule):
         if self.multi_label:
             preds = torch.sigmoid(seg_logits)
             roc_auc = metrics.roc_auc_score(y.cpu(), preds.cpu(), average="micro")
-            self.log("test_roc_auc", roc_auc, on_step=False, on_epoch=True, prog_bar=True)
+            self.log(
+                "test_roc_auc", roc_auc, on_step=False, on_epoch=True, prog_bar=True
+            )
 
         return loss