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

agentr/application.py

@@ -1,5 +1,4 @@
-from abc import ABC, abstractmethod
-
+from abc import ABC
 from loguru import logger
 from agentr.exceptions import NotAuthorizedError
 from agentr.integration import Integration
@@ -11,11 +10,25 @@ class Application(ABC):
     """
     def __init__(self, name: str, **kwargs):
         self.name = name
+        self.tools = []
 
-    @abstractmethod
+    def tool(self):
+        """Decorator to register a method as a tool.
+        
+        This decorator adds the decorated method to the application's tools list
+        and returns the original method unchanged.
+        
+        Returns:
+            The decorated method
+        """
+        def decorator(func):
+            if func not in self.tools:
+                self.tools.append(func)
+            return func
+        return decorator
+    
     def list_tools(self):
-        pass
-
+        return self.tools
 
 class APIApplication(Application):
     """
@@ -86,9 +99,18 @@ class APIApplication(Application):
             logger.error(f"Error posting {url}: {e}")
             raise e
 
+    def _patch(self, url, data):
+        try:
+            headers = self._get_headers()
+            response = httpx.patch(url, headers=headers, json=data)
+            response.raise_for_status()
+            return response
+        except NotAuthorizedError as e:
+            logger.warning(f"Authorization needed: {e.message}")
+            raise e
+        except Exception as e:
+            logger.error(f"Error patching {url}: {e}")
+            raise e       
+
     def validate(self):
-        pass
-    
-    @abstractmethod
-    def list_tools(self):
         pass

agentr/applications/github/app.py

@@ -1,6 +1,7 @@
 from agentr.integration import Integration
 from agentr.application import APIApplication
 from loguru import logger
+from typing import List, Dict, Any
 
 class GithubApp(APIApplication):
     def __init__(self, integration: Integration) -> None:
@@ -125,40 +126,38 @@ class GithubApp(APIApplication):
         
         return result
 
-    def list_issues(self, repo_full_name: str, per_page: int = 30, page: int = 1) -> str:
+    def list_issues(self, repo_full_name: str, state: str = "open", assignee: str = None, 
+                    labels: str = None, per_page: int = 30, page: int = 1) -> List[Dict[str, Any]]:
         """List issues for a GitHub repository
         
         Args:
             repo_full_name: The full name of the repository (e.g. 'owner/repo')
+            state: State of issues to return (open, closed, all). Default: open
+            assignee: Filter by assignee. Use 'none' for no assignee, '*' for any assignee
+            labels: Comma-separated list of label names (e.g. "bug,ui,@high")
             per_page: The number of results per page (max 100)
             page: The page number of the results to fetch
             
         Returns:
-            A formatted list of issues
+             The complete GitHub API response
         """
         repo_full_name = repo_full_name.strip()
-        url = f"{self.base_api_url}/{repo_full_name}/issues/events"
+        url = f"{self.base_api_url}/{repo_full_name}/issues"
+        
         params = {
+            "state": state,
             "per_page": per_page,
             "page": page
         }
-        response = self._get(url, params=params)
-        response.raise_for_status()
         
-        issues = response.json()
-        if not issues:
-            return f"No issues found for repository {repo_full_name}"
-        
-        result = f"Issues for {repo_full_name} (Page {page}):\n\n"
-        for issue in issues:
-            issue_title = issue.get("issue", {}).get("title", "No Title")
-            issue_number = issue.get("issue", {}).get("number", "Unknown")
-            issue_state = issue.get("issue", {}).get("state", "Unknown")
-            issue_user = issue.get("issue", {}).get("user", {}).get("login", "Unknown")
-            
-            result += f"- Issue #{issue_number}: {issue_title} (by {issue_user}, Status: {issue_state})\n"
+        if assignee:
+            params["assignee"] = assignee
+        if labels:
+            params["labels"] = labels
         
-        return result
+        response = self._get(url, params=params)
+        response.raise_for_status()
+        return response.json()
 
     def get_pull_request(self, repo_full_name: str, pull_number: int) -> str:
         """Get a specific pull request for a GitHub repository
@@ -191,45 +190,47 @@ class GithubApp(APIApplication):
         
         return result
 
-    def create_pull_request(self, repo_full_name: str, title: str, head: str, base: str, body: str = "", 
-                            maintainer_can_modify: bool = True, draft: bool = False) -> str:
+    def create_pull_request(self, repo_full_name: str, head: str, base: str, title: str = None,
+                           body: str = None, issue: int = None, maintainer_can_modify: bool = True, 
+                           draft: bool = False) -> Dict[str, Any]:
         """Create a new pull request for a GitHub repository
         
         Args:
             repo_full_name: The full name of the repository (e.g. 'owner/repo')
-            title: The title of the new pull request
             head: The name of the branch where your changes are implemented
             base: The name of the branch you want the changes pulled into
+            title: The title of the new pull request (required if issue is not specified)
             body: The contents of the pull request
+            issue: An issue number to convert to a pull request. If specified, the issue's 
+                   title, body, and comments will be used for the pull request
             maintainer_can_modify: Indicates whether maintainers can modify the pull request
             draft: Indicates whether the pull request is a draft
             
         Returns:
