langfun 0.1.2.dev202510170805__tar.gz → 0.1.2.dev202510190804__tar.gz

{langfun-0.1.2.dev202510170805 → langfun-0.1.2.dev202510190804}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langfun
-Version: 0.1.2.dev202510170805
+Version: 0.1.2.dev202510190804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -23,14 +23,16 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: anyio>=4.7.0
 Requires-Dist: jinja2>=3.1.2
+Requires-Dist: mcp>=1.17.0
 Requires-Dist: puremagic>=1.20
-Requires-Dist: pyglove>=0.4.5.dev202507140812
+Requires-Dist: pyglove>=0.5.0.dev202510170226
 Requires-Dist: requests>=2.31.0
 Provides-Extra: all
 Requires-Dist: anyio>=4.7.0; extra == "all"
 Requires-Dist: jinja2>=3.1.2; extra == "all"
+Requires-Dist: mcp>=1.17.0; extra == "all"
 Requires-Dist: puremagic>=1.20; extra == "all"
-Requires-Dist: pyglove>=0.4.5.dev202507140812; extra == "all"
+Requires-Dist: pyglove>=0.5.0.dev202510170226; extra == "all"
 Requires-Dist: requests>=2.31.0; extra == "all"
 Requires-Dist: google-auth>=2.16.0; extra == "all"
 Requires-Dist: pillow>=10.0.0; extra == "all"

{langfun-0.1.2.dev202510170805 → langfun-0.1.2.dev202510190804}/langfun/__init__.py

@@ -66,8 +66,8 @@ from langfun.core import agentic
 Action = agentic.Action
 Session = agentic.Session
 
+from langfun.core import mcp
 from langfun.core import memories
-
 from langfun.core import modalities
 
 Mime = modalities.Mime

langfun-0.1.2.dev202510190804/langfun/core/mcp/__init__.py

@@ -0,0 +1,10 @@
+"""Langfun MCP support."""
+
+# pylint: disable=g-importing-member
+
+from langfun.core.mcp.client import McpClient
+from langfun.core.mcp.session import McpSession
+from langfun.core.mcp.tool import McpTool
+from langfun.core.mcp.tool import McpToolInput
+
+# pylint: enable=g-importing-member

langfun-0.1.2.dev202510190804/langfun/core/mcp/client.py

@@ -0,0 +1,122 @@
+# Copyright 2025 The Langfun Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""MCP client."""
+
+import abc
+from typing import Annotated, Type
+
+from langfun.core.mcp import session as mcp_session
+from langfun.core.mcp import tool as mcp_tool
+from mcp.server import fastmcp as fastmcp_lib
+import pyglove as pg
+
+
+class McpClient(pg.Object):
+  """Base class for MCP client.
+
+  Usage:
+
+  ```python
+
+  def tool_use():
+    client = lf.mcp.McpClient.from_command('<MCP_CMD>', ['<ARG1>', 'ARG2'])
+    tools = client.list_tools()
+    tool_cls = tools['<TOOL_NAME>']
+
+    # Print the python definition of the tool.
+    print(tool_cls.python_definition())
+
+    with client.session() as session:
+      return tool_cls(x=1, y=2)(session)
+
+  async def tool_use_async_version():
+    client = lf.mcp.McpClient.from_url('http://localhost:8000/mcp')
+    tools = client.list_tools()
+    tool_cls = tools['<TOOL_NAME>']
+
+    # Print the python definition of the tool.
+    print(tool_cls.python_definition())
+
+    async with client.session() as session:
+      return await tool_cls(x=1, y=2).acall(session)
+  ```
+  """
+
+  def _on_bound(self):
+    super()._on_bound()
+    self._tools = None
+
+  def list_tools(
+      self, refresh: bool = False
+  ) -> dict[str, Type[mcp_tool.McpTool]]:
+    """Lists all MCP tools."""
+    if self._tools is None or refresh:
+      with self.session() as session:
+        self._tools = session.list_tools()
+    return self._tools
+
+  @abc.abstractmethod
+  def session(self) -> mcp_session.McpSession:
+    """Creates a MCP session."""
+
+  @classmethod
+  def from_command(cls, command: str, args: list[str]) -> 'McpClient':
+    """Creates a MCP client from a tool."""
+    return _StdioMcpClient(command=command, args=args)
+
+  @classmethod
+  def from_url(
+      cls,
+      url: str,
+      headers: dict[str, str] | None = None
+  ) -> 'McpClient':
+    """Creates a MCP client from a URL."""
+    return _HttpMcpClient(url=url, headers=headers or {})
+
+  @classmethod
+  def from_fastmcp(cls, fastmcp: fastmcp_lib.FastMCP) -> 'McpClient':
+    """Creates a MCP client from a MCP server."""
+    return _InMemoryFastMcpClient(fastmcp=fastmcp)
+
+
+class _StdioMcpClient(McpClient):
+  """Stdio-based MCP client."""
+
+  command: Annotated[str, 'Command to execute.']
+  args: Annotated[list[str], 'Arguments to pass to the command.']
+
+  def session(self) -> mcp_session.McpSession:
+    """Creates a MCP session."""
+    return mcp_session.McpSession.from_command(self.command, self.args)
+
+
+class _HttpMcpClient(McpClient):
+  """Server-Sent Events (SSE)/Streamable HTTP-based MCP client."""
+
+  url: Annotated[str, 'URL to connect to.']
+  headers: Annotated[dict[str, str], 'Headers to send with the request.'] = {}
+
+  def session(self) -> mcp_session.McpSession:
+    """Creates a MCP session."""
+    return mcp_session.McpSession.from_url(self.url, self.headers)
+
+
+class _InMemoryFastMcpClient(McpClient):
+  """In-memory MCP client."""
+
+  fastmcp: Annotated[fastmcp_lib.FastMCP, 'MCP server to connect to.']
+
+  def session(self) -> mcp_session.McpSession:
+    """Creates a MCP session."""
+    return mcp_session.McpSession.from_fastmcp(self.fastmcp)

