Merge pull request #41 from nforro/tools

beeai: tools implementation

Author: nforro

beeai/Containerfile

@@ -2,23 +2,22 @@ FROM fedora:42
 
 # Install system dependencies
 RUN dnf -y install \
-    centpkg \
-    curl \
-    git \
-    glab \
-    python3 \
-    python3-pip \
-    python3-redis \
-    rpmbuild \
-    rpmdevtools \
-    rpmlint \
-    spectool \
+      centpkg \
+      curl \
+      git \
+      python3 \
+      python3-pip \
+      python3-redis \
+      rpmbuild \
+      rpmdevtools \
+      rpmlint \
+      spectool \
     && dnf -y clean all
 
 COPY beeai-gemini.patch /tmp
 
 # Install BeeAI Framework and Phoenix
-RUN pip3 install \
+RUN pip3 install --no-cache-dir \
     beeai-framework[mcp,duckduckgo]==0.1.31 \
     openinference-instrumentation-beeai \
     arize-phoenix-otel \

beeai/Containerfile.mcp

@@ -0,0 +1,26 @@
+FROM fedora:42
+
+# Install system dependencies
+RUN dnf -y install \
+      python3 \
+      python3-pip \
+      python3-ogr \
+      git \
+    && dnf clean all
+
+# Install FastMCP
+RUN pip3 install --no-cache-dir fastmcp
+
+# Create user
+RUN useradd -m -G wheel mcp
+
+# Create directories
+# `/home/mcp/mcp_servers/` should be directly copied for Openshift deployment
+# although it is locally mounted through a volume
+COPY mcp_servers/ /home/mcp/mcp_servers/
+RUN chgrp -R root /home/mcp && chmod -R g+rwX /home/mcp
+
+USER mcp
+WORKDIR /home/mcp
+
+CMD ["/bin/bash"]

beeai/Containerfile.tests

@@ -0,0 +1,17 @@
+FROM fedora:42
+
+# Install system dependencies
+RUN dnf -y install \
+      make \
+      python3 \
+      python3-ogr \
+      python3-pip \
+      python3-pytest \
+      python3-pytest-asyncio \
+      python3-flexmock \ 
+    && dnf clean all
+
+# Install BeeAI Framework and FastMCP
+RUN pip3 install --no-cache-dir beeai-framework fastmcp
+
+WORKDIR /src

beeai/Makefile

@@ -99,3 +99,12 @@ redis-cli:
 .PHONY: clean
 clean:
 	$(COMPOSE) -f $(COMPOSE_FILE) down --volumes
+
+
+.PHONY: build-test-image
+build-test-image:
+	$(MAKE) -f Makefile.tests build-test-image
+
+.PHONY: check-in-container
+check-in-container:
+	$(MAKE) -f Makefile.tests check-in-container

beeai/Makefile.tests

@@ -0,0 +1,19 @@
+TEST_IMAGE ?= beeai-tests
+TEST_TARGET ?= ./tests/unit
+
+CONTAINER_ENGINE ?= $(shell command -v podman 2>/dev/null || echo "docker")
+
+.PHONY: build-test-image
+build-test-image:
+	$(CONTAINER_ENGINE) build --rm --tag $(TEST_IMAGE) -f Containerfile.tests
+
+.PHONY: check
+check:
+	cd ./agents && \
+	PYTHONPATH=$(CURDIR) PYTHONDONTWRITEBYTECODE=1 python3 -m pytest --verbose --showlocals $(TEST_TARGET)
+	cd ./mcp_servers && \
+	PYTHONPATH=$(CURDIR) PYTHONDONTWRITEBYTECODE=1 python3 -m pytest --verbose --showlocals $(TEST_TARGET)
+
+.PHONY: check-in-container
+check-in-container:
+	$(CONTAINER_ENGINE) run --rm -it -v $(CURDIR):/src:z --env TEST_TARGET $(TEST_IMAGE) make -f Makefile.tests check

beeai/agents/backport_agent.py

@@ -22,9 +22,9 @@
 from base_agent import BaseAgent, TInputSchema, TOutputSchema
 from constants import COMMIT_PREFIX, BRANCH_PREFIX
 from observability import setup_observability
-from tools import ShellCommandTool
+from tools.shell_command import ShellCommandTool
 from triage_agent import BackportData, ErrorData
-from utils import redis_client, get_git_finalization_steps
+from utils import mcp_tools, redis_client, get_git_finalization_steps
 
 logger = logging.getLogger(__name__)
 
@@ -46,6 +46,10 @@ class InputSchema(BaseModel):
     git_email: str = Field(
         description="E-mail address of the git user", default="[email protected]"
     )
+    git_repo_basepath: str = Field(
+        description="Base path for cloned git repos",
+        default=os.getenv("GIT_REPO_BASEPATH"),
+    )
 
 
 class OutputSchema(BaseModel):
