@josephyan/qingflow-app-builder-mcp 0.2.0-beta.7 → 0.2.0-beta.71

package/src/qingflow_mcp/tools/solution_tools.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from copy import deepcopy
+import json
 from typing import Any
 from uuid import uuid4
 
@@ -8,6 +9,7 @@ from mcp.server.fastmcp import FastMCP
 from pydantic import BaseModel, ValidationError
 
 from ..config import DEFAULT_PROFILE
+from ..errors import QingflowApiError
 from ..list_type_labels import get_record_list_type_label
 from ..solution.build_assembly_store import BuildAssemblyStore, default_manifest
 from ..solution.compiler import CompiledSolution, ExecutionPlan, ExecutionStep, build_execution_plan, compile_solution
@@ -1850,7 +1852,35 @@ class SolutionTools(ToolBase):
         packages = PackageTools(self.sessions, self.backend)
         normalized_name = package_name.strip()
         if package_tag_id > 0:
-            result = packages.package_get(profile=profile, tag_id=package_tag_id, include_raw=False)
+            try:
+                result = packages.package_get(profile=profile, tag_id=package_tag_id, include_raw=False)
+            except (QingflowApiError, RuntimeError) as exc:
+                error = _coerce_solution_api_error(exc)
+                if error.backend_code in {40002, 40027}:
+                    return {
+                        "status": "resolved",
+                        "matched_via": "tag_id",
+                        "tag_id": package_tag_id,
+                        "tag_name": None,
+                        "candidates": [],
+                        "metadata_unverified": True,
+                        "lookup_permission_blocked": {
+                            "scope": "package",
+                            "target": {"tag_id": package_tag_id},
+                            "transport_error": {
+                                "http_status": error.http_status,
+                                "backend_code": error.backend_code,
+                                "category": error.category,
+                                "request_id": error.request_id,
+                            },
+                        },
+                    }
+                return _builder_package_resolution_failed(
+                    package_name=normalized_name,
+                    package_tag_id=package_tag_id,
+                    error=error,
+                    retried=False,
+                )
             summary = result.get("result") if isinstance(result.get("result"), dict) else {}
             return {
                 "status": "resolved",
@@ -1869,12 +1899,28 @@ class SolutionTools(ToolBase):
                 "source_shape": None,
                 "retried": False,
             }
-        result = packages.package_list(profile=profile, trial_status="all", include_raw=False)
+        try:
+            result = packages.package_list(profile=profile, trial_status="all", include_raw=False)
+        except (QingflowApiError, RuntimeError) as exc:
+            return _builder_package_resolution_failed(
+                package_name=normalized_name,
+                package_tag_id=package_tag_id,
+                error=_coerce_solution_api_error(exc),
+                retried=False,
+            )
         items = result.get("items") if isinstance(result.get("items"), list) else []
         source_shape = result.get("source_shape")
         retried = False
         if not items:
-            retry_result = packages.package_list(profile=profile, trial_status="all", include_raw=False)
+            try:
+                retry_result = packages.package_list(profile=profile, trial_status="all", include_raw=False)
+            except (QingflowApiError, RuntimeError) as exc:
+                return _builder_package_resolution_failed(
+                    package_name=normalized_name,
+                    package_tag_id=package_tag_id,
+                    error=_coerce_solution_api_error(exc),
+                    retried=True,
+                )
             retry_items = retry_result.get("items") if isinstance(retry_result.get("items"), list) else []
             if retry_items:
                 items = retry_items
@@ -2982,6 +3028,72 @@ def _solution_error_fields(
     }
 
 
+def _builder_package_resolution_failed(
+    *,
+    package_name: str,
+    package_tag_id: int,
+    error: QingflowApiError,
+    retried: bool,
+) -> dict[str, Any]:
+    if package_tag_id > 0:
+        detail = f"failed to resolve package_tag_id '{package_tag_id}': {error.message}"
+    elif error.backend_code in {40002, 40027}:
+        detail = (
+            f"failed to resolve package '{package_name}' because package listing is permission-restricted; "
+            "provide package_tag_id explicitly or use an account that can list packages"
+        )
+    else:
+        detail = f"failed to resolve package '{package_name}': {error.message}"
+    error_fields = _solution_error_fields(category="config", detail=detail, suggested_next_call=None, stage="app")
+    error_fields["error_code"] = "PACKAGE_RESOLVE_FAILED"
+    return {
+        "status": "failed",
+        "response": {
+            "status": "failed",
+            "mode": "plan",
+            "stage": "app",
+            "errors": [{"category": "config", "detail": detail}],
+            "package_resolution": {
+                "status": "failed",
+                "requested_name": package_name or None,
+                "requested_tag_id": package_tag_id or None,
+                "resolution_policy": "exact_name_only" if package_name else "tag_id_only",
+                "candidates": [],
+                "source_shape": None,
+                "retried": retried,
+                "transport_error": {
+                    "http_status": error.http_status,
+                    "backend_code": error.backend_code,
+                    "category": error.category,
+                    "request_id": error.request_id,
+                },
+            },
+            **error_fields,
+        },
+    }
+
+
+def _coerce_solution_api_error(error: Exception) -> QingflowApiError:
+    if isinstance(error, QingflowApiError):
+        return error
+    if isinstance(error, RuntimeError):
+        try:
+            payload = json.loads(str(error))
+        except json.JSONDecodeError:
+            payload = None
+        if isinstance(payload, dict) and payload.get("category") and payload.get("message"):
+            details = payload.get("details")
+            return QingflowApiError(
+                category=str(payload.get("category")),
+                message=str(payload.get("message")),
+                backend_code=payload.get("backend_code"),
+                request_id=payload.get("request_id"),
+                http_status=payload.get("http_status"),
+                details=details if isinstance(details, dict) else None,
+            )
+    return QingflowApiError(category="runtime", message=str(error))
+
+
 def _coerce_count(value: Any) -> int | None:
     if isinstance(value, bool) or value is None:
         return None