langfun-0.1.2.dev202510190804/langfun/core/mcp/client_test.py

@@ -0,0 +1,98 @@
+# Copyright 2025 The Langfun Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Tests for MCP client."""
+
+import inspect
+import unittest
+from langfun.core import async_support
+from langfun.core import mcp as lf_mcp
+from mcp.server import fastmcp as fastmcp_lib
+
+mcp = fastmcp_lib.FastMCP(host='0.0.0.0', port=1234)
+
+
+@mcp.tool()
+async def add(a: int, b: int) -> int:
+  """Adds two integers and returns their sum.
+
+  Args:
+    a: The first integer.
+    b: The second integer.
+
+  Returns:
+    The sum of the two integers.
+  """
+  return a + b
+
+
+class McpTest(unittest.TestCase):
+
+  def test_sync_usages(self):
+    client = lf_mcp.McpClient.from_fastmcp(mcp)
+    tools = client.list_tools()
+    self.assertEqual(len(tools), 1)
+    tool_cls = tools['add']
+    print(tool_cls.python_definition())
+    self.assertEqual(
+        tool_cls.python_definition(),
+        inspect.cleandoc(
+            '''
+            Add
+
+            ```python
+            class Add:
+              """Adds two integers and returns their sum.
+
+              Args:
+                a: The first integer.
+                b: The second integer.
+
+              Returns:
+                The sum of the two integers.
+              """
+              a: int
+              b: int
+            ```
+            '''
+        )
+    )
+    self.assertEqual(repr(tool_cls), '<tool-class \'Add\'>')
+    self.assertEqual(tool_cls.__name__, 'Add')
+    self.assertEqual(tool_cls.TOOL_NAME, 'add')
+    self.assertEqual(tool_cls(a=1, b=2).input_parameters(), {'a': 1, 'b': 2})
+    with client.session() as session:
+      self.assertEqual(
+          tool_cls(a=1, b=2)(session), 3
+      )
+
+  def test_async_usages(self):
+    async def _test():
+      client = lf_mcp.McpClient.from_fastmcp(mcp)
+      tools = client.list_tools()
+      self.assertEqual(len(tools), 1)
+      tool_cls = tools['add']
+      self.assertEqual(tool_cls.__name__, 'Add')
+      self.assertEqual(tool_cls.TOOL_NAME, 'add')
+      async with client.session() as session:
+        self.assertEqual(
+            (await tool_cls(a=1, b=2).acall(
+                session, returns_call_result=True))
+            .structuredContent['result'],
+            3
+        )
+    async_support.invoke_sync(_test)
+
+
+if __name__ == '__main__':
+  unittest.main()

