Merge branch 'main' into mcp-restructure

Author: twishabansal

.gitignore

@@ -11,4 +11,7 @@ venv
 .python-version
 **.egg-info/
 __pycache__/** 
-
+.coverage
+**/.coverage
+build/
+**/build/

.release-please-manifest.json

@@ -1 +1 @@
-{"packages/toolbox-langchain":"0.5.0","packages/toolbox-core":"0.5.0","packages/toolbox-llamaindex":"0.5.0"}
+{"packages/toolbox-langchain":"0.5.2","packages/toolbox-core":"0.5.2","packages/toolbox-llamaindex":"0.5.2"}

packages/toolbox-core/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.5.2](https://github.com/googleapis/mcp-toolbox-sdk-python/compare/toolbox-core-v0.5.1...toolbox-core-v0.5.2) (2025-09-22)
+
+
+### Miscellaneous Chores
+
+* **deps:** update python-nonmajor ([#372](https://github.com/googleapis/mcp-toolbox-sdk-python/issues/372)) ([d915624](https://github.com/googleapis/mcp-toolbox-sdk-python/commit/d9156246fd35b7813c49ff4b4bc01cf26b3de9f9))
+
+## [0.5.1](https://github.com/googleapis/mcp-toolbox-sdk-python/compare/toolbox-core-v0.5.0...toolbox-core-v0.5.1) (2025-09-17)
+
+
+### Bug Fixes
+
+* **toolbox-core:** Use typing.Annotated for reliable parameter descriptions instead of docstrings ([#371](https://github.com/googleapis/mcp-toolbox-sdk-python/issues/371)) ([eb76680](https://github.com/googleapis/mcp-toolbox-sdk-python/commit/eb76680d24c344241f3c15293cd12904bbf91b0d))
+
+
+### Documentation
+
+* Update langgraph sample in toolbox-core ([#366](https://github.com/googleapis/mcp-toolbox-sdk-python/issues/366)) ([fe35082](https://github.com/googleapis/mcp-toolbox-sdk-python/commit/fe35082104d8039986eccbdab937f5f3e8b2042b))
+
+
+### Miscellaneous Chores
+
+* Remove redundant test for test_add_auth_token_getter_unused_token ([#347](https://github.com/googleapis/mcp-toolbox-sdk-python/issues/347)) ([dccaf1b](https://github.com/googleapis/mcp-toolbox-sdk-python/commit/dccaf1bd70e4e788fd80a9ef952aede4549b2fc7))
+* Remove duplicate header check during initialization ([#357](https://github.com/googleapis/mcp-toolbox-sdk-python/issues/357)) ([888170b](https://github.com/googleapis/mcp-toolbox-sdk-python/commit/888170b3c34744089fb3b6f2b6f613c4cd718a89))
+
+
 ## [0.5.0](https://github.com/googleapis/mcp-toolbox-sdk-python/compare/toolbox-core-v0.4.0...toolbox-core-v0.5.0) (2025-08-19)
 
 

packages/toolbox-core/README.md

@@ -232,39 +232,67 @@ Here's a conceptual example adapting the [official LangGraph tool calling
 guide](https://langchain-ai.github.io/langgraph/how-tos/tool-calling):
 
 ```py
+import asyncio
+from typing import Annotated
+from typing_extensions import TypedDict
+from langchain_core.messages import HumanMessage, BaseMessage
 from toolbox_core import ToolboxClient
 from langchain_google_vertexai import ChatVertexAI
-from langgraph.graph import StateGraph, MessagesState, START, END
+from langgraph.graph import StateGraph, START, END
 from langgraph.prebuilt import ToolNode
 from langchain.tools import StructuredTool
+from langgraph.graph.message import add_messages
 
-async with ToolboxClient("http://127.0.0.1:5000") as toolbox:
-    tools = await toolbox.load_toolset()
-    wrapped_tools = [StructuredTool.from_function(tool, parse_docstring=True) for tool in tools]
-    model_with_tools = ChatVertexAI(model="gemini-2.0-flash-001").bind_tools(wrapped_tools)
+class State(TypedDict):
+    messages: Annotated[list[BaseMessage], add_messages]
+
+async def main():
+    async with ToolboxClient("http://127.0.0.1:5000") as toolbox:
+        tools = await toolbox.load_toolset()
+        wrapped_tools = [StructuredTool.from_function(tool, parse_docstring=True) for tool in tools]
+        model_with_tools = ChatVertexAI(model="gemini-2.5-flash").bind_tools(wrapped_tools)
+        tool_node = ToolNode(wrapped_tools)
+
+        def call_agent(state: State):
+            response = model_with_tools.invoke(state["messages"])
+            return {"messages": [response]}
+
+        def should_continue(state: State):
+            last_message = state["messages"][-1]
+            if last_message.tool_calls:
+                return "tools"
+            return END
+
+        graph_builder = StateGraph(State)
+
+        graph_builder.add_node("agent", call_agent)
+        graph_builder.add_node("tools", tool_node)
+
+        graph_builder.add_edge(START, "agent")
+        graph_builder.add_conditional_edges(
+            "agent",
+            should_continue,
+        )
+        graph_builder.add_edge("tools", "agent")
 
-    def call_model(state: MessagesState):
-        messages = state["messages"]
-        response = model_with_tools.invoke(messages)
-        return {"messages": [response]}
+        app = graph_builder.compile()
 
-    def should_continue(state: MessagesState):
-        messages = state["messages"]
-        last_message = messages[-1]
-        if last_message.tool_calls:
-            return "tools"
-        return END
+        prompt = "What is the weather in London?"
+        inputs = {"messages": [HumanMessage(content=prompt)]}
 
-    workflow = StateGraph(MessagesState)
+        print(f"User: {prompt}\n")
+        print("--- Streaming Agent Steps ---")
 
-    workflow.add_node("agent", call_model)
-    workflow.add_node("tools", ToolNode(wrapped_tools))
+        events = app.stream(
+            inputs,
+            stream_mode="values",
+        )
 
-    workflow.add_edge(START, "agent")
-    workflow.add_conditional_edges("agent", should_continue, ["tools", END])
-    workflow.add_edge("tools", "agent")
+        for event in events:
+            event["messages"][-1].pretty_print()
+            print("\n---\n")
 
-    app = workflow.compile()
+asyncio.run(main())
 ```
 
 ## Client to Server Authentication

packages/toolbox-core/integration.cloudbuild.yaml

@@ -26,11 +26,13 @@ steps:
     name: 'python:${_VERSION}'
     args:
       - install
+      - '-e'
       - 'packages/toolbox-core[test]'
       - '--user'
     entrypoint: pip
   - id: Run integration tests
     name: 'python:${_VERSION}'
+    dir: 'packages/toolbox-core'
     env:
       - TOOLBOX_URL=$_TOOLBOX_URL
       - TOOLBOX_VERSION=$_TOOLBOX_VERSION
@@ -39,11 +41,11 @@ steps:
     args:
       - '-c'
       - >-
-        python -m pytest packages/toolbox-core/tests/
+        python -m pytest --cov=src/toolbox_core --cov-report=term --cov-fail-under=90 tests/
     entrypoint: /bin/bash
 options:
   logging: CLOUD_LOGGING_ONLY
 substitutions:
   _VERSION: '3.13'
-  _TOOLBOX_VERSION: '0.12.0'
+  _TOOLBOX_VERSION: '0.16.0'
   _TOOLBOX_MANIFEST_VERSION: '34'

packages/toolbox-core/pyproject.toml

@@ -44,16 +44,16 @@ Changelog = "https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/pack
 
 [project.optional-dependencies]
 test = [
-    "black[jupyter]==25.1.0",
-    "isort==6.0.1",
-    "mypy==1.17.1",
+    "black[jupyter]==25.9.0",
+    "isort==6.1.0",
+    "mypy==1.18.2",
     "pytest==8.4.2",
     "pytest-aioresponses==0.3.0",
-    "pytest-asyncio==1.1.0",
-    "pytest-cov==6.3.0",
-    "pytest-mock==3.15.0",
+    "pytest-asyncio==1.2.0",
+    "pytest-cov==7.0.0",
+    "pytest-mock==3.15.1",
     "google-cloud-secret-manager==2.24.0",
-    "google-cloud-storage==3.3.1",
+    "google-cloud-storage==3.4.0",
     "aioresponses==0.7.8"
 ]
 [build-system]

packages/toolbox-core/requirements.txt

@@ -1,5 +1,5 @@
-aiohttp==3.12.15
-pydantic==2.11.7
+aiohttp==3.13.0
+pydantic==2.11.10
 deprecated==1.2.18
 requests==2.32.5
-google-auth==2.40.3
+google-auth==2.41.1

packages/toolbox-core/src/toolbox_core/tool.py

@@ -104,19 +104,6 @@ def __init__(
         self.__annotations__ = {p.name: p.annotation for p in inspect_type_params}
         self.__qualname__ = f"{self.__class__.__qualname__}.{self.__name__}"
 
-        # Validate conflicting Headers/Auth Tokens
-        request_header_names = client_headers.keys()
-        auth_token_names = [
-            self.__get_auth_header(auth_token_name)
-            for auth_token_name in auth_service_token_getters.keys()
-        ]
-        duplicates = request_header_names & auth_token_names
-        if duplicates:
-            raise ValueError(
-                f"Client header(s) `{', '.join(duplicates)}` already registered in client. "
-                f"Cannot register client the same headers in the client as well as tool."
-            )
-
         # map of parameter name to auth service required by it
         self.__required_authn_params = required_authn_params
         # sequence of authorization tokens required by it

packages/toolbox-core/src/toolbox_core/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.5.0"
+__version__ = "0.5.2"

packages/toolbox-core/tests/test_client.py

@@ -1478,35 +1478,3 @@ async def test_add_headers_duplicate_fail(self, static_header):
                     match=f"Client header\\(s\\) `X-Static-Header` already registered",
                 ):
                     client.add_headers(static_header)
-
-    @pytest.mark.asyncio
-    async def test_client_header_auth_token_conflict_fail(
-        self, aioresponses, test_tool_auth
-    ):
-        """
-        Tests that loading a tool fails if a client header conflicts with an
-        auth token name.
-        """
-        tool_name = "auth_conflict_tool"
-        conflict_key = "my-auth-service_token"
-        manifest = ManifestSchema(
-            serverVersion="0.0.0", tools={tool_name: test_tool_auth}
-        )
-
-        conflicting_headers = {conflict_key: "some_value"}
-        auth_getters = {"my-auth-service": lambda: "token_val"}
-
-        aioresponses.get(
-            f"{TEST_BASE_URL}/api/tool/{tool_name}",
-            payload=manifest.model_dump(),
-            status=200,
-        )
-
-        async with ToolboxClient(
-            TEST_BASE_URL, client_headers=conflicting_headers
-        ) as client:
-            with pytest.raises(
-                ValueError,
-                match=f"Client header\\(s\\) `{conflict_key}` already registered",
-            ):
-                await client.load_tool(tool_name, auth_token_getters=auth_getters)