feat(csv-templates): Add CSV template validation endpoint and enhance error handling
- Introduced a new endpoint for validating CSV templates without saving, allowing users to check field mappings and type conversions. - Updated the `create_system_template` and `update_system_template` functions to include validation reports in responses. - Enhanced error handling in CSV import processes by integrating `enrich_row_error` for more informative error messages. - Improved the AdminCsvTemplateEditorPage to support format checking and display validation results, enhancing user experience. - Incremented version numbers for `csv_import` and `admin_csv_templates` to reflect these updates.
This commit is contained in:
1 parent
6945b748cb
commit
0629f88b37
10 files changed
+486
-39
No files matched your search
@@ -23,11 +23,8 @@ from csv_parser.mapping_suggest import build_type_conversions_for_mapping, sugge
|
||||
from csv_parser.import_row_processing import (
|
||||
validate_import_row_processing as validate_import_row_processing_spec,
|
||||
)
|
||||
from csv_parser.module_registry import (
|
||||
get_module_definition,
|
||||
validate_field_mappings,
|
||||
validate_required_field_targets,
|
||||
)
|
||||
from csv_parser.module_registry import get_module_definition
|
||||
from csv_parser.template_validator import validate_csv_template
|
||||
|
||||
router = APIRouter(prefix="/api/admin/csv-templates", tags=["admin", "csv-import"])
|
||||
|
||||
@@ -62,6 +59,16 @@ class CsvImportLimitsBody(BaseModel):
|
||||
max_file_bytes: int = Field(..., ge=10_000, le=2_147_483_648)
|
||||
|
||||
|
||||
class CsvTemplateValidateBody(BaseModel):
|
||||
"""Formatprüfung ohne Speichern (field_mappings + type_conversions + optional row_processing)."""
|
||||
|
||||
module: str
|
||||
field_mappings: dict = Field(default_factory=dict)
|
||||
type_conversions: Optional[dict] = None
|
||||
import_row_processing: Optional[dict] = None
|
||||
column_signature: Optional[List[str]] = None
|
||||
|
||||
|
||||
def _row_full(m: dict) -> dict:
|
||||
return {
|
||||
"id": m["id"],
|
||||
@@ -255,6 +262,23 @@ def _admin_csv_limits() -> dict[str, int]:
|
||||
return get_csv_import_limits(r2d(row) if row else None)
|
||||
|
||||
|
||||
@router.post("/validate")
|
||||
def validate_system_template_dry_run(body: CsvTemplateValidateBody, session: dict = Depends(require_admin)):
|
||||
"""
|
||||
Validatorlauf für eine Vorlagen-Konfiguration (ohne DB-Schreiben).
|
||||
Nutzbar aus dem Admin-Editor vor dem Speichern.
|
||||
"""
|
||||
if not get_module_definition(body.module):
|
||||
raise HTTPException(400, f"Unbekanntes Modul: {body.module}")
|
||||
return validate_csv_template(
|
||||
body.module,
|
||||
body.field_mappings,
|
||||
body.type_conversions,
|
||||
body.import_row_processing,
|
||||
body.column_signature,
|
||||
)
|
||||
|
||||
|
||||
@router.get("/{template_id}")
|
||||
def get_system_template(template_id: int, session: dict = Depends(require_admin)):
|
||||
with get_db() as conn:
|
||||
@@ -273,17 +297,15 @@ def get_system_template(template_id: int, session: dict = Depends(require_admin)
|
||||
def create_system_template(body: CsvSystemTemplateCreate, session: dict = Depends(require_admin)):
|
||||
if not get_module_definition(body.module):
|
||||
raise HTTPException(400, f"Unbekanntes Modul: {body.module}")
|
||||
try:
|
||||
validate_field_mappings(body.module, body.field_mappings)
|
||||
validate_required_field_targets(body.module, body.field_mappings)
|
||||
except ValueError as e:
|
||||
raise HTTPException(400, str(e))
|
||||
|
||||
if body.import_row_processing:
|
||||
try:
|
||||
validate_import_row_processing_spec(body.module, body.import_row_processing, body.field_mappings)
|
||||
except ValueError as e:
|
||||
raise HTTPException(400, str(e))
|
||||
report = validate_csv_template(
|
||||
body.module,
|
||||
body.field_mappings,
|
||||
body.type_conversions,
|
||||
body.import_row_processing,
|
||||
body.column_signature,
|
||||
)
|
||||
if not report["valid"]:
|
||||
raise HTTPException(status_code=422, detail=report)
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
@@ -311,7 +333,7 @@ def create_system_template(body: CsvSystemTemplateCreate, session: dict = Depend
|
||||
),
|
||||
)
|
||||
new_id = cur.fetchone()["id"]
|
||||
return {"id": new_id}
|
||||
return {"id": new_id, "validation": report}
|
||||
|
||||
|
||||
@router.put("/{template_id}")
|
||||
@@ -335,12 +357,19 @@ def update_system_template(
|
||||
return _row_full(existing)
|
||||
|
||||
fm = patch.get("field_mappings", existing["field_mappings"])
|
||||
if "field_mappings" in patch:
|
||||
try:
|
||||
validate_field_mappings(existing["module"], fm)
|
||||
validate_required_field_targets(existing["module"], fm)
|
||||
except ValueError as e:
|
||||
raise HTTPException(400, str(e))
|
||||
tc_eff = patch.get("type_conversions", existing.get("type_conversions"))
|
||||
irp_eff = patch.get("import_row_processing", existing.get("import_row_processing"))
|
||||
col_eff = patch.get("column_signature", existing.get("column_signature"))
|
||||
|
||||
report = validate_csv_template(
|
||||
existing["module"],
|
||||
fm,
|
||||
tc_eff,
|
||||
irp_eff,
|
||||
col_eff if isinstance(col_eff, list) else None,
|
||||
)
|
||||
if not report["valid"]:
|
||||
raise HTTPException(status_code=422, detail=report)
|
||||
|
||||
fields_sql = []
|
||||
vals: list = []
|
||||
@@ -371,15 +400,6 @@ def update_system_template(
|
||||
vals.append(Json(tc) if tc is not None else None)
|
||||
if "import_row_processing" in patch:
|
||||
irp = patch["import_row_processing"]
|
||||
if irp:
|
||||
try:
|
||||
validate_import_row_processing_spec(
|
||||
existing["module"],
|
||||
irp,
|
||||
patch.get("field_mappings", existing["field_mappings"]),
|
||||
)
|
||||
except ValueError as e:
|
||||
raise HTTPException(400, str(e))
|
||||
fields_sql.append("import_row_processing = %s")
|
||||
vals.append(Json(irp) if irp is not None else None)
|
||||
|
||||
@@ -393,7 +413,7 @@ def update_system_template(
|
||||
|
||||
cur.execute("SELECT * FROM csv_field_mappings WHERE id = %s", (template_id,))
|
||||
m = r2d(cur.fetchone())
|
||||
return _row_full(m)
|
||||
return {**_row_full(m), "validation": report}
|
||||
|
||||
|
||||
@router.delete("/{template_id}")
|
||||
|
||||
Reference in new issue
Block a user