langfun-0.1.2.dev202510190804/langfun/core/mcp/session.py

@@ -0,0 +1,176 @@
+# Copyright 2025 The Langfun Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""MCP session."""
+
+import contextlib
+from typing import Any, Type
+import anyio
+from langfun.core import async_support
+from langfun.core.mcp import tool as mcp_tool
+import mcp
+from mcp.client import sse
+from mcp.client import streamable_http
+from mcp.server import fastmcp as fastmcp_lib
+from mcp.shared import memory
+
+
+class McpSession:
+  """Langfun's MCP session.
+
+  Compared to the standard mcp.ClientSession, Langfun's MCP session could be
+  used both synchronously and asynchronously.
+  """
+
+  def __init__(self, stream) -> None:
+    self._stream = stream
+    self._session = None
+    self._session_exit_stack = None
+    self._in_session = False
+
+    # For supporting sync context manager.
+    self._sync_context_manager_exit_stack = None
+
+  def __enter__(self) -> 'McpSession':
+    exit_stack = contextlib.ExitStack()
+    exit_stack.enter_context(async_support.sync_context_manager(self))
+    self._sync_context_manager_exit_stack = exit_stack
+    return self
+
+  def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+    assert self._sync_context_manager_exit_stack is not None
+    self._sync_context_manager_exit_stack.close()
+
+  async def __aenter__(self) -> 'McpSession':
+    assert self._session_exit_stack is None, 'Session cannot be re-entered.'
+
+    self._session_exit_stack = contextlib.AsyncExitStack()
+    stream_output = await self._session_exit_stack.enter_async_context(
+        self._stream
+    )
+    assert isinstance(stream_output, tuple) and len(stream_output) in (2, 3)
+    read, write = stream_output[:2]
+    self._session = mcp.ClientSession(read, write)
+    await self._session_exit_stack.enter_async_context(self._session)
+    await self._session.initialize()
+    return self
+
+  async def __aexit__(self, exc_type, exc_val, exc_tb) -> None:
+    del exc_type, exc_val, exc_tb
+    if self._session is None:
+      return
+    assert self._session_exit_stack is not None
+    await self._session_exit_stack.aclose()
+    self._session = None
+
+  def list_tools(self) -> dict[str, Type[mcp_tool.McpTool]]:
+    """Lists all MCP tools synchronously."""
+    return async_support.invoke_sync(self.alist_tools)
+
+  async def alist_tools(self) -> dict[str, Type[mcp_tool.McpTool]]:
+    """Lists all MCP tools asynchronously."""
+    assert self._session is not None, 'MCP session is not entered.'
+    return {
+        t.name: mcp_tool.McpTool.make_class(t)
+        for t in (await self._session.list_tools()).tools
+    }
+
+  def call_tool(
+      self,
+      tool: mcp_tool.McpTool,
+      *,
+      returns_call_result: bool = False
+  ) -> Any:
+    """Calls a MCP tool synchronously."""
+    return async_support.invoke_sync(
+        self.acall_tool,
+        tool,
+        returns_call_result=returns_call_result
+    )
+
+  async def acall_tool(
+      self,
+      tool: mcp_tool.McpTool,
+      *,
+      returns_call_result: bool = False
+  ) -> Any:
+    """Calls a MCP tool asynchronously."""
+    assert self._session is not None, 'MCP session is not entered.'
+    tool_call_result = await self._session.call_tool(
+        tool.TOOL_NAME, tool.input_parameters()
+    )
+    if returns_call_result:
+      return tool_call_result
+    if (
+        tool_call_result.structuredContent
+        and 'result' in tool_call_result.structuredContent
+    ):
+      return tool_call_result.structuredContent['result']
+    return tool_call_result.content
+
+  @classmethod
+  def from_command(
+      cls,
+      command: str,
+      args: list[str] | None = None
+  ) -> 'McpSession':
+    """Creates a MCP session from a command."""
+    return cls(
+        mcp.stdio_client(
+            mcp.StdioServerParameters(command=command, args=args or [])
+        )
+    )
+
+  @classmethod
+  def from_url(
+      cls,
+      url: str,
+      headers: dict[str, str] | None = None
+  ) -> 'McpSession':
+    """Creates a MCP session from a URL."""
+    transport = url.removesuffix('/').split('/')[-1].lower()
+    if transport == 'mcp':
+      return cls(streamable_http.streamablehttp_client(url, headers or {}))
+    elif transport == 'sse':
+      return cls(sse.sse_client(url, headers or {}))
+    else:
+      raise ValueError(f'Unsupported transport: {transport}')
+
+  @classmethod
+  def from_fastmcp(
+      cls,
+      fastmcp: fastmcp_lib.FastMCP
+  ):
+    return cls(_client_streams_from_fastmcp(fastmcp))
+
+
+@contextlib.asynccontextmanager
+async def _client_streams_from_fastmcp(fastmcp: fastmcp_lib.FastMCP):
+  """Creates client streams from a MCP server."""
+  server = fastmcp._mcp_server  # pylint: disable=protected-access
+  async with memory.create_client_server_memory_streams(
+      ) as (client_streams, server_streams):
+    client_read, client_write = client_streams
+    server_read, server_write = server_streams
+
+    # Create a cancel scope for the server task
+    async with anyio.create_task_group() as tg:
+      tg.start_soon(
+          lambda: server.run(
+              server_read,
+              server_write,
+              server.create_initialization_options(),
+              raise_exceptions=True,
+          )
+      )
+      yield client_read, client_write