-            A confirmation message with the new pull request details
+            The complete GitHub API response
         """
         repo_full_name = repo_full_name.strip()
         url = f"{self.base_api_url}/{repo_full_name}/pulls"
         
         pull_request_data = {
-            "title": title,
             "head": head,
             "base": base,
-            "body": body,
             "maintainer_can_modify": maintainer_can_modify,
             "draft": draft
         }
         
+        if issue is not None:
+            pull_request_data["issue"] = issue
+        else:
+            if title is None:
+                raise ValueError("Either 'title' or 'issue' must be specified")
+            pull_request_data["title"] = title
+            if body is not None:
+                pull_request_data["body"] = body
+        
         response = self._post(url, pull_request_data)
         response.raise_for_status()
-        
-        pr = response.json()
-        pr_number = pr.get("number", "Unknown")
-        pr_url = pr.get("html_url", "")
-        
-        return f"Successfully created pull request #{pr_number}:\n" \
-               f"Title: {title}\n" \
-               f"From: {head} → To: {base}\n" \
-               f"URL: {pr_url}"
+        return response.json()
 
     def create_issue(self, repo_full_name: str, title: str, body: str = "", labels = None) -> str:
         """Create a new issue in a GitHub repository
@@ -313,7 +314,43 @@ class GithubApp(APIApplication):
         
         return result
 
+    def update_issue(self, repo_full_name: str, issue_number: int, title: str = None, 
+                    body: str = None, assignee: str = None, state: str = None, 
+                    state_reason: str = None) -> Dict[str, Any]:
+        """Update an issue in a GitHub repository
+        
+        Args:
+            repo_full_name: The full name of the repository (e.g. 'owner/repo')
+            issue_number: The number that identifies the issue
+            title: The title of the issue
+            body: The contents of the issue
+            assignee: Username to assign to this issue
+            state: State of the issue (open or closed)
+            state_reason: Reason for state change (completed, not_planned, reopened, null)
+            
+        Returns:
+             The complete GitHub API response
+        """
+        url = f"{self.base_api_url}/{repo_full_name}/issues/{issue_number}"
+        
+        update_data = {}
+        if title is not None:
+            update_data["title"] = title
+        if body is not None:
+            update_data["body"] = body
+        if assignee is not None:
+            update_data["assignee"] = assignee
+        if state is not None:
+            update_data["state"] = state
+        if state_reason is not None:
+            update_data["state_reason"] = state_reason
+        
+        response = self._patch(url, update_data)
+        response.raise_for_status()
+        return response.json()
+
     def list_tools(self):
         return [self.star_repository, self.list_commits, self.list_branches, 
                 self.list_pull_requests, self.list_issues, self.get_pull_request, 
-                self.create_pull_request, self.create_issue, self.list_repo_activities]
+                self.create_pull_request, self.create_issue, self.update_issue,
+                self.list_repo_activities]

agentr/applications/reddit/app.py

@@ -1,11 +1,31 @@
+import httpx
 from agentr.application import APIApplication
 from agentr.integration import Integration
+from agentr.exceptions import NotAuthorizedError
 from loguru import logger
 
 class RedditApp(APIApplication):
     def __init__(self, integration: Integration) -> None:
         super().__init__(name="reddit", integration=integration)
-        self.base_api_url = "https://oauth.reddit.com" 
+        self.base_api_url = "https://oauth.reddit.com"
+
+    def _post(self, url, data):
+        try:
+            headers = self._get_headers()
+            response = httpx.post(url, headers=headers, data=data)
+            response.raise_for_status()
+            return response
+        except NotAuthorizedError as e:
+            logger.warning(f"Authorization needed: {e.message}")
+            raise e
+        except httpx.HTTPStatusError as e:
+            if e.response.status_code == 429:
+                return e.response.text or "Rate limit exceeded. Please try again later."
+            else:
+                raise e
+        except Exception as e:
+            logger.error(f"Error posting {url}: {e}")
+            raise e
 
     def _get_headers(self):
         if not self.integration:

agentr/cli.py

@@ -59,6 +59,8 @@ def install(app_name: str):
         
         with open(config_path, 'r') as f:
             config = json.load(f)
+        if 'mcpServers' not in config:
+            config['mcpServers'] = {}
         config['mcpServers']['agentr'] = {
             "command": "uvx",
             "args": ["agentr@latest", "run"],
@@ -66,6 +68,35 @@ def install(app_name: str):
                 "AGENTR_API_KEY": api_key
             }
         }
