BDMS-626: Improve validation, schema alignment, and well inventory handling

cli/db_restore.py

@@ -235,6 +235,7 @@ def restore_local_db_from_sql(
             ) from exc
 
         return LocalDbRestoreResult(
+            sql_file=staged_sql_file,
             source=source_description,
             host=host,
             port=port,

cli/service_adapter.py

@@ -50,19 +50,33 @@ def well_inventory_csv(source_file: Path | str):
         payload = {"detail": "Empty file"}
         return WellInventoryResult(1, json.dumps(payload), payload["detail"], payload)
     try:
-        text = content.decode("utf-8")
+        # Accept UTF-8 CSVs saved with a BOM so the first header is parsed correctly.
+        text = content.decode("utf-8-sig")
     except UnicodeDecodeError:
         payload = {"detail": "File encoding error"}
         return WellInventoryResult(1, json.dumps(payload), payload["detail"], payload)
     try:
+        progress_callback = None
+        if sys.stdout.isatty():
+            progress_callback = lambda message: print(message, flush=True)
         payload = import_well_inventory_csv(
-            text=text, user={"sub": "cli", "name": "cli"}
+            text=text,
+            user={"sub": "cli", "name": "cli"},
+            progress_callback=progress_callback,
         )
     except ValueError as exc:
         payload = {"detail": str(exc)}
         return WellInventoryResult(1, json.dumps(payload), payload["detail"], payload)
-    exit_code = 0 if not payload.get("validation_errors") else 1
-    return WellInventoryResult(exit_code, json.dumps(payload), "", payload)
+    exit_code = (
+        0 if not payload.get("validation_errors") and not payload.get("detail") else 1
+    )
+    stderr = ""
+    if exit_code != 0:
+        if payload.get("validation_errors"):
+            stderr = f"Validation errors: {json.dumps(payload.get('validation_errors'), indent=2)}"
+        else:
+            stderr = f"Error: {payload.get('detail')}"
+    return WellInventoryResult(exit_code, json.dumps(payload), stderr, payload)
 
 
 def water_levels_csv(source_file: Path | str, *, pretty_json: bool = False):

core/enums.py

@@ -48,7 +48,7 @@
 )
 LimitType: type[Enum] = build_enum_from_lexicon_category("limit_type")
 MeasurementMethod: type[Enum] = build_enum_from_lexicon_category("measurement_method")
-MonitoringStatus: type[Enum] = build_enum_from_lexicon_category("monitoring_status")
+MonitoringStatus: type[Enum] = build_enum_from_lexicon_category("status_value")
 ParameterName: type[Enum] = build_enum_from_lexicon_category("parameter_name")
 Organization: type[Enum] = build_enum_from_lexicon_category("organization")
 OriginType: type[Enum] = build_enum_from_lexicon_category("origin_type")

core/lexicon.json

@@ -4452,6 +4452,111 @@
       "term": "Zamora Accounting Services",
       "definition": "Zamora Accounting Services"
     },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Agua Sana MWCD",
+      "definition": "Agua Sana MWCD"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Canada Los Alamos MDWCA",
+      "definition": "Canada Los Alamos MDWCA"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Canjilon Mutual Domestic Water System",
+      "definition": "Canjilon Mutual Domestic Water System"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Cebolla Mutual Domestic",
+      "definition": "Cebolla Mutual Domestic"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Chihuahuan Desert Rangeland Research Center (CDRRC)",
+      "definition": "Chihuahuan Desert Rangeland Research Center (CDRRC)"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "East Rio Arriba SWCD",
+      "definition": "East Rio Arriba SWCD"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "El Prado Municipal Water",
+      "definition": "El Prado Municipal Water"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Hachita Mutual Domestic",
+      "definition": "Hachita Mutual Domestic"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Jornada Experimental Range (JER)",
+      "definition": "Jornada Experimental Range (JER)"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "La Canada Way HOA",
+      "definition": "La Canada Way HOA"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Los Ojos Mutual Domestic",
+      "definition": "Los Ojos Mutual Domestic"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "The Nature Conservancy (TNC)",
+      "definition": "The Nature Conservancy (TNC)"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Smith Ranch LLC",
+      "definition": "Smith Ranch LLC"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Zia Pueblo",
+      "definition": "Zia Pueblo"
+    },
+    {
+      "categories": [
+        "organization"
+      ],
+      "term": "Our Lady of Guadalupe (OLG)",
+      "definition": "Our Lady of Guadalupe (OLG)"
+    },
     {
       "categories": [
         "organization"
@@ -8185,6 +8290,13 @@
       "term": "Water",
       "definition": "Water bearing zone information and other info from ose reports"
     },
+    {
+      "categories": [
+        "note_type"
+      ],
+      "term": "Water Quality",
+      "definition": "Water quality information"
+    },
     {
       "categories": [
         "note_type"

schemas/contact.py

@@ -151,7 +151,7 @@ class CreateContact(BaseCreateModel, ValidateContact):
     name: str | None = None
     organization: str | None = None
     role: Role
-    contact_type: ContactType = "Primary"
+    contact_type: ContactType
     nma_pk_owners: str | None = None
     # description: str | None = None
     # email: str | None = None

schemas/thing.py

@@ -143,6 +143,7 @@ class CreateWell(CreateBaseThing, ValidateWell):
     is_suitable_for_datalogger: bool | None = None
     is_open: bool | None = None
     well_status: str | None = None
+    monitoring_status: str | None = None
     formation_completion_code: FormationCode | None = None
     nma_formation_zone: str | None = None