fix: removed time from InputObservation, renamed date for clarity

- still some ambiguity with the names "date_option" and "time_option"
but the present change is more involved, while renaming those two
can happen after if valid

src/input/input_observation.py

@@ -1,6 +1,11 @@
 import hashlib
 from input.input_validator import generate_random_md5
 
+from numpy import ndarray
+from streamlit.runtime.uploaded_file_manager import UploadedFile
+import datetime
+
+
 # autogenerated class to hold the input data
 class InputObservation:
     """
@@ -15,10 +20,8 @@ class InputObservation:
             The longitude where the observation was made.
         author_email (str): 
             The email of the author of the observation.
-        date (Any):  # FIXME: specify the type
-            The date when the observation was made.
-        time (Any):  # FIXME: specify the type
-            The time when the observation was made.
+        image_datetime_raw (str):  
+            The datetime extracted from the observation file 
         date_option (datetime.date): 
             Additional date option for the observation.
         time_option (datetime.time): 
@@ -51,7 +54,9 @@ class InputObservation:
     
     def __init__(
         self, image:ndarray=None, latitude:float=None, longitude:float=None, 
-        author_email:str=None, date=None, time=None, date_option:datetime.date=None, 
+        author_email:str=None, image_datetime_raw:str=None, 
+        #time=None, 
+        date_option:datetime.date=None, 
         time_option:datetime.time=None, 
         uploaded_file:UploadedFile=None, image_md5:str=None):
 
@@ -59,8 +64,8 @@ class InputObservation:
         self.latitude = latitude
         self.longitude = longitude
         self.author_email = author_email
-        self.date = date
-        self.time = time
+        self.image_datetime_raw = image_datetime_raw
+        #self.time = time
         self.date_option = date_option
         self.time_option = time_option
         self.uploaded_file = uploaded_file
@@ -70,7 +75,10 @@ class InputObservation:
         InputObservation._inst_count += 1
         self._inst_id = InputObservation._inst_count
 
-        #self.assign_image_md5()
+
+        #dbg - temporarily give up if hash is not provided
+        if self.image_md5 is None:
+            raise ValueError(f"Image MD5 hash is required - {self._inst_id:3}.")
 
 
     def set_top_predictions(self, top_predictions:list):
@@ -98,7 +106,7 @@ class InputObservation:
         _im_str = "None" if self.image is None else f"image dims: {self.image.shape}"
         return (
             f"Observation: {_im_str}, {self.latitude}, {self.longitude}, "
-            f"{self.author_email}, {self.date}, {self.time}, {self.date_option}, " 
+            f"{self.author_email}, {self.image_datetime_raw}, {self.date_option}, " 
             f"{self.time_option}, {self.uploaded_file}, {self.image_md5}"
         )
 
@@ -110,8 +118,8 @@ class InputObservation:
             f"Latitude: {self.latitude}, "
             f"Longitude: {self.longitude}, "
             f"Author Email: {self.author_email}, "
-            f"Date: {self.date}, "
-            f"Time: {self.time}, "
+            f"raw timestamp: {self.image_datetime_raw}, "
+            #f"Time: {self.time}, "
             f"Date Option: {self.date_option}, "
             f"Time Option: {self.time_option}, "
             f"Uploaded Filename: {self.uploaded_file}"
@@ -133,7 +141,8 @@ class InputObservation:
             self.latitude == other.latitude and 
             self.longitude == other.longitude and 
             self.author_email == other.author_email and
-            self.date == other.date and self.time == other.time and 
+            self.image_datetime_raw == other.image_datetime_raw and
+            #self.time == other.time and 
             self.date_option == other.date_option and
             # temporarily skip time_option, it is followed by the clock and that is always differnt 
             #self.time_option == other.time_option and 
@@ -162,10 +171,8 @@ class InputObservation:
             differences.append(f"   Longitude is different. (self: {self.longitude}, other: {other.longitude})")
         if self.author_email != other.author_email:
             differences.append(f"   Author email is different. (self: {self.author_email}, other: {other.author_email})")
-        if self.date != other.date:
-            differences.append(f"   Date is different. (self: {self.date}, other: {other.date})")
-        if self.time != other.time:
-            differences.append(f"   Time is different. (self: {self.time}, other: {other.time})")
+        if self.image_datetime_raw != other.image_datetime_raw:
+            differences.append(f"   Date is different. (self: {self.image_datetime_raw}, other: {other.image_datetime_raw})")
         if self.date_option != other.date_option:
             differences.append(f"   Date option is different. (self: {self.date_option}, other: {other.date_option})")
         if self.time_option != other.time_option:
@@ -194,11 +201,10 @@ class InputObservation:
             "latitude": self.latitude,
             "longitude": self.longitude,
             "author_email": self.author_email,
-            "date": self.date,
-            "time": self.time,
+            "image_datetime_raw": self.image_datetime_raw,
             "date_option": str(self.date_option),
             "time_option": str(self.time_option),
-            "uploaded_file": self.uploaded_file
+            #"uploaded_file": self.uploaded_file # can't serialize this in json, not needed anyway.
         }
 
     @classmethod
@@ -208,8 +214,7 @@ class InputObservation:
             latitude=data.get("latitude"),
             longitude=data.get("longitude"),
             author_email=data.get("author_email"),
-            date=data.get("date"),
-            time=data.get("time"),
+            image_datetime_raw=data.get("image_datetime_raw"),
             date_option=data.get("date_option"),
             time_option=data.get("time_option"),
             uploaded_file=data.get("uploaded_file"),
@@ -223,8 +228,7 @@ class InputObservation:
             latitude=input.latitude,
             longitude=input.longitude,
             author_email=input.author_email,
-            date=input.date,
-            time=input.time,
+            image_datetime_raw=input.image_datetime_raw,
             date_option=input.date_option,
             time_option=input.time_option,
             uploaded_file=input.uploaded_file,