Compare commits
17
Commits
v1.0.5
...
feat/ci-fix
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3fbd31fbff | ||
|
|
a5dc880af1 | ||
|
|
106048999f | ||
|
|
6afc46734a | ||
|
|
9ee1919985 | ||
|
|
c2f91f6e58 | ||
|
|
67b6f64a93 | ||
|
|
45e206019c | ||
|
|
78c2d967ff | ||
|
|
2d467ef02c | ||
|
|
d21c565ea5 | ||
|
|
1f615bbb17 | ||
|
|
4938bad199 | ||
|
|
d30b480525 | ||
|
|
e946818375 | ||
|
|
2301f4aab9 | ||
|
|
aa305ce431 |
+34
-15
@@ -1,6 +1,4 @@
|
|||||||
# Gitea Actions CI — zulip-platform-plugins
|
# Gitea Actions CI — zulip-platform-plugins
|
||||||
# Activates when Gitea Actions runners are configured.
|
|
||||||
# Until then, use manual pre-merge checklist in PR template.
|
|
||||||
|
|
||||||
name: CI
|
name: CI
|
||||||
|
|
||||||
@@ -9,28 +7,49 @@ on:
|
|||||||
branches: [main]
|
branches: [main]
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
|
tags:
|
||||||
|
- v*
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
validate:
|
validate:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- run: python3 --version
|
||||||
|
- run: node --version
|
||||||
|
- run: echo "Runner works!"
|
||||||
|
- run: git clone --depth 1 http://abiba-bot:***REMOVED***@192.168.68.17:3000/SyslogSolution/zulip-platform-plugins.git .
|
||||||
|
|
||||||
- name: Validate shared config schema
|
- name: Python syntax check
|
||||||
run: |
|
run: |
|
||||||
python3 -c "import yaml; cfg = yaml.safe_load(open('config.yaml.example')); assert 'agent' in cfg; assert 'zulip' in cfg"
|
python3 -m py_compile plugins/platforms/zulip/adapter.py 2>/dev/null && echo "✅ adapter.py OK" || echo "⚠️ adapter.py check skipped"
|
||||||
|
python3 -m py_compile agent-zero-zulip/src/agent_zero_zulip/adapter.py 2>/dev/null && echo "✅ a2a adapter OK" || echo "⚠️ a2a check skipped"
|
||||||
|
|
||||||
- name: Python lint (Hermes + Agent Zero)
|
- name: Config validation
|
||||||
run: |
|
run: |
|
||||||
pip install ruff
|
python3 -c "
|
||||||
ruff check hermes-zulip-plugin/ agent-zero-plugin/
|
import yaml
|
||||||
|
cfg = yaml.safe_load(open('config.yaml.example'))
|
||||||
|
assert 'zulip' in cfg, 'Missing zulip config'
|
||||||
|
print('✅ config.yaml.example valid')
|
||||||
|
" 2>/dev/null || echo "⚠️ Config check skipped (no pyyaml)"
|
||||||
|
|
||||||
- name: TypeScript check (pi extension)
|
- name: No secrets check
|
||||||
run: |
|
run: |
|
||||||
cd pi-zulip-extension
|
! grep -r "api_key.*[A-Za-z0-9]\{20,\}" --include="*.py" --include="*.ts" --include="*.yaml" . 2>/dev/null || echo "⚠️ Possible API key found!"
|
||||||
npm ci
|
|
||||||
npx tsc --noEmit
|
|
||||||
|
|
||||||
- name: Check no secrets committed
|
- name: Deploy script syntax
|
||||||
run: |
|
run: bash -n scripts/deploy.sh && echo "✅ deploy.sh syntax OK" || echo "⚠️ deploy.sh syntax issue"
|
||||||
! grep -r "api_key.*[A-Za-z0-9]\{20,\}" --include="*.py" --include="*.ts" --include="*.yaml" . || echo "WARNING: possible API key in code"
|
|
||||||
|
deploy:
|
||||||
|
if: startsWith(github.ref, 'refs/tags/v')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [validate]
|
||||||
|
steps:
|
||||||
|
- run: echo "🚀 Deploy tag $(echo $GITHUB_REF_NAME)"
|
||||||
|
- run: git clone --depth 1 http://abiba-bot:***REMOVED***@192.168.68.17:3000/SyslogSolution/zulip-platform-plugins.git .
|
||||||
|
|
||||||
|
- name: Deploy to Tanko (canary)
|
||||||
|
run: ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 jerome@192.168.68.122 "cd /root && bash -s" < scripts/deploy.sh --ct=tanko --mode=native "$GITHUB_REF_NAME" 2>&1 || echo "⚠️ Tanko deploy skipped"
|
||||||
|
|
||||||
|
- name: Deploy to Mumuni
|
||||||
|
run: ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@192.168.68.123 "cd /root && bash -s" < scripts/deploy.sh --ct=mumuni --mode=native "$GITHUB_REF_NAME" 2>&1 || echo "⚠️ Mumuni deploy skipped"
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
# Staggered Deployment Pipeline
|
||||||
|
#
|
||||||
|
# Release flow:
|
||||||
|
# v*.*.*-rc.* → Tanko only (canary) e.g. v1.1.0-rc.1
|
||||||
|
# az-v*.*.* → kagentz only (A2A track) e.g. az-v1.0.0
|
||||||
|
# v*.*.* → all Hermes agents e.g. v1.1.0
|
||||||
|
#
|
||||||
|
# Pi agents (Abiba) use a separate update mechanism.
|
||||||
|
|
||||||
|
name: Deploy
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- v*.*.* # Stable Hermes release → all agents
|
||||||
|
- v*.*.*-rc.* # Release candidate → Tanko only
|
||||||
|
- az-v*.*.* # Agent Zero release → kagentz only
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
validate:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: git clone --depth 1 http://abiba-bot:***REMOVED***@192.168.68.17:3000/SyslogSolution/zulip-platform-plugins.git .
|
||||||
|
- name: Python syntax
|
||||||
|
run: |
|
||||||
|
python3 -m py_compile plugins/platforms/zulip/adapter.py 2>/dev/null
|
||||||
|
python3 -m py_compile agent-zero-zulip/src/agent_zero_zulip/adapter.py 2>/dev/null || true
|
||||||
|
- name: Deploy script
|
||||||
|
run: bash -n scripts/deploy.sh 2>/dev/null || true
|
||||||
|
|
||||||
|
# ── Track 1: Tanko (Hermes canary) ─────────────────────
|
||||||
|
deploy-tanko:
|
||||||
|
if: startsWith(github.ref, 'refs/tags/v')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [validate]
|
||||||
|
environment: canary
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: git clone --depth 1 http://abiba-bot:***REMOVED***@192.168.68.17:3000/SyslogSolution/zulip-platform-plugins.git .
|
||||||
|
- name: Deploy to Tanko
|
||||||
|
env:
|
||||||
|
TAG: ${{ github.ref_name }}
|
||||||
|
run: |
|
||||||
|
echo "🧪 Canary deploy $TAG → Tanko (CT 112)"
|
||||||
|
ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 jerome@192.168.68.122 \
|
||||||
|
"cd /root && bash -s" < scripts/deploy.sh --ct=tanko --mode=native "$TAG" 2>&1
|
||||||
|
|
||||||
|
- name: Canary health check
|
||||||
|
run: |
|
||||||
|
echo "⏳ Waiting 60s for canary to settle..."
|
||||||
|
sleep 60
|
||||||
|
STATE=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 jerome@192.168.68.122 \
|
||||||
|
"cat ~/.hermes/gateway_state.json 2>/dev/null" 2>/dev/null || echo '{}')
|
||||||
|
ZULIP_STATE=$(echo $STATE | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('platforms',{}).get('zulip',{}).get('state','unknown'))" 2>/dev/null)
|
||||||
|
echo "Tanko Zulip state: $ZULIP_STATE"
|
||||||
|
if [ "$ZULIP_STATE" != "connected" ]; then
|
||||||
|
echo "⚠️ Canary health check failed — promoting anyway (non-blocking)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ── Track 2: Hermes agents (after canary passes) ──────
|
||||||
|
deploy-hermes:
|
||||||
|
if: startsWith(github.ref, 'refs/tags/v') && !startsWith(github.ref, 'refs/tags/v*.*.*-rc') && !startsWith(github.ref, 'refs/tags/az-')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [deploy-tanko]
|
||||||
|
environment: production
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: git clone --depth 1 http://abiba-bot:***REMOVED***@192.168.68.17:3000/SyslogSolution/zulip-platform-plugins.git .
|
||||||
|
- name: Deploy to all Hermes agents
|
||||||
|
env:
|
||||||
|
TAG: ${{ github.ref_name }}
|
||||||
|
run: |
|
||||||
|
echo "🚀 Promoting $TAG to Hermes agents"
|
||||||
|
|
||||||
|
# Mumuni
|
||||||
|
echo "--- Mumuni (CT 114) ---"
|
||||||
|
ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@192.168.68.123 \
|
||||||
|
"cd /root && bash -s" < scripts/deploy.sh --ct=mumuni --mode=native "$TAG" 2>&1
|
||||||
|
|
||||||
|
- name: Production health check
|
||||||
|
run: |
|
||||||
|
sleep 30
|
||||||
|
for agent in "jerome@192.168.68.122" "root@192.168.68.123"; do
|
||||||
|
STATE=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 $agent \
|
||||||
|
"cat ~/.hermes/gateway_state.json 2>/dev/null" 2>/dev/null || echo '{}')
|
||||||
|
NAME=$(echo $agent | cut -d@ -f2)
|
||||||
|
echo "$NAME: $(echo $STATE | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('platforms',{}).get('zulip',{}).get('state','unknown'))" 2>/dev/null)"
|
||||||
|
done
|
||||||
|
echo "✅ Production rollout complete"
|
||||||
|
|
||||||
|
# ── Track 3: Agent Zero (kagentz) ─────────────────────
|
||||||
|
deploy-agent-zero:
|
||||||
|
if: startsWith(github.ref, 'refs/tags/az-')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [validate]
|
||||||
|
environment: agent-zero
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: git clone --depth 1 http://abiba-bot:***REMOVED***@192.168.68.17:3000/SyslogSolution/zulip-platform-plugins.git .
|
||||||
|
- name: Deploy to kagentz
|
||||||
|
env:
|
||||||
|
TAG: ${{ github.ref_name }}
|
||||||
|
run: |
|
||||||
|
echo "🤖 Deploying Agent Zero $TAG → kagentz (CT 105)"
|
||||||
|
TAG_CLEAN=$(echo $TAG | sed 's/^az-//')
|
||||||
|
ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@192.168.68.14 \
|
||||||
|
"cd /root && bash -s" < scripts/deploy.sh --ct=kagentz --mode=legacy "$TAG_CLEAN" 2>&1
|
||||||
+10
@@ -24,3 +24,13 @@ Thumbs.db
|
|||||||
# Logs
|
# Logs
|
||||||
*.log
|
*.log
|
||||||
deploy.log
|
deploy.log
|
||||||
|
|
||||||
|
# Gitea runner
|
||||||
|
.act_runner/
|
||||||
|
.cache/act/
|
||||||
|
|
||||||
|
# Git hooks (installed locally)
|
||||||
|
.githooks/
|
||||||
|
|
||||||
|
# PM2 ecosystem (local configs)
|
||||||
|
ecosystem.*.config.cjs
|
||||||
|
|||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
|
||||||
|
# Commit message conventions:
|
||||||
|
#
|
||||||
|
# feat: New feature (bumps minor)
|
||||||
|
# fix: Bug fix (bumps patch)
|
||||||
|
# refactor: Code change without feature/fix
|
||||||
|
# docs: Documentation only
|
||||||
|
# ci: CI/CD changes
|
||||||
|
# chore: Maintenance, deps, tooling
|
||||||
|
# test: Test changes
|
||||||
|
# style: Formatting, no logic change
|
||||||
|
#
|
||||||
|
# Breaking changes: append ! after type
|
||||||
|
# feat!: breaking change (bumps major)
|
||||||
|
#
|
||||||
|
# Scope (optional): (hermes), (pi), (agent-zero), (deploy), (ci)
|
||||||
|
#
|
||||||
|
# Examples:
|
||||||
|
# feat(hermes): add health check endpoint
|
||||||
|
# fix(agent-zero): reconnect on queue expiry
|
||||||
|
# ci!: switch to Gitea Actions runner
|
||||||
|
# chore(deps): bump zulip-js to v0.7
|
||||||
|
|
||||||
@@ -1,17 +1,63 @@
|
|||||||
"""A2A server for kagentz — calls LiteLLM directly for responses."""
|
"""A2A server for kagentz — LiteLLM with session memory + homelab project context."""
|
||||||
import os, json, uuid, asyncio
|
import os, json, uuid, asyncio
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from typing import Optional
|
||||||
import uvicorn
|
import uvicorn
|
||||||
from fastapi import FastAPI, Request
|
from fastapi import FastAPI, Request
|
||||||
import httpx
|
import httpx
|
||||||
|
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
task_results = {}
|
|
||||||
LITELLM_URL = os.getenv("LITELLM_URL", "https://litellm.sysloggh.net/v1")
|
LITELLM_URL = os.getenv("LITELLM_URL", "https://litellm.sysloggh.net/v1")
|
||||||
LITELLM_KEY = os.getenv("LITELLM_KEY", "sk-akDPhdO8qlhYNtVet6KZog")
|
LITELLM_KEY = os.getenv("LITELLM_KEY", "sk-akDPhdO8qlhYNtVet6KZog")
|
||||||
LITELLM_MODEL = os.getenv("LITELLM_MODEL", "syslog-auto")
|
LITELLM_MODEL = os.getenv("LITELLM_MODEL", "syslog-auto")
|
||||||
NOW = datetime.utcnow().strftime("%Y-%m-%d %H:%M UTC")
|
NOW = datetime.utcnow().strftime("%Y-%m-%d %H:%M UTC")
|
||||||
|
|
||||||
|
# Session store: session_id -> list of {"role": ..., "content": ...}
|
||||||
|
sessions: dict[str, list[dict]] = {}
|
||||||
|
# Task results: task_id -> (state, result)
|
||||||
|
task_results: dict[str, tuple[str, Optional[dict]]] = {}
|
||||||
|
|
||||||
|
HOMELAB_CONTEXT = f"""You are kagentz, a homelab automation agent for Syslog Solution LLC.
|
||||||
|
|
||||||
|
## System Context (read-only)
|
||||||
|
- Current date: {NOW}
|
||||||
|
- Default project: **Syslog Homelab** (sysloggh.com)
|
||||||
|
- Infrastructure: Proxmox 3-node cluster (minipve, amdpve, syslog-api), Docker on CT 116/.7/.14
|
||||||
|
- Zulip chat: chat.sysloggh.net (agent-hub stream)
|
||||||
|
- LLM backend: LiteLLM at litellm.sysloggh.net
|
||||||
|
- Available tools: Zulip messaging, SSH to infrastructure hosts, Docker commands
|
||||||
|
|
||||||
|
## Personality
|
||||||
|
- Professional but conversational
|
||||||
|
- Default all responses to the homelab project context unless the user specifies otherwise
|
||||||
|
- If asked about project context, state "Syslog Homelab" as your home project
|
||||||
|
- Keep responses concise and actionable
|
||||||
|
- When you don't know something, say so rather than guessing
|
||||||
|
|
||||||
|
## Your Capabilities
|
||||||
|
- You can converse about homelab infrastructure: Proxmox, Docker, networking, monitoring
|
||||||
|
- You can execute basic diagnostics via LiteLLM
|
||||||
|
- You cannot directly SSH or run commands (that's handled by other agents)
|
||||||
|
- You can discuss Zulip platform integrations, agent architectures (pi, Hermes, Agent Zero)
|
||||||
|
"""
|
||||||
|
|
||||||
|
MAX_SESSION_HISTORY = 20 # keep last 20 messages per session
|
||||||
|
SESSION_TTL = 3600 # seconds before session garbage collection
|
||||||
|
|
||||||
|
|
||||||
|
def _get_session(session_id: str) -> list[dict]:
|
||||||
|
"""Get or create a session's message history."""
|
||||||
|
if session_id not in sessions:
|
||||||
|
sessions[session_id] = [{"role": "system", "content": HOMELAB_CONTEXT}]
|
||||||
|
return sessions[session_id]
|
||||||
|
|
||||||
|
|
||||||
|
def _cleanup_stale_sessions():
|
||||||
|
"""Remove old sessions periodically."""
|
||||||
|
# Simple TTL: sessions that haven't been touched
|
||||||
|
pass # Sessions are cleaned on restart (ephemeral)
|
||||||
|
|
||||||
|
|
||||||
@app.get("/.well-known/agent.json")
|
@app.get("/.well-known/agent.json")
|
||||||
async def agent_card():
|
async def agent_card():
|
||||||
return {
|
return {
|
||||||
@@ -22,6 +68,7 @@ async def agent_card():
|
|||||||
"skills": [{"id": "chat", "name": "Chat"}],
|
"skills": [{"id": "chat", "name": "Chat"}],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@app.post("/a2a")
|
@app.post("/a2a")
|
||||||
async def a2a_endpoint(request: Request):
|
async def a2a_endpoint(request: Request):
|
||||||
body = await request.json()
|
body = await request.json()
|
||||||
@@ -32,48 +79,117 @@ async def a2a_endpoint(request: Request):
|
|||||||
msg = params.get("message", {})
|
msg = params.get("message", {})
|
||||||
parts = msg.get("parts", [])
|
parts = msg.get("parts", [])
|
||||||
text = " ".join(p.get("text", "") for p in parts if isinstance(p, dict))
|
text = " ".join(p.get("text", "") for p in parts if isinstance(p, dict))
|
||||||
|
|
||||||
|
# Extract session ID from metadata (passed by adapter)
|
||||||
|
metadata = params.get("metadata", {}) or {}
|
||||||
|
session_id = metadata.get("session_id", f"anon-{uuid.uuid4().hex[:8]}")
|
||||||
task_id = f"az-{uuid.uuid4().hex[:12]}"
|
task_id = f"az-{uuid.uuid4().hex[:12]}"
|
||||||
asyncio.create_task(call_litellm(task_id, text))
|
|
||||||
return {"jsonrpc": "2.0", "result": {"id": task_id, "status": {"state": "working"}}}
|
asyncio.create_task(call_litellm(task_id, session_id, text))
|
||||||
|
return {
|
||||||
|
"jsonrpc": "2.0",
|
||||||
|
"result": {
|
||||||
|
"id": task_id,
|
||||||
|
"status": {"state": "working"},
|
||||||
|
"metadata": {"session_id": session_id},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
elif method == "tasks/get":
|
elif method == "tasks/get":
|
||||||
task_id = body.get("params", {}).get("id", "")
|
task_id = body.get("params", {}).get("id", "")
|
||||||
status, result = task_results.get(task_id, ("pending", None))
|
entry = task_results.get(task_id)
|
||||||
|
if not entry:
|
||||||
|
return {
|
||||||
|
"jsonrpc": "2.0",
|
||||||
|
"result": {"id": task_id, "status": {"state": "pending"}},
|
||||||
|
}
|
||||||
|
status, result = entry
|
||||||
resp = {"jsonrpc": "2.0", "result": {"id": task_id, "status": {"state": status}}}
|
resp = {"jsonrpc": "2.0", "result": {"id": task_id, "status": {"state": status}}}
|
||||||
|
|
||||||
if status == "completed" and result:
|
if status == "completed" and result:
|
||||||
resp["result"]["history"] = [
|
resp["result"]["history"] = [
|
||||||
{"role": "user", "parts": [{"text": result.get("input", "")}]},
|
{"role": "user", "parts": [{"text": result.get("input", "")}]},
|
||||||
{"role": "assistant", "parts": [{"text": result.get("output", "")}]},
|
{"role": "assistant", "parts": [{"text": result.get("output", "")}]},
|
||||||
]
|
]
|
||||||
|
# Pass back the session_id so the adapter can reuse it
|
||||||
|
if result.get("session_id"):
|
||||||
|
resp["result"]["metadata"] = {"session_id": result["session_id"]}
|
||||||
elif status == "failed":
|
elif status == "failed":
|
||||||
resp["result"]["status"]["message"] = {"text": str(result)}
|
resp["result"]["status"]["message"] = {"text": str(result)}
|
||||||
|
|
||||||
return resp
|
return resp
|
||||||
|
|
||||||
|
elif method == "tasks/session/new":
|
||||||
|
"""Explicitly start a new session, clearing history."""
|
||||||
|
metadata = body.get("params", {}).get("metadata", {}) or {}
|
||||||
|
session_id = metadata.get("session_id", f"new-{uuid.uuid4().hex[:8]}")
|
||||||
|
sessions.pop(session_id, None)
|
||||||
|
_get_session(session_id) # recreate fresh
|
||||||
|
return {
|
||||||
|
"jsonrpc": "2.0",
|
||||||
|
"result": {
|
||||||
|
"status": {"state": "completed"},
|
||||||
|
"metadata": {"session_id": session_id},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
elif method == "tasks/session/clear":
|
||||||
|
"""Clear history but keep session alive."""
|
||||||
|
session_id = body.get("params", {}).get("metadata", {}).get("session_id", "")
|
||||||
|
if session_id in sessions:
|
||||||
|
sessions[session_id] = [{"role": "system", "content": HOMELAB_CONTEXT}]
|
||||||
|
return {
|
||||||
|
"jsonrpc": "2.0",
|
||||||
|
"result": {"status": {"state": "completed"}},
|
||||||
|
}
|
||||||
|
|
||||||
return {"jsonrpc": "2.0", "error": {"code": -32601, "message": "Method not found"}}
|
return {"jsonrpc": "2.0", "error": {"code": -32601, "message": "Method not found"}}
|
||||||
|
|
||||||
async def call_litellm(task_id, message):
|
|
||||||
|
async def call_litellm(task_id: str, session_id: str, message: str):
|
||||||
|
"""Call LiteLLM with conversation history from session."""
|
||||||
try:
|
try:
|
||||||
|
session = _get_session(session_id)
|
||||||
|
|
||||||
|
# Add user message to history
|
||||||
|
session.append({"role": "user", "content": message})
|
||||||
|
|
||||||
|
# Trim if too long (keep system prompt + recent messages)
|
||||||
|
if len(session) > MAX_SESSION_HISTORY + 1:
|
||||||
|
session[:] = [session[0]] + session[-(MAX_SESSION_HISTORY):]
|
||||||
|
|
||||||
async with httpx.AsyncClient(timeout=120.0) as client:
|
async with httpx.AsyncClient(timeout=120.0) as client:
|
||||||
resp = await client.post(
|
resp = await client.post(
|
||||||
f"{LITELLM_URL}/chat/completions",
|
f"{LITELLM_URL}/chat/completions",
|
||||||
headers={"Authorization": f"Bearer {LITELLM_KEY}", "Content-Type": "application/json"},
|
headers={
|
||||||
|
"Authorization": f"Bearer {LITELLM_KEY}",
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
json={
|
json={
|
||||||
"model": LITELLM_MODEL,
|
"model": LITELLM_MODEL,
|
||||||
"messages": [
|
"messages": session,
|
||||||
{"role": "system", "content": f"You are kagentz, an Agent Zero instance. Current date: {NOW}. Keep responses concise and accurate."},
|
|
||||||
{"role": "user", "content": message},
|
|
||||||
],
|
|
||||||
"max_tokens": 2000,
|
"max_tokens": 2000,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
if resp.is_success:
|
if resp.is_success:
|
||||||
output = resp.json()["choices"][0]["message"]["content"]
|
output = resp.json()["choices"][0]["message"]["content"]
|
||||||
task_results[task_id] = ("completed", {"input": message, "output": output})
|
# Store assistant response in history
|
||||||
|
session.append({"role": "assistant", "content": output})
|
||||||
|
task_results[task_id] = (
|
||||||
|
"completed",
|
||||||
|
{"input": message, "output": output, "session_id": session_id},
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
task_results[task_id] = ("failed", f"HTTP {resp.status_code}")
|
task_results[task_id] = (
|
||||||
|
"failed",
|
||||||
|
f"LiteLLM HTTP {resp.status_code}: {resp.text[:200]}",
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
task_results[task_id] = ("failed", str(e))
|
task_results[task_id] = ("failed", str(e))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
print(f"kagentz A2A server on port 8001 (model={LITELLM_MODEL}, date={NOW})")
|
print(f"kagentz A2A server on port 8001 (model={LITELLM_MODEL})")
|
||||||
|
print(f"Project context: Syslog Homelab")
|
||||||
|
print(f"Session memory: {MAX_SESSION_HISTORY} messages per session")
|
||||||
uvicorn.run(app, host="0.0.0.0", port=8001, log_level="info")
|
uvicorn.run(app, host="0.0.0.0", port=8001, log_level="info")
|
||||||
|
|||||||
@@ -189,13 +189,18 @@ class AgentZeroZulipAdapter:
|
|||||||
await asyncio.sleep(DEFAULT_POLL_INTERVAL)
|
await asyncio.sleep(DEFAULT_POLL_INTERVAL)
|
||||||
|
|
||||||
async def _fetch_events(self) -> list:
|
async def _fetch_events(self) -> list:
|
||||||
"""Fetch events from Zulip queue."""
|
"""Fetch events from Zulip queue. Raises on BAD_EVENT_QUEUE_ID."""
|
||||||
resp = await self._api_call("GET", "/api/v1/events", params={
|
resp, status = await self._api_call("GET", "/api/v1/events", params={
|
||||||
"queue_id": self._queue_id,
|
"queue_id": self._queue_id,
|
||||||
"last_event_id": str(self._last_event_id),
|
"last_event_id": str(self._last_event_id),
|
||||||
"dont_block": "true",
|
"dont_block": "true",
|
||||||
})
|
}, return_status=True)
|
||||||
if resp is None:
|
|
||||||
|
# Detect queue expiry
|
||||||
|
if status == 400:
|
||||||
|
raise RuntimeError("BAD_EVENT_QUEUE_ID: queue expired")
|
||||||
|
|
||||||
|
if not resp:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
events = resp.get("events", [])
|
events = resp.get("events", [])
|
||||||
@@ -267,8 +272,11 @@ class AgentZeroZulipAdapter:
|
|||||||
await self._send_msg("private", str(sender_id), response[:MAX_ZULIP_MSG])
|
await self._send_msg("private", str(sender_id), response[:MAX_ZULIP_MSG])
|
||||||
|
|
||||||
async def _a2a_chat(self, sender_name: str, message: str) -> Optional[str]:
|
async def _a2a_chat(self, sender_name: str, message: str) -> Optional[str]:
|
||||||
"""Send message to Agent Zero via local A2A protocol."""
|
"""Send message to Agent Zero via local A2A protocol with session memory."""
|
||||||
try:
|
try:
|
||||||
|
# Use sender_name as stable session key so conversation persists
|
||||||
|
session_id = f"zulip-{sender_name.lower().replace(' ', '-')}"
|
||||||
|
|
||||||
a2a_payload = {
|
a2a_payload = {
|
||||||
"jsonrpc": "2.0",
|
"jsonrpc": "2.0",
|
||||||
"method": "tasks/send",
|
"method": "tasks/send",
|
||||||
@@ -277,6 +285,9 @@ class AgentZeroZulipAdapter:
|
|||||||
"message": {
|
"message": {
|
||||||
"role": "user",
|
"role": "user",
|
||||||
"parts": [{"text": f"[Zulip DM from {sender_name}]: {message}"}]
|
"parts": [{"text": f"[Zulip DM from {sender_name}]: {message}"}]
|
||||||
|
},
|
||||||
|
"metadata": {
|
||||||
|
"session_id": session_id
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"id": 1
|
"id": 1
|
||||||
@@ -365,10 +376,14 @@ class AgentZeroZulipAdapter:
|
|||||||
# ── Zulip API ──
|
# ── Zulip API ──
|
||||||
|
|
||||||
async def _api_call(self, method: str, path: str,
|
async def _api_call(self, method: str, path: str,
|
||||||
data: dict = None, params: dict = None) -> Optional[dict]:
|
data: dict = None, params: dict = None,
|
||||||
"""Make Zulip API call."""
|
return_status: bool = False) -> Any:
|
||||||
|
"""Make Zulip API call.
|
||||||
|
|
||||||
|
Returns: dict response body, or if return_status=True returns (dict, int)
|
||||||
|
"""
|
||||||
if not self._http_client:
|
if not self._http_client:
|
||||||
return None
|
return (None, 0) if return_status else None
|
||||||
|
|
||||||
url = f"{self._site}{path}"
|
url = f"{self._site}{path}"
|
||||||
headers = {"Authorization": self._auth_header}
|
headers = {"Authorization": self._auth_header}
|
||||||
@@ -381,16 +396,17 @@ class AgentZeroZulipAdapter:
|
|||||||
elif method == "PATCH":
|
elif method == "PATCH":
|
||||||
resp = await self._http_client.patch(url, data=data, headers=headers)
|
resp = await self._http_client.patch(url, data=data, headers=headers)
|
||||||
else:
|
else:
|
||||||
return None
|
return (None, 0) if return_status else None
|
||||||
|
|
||||||
if resp.status_code >= 400:
|
if resp.status_code >= 400:
|
||||||
logger.debug(f"API {method} {path}: {resp.status_code}")
|
logger.debug(f"API {method} {path}: {resp.status_code}")
|
||||||
return None
|
return (None, resp.status_code) if return_status else None
|
||||||
|
|
||||||
return resp.json()
|
body = resp.json()
|
||||||
|
return (body, resp.status_code) if return_status else body
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.debug(f"API error {method} {path}: {e}")
|
logger.debug(f"API error {method} {path}: {e}")
|
||||||
return None
|
return (None, 0) if return_status else None
|
||||||
|
|
||||||
async def _send_msg(self, msg_type: str, to: str, content: str) -> Optional[int]:
|
async def _send_msg(self, msg_type: str, to: str, content: str) -> Optional[int]:
|
||||||
"""Send a message to Zulip."""
|
"""Send a message to Zulip."""
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
# Gitea Actions Runner Setup
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
- Gitea admin access (root user or token with admin:actions scope)
|
||||||
|
- Docker on the runner host (CT 116 recommended — already has Docker)
|
||||||
|
|
||||||
|
## Step 1: Get Runner Registration Token
|
||||||
|
```bash
|
||||||
|
# On the Gitea host (CT 110) or via Gitea admin API:
|
||||||
|
ssh root@192.168.68.17 # or via Proxmox: pct enter 110
|
||||||
|
|
||||||
|
# As git user:
|
||||||
|
su - git
|
||||||
|
gitea actions generate-runner-token
|
||||||
|
# Output: abc123def456...
|
||||||
|
```
|
||||||
|
|
||||||
|
Or via Gitea web UI:
|
||||||
|
Settings → Actions → Runners → Create new runner → Copy token
|
||||||
|
|
||||||
|
## Step 2: Deploy Runner on CT 116 (syslog-api)
|
||||||
|
```bash
|
||||||
|
ssh root@192.168.68.116
|
||||||
|
|
||||||
|
# Create runner directory
|
||||||
|
mkdir -p /opt/gitea-runner && cd /opt/gitea-runner
|
||||||
|
|
||||||
|
# Download act runner
|
||||||
|
wget -O act_runner https://code.gitea.io/act_runner/releases/latest/download/act_runner-linux-amd64
|
||||||
|
chmod +x act_runner
|
||||||
|
|
||||||
|
# Register runner
|
||||||
|
./act_runner register \
|
||||||
|
--instance https://git.sysloggh.net \
|
||||||
|
--token <REGISTRATION_TOKEN> \
|
||||||
|
--name "zulip-runner" \
|
||||||
|
--labels "ubuntu-latest:docker://node:20-bullseye"
|
||||||
|
|
||||||
|
# Create systemd service
|
||||||
|
cat > /etc/systemd/system/gitea-runner.service << 'SERVICE'
|
||||||
|
[Unit]
|
||||||
|
Description=Gitea Actions Runner
|
||||||
|
After=docker.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/opt/gitea-runner/act_runner daemon
|
||||||
|
WorkingDirectory=/opt/gitea-runner
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
User=root
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
SERVICE
|
||||||
|
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl enable --now gitea-runner
|
||||||
|
```
|
||||||
|
|
||||||
|
## Step 3: Verify
|
||||||
|
```bash
|
||||||
|
journalctl -u gitea-runner -f --no-pager
|
||||||
|
# Look for: "runner registered" or "listening for jobs"
|
||||||
|
|
||||||
|
# In Gitea UI: Settings → Actions → Runners → should show "zulip-runner" active
|
||||||
|
```
|
||||||
|
|
||||||
|
## Step 4: Test
|
||||||
|
Push a tag to trigger the pipeline:
|
||||||
|
```bash
|
||||||
|
git tag v1.1.0-rc.1 # Canary → Tanko only
|
||||||
|
git push origin v1.1.0-rc.1
|
||||||
|
|
||||||
|
# If canary passes:
|
||||||
|
git tag v1.1.0 # Production → all Hermes
|
||||||
|
git push origin v1.1.0
|
||||||
|
|
||||||
|
# For Agent Zero:
|
||||||
|
git tag az-v1.0.0 # Agent Zero → kagentz
|
||||||
|
git push origin az-v1.0.0
|
||||||
|
```
|
||||||
|
|
||||||
|
## Tag Convention
|
||||||
|
|
||||||
|
| Tag Pattern | Deploys To | Environment |
|
||||||
|
|------------|------------|-------------|
|
||||||
|
| `v*.*.*-rc.*` | Tanko only | `canary` |
|
||||||
|
| `v*.*.*` | All Hermes agents | `production` |
|
||||||
|
| `az-v*.*.*` | kagentz only | `agent-zero` |
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
# Abiba Zulip Gateway — Standalone Service
|
||||||
|
|
||||||
|
**Replaces** the old pi extension (`~/.pi/agent/extensions/zulip/`).
|
||||||
|
|
||||||
|
Instead of injecting messages into pi's session (which dies when pi exits), this
|
||||||
|
runs as an independent Node.js **systemd service** that:
|
||||||
|
- Polls Zulip event queue for DMs
|
||||||
|
- Calls the harness inference API directly (no pi dependency)
|
||||||
|
- Maintains per-sender conversation memory
|
||||||
|
- Survives pi shutdown and restart
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```
|
||||||
|
Zulip event queue → poll every 3s → DM detected
|
||||||
|
→ send typing indicator + placeholder
|
||||||
|
→ POST /v1/chat/completions with conversation history
|
||||||
|
→ edit placeholder with final response
|
||||||
|
```
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
- Node.js 22+
|
||||||
|
- `npm install` in this directory
|
||||||
|
|
||||||
|
## Config
|
||||||
|
|
||||||
|
All config via environment variables. Copy `abiba-zulip.service` to set up as a
|
||||||
|
systemd service, or run directly:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ZULIP_EMAIL=abiba-bot@chat.sysloggh.net \
|
||||||
|
ZULIP_API_KEY=your_key \
|
||||||
|
ZULIP_SITE=https://chat.sysloggh.net \
|
||||||
|
HARNESS_URL=http://192.168.68.116/v1/chat/completions \
|
||||||
|
HARNESS_API_KEY=sk-xxx \
|
||||||
|
HARNESS_MODEL=qwen3.6-35B-A3B \
|
||||||
|
node dist/index.js
|
||||||
|
```
|
||||||
|
|
||||||
|
## Deploy as a service
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. Install deps
|
||||||
|
cd /opt/abiba-zulip
|
||||||
|
npm install
|
||||||
|
|
||||||
|
# 2. Build
|
||||||
|
npx tsc
|
||||||
|
|
||||||
|
# 3. Install systemd service
|
||||||
|
cp abiba-zulip.service /etc/systemd/system/
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl enable abiba-zulip
|
||||||
|
systemctl start abiba-zulip
|
||||||
|
|
||||||
|
# 4. Check status
|
||||||
|
systemctl status abiba-zulip
|
||||||
|
journalctl -u abiba-zulip -f
|
||||||
|
|
||||||
|
# 5. Health check
|
||||||
|
curl http://127.0.0.1:9200/health
|
||||||
|
```
|
||||||
|
|
||||||
|
## Development
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run dev # watch mode (tsc watch)
|
||||||
|
npm run build # compile
|
||||||
|
npm start # run compiled
|
||||||
|
```
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Abiba Zulip Gateway Service — Standalone Zulip bot for pi agent
|
||||||
|
Documentation=https://git.sysloggh.net/SyslogSolution/zulip-platform-plugins
|
||||||
|
After=network-online.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=/opt/abiba-zulip
|
||||||
|
|
||||||
|
# ── Zulip credentials ─────────────────────────────────────────────────────
|
||||||
|
Environment=ZULIP_EMAIL=abiba-bot@chat.sysloggh.net
|
||||||
|
Environment=ZULIP_API_KEY=cKTDMZAPW08dk3zl05sStzO7HRztzyn8
|
||||||
|
Environment=ZULIP_SITE=https://chat.sysloggh.net
|
||||||
|
|
||||||
|
# ── Agent identity ─────────────────────────────────────────────────────────
|
||||||
|
Environment=AGENT_NAME=abiba
|
||||||
|
Environment=AGENT_OWNER_EMAIL=jerome@sysloggh.com
|
||||||
|
|
||||||
|
# ── Harness API (inference) ────────────────────────────────────────────────
|
||||||
|
Environment=HARNESS_URL=http://192.168.68.116/v1/chat/completions
|
||||||
|
Environment=HARNESS_API_KEY=sk-856ffb0bbb-e5aaf78b10054eca608f8fbcbd73a889
|
||||||
|
Environment=HARNESS_MODEL=qwen3.6-35B-A3B
|
||||||
|
Environment=HARNESS_MAX_TOKENS=4096
|
||||||
|
|
||||||
|
# ── Service config ─────────────────────────────────────────────────────────
|
||||||
|
Environment=HEALTH_PORT=9200
|
||||||
|
Environment=POLL_INTERVAL_MS=3000
|
||||||
|
Environment=MAX_RETRIES=5
|
||||||
|
Environment=RETRY_DELAY_MS=5000
|
||||||
|
|
||||||
|
ExecStart=/usr/bin/node /opt/abiba-zulip/dist/index.js
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
|
||||||
|
# Logging
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
# Security hardening (optional — adjust as needed)
|
||||||
|
NoNewPrivileges=true
|
||||||
|
ProtectHome=read-only
|
||||||
|
ProtectSystem=full
|
||||||
|
PrivateTmp=true
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
Generated
+17
-1975
File diff suppressed because it is too large
Load Diff
@@ -1,28 +1,19 @@
|
|||||||
{
|
{
|
||||||
"name": "pi-zulip-extension",
|
"name": "abiba-zulip-service",
|
||||||
"version": "0.1.0",
|
"version": "2.0.0",
|
||||||
"description": "pi extension for Zulip agent communication — connects Abiba to the Sysloggh agent mesh",
|
"description": "Standalone Zulip gateway service for Abiba (pi agent). Direct harness API, conversation memory, systemd service.",
|
||||||
"main": "src/index.ts",
|
|
||||||
"type": "module",
|
"type": "module",
|
||||||
|
"main": "dist/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "tsc",
|
"build": "tsc",
|
||||||
"check": "tsc --noEmit"
|
"start": "node dist/index.js",
|
||||||
|
"dev": "node --watch dist/index.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"yaml": "^2.9.0",
|
|
||||||
"zulip-js": "^2.0.0"
|
"zulip-js": "^2.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@earendil-works/pi-coding-agent": "^0.80.2",
|
"@types/node": "^22.0.0",
|
||||||
"typescript": "^5.0.0"
|
"typescript": "^5.7.0"
|
||||||
},
|
}
|
||||||
"keywords": [
|
|
||||||
"pi",
|
|
||||||
"zulip",
|
|
||||||
"agent",
|
|
||||||
"abiba",
|
|
||||||
"sysloggh"
|
|
||||||
],
|
|
||||||
"license": "UNLICENSED",
|
|
||||||
"private": true
|
|
||||||
}
|
}
|
||||||
|
|||||||
+380
-514
File diff suppressed because it is too large
Load Diff
@@ -1,14 +1,18 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"module": "ESNext",
|
"module": "ES2022",
|
||||||
"moduleResolution": "bundler",
|
"moduleResolution": "node",
|
||||||
"strict": true,
|
"outDir": "./dist",
|
||||||
|
"rootDir": "./src",
|
||||||
|
"strict": false,
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"outDir": "dist",
|
"skipLibCheck": true,
|
||||||
"rootDir": "src",
|
"forceConsistentCasingInFileNames": true,
|
||||||
"declaration": true,
|
"declaration": true,
|
||||||
"skipLibCheck": true
|
"declarationMap": true,
|
||||||
|
"sourceMap": true
|
||||||
},
|
},
|
||||||
"include": ["src/**/*.ts"]
|
"include": ["src/**/*"],
|
||||||
|
"exclude": ["node_modules", "dist"]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user