agentr 0.1.7__py3-none-any.whl → 0.1.8__py3-none-any.whl

agentr/server.py

@@ -2,11 +2,15 @@ from abc import ABC, abstractmethod
 import httpx
 from mcp.server.fastmcp import FastMCP
 from agentr.applications import app_from_name
+from agentr.exceptions import NotAuthorizedError
 from agentr.integration import AgentRIntegration, ApiKeyIntegration
 from agentr.store import EnvironmentStore, MemoryStore
 from agentr.config import AppConfig, IntegrationConfig, StoreConfig
 from loguru import logger
 import os
+from typing import Any
+from mcp.types import TextContent
+from mcp.server.fastmcp.exceptions import ToolError
 
 class Server(FastMCP, ABC):
     """
@@ -21,6 +25,17 @@ class Server(FastMCP, ABC):
     def _load_apps(self):
         pass
 
+    async def call_tool(self, name: str, arguments: dict[str, Any]):
+        """Call a tool by name with arguments."""
+        try:
+            result = await super().call_tool(name, arguments)
+            return result
+        except ToolError as e:
+            raised_error = e.__cause__
+            if isinstance(raised_error, NotAuthorizedError):
+                return [TextContent(type="text", text=raised_error.message)]
+            else:
+                raise e
 
 class LocalServer(Server):
     """

agentr/test.py

@@ -1,38 +1,13 @@
-from agentr.server import LocalServer
-from agentr.store import MemoryStore
+from agentr.server import AgentRServer
 
-store = MemoryStore()
-apps_list = [
-    {
-        "name": "tavily",
-        "integration": {
-            "name": "tavily_api_key",
-            "type": "api_key",
-            "store": {
-                "type": "environment",
-            }
-        },        
-    },
-    {
-        "name": "zenquotes",
-        "integration": None
-    },
-    {
-        "name": "github",
-        "integration": {
-            "name": "github",
-            "type": "agentr",
-        }
-    }
-]
-mcp = LocalServer(name="Test Server", description="Test Server", apps_list=apps_list)
 
+mcp = AgentRServer(name="Test Server", description="Test Server")
 
 async def test():
     tools = await mcp.list_tools()
     from pprint import pprint
     pprint(tools)
-    result = await mcp.call_tool("star_repository", {"repo_full_name": "manojbajaj95/config"})
+    result = await mcp.call_tool("get_today_events", {})
     print(result)
 
 if __name__ == "__main__":

agentr/utils/openapi.py

@@ -1,6 +1,26 @@
 import json
 import yaml
+import re
 from pathlib import Path
+from typing import Dict, Any
+
+
+def convert_to_snake_case(identifier: str) -> str:
+    """
+    Convert a camelCase or PascalCase identifier to snake_case.
+    
+    Args:
+        identifier (str): The string to convert
+        
+    Returns:
+        str: The converted snake_case string
+    """
+    if not identifier:
+        return identifier
+    # Add underscore between lowercase and uppercase letters
+    result = re.sub(r'([a-z0-9])([A-Z])', r'\1_\2', identifier)
+    # Convert to lowercase
+    return result.lower()
 
 
 def load_schema(path: Path):
@@ -14,6 +34,7 @@ def load_schema(path: Path):
         else:
             return json.load(f)
 
+
 def generate_api_client(schema):
     """
     Generate a Python API client class from an OpenAPI schema.
@@ -25,25 +46,62 @@ def generate_api_client(schema):
         str: A string containing the Python code for the API client class.
     """
     methods = []
+    method_names = []
+    
+    # Extract API info for naming and base URL
+    info = schema.get('info', {})
+    api_title = info.get('title', 'API')
+    
+    # Get base URL from servers array if available
+    base_url = ""
+    servers = schema.get('servers', [])
+    if servers and isinstance(servers, list) and 'url' in servers[0]:
+        base_url = servers[0]['url'].rstrip('/')
+    
+    # Create a clean class name from API title
+    if api_title:
+        # Convert API title to a clean class name
+        base_name = "".join(word.capitalize() for word in api_title.split())
+        clean_name = ''.join(c for c in base_name if c.isalnum())
+        class_name = f"{clean_name}App"
+    else:
+        class_name = "APIClient"
     
     # Iterate over paths and their operations
     for path, path_info in schema.get('paths', {}).items():
         for method in path_info:
             if method in ['get', 'post', 'put', 'delete', 'patch', 'options', 'head']:
                 operation = path_info[method]
-                method_code = generate_method_code(path, method, operation)
+                method_code, func_name = generate_method_code(path, method, operation)
                 methods.append(method_code)
