Add MCP server

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

@@ -1,33 +1,70 @@
 # This file was autogenerated by uv via the following command:
 #    uv export --format requirements-txt --no-hashes --group dev --group test -o requirements-dev.txt
+aiofiles==24.1.0
+annotated-types==0.7.0
+anyio==4.9.0
+audioop-lts==0.2.1 ; python_full_version >= '3.13'
 boolean-py==5.0
+boto3==1.38.27
+botocore==1.38.27
 cachecontrol==0.14.3
 certifi==2025.4.26
+cffi==1.17.1 ; platform_python_implementation == 'PyPy'
 cfgv==3.4.0
 charset-normalizer==3.4.2
+click==8.2.1 ; sys_platform != 'emscripten'
 colorama==0.4.6 ; sys_platform == 'win32'
 coverage==7.8.2
 cyclonedx-python-lib==9.1.0
 defusedxml==0.7.1
 distlib==0.3.9
 exceptiongroup==1.3.0 ; python_full_version < '3.11'
+fastapi==0.115.12
+ffmpy==0.6.0
 filelock==3.18.0
 fsspec==2025.5.1
+gradio==5.32.1
+gradio-client==1.10.2
+groovy==0.1.2
+h11==0.16.0
 hf-xet==1.1.2 ; platform_machine == 'aarch64' or platform_machine == 'amd64' or platform_machine == 'arm64' or platform_machine == 'x86_64'
+httpcore==1.0.9
+httpx==0.28.1
+httpx-sse==0.4.0
 huggingface-hub==0.32.3
 identify==2.6.12
 idna==3.10
 iniconfig==2.1.0
+jinja2==3.1.6
+jmespath==1.0.1
+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
+langgraph-sdk==0.1.70
+langsmith==0.3.43
 license-expression==30.4.1
 markdown-it-py==3.0.0
+markupsafe==3.0.2
+mcp==1.9.0
 mdurl==0.1.2
 msgpack==1.1.0
 mypy==1.16.0
 mypy-extensions==1.1.0
 nodeenv==1.9.1
+numpy==1.26.4 ; python_full_version < '3.12'
+numpy==2.2.6 ; python_full_version >= '3.12'
+orjson==3.10.18
+ormsgpack==1.10.0
 packageurl-python==0.16.0
-packaging==25.0
+packaging==24.2
+pandas==2.2.3
 pathspec==0.12.1
+pillow==11.2.1
 pip==25.1.1
 pip-api==0.0.34
 pip-audit==2.9.0
@@ -36,20 +73,47 @@ platformdirs==4.3.8
 pluggy==1.6.0
 pre-commit==3.8.0
 py-serializable==2.0.0
+pycparser==2.22 ; platform_python_implementation == 'PyPy'
+pydantic==2.11.5
+pydantic-core==2.33.2
+pydantic-settings==2.9.1
+pydub==0.25.1
 pygments==2.19.1
 pyparsing==3.2.3
 pytest==7.4.4
 pytest-cov==4.1.0
 pytest-randomly==3.16.0
+python-dateutil==2.9.0.post0
+python-dotenv==1.1.0
+python-multipart==0.0.20
+pytz==2025.2
 pyyaml==6.0.2
 requests==2.32.3
+requests-toolbelt==1.0.0
 rich==14.0.0
 ruff==0.11.12
+s3transfer==0.13.0
+safehttpx==0.1.6
+semantic-version==2.10.0
+shellingham==1.5.4 ; sys_platform != 'emscripten'
+six==1.17.0
+sniffio==1.3.1
 sortedcontainers==2.4.0
+sse-starlette==2.3.6
+starlette==0.46.2
+tenacity==9.1.2
 toml==0.10.2
 tomli==2.2.1 ; python_full_version <= '3.11'
+tomlkit==0.13.2
 tqdm==4.67.1
+typer==0.16.0 ; sys_platform != 'emscripten'
 typing-extensions==4.13.2
