chore: limit displayed validation errors to 10 and update output formatting

Author: jirhiker

cli/cli.py

@@ -121,7 +121,7 @@ def _row_sort_key(row_value):
             except (TypeError, ValueError):
                 return (1, str(row_value))
 
-        max_errors_to_show = 1000
+        max_errors_to_show = 10
         shown = 0
         first_group = True
         for row in sorted(grouped_errors.keys(), key=_row_sort_key):
@@ -141,13 +141,13 @@ def _row_sort_key(row_value):
                 bold=True,
             )
 
-            for err in row_errors:
+            for idx, err in enumerate(row_errors, start=1):
                 if shown >= max_errors_to_show:
                     break
                 field = err.get("field", "unknown")
                 message = err.get("error") or err.get("msg") or "validation error"
                 input_value = err.get("value")
-                prefix_raw = "    ! "
+                prefix_raw = f"    {idx}. "
                 field_raw = f"{field}:"
                 msg_chunks = wrap(
                     str(message),
@@ -163,128 +163,7 @@ def _row_sort_key(row_value):
                 for chunk in msg_chunks[1:]:
                     typer.secho(f"{msg_indent}{chunk}", fg=typer.colors.BRIGHT_YELLOW)
                 if input_value is not None:
-                    input_prefix = "      input="
-                    input_chunks = wrap(
-                        str(input_value), width=max(20, 200 - len(input_prefix))
-                    ) or [""]
-                    typer.secho(
-                        f"{input_prefix}{input_chunks[0]}", fg=typer.colors.BRIGHT_WHITE
-                    )
-                    input_indent = " " * len(input_prefix)
-                    for chunk in input_chunks[1:]:
-                        typer.secho(
-                            f"{input_indent}{chunk}", fg=typer.colors.BRIGHT_WHITE
-                        )
-                shown += 1
-            typer.echo()
-
-        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)
-    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
-        first_group = True
-        for row in sorted(grouped_errors.keys(), key=_row_sort_key):
-            if shown >= max_errors_to_show:
-                break
-
-            row_errors = grouped_errors[row]
-            if not first_group:
-                typer.secho(
-                    "  " + "-" * 56,
-                    fg=typer.colors.BRIGHT_BLACK,
-                )
-            first_group = False
-            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"
-                input_value = err.get("value")
-                prefix_raw = "    ! "
-                field_raw = f"{field}:"
-                msg_chunks = wrap(
-                    str(message),
-                    width=max(20, 200 - len(prefix_raw) - len(field_raw) - 1),
-                ) or [""]
-                prefix = typer.style(prefix_raw, fg=typer.colors.BRIGHT_YELLOW)
-                field_part = typer.style(
-                    field_raw, fg=typer.colors.BRIGHT_YELLOW, bold=True
-                )
-                first_msg_part = typer.style(
-                    msg_chunks[0], fg=typer.colors.BRIGHT_YELLOW
-                )
-                typer.echo(f"{prefix}{field_part} {first_msg_part}")
-                msg_indent = " " * (len(prefix_raw) + len(field_raw) + 1)
-                for chunk in msg_chunks[1:]:
-                    typer.secho(f"{msg_indent}{chunk}", fg=typer.colors.BRIGHT_YELLOW)
-                if input_value is not None:
-                    input_prefix = "      input="
+                    input_prefix = "       input="
                     input_chunks = wrap(
                         str(input_value), width=max(20, 200 - len(input_prefix))
                     ) or [""]

tests/test_cli_commands.py

@@ -138,9 +138,9 @@ def fake_well_inventory(_file_path):
     assert "Validation errors: 2" in result.output
     assert (
         "Row 1 (1 issue)" in result.output
-        and "! contact_1_phone_1: Invalid phone" in result.output
+        and "1. contact_1_phone_1: Invalid phone" in result.output
     ) or "- row=1 field=contact_1_phone_1: Invalid phone" in result.output
-    assert "input='555-INVALID'" in result.output
+    assert "input=555-INVALID" in result.output
 
 
 def test_water_levels_bulk_upload_default_output(monkeypatch, tmp_path):