xarray-behave 0.37.1__tar.gz → 0.37.3__tar.gz

{xarray_behave-0.37.1 → xarray_behave-0.37.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xarray-behave
-Version: 0.37.1
+Version: 0.37.3
 Summary: xarray tools for behavioral data.
 Author-email: Jan Clemens <clemensjan@googlemail.com>
 Requires-Python: >3.9

{xarray_behave-0.37.1 → xarray_behave-0.37.3}/conda/xarray-behave/meta.yaml

@@ -7,8 +7,7 @@ package:
   version: "{{ version }}"
 
 source:
-  url: "https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz"
-
+  url: https://pypi.org/packages/source/x/xarray-behave/xarray_behave-{{ version }}.tar.gz
 build:
   number: 0
 

{xarray_behave-0.37.1 → xarray_behave-0.37.3}/src/xarray_behave/__init__.py

@@ -1,6 +1,6 @@
 """xarray tools for behavioral data."""
 
-__version__ = "0.37.1"
+__version__ = "0.37.3"
 
 from .xarray_behave import assemble, assemble_metrics, load, save
 import os

{xarray_behave-0.37.1 → xarray_behave-0.37.3}/src/xarray_behave/gui/app.py

@@ -15,6 +15,7 @@ import defopt
 import yaml
 import h5py
 import functools
+import rich
 
 import numpy as np
 import scipy.interpolate
@@ -46,9 +47,7 @@ try:
     from . import das
 except Exception:
     logger.warning(
-        "Failed to import the das module.\nIgnore if you do not want to use das.\n"
-        "Otherwise follow these instructions to install:\n"
-        "https://janclemenslab.org/das/install.html"
+        "Failed to import the das module.\nIgnore if you do not want to use das.\nOtherwise follow these instructions to install:\nhttps://janclemenslab.org/das/install.html"
     )
 
 sys.setrecursionlimit(10**6)  # increase recursion limit to avoid errors when keeping key pressed for a long time
@@ -537,7 +536,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 cmd = "python3 -m das.train"
                 # FIXME formatting
                 for key, val in form_data.items():
-                    cmd += f" --{key.replace('_','-')} {val}"
+                    cmd += f" --{key.replace('_', '-')} {val}"
                 with open(savefilename, "w") as f:
                     f.write(cmd)
 
@@ -719,9 +718,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 params = das.utils.load_params(model_path)
                 if audio.shape[0] < params["nb_hist"]:
                     logger.warning(
-                        f"   Aborting. Audio has fewer samples ({audio.shape[0]}) shorter"
-                        f"    than network chunk size ({params['nb_hist']})."
-                        "    Fix by select longer audio."
+                        f"   Aborting. Audio has fewer samples ({audio.shape[0]}) shorter    than network chunk size ({params['nb_hist']}).    Fix by select longer audio."
                     )
                     return
 
@@ -737,14 +734,6 @@ class MainWindow(QtWidgets.QMainWindow):
                 logger.info("   Running inference on audio.")
                 logger.info(f"   Model from {model_path}.")
                 params = das.utils.load_params(model_path)
-                fs_model = params["samplerate_x_Hz"]
-                fs_audio = self.ds.song_raw.attrs["sampling_rate_Hz"]
-
-                if form_data["resample"] and fs_audio and fs_audio != fs_model:
-                    logger.info(f"   Resampling. Audio rate is {fs_audio}Hz but model was trained on data with {fs_model}Hz.")
-                    audio = das.utils.resample(audio, fs_audio, fs_model)
-
-                import rich
 
                 rich.print(form_data)
                 events, segments, _, _ = das.predict.predict(
@@ -762,7 +751,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     bandpass_low_freq=form_data["bandpass_low_freq"],
                     bandpass_up_freq=form_data["bandpass_up_freq"],
                     resample=form_data["resample"],
-                    fs_audio=fs_audio,
+                    fs_audio=self.fs_song,
                 )
 
                 # Process detected song
@@ -872,8 +861,7 @@ class MainWindow(QtWidgets.QMainWindow):
                                 pass
                 except KeyError:
                     logger.info(
-                        f"{filename} no sample rate info in NPZ file."
-                        f"Need to save 'samplerate' variable with the audio data. Defaulting to {samplerate}"
+                        f"{filename} no sample rate info in NPZ file.Need to save 'samplerate' variable with the audio data. Defaulting to {samplerate}"
                     )
             elif (
                 filename.endswith(".h5")
@@ -2413,7 +2401,7 @@ class PSV(MainWindow):
 
         modifiers = QtWidgets.QApplication.keyboardModifiers()
 
-        if mouseButton == 1 and modifiers == QtCore.Qt.ControlModifier:  # change event type
+        if mouseButton == QtCore.Qt.MouseButton.LeftButton and modifiers == QtCore.Qt.ControlModifier:  # change event type
             self.sinet0 = None
 
             if not self.edit_only_current_events:
@@ -2436,7 +2424,7 @@ class PSV(MainWindow):
                         f"  Changed segment at {changed_time[0]:1.4f}:{changed_time[1]:1.4f} from {old_name} to {new_name}."
                     )
                 self.update_xy()
-        elif mouseButton == 1:  # add event
+        elif mouseButton == QtCore.Qt.MouseButton.LeftButton:  # add event
             if self.current_event_index is not None:
                 if self.event_times.categories[self.current_event_name] == "segment":
                     if self.sinet0 is None:
@@ -2467,7 +2455,7 @@ class PSV(MainWindow):
                 self.update_xy()
             else:
                 self.sinet0 = None
-        elif mouseButton == 2:  # delete nearest event
+        elif mouseButton == QtCore.Qt.MouseButton.RightButton:  # delete nearest event
             self.spec_view.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
             self.slice_view.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
             self.annot_view.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
@@ -2555,7 +2543,7 @@ class PSV(MainWindow):
                 )
                 self.event_times.delete_range(name, t0, t1, strict=False)
                 if len(within_range_times):
-                    logger.info(f"   {len(within_range_times)} events of {name} to {name[:-len(proposal_suffix)]}")
+                    logger.info(f"   {len(within_range_times)} events of {name} to {name[: -len(proposal_suffix)]}")
         # update event selector in case the event did not exist yet
         self.nb_eventtypes = len(self.event_times)
         self.eventtype_colors = utils.make_colors(self.nb_eventtypes)