universal-mcp 0.1.24rc17__py3-none-any.whl → 0.1.24rc19__py3-none-any.whl

universal_mcp/agentr/client.py

@@ -1,3 +1,4 @@
+import io
 import os
 from typing import Any
 
@@ -25,6 +26,7 @@ class AgentrClient:
         base_url = base_url or os.getenv("AGENTR_BASE_URL", "https://api.agentr.dev")
         self.base_url = f"{base_url.rstrip('/')}/v1"
         api_key = api_key or os.getenv("AGENTR_API_KEY")
+        self.user_id = None
         if api_key:
             self.client = httpx.Client(
                 base_url=self.base_url,
@@ -34,6 +36,7 @@ class AgentrClient:
                 verify=False,
             )
             me_data = self.me()
+            self.user_id = me_data["id"]
             logger.debug(f"Client initialized with user: {me_data['email']}")
         elif auth_token:
             logger.debug("Initializing client with auth token")
@@ -45,6 +48,7 @@ class AgentrClient:
                 verify=False,
             )
             me_data = self.me()
+            self.user_id = me_data["id"]
             logger.debug(f"Client initialized with user: {me_data['email']}")
         else:
             raise ValueError("No API key or auth token provided")
@@ -207,3 +211,10 @@ class AgentrClient:
         response = self.client.get("/tools/", params=params)
         response.raise_for_status()
         return response.json().get("items", [])
+
+    def _upload_file(self, file_name: str, mime_type: str, base64_data: str) -> str:
+        """Upload a file to the server."""
+        files = {"file": (file_name, io.BytesIO(base64_data), mime_type)}
+        reponse = self.client.post("/files/upload", files=files)
+        reponse.raise_for_status()
+        return reponse.json()

universal_mcp/agentr/registry.py

@@ -1,15 +1,34 @@
+import base64
 from typing import Any
 
 from loguru import logger
 
 from universal_mcp.agentr.client import AgentrClient
 from universal_mcp.applications.utils import app_from_slug
+from universal_mcp.exceptions import ToolError
 from universal_mcp.tools.manager import ToolManager, _get_app_and_tool_name
 from universal_mcp.tools.registry import ToolRegistry
 from universal_mcp.types import ToolConfig, ToolFormat
 
 from .integration import AgentrIntegration
 
+MARKDOWN_INSTRUCTIONS = """Always render the URL in markdown format for images and media files. Here are examples:
+The url is provided in the response as "signed_url".
+For images:
+- Use markdown image syntax: ![alt text](url)
+- Example: ![Generated sunset image](https://example.com/image.png)
+- Always include descriptive alt text that explains what the image shows
+
+For audio files:
+- Use markdown link syntax with audio description: [🔊 Audio file description](url)
+- Example: [🔊 Generated speech audio](https://example.com/audio.mp3)
+
+For other media:
+- Use descriptive link text: [📄 File description](url)
+- Example: [📄 Generated document](https://example.com/document.pdf)
+
+Always make the links clickable and include relevant context about what the user will see or hear when they access the URL."""
+
 
 class AgentrRegistry(ToolRegistry):
     """Platform manager implementation for AgentR platform."""
@@ -181,7 +200,23 @@ class AgentrRegistry(ToolRegistry):
 
     async def call_tool(self, tool_name: str, tool_args: dict[str, Any]) -> dict[str, Any]:
         """Call a tool with the given name and arguments."""
-        return await self.tool_manager.call_tool(tool_name, tool_args)
+        data = await self.tool_manager.call_tool(tool_name, tool_args)
+        logger.debug(f"Tool {tool_name} called with args {tool_args} and returned {data}")
+        if isinstance(data, dict):
+            type_ = data.get("type")
+            if type_ == "image" or type_ == "audio":
+                # Special handling for images and audio
+                base64_data = data.get("data")
+                mime_type = data.get("mime_type")
+                file_name = data.get("file_name")
+                if not mime_type or not file_name:
+                    raise ToolError("Mime type or file name is missing")
+                bytes_data = base64.b64decode(base64_data)
+                response = self.client._upload_file(file_name, mime_type, bytes_data)
+                # Hard code instructions for llm
+                response = {**response, "instructions": MARKDOWN_INSTRUCTIONS}
+                return response
+        return data
 
     async def list_connected_apps(self) -> list[str]:
         """List all apps that the user has connected."""

universal_mcp/applications/sample/app.py

@@ -1,22 +1,25 @@
 import datetime
 
 import httpx
+from loguru import logger
 
 from universal_mcp.applications.application import BaseApplication
 
 
-class SampleToolApp(BaseApplication):
+class SampleApp(BaseApplication):
     """A sample application providing basic utility tools."""
 
-    def __init__(self):
+    def __init__(self, **kwargs):
         """Initializes the SampleToolApp with the name 'sample_tool_app'."""