langfun-0.1.2.dev202510190804/langfun/core/mcp/testing/simple_mcp_client.py

@@ -0,0 +1,33 @@
+# Copyright 2025 The Langfun Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""A simple MCP client for testing."""
+
+from absl import app
+from absl import flags
+from langfun.core import mcp
+
+
+_URL = flags.DEFINE_string(
+    'url',
+    'http://localhost:8000/mcp',
+    'URL of the MCP server.',
+)
+
+
+def main(_):
+  print(mcp.McpClient.from_url(url=_URL.value).list_tools())
+
+
+if __name__ == '__main__':
+  app.run(main)

langfun-0.1.2.dev202510190804/langfun/core/mcp/testing/simple_mcp_server.py

@@ -0,0 +1,33 @@
+# Copyright 2025 The Langfun Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Simple MCP server for testing."""
+
+from absl import app as absl_app
+from mcp.server import fastmcp as fastmcp_lib
+
+mcp = fastmcp_lib.FastMCP(host='0.0.0.0', port=8000)
+
+
+@mcp.tool()
+async def add(a: int, b: int) -> int:
+  """Adds two integers and returns their sum."""
+  return a + b
+
+
+def main(_):
+  mcp.run(transport='streamable-http', mount_path='/mcp')
+
+
+if __name__ == '__main__':
+  absl_app.run(main)

langfun-0.1.2.dev202510190804/langfun/core/mcp/tool.py

