Merge branch 'water-level-csv' into water-level-csv-refactor

Author: jacob-a-brown

schemas/__init__.py

@@ -55,7 +55,10 @@ class BaseUpdateModel(BaseCreateModel):
 
 def past_or_today_validator(value: date | datetime) -> date | datetime:
     if isinstance(value, datetime):
-        if value > datetime.now(timezone.utc):
+        if value.tzinfo is None:
+            if value > datetime.now():
+                raise ValueError("Datetime must be in the past or present.")
+        elif value > datetime.now(timezone.utc):
             raise ValueError("Datetime must be in the past or present.")
     elif value > date.today():
         raise ValueError("Date must be today or in the past.")

schemas/well_inventory.py

@@ -92,6 +92,10 @@ def state_validator(v):
 
 
 def phone_validator(phone_number_str):
+    # Allow optional phone fields: treat None or blank as no value.
+    if phone_number_str is None:
+        return None
+
     phone_number_str = phone_number_str.strip()
     if phone_number_str:
         parsed_number = phonenumbers.parse(phone_number_str, "US")

services/thing_helper.py

@@ -191,6 +191,9 @@ def add_thing(
         thing_type = get_thing_type_from_request(request)
 
     # Extract data for related tables
+    # Normalize Pydantic models to dictionaries so we can safely mutate with .pop()
+    if isinstance(data, BaseModel):
+        data = data.model_dump()
 
     # ---------
     # BEGIN UNIVERSAL THING RELATED TABLES