endoreg-db 0.8.4.8__py3-none-any.whl → 0.8.5.0__py3-none-any.whl

endoreg_db/models/media/video/video_file.py

@@ -4,6 +4,7 @@ import logging
 from pathlib import Path
 import uuid
 from typing import TYPE_CHECKING, Optional, Union, cast
+import os
 
 from django.db import models
 from django.core.files import File
@@ -208,46 +209,25 @@ class VideoFile(models.Model):
             return ffmpeg_meta
 
 
+        # Exception message constants
+    NO_ACTIVE_FILE = "Has no raw file"
+    NO_FILE_ASSOCIATED = "Active file has no associated file."
+
     @property
-    def active_file_url(self) -> str:
-        """
-        Return the URL of the active processed file.
-        
-        Returns:
-            str: The URL of the active video file.
-        
-        Raises:
-            Value Error if no active VideoFile is available.
-        """
-        active = self.active_file
-        if not isinstance(active, FieldFile):
-            raise ValueError("Active file is not a stored FieldFile instance.")
-        if not active.name:
-            raise ValueError("Active file has no associated name.")
-        return active.url
-    
-    @property
-    def active_raw_file(self) -> FieldFile:
-        raw = self.raw_file
-        if isinstance(raw, FieldFile) and raw.name:
-            return raw
-        raise ValueError("No raw file available for this video")
-        
-    @property
-    def active_raw_file_url(self)-> str:
-        """
-        Return the path of the URL of the active raw file for name reading.
+    def active_raw_file(self) -> File:
+        """Return the raw file if available, otherwise raise ValueError."""
+        if self.has_raw:
+            return self.raw_file
+        raise ValueError(self.NO_ACTIVE_FILE)
 
-        Raises:
-        ValueError("Active file has no associated file")
-        
-        Returns:
-        """
-        raw = self.active_raw_file
-        if not raw.name:
-            raise ValueError("Active raw file has no associated name.")
-        return raw.url
-        
+    @property
+    def active_raw_file_url(self) -> str:
+        """Return the URL of the active raw file, or raise ValueError if unavailable."""
+        _file = self.active_raw_file
+        assert _file is not None, self.NO_ACTIVE_FILE
+        if not _file or not _file.name:
+            raise ValueError(self.NO_FILE_ASSOCIATED)
+        return _file.url        
 
     # Pipeline Functions
     pipe_1 = _pipe_1
@@ -414,6 +394,12 @@ class VideoFile(models.Model):
         if isinstance(file_path, str):
             file_path = Path(file_path)
         # Pass center_name and other kwargs to the helper function
+        if not center_name:
+            try:
+                center_name = os.environ["CENTER_NAME"]
+            except KeyError:
+                logger.error("Center name must be provided to create VideoFile from file. You can set CENTER_NAME in environment variables.")
+                return None
         return _create_from_file(cls, file_path, center_name=center_name, **kwargs)
 
     @classmethod

endoreg_db/models/metadata/sensitive_meta_logic.py

@@ -160,6 +160,9 @@ def calculate_patient_hash(instance: "SensitiveMeta", salt: str = SECRET_SALT) -
     if not center:
         raise ValueError("Center is required to calculate patient hash.")
 
