endoreg-db 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

endoreg_db/management/commands/register_ai_model.py

@@ -14,7 +14,6 @@ from django.core.files import File
 from endoreg_db.models import ModelMeta, ModelType, LabelSet
 import json
 from pathlib import Path
-from icecream import ic
 
 class Command(BaseCommand):
     """

endoreg_db/migrations/0005_uploadedfile_alter_rawpdffile_file_anonymizedfile.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.2.15 on 2024-09-17 11:46
+
+import django.core.files.storage
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('endoreg_db', '0004_alter_rawpdffile_file'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UploadedFile',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('original_file', models.FileField(upload_to='uploads/original/')),
+                ('upload_date', models.DateTimeField(default=django.utils.timezone.now)),
+                ('description', models.TextField(blank=True, null=True)),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='rawpdffile',
+            name='file',
+            field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location='/mnt/hdd-sensitive/Pseudo/import/pdf'), upload_to='raw_pdf/', validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['pdf'])]),
+        ),
+        migrations.CreateModel(
+            name='AnonymizedFile',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('anonymized_file', models.FileField(upload_to='uploads/anonymized/')),
+                ('anonymization_date', models.DateTimeField(default=django.utils.timezone.now)),
+                ('original_file', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='anonymized_file', to='endoreg_db.uploadedfile')),
+            ],
+        ),
+    ]

endoreg_db/models/__init__.py

@@ -39,11 +39,7 @@ from .patient_examination import PatientExamination
 
 from .label import Label, LabelType, LabelSet
 
-from .annotation import (
-    ImageClassificationAnnotation,
-    LegacyBinaryClassificationAnnotationTask,
-    BinaryClassificationAnnotationTask,
-)
+from .annotation import *
 
 from .legacy_data import (
     LegacyImage,
@@ -74,3 +70,4 @@ from .hardware import (
 )
 
 from .questionnaires import TtoQuestionnaire
+from .annotation import AnonymousImageAnnotation, AnonymizedImageLabel, DroppedName

endoreg_db/models/annotation/__init__.py

@@ -1,3 +1,3 @@
 from .image_classification import ImageClassificationAnnotation
 from .binary_classification_annotation_task import LegacyBinaryClassificationAnnotationTask, BinaryClassificationAnnotationTask
-from .anonymized_image_annotation import AnonymousImageAnnotation, DroppedName, AnonymizedImageLabel
+from .anonymized_image_annotation import AnonymousImageAnnotation, DroppedName, AnonymizedImageLabel, AnonymizedFile, UploadedFile

endoreg_db/models/annotation/anonymized_image_annotation.py

@@ -39,3 +39,22 @@ class DroppedName(models.Model):
 
     def __str__(self):
         return f"{self.name} ({self.gender}) at ({self.x}, {self.y})"
+
+from django.db import models
+from django.utils import timezone
+
+class UploadedFile(models.Model):
+    original_file = models.FileField(upload_to='uploads/original/')
+    upload_date = models.DateTimeField(default=timezone.now)
+    description = models.TextField(blank=True, null=True)
+    
+    def __str__(self):
+        return self.original_file.name
+    
+class AnonymizedFile(models.Model):
+    original_file = models.OneToOneField(UploadedFile, on_delete=models.CASCADE, related_name='anonymized_file')
+    anonymized_file = models.FileField(upload_to='uploads/anonymized/')
+    anonymization_date = models.DateTimeField(default=timezone.now)
+    
+    def __str__(self):
+        return f"Anonymized version of {self.original_file.original_file.name}"

endoreg_db/queries/annotations/legacy.py

@@ -1,7 +1,6 @@
 from ...models import LabelSet, ImageClassificationAnnotation
 from django.db.models import Q, F
 from django.db import models
-from icecream import ic
 from tqdm import tqdm
 from collections import defaultdict
 

endoreg_db/utils/legacy_ocr.py

@@ -7,7 +7,6 @@ from tempfile import TemporaryDirectory
 import re
 from datetime import datetime
 from typing import Dict, List
-from icecream import ic
 import numpy as np
 
 N_FRAMES_MEAN_OCR = 2
@@ -126,9 +125,10 @@ def extract_text_from_rois(image_path, processor:EndoscopyProcessor):
             extracted_texts[roi_name] = processed_text
 
         else:
-            ic(roi_name)
-            ic(roi)
-            ic("No values for this ROI")
+            pass
+            # ic(roi_name)
+            # ic(roi)
+            # ic("No values for this ROI")
 
     return extracted_texts
 
@@ -146,8 +146,8 @@ def get_most_frequent_values(rois_texts: Dict[str, List[str]]) -> Dict[str, str]
     most_frequent = {}
     for key in rois_texts.keys():
         counter = Counter([text for text in rois_texts[key] if text])
-        ic(key)
-        ic(counter)
+        # ic(key)
+        # ic(counter)
         most_frequent[key], _ = counter.most_common(1)[0] if counter else (None, None)
     return most_frequent
 
@@ -164,7 +164,7 @@ def process_video(video_path, processor):
     """
     # Create a temporary directory to store frames
     with TemporaryDirectory() as temp_dir:
