boris-behav-obs 9.4.1__py2.py3-none-any.whl → 9.5.2__py2.py3-none-any.whl

boris/preferences_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'preferences.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.8.0
+## Created by: Qt User Interface Compiler version 6.9.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -16,10 +16,11 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QDialog,
-    QDoubleSpinBox, QFormLayout, QGridLayout, QHBoxLayout,
+    QDoubleSpinBox, QFormLayout, QGroupBox, QHBoxLayout,
     QLabel, QLineEdit, QListWidget, QListWidgetItem,
     QPlainTextEdit, QPushButton, QSizePolicy, QSpacerItem,
-    QSpinBox, QTabWidget, QVBoxLayout, QWidget)
+    QSpinBox, QSplitter, QTabWidget, QVBoxLayout,
+    QWidget)
 
 class Ui_prefDialog(object):
     def setupUi(self, prefDialog):
@@ -27,8 +28,8 @@ class Ui_prefDialog(object):
             prefDialog.setObjectName(u"prefDialog")
         prefDialog.setWindowModality(Qt.WindowModality.WindowModal)
         prefDialog.resize(904, 554)
-        self.gridLayout = QGridLayout(prefDialog)
-        self.gridLayout.setObjectName(u"gridLayout")
+        self.horizontalLayout_17 = QHBoxLayout(prefDialog)
+        self.horizontalLayout_17.setObjectName(u"horizontalLayout_17")
         self.verticalLayout_2 = QVBoxLayout()
         self.verticalLayout_2.setObjectName(u"verticalLayout_2")
         self.tabWidget = QTabWidget(prefDialog)
@@ -250,34 +251,40 @@ class Ui_prefDialog(object):
         self.tabWidget.addTab(self.tab_observations, "")
         self.tab_analysis_plugins = QWidget()
         self.tab_analysis_plugins.setObjectName(u"tab_analysis_plugins")
-        self.horizontalLayout_17 = QHBoxLayout(self.tab_analysis_plugins)
-        self.horizontalLayout_17.setObjectName(u"horizontalLayout_17")
-        self.verticalLayout_11 = QVBoxLayout()
+        self.verticalLayout_15 = QVBoxLayout(self.tab_analysis_plugins)
+        self.verticalLayout_15.setObjectName(u"verticalLayout_15")
+        self.splitter_2 = QSplitter(self.tab_analysis_plugins)
+        self.splitter_2.setObjectName(u"splitter_2")
+        self.splitter_2.setOrientation(Qt.Orientation.Horizontal)
+        self.widget = QWidget(self.splitter_2)
+        self.widget.setObjectName(u"widget")
+        self.verticalLayout_11 = QVBoxLayout(self.widget)
         self.verticalLayout_11.setObjectName(u"verticalLayout_11")
-        self.label_13 = QLabel(self.tab_analysis_plugins)
+        self.verticalLayout_11.setContentsMargins(0, 0, 0, 0)
+        self.label_13 = QLabel(self.widget)
         self.label_13.setObjectName(u"label_13")
 
         self.verticalLayout_11.addWidget(self.label_13)
 
-        self.lv_all_plugins = QListWidget(self.tab_analysis_plugins)
+        self.lv_all_plugins = QListWidget(self.widget)
         self.lv_all_plugins.setObjectName(u"lv_all_plugins")
 
         self.verticalLayout_11.addWidget(self.lv_all_plugins)
 
-        self.label_15 = QLabel(self.tab_analysis_plugins)
+        self.label_15 = QLabel(self.widget)
         self.label_15.setObjectName(u"label_15")
 
         self.verticalLayout_11.addWidget(self.label_15)
 
         self.horizontalLayout_16 = QHBoxLayout()
         self.horizontalLayout_16.setObjectName(u"horizontalLayout_16")
-        self.le_personal_plugins_dir = QLineEdit(self.tab_analysis_plugins)
+        self.le_personal_plugins_dir = QLineEdit(self.widget)
         self.le_personal_plugins_dir.setObjectName(u"le_personal_plugins_dir")
         self.le_personal_plugins_dir.setReadOnly(True)
 
         self.horizontalLayout_16.addWidget(self.le_personal_plugins_dir)
 
