Add reporting in Jira about agent actions

Resolves: packit/jotnar#72

Signed-off-by: Siteshwar Vashisht <svashisht@redhat.com>

Author: siteshwar

beeai/agents/backport_agent.py

@@ -1,9 +1,11 @@
 import asyncio
 import logging
 import os
+from shutil import rmtree
 import subprocess
 import sys
 import traceback
+
 from pathlib import Path
 
 from pydantic import BaseModel, Field
@@ -30,7 +32,7 @@
 from tools.text import CreateTool, InsertTool, StrReplaceTool, ViewTool
 from tools.wicked_git import GitLogSearchTool, GitPatchCreationTool
 from triage_agent import BackportData, ErrorData
-from utils import check_subprocess, get_agent_execution_config, mcp_tools, redis_client
+from utils import check_subprocess, get_agent_execution_config, mcp_tools, redis_client, post_private_jira_comment
 
 logger = logging.getLogger(__name__)
 
@@ -274,6 +276,19 @@ async def retry(task, error):
                     logger.info(
                         f"Backport processing completed for {backport_data.jira_issue}, " f"success: {state.backport_result.success}"
                     )
+
+                    agent_type = "Backport"
+                    if state.backport_result.success:
+                        logger.info(f"Updating JIRA {backport_data.jira_issue} with {state.backport_result.mr_url} ")
+
+                        await post_private_jira_comment(gateway_tools, backport_data.jira_issue, agent_type, state.backport_result.mr_url)
+                    else:
+                        logger.info(f"Agent failed to perform a backport for {backport_data.jira_issue}.")
+                        await post_private_jira_comment(gateway_tools, backport_data.jira_issue, agent_type,
+                                                        "Agent failed to perform a backport: {state.backport_result.error}")
+
+
+
                 except Exception as e:
                     error = "".join(traceback.format_exception(e))
                     logger.error(f"Exception during backport processing for {backport_data.jira_issue}: {error}")

beeai/agents/constants.py

@@ -1,4 +1,9 @@
+from string import Template
 
 COMMIT_PREFIX = "[DO NOT MERGE: AI EXPERIMENTS]"
 
 BRANCH_PREFIX = "automated-package-update"
+
+AGENT_WARNING = "Warning: This is an AI-Generated contribution and may contain mistakes. Please carefully review the contributions made by AI agents."
+
+JIRA_COMMENT_TEMPLATE = Template(f"""Output from $AGENT_TYPE Agent: $JIRA_COMMENT\n\n{AGENT_WARNING}""")

beeai/agents/rebase_agent.py

@@ -28,7 +28,7 @@
 from tools.specfile import AddChangelogEntryTool
 from tools.text import CreateTool, InsertTool, StrReplaceTool, ViewTool
 from triage_agent import RebaseData, ErrorData
-from utils import get_agent_execution_config, mcp_tools, redis_client, run_tool
+from utils import get_agent_execution_config, mcp_tools, redis_client, run_tool, post_private_jira_comment
 
 logger = logging.getLogger(__name__)
 
@@ -279,6 +279,16 @@ async def retry(task, error):
                     logger.info(
                         f"Rebase processing completed for {rebase_data.jira_issue}, " f"success: {state.rebase_result.success}"
                     )
+
+                    agent_type = "Rebase"
+                    if state.rebase_result.success:
+                        logger.info(f"Updating JIRA {rebase_data.jira_issue} with {state.rebase_result.mr_url} ")
+                        await post_private_jira_comment(gateway_tools, rebase_data.jira_issue, agent_type, state.rebase_result.mr_url)
+                    else:
+                        logger.info(f"Agent failed to perform a rebase for {rebase_data.jira_issue}.")
+                        await post_private_jira_comment(gateway_tools, rebase_data.jira_issue, agent_type,
+                                                        "Agent failed to perform a rebase: {state.rebase_result.error}")
+
                 except Exception as e:
                     error = "".join(traceback.format_exception(e))
                     logger.error(f"Exception during rebase processing for {rebase_data.jira_issue}: {error}")

beeai/agents/triage_agent.py

@@ -24,7 +24,7 @@
 from tools.commands import RunShellCommandTool
 from tools.patch_validator import PatchValidatorTool
 from tools.version_mapper import VersionMapperTool
