Compare commits

..

1 Commits

Author SHA1 Message Date
Thierry Pouplier
b416d72454 feat(ai): add emacs-nox (PR 5/5)
Add Emacs nox (no X11) for terminal-based Emacs editing.

Depends on PR #7, #8, #9, and #10
2026-04-29 21:25:49 +00:00
6 changed files with 71 additions and 213 deletions

View File

@@ -1,66 +1,64 @@
# 1. On récupère la version la plus récente d'UV FROM ghcr.io/astral-sh/uv:0.11.6-python3.13-trixie@sha256:b3c543b6c4f23a5f2df22866bd7857e5d304b67a564f4feab6ac22044dde719b AS uv_source
FROM ghcr.io/astral-sh/uv:latest AS uv_source FROM tianon/gosu:1.19-trixie@sha256:3b176695959c71e123eb390d427efc665eeb561b1540e82679c15e992006b8b9 AS gosu_source
FROM debian:13.4
# 2. Image de base stable
FROM debian:stable-slim
# Disable Python stdout buffering to ensure logs are printed immediately # Disable Python stdout buffering to ensure logs are printed immediately
ENV PYTHONUNBUFFERED=1 ENV PYTHONUNBUFFERED=1
# Store Playwright browsers outside the volume mount so the build-time
# install survives the /opt/data volume overlay at runtime.
ENV PLAYWRIGHT_BROWSERS_PATH=/opt/hermes/.playwright
# Install system dependencies in one layer, clear APT cache # Install system dependencies in one layer, clear APT cache
# tini reaps orphaned zombie processes (MCP stdio subprocesses, git, bun, etc.) # tini reaps orphaned zombie processes (MCP stdio subprocesses, git, bun, etc.)
# that would otherwise accumulate when hermes runs as PID 1. See #15012.
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
build-essential python3 ripgrep ffmpeg gcc python3-dev libffi-dev procps git openssh-client docker-cli tini \ build-essential nodejs npm python3 ripgrep ffmpeg gcc python3-dev libffi-dev procps git openssh-client docker-cli tini \
curl poppler-utils imagemagick \ curl poppler-utils imagemagick && \
texlive-latex-base texlive-latex-extra texlive-fonts-recommended texlive-xetex texlive-science \
qemu-user-static binfmt-support qemu-user-binfmt \
emacs-nox \
libportaudio2 && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Création de l'utilisateur 'hermes' directement avec les bons accès # Non-root user for runtime; UID can be overridden via HERMES_UID at runtime
RUN useradd -u 10000 -m -d /opt/data hermes RUN useradd -u 10000 -m -d /opt/data hermes
# Copie d'uv (dernière version) COPY --chmod=0755 --from=gosu_source /gosu /usr/local/bin/
COPY --chmod=0755 --from=uv_source /uv /usr/local/bin/ COPY --chmod=0755 --from=uv_source /usr/local/bin/uv /usr/local/bin/uvx /usr/local/bin/
WORKDIR /opt/hermes WORKDIR /opt/hermes
# On donne la propriété du dossier de travail à l'utilisateur hermes # ---------- Layer-cached dependency install ----------
RUN chown hermes:hermes /opt/hermes # Copy only package manifests first so npm install + Playwright are cached
# unless the lockfiles themselves change.
COPY package.json package-lock.json ./
COPY web/package.json web/package-lock.json web/
# ---------- Hermes venv ---------- RUN npm install --prefer-offline --no-audit && \
# Passer immédiatement sous l'utilisateur hermes pour tout le reste du build npx playwright install --with-deps chromium --only-shell && \
USER hermes (cd web && npm install --prefer-offline --no-audit) && \
npm cache clean --force
# ---------- Source code ---------- # ---------- Source code ----------
# On copie tout le projet d'un coup sans assumer la présence de fichiers de lock spécifiques # .dockerignore excludes node_modules, so the installs above survive.
COPY --chown=hermes:hermes . . COPY --chown=hermes:hermes . .
# ---------- Python virtualenv avec Piper TTS ---------- # Build web dashboard (Vite outputs to hermes_cli/web_dist/)
RUN cd web && npm run build
# ---------- Permissions ----------
# Make install dir world-readable so any HERMES_UID can read it at runtime.
# The venv needs to be traversable too.
USER root
RUN chmod -R a+rX /opt/hermes
# Start as root so the entrypoint can usermod/groupmod + gosu.
# If HERMES_UID is unset, the entrypoint drops to the default hermes user (10000).
# ---------- Python virtualenv ----------
RUN uv venv && \ RUN uv venv && \
uv pip install --no-cache-dir piper-tts sounddevice numpy faster-whisper uv pip install --no-cache-dir -e ".[all]"
# ---------- Télécharger la voix Piper Ryan ----------
RUN mkdir -p /opt/hermes/.venv/share/piper/voices && \
/opt/hermes/.venv/bin/python3 -c "
import urllib.request
base = '/opt/hermes/.venv/share/piper/voices'
url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
urllib.request.urlretrieve(url + '?download=true', base + '/en_US-ryan-high.onnx')
urllib.request.urlretrieve(url + '.onnx.json?download=true', base + '/en_US-ryan-high.onnx.json')
"
# ---------- Patch tts_tool.py: replace Edge TTS fallback with Piper ----------
COPY ai/patch_tts_tool.py /tmp/patch_tts_tool.py
RUN /opt/hermes/.venv/bin/python3 /tmp/patch_tts_tool.py && rm /tmp/patch_tts_tool.py
# ---------- Runtime ---------- # ---------- Runtime ----------
ENV HERMES_WEB_DIST=/opt/hermes/hermes_cli/web_dist
ENV HERMES_HOME=/opt/data ENV HERMES_HOME=/opt/data
ENV PATH="/opt/data/.local/bin:${PATH}" ENV PATH="/opt/data/.local/bin:${PATH}"
VOLUME [ "/opt/data" ] VOLUME [ "/opt/data" ]
# Le conteneur tourne de manière ultra-sécurisée sous l'utilisateur hermes dès le départ
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/docker/entrypoint.sh" ] ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/docker/entrypoint.sh" ]

