cleanup: refactor mcp.run client (#12)

Author: zshipko

README.md

@@ -1,16 +1,10 @@
 # mcpx-py
 [![PyPI](https://img.shields.io/pypi/v/mcpx-py)](https://pypi.org/project/mcpx-py/)
 
-
-A Python library and command line client for https://www.mcp.run. This tool enables seamless interaction with various AI models while providing access to a suite of powerful tools.
+A Python library for interacting with LLMs using mcp.run tools
 
 ## Features
 
-### Tool Management
-- **List Tools**: Browse available tools and their capabilities
-- **Direct Tool Execution**: Run tools with specific inputs without LLM interaction
-- **Tool Integration**: Use tools seamlessly within AI chat conversations
-
 ### AI Provider Support
 - **Ollama**: https://ollama.com/
 - **Claude**: https://www.anthropic.com/api
@@ -80,17 +74,27 @@ pip install mcpx-py
 ### Example code
 
 ```python
-from mcpx_py import Client   # Import the mcp.run client
+from mcpx_py import Chat, Claude
+
+llm = Chat(Claude)
+
+# Or OpenAI
+# from mcpx import OpenAI
+# llm = Chat(OpenAI)
 
-client = Client()            # Create the client, this will check the
-                             # `MCP_RUN_SESSION_ID` environment variable
+# Or Ollama
+# from mcpx import Ollama
+# llm = Chat(Ollama)
 
-# Call a tool with the given input
-results = client.call("eval-js", {"code": "'Hello, world!'"})
+# Or Gemini
+# from mcpx import Gemini
+# llm = Chat(Gemini)
 
-# Iterate over the results
-for content in results.content:
-    print(content.text)
+# Prompt claude and iterate over the results
+async for response in llm.send_message(
+    "summarize the contents of example.com"
+):
+    print(response)
 ```
 
 More examples can be found in the [examples/](https://github.com/dylibso/mcpx-py/tree/main/examples) directory

examples/chat.py

@@ -21,9 +21,7 @@ async def main():
     # llm = Chat(Gemini)
 
     # Prompt claude and iterate over the results
-    async for response in llm.send_message(
-        "what is the total volume of nine three foot by 5 foot by four foot boxes"
-    ):
+    async for response in llm.send_message("summarize the contents of example.com"):
         print(response)
 
 

examples/hello_world.py

@@ -2,7 +2,10 @@ test:
     uv run python3 -m unittest
 
 format:
-    uv run ruff format mcpx_py tests examples
+    uv run ruff format mcpx_py examples
 
 check:
-    uv run ruff check mcpx_py tests examples
+    uv run ruff check mcpx_py examples
+
+chat:
+    uv run python3 -m mcpx_py chat

examples/search.py

@@ -1,15 +1,13 @@
 from .chat import ChatProvider, ChatConfig, Chat, Ollama, OpenAI, Claude, Gemini
-from .client import Client, ClientConfig, Tool
+import mcp_run as client
 
 __all__ = [
     "Chat",
-    "Client",
-    "ClientConfig",
-    "Tool",
     "ChatConfig",
     "ChatProvider",
     "Ollama",
     "OpenAI",
     "Claude",
     "Gemini",
+    "client",
 ]

justfile

@@ -10,7 +10,8 @@
 
 from dotenv import load_dotenv
 
-from . import Claude, OpenAI, Ollama, ChatConfig, Client, Gemini, Chat, ClientConfig
+from . import Claude, OpenAI, Ollama, ChatConfig, Gemini, Chat
+from mcp_run import Client, ClientConfig
 from .chat import SYSTEM_PROMPT
 
 CHAT_HELP = """
@@ -35,7 +36,7 @@ async def list_cmd(client, args):
 
 async def tool_cmd(client, args):
     try:
-        res = client.call(tool=args.name, input=json.loads(args.input))
+        res = client.call_tool(tool=args.name, input=json.loads(args.input))
         for c in res:
             if c.type == "text":
                 print(c.text)
@@ -178,8 +179,8 @@ def main():
         choices=["off", "critical", "fatal", "warn", "info", "debug", "error"],
         help="Select log level",
     )
-    args.add_argument("--base-url", default="https://www.mcp.run", help="nURL")
-    args.add_argument("--profile", default="default", help="mcpx profile")
+    args.add_argument("--base-url", default="https://www.mcp.run", help="mcp.run URL")
+    args.add_argument("--profile", default="~/default", help="mcpx profile")
     sub = args.add_subparsers(title="subcommand", help="subcommands", required=True)
 
     # List subcommand

mcpx_py/__init__.py

@@ -1,4 +1,4 @@
-from .client import Tool
+from mcp_run import Tool
 
 SEARCH = Tool(
     name="mcp_run_search_servlets",
@@ -31,3 +31,33 @@
         "required": [],
     },
 )
+
+GET_PROFILES = Tool(
+    name="mcp_run_get_profiles",
+    description="""
+    List all profiles for the current user.
+    """,
+    input_schema={
+        "type": "object",
+        "properties": {},
+        "required": [],
+    },
+)
+
+
+SET_PROFILE = Tool(
+    name="mcp_run_set_profile",
+    description="""
+    Set the active profile
+    """,
+    input_schema={
+        "type": "object",
+        "properties": {
+            "profile": {
+                "type": "string",
+                "description": """The name of the profile to set as active""",
+            },
+        },
+        "required": ["profile"],
+    },
+)

mcpx_py/__main__.py

@@ -10,7 +10,7 @@
 import os
 import asyncio
 
-from .client import Client, Tool
+from mcp_run import Client, Tool
 from . import builtin_tools
 
 
@@ -234,7 +234,11 @@ def chat_sync(self, *args, **kw) -> Iterator[ChatResponse]:
             yield res
 
     def _builtin_tools(self) -> List[object]:
-        return [self._convert_tool(builtin_tools.SEARCH)]
+        return [
+            self._convert_tool(builtin_tools.SEARCH),
+            self._convert_tool(builtin_tools.GET_PROFILES),
+            self._convert_tool(builtin_tools.SET_PROFILE),
+        ]
 
     def get_tools(self) -> List[object]:
         """
@@ -253,16 +257,45 @@ def get_tools(self) -> List[object]:
     async def call_tool(self, name: str, input: object, **kw) -> Iterator[ChatResponse]:
         """
         Call a tool by name with the given input, the extra arguments are passed to
-        `Client.call`
+        `Client.call_tool`
         """
         if isinstance(input, str):
             input = json.loads(input)
         self.logger.info(f"Calling tool: {name} with input: {input}")
         try:
             # Handle builtin tools
             if name in ["mcp_run_search_servlets"]:
-                res = self.config.client.search(input["q"])
-                c = json.dumps(res)
+                x = []
+                for r in self.config.client.search(input["q"]):
+                    x.append(
+                        {
+                            "slug": r.slug,
+                            "meta": r.meta,
+                            "installation_count": r.installation_count,
+                        }
+                    )
+                c = json.dumps(x)
+                yield ChatResponse(
+                    role="tool",
+                    content=c,
+                    tool=ToolCall(name=name, input=input),
+                )
+                async for res in self.chat(c, tool=name):
+                    yield res
+                return
+            elif name in ["mcp_run_get_profiles"]:
+                p = []
+                for user, u in self.config.client.profiles.items():
+                    if user == '~':
+                        continue
+                    for profile in u.values():
+                        p.append(
+                            {
+                                "name": f"{user}/{profile.slug.name}",
+                                "description": profile.description,
+                            }
+                        )
+                c = json.dumps(p)
                 yield ChatResponse(
                     role="tool",
                     content=c,
@@ -271,8 +304,20 @@ async def call_tool(self, name: str, input: object, **kw) -> Iterator[ChatRespon
                 async for res in self.chat(c, tool=name):
                     yield res
                 return
+            elif name in ["mcp_run_set_profile"]:
+                profile = input["profile"]
+                c = f"Active profile set to {profile}"
+                yield ChatResponse(
+                    role="tool",
+                    content=c,
+                    tool=ToolCall(name=name, input=input),
+
+                )
+                async for res in self.chat(c, tool=name):
+                    yield res
+                return
 
-            res = self.config.client.call(tool=name, input=input, **kw)
+            res = self.config.client.call_tool(tool=name, params=input, **kw)
             for c in res.content:
                 if c.type == "text":
                     yield ChatResponse(