-from utils import get_agent_execution_config, mcp_tools, redis_client
+from utils import get_agent_execution_config, mcp_tools, redis_client, post_private_jira_comment
 
 logger = logging.getLogger(__name__)
 
@@ -331,14 +331,20 @@ async def retry(task, error):
 
                 try:
                     logger.info(f"Starting triage processing for {input.issue}")
+
+                    # await post_private_jira_comment(gateway_tools, input.issue, "Starting ...")
+
                     output = await run(input)
                     logger.info(
                         f"Triage processing completed for {input.issue}, " f"resolution: {output.resolution.value}"
                     )
-                    # tool = next(t for t in gateway_tools if t.name == "add_jira_comment")
-                    # await tool.run(input={"issue_key": input.issue, "comment": "..."}).middleware(
-                    #    GlobalTrajectoryMiddleware(pretty=True)
-                    # )
+
+                    agent_type = "Triage"
+                    if output.resolution.value == "clarification-needed":
+                        await post_private_jira_comment(gateway_tools, input.issue, agent_type, output.data.additional_info_needed)
+                    elif output.resolution.value == "no-action":
+                        await post_private_jira_comment(gateway_tools, input.issue, agent_type, output.data.reasoning)
+
                 except Exception as e:
                     error = "".join(traceback.format_exception(e))
                     logger.error(f"Exception during triage processing for {input.issue}: {error}")

beeai/agents/utils.py

@@ -1,4 +1,5 @@
 import asyncio
+import logging
 import os
 import shlex
 import subprocess
@@ -16,6 +17,7 @@
 from beeai_framework.tools import Tool
 from beeai_framework.tools.mcp import MCPTool
 
+from constants import JIRA_COMMENT_TEMPLATE
 
 def get_agent_execution_config() -> AgentExecutionConfig:
     return AgentExecutionConfig(
@@ -104,3 +106,25 @@ async def mcp_tools(
         if filter:
             tools = [t for t in tools if filter(t.name)]
         yield tools
+
+async def post_private_jira_comment(gateway_tools: list, issue_key: str, agent_type: str, comment: str):
+    """Finds the Jira comment tool and posts a comment to the specified issue."""
+
+    logger = logging.getLogger(__name__)
+
+    dry_run = os.getenv("DRY_RUN", "False").lower() == "true"
+
+    if not dry_run:
+        try:
+            comment_tool = next(t for t in gateway_tools if t.name == "add_private_jira_comment")
+            await comment_tool.run(
+                input={
+                    "issue_key": issue_key,
+                    "comment": JIRA_COMMENT_TEMPLATE.substitute({"AGENT_TYPE": agent_type,
+                                                                 "JIRA_COMMENT": comment}),
+                }
+            ).middleware(GlobalTrajectoryMiddleware(pretty=True))
+        except StopIteration:
+            logger.error("Jira comment tool not found in gateway tools.")
+        except Exception as e:
+            logger.error(f"Failed to post Jira comment for issue {issue_key}: {e}")

beeai/mcp_server/jira_tools.py

@@ -153,3 +153,25 @@ def add_jira_comment(
     except requests.RequestException as e:
         return f"Failed to add the specified comment: {e}"
     return f"Successfully added the specified comment to {issue_key}"
+
+def add_private_jira_comment(
+    issue_key: Annotated[str, Field(description="Jira issue key (e.g. RHEL-12345)")],
+    comment: Annotated[str, Field(description="Comment text to add")],
+) -> str:
+    """
+    Adds a private comment to the specified Jira issue.
+    """
+
+    if os.getenv("DRY_RUN", "False").lower() == "true":
+        return "Dry run, not adding private comment"
+
+    try:
+        response = requests.post(
+            urljoin(os.getenv("JIRA_URL"), f"rest/api/2/issue/{issue_key}/comment"),
+            json={"body": comment, "visibility": {"type":"group", "value":"Red Hat Employee"}},
+            headers=_get_jira_headers(os.getenv("JIRA_TOKEN")),
+        )
+        response.raise_for_status()
+    except requests.RequestException as e:
+        return f"Failed to add the specified comment: {e}"
+    return f"Successfully added the specified comment to {issue_key}"