-        super().__init__(name="sample_tool_app")
+        super().__init__(name="sample")
 
     def get_current_time(self):
         """Get the current system time as a formatted string.
 
         Returns:
             str: The current time in the format 'YYYY-MM-DD HH:MM:SS'.
+        Tags:
+            time, date, current, system, utility, important
         """
         return datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
@@ -25,6 +28,8 @@ class SampleToolApp(BaseApplication):
 
         Returns:
             str: The current date in the format 'YYYY-MM-DD'.
+        Tags:
+            time, date, current, system, utility, important
         """
         return datetime.datetime.now().strftime("%Y-%m-%d")
 
@@ -36,6 +41,8 @@ class SampleToolApp(BaseApplication):
 
         Returns:
             str: The result of the calculation, or an error message if evaluation fails.
+        Tags:
+            math, calculation, utility, important
         """
         try:
             # Safe evaluation of mathematical expressions
@@ -44,29 +51,41 @@ class SampleToolApp(BaseApplication):
         except Exception as e:
             return f"Error in calculation: {str(e)}"
 
-    def file_operations(self, operation: str, filename: str, content: str = ""):
-        """Perform file read or write operations.
+    def read_file(self, filename: str):
+        """Read content from a file.
 
         Args:
-            operation (str): The operation to perform, either 'read' or 'write'.
-            filename (str): The name of the file to operate on.
-            content (str, optional): The content to write to the file (used only for 'write'). Defaults to "".
+            filename (str): The name of the file to read from.
 
         Returns:
-            str: The result of the file operation, or an error message if the operation fails.
+            str: The content of the file, or an error message if the operation fails.
+        Tags:
+            file, read, utility, important
         """
         try:
-            if operation == "read":
-                with open(filename) as f:
-                    return f"File content:\n{f.read()}"
-            elif operation == "write":
-                with open(filename, "w") as f:
-                    f.write(content)
-                return f"Successfully wrote to {filename}"
-            else:
-                return "Invalid operation. Use 'read' or 'write'"
+            with open(filename) as f:
+                return f"File content:\n{f.read()}"
         except Exception as e:
-            return f"File operation error: {str(e)}"
+            return f"File read error: {str(e)}"
+
+    def write_file(self, filename: str, content: str):
+        """Write content to a file.
+
+        Args:
+            filename (str): The name of the file to write to.
+            content (str): The content to write to the file.
+
+        Returns:
+            str: Success message or an error message if the operation fails.
+        Tags:
+            file, write, utility, important
+        """
+        try:
+            with open(filename, "w") as f:
+                f.write(content)
+            return f"Successfully wrote to {filename}"
+        except Exception as e:
+            return f"File write error: {str(e)}"
 
     def get_weather(
         self,
@@ -230,6 +249,44 @@ class SampleToolApp(BaseApplication):
         except Exception as e:
             return {"error": str(e)}
 
+    def generate_image(self, prompt: str):
+        """Generate an image based on a prompt.
+        A
+        Args:
+            prompt (str): The prompt to generate an image from.
+
+        Returns:
+            dict: The generated image.
+        Tags:
+            image, generate, utility, important
+        """
+        import base64
+        import io
+
+        from PIL import Image, ImageDraw, ImageFont
+
+        # Create a simple placeholder image
+        img = Image.new("RGB", (600, 400), color="lightblue")
+        draw = ImageDraw.Draw(img)
+
+        # Add text to the image
+        try:
+            # Try to use a default font
+            font = ImageFont.load_default()
+        except Exception as e:
+            logger.error(f"Error loading font: {e}")
+            font = None
+
+        text = f"Generated: {prompt[:50]}..."
+        draw.text((50, 200), text, fill="black", font=font)
+
+        # Convert to base64
+        buffer = io.BytesIO()
+        img.save(buffer, format="PNG")
+        img_base64 = base64.b64encode(buffer.getvalue()).decode("utf-8")
+
+        return {"type": "image", "data": img_base64, "mime_type": "image/png", "file_name": "sample.png"}
+
     def list_tools(self):
         """List all available tool methods in this application.
 
@@ -240,6 +297,8 @@ class SampleToolApp(BaseApplication):
             self.get_current_time,
             self.get_current_date,
             self.calculate,
-            self.file_operations,
+            self.read_file,
+            self.write_file,
             self.get_simple_weather,
+            self.generate_image,
         ]