+                method_names.append(func_name)
+    
+    # Generate list_tools method with all the function names
+    tools_list = ",\n            ".join([f"self.{name}" for name in method_names])
+    list_tools_method = f"""    def list_tools(self):
+        return [
+            {tools_list}
+        ]"""
+    
+    # Generate class imports
+    imports = [
+        "from agentr.application import APIApplication",
+        "from agentr.integration import Integration"
+    ]
     
     # Construct the class code
     class_code = (
-        "import requests\n\n"
-        "class APIClient:\n"
-        "    def __init__(self, base_url):\n"
-        "        self.base_url = base_url\n\n" +
-        '\n\n'.join(methods)
+        "\n".join(imports) + "\n\n"
+        f"class {class_name}(APIApplication):\n"
+        f"    def __init__(self, integration: Integration = None, **kwargs) -> None:\n"
+        f"        super().__init__(name='{class_name.lower()}', integration=integration, **kwargs)\n"
+        f"        self.base_url = \"{base_url}\"\n\n" +
+        '\n\n'.join(methods) + "\n\n" +
+        list_tools_method + "\n"
     )
     return class_code
 
+
 def generate_method_code(path, method, operation):
     """
     Generate the code for a single API method.
@@ -54,11 +112,13 @@ def generate_method_code(path, method, operation):
         operation (dict): The operation details from the schema.
     
     Returns:
-        str: The Python code for the method.
+        tuple: (method_code, func_name) - The Python code for the method and its name.
     """
     # Determine function name
     if 'operationId' in operation:
-        func_name = operation['operationId']
+        raw_name = operation['operationId']
+        cleaned_name = raw_name.replace('.', '_').replace('-', '_')
+        func_name = convert_to_snake_case(cleaned_name)
     else:
         # Generate name from path and method
         path_parts = path.strip('/').split('/')
@@ -82,43 +142,71 @@ def generate_method_code(path, method, operation):
             args.append(param['name'])
         else:
             args.append(f"{param['name']}=None")
+    
     if has_body:
-        args.append('body' if body_required else 'body=None')
-    signature = f"def {func_name}(self, {', '.join(args)}):"
+        args.append('request_body' if body_required else 'request_body=None')
+    
+    signature = f"    def {func_name}(self, {', '.join(args)}) -> Dict[str, Any]:"
     
     # Build method body
     body_lines = []
     
+    # Validate required parameters
+    for param in parameters:
+        if param.get('required', False):
+            body_lines.append(f"        if {param['name']} is None:")
+            body_lines.append(f"            raise ValueError(\"Missing required parameter '{param['name']}'\")")
+    
+    # Validate required body
+    if has_body and body_required:
+        body_lines.append("        if request_body is None:")
+        body_lines.append("            raise ValueError(\"Missing required request body\")")
+    
     # Path parameters
     path_params = [p for p in parameters if p['in'] == 'path']
     path_params_dict = ', '.join([f"'{p['name']}': {p['name']}" for p in path_params])
-    body_lines.append(f"    path_params = {{{path_params_dict}}}")
+    body_lines.append(f"        path_params = {{{path_params_dict}}}")
+    
+    # Format URL
+    body_lines.append(f"        url = f\"{{self.base_url}}{path}\".format_map(path_params)")
     
     # Query parameters
     query_params = [p for p in parameters if p['in'] == 'query']
     query_params_items = ', '.join([f"('{p['name']}', {p['name']})" for p in query_params])
     body_lines.append(
-        f"    query_params = {{k: v for k, v in [{query_params_items}] if v is not None}}"
+        f"        query_params = {{k: v for k, v in [{query_params_items}] if v is not None}}"
     )
     
-    # Format URL
-    body_lines.append(f"    url = f\"{{self.base_url}}{path}\".format_map(path_params)")
-    
-    # Make HTTP request
-    method_func = method.lower()
+    # Request body handling for JSON
     if has_body:
-        body_lines.append("    if body is not None:")
-        body_lines.append(f"        response = requests.{method_func}(url, params=query_params, json=body)")
-        body_lines.append("    else:")
-        body_lines.append(f"        response = requests.{method_func}(url, params=query_params)")
+        body_lines.append("        json_body = request_body if request_body is not None else None")
+    
+    # Make HTTP request using the proper method
+    method_lower = method.lower()
+    if method_lower == 'get':
+        body_lines.append("        response = self._get(url, params=query_params)")
+    elif method_lower == 'post':
+        if has_body:
+            body_lines.append("        response = self._post(url, data=json_body)")
+        else:
+            body_lines.append("        response = self._post(url, data={})")
+    elif method_lower == 'put':
+        if has_body:
+            body_lines.append("        response = self._put(url, data=json_body)")
+        else:
+            body_lines.append("        response = self._put(url, data={})")
+    elif method_lower == 'delete':
+        body_lines.append("        response = self._delete(url)")
     else:
