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

endoreg_db/views/requirement/requirement_utils.py

@@ -0,0 +1,89 @@
+import logging
+from typing import Any, Tuple, TYPE_CHECKING
+import json
+
+from endoreg_db.models.requirement.requirement_error import (
+    RequirementEvaluationError,
+)
+
+if TYPE_CHECKING:
+    from endoreg_db.models.requirement.requirement import Requirement
+
+logger = logging.getLogger(__name__)
+
+
+def safe_evaluate_requirement(
+    requirement: "Requirement",
+    *args: Any,
+    mode: str = "strict",
+    **kwargs: Any,
+) -> Tuple[bool, str, str | None]:
+    """
+    Wrapper für Requirement.evaluate / evaluate_with_details, der NIE Exceptions durchlässt.
+
+    Returns:
+        met: bool
+        details: human-readable explanation (für UI)
+        error: technischer Fehlerstring oder None
+    """
+
+    try:
+        if hasattr(requirement, "evaluate_with_details"):
+            met, details = requirement.evaluate_with_details(*args, mode=mode, **kwargs)
+        else:
+            met = requirement.evaluate(*args, mode=mode, **kwargs)
+            details = "Voraussetzung erfüllt" if met else "Voraussetzung nicht erfüllt"
+        error = None
+
+    except RequirementEvaluationError as e:
+        ctx = e.context
+        req_obj = ctx.requirement or requirement
+
+        # sprechbarer Name aus DB (Beschreibung bevorzugen, sonst name)
+        display_name = (
+            getattr(req_obj, "description", None)
+            or getattr(req_obj, "name", None)
+            or "unbekannte Voraussetzung"
+        )
+
+        # falls Exception schon eine user_message mitbringt: die nehmen
+        if ctx.user_message:
+            details = ctx.user_message
+        else:
+            details = (
+                f"Die Voraussetzung „{display_name}“ konnte nicht ausgewertet werden."
+            )
+
+        # technischer Fehlerstring für Logs/Debug
+        error = f"{ctx.code}: {ctx.technical_message}"
+        logger.warning(
+            "Requirement '%s' (code=%s) validation error: %s",
+            getattr(req_obj, "name", "unknown"),
+            ctx.code,
+            ctx.technical_message,
+        )
+
+        met = False
+
+    except Exception as e:
+        met = False
+        display_name = getattr(requirement, "description", None) or getattr(
+            requirement, "name", "unbekannte Voraussetzung"
+        )
+        details = (
+            f"Bei der Auswertung der Voraussetzung „{display_name}“ ist ein interner Fehler aufgetreten."
+        )
+        error = f"{e.__class__.__name__}: {e}"
+        logger.exception(
+            "Requirement '%s' unexpected error",
+            getattr(requirement, "name", "unknown"),
+        )
+
+    # normalize details to string
+    if not isinstance(details, str):
+        try:
+            details = json.dumps(details, ensure_ascii=False, default=str)
+        except Exception:
+            details = str(details)
+
+    return bool(met), details, error

endoreg_db/views/video/__init__.py

@@ -1,5 +1,4 @@
 from .correction import (
-    VideoMetadataView,
     VideoProcessingHistoryView,
     VideoApplyMaskView,
     VideoRemoveFramesView,
@@ -30,7 +29,6 @@ from .video_examination_viewset import VideoExaminationViewSet
 
 __all__ = [
     # Video Correction (Phase 1.1) - Implemented
-    'VideoMetadataView',
     'VideoProcessingHistoryView',
     'VideoApplyMaskView',
     'VideoRemoveFramesView',

endoreg_db/views/video/correction.py

@@ -21,7 +21,7 @@ import json
 import logging
 
 from endoreg_db.models import VideoFile, VideoMetadata, VideoProcessingHistory, LabelVideoSegment
-from endoreg_db.serializers import VideoMetadataSerializer, VideoProcessingHistorySerializer
+from endoreg_db.serializers import VideoMetaSerializer, VideoProcessingHistorySerializer
 from lx_anonymizer import FrameCleaner
 
 from endoreg_db.models import VideoFile
@@ -173,7 +173,7 @@ class VideoMetadataView(APIView):
         # Get or create metadata record
         metadata, created = VideoMetadata.objects.get_or_create(video=video)
         
-        serializer = VideoMetadataSerializer(metadata, context={'request': request})
+        serializer = VideoMetaSerializer(metadata, context={'request': request})
         return Response(serializer.data)
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: endoreg-db
-Version: 0.8.6.1
+Version: 0.8.8.0
 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.6
 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