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

endoreg_db/services/anonymization.py

@@ -6,8 +6,8 @@ from typing import Optional
 from django.db import transaction
 
 from endoreg_db.models import RawPdfFile, VideoFile
-from endoreg_db.services.pdf_import import PdfImportService
-from endoreg_db.services.video_import import VideoImportService
+from endoreg_db.services.__old.video_import import VideoImportService
+from endoreg_db.services.report_import import ReportImportService
 from endoreg_db.utils.paths import STORAGE_DIR
 from endoreg_db.utils.storage import ensure_local_file, file_exists
 
@@ -29,7 +29,7 @@ class AnonymizationService:
         """
         self.project_root: Path = project_root or STORAGE_DIR
         self.video_service = VideoImportService()
-        self.pdf_service = PdfImportService()
+        self.pdf_service = ReportImportService()
 
     # ---------- READ ----------------------------------------------------
     @staticmethod
@@ -40,20 +40,32 @@ class AnonymizationService:
         Returns:
             dict or None: A dictionary containing the file's media type and anonymization status if found, or None if no matching file exists.
         """
-        vf = VideoFile.objects.select_related("state", "sensitive_meta").filter(pk=file_id).first()
+        vf = (
+            VideoFile.objects.select_related("state", "sensitive_meta")
+            .filter(pk=file_id)
+            .first()
+        )
         if vf:
             return {
                 "mediaType": "video",
-                "anonymizationStatus": vf.state.anonymization_status if vf.state else "not_started",
+                "anonymizationStatus": vf.state.anonymization_status
+                if vf.state
+                else "not_started",
                 "fileExists": file_exists(vf.raw_file),
                 "uuid": str(vf.uuid) if vf.uuid else None,
             }
 
-        pdf = RawPdfFile.objects.select_related("state", "sensitive_meta").filter(pk=file_id).first()
+        pdf = (
+            RawPdfFile.objects.select_related("state", "sensitive_meta")
+            .filter(pk=file_id)
+            .first()
+        )
         if pdf:
             return {
                 "mediaType": "pdf",
-                "anonymizationStatus": pdf.state.anonymization_status if pdf.state else "not_started",
+                "anonymizationStatus": pdf.state.anonymization_status
+                if pdf.state
+                else "not_started",
                 "fileExists": file_exists(pdf.file),
                 "hash": pdf.pdf_hash,
             }
