Add MCP server (#5)

- fix: Add missing requirements (7fa7ab92623e1ed9f8941da9c6551f5636a742a1)
- feat: Add mutable list of checkboxes (7e71135a1453a3a309c34163d563904934c89585)
- feat: Get tools from MCP SSE server (c5235b0c2d6b125689b7864597f8987c18b19902)
- feat: Get tools from MCP SSE server (d6af55a4ca2c47860a9f6e7adbf1d4a0fe0270cc)

pyproject.toml

@@ -16,6 +16,7 @@ dependencies = [
     "gradio[mcp]>=5.32.1",
     "huggingface-hub>=0.32.3",
     "langchain-aws>=0.2.24",
+    "langchain-mcp-adapters>=0.1.1",
     "langgraph>=0.4.7",
 ]
 
@@ -103,7 +104,17 @@ line-length = 88
 
 [tool.ruff.lint]
 select = ["ALL"]
-ignore = ["D100", "D104", "D107", "D401", "EM102", "ERA001", "TRY003"]
+ignore = [
+    "D100",
+    "D104",
+    "D107",
+    "D401",
+    "EM102",
+    "ERA001",
+    "TC002",
+    "TC003",
+    "TRY003",
+]
 
 [tool.ruff.lint.flake8-quotes]
 inline-quotes = "double"
@@ -121,6 +132,9 @@ lines-after-imports = 2
 [tool.ruff.lint.mccabe]
 max-complexity = 18
 
+[tool.ruff.lint.pylint]
+max-args = 7
+
 [tool.ruff.lint.pydocstyle]
 convention = "google"
 

requirements-dev.txt

@@ -41,6 +41,7 @@ jsonpatch==1.33
 jsonpointer==3.0.0
 langchain-aws==0.2.24
 langchain-core==0.3.63
+langchain-mcp-adapters==0.1.1
 langgraph==0.4.7
 langgraph-checkpoint==2.0.26
 langgraph-prebuilt==0.2.2

requirements.txt

@@ -34,6 +34,7 @@ jsonpatch==1.33
 jsonpointer==3.0.0
 langchain-aws==0.2.24
 langchain-core==0.3.63
+langchain-mcp-adapters==0.1.1
 langgraph==0.4.7
 langgraph-checkpoint==2.0.26
 langgraph-prebuilt==0.2.2

tdagent/grchat.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
+from collections.abc import Mapping, Sequence
 from types import MappingProxyType
+from typing import TYPE_CHECKING
 
 import boto3
 import botocore
@@ -9,9 +10,15 @@ import botocore.exceptions
 import gradio as gr
 from langchain_aws import ChatBedrock
 from langchain_core.messages import AIMessage, HumanMessage, SystemMessage
-from langgraph.graph.graph import CompiledGraph
+from langchain_mcp_adapters.client import MultiServerMCPClient
 from langgraph.prebuilt import create_react_agent
 
+from tdagent.grcomponents import MutableCheckBoxGroup, MutableCheckBoxGroupEntry
+
+
+if TYPE_CHECKING:
+    from langgraph.graph.graph import CompiledGraph
+
 
 #### Constants ####
 
@@ -59,7 +66,7 @@ def create_bedrock_llm(
     try:
         bedrock_client = boto3.client("bedrock-runtime", **boto3_config)
         llm = ChatBedrock(
-            model=bedrock_model_id,
+            model_id=bedrock_model_id,
             client=bedrock_client,
             model_kwargs={"temperature": 0.7},
         )
@@ -78,6 +85,7 @@ async def gr_connect_to_bedrock(
     secret_key: str,
     session_token: str,
     region: str,
+    mcp_servers: Sequence[MutableCheckBoxGroupEntry] | None,
 ) -> str:
     """Initialize Bedrock agent."""
     global llm_agent  # noqa: PLW0603
@@ -96,9 +104,33 @@ async def gr_connect_to_bedrock(
     if llm is None:
         return f"❌ Connection failed: {error}"
 
+    # client = MultiServerMCPClient(
+    #     {
+    #         "toolkit": {
+    #             "url": "https://agents-mcp-hackathon-tdagenttools.hf.space/gradio_api/mcp/sse",
+    #             "transport": "sse",
+    #         },
+    #     }
+    # )
+    # tools = await client.get_tools()
+
+    if mcp_servers:
+        client = MultiServerMCPClient(
+            {
+                server.name.replace(" ", "-"): {
+                    "url": server.value,
+                    "transport": "sse",
+                }
+                for server in mcp_servers
+            },
+        )
+        tools = await client.get_tools()
+    else:
+        tools = []
+
     llm_agent = create_react_agent(
         model=llm,
-        tools=[],
+        tools=tools,
         prompt=SYSTEM_MESSAGE,
     )
 
@@ -134,6 +166,18 @@ async def gr_chat_function(  # noqa: D103
 with gr.Blocks() as gr_app:
     gr.Markdown("# 🔐 Secure Bedrock Chatbot")
 
+    ### MCP Servers ###
+    with gr.Accordion():
+        mcp_list = MutableCheckBoxGroup(
+            values=[
+                MutableCheckBoxGroupEntry(
+                    name="TDAgent tools",
+                    value="https://agents-mcp-hackathon-tdagenttools.hf.space/gradio_api/mcp/sse",
+                ),
+            ],
+            label="MCP Servers",
+        )
+
     # Credentials section (collapsible)
     with gr.Accordion("🔑 Bedrock Configuration", open=True):
         gr.Markdown(
@@ -185,6 +229,7 @@ with gr.Blocks() as gr_app:
                 aws_secret_key_textbox,
                 aws_session_token_textbox,
                 aws_region_dropdown,
+                mcp_list.state,
             ],
             outputs=[status_textbox],
         )

tdagent/grcomponents/__init__.py

@@ -0,0 +1 @@
+from .mcbgroup import MutableCheckBoxGroup, MutableCheckBoxGroupEntry

tdagent/grcomponents/mcbgroup.py

@@ -0,0 +1,151 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, NamedTuple
+
+import gradio as gr
+
+
+if TYPE_CHECKING:
+    from collections.abc import Callable, Sequence
+
+
+class MutableCheckBoxGroupEntry(NamedTuple):
+    """Entry of the mutable checkbox group."""
+
+    name: str
+    value: str
+
+
+class MutableCheckBoxGroup(gr.Blocks):
+    """Check box group with controls to add or remove values."""
+
+    def __init__(  # noqa: PLR0913
+        self,
+        values: list[MutableCheckBoxGroupEntry] | None = None,
+        label: str = "Extendable List",
+        new_value_label: str = "New Item Value",
+        new_name_label: str = "New Item Name",
+        new_value_placeholder: str = "New item value ...",
+        new_name_placeholder: str = "New item name, if not given value will be used...",
+        on_change: Callable[[Sequence[MutableCheckBoxGroupEntry]], None] | None = None,
+    ) -> None:
+        super().__init__()
+        self.values = values or []
+
+        self.label = label
+        self.new_value_label = new_value_label
+        self.new_name_label = new_name_label
+
+        self.new_value_placeholder = new_value_placeholder
+        self.new_name_placeholder = new_name_placeholder
+
+        self.on_change = on_change
+        self._build_interface()
+
+    def _build_interface(self) -> None:
+        # Custom CSS for vertical checkbox layout
+        self.style = """
+            #vertical-container .wrap {
+                display: flex;
+                flex-direction: column;
+                gap: 8px;
+            }
+            #vertical-container .wrap label {
+                display: flex;
+                align-items: center;
+                gap: 8px;
+            }
+        """
+
+        with self:
+            gr.Markdown(f"### {self.label}")
+
+            # Store items in state
+            self.state = gr.State(self.values)
+
+            # Input row
+            with gr.Row():
+                self.input_value = gr.Textbox(
+                    label=self.new_value_label,
+                    placeholder=self.new_value_placeholder,
+                    scale=4,
+                )
+                self.input_name = gr.Textbox(
+                    label=self.new_name_label,
+                    placeholder=self.new_name_placeholder,
+                    scale=2,
+                )
+                with gr.Column():
+                    self.add_btn = gr.Button("Add", variant="primary", scale=1)
+                    self.delete_btn = gr.Button("Delete Selected", variant="stop")
+
+            # Vertical checkbox group
+            self.items_group = gr.CheckboxGroup(
+                choices=self.values,
+                label="Items",
+                elem_id="vertical-container",
+                container=True,
+            )
+
+            # Set up event handlers
+            self.add_btn.click(
+                self._add_item,
+                inputs=[self.state, self.input_value, self.input_name],
+                outputs=[
+                    self.state,
+                    self.items_group,
+                    self.input_value,
+                    self.input_name,
+                ],
+            )
+
+            self.delete_btn.click(
+                self._delete_selected,
+                inputs=[self.state, self.items_group],
+                outputs=[self.state, self.items_group],
+            )
+
+    def get_values(self) -> Sequence[str]:
+        """Get check box values."""
+        return self.state.value
+
+    def _add_item(
+        self,
+        items: list[MutableCheckBoxGroupEntry],
+        new_value: str,
+        new_name: str,
+    ) -> tuple[list[MutableCheckBoxGroupEntry], dict[str, Any], str, str]:
+        if not new_name:
+            new_name = new_value
+
+        if new_value:
+            if any(entry.name == new_name for entry in items):
+                raise gr.Error(
+                    f"Entry with name '{new_name}' already exists",
+                    duration=10,
+                )
+            if any(entry.value == new_value for entry in items):
+                raise gr.Error(
+                    f"Entry with value '{new_value}' already exists",
+                    duration=10,
+                )
+
+            items = [*items, MutableCheckBoxGroupEntry(new_name, new_value)]
+            if self.on_change:
+                self.on_change(items)
+
+            # State, checkbox, input_value, input_name
+            return items, gr.update(choices=items), "", ""
+
+        # State, checkbox, input_value, input_name
+        return items, gr.update(), "", ""
+
+    def _delete_selected(
+        self,
+        items: list[MutableCheckBoxGroupEntry],
+        selected: list[str],
+    ) -> tuple[list[MutableCheckBoxGroupEntry], dict[str, Any]]:
+        updated_items = [item for item in items if item.value not in selected]
+        if self.on_change:
+            self.on_change(updated_items)
+        return updated_items, gr.update(choices=updated_items, value=[])

uv.lock

@@ -705,6 +705,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/5c/71/a748861e6a69ab6ef50ab8e65120422a1f36245c71a0dd0f02de49c208e1/langchain_core-0.3.63-py3-none-any.whl", hash = "sha256:f91db8221b1bc6808f70b2e72fded1a94d50ee3f1dff1636fb5a5a514c64b7f5", size = 438468 },
 ]
 
+[[package]]
+name = "langchain-mcp-adapters"
+version = "0.1.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "langchain-core" },
+    { name = "mcp" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b0/de/62a6ee2c21f74eed961773e75a4e3170f8abc79fd5fd7a1b4e2ea07f4c04/langchain_mcp_adapters-0.1.1.tar.gz", hash = "sha256:e43ddf06e4ce237ad80f5c91d0efa7fd7c845b274a5a07e7e8a7f9d7239331d7", size = 17359 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/30/68/13405f252b38a8e1bd7ef345907a4e0eda535c2ca36fe4d6821fc7e9f5de/langchain_mcp_adapters-0.1.1-py3-none-any.whl", hash = "sha256:81594b265d824012040ebd24056fbdb5aabf0b46f780e369ed132421e3411e4d", size = 12100 },
+]
+
 [[package]]
 name = "langgraph"
 version = "0.4.7"
@@ -1905,6 +1918,7 @@ dependencies = [
     { name = "gradio", extra = ["mcp"] },
     { name = "huggingface-hub" },
     { name = "langchain-aws" },
+    { name = "langchain-mcp-adapters" },
     { name = "langgraph" },
 ]
 
@@ -1927,6 +1941,7 @@ requires-dist = [
     { name = "gradio", extras = ["mcp"], specifier = ">=5.32.1" },
     { name = "huggingface-hub", specifier = ">=0.32.3" },
     { name = "langchain-aws", specifier = ">=0.2.24" },
+    { name = "langchain-mcp-adapters", specifier = ">=0.1.1" },
     { name = "langgraph", specifier = ">=0.4.7" },
 ]