Merge pull request #40 from lbarcziova/compose-refactor

Split into 3-container agent architecture for local development

Author: lbarcziova

beeai/Makefile

@@ -7,49 +7,19 @@ COMPOSE ?= $(shell command -v podman >/dev/null 2>&1 && echo "podman compose" ||
 build:
 	$(COMPOSE) -f $(COMPOSE_FILE) build
 
-.PHONY: start-mcp
-start-mcp:
-	$(COMPOSE) -f $(COMPOSE_FILE) up -d mcp-atlassian
-
-.PHONY: stop-mcp
-stop-mcp:
-	$(COMPOSE) -f $(COMPOSE_FILE) stop mcp-atlassian
-
-.PHONY: start-valkey
-start-valkey:
-	$(COMPOSE) -f $(COMPOSE_FILE) up -d valkey
-
-.PHONY: stop-valkey
-stop-valkey:
-	$(COMPOSE) -f $(COMPOSE_FILE) stop valkey
-
-.PHONY: start-phoenix
-start-phoenix:
-	$(COMPOSE) -f $(COMPOSE_FILE) up -d phoenix
-
-.PHONY: stop-phoenix
-stop-phoenix:
-	$(COMPOSE) -f $(COMPOSE_FILE) stop phoenix
 
 .PHONY: run-beeai-bash
 run-beeai-bash:
-	$(COMPOSE) -f $(COMPOSE_FILE) run --rm beeai-agent /bin/bash
+	$(COMPOSE) -f $(COMPOSE_FILE) run --rm triage-agent /bin/bash
 
 .PHONY: run-triage-agent-standalone
 run-triage-agent-standalone:
 	$(COMPOSE) -f $(COMPOSE_FILE) run --rm \
 		-e JIRA_ISSUE=$(JIRA_ISSUE) \
-		beeai-agent /usr/bin/python agents/triage_agent.py
+		triage-agent
+
 
-.PHONY: run-triage-agent
-run-triage-agent:
-	$(COMPOSE) -f $(COMPOSE_FILE) run --rm \
-		beeai-agent /usr/bin/python agents/triage_agent.py
 
-.PHONY: run-triage-agent-detached
-run-triage-agent-detached:
-	$(COMPOSE) -f $(COMPOSE_FILE) run --rm --detach \
-		beeai-agent /usr/bin/python agents/triage_agent.py
 
 .PHONY: run-rebase-agent-standalone
 run-rebase-agent-standalone:
@@ -58,17 +28,11 @@ run-rebase-agent-standalone:
 		-e VERSION=$(VERSION) \
 		-e JIRA_ISSUE=$(JIRA_ISSUE) \
 		-e BRANCH=$(BRANCH) \
-		beeai-agent /usr/bin/python agents/rebase_agent.py
+		rebase-agent
+
+
 
-.PHONY: run-rebase-agent
-run-rebase-agent:
-	$(COMPOSE) -f $(COMPOSE_FILE) run --rm \
-		beeai-agent /usr/bin/python agents/rebase_agent.py
 
-.PHONY: run-rebase-agent-detached
-run-rebase-agent-detached:
-	$(COMPOSE) -f $(COMPOSE_FILE) run --rm --detach \
-		beeai-agent /usr/bin/python agents/rebase_agent.py
 
 .PHONY: run-backport-agent-standalone
 run-backport-agent-standalone:
@@ -77,17 +41,57 @@ run-backport-agent-standalone:
 		-e UPSTREAM_FIX=$(UPSTREAM_FIX) \
 		-e JIRA_ISSUE=$(JIRA_ISSUE) \
 		-e BRANCH=$(BRANCH) \
-		beeai-agent /usr/bin/python agents/backport_agent.py
+		backport-agent
 
-.PHONY: run-backport-agent
-run-backport-agent:
-	$(COMPOSE) -f $(COMPOSE_FILE) run --rm \
-		beeai-agent /usr/bin/python agents/backport_agent.py
 
-.PHONY: run-backport-agent-detached
-run-backport-agent-detached:
-	$(COMPOSE) -f $(COMPOSE_FILE) run --rm --detach \
-		beeai-agent /usr/bin/python agents/backport_agent.py
+
+
+
+# Essential 3-Agent Architecture Targets
+
+.PHONY: start
+start:
+	$(COMPOSE) -f $(COMPOSE_FILE) up
+
+.PHONY: start-detached
+start-detached:
+	$(COMPOSE) -f $(COMPOSE_FILE) up -d
+
+.PHONY: stop
+stop:
+	$(COMPOSE) -f $(COMPOSE_FILE) down
+
+
+
+.PHONY: logs-triage
+logs-triage:
+	$(COMPOSE) -f $(COMPOSE_FILE) logs -f triage-agent
+
+.PHONY: logs-backport
+logs-backport:
+	$(COMPOSE) -f $(COMPOSE_FILE) logs -f backport-agent
+
+.PHONY: logs-rebase
+logs-rebase:
+	$(COMPOSE) -f $(COMPOSE_FILE) logs -f rebase-agent
+
+.PHONY: status
+status:
+	$(COMPOSE) -f $(COMPOSE_FILE) ps
+
+.PHONY: trigger-pipeline
+trigger-pipeline:
+	@if [ -z "$(JIRA_ISSUE)" ]; then \
+		echo "Usage: make trigger-pipeline JIRA_ISSUE=RHEL-12345"; \
+		exit 1; \
+	fi
+	@echo "Triggering pipeline for issue: $(JIRA_ISSUE)"
+	$(COMPOSE) -f $(COMPOSE_FILE) exec valkey redis-cli LPUSH triage_queue '{"metadata": {"issue": "$(JIRA_ISSUE)"}}'
+
+.PHONY: redis-cli
+redis-cli:
+	$(COMPOSE) -f $(COMPOSE_FILE) exec valkey redis-cli
+
 
 .PHONY: clean
 clean:

beeai/README.md

@@ -3,26 +3,44 @@
 A set of AI agents implemented in the BeeAI Framework, interconnected via Redis.
 Every agent can run individually or pick up tasks from a Redis queue.
 
+## Architecture
+
+Three agents process tasks through Redis queues:
+- **Triage Agent**: Analyzes JIRA issues and determines resolution path
+- **Rebase Agent**: Updates packages to newer upstream versions
+- **Backport Agent**: Applies specific fixes/patches to packages
+
 ## Setup
 
 Copy the `templates` directory to `.secrets` and fill in required information.
 
-## Running the workflow
+## Running as a service
 
-Start the agents using e.g. `make run-triage-agent` or `make run-triage-agent-detached`. This will automatically
-start all the related services. There is currently no mechanism to initiate the workflow other than manually
-pushing a task to the `triage_queue` Redis list. The easiest way to do that is with:
+The agents run continuously, waiting for work from Redis queues. To process a JIRA issue:
 
+**Step 1: Start the system** (if not already running)
 ```bash
-podman compose exec valkey -- redis-cli lpush triage_queue '{"metadata":{"issue":"RHEL-12345"}}'
+make start
+```
+
+This runs the services in the foreground, showing logs for monitoring and debugging. If you prefer to run the services in the background, use `make start-detached` instead.
+
+**Step 2: Trigger work**
+```bash
+make trigger-pipeline JIRA_ISSUE=RHEL-12345
 ```
 
 ## Running individual agents
 
-You can run any agent individually with the appropriate make target, passing required input data
-via environment variables, e.g. `make JIRA_ISSUE=RHEL-12345 run-triage-agent-standalone`.
+You can run any agent individually with the appropriate make target, passing required input data via environment variables, e.g. `make JIRA_ISSUE=RHEL-12345 run-triage-agent-standalone`.
 The agent will run only once, print its output and exit.
 
+```bash
+make JIRA_ISSUE=RHEL-12345 run-triage-agent-standalone
+make PACKAGE=httpd VERSION=2.4.62 JIRA_ISSUE=RHEL-12345 BRANCH=c10s run-rebase-agent-standalone
+make PACKAGE=httpd UPSTREAM_FIX=https://github.com/... JIRA_ISSUE=RHEL-12345 BRANCH=c10s run-backport-agent-standalone
+```
+
 ## Observability
 
 You can connect to http://localhost:6006/ to access Phoenix web interface and trace agents

beeai/compose.yaml

@@ -1,3 +1,24 @@
+# Base template for BeeAI agents
+x-beeai-agent: &beeai-agent
+  depends_on:
+    - mcp-atlassian
+    - valkey
+    - phoenix
+  image: beeai-agent
+  build:
+    context: .
+    dockerfile: Containerfile
+  environment:
+    - MCP_JIRA_URL=http://mcp-atlassian:9000/sse
+    - REDIS_URL=redis://valkey:6379/0
+    - COLLECTOR_ENDPOINT=http://phoenix:6006/v1/traces
+    - MAX_RETRIES=3
+  env_file:
+    - .secrets/beeai-agent.env
+  volumes:
+    - ./agents:/home/beeai/agents:ro,z
+  restart: unless-stopped
+
 services:
   mcp-atlassian:
     image: ghcr.io/sooperset/mcp-atlassian:latest
@@ -22,26 +43,17 @@ services:
       - phoenix-data:/mnt/data
     restart: unless-stopped
 
-  beeai-agent:
-    depends_on:
-      - mcp-atlassian
-      - valkey
-      - phoenix
-    image: beeai-agent
-    build:
-      context: .
-      dockerfile: Containerfile
-    environment:
-      - MCP_JIRA_URL=http://mcp-atlassian:9000/sse
-      - REDIS_URL=redis://valkey:6379/0
-      - COLLECTOR_ENDPOINT=http://phoenix:6006/v1/traces
-    env_file:
-      - .secrets/beeai-agent.env
-    volumes:
-      - ./agents:/home/beeai/agents:ro,z
-    stdin_open: true
-    tty: true
-    restart: "no"
+  triage-agent:
+    <<: *beeai-agent
+    command: ["python", "agents/triage_agent.py"]
+
+  backport-agent:
+    <<: *beeai-agent
+    command: ["python", "agents/backport_agent.py"]
+
+  rebase-agent:
+    <<: *beeai-agent
+    command: ["python", "agents/rebase_agent.py"]
 
 volumes:
   valkey-data:

beeai/templates/mcp-atlassian.env

@@ -1,2 +1,2 @@
-JIRA_URL=
+JIRA_URL=https://issues.redhat.com
 JIRA_PERSONAL_TOKEN=