@@ -72,7 +84,13 @@ class AnonymizationService:
             str or None: Media type if successful, None if file not found
         """
         # Try VideoFile first
-        vf = VideoFile.objects.select_related("state", "sensitive_meta", "center", "video_meta__processor").filter(pk=file_id).first()
+        vf = (
+            VideoFile.objects.select_related(
+                "state", "sensitive_meta", "center", "video_meta__processor"
+            )
+            .filter(pk=file_id)
+            .first()
+        )
         if vf:
             try:
                 logger.info(f"Starting video anonymization for VideoFile ID: {file_id}")
@@ -85,7 +103,9 @@ class AnonymizationService:
                 # Get file path
                 file_path = vf.get_raw_file_path()
                 if not file_path or not Path(file_path).exists():
-                    logger.error(f"Raw file not found for VideoFile {file_id}: {file_path}")
+                    logger.error(
+                        f"Raw file not found for VideoFile {file_id}: {file_path}"
+                    )
                     return None
 
                 # Get processor name
@@ -106,25 +126,37 @@ class AnonymizationService:
                 # Use VideoImportService for anonymization
                 safe_processor_name = processor_name or "unknown_processor"
                 self.video_service.import_and_anonymize(
-                    file_path=file_path, center_name=center_name, processor_name=safe_processor_name, save_video=True, delete_source=False
+                    file_path=file_path,
+                    center_name=center_name,
+                    processor_name=safe_processor_name,
+                    save_video=True,
+                    delete_source=False,
                 )
 
-                logger.info(f"Video anonymization completed for VideoFile ID: {file_id}")
+                logger.info(
+                    f"Video anonymization completed for VideoFile ID: {file_id}"
+                )
                 return "video"
 
             except Exception as e:
                 logger.error(f"Failed to anonymize VideoFile {file_id}: {e}")
                 # Mark as failed if state exists
                 if vf.state:
-                    vf.state.processing_started = False  # Mark processing as not started due to failure
+                    vf.state.processing_started = (
+                        False  # Mark processing as not started due to failure
+                    )
                     vf.state.save(update_fields=["processing_started"])
                 raise
 
         # Try RawPdfFile
-        pdf = RawPdfFile.objects.select_related("state", "sensitive_meta", "center").filter(pk=file_id).first()
+        pdf = (
+            RawPdfFile.objects.select_related("state", "sensitive_meta", "center")
+            .filter(pk=file_id)
+            .first()
+        )
         if pdf:
             try:
-                logger.info(f"Starting PDF processing for RawPdfFile ID: {file_id}")
+                logger.info(f"Starting report processing for RawPdfFile ID: {file_id}")
 
                 # Check if already processed
                 if pdf.state and getattr(pdf.state, "anonymized", False):
@@ -133,11 +165,13 @@ class AnonymizationService:
 
                 file_field = pdf.file
                 if not file_field or not file_field.name:
-                    logger.error(f"PDF file not found for RawPdfFile {file_id}")
+                    logger.error(f"report file not found for RawPdfFile {file_id}")
                     return None
 
                 if not file_exists(file_field):
-                    logger.error("PDF file missing from storage for RawPdfFile %s", file_id)
+                    logger.error(
+                        "report file missing from storage for RawPdfFile %s", file_id
+                    )
                     return None
 
                 # Get center name
@@ -147,9 +181,6 @@ class AnonymizationService:
                 if pdf.state:
                     pdf.state.processing_started = True
                     pdf.state.save(update_fields=["processing_started"])
-                elif pdf.sensitive_meta and hasattr(pdf.sensitive_meta, "anonymization_started"):
-                    pdf.sensitive_meta.anonymization_started = True
-                    pdf.sensitive_meta.save(update_fields=["anonymization_started"])
 
                 with ensure_local_file(file_field) as local_path:
                     self.pdf_service.import_and_anonymize(
@@ -157,17 +188,17 @@ class AnonymizationService:
                         center_name=center_name,
                     )
 
-                logger.info(f"PDF processing completed for RawPdfFile ID: {file_id}")
+                logger.info(f"report processing completed for RawPdfFile ID: {file_id}")
                 return "pdf"
 
             except Exception as e:
                 logger.error(f"Failed to process RawPdfFile {file_id}: {e}")
                 # Mark as failed if state exists
                 if pdf.state and hasattr(pdf.state, "processing_failed"):
-                    pdf.state.processing_failed = True
                     pdf.state.save(update_fields=["processing_failed"])
-                elif pdf.sensitive_meta and hasattr(pdf.sensitive_meta, "processing_failed"):
-                    pdf.sensitive_meta.processing_failed = True
+                elif pdf.sensitive_meta and hasattr(
+                    pdf.sensitive_meta, "processing_failed"
+                ):
                     pdf.sensitive_meta.save(update_fields=["processing_failed"])
                 raise
 
@@ -196,7 +227,9 @@ class AnonymizationService:
     @staticmethod
     def list_items():
         video_files = VideoFile.objects.select_related("state").all()
-        pdf_files = RawPdfFile.objects.select_related("state").all()  # was sensitive_meta
+        pdf_files = RawPdfFile.objects.select_related(
+            "state"
+        ).all()  # was sensitive_meta
 
         data = []
         for vf in video_files:
@@ -204,7 +237,9 @@ class AnonymizationService:
                 {
                     "id": vf.pk,
                     "mediaType": "video",
-                    "anonymizationStatus": vf.state.anonymization_status if vf.state else "not_started",
+                    "anonymizationStatus": vf.state.anonymization_status
+                    if vf.state
+                    else "not_started",
                     "createdAt": vf.date_created,
                     "updatedAt": vf.date_modified,
                 }
@@ -215,7 +250,9 @@ class AnonymizationService:
                 {
                     "id": pdf.pk,
                     "mediaType": "pdf",
-                    "anonymizationStatus": pdf.state.anonymization_status if pdf.state else "not_started",
+                    "anonymizationStatus": pdf.state.anonymization_status
+                    if pdf.state
+                    else "not_started",
                     "createdAt": pdf.date_created,
                     "updatedAt": pdf.date_modified,
                 }

endoreg_db/services/lookup_service.py

@@ -148,14 +148,14 @@ def build_initial_lookup(
         Dictionary containing initial lookup data with the following keys:
         - patient_examination_id: ID of the patient examination
         - requirement_sets: List of available requirement sets with metadata
-        - availableFindings: List of finding IDs available for the examination
-        - requiredFindings: List of finding IDs that are required by defaults
-        - requirementDefaults: Default findings per requirement
-        - classificationChoices: Available classification choices per requirement
-        - requirementsBySet: Empty dict (populated on selection)
-        - requirementStatus: Empty dict (computed on evaluation)
-        - requirementSetStatus: Empty dict (computed on evaluation)
-        - suggestedActions: Empty dict (computed on evaluation)
+        - available_findings: List of finding IDs available for the examination
+        - required_findings: List of finding IDs that are required by defaults
+        - requirement_defaults: Default findings per requirement
+        - classification_choices: Available classification choices per requirement
+        - requirements_by_set: Empty dict (populated on selection)
+        - requirement_status: Empty dict (computed on evaluation)
+        - requirement_set_status: Empty dict (computed on evaluation)
+        - suggested_actions: Empty dict (computed on evaluation)
     """
     # Available + required findings
     available_findings = (
@@ -202,15 +202,15 @@ def build_initial_lookup(
     return {
         "patient_examination_id": pe.id,
         "requirement_sets": requirement_sets,
-        "availableFindings": available_findings,
-        "requiredFindings": required_findings,
-        "requirementDefaults": req_defaults,
-        "classificationChoices": cls_choices,
+        "available_findings": available_findings,
+        "required_findings": required_findings,
+        "requirement_defaults": req_defaults,
+        "classification_choices": cls_choices,
         # New fields for expanded lookup payload
-        "requirementsBySet": {},  # Will be populated when requirement sets are selected
-        "requirementStatus": {},  # Status of each requirement (satisfied/unsatisfied)
-        "requirementSetStatus": {},  # Status of each requirement set
-        "suggestedActions": {},  # Suggested actions to satisfy requirements
+        "requirements_by_set": {},  # Will be populated when requirement sets are selected
+        "requirement_status": {},  # Status of each requirement (satisfied/unsatisfied)
+        "requirement_set_status": {},  # Status of each requirement set
+        "suggested_actions": {},  # Suggested actions to satisfy requirements
         # You can add "selectedRequirementSetIds" as the user makes choices
     }
 
@@ -260,12 +260,12 @@ def recompute_lookup(token: str) -> Dict[str, Any]:
 
     Returns:
         Dictionary of updates containing:
-        - requirementsBySet: Requirements grouped by selected requirement sets
-        - requirementStatus: Boolean status for each requirement
-        - requirementSetStatus: Boolean status for each requirement set
-        - requirementDefaults: Default findings per requirement
-        - classificationChoices: Available choices per requirement
-        - suggestedActions: UI actions to satisfy unsatisfied requirements
+        - requirements_by_set: Requirements grouped by selected requirement sets
+        - requirement_status: Boolean status for each requirement
+        - requirement_set_status: Boolean status for each requirement set
+        - requirement_defaults: Default findings per requirement
+        - classification_choices: Available choices per requirement
+        - suggested_actions: UI actions to satisfy unsatisfied requirements
 
     Raises:
         ValueError: If lookup data is invalid or patient examination not found
@@ -396,12 +396,12 @@ def recompute_lookup(token: str) -> Dict[str, Any]:
         # if you implement server-side simulation later, adjust requirement_status with staged result here
 
         updates = {
-            "requirementsBySet": requirements_by_set,
-            "requirementStatus": requirement_status,
-            "requirementSetStatus": set_status,
-            "requirementDefaults": req_defaults,  # keep your existing key
-            "classificationChoices": cls_choices,  # keep your existing key
-            "suggestedActions": suggested_actions,  # new
+            "requirements_by_set": requirements_by_set,
+            "requirement_status": requirement_status,
+            "requirement_set_status": set_status,
+            "requirement_defaults": req_defaults,  # keep your existing key
+            "classification_choices": cls_choices,  # keep your existing key
+            "suggested_actions": suggested_actions,  # new
         }
 
         logger.debug(

endoreg_db/services/lookup_store.py

@@ -173,8 +173,8 @@ class LookupStore:
         # Check if required fields are present
         required_fields = [
             "patient_examination_id",
-            "requirementsBySet",
-            "requirementStatus",
+            "requirements_by_set",
+            "requirement_status",
         ]
         missing_fields = [field for field in required_fields if field not in data]