Compare commits
1 Commits
fix/remove
...
b1dbdb9f2d
| Author | SHA1 | Date | |
|---|---|---|---|
| b1dbdb9f2d |
113
ai/compose.yml
Executable file → Normal file
113
ai/compose.yml
Executable file → Normal file
@@ -1,4 +1,35 @@
|
||||
version: "3.8"
|
||||
|
||||
# ── Hermes Worker Template ──────────────────────────────────
|
||||
# Used by paperclip-worker-* Hermes containers via YAML anchor.
|
||||
# Each worker = one isolated Hermes agent for a Paperclip employee.
|
||||
# Override at service level: container_name, API_SERVER_PORT,
|
||||
# API_SERVER_KEY, DISCORD_BOT_TOKEN, volumes.
|
||||
# Workers have NO GPU — they use OpenCode Go or remote providers.
|
||||
x-hermes-worker: &hermes-worker
|
||||
build:
|
||||
context: ./hermes
|
||||
ssh:
|
||||
- default
|
||||
entrypoint: ["/bin/bash", "-c",
|
||||
"bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||
"hermes-entrypoint"]
|
||||
command: gateway run
|
||||
restart: always
|
||||
environment:
|
||||
API_SERVER_ENABLED: "true"
|
||||
API_SERVER_HOST: "0.0.0.0"
|
||||
OLLAMA_HOST: "http://ollama:11434"
|
||||
OPENROUTER_API_KEY: ${OPENROUTER_API_KEY}
|
||||
# Each worker needs its own OpenCode Go API key in .env
|
||||
OPENCODE_GO_API_KEY: ${OPENCODE_GO_API_KEY}
|
||||
GATEWAY_ALLOW_ALL_USERS: "true"
|
||||
TZ: "America/Montreal"
|
||||
networks:
|
||||
ai_backend:
|
||||
# NO devices — workers are CPU-only, no GPU passthrough
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
|
||||
services:
|
||||
|
||||
# webui:
|
||||
@@ -32,18 +63,13 @@ services:
|
||||
- default
|
||||
container_name: hermes
|
||||
entrypoint: ["/bin/bash", "-c",
|
||||
"bash /opt/data/hermes-tools/install.sh && bash /opt/data/hermes-tools/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||
"bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||
"hermes-entrypoint"]
|
||||
restart: always
|
||||
# Gateway run enables the internal API server on port 8642
|
||||
command: gateway run
|
||||
environment:
|
||||
- OLLAMA_HOST=http://ollama:11434
|
||||
- HERMES_DASHBOARD=1
|
||||
# Multi-profile: comma-separated list of profiles to run as gateways.
|
||||
# The entrypoint reads this and starts one gateway per profile.
|
||||
# Add profiles here when they exist on disk (e.g. default,researcher,writer)
|
||||
- HERMES_PROFILES=ashley,claire,finn,matt,paul
|
||||
- API_SERVER_ENABLED=true
|
||||
- API_SERVER_PORT=8642
|
||||
- API_SERVER_HOST=0.0.0.0
|
||||
@@ -59,10 +85,6 @@ services:
|
||||
- TZ=America/Montreal
|
||||
volumes:
|
||||
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
|
||||
# Syncthing-shared org files — read-only view of user's agenda
|
||||
- /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-ro:ro
|
||||
# Syncthing-shared inbox — write tasks here, they sync to user's laptop
|
||||
- /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
|
||||
devices:
|
||||
- /dev/kfd:/dev/kfd
|
||||
- /dev/dri:/dev/dri
|
||||
@@ -71,59 +93,6 @@ services:
|
||||
- "26"
|
||||
networks:
|
||||
- ai_backend
|
||||
- ai_net
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.docker.network=ai_net"
|
||||
|
||||
# Router for HTTP + redirection to HTTPS
|
||||
- "traefik.http.routers.hermes-web-http.rule=Host(`hermes.lazyworkhorse.net`)"
|
||||
- "traefik.http.routers.hermes-web-http.entrypoints=web"
|
||||
- "traefik.http.routers.hermes-web-http.middlewares=redirect-to-https"
|
||||
|
||||
# Router for HTTPS with TLS — protected by Authelia
|
||||
- "traefik.http.routers.hermes-web-https.rule=Host(`hermes.lazyworkhorse.net`)"
|
||||
- "traefik.http.routers.hermes-web-https.entrypoints=websecure"
|
||||
- "traefik.http.routers.hermes-web-https.tls=true"
|
||||
- "traefik.http.routers.hermes-web-https.tls.certresolver=njalla"
|
||||
- "traefik.http.routers.hermes-web-https.middlewares=hermes-auth"
|
||||
|
||||
# Authelia forwardAuth
|
||||
- "traefik.http.middlewares.hermes-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
|
||||
- "traefik.http.middlewares.hermes-auth.forwardauth.trustforwardheader=true"
|
||||
- "traefik.http.middlewares.hermes-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"
|
||||
|
||||
# Service Loadbalancer (dashboard port 9119)
|
||||
- "traefik.http.services.hermes-web.loadbalancer.server.port=9119"
|
||||
|
||||
syncthing:
|
||||
image: syncthing/syncthing:latest
|
||||
container_name: syncthing
|
||||
hostname: syncthing
|
||||
restart: always
|
||||
ports:
|
||||
- "8384:8384"
|
||||
- "22000:22000"
|
||||
- "21027:21027/udp"
|
||||
environment:
|
||||
- TZ=America/Montreal
|
||||
volumes:
|
||||
- /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
|
||||
- /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
|
||||
- /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
|
||||
networks:
|
||||
- ai_backend
|
||||
- ai_net
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
|
||||
- "traefik.http.routers.syncthing-http.entrypoints=web"
|
||||
- "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
|
||||
- "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
|
||||
- "traefik.http.routers.syncthing-https.entrypoints=websecure"
|
||||
- "traefik.http.routers.syncthing-https.tls=true"
|
||||
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
|
||||
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
|
||||
|
||||
ollama:
|
||||
build:
|
||||
@@ -158,6 +127,24 @@ services:
|
||||
- "303"
|
||||
- "26"
|
||||
|
||||
# ── Paperclip Worker Hermes Agents ──────────────────────────
|
||||
# Each worker is an isolated Hermes agent for a Paperclip employee.
|
||||
# Add new workers with: ./scripts/provision-hermes-worker.sh <name> <discord-token>
|
||||
# The API server key and port are generated automatically.
|
||||
# Workers are CPU-only — they use OpenCode Go or remote providers.
|
||||
|
||||
# ── Worker Template (commented — uncomment + configure to activate) ──
|
||||
# hermes-worker-1:
|
||||
# <<: *hermes-worker
|
||||
# container_name: hermes-worker-1
|
||||
# environment:
|
||||
# API_SERVER_PORT: "8651"
|
||||
# API_SERVER_KEY: "generated-by-provision-script"
|
||||
# DISCORD_BOT_TOKEN: ${WORKER_1_DISCORD_BOT_TOKEN}
|
||||
# volumes:
|
||||
# - /mnt/HoardingCow_docker_data/Hermes/worker-1:/opt/data
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
|
||||
networks:
|
||||
ai_net:
|
||||
external: true
|
||||
|
||||
@@ -20,10 +20,16 @@ RUN --mount=type=ssh \
|
||||
GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
|
||||
git clone --depth 1 --branch main \
|
||||
git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
|
||||
rm -rf fork/node_modules fork/.venv fork/.git && \
|
||||
cp -a fork/. /opt/hermes/ && \
|
||||
rsync -a --delete fork/ /opt/hermes/ \
|
||||
--exclude node_modules \
|
||||
--exclude .venv \
|
||||
--exclude .git && \
|
||||
rm -rf /tmp/fork /root/.ssh/
|
||||
|
||||
# ---------- Rebuild web UI ----------
|
||||
# Source files changed; node_modules (from base image) reused.
|
||||
RUN cd /opt/hermes && npm run build
|
||||
|
||||
# ---------- Reinstall Python package (editable) ----------
|
||||
# Picks up source changes from our fork.
|
||||
RUN . /opt/hermes/.venv/bin/activate && \
|
||||
@@ -34,7 +40,6 @@ USER root
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
libportaudio2 ca-certificates poppler-utils imagemagick \
|
||||
libolm-dev \
|
||||
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
||||
texlive-xetex texlive-science \
|
||||
qemu-user-static binfmt-support emacs-nox && \
|
||||
@@ -43,12 +48,6 @@ RUN apt-get update && \
|
||||
# ---------- UV ----------
|
||||
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
|
||||
|
||||
# ---------- Matrix bridge + extra pip deps ----------
|
||||
# Previously installed inline at container startup and persisted via volume mount.
|
||||
# Now baked into the image so the fragile venv volume mount can be removed.
|
||||
RUN . /opt/hermes/.venv/bin/activate && \
|
||||
uv pip install --no-cache-dir 'mautrix[encryption]' openai
|
||||
|
||||
# ---------- Piper TTS ----------
|
||||
RUN . /opt/hermes/.venv/bin/activate && \
|
||||
uv pip install --no-cache-dir piper-tts sounddevice numpy && \
|
||||
@@ -76,6 +75,10 @@ os.remove(tgz)
|
||||
print('himalaya v1.2.0 installed')
|
||||
PYEOF
|
||||
|
||||
# ---------- Install himalaya-ro wrapper ----------
|
||||
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
||||
|
||||
|
||||
# ---------- Runtime ----------
|
||||
USER hermes
|
||||
ENV HERMES_HOME=/opt/data
|
||||
@@ -85,7 +88,6 @@ ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
|
||||
|
||||
# Ensure tools directory and toolsets.py are writable by the hermes runtime user
|
||||
# so custom tools can be injected from the persistent volume at startup.
|
||||
USER root
|
||||
RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
|
||||
|
||||
VOLUME [ "/opt/data" ]
|
||||
73
ai/hermes/himalaya-ro.sh
Normal file
73
ai/hermes/himalaya-ro.sh
Normal file
@@ -0,0 +1,73 @@
|
||||
#!/usr/bin/env bash
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
# himalaya-ro — Read-only wrapper for himalaya
|
||||
#
|
||||
# Blocks destructive commands and logs audit trail.
|
||||
# Pass-through for read-only commands (list, read, search).
|
||||
#
|
||||
# Usage: himalaya-ro [options] <command> [args...]
|
||||
#
|
||||
# Install: place in PATH before the real himalaya, or use
|
||||
# `ln -sf himalaya-ro /usr/local/bin/himalaya`
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
set -o pipefail
|
||||
|
||||
# ── Configuration ───────────────────────────────────────────
|
||||
HIMALAYA_BIN="${HIMALAYA_BIN:-/usr/local/bin/himalaya}"
|
||||
AUDIT_LOG="${HIMALAYA_AUDIT_LOG:-/var/log/himalaya-audit.log}"
|
||||
|
||||
# ── Destructive commands we block ──────────────────────────
|
||||
BLOCKED_CMDS=(
|
||||
"message move"
|
||||
"message delete"
|
||||
"message copy"
|
||||
"flag add"
|
||||
"flag remove"
|
||||
"folder create"
|
||||
"folder delete"
|
||||
"folder rename"
|
||||
"template send"
|
||||
"account configure"
|
||||
"account delete"
|
||||
)
|
||||
|
||||
# ── Determine the subcommand being invoked ─────────────────
|
||||
# Strip leading options (--account, --output, etc.) to find the verb
|
||||
ARGS=()
|
||||
SKIP_NEXT=false
|
||||
for arg in "$@"; do
|
||||
if $SKIP_NEXT; then
|
||||
SKIP_NEXT=false
|
||||
continue
|
||||
fi
|
||||
if [[ "$arg" == --* ]]; then
|
||||
case "$arg" in
|
||||
--account|--output|--page|--page-size|--folder|--color|--format)
|
||||
SKIP_NEXT=true ;;
|
||||
esac
|
||||
continue
|
||||
fi
|
||||
ARGS+=("$arg")
|
||||
done
|
||||
|
||||
# Build subcommand string and check against blocklist
|
||||
CMD_STR=""
|
||||
for ((i=0; i<${#ARGS[@]}; i++)); do
|
||||
if [ -z "$CMD_STR" ]; then
|
||||
CMD_STR="${ARGS[$i]}"
|
||||
else
|
||||
CMD_STR="$CMD_STR ${ARGS[$i]}"
|
||||
fi
|
||||
for blocked in "${BLOCKED_CMDS[@]}"; do
|
||||
if [[ "$CMD_STR" == "$blocked" ]]; then
|
||||
TS=$(date '+%Y-%m-%d %H:%M:%S')
|
||||
echo "[AUDIT] $TS BLOCKED: himalaya $*" >> "$AUDIT_LOG"
|
||||
echo "ERROR: Command 'himalaya $CMD_STR ...' is blocked by read-only policy." >&2
|
||||
echo " Audit log: $AUDIT_LOG" >&2
|
||||
exit 100
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
# ── Allow pass-through ─────────────────────────────────────
|
||||
exec "$HIMALAYA_BIN" "$@"
|
||||
135
ai/scripts/provision-hermes-worker.sh
Executable file
135
ai/scripts/provision-hermes-worker.sh
Executable file
@@ -0,0 +1,135 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# ── Hermes Worker Provisioner ──────────────────────────────
|
||||
# Adds a new Paperclip Hermes worker to the ai compose stack.
|
||||
#
|
||||
# Usage:
|
||||
# ./provision-hermes-worker.sh <name> <discord_bot_token_var>
|
||||
#
|
||||
# Example:
|
||||
# ./provision-hermes-worker.sh worker-1 WORKER_1_DISCORD_BOT_TOKEN
|
||||
#
|
||||
# The script APPENDS only — never modifies or removes existing
|
||||
# content, even commented lines.
|
||||
#
|
||||
# Post-provision steps (manual):
|
||||
# 1. Add secrets to agenix .env file
|
||||
# 2. systemctl restart ai_stack.service
|
||||
# 3. Configure Paperclip agent
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
|
||||
NAME="${1:?Usage: $0 <name> <discord_bot_token_var>}"
|
||||
TOKEN_VAR="${2:?Usage: $0 <name> <discord_bot_token_var>}"
|
||||
|
||||
# ── Paths ───────────────────────────────────────────────────
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
COMPOSE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||
COMPOSE_FILE="${COMPOSE_DIR}/compose.yml"
|
||||
|
||||
# Each Hermes worker gets its own volume on the NFS HoardingCow
|
||||
VOLUME_BASE="/mnt/HoardingCow_docker_data/Hermes"
|
||||
VOLUME_DIR="${VOLUME_BASE}/${NAME}"
|
||||
|
||||
# The Hermes container runs as UID 10000 (hermes user from Dockerfile)
|
||||
HERMES_UID=10000
|
||||
|
||||
# ── Validation ──────────────────────────────────────────────
|
||||
if ! [ -f "$COMPOSE_FILE" ]; then
|
||||
echo "❌ compose.yml not found at $COMPOSE_FILE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if grep -q "^ ${NAME}:" "$COMPOSE_FILE"; then
|
||||
echo "❌ Service '${NAME}' already exists in ${COMPOSE_FILE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ── Generate unique API key ─────────────────────────────────
|
||||
# Used by Paperclip to authenticate against this worker's
|
||||
# Hermes API server (/v1/chat/completions)
|
||||
API_KEY="pc_worker_$(openssl rand -hex 16)"
|
||||
|
||||
# ── Find next available API port ────────────────────────────
|
||||
# Workers get sequential ports starting at 8650.
|
||||
# Scans compose.yml for existing API_SERVER_PORT values and
|
||||
# picks the next one.
|
||||
BASE_PORT=8650
|
||||
MAX_PORT=0
|
||||
while IFS= read -r line; do
|
||||
port="${line#*API_SERVER_PORT: \"}"
|
||||
port="${port%%\"*}"
|
||||
if [ -n "$port" ] && [ "$port" -gt "$MAX_PORT" ]; then
|
||||
MAX_PORT="$port"
|
||||
fi
|
||||
done < <(grep -oP 'API_SERVER_PORT:\s*"\d+"' "$COMPOSE_FILE" 2>/dev/null)
|
||||
|
||||
NEW_PORT=$((MAX_PORT + 1))
|
||||
if [ "$NEW_PORT" -lt "$BASE_PORT" ]; then
|
||||
NEW_PORT=$BASE_PORT
|
||||
fi
|
||||
|
||||
# ── Create volume directory (on NFS) ────────────────────────
|
||||
echo "📁 Creating volume directory: ${VOLUME_DIR}"
|
||||
mkdir -p "$VOLUME_DIR"
|
||||
|
||||
# Hermes container runs as UID 10000 — set ownership so the
|
||||
# container can write its config, sessions, skills
|
||||
if command -v chown &>/dev/null; then
|
||||
chown -R "${HERMES_UID}:${HERMES_UID}" "$VOLUME_DIR" 2>/dev/null || \
|
||||
echo "⚠ Could not chown ${VOLUME_DIR} — run with sudo if needed"
|
||||
fi
|
||||
|
||||
# Make it group-readable for debugging
|
||||
chmod 755 "$VOLUME_DIR" 2>/dev/null || true
|
||||
|
||||
# ── Append service to compose.yml ───────────────────────────
|
||||
echo "📝 Appending service '${NAME}' to compose.yml ..."
|
||||
|
||||
TMPFILE=$(mktemp)
|
||||
|
||||
awk -v name="$NAME" \
|
||||
-v port="$NEW_PORT" \
|
||||
-v api_key="$API_KEY" \
|
||||
-v token_var="$TOKEN_VAR" \
|
||||
'
|
||||
# Insert new worker service block just before the networks: section
|
||||
/^networks:/ {
|
||||
print ""
|
||||
print " " name ":"
|
||||
print " <<: *hermes-worker"
|
||||
print " container_name: " name
|
||||
print " environment:"
|
||||
print " API_SERVER_PORT: \"" port "\""
|
||||
print " API_SERVER_KEY: \"" api_key "\""
|
||||
print " DISCORD_BOT_TOKEN: ${" token_var "}"
|
||||
print " volumes:"
|
||||
print " - /mnt/HoardingCow_docker_data/Hermes/" name ":/opt/data"
|
||||
print ""
|
||||
}
|
||||
{ print }
|
||||
' "$COMPOSE_FILE" > "$TMPFILE" && mv "$TMPFILE" "$COMPOSE_FILE"
|
||||
|
||||
# ── Done ────────────────────────────────────────────────────
|
||||
echo ""
|
||||
echo "✅ Worker '${NAME}' provisioned successfully"
|
||||
echo ""
|
||||
echo "────────────────────────────────────────────"
|
||||
echo " NEXT STEPS"
|
||||
echo "────────────────────────────────────────────"
|
||||
echo ""
|
||||
echo "1. Add secrets to the agenix .env stack file:"
|
||||
echo ""
|
||||
echo " # ${NAME}"
|
||||
echo " ${TOKEN_VAR}=<paste-discord-bot-token-here>"
|
||||
echo ""
|
||||
echo "2. Restart the AI stack:"
|
||||
echo ""
|
||||
echo " systemctl restart ai_stack.service"
|
||||
echo ""
|
||||
echo "3. In Paperclip, create an agent with HTTP adapter:"
|
||||
echo ""
|
||||
echo " Endpoint: http://${NAME}:${NEW_PORT}/v1/chat/completions"
|
||||
echo " API Key: ${API_KEY}"
|
||||
echo ""
|
||||
echo "────────────────────────────────────────────"
|
||||
@@ -8,10 +8,13 @@ services:
|
||||
- USER_GID=1000
|
||||
- GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
|
||||
- GITEA__actions__ENABLED=true
|
||||
- GITEA__actions__DEFAULT_ACTIONS_URL=off
|
||||
- SSH_PORT=2222
|
||||
- SSH_LISTEN_PORT=2222
|
||||
# Enable Gitea Actions (act_runner required on host)
|
||||
- GITEA__actions__ENABLED=true
|
||||
# Don't fetch actions from GitHub (offline mode + local only)
|
||||
- GITEA__actions__DEFAULT_ACTIONS_URL=off
|
||||
volumes:
|
||||
- /mnt/HoardingCow_docker_data/Gitea:/data
|
||||
networks:
|
||||
|
||||
Reference in New Issue
Block a user