+typing-inspection==0.4.1
+tzdata==2025.2
 urllib3==2.4.0
+uvicorn==0.34.3 ; sys_platform != 'emscripten'
 virtualenv==20.31.2
+websockets==15.0.1
 xdoctest==1.2.0
+xxhash==3.5.0
+zstandard==0.23.0

requirements.txt

@@ -1,25 +1,94 @@
 # This file was autogenerated by uv via the following command:
 #    uv export --format requirements-txt --no-hashes --no-dev -o requirements.txt
+aiofiles==24.1.0
+annotated-types==0.7.0
+anyio==4.9.0
+audioop-lts==0.2.1 ; python_full_version >= '3.13'
+boto3==1.38.27
+botocore==1.38.27
 certifi==2025.4.26
+cffi==1.17.1 ; platform_python_implementation == 'PyPy'
 charset-normalizer==3.4.2
+click==8.2.1 ; sys_platform != 'emscripten'
 colorama==0.4.6 ; sys_platform == 'win32'
 coverage==7.8.2
 exceptiongroup==1.3.0 ; python_full_version < '3.11'
+fastapi==0.115.12
+ffmpy==0.6.0
 filelock==3.18.0
 fsspec==2025.5.1
+gradio==5.32.1
+gradio-client==1.10.2
+groovy==0.1.2
+h11==0.16.0
 hf-xet==1.1.2 ; platform_machine == 'aarch64' or platform_machine == 'amd64' or platform_machine == 'arm64' or platform_machine == 'x86_64'
+httpcore==1.0.9
+httpx==0.28.1
+httpx-sse==0.4.0
 huggingface-hub==0.32.3
 idna==3.10
 iniconfig==2.1.0
-packaging==25.0
+jinja2==3.1.6
+jmespath==1.0.1
+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
+langgraph-sdk==0.1.70
+langsmith==0.3.43
+markdown-it-py==3.0.0 ; sys_platform != 'emscripten'
+markupsafe==3.0.2
+mcp==1.9.0
+mdurl==0.1.2 ; sys_platform != 'emscripten'
+numpy==1.26.4 ; python_full_version < '3.12'
+numpy==2.2.6 ; python_full_version >= '3.12'
+orjson==3.10.18
+ormsgpack==1.10.0
+packaging==24.2
+pandas==2.2.3
+pillow==11.2.1
 pluggy==1.6.0
+pycparser==2.22 ; platform_python_implementation == 'PyPy'
+pydantic==2.11.5
+pydantic-core==2.33.2
+pydantic-settings==2.9.1
+pydub==0.25.1
+pygments==2.19.1 ; sys_platform != 'emscripten'
 pytest==7.4.4
 pytest-cov==4.1.0
 pytest-randomly==3.16.0
+python-dateutil==2.9.0.post0
+python-dotenv==1.1.0
+python-multipart==0.0.20
+pytz==2025.2
 pyyaml==6.0.2
 requests==2.32.3
+requests-toolbelt==1.0.0
+rich==14.0.0 ; sys_platform != 'emscripten'
+ruff==0.11.12 ; sys_platform != 'emscripten'
+s3transfer==0.13.0
+safehttpx==0.1.6
+semantic-version==2.10.0
+shellingham==1.5.4 ; sys_platform != 'emscripten'
+six==1.17.0
+sniffio==1.3.1
+sse-starlette==2.3.6
+starlette==0.46.2
+tenacity==9.1.2
 tomli==2.2.1 ; python_full_version <= '3.11'
+tomlkit==0.13.2
 tqdm==4.67.1
+typer==0.16.0 ; sys_platform != 'emscripten'
 typing-extensions==4.13.2
+typing-inspection==0.4.1
+tzdata==2025.2
 urllib3==2.4.0
+uvicorn==0.34.3 ; sys_platform != 'emscripten'
+websockets==15.0.1
 xdoctest==1.2.0
+xxhash==3.5.0
+zstandard==0.23.0

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" },
 ]