endoreg-db 0.8.6.1__py3-none-any.whl → 0.8.8.9__py3-none-any.whl

endoreg_db/views/video/reimport.py

@@ -6,7 +6,7 @@ import logging
 from pathlib import Path
 from django.db import transaction
 from ...models import VideoFile, SensitiveMeta
-from ...services.video_import import VideoImportService
+from ...services.__old.video_import import VideoImportService
 logger = logging.getLogger(__name__)
 
 class VideoReimportView(APIView):

endoreg_db/views/{media/video_segments.py → video/segments_crud.py}

@@ -273,24 +273,38 @@ def video_segment_validate(request, pk: int, segment_id: int):
     # Verify video exists
     video = get_object_or_404(VideoFile, pk=pk)
 
-    # Get segment and verify it belongs to this video
-    segment = get_object_or_404(LabelVideoSegment.objects.select_related("state", "video_file", "label"), pk=segment_id, video_file=video)
+    segment = get_object_or_404(
+        LabelVideoSegment.objects.select_related("state", "video_file", "label"),
+        pk=segment_id,
+        video_file=video,
+    )
 
     try:
-        # Validation status from request (default: True)
         is_validated = request.data.get("is_validated", True)
         notes = request.data.get("notes", "")
+        information_source_name = request.data.get("information_source_name", "manual_annotation")
 
