endoreg-db 0.4.1__tar.gz → 0.4.2__tar.gz

{endoreg_db-0.4.1 → endoreg_db-0.4.2}/PKG-INFO

@@ -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.2/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-0.4.1 → endoreg_db-0.4.2}/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-0.4.1 → endoreg_db-0.4.2}/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-0.4.1 → endoreg_db-0.4.2}/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 → endoreg_db-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "endoreg-db"
-version = "0.4.1"
+version = "0.4.2"
 description = "EndoReg Db Django App"
 authors = ["Thomas J. Lux"]
 license = "GNU3"
@@ -8,22 +8,24 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.11"
-django = "~4.2"
+django = "^5.1"
 djangorestframework = "^3.14.0"
 django-bootstrap5 = "^23.4"
 tqdm = "^4.66.2"
 pyyaml = "^6.0.1"
-icecream = "^2.1.3"
-pillow = "^10.2.0"
-# opencv-python
 opencv-python = "^4.9.0.80"
 ffmpeg-python = "^0.2.0"
 pytesseract = "^0.3.10"
-agl-report-reader = "^0.3.0"
 scipy = "^1.14.0"
 pandas = "^2.2.2"
+pillow = "~10"
 
+[tool.poetry.group.nixProvided.dependencies]
+icecream = "^2.1.3"
+# agl-report-reader = "^0.3"
 
+[tool.poetry.group.dev.dependencies]
+pytest = "^8.3.3"
 
 [build-system]
 requires = ["poetry-core"]