-        self.pb_browse_plugins_dir = QPushButton(self.tab_analysis_plugins)
+        self.pb_browse_plugins_dir = QPushButton(self.widget)
         self.pb_browse_plugins_dir.setObjectName(u"pb_browse_plugins_dir")
 
         self.horizontalLayout_16.addWidget(self.pb_browse_plugins_dir)
@@ -285,29 +292,52 @@ class Ui_prefDialog(object):
 
         self.verticalLayout_11.addLayout(self.horizontalLayout_16)
 
-        self.lw_personal_plugins = QListWidget(self.tab_analysis_plugins)
+        self.lw_personal_plugins = QListWidget(self.widget)
         self.lw_personal_plugins.setObjectName(u"lw_personal_plugins")
 
         self.verticalLayout_11.addWidget(self.lw_personal_plugins)
 
-
-        self.horizontalLayout_17.addLayout(self.verticalLayout_11)
-
-        self.verticalLayout_12 = QVBoxLayout()
+        self.splitter_2.addWidget(self.widget)
+        self.splitter = QSplitter(self.splitter_2)
+        self.splitter.setObjectName(u"splitter")
+        self.splitter.setOrientation(Qt.Orientation.Vertical)
+        self.widget1 = QWidget(self.splitter)
+        self.widget1.setObjectName(u"widget1")
+        self.verticalLayout_12 = QVBoxLayout(self.widget1)
         self.verticalLayout_12.setObjectName(u"verticalLayout_12")
-        self.label_14 = QLabel(self.tab_analysis_plugins)
+        self.verticalLayout_12.setContentsMargins(0, 0, 0, 0)
+        self.label_14 = QLabel(self.widget1)
         self.label_14.setObjectName(u"label_14")
 
         self.verticalLayout_12.addWidget(self.label_14)
 
-        self.pte_plugin_description = QPlainTextEdit(self.tab_analysis_plugins)
+        self.pte_plugin_description = QPlainTextEdit(self.widget1)
         self.pte_plugin_description.setObjectName(u"pte_plugin_description")
         self.pte_plugin_description.setReadOnly(True)
 
         self.verticalLayout_12.addWidget(self.pte_plugin_description)
 
+        self.splitter.addWidget(self.widget1)
+        self.widget2 = QWidget(self.splitter)
+        self.widget2.setObjectName(u"widget2")
+        self.verticalLayout_14 = QVBoxLayout(self.widget2)
+        self.verticalLayout_14.setObjectName(u"verticalLayout_14")
+        self.verticalLayout_14.setContentsMargins(0, 0, 0, 0)
+        self.label_23 = QLabel(self.widget2)
+        self.label_23.setObjectName(u"label_23")
+
+        self.verticalLayout_14.addWidget(self.label_23)
+
+        self.pte_plugin_code = QPlainTextEdit(self.widget2)
+        self.pte_plugin_code.setObjectName(u"pte_plugin_code")
+        self.pte_plugin_code.setLineWrapMode(QPlainTextEdit.LineWrapMode.NoWrap)
+
+        self.verticalLayout_14.addWidget(self.pte_plugin_code)
+
+        self.splitter.addWidget(self.widget2)
+        self.splitter_2.addWidget(self.splitter)
 
-        self.horizontalLayout_17.addLayout(self.verticalLayout_12)
+        self.verticalLayout_15.addWidget(self.splitter_2)
 
         self.tabWidget.addTab(self.tab_analysis_plugins, "")
         self.tab_ffmpeg = QWidget()
@@ -358,31 +388,39 @@ class Ui_prefDialog(object):
         self.tabWidget.addTab(self.tab_ffmpeg, "")
         self.tab_spectro = QWidget()
         self.tab_spectro.setObjectName(u"tab_spectro")
