feat: merge dev and into image batch

src/input/input_validator.py

@@ -3,10 +3,13 @@ import string
 import hashlib
 import re
 import streamlit as st
+from fractions import Fraction
 
 from PIL import Image
 from PIL import ExifTags
 
+from streamlit.runtime.uploaded_file_manager import UploadedFile
+
 def generate_random_md5():
     # Generate a random string
     random_string = ''.join(random.choices(string.ascii_letters + string.digits, k=16))
@@ -59,10 +62,64 @@ def get_image_datetime(image_file):
         image = Image.open(image_file)
         exif_data = image._getexif()
         if exif_data is not None:
-            for tag, value in exif_data.items():
-                if ExifTags.TAGS.get(tag) == 'DateTimeOriginal':
-                    return value
+            if ExifTags.Base.DateTimeOriginal in exif_data:
+                return exif_data.get(ExifTags.Base.DateTimeOriginal)
     except Exception as e: # FIXME: what types of exception?
          st.warning(f"Could not extract date from image metadata. (file: {image_file.name})")
          # TODO: add to logger
-    return None
+    return None
+
+def decimal_coords(coords:tuple, ref:str) -> Fraction:
+    """
+    Converts coordinates from degrees, minutes, and seconds to decimal degrees.
+
+    Args:
+        coords (tuple): A tuple containing three elements representing degrees, minutes, and seconds.
+        ref (str): A string representing the reference direction ('N', 'S', 'E', 'W').
+
+    Returns:
+        Fraction: The coordinates in decimal degrees. Negative if the reference is 'S' or 'W'.
+
+    Example:
+        decimal_coords((40, 26, 46), 'N') -> 40.44611111111111
+        decimal_coords((40, 26, 46), 'W') -> -40.44611111111111
+    """
+    # https://stackoverflow.com/a/73267185
+    if ref not in ['N', 'S', 'E', 'W']:
+        raise ValueError("Invalid reference direction. Must be 'N', 'S', 'E', or 'W'.")
+    if len(coords) != 3:
+        raise ValueError("Coordinates must be a tuple of three elements (degrees, minutes, seconds).")
+    
+    decimal_degrees = coords[0] + coords[1] / 60 + coords[2] / 3600
+    if ref == "S" or ref =='W':
+        decimal_degrees = -decimal_degrees
+    return decimal_degrees
+
+
+def get_image_latlon(image_file: UploadedFile) -> tuple[float, float] | None:
+    """
+    Extracts the latitude and longitude from the EXIF metadata of an uploaded image file.
+
+    Args:
+        image_file (UploadedFile): The uploaded image file from which to extract the latitude and longitude.
+
+    Returns:
+        tuple[float, float]: The latitude and longitude as a tuple if available, otherwise None.
+
+    Raises:
+        Warning: If the latitude and longitude could not be extracted from the image metadata.
+    """
+    try:
+        image = Image.open(image_file)
+        exif_data = image._getexif()
+        if exif_data is not None:
+            if ExifTags.Base.GPSInfo in exif_data:
+                gps_ifd = exif_data.get(ExifTags.Base.GPSInfo) 
+                
+                lat = float(decimal_coords(gps_ifd[ExifTags.GPS.GPSLatitude], gps_ifd[ExifTags.GPS.GPSLatitudeRef]))
+                lon = float(decimal_coords(gps_ifd[ExifTags.GPS.GPSLongitude], gps_ifd[ExifTags.GPS.GPSLongitudeRef]))
+            
+                return lat, lon
+            
+    except Exception as e: # FIXME: what types of exception?
+         st.warning(f"Could not extract latitude and longitude from image metadata. (file: {str(image_file)}")

tests/test_input_handling.py

@@ -2,7 +2,7 @@ import pytest
 from pathlib import Path
 
 from input_handling import is_valid_email, is_valid_number
-from input_handling import get_image_datetime, get_image_latlon, decimal_coords
+from input.input_validator import get_image_latlon, decimal_coords, get_image_datetime
 
 # generate tests for is_valid_email
 # - test with valid email