Merge pull request #56 from nforro/tools

Tools implementation #2

Author: nforro

beeai/Containerfile

@@ -8,6 +8,7 @@ RUN dnf -y install \
       python3 \
       python3-pip \
       python3-redis \
+      python3-specfile \
       rpmbuild \
       rpmdevtools \
       rpmlint \

beeai/Containerfile.mcp

@@ -5,6 +5,10 @@ RUN dnf -y install \
       python3 \
       python3-pip \
       python3-ogr \
+      python3-requests \
+      krb5-libs \
+      krb5-workstation \
+      centpkg \
       git \
     && dnf clean all
 
@@ -15,9 +19,9 @@ RUN pip3 install --no-cache-dir fastmcp
 RUN useradd -m -G wheel mcp
 
 # Create directories
-# `/home/mcp/mcp_servers/` should be directly copied for Openshift deployment
+# `/home/mcp/mcp_server/` should be directly copied for Openshift deployment
 # although it is locally mounted through a volume
-COPY mcp_servers/ /home/mcp/mcp_servers/
+COPY mcp_server/ /home/mcp/mcp_server/
 RUN chgrp -R root /home/mcp && chmod -R g+rwX /home/mcp
 
 USER mcp

beeai/Containerfile.tests

@@ -5,6 +5,7 @@ RUN dnf -y install \
       make \
       python3 \
       python3-ogr \
+      python3-specfile \
       python3-pip \
       python3-pytest \
       python3-pytest-asyncio \

beeai/Makefile.tests

@@ -11,7 +11,7 @@ build-test-image:
 check:
 	cd ./agents && \
 	PYTHONPATH=$(CURDIR) PYTHONDONTWRITEBYTECODE=1 python3 -m pytest --verbose --showlocals $(TEST_TARGET)
-	cd ./mcp_servers && \
+	cd ./mcp_server && \
 	PYTHONPATH=$(CURDIR) PYTHONDONTWRITEBYTECODE=1 python3 -m pytest --verbose --showlocals $(TEST_TARGET)
 
 .PHONY: check-in-container

beeai/agents/backport_agent.py

@@ -22,7 +22,7 @@
 from base_agent import BaseAgent, TInputSchema, TOutputSchema
 from constants import COMMIT_PREFIX, BRANCH_PREFIX
 from observability import setup_observability
-from tools.shell_command import ShellCommandTool
+from tools.commands import RunShellCommandTool
 from triage_agent import BackportData, ErrorData
 from utils import mcp_tools, redis_client, get_git_finalization_steps
 