View File

@@ -1,32 +1,32 @@
version: "3.8" version: "3.8"
services: services:
# webui: webui:
# image: ghcr.io/open-webui/open-webui:main image: ghcr.io/open-webui/open-webui:main
# volumes: volumes:
# - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
# restart: always restart: always
# environment: environment:
# - OLLAMA_API_BASE_URL=http://ollama:11434/api - OLLAMA_API_BASE_URL=http://ollama:11434/api
# networks: networks:
# - ai_net - ai_net
# - ai_backend - ai_backend
# labels: labels:
# - "traefik.enable=true" - "traefik.enable=true"
# # Router for HTTP + redirection to HTTPS # Router for HTTP + redirection to HTTPS
# - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)" - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
# - "traefik.http.routers.webui-http.entrypoints=web" - "traefik.http.routers.webui-http.entrypoints=web"
# - "traefik.http.routers.webui-http.middlewares=redirect-to-https" - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
# # Router for HTTPS with TLS # Router for HTTPS with TLS
# - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)" - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
# - "traefik.http.routers.webui-https.entrypoints=websecure" - "traefik.http.routers.webui-https.entrypoints=websecure"
# - "traefik.http.routers.webui-https.tls=true" - "traefik.http.routers.webui-https.tls=true"
# - "traefik.http.routers.webui-https.tls.certresolver=njalla" - "traefik.http.routers.webui-https.tls.certresolver=njalla"
hermes: hermes:
build: ./ image: nousresearch/hermes-agent:latest
container_name: hermes container_name: hermes
restart: always restart: always
# Gateway run enables the internal API server on port 8642 # Gateway run enables the internal API server on port 8642
@@ -39,12 +39,6 @@ services:
- API_SERVER_KEY=hermes_local_key - API_SERVER_KEY=hermes_local_key
- GATEWAY_ALLOW_ALL_USERS=true - GATEWAY_ALLOW_ALL_USERS=true
- OPENROUTER_API_KEY=${OPENROUTER_API_KEY} - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
# ROCm for GPU-accelerated faster-whisper STT
- HSA_OVERRIDE_GFX_VERSION=9.0.6
- HCC_AMDGPU_TARGET=gfx906
- HIP_VISIBLE_DEVICES=0,1
- ROCR_VISIBLE_DEVICES=0,1
- HSA_ENABLE_SDMA=0
volumes: volumes:
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data - /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
devices: devices:

View File