@@ -0,0 +1,125 @@
+# Copyright 2025 The Langfun Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""MCP tool."""
+
+from typing import Annotated, Any, ClassVar
+
+from langfun.core.structured import schema as lf_schema
+import mcp
+import pyglove as pg
+
+
+class _McpToolMeta(pg.symbolic.ObjectMeta):
+
+  def __repr__(self) -> str:
+    return f'<tool-class \'{self.__name__}\'>'
+
+
+class McpTool(pg.Object, metaclass=_McpToolMeta):
+  """Base class for MCP tools."""
+
+  TOOL_NAME: Annotated[
+      ClassVar[str],
+      'Tool name.'
+  ]
+
+  @classmethod
+  def python_definition(cls, markdown: bool = True) -> str:
+    """Returns the Python definition of the tool."""
+    return lf_schema.Schema.from_value(cls).schema_str(
+        protocol='python', markdown=markdown
+    )
+
+  def __call__(
+      self,
+      session,
+      *,
+      returns_call_result: bool = False) -> Any:
+    """Calls a MCP tool synchronously.
+
+    Args:
+      session: A MCP session.
+      returns_call_result: If True, returns the call result. Otherwise returns
+        the result from structured content, or return content.
+
+    Returns:
+      The call result, or the result from structured content, or content.
+    """
+    return session.call_tool(
+        self,
+        returns_call_result=returns_call_result
+    )
+
+  async def acall(
+      self,
+      session,
+      *,
+      returns_call_result: bool = False) -> Any:
+    """Calls a MCP tool asynchronously."""
+    return await session.acall_tool(self, returns_call_result=returns_call_result)
+
+  def input_parameters(self) -> dict[str, Any]:
+    """Returns the input parameters of the tool."""
+    json = self.to_json()
+    def _transform(path: pg.KeyPath, x: Any) -> Any:
+      del path
+      if isinstance(x, dict):
+        x.pop(pg.JSONConvertible.TYPE_NAME_KEY, None)
+      return x
+    return pg.utils.transform(json, _transform)
+
+  @classmethod
+  def make_class(cls, tool_definition: mcp.Tool) -> type['McpTool']:
+    """Makes a MCP tool class from tool definition."""
+
+    class _McpTool(cls):
+      auto_schema = False
+
+    tool_cls = _McpTool
+    tool_cls.TOOL_NAME = tool_definition.name
+    tool_cls.__name__ = _snake_to_camel(tool_definition.name)
+    tool_cls.__doc__ = tool_definition.description
+    schema = pg.Schema.from_json_schema(
+        tool_definition.inputSchema, class_fn=McpToolInput.make_class
+    )
+    tool_cls.apply_schema(schema)
+    return tool_cls
+
+
+class _McpToolInputMeta(pg.symbolic.ObjectMeta):
+
+  def __repr__(self) -> str:
+    return f'<input-class \'{self.__name__}\'>'
+
+
+class McpToolInput(pg.Object, metaclass=_McpToolInputMeta):
+  """Base class for MCP tool inputs."""
+
+  @classmethod
+  def make_class(cls, name: str, schema: pg.Schema):
+    """Converts a schema to an input class."""
+
+    class _McpToolInput(cls):
+      pass
+
+    input_cls = _McpToolInput
+    input_cls.__name__ = _snake_to_camel(name)
+    input_cls.__doc__ = schema.description
+    input_cls.apply_schema(schema)
+    return input_cls
+
+
+def _snake_to_camel(name: str) -> str:
+  """Converts a snake_case name to a CamelCase name."""
+  return ''.join(x.capitalize() for x in name.split('_'))

{langfun-0.1.2.dev202510170805 → langfun-0.1.2.dev202510190804}/langfun.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langfun
-Version: 0.1.2.dev202510170805
+Version: 0.1.2.dev202510190804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -23,14 +23,16 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: anyio>=4.7.0
 Requires-Dist: jinja2>=3.1.2
+Requires-Dist: mcp>=1.17.0
 Requires-Dist: puremagic>=1.20
-Requires-Dist: pyglove>=0.4.5.dev202507140812
+Requires-Dist: pyglove>=0.5.0.dev202510170226
 Requires-Dist: requests>=2.31.0
 Provides-Extra: all
 Requires-Dist: anyio>=4.7.0; extra == "all"
 Requires-Dist: jinja2>=3.1.2; extra == "all"
+Requires-Dist: mcp>=1.17.0; extra == "all"
 Requires-Dist: puremagic>=1.20; extra == "all"
-Requires-Dist: pyglove>=0.4.5.dev202507140812; extra == "all"
+Requires-Dist: pyglove>=0.5.0.dev202510170226; extra == "all"
 Requires-Dist: requests>=2.31.0; extra == "all"
 Requires-Dist: google-auth>=2.16.0; extra == "all"
 Requires-Dist: pillow>=10.0.0; extra == "all"

{langfun-0.1.2.dev202510170805 → langfun-0.1.2.dev202510190804}/langfun.egg-info/SOURCES.txt

@@ -129,6 +129,13 @@ langfun/core/llms/cache/__init__.py
 langfun/core/llms/cache/base.py
 langfun/core/llms/cache/in_memory.py
 langfun/core/llms/cache/in_memory_test.py
+langfun/core/mcp/__init__.py
+langfun/core/mcp/client.py
+langfun/core/mcp/client_test.py
+langfun/core/mcp/session.py
+langfun/core/mcp/tool.py
+langfun/core/mcp/testing/simple_mcp_client.py
+langfun/core/mcp/testing/simple_mcp_server.py
 langfun/core/memories/__init__.py
 langfun/core/memories/conversation_history.py
 langfun/core/memories/conversation_history_test.py