Merge pull request #74 from sidhulyalkar/main

DLC bugfix

Author: tdincer

element_deeplabcut/model.py

@@ -374,7 +374,7 @@ def insert_new_model(
             prompt (bool): Optional. Prompt the user with all info before inserting.
             params (dict): Optional. If dlc_config is path, dict of override items
         """
-        from deeplabcut.utils.auxiliaryfunctions import GetScorerName # isort:skip
+        from deeplabcut.utils.auxiliaryfunctions import GetScorerName  # isort:skip
 
         # handle dlc_config being a yaml file
         if not isinstance(dlc_config, dict):
@@ -392,7 +392,7 @@ def insert_new_model(
         project_path = find_full_path(
             get_dlc_root_data_dir(), dlc_config.get("project_path", project_path)
         )
-        dlc_config["project_path"] = str(project_path)  # update if different
+        dlc_config["project_path"] = project_path.as_posix()  # update if different
         root_dir = find_root_directory(get_dlc_root_data_dir(), project_path)
 
         # ---- Verify config ----
@@ -488,8 +488,11 @@ class ModelEvaluation(dj.Computed):
     """
 
     def make(self, key):
-        from deeplabcut import evaluate_network # isort:skip
-        from deeplabcut.utils.auxiliaryfunctions import get_evaluation_folder  # isort:skip
+        from deeplabcut import evaluate_network  # isort:skip
+        from deeplabcut.utils.auxiliaryfunctions import (
+            get_evaluation_folder,
+        )  # isort:skip
+
         """.populate() method will launch evaluation for each unique entry in Model."""
         dlc_config, project_path, model_prefix, shuffle, trainingsetindex = (
             Model & key
@@ -719,6 +722,7 @@ def make(self, key):
             ) or {}
 
             dlc_reader.do_pose_estimation(
+                key,
                 video_filepaths,
                 dlc_model,
                 project_path,

element_deeplabcut/readers/dlc_reader.py

@@ -249,6 +249,7 @@ def save_yaml(
 
 
 def do_pose_estimation(
+    key: dict,
     video_filepaths: list,
     dlc_model: dict,
     project_path: str,
@@ -334,15 +335,10 @@ def do_pose_estimation(
     # ---- Add current video to config ---
     for video_filepath in video_filepaths:
         if video_filepath not in dlc_config["video_sets"]:
-            root_dir = find_root_directory(get_dlc_root_data_dir(), video_filepath)
-            relative_path = Path(video_filepath).relative_to(root_dir)
-            recording_id = (
-                model.VideoRecording.File & f'file_path="{relative_path}"'
-            ).fetch1("recording_id")
             try:
-                px_width, px_height = (
-                    model.RecordingInfo & f'recording_id="{recording_id}"'
-                ).fetch1("px_width", "px_height")
+                px_width, px_height = (model.RecordingInfo & key).fetch1(
+                    "px_width", "px_height"
+                )
             except DataJointError:
                 logger.warn(
                     f"Could not find RecordingInfo for {video_filepath.stem}"

requirements.txt

@@ -1,4 +1,4 @@
 datajoint>=0.13
 deeplabcut[tf]>=2.2.1.1
 element-interface>=0.3.0
-opencv-python-headless
+opencv-python-headless