-        # Get or create state object
-        if not hasattr(segment, "state") or segment.state is None:
-            return Response({"error": "Segment has no state object. Cannot validate."}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        # Optional: update times (seconds) before validation
+        start_time = request.data.get("start_time")
+        end_time = request.data.get("end_time")
 
-        # Update state
         with transaction.atomic():
-            segment.state.is_validated = is_validated
-            if notes and hasattr(segment.state, "validation_notes"):
-                segment.state.validation_notes = notes
-            segment.state.save()
+            if start_time is not None and end_time is not None:
+                fps = segment.video_file.get_fps() or 0
+                if fps > 0:
+                    new_start = int(round(float(start_time) * fps))
+                    new_end = int(round(float(end_time) * fps))
+                    LabelVideoSegment.validate_frame_range(
+                        new_start, new_end, video_file=segment.video_file
+                    )
+                    segment.start_frame_number = new_start
+                    segment.end_frame_number = new_end
+                    segment.save(update_fields=["start_frame_number", "end_frame_number"])
+
+            segment.mark_validated(
+                is_validated=is_validated,
+                information_source_name=information_source_name,
+            )
 
         logger.info(f"Validated segment {segment_id} in video {pk}: {is_validated}")
 
@@ -311,7 +325,7 @@ def video_segment_validate(request, pk: int, segment_id: int):
         logger.error(f"Error validating segment {segment_id} in video {pk}: {e}")
         return Response({"error": f"Validation failed: {str(e)}"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
-
+#TODO Pass user based information source to backend. This is the endpoint currently used by the VideoExamination endpoint
 @api_view(["POST"])
 @permission_classes([EnvironmentAwarePermission])
 def video_segments_validate_bulk(request, pk: int):
@@ -320,41 +334,45 @@ def video_segments_validate_bulk(request, pk: int):
 
     POST /api/media/videos/<pk>/segments/validate-bulk/
 
-    Validates multiple LabelVideoSegments simultaneously.
-    Useful for batch validation after review.
-
-    Request Body:
+    Body:
     {
       "segment_ids": [1, 2, 3, ...],
-      "is_validated": true,  // optional, default true
-      "notes": "..."         // optional, applies to all segments
-    }
-
-    Response:
-    {
-      "message": "Bulk validation completed. 3 segments updated.",
-      "updated_count": 3,
-      "requested_count": 3,
+      "segments": [
+        {"id": 1, "start_time": 12.3, "end_time": 15.7},
+        ...
+      ],
       "is_validated": true,
-      "failed_ids": []  // only present if some failed
+      "notes": "...",
+      "information_source_name": "manual_annotation"
     }
     """
-    # Verify video exists
     video = get_object_or_404(VideoFile, pk=pk)
 
     segment_ids = request.data.get("segment_ids", [])
     is_validated = request.data.get("is_validated", True)
     notes = request.data.get("notes", "")
-
+    information_source_name = request.data.get("information_source_name", "manual_annotation")
+    if notes:
+        logger.info(f"Segment Validiert ${notes}")
     if not segment_ids:
         return Response({"error": "segment_ids is required"}, status=status.HTTP_400_BAD_REQUEST)
 
+    # optional per-segment timing info (seconds)
+    segments_data_list = request.data.get("segments", []) or []
+    segments_data = {int(s["id"]): s for s in segments_data_list if "id" in s}
+
     try:
-        # Get all segments for this video only
-        segments = LabelVideoSegment.objects.filter(pk__in=segment_ids, video_file=video).select_related("state")
+        segments = (
+            LabelVideoSegment.objects
+            .filter(pk__in=segment_ids, video_file=video)
+            .select_related("state", "video_file")
+        )
 
         if not segments.exists():
-            return Response({"error": "No segments found with provided IDs for this video"}, status=status.HTTP_404_NOT_FOUND)
+            return Response(
+                {"error": "No segments found with provided IDs for this video"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
 
         updated_count = 0
         failed_ids = []
@@ -362,14 +380,32 @@ def video_segments_validate_bulk(request, pk: int):
         with transaction.atomic():
             for segment in segments:
                 try:
-                    if segment.state:
-                        segment.state.is_validated = is_validated
-                        if notes and hasattr(segment.state, "validation_notes"):
-                            segment.state.validation_notes = notes
-                        segment.state.save()
-                        updated_count += 1
-                    else:
-                        failed_ids.append(segment.id)
+                    # 1) optionally update times from payload
+                    data = segments_data.get(segment.id)
+                    if data is not None:
+                        start_time = data.get("start_time")
+                        end_time = data.get("end_time")
+                        if start_time is not None and end_time is not None:
+                            fps = segment.video_file.get_fps() or 0
+                            if fps > 0:
+                                new_start = int(round(float(start_time) * fps))
+                                new_end = int(round(float(end_time) * fps))
+                                LabelVideoSegment.validate_frame_range(
+                                    new_start, new_end, video_file=segment.video_file
+                                )
+                                segment.start_frame_number = new_start
+                                segment.end_frame_number = new_end
+                                segment.save(
+                                    update_fields=["start_frame_number", "end_frame_number"]
+                                )
+
+                    # 2) mark as validated + update information source + notes
+                    segment.mark_validated(
+                        is_validated=is_validated,
+                        information_source_name=str(information_source_name) if is_validated else str(None),
+                    )
+                    updated_count += 1
+
                 except Exception as e:
                     logger.error(f"Error validating segment {segment.id}: {e}")
                     failed_ids.append(segment.id)
@@ -510,7 +546,8 @@ def video_segments_validation_status(request, pk: int):
                     failed_count += 1
 
         logger.info(f"Completed validation for {updated_count} segments in video {pk}")
-
+        logger.info(f"Removing Outside Segments")
+        video_file.label_video_segments.filter(video_file=video, label="outside", state__is_validated=False).delete()
         return Response(
             {
                 "message": f"Video segment validation completed for video {pk}",

endoreg_db/views/video/{video_meta.py → video_meta_stats.py}

@@ -8,9 +8,9 @@ from rest_framework.response import Response
 from rest_framework.views import APIView
 
 
-class VideoMetadataView(APIView):
+class VideoMetadataStatsView(APIView):
     """
-    GET /api/video-metadata/{id}/ - Get video metadata including sensitivity analysis
+    GET media/videos/{pk}/metadata/ - Get video metadata including sensitivity analysis
     """
     permission_classes = [EnvironmentAwarePermission]
 

endoreg_db/views/video/video_stream.py

@@ -188,14 +188,13 @@ def _stream_video_file(vf: VideoFile, frontend_origin: str, file_type: str = 'ra
             # No Range header - stream entire file (HTTP 200)
             try:
                 # Open file in binary mode - FileResponse will handle closing
-                file_handle = open(path, 'rb')
-                response = FileResponse(file_handle, content_type=content_type)
-                
-                # Set HTTP headers for video streaming
-                response['Content-Length'] = str(file_size)
-                response['Accept-Ranges'] = 'bytes'  # Enable HTTP range requests for seeking
-                response['Content-Disposition'] = f'inline; filename="{path.name}"'
-                
+                with open(path, "rb") as file_handle:
+                    response = FileResponse(file_handle, content_type=content_type)
+                    # Set HTTP headers for video streaming
+                    response['Content-Length'] = str(file_size)
+                    response['Accept-Ranges'] = 'bytes'  # Enable HTTP range requests for seeking
+                    response['Content-Disposition'] = f'inline; filename="{path.name}"'
+                    
             except IOError as e:
                 raise Http404(f"Cannot open video file: {str(e)}")
         

{endoreg_db-0.8.6.1.dist-info → endoreg_db-0.8.8.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: endoreg-db
-Version: 0.8.6.1
+Version: 0.8.8.9
 Summary: EndoReg Db Django App
 Project-URL: Homepage, https://info.coloreg.de
 Project-URL: Repository, https://github.com/wg-lux/endoreg-db
@@ -28,14 +28,17 @@ Requires-Dist: djangorestframework>=3.16.1
 Requires-Dist: dotenv>=0.9.9
 Requires-Dist: faker>=37.6.0
 Requires-Dist: flake8>=7.3.0
+Requires-Dist: googlemaps>=4.10.0
 Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: icecream>=2.1.4
 Requires-Dist: librosa==0.11.0
 Requires-Dist: llvmlite>=0.44.0
-Requires-Dist: lx-anonymizer[llm,ocr]>=0.8.8
+Requires-Dist: lx-anonymizer[llm,ocr]==0.8.9.7
 Requires-Dist: moviepy==2.2.1
+Requires-Dist: mozilla-django-oidc>=4.0.1
 Requires-Dist: mypy>=1.16.0
 Requires-Dist: numpy>=2.2.3
+Requires-Dist: oauth2-proxy>=1.0.11
 Requires-Dist: opencv-python>=4.11.0.86
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: optimum==1.26.1
@@ -50,12 +53,14 @@ Requires-Dist: pytest-django>=4.11.1
 Requires-Dist: pytest-env>=1.1.5
 Requires-Dist: pytest>=8.3.5
 Requires-Dist: python-ffmpeg>=2.0.12
+Requires-Dist: python-jose[cryptography]>=3.5.0
 Requires-Dist: python-magic>=0.4.27
 Requires-Dist: pytorch-lightning>=2.5.1
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: regex>=2024.11.6
 Requires-Dist: requests>=2.32.3
 Requires-Dist: ruff>=0.14.0
+Requires-Dist: safetensors>=0.4.5
 Requires-Dist: scikit-learn>=1.5.2
 Requires-Dist: scipy>=1.16.1
 Requires-Dist: soundfile==0.12.1
@@ -275,7 +280,6 @@ To load the data back into the database
 ```
 endoreg-db/
 ├── endoreg_db/                # Main Django app for medical data
-│   ├── case_generator/        # Sample case generator
 │   ├── data/                  # Medical knowledge base
 │   ├── management/            # Data wrangling operations
 │   ├── models/                # Data models