chore: update pydantic and pydantic-core versions, enhance phone number validation, and add CSV feature tests

Author: jirhiker

cli/cli.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ===============================================================================
+from collections import defaultdict
 from enum import Enum
 from pathlib import Path
 
@@ -70,7 +71,92 @@ def well_inventory_csv(
     # TODO: use the same helper function used by api to parse and upload a WI csv
     from cli.service_adapter import well_inventory_csv
 
-    well_inventory_csv(file_path)
+    result = well_inventory_csv(file_path)
+    payload = result.payload if isinstance(result.payload, dict) else {}
+    summary = payload.get("summary", {})
+    validation_errors = payload.get("validation_errors", [])
+    detail = payload.get("detail")
+
+    if result.exit_code == 0:
+        typer.secho("[WELL INVENTORY IMPORT] SUCCESS", fg=typer.colors.GREEN, bold=True)
+    else:
+        typer.secho(
+            "[WELL INVENTORY IMPORT] COMPLETED WITH ISSUES",
+            fg=typer.colors.BRIGHT_YELLOW,
+            bold=True,
+        )
+    typer.secho("=" * 72, fg=typer.colors.BRIGHT_BLUE)
+
+    if summary:
+        processed = summary.get("total_rows_processed", 0)
+        imported = summary.get("total_rows_imported", 0)
+        rows_with_issues = summary.get("validation_errors_or_warnings", 0)
+        typer.secho("SUMMARY", fg=typer.colors.BRIGHT_BLUE, bold=True)
+        typer.echo(
+            f"Summary: processed={processed} imported={imported} rows_with_issues={rows_with_issues}"
+        )
+        typer.secho(f"  processed        : {processed}", fg=typer.colors.CYAN)
+        typer.secho(f"  imported         : {imported}", fg=typer.colors.GREEN)
+        issue_color = (
+            typer.colors.BRIGHT_YELLOW if rows_with_issues else typer.colors.GREEN
+        )
+        typer.secho(f"  rows_with_issues : {rows_with_issues}", fg=issue_color)
+
+    if validation_errors:
+        typer.secho("VALIDATION", fg=typer.colors.BRIGHT_BLUE, bold=True)
+        typer.secho(
+            f"Validation errors: {len(validation_errors)}",
+            fg=typer.colors.BRIGHT_YELLOW,
+            bold=True,
+        )
+        grouped_errors = defaultdict(list)
+        for err in validation_errors:
+            row = err.get("row", "?")
+            grouped_errors[row].append(err)
+
+        def _row_sort_key(row_value):
+            try:
+                return (0, int(row_value))
+            except (TypeError, ValueError):
+                return (1, str(row_value))
+
+        max_errors_to_show = 100
+        shown = 0
+        for row in sorted(grouped_errors.keys(), key=_row_sort_key):
+            if shown >= max_errors_to_show:
+                break
+
+            row_errors = grouped_errors[row]
+            typer.secho(
+                f"  Row {row} ({len(row_errors)} issue{'s' if len(row_errors) != 1 else ''})",
+                fg=typer.colors.CYAN,
+                bold=True,
+            )
+
+            for err in row_errors:
+                if shown >= max_errors_to_show:
+                    break
+                field = err.get("field", "unknown")
+                message = err.get("error") or err.get("msg") or "validation error"
+                prefix = typer.style("    ! ", fg=typer.colors.BRIGHT_YELLOW)
+                field_part = f"\033[1;38;5;208m{field}:\033[0m"
+                message_part = typer.style(f" {message}", fg=typer.colors.BRIGHT_YELLOW)
+                typer.echo(f"{prefix}{field_part}{message_part}")
+                shown += 1
+
+        if len(validation_errors) > shown:
+            typer.secho(
+                f"... and {len(validation_errors) - shown} more validation errors",
+                fg=typer.colors.YELLOW,
+            )
+
+    if detail:
+        typer.secho("ERRORS", fg=typer.colors.BRIGHT_BLUE, bold=True)
+        typer.secho(f"Error: {detail}", fg=typer.colors.BRIGHT_YELLOW, bold=True)
+
+    typer.secho("=" * 72, fg=typer.colors.BRIGHT_BLUE)
+
+    raise typer.Exit(result.exit_code)
 
 
 @water_levels.command("bulk-upload")

pyproject.toml

@@ -69,8 +69,8 @@ dependencies = [
   "pyasn1==0.6.2",
   "pyasn1-modules==0.4.2",
   "pycparser==2.23",
-  "pydantic==2.11.7",
-  "pydantic-core==2.33.2",
+  "pydantic==2.12.5",
+  "pydantic-core==2.41.5",
   "pygments==2.19.2",
   "pyjwt==2.11.0",
   "pyproj==3.7.2",

requirements.txt

@@ -1092,32 +1092,57 @@ pycparser==2.23 \
     # via
     #   cffi
     #   ocotilloapi
-pydantic==2.11.7 \
-    --hash=sha256:d989c3c6cb79469287b1569f7447a17848c998458d49ebe294e975b9baf0f0db \
-    --hash=sha256:dde5df002701f6de26248661f6835bbe296a47bf73990135c7d07ce741b9623b
+pydantic==2.12.5 \
+    --hash=sha256:4d351024c75c0f085a9febbb665ce8c0c6ec5d30e903bdb6394b7ede26aebb49 \
+    --hash=sha256:e561593fccf61e8a20fc46dfc2dfe075b8be7d0188df33f221ad1f0139180f9d
     # via
     #   fastapi
     #   fastapi-pagination
     #   ocotilloapi
-pydantic-core==2.33.2 \
-    --hash=sha256:04a1a413977ab517154eebb2d326da71638271477d6ad87a769102f7c2488c56 \
-    --hash=sha256:0a9f2c9dd19656823cb8250b0724ee9c60a82f3cdf68a080979d13092a3b0fef \
-    --hash=sha256:0fb2d542b4d66f9470e8065c5469ec676978d625a8b7a363f07d9a501a9cb36a \
-    --hash=sha256:1082dd3e2d7109ad8b7da48e1d4710c8d06c253cbc4a27c1cff4fbcaa97a9e3f \
-    --hash=sha256:1ea40a64d23faa25e62a70ad163571c0b342b8bf66d5fa612ac0dec4f069d916 \
-    --hash=sha256:2b0a451c263b01acebe51895bfb0e1cc842a5c666efe06cdf13846c7418caa9a \
-    --hash=sha256:52fb90784e0a242bb96ec53f42196a17278855b0f31ac7c3cc6f5c1ec4811849 \
-    --hash=sha256:5c92edd15cd58b3c2d34873597a1e20f13094f59cf88068adb18947df5455b4e \
-    --hash=sha256:61c18fba8e5e9db3ab908620af374db0ac1baa69f0f32df4f61ae23f15e586ac \
-    --hash=sha256:65132b7b4a1c0beded5e057324b7e16e10910c106d43675d9bd87d4f38dde162 \
-    --hash=sha256:7cb8bc3605c29176e1b105350d2e6474142d7c1bd1d9327c4a9bdb46bf827acc \
-    --hash=sha256:95237e53bb015f67b63c91af7518a62a8660376a6a0db19b89acc77a4d6199f5 \
-    --hash=sha256:9fdac5d6ffa1b5a83bca06ffe7583f5576555e6c8b3a91fbd25ea7780f825f7d \
-    --hash=sha256:c083a3bdd5a93dfe480f1125926afcdbf2917ae714bdb80b36d34318b2bec5d9 \
-    --hash=sha256:c2fc0a768ef76c15ab9238afa6da7f69895bb5d1ee83aeea2e3509af4472d0b9 \
-    --hash=sha256:c8e7af2f4e0194c22b5b37205bfb293d166a7344a5b0d0eaccebc376546d77d5 \
-    --hash=sha256:e80b087132752f6b3d714f041ccf74403799d3b23a72722ea2e6ba2e892555b9 \
-    --hash=sha256:f517ca031dfc037a9c07e748cefd8d96235088b83b4f4ba8939105d20fa1dcd6
+pydantic-core==2.41.5 \
+    --hash=sha256:0177272f88ab8312479336e1d777f6b124537d47f2123f89cb37e0accea97f90 \
+    --hash=sha256:01a3d0ab748ee531f4ea6c3e48ad9dac84ddba4b0d82291f87248f2f9de8d740 \
+    --hash=sha256:03ca43e12fab6023fc79d28ca6b39b05f794ad08ec2feccc59a339b02f2b3d33 \
+    --hash=sha256:08daa51ea16ad373ffd5e7606252cc32f07bc72b28284b6bc9c6df804816476e \
+    --hash=sha256:0cbaad15cb0c90aa221d43c00e77bb33c93e8d36e0bf74760cd00e732d10a6a0 \
+    --hash=sha256:112e305c3314f40c93998e567879e887a3160bb8689ef3d2c04b6cc62c33ac34 \
+    --hash=sha256:1d1d9764366c73f996edd17abb6d9d7649a7eb690006ab6adbda117717099b14 \
+    --hash=sha256:22f0fb8c1c583a3b6f24df2470833b40207e907b90c928cc8d3594b76f874375 \
+    --hash=sha256:239edca560d05757817c13dc17c50766136d21f7cd0fac50295499ae24f90fdf \
+    --hash=sha256:25e1c2af0fce638d5f1988b686f3b3ea8cd7de5f244ca147c777769e798a9cd1 \
+    --hash=sha256:2782c870e99878c634505236d81e5443092fba820f0373997ff75f90f68cd553 \
+    --hash=sha256:2a5e06546e19f24c6a96a129142a75cee553cc018ffee48a460059b1185f4470 \
+    --hash=sha256:2b761d210c9ea91feda40d25b4efe82a1707da2ef62901466a42492c028553a2 \
+    --hash=sha256:2ff4321e56e879ee8d2a879501c8e469414d948f4aba74a2d4593184eb326660 \
+    --hash=sha256:3006c3dd9ba34b0c094c544c6006cc79e87d8612999f1a5d43b769b89181f23c \
+    --hash=sha256:35b44f37a3199f771c3eaa53051bc8a70cd7b54f333531c59e29fd4db5d15008 \
+    --hash=sha256:3f37a19d7ebcdd20b96485056ba9e8b304e27d9904d233d7b1015db320e51f0a \
+    --hash=sha256:3f84d5c1b4ab906093bdc1ff10484838aca54ef08de4afa9de0f5f14d69639cd \
+    --hash=sha256:406bf18d345822d6c21366031003612b9c77b3e29ffdb0f612367352aab7d586 \
+    --hash=sha256:4819fa52133c9aa3c387b3328f25c1facc356491e6135b459f1de698ff64d869 \
+    --hash=sha256:506d766a8727beef16b7adaeb8ee6217c64fc813646b424d0804d67c16eddb66 \
+    --hash=sha256:5cb1b2f9742240e4bb26b652a5aeb840aa4b417c7748b6f8387927bc6e45e40d \
+    --hash=sha256:63510af5e38f8955b8ee5687740d6ebf7c2a0886d15a6d65c32814613681bc07 \
+    --hash=sha256:650ae77860b45cfa6e2cdafc42618ceafab3a2d9a3811fcfbd3bbf8ac3c40d36 \
+    --hash=sha256:6561e94ba9dacc9c61bce40e2d6bdc3bfaa0259d3ff36ace3b1e6901936d2e3e \
+    --hash=sha256:72f6c8b11857a856bcfa48c86f5368439f74453563f951e473514579d44aa612 \
+    --hash=sha256:79ec52ec461e99e13791ec6508c722742ad745571f234ea6255bed38c6480f11 \
+    --hash=sha256:80aa89cad80b32a912a65332f64a4450ed00966111b6615ca6816153d3585a8c \
+    --hash=sha256:8566def80554c3faa0e65ac30ab0932b9e3a5cd7f8323764303d468e5c37595a \
+    --hash=sha256:8e7c86f27c585ef37c35e56a96363ab8de4e549a95512445b85c96d3e2f7c1bf \
+    --hash=sha256:915c3d10f81bec3a74fbd4faebe8391013ba61e5a1a8d48c4455b923bdda7858 \
+    --hash=sha256:941103c9be18ac8daf7b7adca8228f8ed6bb7a1849020f643b3a14d15b1924d9 \
+    --hash=sha256:97aeba56665b4c3235a0e52b2c2f5ae9cd071b8a8310ad27bddb3f7fb30e9aa2 \
+    --hash=sha256:a39455728aabd58ceabb03c90e12f71fd30fa69615760a075b9fec596456ccc3 \
+    --hash=sha256:aec5cf2fd867b4ff45b9959f8b20ea3993fc93e63c7363fe6851424c8a7e7c23 \
+    --hash=sha256:b4ececa40ac28afa90871c2cc2b9ffd2ff0bf749380fbdf57d165fd23da353aa \
+    --hash=sha256:b80aa5095cd3109962a298ce14110ae16b8c1aece8b72f9dafe81cf597ad80b3 \
+    --hash=sha256:b93590ae81f7010dbe380cdeab6f515902ebcbefe0b9327cc4804d74e93ae69d \
+    --hash=sha256:bd3d54f38609ff308209bd43acea66061494157703364ae40c951f83ba99a1a9 \
+    --hash=sha256:d0d2568a8c11bf8225044aa94409e21da0cb09dcdafe9ecd10250b2baad531a9 \
+    --hash=sha256:dc799088c08fa04e43144b164feb0c13f9a0bc40503f8df3e9fde58a3c0c101e \
+    --hash=sha256:e56ba91f47764cc14f1daacd723e3e82d1a89d783f0f5afe9c364b8bb491ccdb \
+    --hash=sha256:e672ba74fbc2dc8eea59fb6d4aed6845e6905fc2a8afe93175d94a83ba2a01a0
     # via
     #   ocotilloapi
     #   pydantic

schemas/__init__.py

@@ -16,6 +16,7 @@
 from datetime import datetime, timezone, date
 from typing import Annotated
 
+from core.enums import ReleaseStatus
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -26,8 +27,6 @@
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core import core_schema
 
-from core.enums import ReleaseStatus
-
 DT_FMT = "%Y-%m-%dT%H:%M:%SZ"
 
 
@@ -53,7 +52,12 @@ class BaseUpdateModel(BaseCreateModel):
     release_status: ReleaseStatus | None = None
 
 
-def past_or_today_validator(value: date | datetime) -> date | datetime:
+def past_or_today_validator(
+    value: date | datetime | None,
+) -> date | datetime | None:
+    if value is None:
+        return None
+
     if isinstance(value, datetime):
         if value.tzinfo is None:
             if value > datetime.now():

schemas/well_inventory.py

@@ -19,15 +19,6 @@
 
 import phonenumbers
 import utm
-from pydantic import (
-    BaseModel,
-    model_validator,
-    BeforeValidator,
-    validate_email,
-    AfterValidator,
-    field_validator,
-)
-
 from core.constants import STATE_CODES
 from core.enums import (
     ElevationMethod,
@@ -39,6 +30,15 @@
     WellPurpose as WellPurposeEnum,
     MonitoringFrequency,
 )
+from phonenumbers import NumberParseException
+from pydantic import (
+    BaseModel,
+    model_validator,
+    BeforeValidator,
+    validate_email,
+    AfterValidator,
+    field_validator,
+)
 from schemas import past_or_today_validator, PastOrTodayDatetime
 from services.util import convert_dt_tz_naive_to_tz_aware
 
@@ -96,14 +96,18 @@ def phone_validator(phone_number_str):
 
     phone_number_str = phone_number_str.strip()
     if phone_number_str:
-        parsed_number = phonenumbers.parse(phone_number_str, "US")
+        try:
+            parsed_number = phonenumbers.parse(phone_number_str, "US")
+        except NumberParseException as e:
+            raise ValueError(f"Invalid phone number. {phone_number_str}") from e
+
         if phonenumbers.is_valid_number(parsed_number):
             formatted_number = phonenumbers.format_number(
                 parsed_number, phonenumbers.PhoneNumberFormat.E164
             )
             return formatted_number
-        else:
-            raise ValueError(f"Invalid phone number. {phone_number_str}")
+
+        raise ValueError(f"Invalid phone number. {phone_number_str}")
 
 
 def email_validator_function(email_str):