britekit 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

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/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/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/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
 

{britekit-0.0.6.dist-info → britekit-0.0.7.dist-info}/METADATA

@@ -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.dist-info → britekit-0.0.7.dist-info}/RECORD

@@ -12,9 +12,9 @@ britekit/core/plot.py,sha256=hLuLB1VdtdFyaSHVDGl5tjjFCRgOJJ1ucTVJHM_3D_0,5332
 britekit/core/predictor.py,sha256=u4H8horTTvcg4Oqfpy5PG44eiiMeR5RU3aPZnMiXRCw,22914
 britekit/core/reextractor.py,sha256=gazhIZN8V1K4T_Q_kc-ihxUYbkNnc_hoAS6bpYQc95I,8396
 britekit/core/trainer.py,sha256=uKSXsrehb7-IPSCaw0oPpGBoDOcjDtaQovTt022kvzw,5467
-britekit/core/tuner.py,sha256=FG81jbcT4H3l9ugtQnLOeB0pY621nZ3iG54LLlyxeBI,15857
+britekit/core/tuner.py,sha256=m0z4nEqNfCckX3GJWiAAYvsD-ND6gJWkMZupcVvq5is,16408
 britekit/core/util.py,sha256=0JsEEN09hFPQzuttCKaejWofXAjCGSvWEewjkiLAh3E,19172
-britekit/models/base_model.py,sha256=nuJe01HI8V5PUULr8PGzvFDNDOAV6aw2b8uBQSor57o,16898
+britekit/models/base_model.py,sha256=9T7TwHx3K8fl10Vb-qUuypK3NDDZM-ktB8ZLHzqQhdc,16883
 britekit/models/dla.py,sha256=ALMY997AbERN7-sHqQuE5e43llRjpUDPZSFGL-Flv4M,3137
 britekit/models/effnet.py,sha256=e7WdZMsLPXe8jcWChk6n97c8DMV0YyGV6lDP_Jv6Wz4,3129
 britekit/models/gernet.py,sha256=7MEUZaDTfr-6oa8eE8dyDQb2LgahGBOEp1pTZSu1KOE,7022
@@ -32,7 +32,7 @@ britekit/testing/per_segment_tester.py,sha256=FnaozQ8VmH99aYc1ibmDFfOk_ADgsXQGU_
 britekit/training_db/extractor.py,sha256=pT7lAUsNzYs3RXDzpMv7q0MKg6TktiFLKrRtKTWv6ho,8409
 britekit/training_db/training_data_provider.py,sha256=V5aBjsCvrWViZ0Jv05hgcKRizcAXmqoj4q3hAHedoD8,5651
 britekit/training_db/training_db.py,sha256=OOfD1pcbq5HVJbzhmuI-D-gkPHWSoz0cCO4zIUGFvoY,65011
-britekit/__about__.py,sha256=YpAqd8Dr5d0riiqmNf8S5h4r5b9EreukhdhH71k7J00,122
+britekit/__about__.py,sha256=wVVqKeDr1kbfywz7cERdcfhJ0MkM0r5qQboD-dAkPOg,122
 britekit/__init__.py,sha256=RpruzdjbvTcFNf21zJYY8HrAhJei91FtNNLjIBmw-kw,1857
 britekit/install/data/classes.csv,sha256=OdTZ8oQdx7N-HKyhftxZStGZYsjhCy4UbanwtQJ2wBM,54
 britekit/install/data/ignore.txt,sha256=RbKvEHtUCbgRYolwR1IucClwyD3q7l2s6QuRjph-Us4,68
@@ -82,13 +82,13 @@ britekit/commands/_reextract.py,sha256=kCmSjeghg6mhrJ46ibRTmBkGVytU7flFvTbqsnYhB
 britekit/commands/_reports.py,sha256=v1eXJzMoSE-Qlwwyj_d0df9NWpG2yWLMzvvxu5axz7k,21993
 britekit/commands/_search.py,sha256=HIUXwfPvh3rxpgaFSR3bAAI38OtGVPyMo5GMfLtLX-8,9991
 britekit/commands/_train.py,sha256=vGFKlfcv35cOelArQNbVbTRbDWogT_IMg0wZt5virHY,4158
-britekit/commands/_tune.py,sha256=lENPOuPNdY50PwqbFd3n10gzD5ujY1vuM7PByoMzLd0,7242
+britekit/commands/_tune.py,sha256=8dEZZURE769C0JZwhNpzB6pQxVklzl2w2cyXyWyhWXs,7331
 britekit/commands/_wav2mp3.py,sha256=2Q4cjT6OhJmBPTNzGRMrDd6dSdBBufuQdjhH1V8ghLo,2167
 britekit/commands/_xeno.py,sha256=_6YxQ7xFdaSy5DNUaigkbYp3E8EhtOhTC9b6OFS0MFA,6026
 britekit/commands/_youtube.py,sha256=_u1LrwY_2GxllKd505N_2ArFMbACQ_PtVxuqUCYxFe0,2214
 britekit/core/__init__.py,sha256=QcjcFyvO5KqJLF_HBeqiCk925uU5jTUjIV5lJix9XY4,556
-britekit-0.0.6.dist-info/METADATA,sha256=FAvpkc7b7s-EOI6fk7NPavvyLQelKRsAOxImtBUYI8A,18555
-britekit-0.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-britekit-0.0.6.dist-info/entry_points.txt,sha256=ycnPy5DLX14RTf7lKfkQAVyIf1B1zTL1gMsHm455wmg,46
-britekit-0.0.6.dist-info/licenses/LICENSE.txt,sha256=kPoHm6iop8-CUa_720Tt8gqyvLD6D_7218u1hCCpErk,1092
-britekit-0.0.6.dist-info/RECORD,,
+britekit-0.0.7.dist-info/METADATA,sha256=y8JY_v_wLMCsG6-zaSY9O9qgGj5S6Ry2sXQkPRS6VdU,18555
+britekit-0.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+britekit-0.0.7.dist-info/entry_points.txt,sha256=ycnPy5DLX14RTf7lKfkQAVyIf1B1zTL1gMsHm455wmg,46
+britekit-0.0.7.dist-info/licenses/LICENSE.txt,sha256=kPoHm6iop8-CUa_720Tt8gqyvLD6D_7218u1hCCpErk,1092
+britekit-0.0.7.dist-info/RECORD,,