@@ -63,7 +63,7 @@ class BackportAgent(BaseAgent):
     def __init__(self) -> None:
         super().__init__(
             llm=ChatModel.from_name(os.getenv("CHAT_MODEL")),
-            tools=[ThinkTool(), ShellCommandTool(), DuckDuckGoSearchTool()],
+            tools=[ThinkTool(), RunShellCommandTool(), DuckDuckGoSearchTool()],
             memory=UnconstrainedMemory(),
             requirements=[
                 ConditionalRequirement(ThinkTool, force_after=Tool, consecutive_allowed=False),
@@ -145,16 +145,20 @@ def prompt(self) -> str:
         """
 
     async def run_with_schema(self, input: TInputSchema) -> TOutputSchema:
-        async with mcp_tools(os.getenv("MCP_GITLAB_URL")) as gitlab_tools:
+        async with mcp_tools(
+            os.getenv("MCP_GATEWAY_URL"),
+            filter=lambda t: t
+            in ("fork_repository", "open_merge_request", "push_to_remote_repository"),
+        ) as gateway_tools:
             tools = self._tools.copy()
             try:
-                self._tools.extend(gitlab_tools)
+                self._tools.extend(gateway_tools)
                 return await self._run_with_schema(input)
             finally:
                 self._tools = tools
                 # disassociate removed tools from requirements
                 for requirement in self._requirements:
-                    if requirement._source_tool in gitlab_tools:
+                    if requirement._source_tool in gateway_tools:
                         requirement._source_tool = None
 
 

beeai/agents/rebase_agent.py

@@ -22,7 +22,7 @@
 from base_agent import BaseAgent, TInputSchema, TOutputSchema
 from constants import COMMIT_PREFIX, BRANCH_PREFIX
 from observability import setup_observability
-from tools.shell_command import ShellCommandTool
+from tools.commands import RunShellCommandTool
 from triage_agent import RebaseData, ErrorData
 from utils import mcp_tools, redis_client, get_git_finalization_steps
 
@@ -62,7 +62,7 @@ class RebaseAgent(BaseAgent):
     def __init__(self) -> None:
         super().__init__(
             llm=ChatModel.from_name(os.getenv("CHAT_MODEL")),
-            tools=[ThinkTool(), ShellCommandTool(), DuckDuckGoSearchTool()],
+            tools=[ThinkTool(), RunShellCommandTool(), DuckDuckGoSearchTool()],
             memory=UnconstrainedMemory(),
             requirements=[
                 ConditionalRequirement(ThinkTool, force_after=Tool, consecutive_allowed=False),
@@ -122,9 +122,9 @@ def prompt(self) -> str:
           * Do not run the `centpkg new-sources` command for now (testing purposes), just write down the commands you would run.
 
           IMPORTANT GUIDELINES:
-          - **Tool Usage**: You have ShellCommand tool available - use it directly!
+          - **Tool Usage**: You have run_shell_command tool available - use it directly!
           - **Command Execution Rules**:
-            - Use ShellCommand tool for ALL command execution
+            - Use run_shell_command tool for ALL command execution
             - If a command shows "no output" or empty STDOUT, that is a VALID result - do not retry
             - Commands that succeed with no output are normal - report success
           - **Git Configuration**: Always configure git user name and email before any git operations
@@ -174,16 +174,20 @@ def prompt(self) -> str:
         """
 
     async def run_with_schema(self, input: TInputSchema) -> TOutputSchema:
-        async with mcp_tools(os.getenv("MCP_GITLAB_URL")) as gitlab_tools:
+        async with mcp_tools(
+            os.getenv("MCP_GATEWAY_URL"),
+            filter=lambda t: t
+            in ("fork_repository", "open_merge_request", "push_to_remote_repository"),
+        ) as gateway_tools:
             tools = self._tools.copy()
             try:
-                self._tools.extend(gitlab_tools)
+                self._tools.extend(gateway_tools)
                 return await self._run_with_schema(input)
             finally:
                 self._tools = tools
                 # disassociate removed tools from requirements
                 for requirement in self._requirements:
-                    if requirement._source_tool in gitlab_tools:
+                    if requirement._source_tool in gateway_tools:
                         requirement._source_tool = None
 
 

beeai/agents/tests/unit/test_tools.py

@@ -1,8 +1,19 @@
+import datetime
+from textwrap import dedent
+
 import pytest
+from flexmock import flexmock
+from specfile import specfile
 
 from beeai_framework.middleware.trajectory import GlobalTrajectoryMiddleware
 
-from tools.shell_command import ShellCommandTool, ShellCommandToolInput
+from tools.commands import RunShellCommandTool, RunShellCommandToolInput
+from tools.specfile import (
+    AddChangelogEntryTool,
+    AddChangelogEntryToolInput,
+    BumpReleaseTool,
+    BumpReleaseToolInput,
+)
 
 
 @pytest.mark.parametrize(
@@ -29,12 +40,74 @@
     ],
 )
 @pytest.mark.asyncio
-async def test_shell_command(command, exit_code, stdout, stderr):
-    tool = ShellCommandTool()
-    output = await tool.run(input=ShellCommandToolInput(command=command)).middleware(
+async def test_run_shell_command(command, exit_code, stdout, stderr):
+    tool = RunShellCommandTool()
+    output = await tool.run(input=RunShellCommandToolInput(command=command)).middleware(
         GlobalTrajectoryMiddleware(pretty=True)
     )
     result = output.to_json_safe()
     assert result.exit_code == exit_code
     assert result.stdout == stdout
     assert result.stderr == stderr
+
+
+@pytest.fixture
+def minimal_spec(tmp_path):
+    spec = tmp_path / "test.spec"
+    spec.write_text(
+        dedent(
+            """
+            Name:           test
+            Version:        0.1
+            Release:        2%{?dist}
+            Summary:        Test package
+
+            License:        MIT
+
+            %description
+            Test package
+
+            %changelog
+            * Thu Jun 07 2018 Nikola Forró <[email protected]> - 0.1-1
+            - first version
+            """
+        )
+    )
+    return spec
+
+
+@pytest.mark.asyncio
+async def test_add_changelog_entry(minimal_spec):
+    content = ["- some change", "  second line"]
+    author = "rhel-packaging-agent"
+    email = "[email protected]"
+    flexmock(specfile).should_receive("datetime").and_return(
+        flexmock(
+            datetime=flexmock(now=lambda _: flexmock(date=lambda: datetime.date(2025, 8, 5))),
+            timezone=flexmock(utc=None),
+        )
+    )
+    tool = AddChangelogEntryTool()
+    output = await tool.run(
+        input=AddChangelogEntryToolInput(spec=minimal_spec, content=content, author=author, email=email)
+    ).middleware(GlobalTrajectoryMiddleware(pretty=True))
+    result = output.result
+    assert not result
+    assert minimal_spec.read_text().splitlines()[-7:-2] == [
+        "%changelog",
+        "* Tue Aug 05 2025 rhel-packaging-agent <[email protected]> - 0.1-2",
+        "- some change",
+        "  second line",
+        "",
+    ]
+
+
+@pytest.mark.asyncio
+async def test_bump_release(minimal_spec):
+    tool = BumpReleaseTool()
+    output = await tool.run(input=BumpReleaseToolInput(spec=minimal_spec)).middleware(
+        GlobalTrajectoryMiddleware(pretty=True)
+    )
+    result = output.result
+    assert not result
+    assert minimal_spec.read_text().splitlines()[3] == "Release:        3%{?dist}"

beeai/agents/tools/shell_command.py renamed to beeai/agents/tools/commands.py

@@ -8,37 +8,37 @@
 from beeai_framework.tools import JSONToolOutput, Tool, ToolRunOptions
 
 
-class ShellCommandToolInput(BaseModel):
-    command: str = Field(description="Command to run.")
+class RunShellCommandToolInput(BaseModel):
+    command: str = Field(description="Command to run")
 
 
-class ShellCommandToolResult(BaseModel):
+class RunShellCommandToolResult(BaseModel):
     exit_code: int
     stdout: str | None
     stderr: str | None
 
 
-class ShellCommandToolOutput(JSONToolOutput[ShellCommandToolResult]):
+class RunShellCommandToolOutput(JSONToolOutput[RunShellCommandToolResult]):
     pass
 
 
-class ShellCommandTool(Tool[ShellCommandToolInput, ToolRunOptions, ShellCommandToolOutput]):
-    name = "ShellCommand"
-    description = """Runs commands in a shell."""
-    input_schema = ShellCommandToolInput
-
-    def __init__(self, options: dict[str, Any] | None = None) -> None:
-        super().__init__(options)
+class RunShellCommandTool(Tool[RunShellCommandToolInput, ToolRunOptions, RunShellCommandToolOutput]):
+    name = "run_shell_command"
+    description = """
+        Runs the specified command in a shell. Returns a dictionary with exit code
+        and captured stdout and stderr.
+    """
+    input_schema = RunShellCommandToolInput
 
     def _create_emitter(self) -> Emitter:
         return Emitter.root().child(
-            namespace=["tool", "shell", "command"],
+            namespace=["tool", "commands", self.name],
             creator=self,
         )
 
     async def _run(
-        self, tool_input: ShellCommandToolInput, options: ToolRunOptions | None, context: RunContext
-    ) -> ShellCommandToolOutput:
+        self, tool_input: RunShellCommandToolInput, options: ToolRunOptions | None, context: RunContext
+    ) -> RunShellCommandToolOutput:
         proc = await asyncio.create_subprocess_shell(
             tool_input.command,
             stdout=asyncio.subprocess.PIPE,
@@ -53,4 +53,4 @@ async def _run(
             "stderr": stderr.decode() if stderr else None,
         }
 
-        return ShellCommandToolOutput(ShellCommandToolResult.model_validate(result))
+        return RunShellCommandToolOutput(RunShellCommandToolResult.model_validate(result))

beeai/agents/tools/specfile.py

@@ -0,0 +1,79 @@
+import asyncio
+from pathlib import Path
+from typing import Any
+
+from pydantic import BaseModel, Field
+from specfile import Specfile
+
+from beeai_framework.context import RunContext
+from beeai_framework.emitter import Emitter
+from beeai_framework.tools import StringToolOutput, Tool, ToolRunOptions
+
+
+# version update & release reset ?
+# patch addition ?
+
+
+class AddChangelogEntryToolInput(BaseModel):
+    spec: Path = Field(description="Absolute path to a spec file")
+    content: list[str] = Field(
+        description="""
+        Content of the entry as a list of lines, maximum line length should be 80 characters,
+        every paragraph should start with "- "
+        """
+    )
+    author: str = Field(description="Author of the entry (change)")
+    email: str = Field(description="E-mail address of the author")
+
+
+class AddChangelogEntryTool(Tool[AddChangelogEntryToolInput, ToolRunOptions, StringToolOutput]):
+    name = "add_changelog_entry"
+    description = """
+    Adds a new changelog entry to the specified spec file. Returns error message on failure.
+    """
+    input_schema = AddChangelogEntryToolInput
+
+    def _create_emitter(self) -> Emitter:
+        return Emitter.root().child(
+            namespace=["tool", "specfile", self.name],
+            creator=self,
+        )
+
+    async def _run(
+        self, tool_input: AddChangelogEntryToolInput, options: ToolRunOptions | None, context: RunContext
+    ) -> StringToolOutput:
+        try:
+            with Specfile(tool_input.spec) as spec:
+                spec.add_changelog_entry(tool_input.content, author=tool_input.author, email=tool_input.email)
+        except Exception as e:
+            return StringToolOutput(result=f"Failed to add changelog entry: {e}")
+        return StringToolOutput()
+
+
+class BumpReleaseToolInput(BaseModel):
+    spec: Path = Field(description="Absolute path to a spec file")
+
+
+class BumpReleaseTool(Tool[BumpReleaseToolInput, ToolRunOptions, StringToolOutput]):
+    name = "bump_release"
+    description = """
+    Bumps (increments) the value of `Release` in the specified spec file.
+    Returns error message on failure.
+    """
+    input_schema = BumpReleaseToolInput
+
+    def _create_emitter(self) -> Emitter:
+        return Emitter.root().child(
+            namespace=["tool", "specfile", self.name],
+            creator=self,
+        )
+
+    async def _run(
+        self, tool_input: BumpReleaseToolInput, options: ToolRunOptions | None, context: RunContext
+    ) -> StringToolOutput:
+        try:
+            with Specfile(tool_input.spec) as spec:
+                spec.bump_release()
+        except Exception as e:
+            return StringToolOutput(result=f"Failed to bump release: {e}")
+        return StringToolOutput()