-        body_lines.append(f"    response = requests.{method_func}(url, params=query_params)")
+        body_lines.append(f"        response = self._{method_lower}(url, data={{}})")
     
     # Handle response
-    body_lines.append("    response.raise_for_status()")
-    body_lines.append("    return response.json()")
+    body_lines.append("        response.raise_for_status()")
+    body_lines.append("        return response.json()")
     
-    return signature + '\n' + '\n'.join(body_lines)
+    method_code = signature + '\n' + '\n'.join(body_lines)
+    return method_code, func_name
+
 
 # Example usage
 if __name__ == "__main__":

{agentr-0.1.7.dist-info → agentr-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentr
-Version: 0.1.7
+Version: 0.1.8
 Summary: A python framework to build MCP servers
 Author-email: Manoj Bajaj <manojbajaj95@gmail.com>
 License-File: LICENSE

agentr-0.1.8.dist-info/RECORD

@@ -0,0 +1,30 @@
+agentr/__init__.py,sha256=LOWhgQayrQV7f5ro4rlBJ_6WevhbWIbjAOHnqP7b_-4,30
+agentr/application.py,sha256=DdDF55_44Bj2vE_9JDzv3i9rYm8LK2r8E5mBd7xQdR0,2884
+agentr/cli.py,sha256=z0QOdyiBcypNE_npN2lYIkEcYZXG8Ji0027IcEuhDTs,2880
+agentr/config.py,sha256=YTygfFJPUuL-epRuILvt5tc5ACzByWIFFNhpFwHlDCE,387
+agentr/exceptions.py,sha256=hHlyXUZBjG4DfUurvqd0ZiruHC67gbpT6EHKxifwUhg,271
+agentr/integration.py,sha256=hr2Edd2H-JG_CNe6xgYvfjy2BgKgFrBN2Grn8n4vfGs,5433
+agentr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agentr/server.py,sha256=PNtg8BkVST4fOgNI4tWoBX2ue1EfGdgEf3__MjOVYmc,4907
+agentr/store.py,sha256=fB3uAaobnWf2ILcDBmg3ToDaqAIPYlLtmHBdpmkcGcI,1585
+agentr/test.py,sha256=crKkiygUhXBaJPfcaS35bLbTd_-hc9jdaONQkT79i3M,354
+agentr/applications/__init__.py,sha256=huqhhfMkSMjcc3eqVAprW03Drr98OHbH2Rh0GwGQHjs,942
+agentr/applications/github/app.py,sha256=qN2O3F9bfRLTxklTPzs67scjZ2KxtrqS6nOGh3ZDmR8,12407
+agentr/applications/google_calendar/app.py,sha256=BlOBmdoEqifuOrG194BgjAvUkBhwvVeGM1HBYKv0bDU,19953
+agentr/applications/google_mail/app.py,sha256=GWmJwgdpBKyNufsrHp2PkYzXNzyCb7XOHxZPYw6XaBA,23710
+agentr/applications/reddit/app.py,sha256=W4rGSDE3ooZiMPWUsgM2URCjaI7lYC56r5pfdlrP4Ss,12548
+agentr/applications/resend/app.py,sha256=ihRzP65bwoNIq3EzBqIghxgLZRxvy-LbHy-rER20ODo,1428
+agentr/applications/tavily/app.py,sha256=D4FOhm2yxNbuTVHTo3T8ZsuE5AgwK874YutfYx2Njcw,1805
+agentr/applications/zenquotes/app.py,sha256=4LjYeWdERI8ZMzkajOsDgy9IRTA9plUKem-rW4M03sA,607
+agentr/integrations/README.md,sha256=lTAPXO2nivcBe1q7JT6PRa6v9Ns_ZersQMIdw-nmwEA,996
+agentr/integrations/__init__.py,sha256=_jGeykaUjY97rklbUIGbY7oWQXhtYGRUdYszNRw_NOg,232
+agentr/integrations/agentr.py,sha256=MWUHItiRvs-9PNi8jcPHXgJ-cxCGVpzIpW7VNWWIoAs,3364
+agentr/integrations/api_key.py,sha256=cbX_8Je7nX3alIK1g0EqQcyNsNylQRQExGzsUARfytU,552
+agentr/integrations/base.py,sha256=jZPWwzEHPJxS7onfscp8wwXt0bT66SC9tr75XQaueR4,1536
+agentr/utils/bridge.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agentr/utils/openapi.py,sha256=AEBMAuuDpjmoNjC3KWri6m2Pje0H_h397xE17deLLQg,9563
+agentr-0.1.8.dist-info/METADATA,sha256=TyG5rgrVd_19Si0Y0ORwiE9LWVVRjGTCs82FOpUxoL0,4388
+agentr-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agentr-0.1.8.dist-info/entry_points.txt,sha256=13fGFeVhgF6_8T-VFiIkNxYO7gDQaUwwTcUNWdvaLQg,42
+agentr-0.1.8.dist-info/licenses/LICENSE,sha256=CPslwL9mT3MH-lEljRJQHKe646096G-szURVmOD18Lc,1063
+agentr-0.1.8.dist-info/RECORD,,

agentr-0.1.7.dist-info/RECORD

@@ -1,25 +0,0 @@
-agentr/__init__.py,sha256=LOWhgQayrQV7f5ro4rlBJ_6WevhbWIbjAOHnqP7b_-4,30
-agentr/application.py,sha256=r2o4PP0uDBFTkziseuOh7AobcVqnEWDoYJxN_UA7UVo,2932
-agentr/cli.py,sha256=z0QOdyiBcypNE_npN2lYIkEcYZXG8Ji0027IcEuhDTs,2880
-agentr/config.py,sha256=YTygfFJPUuL-epRuILvt5tc5ACzByWIFFNhpFwHlDCE,387
-agentr/exceptions.py,sha256=hHlyXUZBjG4DfUurvqd0ZiruHC67gbpT6EHKxifwUhg,271
-agentr/integration.py,sha256=BmtPpn2lXV7i6k6Uqu5g-LWpD9wRiMz7R3SgztLAktc,2663
-agentr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agentr/server.py,sha256=vg9YlApxlLvxcIn9h_Rz2IgatXv7aBj0pTTb6XWMRN4,4279
-agentr/store.py,sha256=fB3uAaobnWf2ILcDBmg3ToDaqAIPYlLtmHBdpmkcGcI,1585
-agentr/test.py,sha256=wtupsEMrn-Q9Ocjlhelk4YrVSrWMM5vwMBhnvepEaHo,917
-agentr/applications/__init__.py,sha256=huqhhfMkSMjcc3eqVAprW03Drr98OHbH2Rh0GwGQHjs,942
-agentr/applications/github/app.py,sha256=N-f9TX5btcUDr19H-eTG7NlFlb25fGENLZ07fFfQBg4,17301
-agentr/applications/google_calendar/app.py,sha256=3mpqP0MsTYsJyZDF2Skgs1VLfLRr6E7OSOhbcAQ_L3E,25710
-agentr/applications/google_mail/app.py,sha256=GWmJwgdpBKyNufsrHp2PkYzXNzyCb7XOHxZPYw6XaBA,23710
-agentr/applications/reddit/app.py,sha256=iNkSRVGScj7Mae3e8N-Mkov_hvZrvH5NynbpO8mKToQ,842
-agentr/applications/resend/app.py,sha256=ihRzP65bwoNIq3EzBqIghxgLZRxvy-LbHy-rER20ODo,1428
-agentr/applications/tavily/app.py,sha256=D4FOhm2yxNbuTVHTo3T8ZsuE5AgwK874YutfYx2Njcw,1805
-agentr/applications/zenquotes/app.py,sha256=4LjYeWdERI8ZMzkajOsDgy9IRTA9plUKem-rW4M03sA,607
-agentr/utils/bridge.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agentr/utils/openapi.py,sha256=DT4jcWue_Fx0J-wg7T53w3uMb5CIzn4u2QswmtpSFVU,6280
-agentr-0.1.7.dist-info/METADATA,sha256=BUoooDf1WgcRVE-rVBD3W78W-FrhSGnvAmhbYbuV-TY,4388
-agentr-0.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agentr-0.1.7.dist-info/entry_points.txt,sha256=13fGFeVhgF6_8T-VFiIkNxYO7gDQaUwwTcUNWdvaLQg,42
-agentr-0.1.7.dist-info/licenses/LICENSE,sha256=CPslwL9mT3MH-lEljRJQHKe646096G-szURVmOD18Lc,1063
-agentr-0.1.7.dist-info/RECORD,,