-        self.verticalLayout_8 = QVBoxLayout(self.tab_spectro)
+        self.verticalLayout_13 = QVBoxLayout(self.tab_spectro)
+        self.verticalLayout_13.setObjectName(u"verticalLayout_13")
+        self.groupBox = QGroupBox(self.tab_spectro)
+        self.groupBox.setObjectName(u"groupBox")
+        self.verticalLayout_8 = QVBoxLayout(self.groupBox)
         self.verticalLayout_8.setObjectName(u"verticalLayout_8")
         self.horizontalLayout_7 = QHBoxLayout()
         self.horizontalLayout_7.setObjectName(u"horizontalLayout_7")
-        self.label_7 = QLabel(self.tab_spectro)
+        self.label_7 = QLabel(self.groupBox)
         self.label_7.setObjectName(u"label_7")
 
         self.horizontalLayout_7.addWidget(self.label_7)
 
-        self.cbSpectrogramColorMap = QComboBox(self.tab_spectro)
+        self.cbSpectrogramColorMap = QComboBox(self.groupBox)
         self.cbSpectrogramColorMap.setObjectName(u"cbSpectrogramColorMap")
 
         self.horizontalLayout_7.addWidget(self.cbSpectrogramColorMap)
 
+        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_7.addItem(self.horizontalSpacer_2)
+
 
         self.verticalLayout_8.addLayout(self.horizontalLayout_7)
 
         self.horizontalLayout_10 = QHBoxLayout()
         self.horizontalLayout_10.setObjectName(u"horizontalLayout_10")
-        self.label_12 = QLabel(self.tab_spectro)
+        self.label_12 = QLabel(self.groupBox)
         self.label_12.setObjectName(u"label_12")
 
         self.horizontalLayout_10.addWidget(self.label_12)
 
-        self.sb_time_interval = QSpinBox(self.tab_spectro)
+        self.sb_time_interval = QSpinBox(self.groupBox)
         self.sb_time_interval.setObjectName(u"sb_time_interval")
         self.sb_time_interval.setMinimum(2)
         self.sb_time_interval.setMaximum(360)
@@ -390,12 +428,140 @@ class Ui_prefDialog(object):
 
         self.horizontalLayout_10.addWidget(self.sb_time_interval)
 
+        self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_10.addItem(self.horizontalSpacer_3)
+
 
         self.verticalLayout_8.addLayout(self.horizontalLayout_10)
 
