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

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-0.4.1.dist-info → endoreg_db-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: endoreg-db
-Version: 0.4.1
+Version: 0.4.2
 Summary: EndoReg Db Django App
 License: GNU3
 Author: Thomas J. Lux
@@ -9,15 +9,13 @@ 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: 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.2.dist-info}/RECORD

@@ -148,15 +148,16 @@ endoreg_db/migrations/0001_initial.py,sha256=tIXFN6sFZ2VUIP-TaFSGcobrgARkia0SIOi
 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
@@ -307,7 +308,7 @@ endoreg_db/utils/ocr.py,sha256=jkdT1bl-LSCjZ2PvxlX1AG2TmhdMclayxUPrdZWs7UE,7322
 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.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+endoreg_db-0.4.2.dist-info/METADATA,sha256=T6Dqv1TD5kZ6V9GHtPSJKN7mh8WG3l6XM_Trj4TxPyc,955
+endoreg_db-0.4.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+endoreg_db-0.4.2.dist-info/RECORD,,