endoreg-db 0.8.4.4__tar.gz → 0.8.4.6__tar.gz

{endoreg_db-0.8.4.4 → endoreg_db-0.8.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: endoreg-db
-Version: 0.8.4.4
+Version: 0.8.4.6
 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.4 → endoreg_db-0.8.4.6}/endoreg_db/management/commands/load_ai_model_data.py

@@ -9,6 +9,7 @@ from ...data import (
 )
 from ...models import (
     AiModel,
+    LabelSet,  # Add LabelSet import
     ModelMeta,  # Add ModelMeta back to imports
     ModelType,
     VideoSegmentationLabel,
@@ -35,7 +36,7 @@ IMPORT_METADATA = {
         "dir": AI_MODEL_META_DATA_DIR,  # e.g. "ai_model_meta"
         "model": ModelMeta,  # e.g. ModelMeta
         "foreign_keys": ["labelset", "model"],  # Foreign key relationships
-        "foreign_key_models": [VideoSegmentationLabelSet, AiModel],  # Actual model classes
+        "foreign_key_models": [LabelSet, AiModel],  # Actual model classes
     },
     VideoSegmentationLabel.__name__: {
         "dir": VIDEO_SEGMENTATION_LABEL_DATA_DIR,  # e.g. "interventions"

{endoreg_db-0.8.4.4 → endoreg_db-0.8.4.6}/endoreg_db/models/media/video/pipe_1.py

@@ -1,20 +1,23 @@
 import logging
-from typing import TYPE_CHECKING, Optional, Dict, List, Tuple
+from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
+
 from django.db import transaction
+
 from endoreg_db.helpers.download_segmentation_model import download_segmentation_model
 
 # Added imports
 
 # Configure logging
-logger = logging.getLogger(__name__) # Changed from "video_file"
+logger = logging.getLogger(__name__)  # Changed from "video_file"
 
 if TYPE_CHECKING:
     from endoreg_db.models import VideoFile
 
-
     # --- Pipeline 1 ---
+
+
 def _pipe_1(
-    video_file:"VideoFile",
+    video_file: "VideoFile",
     model_name: str,
     model_meta_version: Optional[int] = None,
     delete_frames_after: bool = False,
@@ -28,11 +31,12 @@ def _pipe_1(
     """
     Pipeline 1: Extract frames, text, predict, create segments, optionally delete frames.
     """
-    success = False # Initialize success flag
-    from .video_file_segments import _convert_sequences_to_db_segments # Added import
-    from ...metadata import ModelMeta, VideoPredictionMeta
+    success = False  # Initialize success flag
     from endoreg_db.models import AiModel, LabelVideoSegment
 
+    from ...metadata import ModelMeta, VideoPredictionMeta
+    from .video_file_segments import _convert_sequences_to_db_segments  # Added import
+
     video_file.refresh_from_db()
     video_file.update_video_meta()
 
@@ -43,16 +47,12 @@ def _pipe_1(
         video_file.extract_frames(overwrite=False)  # Avoid overwriting if already extracted
 
         logger.info("Pipe 1: Extracting text metadata...")
-        video_file.update_text_metadata(
-            ocr_frame_fraction=ocr_frame_fraction, cap=ocr_cap, overwrite=False
-        )
+        video_file.update_text_metadata(ocr_frame_fraction=ocr_frame_fraction, cap=ocr_cap, overwrite=False)
         with transaction.atomic():
             state = video_file.get_or_create_state()
             if not state.frames_extracted:
                 logger.error("Pipe 1 failed: Frame extraction did not complete successfully.")
                 return False
-            
-            
 
             # 3. Perform Initial Prediction
             logger.info(f"Pipe 1: Performing prediction with model '{model_name}'...")
@@ -74,7 +74,7 @@ def _pipe_1(
                 except AiModel.DoesNotExist:
                     logger.error(f"Pipe 1 failed: Model '{model_name}' not found.")
                     return False
-                
+
             except ModelMeta.DoesNotExist:
                 try:
                     model_name = download_segmentation_model()
@@ -82,11 +82,9 @@ def _pipe_1(
                     if model_meta_version is not None:
                         model_meta = ai_model_obj.metadata_versions.get(version=model_meta_version)
                     else:
-                        model_meta = ModelMeta.setup_default_from_huggingface()
+                        model_meta = ai_model_obj.get_latest_version()
                 except ModelMeta.DoesNotExist:
-                    logger.error(
-                        f"Pipe 1 failed: ModelMeta version {model_meta_version} for model '{model_name}' not found."
-                    )
+                    logger.error(f"Pipe 1 failed: ModelMeta version {model_meta_version} for model '{model_name}' not found.")
                     return False
             try:
                 sequences: Optional[Dict[str, List[Tuple[int, int]]]] = video_file.predict_video(
@@ -107,7 +105,7 @@ def _pipe_1(
 
             # --- Set and Save State ---
             state.initial_prediction_completed = True
-            state.save(update_fields=['initial_prediction_completed'])
+            state.save(update_fields=["initial_prediction_completed"])
             logger.info("Pipe 1: Set initial_prediction_completed state to True.")
 
             logger.info(f"Pipe 1: Sequences returned from prediction: {sequences}")
@@ -117,9 +115,7 @@ def _pipe_1(
             # 4. Create LabelVideoSegments
             logger.info("Pipe 1: Creating LabelVideoSegments from predictions...")
             try:
-                video_prediction_meta = VideoPredictionMeta.objects.get(
-                    video_file=video_file, model_meta=model_meta
-                )
+                video_prediction_meta = VideoPredictionMeta.objects.get(video_file=video_file, model_meta=model_meta)
                 logger.info(f"Pipe 1: Calling _convert_sequences_to_db_segments for video {video_file.uuid} with prediction meta {video_prediction_meta.pk}")
                 _convert_sequences_to_db_segments(
                     video=video_file,
@@ -127,9 +123,9 @@ def _pipe_1(
                     video_prediction_meta=video_prediction_meta,
                 )
                 video_file.sequences = sequences
-                video_file.save(update_fields=['sequences'])
+                video_file.save(update_fields=["sequences"])
                 state.lvs_created = True
-                state.save(update_fields=['lvs_created'])
+                state.save(update_fields=["lvs_created"])
                 logger.info("Pipe 1: Set lvs_created state to True.")
                 logger.info("Pipe 1: LabelVideoSegment creation complete.")
                 lvs_count_after = LabelVideoSegment.objects.filter(video_file=video_file).count()
@@ -139,7 +135,7 @@ def _pipe_1(
                 raise
 
         logger.info(f"Pipe 1 completed successfully for video {video_file.uuid}")
-        success = True # Set success flag
+        success = True  # Set success flag
         return True
 
     except Exception as e:
@@ -147,7 +143,7 @@ def _pipe_1(
         return False
     finally:
         # 5. Optionally delete frames
-        if delete_frames_after and success: # Check success flag
+        if delete_frames_after and success:  # Check success flag
             logger.info("Pipe 1: Deleting frames after processing...")
             try:
                 video_file.delete_frames()
@@ -156,15 +152,16 @@ def _pipe_1(
                 logger.error(f"Pipe 1 failed during frame deletion: {e}", exc_info=True)
         else:
             logger.info("Pipe 1: Frame deletion skipped.")
-            
+
+
 # --- Test after Pipe 1 ---
-def _test_after_pipe_1(video_file:"VideoFile", start_frame: int = 0, end_frame: int = 100) -> bool:
+def _test_after_pipe_1(video_file: "VideoFile", start_frame: int = 0, end_frame: int = 100) -> bool:
     """
     Simulates human annotation validation after Pipe 1.
     Creates 'outside' segments and marks sensitive meta as verified.
     """
-    from ...label import LabelVideoSegment, Label
-    
+    from ...label import Label, LabelVideoSegment
+
     logger.info(f"Starting _test_after_pipe_1 for video {video_file.uuid}")
     try:
         # 1. Create 'outside' LabelVideoSegments
@@ -172,15 +169,15 @@ def _test_after_pipe_1(video_file:"VideoFile", start_frame: int = 0, end_frame:
             outside_label = Label.objects.get(name__iexact="outside")
             logger.info(f"Creating 'outside' annotation segment [{start_frame}-{end_frame}]")
             # Create a segment - assuming custom_create handles saving
-            outside_segment = LabelVideoSegment.objects.create( # Assign to variable
+            outside_segment = LabelVideoSegment.objects.create(  # Assign to variable
                 video_file=video_file,
                 label=outside_label,
                 start_frame_number=start_frame,
                 end_frame_number=end_frame,
-                prediction_meta=None, 
+                prediction_meta=None,
             )
             # Ensure the segment has a state and mark it as validated
-            segment_state, created = outside_segment.get_or_create_state() # Unpack the tuple
+            segment_state, created = outside_segment.get_or_create_state()  # Unpack the tuple
             segment_state.is_validated = True
             segment_state.save()
             logger.info(f"Marked 'outside' segment {outside_segment.pk} as validated. Created: {created}")
@@ -202,7 +199,7 @@ def _test_after_pipe_1(video_file:"VideoFile", start_frame: int = 0, end_frame:
             # Example: using a boolean field
             video_file.sensitive_meta.state.dob_verified = True
             video_file.sensitive_meta.state.names_verified = True
-            video_file.sensitive_meta.state.save() # Save the SensitiveMeta instance
+            video_file.sensitive_meta.state.save()  # Save the SensitiveMeta instance
             logger.info("Sensitive meta state updated.")
 
         else:

{endoreg_db-0.8.4.4 → endoreg_db-0.8.4.6}/endoreg_db/models/metadata/model_meta_logic.py

@@ -19,6 +19,13 @@ if TYPE_CHECKING:
     from .model_meta import ModelMeta  # Import ModelMeta for type hinting
 
 
+def _get_model_meta_class():
+    """Lazy import to avoid circular imports"""
+    from .model_meta import ModelMeta
+
+    return ModelMeta
+
+
 def get_latest_version_number_logic(cls: Type["ModelMeta"], meta_name: str, model_name: str) -> int:
     """
     Finds the highest numerical version for a given meta_name and model_name.
@@ -308,7 +315,14 @@ def setup_default_from_huggingface_logic(cls, model_id: str, labelset_name: str
     )
 
     ai_model, _ = AiModel.objects.get_or_create(name=meta["name"])
-    labelset = LabelSet.objects.first() if not labelset_name else LabelSet.objects.get(name=labelset_name)
+    if not labelset_name:
+        labelset = LabelSet.objects.first()
+        if not labelset:
+            raise ValueError("No labelset found and no labelset_name provided")
+    else:
+        labelset = LabelSet.objects.get(name=labelset_name)
+
+    ModelMeta = _get_model_meta_class()
     model_meta = ModelMeta.objects.filter(name=meta["name"], model=ai_model).first()
     if model_meta:
         logger.info(f"ModelMeta {meta['name']} for model {ai_model.name} already exists. Skipping creation.")

{endoreg_db-0.8.4.4 → endoreg_db-0.8.4.6}/pyproject.toml

@@ -14,7 +14,7 @@ maintainers = [
 ]
 name = "endoreg-db"
 readme = "README.md"
-version = "0.8.4.4"
+version = "0.8.4.6"
 
 classifiers = [
   "Development Status :: 3 - Alpha",

{endoreg_db-0.8.4.4 → endoreg_db-0.8.4.6}/uv.lock

@@ -771,7 +771,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/62/59/e47bbd0542d0e6f4c
 
 [[package]]
 name = "endoreg-db"
-version = "0.8.4.4"
+version = "0.8.4.6"
 source = { editable = "." }
 dependencies = [
     { name = "agl-report-reader" },