+    assert first_name is not None, "First name is required to calculate patient hash."
+    assert last_name is not None, "Last name is required to calculate patient hash."
+    
     hash_str = get_patient_hash(
         first_name=first_name,
         last_name=last_name,

endoreg_db/services/video_import.py

@@ -11,23 +11,26 @@ Changelog:
 
 from datetime import date
 import logging
-import sys
 import os
+import random
 import shutil
+import sys
 import time
 from contextlib import contextmanager
+from datetime import date
 from pathlib import Path
-from typing import Union, Dict, Any, Optional, List, Tuple
+from typing import Any, Dict, List, Optional, Tuple, Union
+
 from django.db import transaction
+from django.db.models.fields.files import FieldFile
 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
-import random
+
+from endoreg_db.models import EndoscopyProcessor, SensitiveMeta, VideoFile
+from endoreg_db.models.media.video.video_file_anonymize import \
+    _cleanup_raw_assets
 from endoreg_db.utils.hashs import get_video_hash
-from endoreg_db.models.media.video.video_file_anonymize import _cleanup_raw_assets
-from django.db.models.fields.files import FieldFile
-from endoreg_db.models import EndoscopyProcessor
+from endoreg_db.utils.paths import ANONYM_VIDEO_DIR, STORAGE_DIR, VIDEO_DIR
 
 # File lock configuration (matches PDF import)
 STALE_LOCK_SECONDS = 6000  # 100 minutes - reclaim locks older than this
@@ -895,20 +898,46 @@ class VideoImportService:
 
         sm = sensitive_meta
         updated_fields = []
-
+        
+        # Ensure center is set from video.center if not in extracted_metadata
+        metadata_to_update = extracted_metadata.copy()
+        
+        # FIX: Set center object instead of center_name string
+        if not hasattr(sm, 'center') or not sm.center:
+            if video.center:
+                metadata_to_update['center'] = video.center
+                self.logger.debug("Added center object '%s' to metadata for SensitiveMeta update", video.center.name)
+            else:
+                center_name = metadata_to_update.get('center_name')
+                if center_name:
+                    try:
+                        from ..models.administration import Center
+                        center_obj = Center.objects.get(name=center_name)
+                        metadata_to_update['center'] = center_obj
+                        self.logger.debug("Loaded center object '%s' from center_name", center_name)
+                        metadata_to_update.pop('center_name', None)
+                    except Center.DoesNotExist:
+                        self.logger.error("Center '%s' not found in database", center_name)
+                        return
+        
         try:
-            sm.update_from_dict(extracted_metadata)
-            updated_fields = list(extracted_metadata.keys())
+            sm.update_from_dict(metadata_to_update)
+            updated_fields = list(extracted_metadata.keys())  # Only log originally extracted fields
         except KeyError as e:
             self.logger.warning(f"Failed to update SensitiveMeta field {e}")
+            return
 
         if updated_fields:
-            sm.save(update_fields=updated_fields)
-            self.logger.info("Updated SensitiveMeta fields for video %s: %s", video.uuid, updated_fields)
+            try:
+                sm.save()  # Remove update_fields to allow all necessary fields to be saved
+                self.logger.info("Updated SensitiveMeta fields for video %s: %s", video.uuid, updated_fields)
 
-            state = video.get_or_create_state()
-            state.mark_sensitive_meta_processed(save=True)
-            self.logger.info("Marked sensitive metadata as processed for video %s", video.uuid)
+                state = video.get_or_create_state()
+                state.mark_sensitive_meta_processed(save=True)
+                self.logger.info("Marked sensitive metadata as processed for video %s", video.uuid)
+            except Exception as e:
+                self.logger.error(f"Failed to save SensitiveMeta: {e}")
+                raise  # Re-raise to trigger fallback in calling method
         else:
             self.logger.info("No SensitiveMeta fields updated for video %s - all existing values preserved", video.uuid)
 

{endoreg_db-0.8.4.8.dist-info → endoreg_db-0.8.5.0.dist-info}/METADATA

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

@@ -390,7 +390,7 @@ endoreg_db/models/media/video/create_from_file.py,sha256=3n4bbzFteEOFDUuEikP0x-S
 endoreg_db/models/media/video/pipe_1.py,sha256=ljO3vO2mqqTXLZsKjzMTC6-sW4JRWMVRfJcK0n5CjKg,9740
 endoreg_db/models/media/video/pipe_2.py,sha256=DnMxW0uOqSsf7-0n9Rlvn7u89U4Jpkv7n6hFpQfUjkQ,4964
 endoreg_db/models/media/video/refactor_plan.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-endoreg_db/models/media/video/video_file.py,sha256=txlxR8d1OBgt3UEkWvLcGSyLarh0jXLw-z0SAV5KOok,26789
+endoreg_db/models/media/video/video_file.py,sha256=XYF0uhA4VjfGu3w7CsFWt0pdkbMzbGkjzBE2s--ZrPY,26604
 endoreg_db/models/media/video/video_file_ai.py,sha256=3ABea52FOF1qlrlxHdYhz_M3Kmqfzqtgq7M0prl-FAo,18819
 endoreg_db/models/media/video/video_file_anonymize.py,sha256=pet1UfSsbSHJJZxq6gDPifAfBWpGyEpD1jEQuSQi0Gg,16027
 endoreg_db/models/media/video/video_file_frames.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -468,7 +468,7 @@ endoreg_db/models/metadata/model_meta.py,sha256=F_r-PTLeNi4J-4EaGCQkGIguhdl7Bwba
 endoreg_db/models/metadata/model_meta_logic.py,sha256=vAbNDaoZygH8xOCulWlXoHoR1T0BSvr9kIloxjzhfjo,12533
 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=XN3x3p0cqLlzPSZl7e35JBUXr_QKYSq48vwF1N60N4U,32134
+endoreg_db/models/metadata/sensitive_meta_logic.py,sha256=BnxWSSGHRlWLvqGgChzZ13qCXMB7onLE6MOBdE5CBhg,32311
 endoreg_db/models/metadata/video_meta.py,sha256=c6xWdLW3uNqJ5VPJXHCxXA3mbXw-b0uR54-TOS3qL2Q,14966
 endoreg_db/models/metadata/video_prediction_logic.py,sha256=j5N82mHtiomeeIaf1HA65kT5d0htQfJmbI2bJb8mpxQ,7677
 endoreg_db/models/metadata/video_prediction_meta.py,sha256=EyfctAAAVcW9L0gf76ZBc9-G8MLMcD-tc2kkjaaLH4w,10592
@@ -603,7 +603,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=quQ1z_hqJFcrq5pOeq74pqqmnS2I9ybJIh5D0v8qtOk,46514
+endoreg_db/services/video_import.py,sha256=bnmdtE2-XMXoNOHRfL_NBO03RIIznzHi0DzVxGkLc5I,48006
 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
@@ -788,7 +788,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.8.dist-info/METADATA,sha256=TbemUzPCUJkNOQV3TdNGw0EdQCfefEMuWoChAjYjik8,14719
-endoreg_db-0.8.4.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-endoreg_db-0.8.4.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-endoreg_db-0.8.4.8.dist-info/RECORD,,
+endoreg_db-0.8.5.0.dist-info/METADATA,sha256=sbgw_9rLtOsgqYAvPKG0MwFZOyVJ01QGnh5sMBIEPVk,14719
+endoreg_db-0.8.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+endoreg_db-0.8.5.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+endoreg_db-0.8.5.0.dist-info/RECORD,,