IBM
diff --git a/‎MANIFEST.in‎
Lines changed: 10 additions & 0 deletions b/‎MANIFEST.in‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎mcpgateway/plugins/framework/external/mcp/client.py‎
Lines changed: 44 additions & 18 deletions b/‎mcpgateway/plugins/framework/external/mcp/client.py‎
Lines changed: 44 additions & 18 deletions
diff --git a/‎plugins/external/config.yaml‎
Lines changed: 7 additions & 1 deletion b/‎plugins/external/config.yaml‎
Lines changed: 7 additions & 1 deletion
@@ -172,3 +172,13 @@ exclude plugins/external/opa/MANIFEST.in
 exclude plugins/external/opa/opaserver/rego/example.rego
 exclude plugins/external/opa/pyproject.toml
 exclude plugins/external/opa/run-server.sh
+
+# Exclude llmguard
+exclude  plugins/external/llmguard/.dockerignore
+exclude plugins/external/llmguard/.env.template
+exclude plugins/external/llmguard/.ruff.toml
+exclude plugins/external/llmguard/Containerfile
+exclude plugins/external/llmguard/MANIFEST.in
+exclude plugins/external/llmguard/opaserver/rego/example.rego
+exclude plugins/external/llmguard/pyproject.toml
+exclude plugins/external/llmguard/run-server.sh
@@ -135,29 +135,54 @@ async def __connect_to_stdio_server(self, server_script_path: str) -> None:
             raise PluginError(error=convert_exception_to_error(e, plugin_name=self.name))
 
     async def __connect_to_http_server(self, uri: str) -> None:
-        """Connect to an MCP plugin server via streamable http.
+        """Connect to an MCP plugin server via streamable http with retry logic.
 
         Args:
             uri: the URI of the mcp plugin server.
 
         Raises:
-            PluginError: if there is an external connection error.
+            PluginError: if there is an external connection error after all retries.
         """
-
-        try:
-            http_transport = await self._exit_stack.enter_async_context(streamablehttp_client(uri))
-            self._http, self._write, _ = http_transport
-            self._session = await self._exit_stack.enter_async_context(ClientSession(self._http, self._write))
-
-            await self._session.initialize()
-
-            # List available tools
-            response = await self._session.list_tools()
-            tools = response.tools
-            logger.info("\nConnected to plugin MCP (http) server with tools: %s", " ".join([tool.name for tool in tools]))
-        except Exception as e:
-            logger.exception(e)
-            raise PluginError(error=convert_exception_to_error(e, plugin_name=self.name))
+        max_retries = 3
+        base_delay = 1.0
+
+        for attempt in range(max_retries):
+            logger.info(f"Connecting to external plugin server: {uri} (attempt {attempt + 1}/{max_retries})")
+
+            try:
+                # Create a fresh exit stack for each attempt
+                async with AsyncExitStack() as temp_stack:
+                    http_transport = await temp_stack.enter_async_context(streamablehttp_client(uri))
+                    http_client, write_func, _ = http_transport
+                    session = await temp_stack.enter_async_context(ClientSession(http_client, write_func))
+
+                    await session.initialize()
+
+                    # List available tools
+                    response = await session.list_tools()
+                    tools = response.tools
+                    logger.info("Successfully connected to plugin MCP server with tools: %s", " ".join([tool.name for tool in tools]))
+
+                # Success! Now move to the main exit stack
+                self._http = await self._exit_stack.enter_async_context(streamablehttp_client(uri))
+                self._http, self._write, _ = self._http
+                self._session = await self._exit_stack.enter_async_context(ClientSession(self._http, self._write))
+                await self._session.initialize()
+                return
+
+            except Exception as e:
+                logger.warning(f"Connection attempt {attempt + 1}/{max_retries} failed: {e}")
+
+                if attempt == max_retries - 1:
+                    # Final attempt failed
+                    error_msg = f"External plugin '{self.name}' connection failed after {max_retries} attempts: {uri} is not reachable. Please ensure the MCP server is running."
+                    logger.error(error_msg)
+                    raise PluginError(error=PluginErrorModel(message=error_msg, plugin_name=self.name))
+                await self.shutdown()
+                # Wait before retry
+                delay = base_delay * (2**attempt)
+                logger.info(f"Retrying in {delay}s...")
+                await asyncio.sleep(delay)
 
     async def __invoke_hook(self, payload_result_model: Type[P], hook_type: HookType, payload: BaseModel, context: PluginContext) -> P:
         """Invoke an external plugin hook using the MCP protocol.
@@ -296,4 +321,5 @@ async def __get_plugin_config(self) -> PluginConfig | None:
 
     async def shutdown(self) -> None:
         """Plugin cleanup code."""
-        await self._exit_stack.aclose()
+        if self._exit_stack:
+            await self._exit_stack.aclose()
@@ -1,5 +1,4 @@
 # plugins/config.yaml - Main plugin configuration file
-
 plugins:
   - name: "DenyListPlugin"
     kind: "external"
@@ -14,6 +13,13 @@ plugins:
       proto: STREAMABLEHTTP
       url: http://127.0.0.1:8000/mcp
 
+  - name: "LLMGuardPlugin"
+    kind: "external"
+    priority: 20 # adjust the priority
+    mcp:
+      proto: STREAMABLEHTTP
+      url: http://127.0.0.1:8001/mcp
+
 # Plugin directories to scan
 plugin_dirs:
   - "plugins/native"      # Built-in plugins