{universal_mcp-0.1.24rc17.dist-info → universal_mcp-0.1.24rc19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal-mcp
-Version: 0.1.24rc17
+Version: 0.1.24rc19
 Summary: Universal MCP acts as a middle ware for your API applications. It can store your credentials, authorize, enable disable apps on the fly and much more.
 Author-email: Manoj Bajaj <manojbajaj95@gmail.com>
 License: MIT
@@ -32,7 +32,6 @@ Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=14.0.0
 Requires-Dist: streamlit>=1.46.1
 Requires-Dist: typer>=0.15.2
-Requires-Dist: universal-mcp-applications>=0.1.2
 Provides-Extra: dev
 Requires-Dist: litellm>=1.30.7; extra == 'dev'
 Requires-Dist: pre-commit>=4.2.0; extra == 'dev'

{universal_mcp-0.1.24rc17.dist-info → universal_mcp-0.1.24rc19.dist-info}/RECORD

@@ -6,13 +6,13 @@ universal_mcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 universal_mcp/types.py,sha256=DAzYyS7Zqdi38SpnhdOm08_JeN2CJiC0hDIpLLIhlSw,316
 universal_mcp/agentr/README.md,sha256=t15pVgkCwZM5wzgLgrf0Zv6hVL7dPmKXvAeTf8CiXPQ,6641
 universal_mcp/agentr/__init__.py,sha256=fv1ZnOCduIUiJ9oN4e6Ya_hA2oWQvcEuDU3Ek1vEufI,180
-universal_mcp/agentr/client.py,sha256=TQgwrNc7dEMXuprELf0Q-fdYdrH92Ppd7PUDZoD-KcY,7429
+universal_mcp/agentr/client.py,sha256=CwfmOAgWsApm0buxZPni3vW6MFgrwdddXsXmQA5UYrA,7882
 universal_mcp/agentr/integration.py,sha256=V5GjqocqS02tRoI8MeV9PL6m-BzejwBzgJhOHo4MxAE,4212
-universal_mcp/agentr/registry.py,sha256=6KFTv45p_crqRqpdcwj1ksaF41PKXzgYIACRxsLaj3o,6909
+universal_mcp/agentr/registry.py,sha256=cWkg9cUEmksWqeuh4xazFf1WtRQ3lEZf1s53hqTlmG4,8657
 universal_mcp/agentr/server.py,sha256=bIPmHMiKKwnUYnxmfZVRh1thcn7Rytm_-bNiXTfANzc,2098
 universal_mcp/applications/application.py,sha256=do45GC0jnNepZHL8US2yDNq9s0ZnE6bII4Xbw90GRTc,23727
 universal_mcp/applications/utils.py,sha256=8Pp9lZU6IPt9z9BnuJ-vpv-NGuzryt1c4e4-ShDd2XI,1450
-universal_mcp/applications/sample/app.py,sha256=E0JwaWD7qytwawb_iWc1pBnJ-Te7MMtab4MxOOebLdc,8972
+universal_mcp/applications/sample/app.py,sha256=D9zPezC13xXVMlfO2A0fHgJQD_I-bnpf9UOOHveHMek,10537
 universal_mcp/client/oauth.py,sha256=O00zOUfQxINaruFU2zt-64DIR1_mAqrY8ykLQo-teJU,8679
 universal_mcp/client/token_store.py,sha256=6VAzjzJG49wYvmEDqksFvb-fVqdjHIKWv7yYyh_AuF8,3912
 universal_mcp/client/transport.py,sha256=qqtb0ky6yvLBxsaA9-oFU0v9MwfcQb4eomq-O2fmwtQ,11850
@@ -47,8 +47,8 @@ universal_mcp/utils/openapi/readme.py,sha256=R2Jp7DUXYNsXPDV6eFTkLiy7MXbSULUj1vH
 universal_mcp/utils/openapi/test_generator.py,sha256=vucBh9klWmQOUA740TFwfM9ry2nkwKWQiNRcsiZ9HbY,12229
 universal_mcp/utils/templates/README.md.j2,sha256=Mrm181YX-o_-WEfKs01Bi2RJy43rBiq2j6fTtbWgbTA,401
 universal_mcp/utils/templates/api_client.py.j2,sha256=972Im7LNUAq3yZTfwDcgivnb-b8u6_JLKWXwoIwXXXQ,908
-universal_mcp-0.1.24rc17.dist-info/METADATA,sha256=Z_twD5L03occBIYlR1zfsz-hvETI6HRvDqaNv4vuD5Y,3304
-universal_mcp-0.1.24rc17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-universal_mcp-0.1.24rc17.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
-universal_mcp-0.1.24rc17.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
-universal_mcp-0.1.24rc17.dist-info/RECORD,,
+universal_mcp-0.1.24rc19.dist-info/METADATA,sha256=zKP0JF9Lp3hnTW-8ZvLutdDpGEcqAishzXtrICY3a4Y,3255
+universal_mcp-0.1.24rc19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+universal_mcp-0.1.24rc19.dist-info/entry_points.txt,sha256=QlBrVKmA2jIM0q-C-3TQMNJTTWOsOFQvgedBq2rZTS8,56
+universal_mcp-0.1.24rc19.dist-info/licenses/LICENSE,sha256=NweDZVPslBAZFzlgByF158b85GR0f5_tLQgq1NS48To,1063
+universal_mcp-0.1.24rc19.dist-info/RECORD,,