@@ -1,96 +0,0 @@
#!/usr/bin/env python3
"""Patch Hermes TTS tool: remove Edge TTS, replace with Piper as default/fallback."""
import sys
tts_path = '/opt/hermes/.venv/lib/python3.13/site-packages/tools/tts_tool.py'
with open(tts_path) as f:
code = f.read()
# Replace the Edge fallback with Piper fallback
old_edge = ''' else:
# Default: Edge TTS (free), with NeuTTS as local fallback
edge_available = True
try:
_import_edge_tts()
except ImportError:
edge_available = False
if edge_available:
logger.info("Generating speech with Edge TTS...")
try:
import concurrent.futures
with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
pool.submit(
lambda: asyncio.run(_generate_edge_tts(text, file_str, tts_config))
).result(timeout=60)
except RuntimeError:
asyncio.run(_generate_edge_tts(text, file_str, tts_config))
elif _check_neutts_available():
logger.info("Edge TTS not available, falling back to NeuTTS (local)...")
provider = "neutts"
_generate_neutts(text, file_str, tts_config)
else:
return json.dumps({
"success": False,
"error": "No TTS provider available. Install edge-tts (pip install edge-tts) "
"or set up NeuTTS for local synthesis."
}, ensure_ascii=False)'''
new_piper = ''' else:
# Default: Piper TTS (local, CPU, no cloud, no Microsoft)
piper_available = False
try:
piper_binary = "/opt/hermes/.venv/bin/piper"
piper_config = tts_config.get("piper", {})
voice = piper_config.get("voice", "en_US-lessac-medium")
model_dir = piper_config.get("model_dir", "/opt/hermes/.venv/share/piper/voices")
model_path = os.path.join(model_dir, f"{voice}.onnx")
if os.path.exists(model_path):
piper_available = True
except Exception:
pass
if piper_available:
logger.info("Generating speech with Piper TTS (local, CPU)...")
import subprocess
piper_binary = "/opt/hermes/.venv/bin/piper"
piper_config = tts_config.get("piper", {})
voice = piper_config.get("voice", "en_US-lessac-medium")
model_dir = piper_config.get("model_dir", "/opt/hermes/.venv/share/piper/voices")
model_path = os.path.join(model_dir, f"{voice}.onnx")
cmd = [piper_binary, "--model", model_path, "--output-raw"]
proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
raw_audio, stderr = proc.communicate(input=text.encode(), timeout=60)
if proc.returncode != 0:
raise RuntimeError(f"Piper TTS failed: {stderr.decode()[:200]}")
ffmpeg_cmd = ["ffmpeg", "-f", "s16le", "-ar", "22050", "-ac", "1", "-i", "-", "-y", file_str]
subprocess.run(ffmpeg_cmd, input=raw_audio, capture_output=True, timeout=30)
logger.info("Piper TTS audio saved: %s", file_str)
else:
return json.dumps({
"success": False,
"error": "No TTS provider available. Install Piper TTS (pip install piper-tts) "
"and download a voice model."
}, ensure_ascii=False)'''
if old_edge in code:
code = code.replace(old_edge, new_piper)
print("Edge fallback replaced with Piper")
else:
if 'Default: Piper TTS' in code:
print("Piper fallback already present")
else:
print("ERROR: Could not find Edge fallback in tts_tool.py")
# Debug output
import re
for m in re.finditer(r' else:\n # Default:', code):
start = max(0, m.start() - 100)
end = min(len(code), m.end() + 200)
print(f"Found else/default at position {m.start()}:")
print(code[start:end])
sys.exit(1)
with open(tts_path, 'w') as f:
f.write(code)
print("tts_tool.py patched successfully")

View File

@@ -1,15 +1,15 @@
version: "3.9" version: "3.9"
services: services:
# nomadnet: nomadnet:
# image: ghcr.io/markqvist/nomadnet:master image: ghcr.io/markqvist/nomadnet:master
# container_name: nomadnet container_name: nomadnet
# restart: always restart: always
# volumes: volumes:
# - /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork - /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork
# - /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum - /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum
# # Reticulum transport must be reachable directly (NOT through Traefik) # Reticulum transport must be reachable directly (NOT through Traefik)
# ports: ports:
# - "4242:4242" - "4242:4242"
synapse: synapse:
image: ghcr.io/element-hq/synapse:latest image: ghcr.io/element-hq/synapse:latest

View File

@@ -13,20 +13,17 @@ services:
- "--certificatesresolvers.njalla.acme.storage=/letsencrypt/acme.json" - "--certificatesresolvers.njalla.acme.storage=/letsencrypt/acme.json"
- "--certificatesresolvers.njalla.acme.httpchallenge.entrypoint=web" - "--certificatesresolvers.njalla.acme.httpchallenge.entrypoint=web"
- "--log.level=INFO" - "--log.level=DEBUG"
- "--log.filepath=/var/log/traefik/traefik.log"
- "--accesslog.filepath=/var/log/traefik/access.log"
- "--providers.docker=true" - "--providers.docker=true"
- "--providers.docker.exposedByDefault=false" - "--providers.docker.exposedByDefault=false"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
environment: environment:
- NJALLA_TOKEN=*** - NJALLA_TOKEN=${NJALLA_TOKEN}
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
- /mnt/HoardingCow_docker_data/Traefik:/letsencrypt - /mnt/HoardingCow_docker_data/Traefik:/letsencrypt
- /var/log/traefik:/var/log/traefik
restart: unless-stopped restart: unless-stopped
networks: networks:
- traefik_backend - traefik_backend

View File

@@ -1,35 +0,0 @@
version: "3.8"
services:
wireguard:
image: weejewel/wg-easy:latest
container_name: wireguard
cap_add:
- NET_ADMIN
- SYS_MODULE
environment:
- WG_HOST=vpn.lazyworkhorse.net
- PASSWORD=${WG_PASSWORD}
- WG_PORT=51820
- WG_DEFAULT_ADDRESS=10.8.0.x
- WG_DEFAULT_DNS=1.1.1.1,8.8.8.8
- WG_ALLOWED_IPS=0.0.0.0/0, ::/0
- WG_PERSISTENT_KEEPALIVE=25
- UI_TRAFFIC_STATS=true
- UI_CHART_TYPE=0
ports:
- "51820:51820/udp"
- "51821:51821/tcp"
volumes:
- /mnt/HoardingCow_docker_data/WireGuard:/etc/wireguard:rw
sysctls:
- net.ipv4.conf.all.src_valid_mark=1
- net.ipv4.ip_forward=1
restart: unless-stopped
networks:
- vpn_net
networks:
vpn_net:
external: true
name: vpn_net