boris-behav-obs 9.5__tar.gz → 9.5.2__tar.gz

{boris_behav_obs-9.5/boris_behav_obs.egg-info → boris_behav_obs-9.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.5
+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

boris_behav_obs-9.5.2/boris/analysis_plugins/list_of_dataframe_columns.py

@@ -0,0 +1,22 @@
+"""
+BORIS plugin
+
+number of occurences of behaviors
+"""
+
+import pandas as pd
+
+__version__ = "0.0.1"
+__version_date__ = "2025-06-13"
+__plugin_name__ = "List of dataframe columns"
+__author__ = "Olivier Friard - University of Torino - Italy"
+
+
+def run(df: pd.DataFrame) -> pd.DataFrame:
+    """
+    List the columns present in the dataframe
+    """
+
+    df_results = pd.DataFrame(df.columns, columns=["column name"])
+
+    return df_results

{boris_behav_obs-9.5 → boris_behav_obs-9.5.2}/boris/export_observation.py

@@ -691,11 +691,6 @@ def export_aggregated_events(pj: dict, parameters: dict, obsId: str, force_numbe
     # obs description
     obs_description = util.eol2space(observation[cfg.DESCRIPTION])
 
-    """
-    obs_length = observation_operations.observation_total_length(pj[cfg.OBSERVATIONS][obsId])
-    logging.debug(f"obs_length: {obs_length}")
-    """
-
     _, _, connector = db_functions.load_aggregated_events_in_db(
         pj, parameters[cfg.SELECTED_SUBJECTS], [obsId], parameters[cfg.SELECTED_BEHAVIORS]
     )
@@ -798,6 +793,7 @@ def export_aggregated_events(pj: dict, parameters: dict, obsId: str, force_numbe
                     if observation[cfg.TYPE] == cfg.MEDIA:
                         observation_type = "Media file"
 
+                        # get the media file name of the start of event
                         media_file_name = observation_operations.event2media_file_name(observation, row["start"])
                         if media_file_name is None:
                             media_file_name = "Not found"
@@ -842,7 +838,7 @@ def export_aggregated_events(pj: dict, parameters: dict, obsId: str, force_numbe
                             observation["date"].replace("T", " "),
                             obs_description,
                             observation_type,
-                            media_file_str,
+                            media_file_str,  # list of media used in observation
                             pj[cfg.OBSERVATIONS][obsId][cfg.TIME_OFFSET],
                             f"{coding_duration:.3f}" if not coding_duration.is_nan() else cfg.NA,
                             media_durations_str,

{boris_behav_obs-9.5 → boris_behav_obs-9.5.2}/boris/observation_operations.py

@@ -1055,8 +1055,6 @@ def new_observation(self, mode: str = cfg.NEW, obsId: str = "") -> None:
             }
 
             if self.pj[cfg.OBSERVATIONS][new_obs_id][cfg.MEDIA_CREATION_DATE_AS_OFFSET]:
-                print("\n", observationWindow.media_creation_time, "\n")
-
                 self.pj[cfg.OBSERVATIONS][new_obs_id][cfg.MEDIA_INFO][cfg.MEDIA_CREATION_TIME] = observationWindow.media_creation_time
 
             try:
@@ -2423,48 +2421,55 @@ def event2media_file_name(observation: dict, timestamp: dec) -> Optional[str]:
         timestamp (dec): time stamp
 
     Returns:
-        str: name of media file containing the event
+        str: path of media file containing the event
     """
+    if observation.get(cfg.MEDIA_CREATION_DATE_AS_OFFSET, False):
+        # media creation date/time was used for coding
+        video_file_name = None
+        for media_path in observation[cfg.MEDIA_INFO].get(cfg.MEDIA_CREATION_TIME, {}):
+            start_media = observation[cfg.MEDIA_INFO][cfg.MEDIA_CREATION_TIME][media_path]
+            duration = observation[cfg.MEDIA_INFO][cfg.LENGTH][media_path]
+            if start_media <= timestamp <= start_media + duration:
+                video_file_name = media_path
+                break
 
-    cumul_media_durations: list = [dec(0)]
-    for media_file in observation[cfg.FILE][cfg.PLAYER1]:
-        try:
-            media_duration = observation[cfg.MEDIA_INFO][cfg.LENGTH][media_file]
-            # cut off media duration to 3 decimal places as that is how fine the player is
-            media_duration = floor(media_duration * 10**3) / dec(10**3)
-            cumul_media_durations.append(floor((cumul_media_durations[-1] + media_duration) * 10**3) / dec(10**3))
-        except KeyError:
-            return None
+    else:  # no media creation date
+        cumul_media_durations: list = [dec(0)]
+        for media_file in observation[cfg.FILE][cfg.PLAYER1]:
+            try:
+                media_duration = observation[cfg.MEDIA_INFO][cfg.LENGTH][media_file]
+                # cut off media duration to 3 decimal places as that is how fine the player is
+                media_duration = floor(media_duration * 10**3) / dec(10**3)
+                cumul_media_durations.append(floor((cumul_media_durations[-1] + media_duration) * 10**3) / dec(10**3))
+            except KeyError:
+                return None
 
-    """
-    cumul_media_durations: list = [dec(0)]
-    for media_file in observation[cfg.FILE][cfg.PLAYER1]:
-        try:
-            media_duration = dec(str(observation[cfg.MEDIA_INFO][cfg.LENGTH][media_file]))
-            cumul_media_durations.append(round(cumul_media_durations[-1] + media_duration, 3))
-        except KeyError:
-            return None
-    """
+        """
+        cumul_media_durations: list = [dec(0)]
+        for media_file in observation[cfg.FILE][cfg.PLAYER1]:
+            try:
+                media_duration = dec(str(observation[cfg.MEDIA_INFO][cfg.LENGTH][media_file]))
+                cumul_media_durations.append(round(cumul_media_durations[-1] + media_duration, 3))
+            except KeyError:
+                return None
+        """
 
-    cumul_media_durations.remove(dec(0))
+        cumul_media_durations.remove(dec(0))
 
-    logging.debug(f"{cumul_media_durations=}")
+        logging.debug(f"{cumul_media_durations=}")
 
-    # test if timestamp is at end of last media
-    if timestamp == cumul_media_durations[-1]:
-        player_idx = len(observation[cfg.FILE][cfg.PLAYER1]) - 1
-    else:
-        player_idx = -1
-        for idx, value in enumerate(cumul_media_durations):
-            start = 0 if idx == 0 else cumul_media_durations[idx - 1]
-            if start <= timestamp < value:
-                player_idx = idx
-                break
+        # test if timestamp is at end of last media
+        if timestamp == cumul_media_durations[-1]:
+            player_idx = len(observation[cfg.FILE][cfg.PLAYER1]) - 1
+        else:
+            player_idx = None
+            for idx, value in enumerate(cumul_media_durations):
+                start = 0 if idx == 0 else cumul_media_durations[idx - 1]
+                if start <= timestamp < value:
+                    player_idx = idx
+                    break
 
-    if player_idx != -1:
-        video_file_name = observation[cfg.FILE][cfg.PLAYER1][player_idx]
-    else:
-        video_file_name = None
+        video_file_name = observation[cfg.FILE][cfg.PLAYER1][player_idx] if player_idx is not None else None
 
     return video_file_name
 

{boris_behav_obs-9.5 → boris_behav_obs-9.5.2}/boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "9.5"
-__version_date__ = "2025-06-12"
+__version__ = "9.5.2"
+__version_date__ = "2025-07-15"

{boris_behav_obs-9.5 → boris_behav_obs-9.5.2/boris_behav_obs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.5
+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

{boris_behav_obs-9.5 → boris_behav_obs-9.5.2}/boris_behav_obs.egg-info/SOURCES.txt

@@ -92,6 +92,7 @@ boris/view_df_ui.py
 boris/write_event.py
 boris/analysis_plugins/__init__.py
 boris/analysis_plugins/_latency.py
+boris/analysis_plugins/list_of_dataframe_columns.py
 boris/analysis_plugins/number_of_occurences.py
 boris/analysis_plugins/number_of_occurences_by_independent_variable.py
 boris/analysis_plugins/time_budget.py

{boris_behav_obs-9.5 → boris_behav_obs-9.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "boris-behav-obs"
-version = "9.5"
+version = "9.5.2"
 description = "BORIS - Behavioral Observation Research Interactive Software"
 authors = [{ name="Olivier Friard", email="olivier.friard@unito.it" }]
 readme = "README.md"