-        ic(temp_dir)
+        # ic(temp_dir)
         # Capture the video
         video = cv2.VideoCapture(video_path)
         success, frame_number = True, 0
@@ -182,7 +182,7 @@ def process_video(video_path, processor):
                 
                 # Extract text from ROIs
                 extracted_texts = extract_text_from_rois(frame_path, processor)
-                ic(extracted_texts)
+                # ic(extracted_texts)
                 
                 # Store the extracted text from each ROI
                 for key, text in extracted_texts.items():

endoreg_db/utils/ocr.py

@@ -6,7 +6,6 @@ from tempfile import TemporaryDirectory
 import re
 from datetime import datetime
 from typing import Dict, List
-from icecream import ic
 import numpy as np
 from endoreg_db.utils.cropping import crop_and_insert
 
@@ -123,9 +122,7 @@ def extract_text_from_rois(image_path, processor):
             extracted_texts[roi_name] = processed_text
 
         else:
-            ic(roi_name)
-            ic(roi)
-            ic("No values for this ROI")
+            pass
 
     return extracted_texts
 
@@ -142,8 +139,6 @@ def get_most_frequent_values(rois_texts: Dict[str, List[str]]) -> Dict[str, str]
     most_frequent = {}
     for key in rois_texts.keys():
         counter = Counter([text for text in rois_texts[key] if text])
-        ic(key)
-        ic(counter)
         most_frequent[key], _ = counter.most_common(1)[0] if counter else (None, None)
     return most_frequent
 
