Fix/nsh mcp bind error 20250309 (#154)

Co-authored-by: 越鸿 <nishenghao.nsh@oceanbase.com>

Author: niiish32x

packages/derisk-core/src/derisk/agent/resource/manage.py

@@ -18,6 +18,15 @@
 logger = logging.getLogger(__name__)
 
 
+def _get_mcp_not_found_error():
+    """Return MCPNotFoundError class, or None when the package is unavailable."""
+    try:
+        from derisk_serve.agent.resource.tool.mcp_collect import MCPNotFoundError
+        return MCPNotFoundError
+    except ImportError:
+        return None
+
+
 def _is_valid_resource_instance(obj: Any) -> bool:
     """Check if object is a valid resource instance (Resource or ToolBase)."""
     if isinstance(obj, Resource):
@@ -267,10 +276,40 @@ def build_resource_by_type(
                         if return_resource
                         else {"name": real_resource_name}
                     )
-            raise ValueError(
-                f"Resource {real_resource_name} not found in {type_unique_key}"
-            )
-            # return cast(Resource, inst_items[0].resource_instance)
+            # Not found in registered instances, try to create dynamically
+            # This handles cases like MCP rebind where old instance exists
+            # but code/name has changed
+            single_item = item[0]
+            try:
+                parameter_cls = single_item.get_parameter_class()
+                param = parameter_cls.from_dict(
+                    resource_value if v2_resource else agent_resource.to_dict(),
+                    ignore_extra_fields=True,
+                )
+                param_dict = param.to_dict()
+                if not return_resource:
+                    return param_dict
+                param_dict["system_app"] = self.system_app
+                resource_inst = single_item.resource_cls(**param_dict)
+                return resource_inst
+            except ValueError as e:
+                # Check if this is an MCPNotFoundError (MCP deleted/recreated).
+                mcp_not_found_cls = _get_mcp_not_found_error()
+                if mcp_not_found_cls and isinstance(e, mcp_not_found_cls):
+                    logger.warning(
+                        f"Skipping unavailable MCP resource [{single_item.key}]: {e}. "
+                        f"Please re-bind the MCP in the application configuration."
+                    )
+                    return None
+                logger.warning(f"Failed to build resource {single_item.key}: {str(e)}")
+                raise ValueError(
+                    f"Failed to build resource {single_item.key}: {str(e)}"
+                )
+            except Exception as e:
+                logger.warning(f"Failed to build resource {single_item.key}: {str(e)}")
+                raise ValueError(
+                    f"Failed to build resource {single_item.key}: {str(e)}"
+                )
         elif len(inst_items) > 1:
             raise ValueError(
                 f"Multiple instances of resource {type_unique_key} found, "
@@ -290,6 +329,21 @@ def build_resource_by_type(
                 param_dict["system_app"] = self.system_app
                 resource_inst = single_item.resource_cls(**param_dict)
                 return resource_inst
+            except ValueError as e:
+                # Check if this is an MCPNotFoundError (MCP deleted/recreated).
+                # Catch it here before the generic re-raise so the rest of the
+                # agent resources can still load.
+                mcp_not_found_cls = _get_mcp_not_found_error()
+                if mcp_not_found_cls and isinstance(e, mcp_not_found_cls):
+                    logger.warning(
+                        f"Skipping unavailable MCP resource [{single_item.key}]: {e}. "
+                        f"Please re-bind the MCP in the application configuration."
+                    )
+                    return None
+                logger.warning(f"Failed to build resource {single_item.key}: {str(e)}")
+                raise ValueError(
+                    f"Failed to build resource {single_item.key}: {str(e)}"
+                )
             except Exception as e:
                 logger.warning(f"Failed to build resource {single_item.key}: {str(e)}")
                 raise ValueError(
@@ -320,13 +374,17 @@ def build_resource(
                 for resource in agent_resources
             ]
         )
+        # Filter out None entries (e.g. MCPs that were deleted/recreated)
+        dependencies = [d for d in dependencies if d is not None]
         # dependencies: List[Resource] = execute_parallel_sync([(self.build_resource_by_type, resource.type, resource) for resource in agent_resources])
         # dependencies: List[Resource] = []
         # for resource in agent_resources:
         #     resource_inst = cast(
         #         Resource, self.build_resource_by_type(resource.type, resource)
         #     )
         #     dependencies.append(resource_inst)
+        if not dependencies:
+            return None
         if len(dependencies) == 1:
             return dependencies[0]
         else:
@@ -356,13 +414,17 @@ async def a_build_resource(
                 for resource in agent_resources
             ]
         )
-        # Summary Agent不放入resource中
+        # Filter out None entries (e.g. MCPs that were deleted/recreated)
+        # and Summary Agents that should not be included in the resource pack
         dependencies = [
             dependency
             for dependency in dependencies
-            if not await is_summary_agent_resource(dependency)
+            if dependency is not None
+            and not await is_summary_agent_resource(dependency)
         ]
 
+        if not dependencies:
+            return None
         if len(dependencies) == 1:
             return dependencies[0]
         else:

packages/derisk-serve/src/derisk_serve/agent/resource/tool/mcp_collect.py

@@ -32,6 +32,18 @@
 CFG = Config()
 
 
+class MCPNotFoundError(ValueError):
+    """Raised when an MCP service cannot be found by its code.
+
+    This typically means the MCP was deleted and recreated (new code) but the
+    agent/app configuration still references the old code.  It is intentionally
+    a subclass of ValueError so existing callers that catch ValueError are
+    unaffected, while new code can catch this specific type to apply
+    graceful-degradation logic (e.g. skip the missing resource instead of
+    aborting the whole agent load).
+    """
+
+
 def get_mcp_list(**kwargs) -> List[Dict]:
     logger.info(f"get_mcp_list:{kwargs}")
     from derisk_serve.mcp.service.service import Service as McpService
@@ -161,7 +173,10 @@ def from_dict(
 
         mcp_info: Optional[MCPResponse] = get_mcp_info(mcp_code)
         if not mcp_info:
-            raise ValueError(f"无法找到当前mcp服务[{mcp_code}].")
+            raise MCPNotFoundError(
+                f"无法找到当前mcp服务[{mcp_code}]，该MCP可能已被删除或code已变更，"
+                f"请在应用配置中重新绑定MCP资源。"
+            )
 
         copied_data["mcp_servers"] = mcp_info.sse_url
         copied_data["headers"] = mcp_info.sse_headers