endoreg-db 0.8.3.3__py3-none-any.whl → 0.8.3.4__py3-none-any.whl

endoreg_db/services/video_import.py

@@ -719,7 +719,7 @@ class VideoImportService():
         self.logger.info("Created sensitive file for %s at %s", video.uuid, target_file_path)
         return target_file_path
 
-    def _get_processor_roi_info(self) -> Tuple[Optional[List[List[Dict[str, Any]]]], Optional[Dict[str, Any]]]:
+    def _get_processor_roi_info(self) -> Tuple[Optional[dict[str, dict[str, int | None] | None]], Optional[dict[str, int | None]] ]:
         """Get processor ROI information for masking."""
         endoscope_data_roi_nested = None
         endoscope_image_roi = None
@@ -742,16 +742,6 @@ class VideoImportService():
         except Exception as exc:
             self.logger.error("Failed to retrieve processor ROI information: %s", exc)
 
-        # Convert dict to nested list if necessary to match return type
-        if isinstance(endoscope_data_roi_nested, dict):
-            # Convert dict[str, dict[str, int | None] | None] to List[List[Dict[str, Any]]]
-            converted_roi = []
-            for key, value in endoscope_data_roi_nested.items():
-                if isinstance(value, dict):
-                    converted_roi.append([value])
-                elif value is None:
-                    converted_roi.append([])
-            endoscope_data_roi_nested = converted_roi
 
         return endoscope_data_roi_nested, endoscope_image_roi
 
@@ -828,9 +818,9 @@ class VideoImportService():
     def _perform_frame_cleaning(self, endoscope_data_roi_nested, endoscope_image_roi):
         """Perform frame cleaning and anonymization."""
         # Instantiate frame cleaner
-        is_available, frame_cleaner = self._ensure_frame_cleaning_available()
+        is_available, FrameCleaner = self._ensure_frame_cleaning_available()
 
-        if not is_available:
+        if not is_available or FrameCleaner is None:
             raise RuntimeError("Frame cleaning not available")
 
         # Prepare parameters for frame cleaning
@@ -839,31 +829,31 @@ class VideoImportService():
         if not raw_video_path or not Path(raw_video_path).exists():
             raise RuntimeError(f"Raw video path not found: {raw_video_path}")
 
-                
         # Create temporary output path for cleaned video
         video_filename = self.processing_context.get('video_filename', Path(raw_video_path).name)
         cleaned_filename = f"cleaned_{video_filename}"
         cleaned_video_path = Path(raw_video_path).parent / cleaned_filename
-                
-        
+
+        # Instantiate FrameCleaner object
+        frame_cleaner_instance = FrameCleaner()
+
         # Clean video with ROI masking (heavy I/O operation)
-        actual_cleaned_path, extracted_metadata = frame_cleaner.clean_video(
+        actual_cleaned_path, extracted_metadata = frame_cleaner_instance.clean_video(
             video_path=Path(raw_video_path),
             endoscope_image_roi=endoscope_image_roi,
             endoscope_data_roi_nested=endoscope_data_roi_nested,
             output_path=cleaned_video_path,
             technique="mask_overlay"
         )
-        
-        
+
         # Store cleaned video path for later use in _cleanup_and_archive
         self.processing_context['cleaned_video_path'] = actual_cleaned_path
         self.processing_context['extracted_metadata'] = extracted_metadata
-        
+
         # Update sensitive metadata with extracted information
         self._update_sensitive_metadata(extracted_metadata)
         self.logger.info(f"Extracted metadata from frame cleaning: {extracted_metadata}")
-        
+
         self.logger.info(f"Frame cleaning with ROI masking completed: {actual_cleaned_path}")
         self.logger.info("Cleaned video will be moved to anonym_videos during cleanup")
 

{endoreg_db-0.8.3.3.dist-info → endoreg_db-0.8.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: endoreg-db
-Version: 0.8.3.3
+Version: 0.8.3.4
 Summary: EndoReg Db Django App
 Project-URL: Homepage, https://info.coloreg.de
 Project-URL: Repository, https://github.com/wg-lux/endoreg-db

{endoreg_db-0.8.3.3.dist-info → endoreg_db-0.8.3.4.dist-info}/RECORD

@@ -602,7 +602,7 @@ endoreg_db/services/pseudonym_service.py,sha256=CJhbtRa6K6SPbphgCZgEMi8AFQtB18CU
 endoreg_db/services/requirements_object.py,sha256=290zf8AEbVtCoHhW4Jr7_ud-RvrqYmb1Nz9UBHtTnc0,6164
 endoreg_db/services/segment_sync.py,sha256=YgHvIHkbW4mqCu0ACf3zjRSZnNfxWwt4gh5syUVXuE0,6400
 endoreg_db/services/storage_aware_video_processor.py,sha256=kKFK64vXLeBSVkp1YJonU3gFDTeXZ8C4qb9QZZB99SE,13420
-endoreg_db/services/video_import.py,sha256=gDuVTW5WUYGSc0m5ly67cc10YpnTpBkxO7uOEcRa3Ok,45663
+endoreg_db/services/video_import.py,sha256=RBk0n_oN3VXRBMHtUKsRVjVXYv9VnxlM6GsMx2yHL6s,45187
 endoreg_db/tasks/upload_tasks.py,sha256=OJq7DhNwcbWdXzHY8jz5c51BCVkPN5gSWOz-6Fx6W5M,7799
 endoreg_db/tasks/video_ingest.py,sha256=kxFuYkHijINV0VabQKCFVpJRv6eCAw07tviONurDgg8,5265
 endoreg_db/tasks/video_processing_tasks.py,sha256=rZ7Kr49bAR4Q-vALO2SURebrhcJ5hSFGwjF4aULrOao,14089
@@ -786,7 +786,7 @@ endoreg_db/views/video/video_meta.py,sha256=C1wBMTtQb_yzEUrhFGAy2UHEWMk_CbU75WXX
 endoreg_db/views/video/video_processing_history.py,sha256=mhFuS8RG5GV8E-lTtuD0qrq-bIpnUFp8vy9aERfC-J8,770
 endoreg_db/views/video/video_remove_frames.py,sha256=2FmvNrSPM0fUXiBxINN6vBUUDCqDlBkNcGR3WsLDgKo,1696
 endoreg_db/views/video/video_stream.py,sha256=kLyuf0ORTmsLeYUQkTQ6iRYqlIQozWhMMR3Lhfe_trk,12148
-endoreg_db-0.8.3.3.dist-info/METADATA,sha256=anKqQ1fidx7S7ca0cWHU1UHEDNI67ujUV-RO4IGgr1g,14758
-endoreg_db-0.8.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-endoreg_db-0.8.3.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-endoreg_db-0.8.3.3.dist-info/RECORD,,
+endoreg_db-0.8.3.4.dist-info/METADATA,sha256=a9terVG2Fh1NBsonpVMM9l5O7PS8FSlAPOMdcg1vAOY,14758
+endoreg_db-0.8.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+endoreg_db-0.8.3.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+endoreg_db-0.8.3.4.dist-info/RECORD,,