Save width/height in PhotoPrediction

Author: epou

tigacrafting/migrations/0034_auto_20250616_1427.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.25 on 2025-06-16 14:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tigacrafting', '0033_add_photoprediction'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='photoprediction',
+            name='height',
+            field=models.PositiveIntegerField(null=True),
+        ),
+        migrations.AddField(
+            model_name='photoprediction',
+            name='width',
+            field=models.PositiveIntegerField(null=True),
+        ),
+    ]

tigacrafting/models.py

@@ -1821,6 +1821,9 @@ def get_score_fieldnames(cls) -> List[str]:
     y_tl = models.PositiveIntegerField(help_text="photo bounding box coordinates top left y")
     y_br = models.PositiveIntegerField(help_text="photo bounding box coordinates bottom right y")
 
+    height = models.PositiveIntegerField(null=True)
+    width = models.PositiveIntegerField(null=True)
+
     created_at = models.DateTimeField(auto_now_add=True, editable=False)
     updated_at = models.DateTimeField(auto_now=True, editable=False)
 
@@ -1839,18 +1842,12 @@ def uncertainty(self) -> float:
         ])
 
     def clean(self):
-        # Get the linked photo dimensions
-        try:
-            width, height = self.photo.photo.width, self.photo.photo.height
-        except FileNotFoundError:
-            width = height = None
-
         # Check if x_br is greater than the photo width
-        if width is not None and self.x_br > width:
+        if self.width is not None and self.x_br > self.width:
             raise ValidationError("Bottom right x-coordinate (x_br) cannot exceed the width of the photo.")
 
         # Check if y_br is greater than the photo height
-        if height is not None and self.y_br > height:
+        if self.height is not None and self.y_br > self.height:
             raise ValidationError("Bottom right y-coordinate (y_br) cannot exceed the height of the photo.")
 
         if self.is_decisive:
@@ -1867,6 +1864,11 @@ def clean(self):
     def save(self, *args, **kwargs):
         self.taxon = Taxon.objects.filter(pk=self.PREDICTED_CLASS_TO_TAXON[self.predicted_class]).first()
 
+        try:
+            self.width, self.height = self.photo.photo.width, self.photo.photo.height
+        except FileNotFoundError:
+            self.width = self.height = None
+
         self.clean()
 
         if self.is_decisive: