fix: github agent sample

Author: cristipufu

.github/workflows/trigger-github-agent.yml

@@ -15,4 +15,4 @@ jobs:
         env:
           COMMENT_BODY: ${{ toJson(github.event.comment.body) }}
         run: |
-          python -c "import requests; import json; import os; import re; import base64; comment_json = os.environ['COMMENT_BODY']; comment = json.loads(comment_json); command = re.search(r'/help\s+(\w+)', comment); command_value = command.group(1) if command else 'help'; number = ${{ github.event.issue.number || github.event.pull_request.number || 0 }}; payload = json.dumps({'owner': '${{ github.repository_owner }}', 'repo': '${{ github.event.repository.name }}', 'pullNumber': number, 'command': command_value, 'in_reply_to': ${{ github.event.comment.id }}}); resp = requests.post('${{ secrets.UIPATH_URL }}/orchestrator_/odata/Jobs/UiPath.Server.Configuration.OData.StartJobs', headers={'Authorization': 'Bearer ${{ secrets.UIPATH_ACCESS_TOKEN }}', 'Content-Type': 'application/json', 'X-UiPath-FolderPath': 'MCP Folder'}, json={'startInfo': {'releaseName': 'github-helper-agent', 'inputArguments': payload}}); print(f'Status code: {resp.status_code}'); print(f'Response: {resp.text}')"
+          python -c "import requests; import json; import os; import re; import base64; comment_json = os.environ['COMMENT_BODY']; comment = json.loads(comment_json); command = re.search(r'/help\s+(\w+)', comment); command_value = command.group(1) if command else 'help'; number = ${{ github.event.issue.number || github.event.pull_request.number || 0 }}; payload = json.dumps({'owner': '${{ github.repository_owner }}', 'repo': '${{ github.event.repository.name }}', 'pullNumber': number, 'command': command_value, 'commentNumber': ${{ github.event.comment.id }}}); resp = requests.post('${{ secrets.UIPATH_URL }}/orchestrator_/odata/Jobs/UiPath.Server.Configuration.OData.StartJobs', headers={'Authorization': 'Bearer ${{ secrets.UIPATH_ACCESS_TOKEN }}', 'Content-Type': 'application/json', 'X-UiPath-FolderPath': 'MCP Folder'}, json={'startInfo': {'releaseName': 'github-helper-agent', 'inputArguments': payload}}); print(f'Status code: {resp.status_code}'); print(f'Response: {resp.text}')"

samples/github-helper-agent/main.py

@@ -11,21 +11,31 @@
 from langgraph.prebuilt.chat_agent_executor import AgentState
 from mcp import ClientSession
 from mcp.client.sse import sse_client
-from pydantic import Field
+from pydantic import BaseModel, Field
 
 dotenv.load_dotenv()
 
 
-class PullRequestState(AgentState):
-    """State for the GitHub Assistant agent."""
+class PullRequestInfo(BaseModel):
+    """Input parameters with Pull Request details"""
 
     owner: str
     repo: str
     pullNumber: int
-    in_reply_to: Optional[int]
+    commentNumber: Optional[int]
     command: str = Field(default="review")
 
 
+class GraphState(AgentState):
+    """Graph state"""
+
+    owner: str
+    repo: str
+    pull_number: int
+    in_reply_to: Optional[int]
+    command: str
+
+
 @asynccontextmanager
 async def make_graph():
     async with sse_client(
@@ -39,42 +49,38 @@ async def make_graph():
             model = ChatAnthropic(model="claude-3-5-sonnet-latest")
 
             # Create the conversation history
-            async def hydrate_history(state: PullRequestState) -> PullRequestState:
+            async def hydrate_history(input: PullRequestInfo) -> GraphState:
                 """Fetch PR context at the start of the workflow."""
-                owner = state["owner"]
-                repo = state["repo"]
-                pull_number = state["pullNumber"]
-                command = state["command"]
-                in_reply_to = state["in_reply_to"] if "in_reply_to" in state else None
 
                 context_messages = []
 
                 # Fetch PR details
                 tool_result = await session.call_tool(
                     "get_pull_request",
                     {
-                        "owner": owner,
-                        "repo": repo,
-                        "pullNumber": pull_number,
+                        "owner": input.owner,
+                        "repo": input.repo,
+                        "pullNumber": input.pullNumber,
                     },
                 )
 
                 pr_details = json.loads(tool_result.content[0].text)
+                pr_body = pr_details["body"] if "body" in pr_details else ""
 
                 # Add PR details as a system message
                 context_messages.append(
                     {
                         "role": "system",
-                        "content": f"Pull Request #{pull_number} by {pr_details['user']['login']}\nTitle: {pr_details['title']}\nDescription: {pr_details['body']}",
+                        "content": f"Pull Request #{input.pullNumber} by {pr_details['user']['login']}\nTitle: {pr_details['title']}\nDescription: {pr_body}",
                     }
                 )
                 # Fetch PR comments
                 tool_result = await session.call_tool(
                     "get_pull_request_comments",
                     {
-                        "owner": owner,
-                        "repo": repo,
-                        "pullNumber": pull_number,
+                        "owner": input.owner,
+                        "repo": input.repo,
+                        "pullNumber": input.pullNumber,
                     },
                 )
 
@@ -83,12 +89,12 @@ async def hydrate_history(state: PullRequestState) -> PullRequestState:
                 # Add each comment as a user or assistant message
                 for comment in comments:
                     # Bot comments
-                    if comment["body"].startswith("/ai generated"):
+                    if comment["body"].startswith("_/ai generated_\n"):
                         context_messages.append(
                             {
                                 "role": "assistant",
                                 "content": comment["body"]
-                                .replace("/ai generated", "")
+                                .replace("_/ai generated_\n", "")
                                 .strip(),
                             }
                         )
@@ -97,26 +103,27 @@ async def hydrate_history(state: PullRequestState) -> PullRequestState:
                         context_messages.append(
                             {"role": "user", "content": comment["body"].strip()}
                         )
+
                 # Fetch PR review comments
-                review_comments = await session.call_tool(
+                tool_result = await session.call_tool(
                     "get_pull_request_reviews",
                     {
-                        "owner": owner,
-                        "repo": repo,
-                        "pullNumber": pull_number,
+                        "owner": input.owner,
+                        "repo": input.repo,
+                        "pullNumber": input.pullNumber,
                     },
                 )
 
                 review_comments = json.loads(tool_result.content[0].text)
 
                 # Add review comments as messages
                 for comment in review_comments:
-                    if comment["body"].startswith("/ai generated"):
+                    if comment["body"].startswith("_/ai generated_\n"):
                         context_messages.append(
                             {
                                 "role": "assistant",
                                 "content": comment["body"]
-                                .replace("/ai generated", "")
+                                .replace("_/ai generated_\n", "")
                                 .strip(),
                             }
                         )
@@ -127,34 +134,71 @@ async def hydrate_history(state: PullRequestState) -> PullRequestState:
                                 "content": f"Comment on {comment['path']} line {comment['line']}: {comment['body']}",
                             }
                         )