@@ -114,9 +118,8 @@ def prompt(self) -> str:
           2. Check if the package {{ package }} already has the fix {{ jira_issue }} applied.
 
           3. Create a local Git repository by following these steps:
-            * Check if the fork already exists for {{ gitlab_user }} as {{ gitlab_user }}/{{ package }} and if not,
-              create a fork of the {{ package }} package using the glab tool.
-            * Clone the fork using git and HTTPS into the temp directory.
+            * Create a fork of the {{ package }} package using the `fork_repository` tool.
+            * Clone the fork using git and HTTPS into a temporary directory under {{ git_repo_basepath }}.
             * Run command `centpkg sources` in the cloned repository which downloads all sources defined in the RPM specfile.
             * Create a new Git branch named `automated-package-update-{{ jira_issue }}`.
 
@@ -141,6 +144,19 @@ def prompt(self) -> str:
           6. {{ backport_git_steps }}
         """
 
+    async def run_with_schema(self, input: TInputSchema) -> TOutputSchema:
+        async with mcp_tools(os.getenv("MCP_GITLAB_URL")) as gitlab_tools:
+            tools = self._tools.copy()
+            try:
+                self._tools.extend(gitlab_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:
+                        requirement._source_tool = None
+
 
 async def main() -> None:
     logging.basicConfig(level=logging.INFO)

beeai/agents/rebase_agent.py

@@ -22,9 +22,9 @@
 from base_agent import BaseAgent, TInputSchema, TOutputSchema
 from constants import COMMIT_PREFIX, BRANCH_PREFIX
 from observability import setup_observability
-from tools import ShellCommandTool
+from tools.shell_command import ShellCommandTool
 from triage_agent import RebaseData, ErrorData
-from utils import redis_client, get_git_finalization_steps
+from utils import mcp_tools, redis_client, get_git_finalization_steps
 
 logger = logging.getLogger(__name__)
 
@@ -45,6 +45,10 @@ class InputSchema(BaseModel):
     git_email: str = Field(
         description="E-mail address of the git user", default="[email protected]"
     )
+    git_repo_basepath: str = Field(
+        description="Base path for cloned git repos",
+        default=os.getenv("GIT_REPO_BASEPATH"),
+    )
 
 
 class OutputSchema(BaseModel):
@@ -113,7 +117,6 @@ def prompt(self) -> str:
           * The Git user's email address is {{ git_email }}
           * Use {{ gitlab_user }} as the GitLab user.
           * Work only in a temporary directory that you can create with the mktemp tool.
-          * To create forks and open merge requests, always use GitLab's `glab` CLI tool.
           * You can find packaging guidelines at https://docs.fedoraproject.org/en-US/packaging-guidelines/
           * You can find the RPM packaging guide at https://rpm-packaging-guide.github.io/.
           * Do not run the `centpkg new-sources` command for now (testing purposes), just write down the commands you would run.
@@ -137,9 +140,8 @@ def prompt(self) -> str:
               * Do not clone any repository for detecting the version in .spec file.
 
           3. Create a local Git repository by following these steps:
-              * Check if the fork already exists for {{ gitlab_user }} as {{ gitlab_user }}/{{ package }} and if not,
-                create a fork of the {{ package }} package using the glab tool.
-              * Clone the fork using git and HTTPS into the temp directory.
+              * Create a fork of the {{ package }} package using the `fork_repository` tool.
+              * Clone the fork using git and HTTPS into a temporary directory under {{ git_repo_basepath }}.
 
           4. Update the {{ package }} to the newer version:
               * Create a new Git branch named `automated-package-update-{{ version }}`.
@@ -171,6 +173,19 @@ def prompt(self) -> str:
           - Any validation issues found with rpmlint
         """
 
+    async def run_with_schema(self, input: TInputSchema) -> TOutputSchema:
+        async with mcp_tools(os.getenv("MCP_GITLAB_URL")) as gitlab_tools:
+            tools = self._tools.copy()
+            try:
+                self._tools.extend(gitlab_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:
+                        requirement._source_tool = None
+
 
 async def main() -> None:
     logging.basicConfig(level=logging.INFO)

beeai/agents/tests/unit/test_tools.py

@@ -0,0 +1,40 @@
+import pytest
+
+from beeai_framework.middleware.trajectory import GlobalTrajectoryMiddleware
+
+from tools.shell_command import ShellCommandTool, ShellCommandToolInput
+
+
+@pytest.mark.parametrize(
+    "command, exit_code, stdout, stderr",
+    [
+        (
+            "exit 28",
+            28,
+            None,
+            None,
+        ),
+        (
+            "echo -n test",
+            0,
+            "test",
+            None,
+        ),
+        (
+            "echo -n error >&2 && false",
+            1,
+            None,
+            "error",
+        ),
+    ],
+)
+@pytest.mark.asyncio
+async def test_shell_command(command, exit_code, stdout, stderr):
+    tool = ShellCommandTool()
+    output = await tool.run(input=ShellCommandToolInput(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