+        self.horizontalLayout_18 = QHBoxLayout()
+        self.horizontalLayout_18.setObjectName(u"horizontalLayout_18")
+        self.label_16 = QLabel(self.groupBox)
+        self.label_16.setObjectName(u"label_16")
+
+        self.horizontalLayout_18.addWidget(self.label_16)
+
+        self.cb_window_type = QComboBox(self.groupBox)
+        self.cb_window_type.addItem("")
+        self.cb_window_type.addItem("")
+        self.cb_window_type.addItem("")
+        self.cb_window_type.setObjectName(u"cb_window_type")
+
+        self.horizontalLayout_18.addWidget(self.cb_window_type)
+
+        self.horizontalSpacer_4 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_18.addItem(self.horizontalSpacer_4)
+
+
+        self.verticalLayout_8.addLayout(self.horizontalLayout_18)
+
+        self.horizontalLayout_19 = QHBoxLayout()
+        self.horizontalLayout_19.setObjectName(u"horizontalLayout_19")
+        self.label_17 = QLabel(self.groupBox)
+        self.label_17.setObjectName(u"label_17")
+
+        self.horizontalLayout_19.addWidget(self.label_17)
+
+        self.cb_NFFT = QComboBox(self.groupBox)
+        self.cb_NFFT.addItem("")
+        self.cb_NFFT.addItem("")
+        self.cb_NFFT.addItem("")
+        self.cb_NFFT.addItem("")
+        self.cb_NFFT.setObjectName(u"cb_NFFT")
+
+        self.horizontalLayout_19.addWidget(self.cb_NFFT)
+
+        self.horizontalSpacer_5 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_19.addItem(self.horizontalSpacer_5)
+
+
+        self.verticalLayout_8.addLayout(self.horizontalLayout_19)
+
+        self.horizontalLayout_20 = QHBoxLayout()
+        self.horizontalLayout_20.setObjectName(u"horizontalLayout_20")
+        self.label_18 = QLabel(self.groupBox)
+        self.label_18.setObjectName(u"label_18")
+
+        self.horizontalLayout_20.addWidget(self.label_18)
+
+        self.sb_noverlap = QSpinBox(self.groupBox)
+        self.sb_noverlap.setObjectName(u"sb_noverlap")
+        self.sb_noverlap.setMaximum(900)
+        self.sb_noverlap.setSingleStep(10)
+        self.sb_noverlap.setValue(128)
+
+        self.horizontalLayout_20.addWidget(self.sb_noverlap)
+
+        self.horizontalSpacer_6 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_20.addItem(self.horizontalSpacer_6)
+
+
+        self.verticalLayout_8.addLayout(self.horizontalLayout_20)
+
+        self.horizontalLayout_21 = QHBoxLayout()
+        self.horizontalLayout_21.setObjectName(u"horizontalLayout_21")
+        self.label_19 = QLabel(self.groupBox)
+        self.label_19.setObjectName(u"label_19")
+
+        self.horizontalLayout_21.addWidget(self.label_19)
+
+        self.sb_vmin = QSpinBox(self.groupBox)
+        self.sb_vmin.setObjectName(u"sb_vmin")
+        self.sb_vmin.setMinimum(-200)
+        self.sb_vmin.setMaximum(0)
+        self.sb_vmin.setValue(-100)
+
+        self.horizontalLayout_21.addWidget(self.sb_vmin)
+
+        self.label_21 = QLabel(self.groupBox)
+        self.label_21.setObjectName(u"label_21")
+
+        self.horizontalLayout_21.addWidget(self.label_21)
+
+        self.horizontalSpacer_7 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_21.addItem(self.horizontalSpacer_7)
+
+
+        self.verticalLayout_8.addLayout(self.horizontalLayout_21)
+
+        self.horizontalLayout_22 = QHBoxLayout()
+        self.horizontalLayout_22.setObjectName(u"horizontalLayout_22")
+        self.label_20 = QLabel(self.groupBox)
+        self.label_20.setObjectName(u"label_20")
+
+        self.horizontalLayout_22.addWidget(self.label_20)
+
+        self.sb_vmax = QSpinBox(self.groupBox)
+        self.sb_vmax.setObjectName(u"sb_vmax")
+        self.sb_vmax.setMinimum(-40)
+        self.sb_vmax.setMaximum(0)
+        self.sb_vmax.setValue(-20)
+
+        self.horizontalLayout_22.addWidget(self.sb_vmax)
+
+        self.label_22 = QLabel(self.groupBox)
+        self.label_22.setObjectName(u"label_22")
+
+        self.horizontalLayout_22.addWidget(self.label_22)
+
+        self.horizontalSpacer_8 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_22.addItem(self.horizontalSpacer_8)
+
+
+        self.verticalLayout_8.addLayout(self.horizontalLayout_22)
+
+
+        self.verticalLayout_13.addWidget(self.groupBox)
+
         self.verticalSpacer_3 = QSpacerItem(20, 319, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
-        self.verticalLayout_8.addItem(self.verticalSpacer_3)
+        self.verticalLayout_13.addItem(self.verticalSpacer_3)
 
         self.tabWidget.addTab(self.tab_spectro, "")
         self.tab_colors = QWidget()
@@ -459,7 +625,7 @@ class Ui_prefDialog(object):
         self.label_9 = QLabel(self.tab_interface)
         self.label_9.setObjectName(u"label_9")
 
-        self.formLayout.setWidget(0, QFormLayout.LabelRole, self.label_9)
+        self.formLayout.setWidget(0, QFormLayout.ItemRole.LabelRole, self.label_9)
 
         self.sb_toolbar_icon_size = QSpinBox(self.tab_interface)
         self.sb_toolbar_icon_size.setObjectName(u"sb_toolbar_icon_size")
@@ -467,7 +633,7 @@ class Ui_prefDialog(object):
         self.sb_toolbar_icon_size.setMaximum(128)
         self.sb_toolbar_icon_size.setValue(24)
 
-        self.formLayout.setWidget(0, QFormLayout.FieldRole, self.sb_toolbar_icon_size)
+        self.formLayout.setWidget(0, QFormLayout.ItemRole.FieldRole, self.sb_toolbar_icon_size)
 
 
         self.verticalLayout_7.addLayout(self.formLayout)
@@ -505,12 +671,12 @@ class Ui_prefDialog(object):
         self.verticalLayout_2.addLayout(self.horizontalLayout_2)
 
 
-        self.gridLayout.addLayout(self.verticalLayout_2, 0, 0, 1, 1)
+        self.horizontalLayout_17.addLayout(self.verticalLayout_2)
 
 
         self.retranslateUi(prefDialog)
 
-        self.tabWidget.setCurrentIndex(0)
+        self.tabWidget.setCurrentIndex(2)
 
 
         QMetaObject.connectSlotsByName(prefDialog)
@@ -546,13 +712,31 @@ class Ui_prefDialog(object):
         self.label_15.setText(QCoreApplication.translate("prefDialog", u"Personal plugins", None))
         self.pb_browse_plugins_dir.setText(QCoreApplication.translate("prefDialog", u"Browse", None))
         self.label_14.setText(QCoreApplication.translate("prefDialog", u"Plugin info", None))
+        self.label_23.setText(QCoreApplication.translate("prefDialog", u"Plugin code", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_analysis_plugins), QCoreApplication.translate("prefDialog", u"Analysis plugins", None))
         self.lbFFmpegPath.setText(QCoreApplication.translate("prefDialog", u"FFmpeg path:", None))
         self.lbFFmpegCacheDir.setText(QCoreApplication.translate("prefDialog", u"FFmpeg cache directory", None))
         self.pbBrowseFFmpegCacheDir.setText(QCoreApplication.translate("prefDialog", u"...", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_ffmpeg), QCoreApplication.translate("prefDialog", u"FFmpeg framework", None))
-        self.label_7.setText(QCoreApplication.translate("prefDialog", u"Spectrogram color map", None))
+        self.groupBox.setTitle(QCoreApplication.translate("prefDialog", u"Spectrogram", None))
+        self.label_7.setText(QCoreApplication.translate("prefDialog", u"Color map", None))
         self.label_12.setText(QCoreApplication.translate("prefDialog", u"Default time interval (s)", None))
+        self.label_16.setText(QCoreApplication.translate("prefDialog", u"Window type", None))
+        self.cb_window_type.setItemText(0, QCoreApplication.translate("prefDialog", u"hanning", None))
+        self.cb_window_type.setItemText(1, QCoreApplication.translate("prefDialog", u"hamming", None))
+        self.cb_window_type.setItemText(2, QCoreApplication.translate("prefDialog", u"blackmanharris", None))
+
+        self.label_17.setText(QCoreApplication.translate("prefDialog", u"NFFT", None))
+        self.cb_NFFT.setItemText(0, QCoreApplication.translate("prefDialog", u"256", None))
+        self.cb_NFFT.setItemText(1, QCoreApplication.translate("prefDialog", u"512", None))
+        self.cb_NFFT.setItemText(2, QCoreApplication.translate("prefDialog", u"1024", None))
+        self.cb_NFFT.setItemText(3, QCoreApplication.translate("prefDialog", u"2048", None))
+
+        self.label_18.setText(QCoreApplication.translate("prefDialog", u"noverlap", None))
+        self.label_19.setText(QCoreApplication.translate("prefDialog", u"vmin", None))
+        self.label_21.setText(QCoreApplication.translate("prefDialog", u"dBFS", None))
+        self.label_20.setText(QCoreApplication.translate("prefDialog", u"vmax", None))
+        self.label_22.setText(QCoreApplication.translate("prefDialog", u"dBFS", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_spectro), QCoreApplication.translate("prefDialog", u"Spectrogram/Wave form", None))
         self.label_10.setText(QCoreApplication.translate("prefDialog", u"<html><head/><body><p>List of colors for behaviors. See <a href=\"https://matplotlib.org/api/colors_api.html\"><span style=\" text-decoration: underline; color:#0000ff;\">matplotlib colors</span></a></p></body></html>", None))
         self.pb_reset_behav_colors.setText(QCoreApplication.translate("prefDialog", u"Reset colors to default", None))

boris/project_functions.py

@@ -565,7 +565,7 @@ def check_project_integrity(
         for player in pj[cfg.OBSERVATIONS][obs_id][cfg.FILE]:
             for media_file in pj[cfg.OBSERVATIONS][obs_id][cfg.FILE][player]:
                 for info in (cfg.LENGTH, cfg.FPS, cfg.HAS_AUDIO, cfg.HAS_VIDEO):
-                    if media_file not in pj[cfg.OBSERVATIONS][obs_id][cfg.MEDIA_INFO][info]:
+                    if media_file not in pj[cfg.OBSERVATIONS][obs_id][cfg.MEDIA_INFO].get(info, {}):
                         tmp_out += f"Observation <b>{obs_id}</b>:<br>"
                         tmp_out += f"The media file {media_file} has no <b>{info}</b> info.<br>"
     if tmp_out:
@@ -1984,6 +1984,4 @@ def project2dataframe(pj: dict, observations_list: list = []) -> pd.DataFrame:
 
     pd.DataFrame(data).info()
 
-    # print(pd.DataFrame(data))
-
     return pd.DataFrame(data)

boris/utilities.py

@@ -23,7 +23,7 @@ from decimal import Decimal as dec
 from decimal import getcontext, ROUND_DOWN
 from hachoir.metadata import extractMetadata
 from hachoir.parser import createParser
-from shutil import copyfile
+from shutil import copyfile, which
 from typing import Union, Tuple
 import csv
 import datetime
@@ -34,7 +34,7 @@ import logging
 import math
 import numpy as np
 import os
-import pathlib as pl
+from pathlib import Path
 from PIL.ImageQt import Image
 import platform
 import re
@@ -71,7 +71,7 @@ except Exception:
         external_files_dir = ""
         # search where to download libmpv-2.dll
 
-        external_files_dir = pl.Path(__file__).parent / "misc"
+        external_files_dir = Path(__file__).parent / "misc"
         if not external_files_dir.is_dir():
             logger.info(f"Creating {external_files_dir} directory")
             external_files_dir.mkdir(parents=True, exist_ok=True)
@@ -143,10 +143,10 @@ def extract_exif_DateTimeOriginal(file_path: str) -> int:
             else:
                 try:
                     # read from file name (YYYY-MM-DD_HHMMSS)
-                    return int(datetime.datetime.strptime(pl.Path(file_path).stem, "%Y-%m-%d_%H%M%S").timestamp())
+                    return int(datetime.datetime.strptime(Path(file_path).stem, "%Y-%m-%d_%H%M%S").timestamp())
                 except Exception:
                     # read from file name (YYYY-MM-DD_HH:MM:SS)
-                    return int(datetime.datetime.strptime(pl.Path(file_path).stem, "%Y-%m-%d_%H:%M:%S").timestamp())
+                    return int(datetime.datetime.strptime(Path(file_path).stem, "%Y-%m-%d_%H:%M:%S").timestamp())
 
     except Exception:
         return -1
@@ -159,7 +159,7 @@ def extract_video_creation_date(file_path: str) -> int | None:
 
     logger.debug(f"extract_video_creation_date for {file_path}")
 
-    if not pl.Path(file_path).is_file():
+    if not Path(file_path).is_file():
         logger.debug(f"{file_path} not found")
         return None
     try:
@@ -839,7 +839,7 @@ def extract_wav(ffmpeg_bin: str, media_file_path: str, tmp_dir: str) -> str:
         str: wav file path or "" if error
     """
 
-    wav_file_path = pl.Path(tmp_dir) / pl.Path(media_file_path + ".wav").name
+    wav_file_path = Path(tmp_dir) / Path(media_file_path + ".wav").name
 
     # check if media file is a wav file
     try:
@@ -1272,11 +1272,11 @@ def check_ffmpeg_path() -> Tuple[bool, str]:
 
     # search embedded ffmpeg
     if sys.platform.startswith("linux") or sys.platform.startswith("darwin"):
-        ffmpeg_executable = pl.Path("ffmpeg")
+        ffmpeg_executable = Path("ffmpeg")
     elif sys.platform.startswith("win"):
-        ffmpeg_executable = pl.Path("ffmpeg.exe")
+        ffmpeg_executable = Path("ffmpeg.exe")
 
-    ffmpeg_path = pl.Path(__file__).parent / "misc" / ffmpeg_executable
+    ffmpeg_path = Path(__file__).parent / "misc" / ffmpeg_executable
 
     if not ffmpeg_path.is_file():
         # search global ffmpeg
@@ -1387,15 +1387,20 @@ def ffprobe_media_analysis(ffmpeg_bin: str, file_name: str) -> dict:
     Returns:
         dict
     """
-    # ffprobe -v quiet -print_format json -show_format -show_streams /tmp/ramdisk/video1.mp4
+
+    # check ffprobe executable in same place than ffmpeg
     ffprobe_bin = ffmpeg_bin.replace("ffmpeg", "ffprobe")
+    if not Path(ffprobe_bin).is_file():
+        if which(ffprobe_bin) is None:
+            return {"error": "ffprobe not found"}
 
     command = f'"{ffprobe_bin}" -hide_banner -v error -print_format json -show_format -show_streams "{file_name}"'
 
     p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     out, error = p.communicate()
     if error:
-        return {"error": f"{error}"}
+        if b"invalid data" in error:
+            return {"error": f"{error}"}
 
     try:
         hasVideo = False
@@ -1404,7 +1409,7 @@ def ffprobe_media_analysis(ffmpeg_bin: str, file_name: str) -> dict:
         video_bitrate = None
         audio_bitrate = []
         resolution = None
-        fps = 0
+        fps: float = 0
         sample_rate = None
         duration = None
         audio_duration = cfg.NA
@@ -1447,6 +1452,8 @@ def ffprobe_media_analysis(ffmpeg_bin: str, file_name: str) -> dict:
                             except Exception:
                                 pass
 
+                fps = round(fps, 3)
+
                 if "duration" in stream:
                     duration = float(stream["duration"])
                 if "duration_ts" in stream:
@@ -1698,7 +1705,7 @@ def dir_images_number(dir_path_str: str) -> dict:
     return number of images in dir_path (see cfg.IMAGE_EXTENSIONS)
     """
 
-    dir_path = pl.Path(dir_path_str)
+    dir_path = Path(dir_path_str)
     if not dir_path.is_dir():
         return {"error": f"The directory {dir_path_str} does not exists"}
     img_count = 0

boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.4.1"
-__version_date__ = "2025-05-28"
+__version__ = "9.5.2"
+__version_date__ = "2025-07-15"

{boris_behav_obs-9.4.1.dist-info → boris_behav_obs-9.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.4.1
+Version: 9.5.2
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only
@@ -26,10 +26,13 @@ Requires-Dist: tablib[cli,html,ods,pandas,xls,xlsx]>=3
 Requires-Dist: pyreadr
 Requires-Dist: pyside6==6.9
 Requires-Dist: hachoir>=3.3.0
+Requires-Dist: scipy>=1.15.3
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Provides-Extra: r
+Requires-Dist: rpy2>=3.6.1; extra == "r"
 Dynamic: license-file
 
 BORIS (Behavioral Observation Research Interactive Software)