-                    # Add the input message as the last user message
-                    if in_reply_to:
+
+                # Fetch PR review comments
+                tool_result = await session.call_tool(
+                    "get_issue_comments",
+                    {
+                        "owner": input.owner,
+                        "repo": input.repo,
+                        "issue_number": input.pullNumber,
+                        "page": 1,
+                        "per_page": 100
+                    },
+                )
+
+                issue_comments = json.loads(tool_result.content[0].text)
+
+                # Add review comments as messages
+                for comment in issue_comments:
+                    if comment["body"].startswith("_/ai generated_\n"):
                         context_messages.append(
                             {
-                                "role": "user",
-                                "content": f"The command is {command} with review comment id #{in_reply_to}",
+                                "role": "assistant",
+                                "content": comment["body"]
+                                .replace("_/ai generated_\n", "")
+                                .strip(),
                             }
                         )
                     else:
                         context_messages.append(
-                            {
-                                "role": "user",
-                                "content": f"Please {command} this PR and provide detailed feedback.",
-                            }
+                            {"role": "user", "content": comment["body"].strip()}
                         )
 
-                # Update the state with the hydrated conversation history
-                return {**state, "messages": context_messages}
+                # Add the input message as the last user message
+                if input.commentNumber:
+                    context_messages.append(
+                        {
+                            "role": "user",
+                            "content": f"The command is {input.command} with review comment id #{input.commentNumber}",
+                        }
+                    )
+                else:
+                    context_messages.append(
+                        {
+                            "role": "user",
+                            "content": f"Please {input.command} this PR and provide detailed feedback.",
+                        }
+                    )
 
-            def pr_prompt(state: PullRequestState):
+                # Update the state with the hydrated conversation history
+                return {
+                    "owner": input.owner,
+                    "repo": input.repo,
+                    "pull_number": input.pullNumber,
+                    "in_reply_to": input.commentNumber,
+                    "messages": context_messages,
+                }
+
+            def pr_prompt(state: GraphState) -> GraphState:
                 """Create a prompt that incorporates PR data and the requested command."""
                 system_message = f"""You are a professional developer with experience in code reviews and GitHub pull requests.
-                You are working with repo: {state["owner"]}/{state["repo"]}, PR #{state["pullNumber"]}.
+                You are working with repo: {state["owner"]}/{state["repo"]}, PR #{state["pull_number"]}.
 
                 IMPORTANT INSTRUCTIONS:
                 1. ALWAYS get the contents of the changed files in the current PR
                 2. ALWAYS use the contents of the changed files as context when replying to a user command.
-                3. Always start your responses with "/ai generated" to properly tag your comments.
+                3. Always start your responses with "_/ai generated_\n" to properly tag your comments.
                 4. When you reply to a comment, make sure to address the specific request.
                 5. When reviewing code, be thorough but constructive - point out both issues and good practices.
                 6. You MUST use the available tools to post your response as a PR comment or perform the PR code review.
@@ -185,20 +229,20 @@ def pr_prompt(state: PullRequestState):
             # Create the agent node - this will handle both analysis and posting the response
             # using its available GitHub tools
             agent = create_react_agent(
-                model, tools=tools, state_schema=PullRequestState, prompt=pr_prompt
+                model, tools=tools, state_schema=GraphState, prompt=pr_prompt
             )
 
             # Create a simple two-node StateGraph
-            workflow = StateGraph(PullRequestState)
+            workflow = StateGraph(GraphState, input=PullRequestInfo)
 
             # Add nodes
             workflow.add_node("hydrate_history", hydrate_history)
-            workflow.add_node("agent", agent)
+            workflow.add_node("github_agent", agent)
 
-            # Add edges - simple linear flow from context hydration to agent to end
+            # Add edges - simple linear flow from "history hydration" to "GitHub MCP tools agent" to end
             workflow.add_edge("__start__", "hydrate_history")
-            workflow.add_edge("hydrate_history", "agent")
-            workflow.add_edge("agent", END)
+            workflow.add_edge("hydrate_history", "github_agent")
+            workflow.add_edge("github_agent", END)
 
             # Compile the graph
             graph = workflow.compile()

samples/github-helper-agent/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "github-helper-agent"
-version = "0.0.1"
+version = "0.0.5"
 description = "An automated agent that reviews GitHub pull requests and provides feedback"
 authors = [{ name = "Cristi Pufu", email = "[email protected]" }]
 dependencies = [