@qingflow-tech/qingflow-app-user-mcp 1.0.2 → 1.0.4

package/src/qingflow_mcp/tools/import_tools.py

@@ -37,6 +37,13 @@ SAFE_REPAIRS = {
     "normalize_url_cells",
 }
 EMAIL_PATTERN = re.compile(r"^[^@\s]+@[^@\s]+\.[^@\s]+$")
+IMPORT_STATUS_BY_PROCESS_STATUS = {
+    1: "queued",
+    2: "running",
+    3: "succeeded",
+    4: "failed",
+    5: "partially_failed",
+}
 
 
 class ImportTools(ToolBase):
@@ -783,6 +790,8 @@ class ImportTools(ToolBase):
                 error_code="CONFIG_ERROR",
                 message="record_import_status_get accepts import_id or process_id_str, but not both at the same time",
                 extra={
+                    "import_id": normalized_import_id,
+                    "process_id_str": normalized_process_id,
                     "details": {
                         "fix_hint": "Use only one of `import_id` or `process_id_str`. You may pass `app_key` as an optional routing hint for direct method compatibility.",
                     }
@@ -793,6 +802,8 @@ class ImportTools(ToolBase):
                 error_code="CONFIG_ERROR",
                 message="record_import_status_get requires at least one selector: process_id_str, import_id, or app_key",
                 extra={
+                    "import_id": normalized_import_id,
+                    "process_id_str": normalized_process_id,
                     "details": {
                         "fix_hint": "Use `process_id_str` or `import_id` for a known import, or use only `app_key` to inspect the latest import in that app.",
                     }
@@ -806,6 +817,9 @@ class ImportTools(ToolBase):
             if local_job is None and normalized_process_id:
                 matches = [item for item in self._job_store.list() if _normalize_optional_text(item.get("process_id_str")) == normalized_process_id]
                 local_job = matches[0] if len(matches) == 1 else None
+            effective_process_id = normalized_process_id
+            if effective_process_id is None and isinstance(local_job, dict):
+                effective_process_id = _normalize_optional_text(local_job.get("process_id_str"))
             resolved_app_key = normalized_app_key
             if not resolved_app_key and isinstance(local_job, dict):
                 resolved_app_key = str(local_job.get("app_key") or "").strip()
@@ -814,6 +828,8 @@ class ImportTools(ToolBase):
                     error_code="CONFIG_ERROR",
                     message="record_import_status_get could not determine app_key from the provided selector",
                     extra={
+                        "import_id": normalized_import_id,
+                        "process_id_str": effective_process_id,
                         "details": {
                             "fix_hint": "Use the original `app_key`, or call import status with the latest-import mode: only `app_key`.",
                         }
@@ -832,13 +848,18 @@ class ImportTools(ToolBase):
             matched_record, matched_by = _match_import_record(
                 records,
                 local_job=local_job,
-                process_id_str=normalized_process_id,
+                import_id=normalized_import_id,
+                process_id_str=effective_process_id,
             )
             if matched_record is None:
                 return self._failed_status_result(
                     error_code="IMPORT_STATUS_AMBIGUOUS",
                     message="could not uniquely resolve an import record from the provided identifiers",
-                    extra={"matched_by": matched_by},
+                    extra={
+                        "import_id": normalized_import_id,
+                        "process_id_str": effective_process_id,
+                        "matched_by": matched_by,
+                    },
                 )
             normalized_process = _normalize_optional_text(
                 matched_record.get("processIdStr") or matched_record.get("processId") or matched_record.get("process_id_str")
@@ -852,13 +873,26 @@ class ImportTools(ToolBase):
                         "process_id_str": normalized_process,
                     },
                 )
+            raw_process_status = matched_record.get("processStatus")
             total_rows = _coerce_int(matched_record.get("totalNumber") or matched_record.get("total_rows"))
             success_rows = _coerce_int(matched_record.get("successNum") or matched_record.get("success_rows"))
             failed_rows = _coerce_int(matched_record.get("errorNum") or matched_record.get("failed_rows"))
             progress = _coerce_int(matched_record.get("importPercentage") or matched_record.get("progress"))
+            normalized_status = _normalize_import_status(raw_process_status)
+            warnings: list[dict[str, str]] = []
+            if normalized_status in {"succeeded", "failed", "partially_failed"} and all(
+                value is None for value in (total_rows, success_rows, failed_rows)
+            ):
+                warnings.append(
+                    {
+                        "code": "IMPORT_STATUS_COUNTERS_MISSING",
+                        "message": "backend import history returned a terminal process status without row counters",
+                    }
+                )
             return {
                 "ok": True,
-                "status": _normalize_optional_text(matched_record.get("processStatus")) or "unknown",
+                "status": normalized_status,
+                "process_status": _coerce_int(raw_process_status),
                 "app_key": resolved_app_key,
                 "import_id": normalized_import_id or (local_job.get("import_id") if isinstance(local_job, dict) else None),
                 "process_id_str": normalized_process,
@@ -871,7 +905,7 @@ class ImportTools(ToolBase):
                 "error_file_urls": _normalize_error_file_urls(matched_record.get("errorFileUrls")),
                 "operate_time": matched_record.get("operateTime"),
                 "operate_user": matched_record.get("operateUser"),
-                "warnings": [],
+                "warnings": warnings,
                 "verification": {
                     "status_lookup_completed": True,
                     "matched_by": matched_by,
@@ -2118,6 +2152,7 @@ def _match_import_record(
     records: list[JSONObject],
     *,
     local_job: dict[str, Any] | None,
+    import_id: str | None,
     process_id_str: str | None,
 ) -> tuple[JSONObject | None, str | None]:
     if process_id_str:
@@ -2130,6 +2165,16 @@ def _match_import_record(
             return exact[0], "process_id_str"
         if len(exact) > 1:
             return None, "process_id_str"
+    if import_id:
+        exact = [
+            item
+            for item in records
+            if import_id in _extract_import_record_ids(item)
+        ]
+        if len(exact) == 1:
+            return exact[0], "import_id"
+        if len(exact) > 1:
+            return None, "import_id"
     if isinstance(local_job, dict):
         source_file_name = _normalize_optional_text(local_job.get("source_file_name"))
         started_at = _parse_utc(local_job.get("started_at"))
@@ -2160,6 +2205,15 @@ def _match_import_record(
     return None, None
 
 
+def _extract_import_record_ids(record: JSONObject) -> set[str]:
+    identifiers: set[str] = set()
+    for key in ("importId", "import_id", "dataImportId", "data_import_id"):
+        normalized = _normalize_optional_text(record.get(key))
+        if normalized:
+            identifiers.add(normalized)
+    return identifiers
+
+
 def _parse_utc(value: Any) -> datetime | None:
     text = _normalize_optional_text(value)
     if text is None:
@@ -2183,6 +2237,26 @@ def _coerce_int(value: Any) -> int | None:
         return None
 
 
+def _normalize_import_status(value: Any) -> str:
+    status_code = _coerce_int(value)
+    if status_code is not None:
+        return IMPORT_STATUS_BY_PROCESS_STATUS.get(status_code, "unknown")
+    text = str(value or "").strip().lower()
+    if text in {"queued", "running", "succeeded", "failed", "partially_failed", "unknown"}:
+        return text
+    if text in {"line_up", "lineup"}:
+        return "queued"
+    if text in {"execute", "executing", "processing"}:
+        return "running"
+    if text in {"success", "completed"}:
+        return "succeeded"
+    if text in {"partly_fail", "partial_fail", "partially_fail", "partial_failed"}:
+        return "partially_failed"
+    if text in {"fail", "error"}:
+        return "failed"
+    return "unknown"
+
+
 def _normalize_error_file_urls(value: Any) -> list[str]:
     if isinstance(value, list):
         return [str(item).strip() for item in value if str(item).strip()]