+        with open(config_path, 'w') as f:
+            json.dump(config, f, indent=4)
+        typer.echo("App installed successfully")
+    elif app_name == "cursor":
+        typer.echo(f"Installing mcp server for: {app_name}")
+        
+        # Set up Cursor config path
+        config_path = Path.home() / ".cursor/mcp.json"
+        
+        # Create config directory if it doesn't exist
+        config_path.parent.mkdir(parents=True, exist_ok=True)
+        
+        # Create or load existing config
+        if config_path.exists():
+            with open(config_path, 'r') as f:
+                config = json.load(f)
+        else:
+            config = {}
+
+        if 'mcpServers' not in config:
+            config['mcpServers'] = {}
+        config['mcpServers']['agentr'] = {
+            "command": "uvx",
+            "args": ["agentr@latest", "run"],
+            "env": {
+                "AGENTR_API_KEY": api_key
+            }
+        }
+        
         with open(config_path, 'w') as f:
             json.dump(config, f, indent=4)
         typer.echo("App installed successfully")

agentr/server.py

@@ -80,7 +80,9 @@ class LocalServer(Server):
             if app:
                 tools = app.list_tools()
                 for tool in tools:
-                    self.add_tool(tool)
+                    name = app.name + "_" + tool.__name__
+                    description = tool.__doc__
+                    self.add_tool(tool, name=name, description=description)
 
                 
 
@@ -114,7 +116,9 @@ class AgentRServer(Server):
                 "X-API-KEY": self.api_key
             }
         )
+        response.raise_for_status()
         apps = response.json()
+        
         logger.info(f"Apps: {apps}")
         return [AppConfig.model_validate(app) for app in apps]
             
@@ -125,4 +129,6 @@ class AgentRServer(Server):
             if app:
                 tools = app.list_tools()
                 for tool in tools:
-                    self.add_tool(tool)
+                    name = app.name + "_" + tool.__name__
+                    description = tool.__doc__
+                    self.add_tool(tool, name=name, description=description)

agentr/test.py

@@ -7,8 +7,8 @@ async def test():
     tools = await mcp.list_tools()
     from pprint import pprint
     pprint(tools)
-    result = await mcp.call_tool("get_today_events", {})
-    print(result)
+    # result = await mcp.call_tool("get_today_events", {})
+    # print(result)
 
 if __name__ == "__main__":
     import asyncio

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: agentr
-Version: 0.1.8
-Summary: A python framework to build MCP servers
-Author-email: Manoj Bajaj <manojbajaj95@gmail.com>
+Version: 0.1.9
+Summary: An MCP middleware to connect to 400+ apps
+Author-email: Manoj Bajaj <manoj@agentr.dev>
 License-File: LICENSE
 Requires-Python: >=3.11
 Requires-Dist: loguru>=0.7.3

{agentr-0.1.8.dist-info → agentr-0.1.9.dist-info}/RECORD

@@ -1,18 +1,18 @@
 agentr/__init__.py,sha256=LOWhgQayrQV7f5ro4rlBJ_6WevhbWIbjAOHnqP7b_-4,30
-agentr/application.py,sha256=DdDF55_44Bj2vE_9JDzv3i9rYm8LK2r8E5mBd7xQdR0,2884
-agentr/cli.py,sha256=z0QOdyiBcypNE_npN2lYIkEcYZXG8Ji0027IcEuhDTs,2880
+agentr/application.py,sha256=1y3591Smesk8SOha7fa6aWFey7KNCqPWOP2uutwrk0w,3729
+agentr/cli.py,sha256=SaJO502Eb-egiu6rXpxlmvDNkXeyYEGNirwSliOsbVI,3906
 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/server.py,sha256=NgqUkTf0h8ot4DEWRQ0nH9winuZLF7E8F-3MPyKa1cs,5233
 agentr/store.py,sha256=fB3uAaobnWf2ILcDBmg3ToDaqAIPYlLtmHBdpmkcGcI,1585
-agentr/test.py,sha256=crKkiygUhXBaJPfcaS35bLbTd_-hc9jdaONQkT79i3M,354
+agentr/test.py,sha256=yhTzUUvdqUXug7Og-cOAP2CQo9NPQ2HezLhIaSBcc7s,358
 agentr/applications/__init__.py,sha256=huqhhfMkSMjcc3eqVAprW03Drr98OHbH2Rh0GwGQHjs,942
-agentr/applications/github/app.py,sha256=qN2O3F9bfRLTxklTPzs67scjZ2KxtrqS6nOGh3ZDmR8,12407
+agentr/applications/github/app.py,sha256=ysW1gzP_PjR9sE5TciECziEkYZq2h-I0R6soRhngF-8,14014
 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/reddit/app.py,sha256=LNkT5lV18lylvghABh_1FFSBcXGo4GwGeH6AiHojXaA,13282
 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
@@ -23,8 +23,8 @@ agentr/integrations/api_key.py,sha256=cbX_8Je7nX3alIK1g0EqQcyNsNylQRQExGzsUARfyt
 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.9.dist-info/METADATA,sha256=zk7QncR1lOritziohTCOJrPhZFm62ubrAztkdmeNxO8,4384
+agentr-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agentr-0.1.9.dist-info/entry_points.txt,sha256=13fGFeVhgF6_8T-VFiIkNxYO7gDQaUwwTcUNWdvaLQg,42
+agentr-0.1.9.dist-info/licenses/LICENSE,sha256=CPslwL9mT3MH-lEljRJQHKe646096G-szURVmOD18Lc,1063
+agentr-0.1.9.dist-info/RECORD,,