@@ -160,7 +155,6 @@ def process_video(video_path, processor):
     """
     # Create a temporary directory to store frames
     with TemporaryDirectory() as temp_dir:
-        ic(temp_dir)
         # Capture the video
         video = cv2.VideoCapture(video_path)
         success, frame_number = True, 0
@@ -178,7 +172,6 @@ def process_video(video_path, processor):
                 
                 # Extract text from ROIs
                 extracted_texts = extract_text_from_rois(frame_path, processor)
-                ic(extracted_texts)
                 
                 # Store the extracted text from each ROI
                 for key, text in extracted_texts.items():

{endoreg_db-0.4.1.dist-info → endoreg_db-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: endoreg-db
-Version: 0.4.1
+Version: 0.4.3
 Summary: EndoReg Db Django App
 License: GNU3
 Author: Thomas J. Lux
@@ -9,15 +9,14 @@ Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: agl-report-reader (>=0.3.0,<0.4.0)
-Requires-Dist: django (>=4.2,<4.3)
+Requires-Dist: agl-report-reader (==0.3.2)
+Requires-Dist: django (>=5.1,<6.0)
 Requires-Dist: django-bootstrap5 (>=23.4,<24.0)
 Requires-Dist: djangorestframework (>=3.14.0,<4.0.0)
 Requires-Dist: ffmpeg-python (>=0.2.0,<0.3.0)
-Requires-Dist: icecream (>=2.1.3,<3.0.0)
 Requires-Dist: opencv-python (>=4.9.0.80,<5.0.0.0)
 Requires-Dist: pandas (>=2.2.2,<3.0.0)
-Requires-Dist: pillow (>=10.2.0,<11.0.0)
+Requires-Dist: pillow (>=10,<11)
 Requires-Dist: pytesseract (>=0.3.10,<0.4.0)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
 Requires-Dist: scipy (>=1.14.0,<2.0.0)

{endoreg_db-0.4.1.dist-info → endoreg_db-0.4.3.dist-info}/RECORD

@@ -142,21 +142,22 @@ endoreg_db/management/commands/load_profession_data.py,sha256=oF3OF7zRqxA-SVpMW6
 endoreg_db/management/commands/load_report_reader_flag.py,sha256=pvqRgtcjaYTgx2Ce7HYnNzsUB48yJe9lXTk-lzfJUPI,1371
 endoreg_db/management/commands/load_unit_data.py,sha256=tcux-iL-ByT2ApgmHEkLllZSEA3AGMK5l-ze2Mtty1Y,1319
 endoreg_db/management/commands/load_user_groups.py,sha256=D7SK2FvZEHoE4TIXNGCjDw5_12MH9bpGZvoS7eEv0Os,1031
-endoreg_db/management/commands/register_ai_model.py,sha256=e5hgEyLS-E98XWzINcZ79mgtHvZltmbmAmLYaNrcfQs,2544
+endoreg_db/management/commands/register_ai_model.py,sha256=ni_YBlEuCuhMymRE1376e64x6S1CcQkNH7XaJ_DhP4A,2520
 endoreg_db/management/commands/reset_celery_schedule.py,sha256=U-m_FNRTw6LAwJoT9RUE4qrhmQXm7AyFToPcHYyJpIE,386
 endoreg_db/migrations/0001_initial.py,sha256=tIXFN6sFZ2VUIP-TaFSGcobrgARkia0SIOiKN0iokvU,95312
 endoreg_db/migrations/0002_anonymizedimagelabel_anonymousimageannotation_and_more.py,sha256=ABUOr5ZMUHkRQ0FDUhqNaVAvq5K8HOOdyVo1TJ8YMkQ,2605
 endoreg_db/migrations/0003_anonymousimageannotation_original_image_url_and_more.py,sha256=bTb9_FfQBNHYLq1tKw1qmem9xsecRv-z1-aWcl9ig4k,1319
 endoreg_db/migrations/0004_alter_rawpdffile_file.py,sha256=B1LxaapxDnzs08ScrXh1pM_KC2hHHyEHGce_0Ciaex8,712
+endoreg_db/migrations/0005_uploadedfile_alter_rawpdffile_file_anonymizedfile.py,sha256=yhQhScntZgPdMpci2aWfGk3qzvSUS9asDfMFyMlIL2U,1776
 endoreg_db/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-endoreg_db/models/__init__.py,sha256=wc1ZyDUNb-sKMZ4P7x_PAb0WtzDhYAq8y19AV8rC7dQ,1552
+endoreg_db/models/__init__.py,sha256=EH4g6EvT8AbEtcVcTj8AUtjGP3sQtQw7M34I_g_IGP4,1512
 endoreg_db/models/ai_model/__init__.py,sha256=rh5npLRGml5iiRocx359gsaA82pGJTW7wdVAfnbZP6w,106
 endoreg_db/models/ai_model/active_model.py,sha256=r7SE3yg54kbjfOkk0Ei0rgs_Wo3ikx88rcEELqvRzGc,343
 endoreg_db/models/ai_model/model_meta.py,sha256=YyYW8dScpAceHePnbrnRpgVBYDByi9x7u5Ydh03OJuo,869
 endoreg_db/models/ai_model/model_type.py,sha256=mg1bEuzAjIte25N4TzD0yDhmUQYayJpyrRn2hB6b6eg,638
 endoreg_db/models/ai_model/utils.py,sha256=Vh6_3lbDuFhSVCaaZKKm0CjoGA5Man6gWYe46HUXmbA,270
-endoreg_db/models/annotation/__init__.py,sha256=9RM6_ZbKToUPzxgNOlFErSlFE3tdLQDY_Qw_z4Oh708,292
-endoreg_db/models/annotation/anonymized_image_annotation.py,sha256=i3DtDOE7OKNJLwK0u5LXDuNNopD6Nql_bCjTwJHXEUM,1961
+endoreg_db/models/annotation/__init__.py,sha256=TnRp_hJ4YomxKN6N1yBzGHStY9SnY_HLPCjJKLdZmu8,323
+endoreg_db/models/annotation/anonymized_image_annotation.py,sha256=1mZadIzYsEZN_zz_SMehGgiIvMbhHpiFMO2tfmbOL54,2716
 endoreg_db/models/annotation/binary_classification_annotation_task.py,sha256=CpvyDxLSJcoJyajtUsDGBt881SNSFcG8lvuQ01knMNM,3292
 endoreg_db/models/annotation/image_classification.py,sha256=Og1tRo1QKBMztwfdbFryUWghnGdsTqQdepn9rOcmVMc,1387
 endoreg_db/models/case_template/__init__.py,sha256=vtq-7Gvpv01l9CuQvBFQugXCKELx9wg2z5HkysrZCNM,369
@@ -271,7 +272,7 @@ endoreg_db/models/rules/ruleset.py,sha256=XaY30qfXuXaUhaDmgfyUhPBnQ4EE1owixZ3mDW
 endoreg_db/models/unit.py,sha256=5-LrmM3vVTElsNqztVDDBE9e9xpYIfz5-AD30H630oU,836
 endoreg_db/queries/__init__.py,sha256=3yhFtU_yY2L8rK2--8WkjcyI0q94QPpTtv5w_v8rZRY,83
 endoreg_db/queries/annotations/__init__.py,sha256=76O3dAIzuSye09VNPGSNPnqPEtgXZcBAGXKdh89y0ts,95
-endoreg_db/queries/annotations/legacy.py,sha256=1uHubRWItrBzvw_5nwJfc4oa6shWWJcG5J68oVgiFvY,6442
+endoreg_db/queries/annotations/legacy.py,sha256=KOHWLDf3CLvIT9GpQi3ps4bUi3JDJUhJXH4gvw9T47E,6418
 endoreg_db/queries/get/__init__.py,sha256=id0oVNTEjzzUpkvTp0E4tClFN91EeKOyEuSAYsIlIQo,147
 endoreg_db/queries/get/annotation.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 endoreg_db/queries/get/center.py,sha256=SeVxpzZUErk_jjv0RaurDar2i_28FWQ6RarxFHblnGw,1155
@@ -302,12 +303,12 @@ endoreg_db/utils/cropping.py,sha256=wMLo5sCFdZAEVBe3RbCH26eQjRe8q3th4K3ZKDd9fww,
 endoreg_db/utils/dataloader.py,sha256=rps-zZ-5QsEetYunxChbZvxZSQHOH9LU4N6a7o8Q0fs,4035
 endoreg_db/utils/file_operations.py,sha256=3mUY6jARIm927XK0nJoDO7fRp5quoSqPr95jDJERmr0,884
 endoreg_db/utils/hashs.py,sha256=mLae54Vj7h5Q-9_MWtEB_KKE7x9qALpClgZyX5DB9Ek,1069
-endoreg_db/utils/legacy_ocr.py,sha256=c2EBP-9egUYyfsQ1n0QoZY2wKndWoKdEXrB-MQZ0Xn4,7633
-endoreg_db/utils/ocr.py,sha256=jkdT1bl-LSCjZ2PvxlX1AG2TmhdMclayxUPrdZWs7UE,7322
+endoreg_db/utils/legacy_ocr.py,sha256=lzZb8om4pfEJ5i7fuamW1XaVjO1Fybne7QCdVUxz8O8,7640
+endoreg_db/utils/ocr.py,sha256=LvyABxX5OZhIeXw2pI6af8_xTj7nHQQoKGh5kNsrv7o,7136
 endoreg_db/utils/uuid.py,sha256=T4HXqYtKwXFqE5kPyvlgWHyllBBF6LL6N48nl9TpwBk,53
 endoreg_db/utils/video_metadata.py,sha256=HDyXxAeNQOK3cGzQ06xosmObzEnJBARuKjwz9vmmRIM,2613
 endoreg_db/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
-endoreg_db-0.4.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-endoreg_db-0.4.1.dist-info/METADATA,sha256=00evXIbn5l5x4dOmbdcvm6UAcpyBnlZuZLYvtq-NX8c,1054
-endoreg_db-0.4.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-endoreg_db-0.4.1.dist-info/RECORD,,
+endoreg_db-0.4.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+endoreg_db-0.4.3.dist-info/METADATA,sha256=hRkpATMqgQmowCk4y7KQlxzihdFvJXtOsqdsVvmLhUM,998
+endoreg_db-0.4.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+endoreg_db-0.4.3.dist-info/RECORD,,