endoreg-db 0.8.4.0__py3-none-any.whl → 0.8.4.2__py3-none-any.whl

endoreg_db/models/metadata/model_meta_logic.py

@@ -2,7 +2,7 @@ import shutil
 from logging import getLogger
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional, Type
-
+from django.core.files import File
 from django.db import transaction
 from huggingface_hub import hf_hub_download
 
@@ -127,6 +127,8 @@ def create_from_file_logic(
         logger.info(f"Copied weights from {source_weights_path} to {full_dest_path}")
     except Exception as e:
         raise IOError(f"Failed to copy weights file: {e}") from e
+    
+
 
     # --- Create/Update ModelMeta Instance ---
     defaults = {
@@ -144,6 +146,11 @@ def create_from_file_logic(
         version=target_version,
         defaults=defaults,
     )
+    
+    with open(full_dest_path, "rb") as f:
+        model_meta.weights.save(relative_dest_path.name, File(f), save=False)
+    model_meta.save()
+
 
     if created:
         logger.info(f"Created new ModelMeta: {model_meta}")

endoreg_db/services/video_import.py

@@ -18,6 +18,7 @@ from contextlib import contextmanager
 from pathlib import Path
 from typing import Union, Dict, Any, Optional, List, Tuple
 from django.db import transaction
+from lx_anonymizer import FrameCleaner
 from moviepy import video
 from endoreg_db.models import VideoFile, SensitiveMeta
 from endoreg_db.utils.paths import STORAGE_DIR, VIDEO_DIR, ANONYM_VIDEO_DIR
@@ -55,18 +56,7 @@ class VideoImportService():
             self.project_root = Path(__file__).parent.parent.parent.parent
         
         # Track processed files to prevent duplicates
-        try:
-            # Ensure anonym_video directory exists before listing files
-            anonym_video_dir = Path(ANONYM_VIDEO_DIR)
-            if anonym_video_dir.exists():
-                self.processed_files = set(str(anonym_video_dir / file) for file in os.listdir(ANONYM_VIDEO_DIR))
-            else:
-                logger.info(f"Creating anonym_videos directory: {anonym_video_dir}")
-                anonym_video_dir.mkdir(parents=True, exist_ok=True)
-                self.processed_files = set()
-        except Exception as e:
-            logger.warning(f"Failed to initialize processed files tracking: {e}")
-            self.processed_files = set()
+        self.processed_files = set(str(Path(ANONYM_VIDEO_DIR) / file) for file in os.listdir(ANONYM_VIDEO_DIR))
                     
         # Central video instance and processing context
         self.current_video: Optional[VideoFile] = None
@@ -75,6 +65,8 @@ class VideoImportService():
         self.delete_source = True
         
         self.logger = logging.getLogger(__name__)
+        
+        self.cleaner = None # This gets instantiated in the perform_frame_cleaning method
 
     def _require_current_video(self) -> VideoFile:
         """Return the current VideoFile or raise if it has not been initialized."""
@@ -157,9 +149,6 @@ class VideoImportService():
         High-level helper that orchestrates the complete video import and anonymization process.
         Uses the central video instance pattern for improved state management.
         """
-        # DEFENSIVE: Initialize processing_context immediately to prevent KeyError crashes
-        self.processing_context = {'file_path': Path(file_path)}
-        
         try:
             # Initialize processing context
             self._initialize_processing_context(file_path, center_name, processor_name, 
@@ -196,12 +185,7 @@ class VideoImportService():
             return self.current_video
             
         except Exception as e:
-            # Safe file path access - handles cases where processing_context wasn't initialized
-            safe_file_path = getattr(self, 'processing_context', {}).get('file_path', file_path)
-            # Debug: Log context state for troubleshooting
-            context_keys = list(getattr(self, 'processing_context', {}).keys())
-            self.logger.debug(f"Context keys during error: {context_keys}")
-            self.logger.error(f"Video import and anonymization failed for {safe_file_path}: {e}")
+            self.logger.error(f"Video import and anonymization failed for {file_path}: {e}")
             self._cleanup_on_error()
             raise
         finally:
@@ -840,7 +824,7 @@ class VideoImportService():
             from lx_anonymizer import FrameCleaner  # type: ignore[import]
 
             if FrameCleaner:
-                return True, FrameCleaner
+                return True, FrameCleaner()
                         
         except Exception as e:
             self.logger.warning(f"Frame cleaning not available: {e} Please install or update lx_anonymizer.")
@@ -869,10 +853,13 @@ class VideoImportService():
 
                 
         # Create temporary output path for cleaned video
-        video_filename = self.processing_context.get('video_filename', Path(raw_video_path).name)
+        video_filename = self.processing_context.get('video_filename', Path(raw_video_path).name if raw_video_path else "video.mp4")
         cleaned_filename = f"cleaned_{video_filename}"
+        if not raw_video_path:
+            raise RuntimeError("raw_video_path is None after fallback, cannot construct cleaned_video_path")
         cleaned_video_path = Path(raw_video_path).parent / cleaned_filename
         
+        
                 
         
         # Clean video with ROI masking (heavy I/O operation)
@@ -988,10 +975,6 @@ class VideoImportService():
         This method is always called in the finally block of import_and_anonymize()
         to ensure the file lock is released even if processing fails.
         """
-        # DEFENSIVE: Ensure processing_context exists before accessing it
-        if not hasattr(self, 'processing_context'):
-            self.processing_context = {}
-            
         try:
             # Release file lock if it was acquired
             lock_context = self.processing_context.get('_lock_context')

{endoreg_db-0.8.4.0.dist-info → endoreg_db-0.8.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: endoreg-db
-Version: 0.8.4.0
+Version: 0.8.4.2
 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.4.0.dist-info → endoreg_db-0.8.4.2.dist-info}/RECORD

@@ -464,7 +464,7 @@ endoreg_db/models/medical/risk/risk_type.py,sha256=kEugcaWSTEWH_Vxq4dcF80Iv1L4_K
 endoreg_db/models/metadata/__init__.py,sha256=8I6oLj3YTmeaPGJpL0AWG5gLwp38QzrEggxSkTisv7c,474
 endoreg_db/models/metadata/frame_ocr_result.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 endoreg_db/models/metadata/model_meta.py,sha256=F_r-PTLeNi4J-4EaGCQkGIguhdl7Bwba7_i56ZAjc-4,7589
-endoreg_db/models/metadata/model_meta_logic.py,sha256=6w1YX8hVq40UXbVN1fvDO9OljwekBZaDVHEjVZecoV8,12252
+endoreg_db/models/metadata/model_meta_logic.py,sha256=pcpKf9J5DUiEG-D-VhOPcnFjBznkx5jK7EGv0zDMQm8,12440
 endoreg_db/models/metadata/pdf_meta.py,sha256=BTmpSgqxmPKi0apcNjyrZAS4AFKCPXVdBd6VBeyyv6E,3174
 endoreg_db/models/metadata/sensitive_meta.py,sha256=ekLHrW-b5uYcjfkRd0EW5ncx5ef8Bu-K6msDkpWCAbk,13034
 endoreg_db/models/metadata/sensitive_meta_logic.py,sha256=by3eCW8CgglK1SHiDOepHhTOGaugswxJhkH0BZp7-gs,33909
@@ -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=5a73s0Au0kgZFbrsD4WUqmDAqhQmuf9_wqs79SI-byE,47356
+endoreg_db/services/video_import.py,sha256=0eeY5etJ4rg6uxC-uUis_yoa6cvGgwY2VaiD3mVFosg,46369
 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.4.0.dist-info/METADATA,sha256=VbEZv_ib_RgBN6I8T17X0e49fU7YYrZOBe24nL4u7ig,14758
-endoreg_db-0.8.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-endoreg_db-0.8.4.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-endoreg_db-0.8.4.0.dist-info/RECORD,,
+endoreg_db-0.8.4.2.dist-info/METADATA,sha256=xSaPMvzzc7HovOmkl2Gn0lYVoRNTPk4yqIBFcz0kc70,14758
+endoreg_db-0.8.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+endoreg_db-0.8.4.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+endoreg_db-0.8.4.2.dist-info/RECORD,,