Compare commits
1 Commits
46f3b23a3f
...
feat/7zz-c
| Author | SHA1 | Date | |
|---|---|---|---|
| 9d2404d8f6 |
33
ai/compose.yml
Executable file → Normal file
33
ai/compose.yml
Executable file → Normal file
@@ -32,16 +32,13 @@ services:
|
|||||||
- default
|
- default
|
||||||
container_name: hermes
|
container_name: hermes
|
||||||
entrypoint: ["/bin/bash", "-c",
|
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"]
|
"hermes-entrypoint"]
|
||||||
restart: always
|
restart: always
|
||||||
|
# Gateway run enables the internal API server on port 8642
|
||||||
|
command: gateway run
|
||||||
environment:
|
environment:
|
||||||
- OLLAMA_HOST=http://ollama:11434
|
- 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_ENABLED=true
|
||||||
- API_SERVER_PORT=8642
|
- API_SERVER_PORT=8642
|
||||||
- API_SERVER_HOST=0.0.0.0
|
- API_SERVER_HOST=0.0.0.0
|
||||||
@@ -69,30 +66,6 @@ services:
|
|||||||
- "26"
|
- "26"
|
||||||
networks:
|
networks:
|
||||||
- ai_backend
|
- 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:
|
syncthing:
|
||||||
image: syncthing/syncthing:latest
|
image: syncthing/syncthing:latest
|
||||||
|
|||||||
@@ -20,10 +20,16 @@ RUN --mount=type=ssh \
|
|||||||
GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
|
GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
|
||||||
git clone --depth 1 --branch main \
|
git clone --depth 1 --branch main \
|
||||||
git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
|
git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
|
||||||
rm -rf fork/node_modules fork/.venv fork/.git && \
|
rsync -a --delete fork/ /opt/hermes/ \
|
||||||
cp -a fork/. /opt/hermes/ && \
|
--exclude node_modules \
|
||||||
|
--exclude .venv \
|
||||||
|
--exclude .git && \
|
||||||
rm -rf /tmp/fork /root/.ssh/
|
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) ----------
|
# ---------- Reinstall Python package (editable) ----------
|
||||||
# Picks up source changes from our fork.
|
# Picks up source changes from our fork.
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
RUN . /opt/hermes/.venv/bin/activate && \
|
||||||
@@ -34,7 +40,6 @@ USER root
|
|||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
libportaudio2 ca-certificates poppler-utils imagemagick \
|
libportaudio2 ca-certificates poppler-utils imagemagick \
|
||||||
libolm-dev \
|
|
||||||
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
||||||
texlive-xetex texlive-science \
|
texlive-xetex texlive-science \
|
||||||
qemu-user-static binfmt-support emacs-nox && \
|
qemu-user-static binfmt-support emacs-nox && \
|
||||||
@@ -43,12 +48,6 @@ RUN apt-get update && \
|
|||||||
# ---------- UV ----------
|
# ---------- UV ----------
|
||||||
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
|
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 ----------
|
# ---------- Piper TTS ----------
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
RUN . /opt/hermes/.venv/bin/activate && \
|
||||||
uv pip install --no-cache-dir piper-tts sounddevice numpy && \
|
uv pip install --no-cache-dir piper-tts sounddevice numpy && \
|
||||||
@@ -76,6 +75,43 @@ os.remove(tgz)
|
|||||||
print('himalaya v1.2.0 installed')
|
print('himalaya v1.2.0 installed')
|
||||||
PYEOF
|
PYEOF
|
||||||
|
|
||||||
|
# ---------- Install himalaya-ro wrapper ----------
|
||||||
|
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
||||||
|
|
||||||
|
|
||||||
|
# ---------- Install 7-Zip (7zz) for CHM extraction ----------
|
||||||
|
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
|
import urllib.request, tarfile, os, shutil, re, subprocess
|
||||||
|
|
||||||
|
# Scrape 7-zip.org for latest Linux x64 binary link
|
||||||
|
url = 'https://7-zip.org/download.html'
|
||||||
|
req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
|
||||||
|
r = urllib.request.urlopen(req, timeout=15)
|
||||||
|
html = r.read().decode()
|
||||||
|
match = re.search(r'href="(a/7z[\d]+-linux-x64\.tar\.xz)"', html)
|
||||||
|
if not match:
|
||||||
|
raise RuntimeError('Could not find 7z Linux x64 download link on 7-zip.org')
|
||||||
|
dl_url = f'https://7-zip.org/{match.group(1)}'
|
||||||
|
|
||||||
|
# Follow Himalaya pattern: download, extract, install, verify
|
||||||
|
xz = '/tmp/7z.tar.xz'
|
||||||
|
urllib.request.urlretrieve(dl_url, xz)
|
||||||
|
os.makedirs('/tmp/7z', exist_ok=True)
|
||||||
|
with tarfile.open(xz, 'r:xz') as t:
|
||||||
|
t.extractall('/tmp/7z')
|
||||||
|
shutil.move('/tmp/7z/7zz', '/usr/local/bin/7zz')
|
||||||
|
os.chmod('/usr/local/bin/7zz', 0o755)
|
||||||
|
shutil.rmtree('/tmp/7z', ignore_errors=True)
|
||||||
|
os.remove(xz)
|
||||||
|
|
||||||
|
# Verify
|
||||||
|
result = subprocess.run(['/usr/local/bin/7zz'], capture_output=True, text=True)
|
||||||
|
assert result.returncode == 0, f'7zz verify failed: {result.stderr}'
|
||||||
|
version = result.stdout.split()[2] if result.stdout else 'unknown'
|
||||||
|
print(f'7-Zip {version} installed successfully')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
@@ -85,7 +121,6 @@ ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
|
|||||||
|
|
||||||
# Ensure tools directory and toolsets.py are writable by the hermes runtime user
|
# 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.
|
# 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
|
RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
|
||||||
|
|
||||||
VOLUME [ "/opt/data" ]
|
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" "$@"
|
||||||
Reference in New Issue
Block a user