Compare commits

...

14 Commits

Author SHA1 Message Date
5e242eb946 fix: add iptables-nft to wg-easy for nftables-only kernels
wg-easy's Alpine wg-quick uses legacy iptables which requires the
iptable_nat kernel module. On NixOS kernels compiled without legacy
netfilter modules, the container crashes in a restart loop:

  iptables v1.8.3 (legacy): can't initialize iptables table 'nat'
  Table does not exist (do you need to insmod?)

Fix: build a custom image that installs Alpine's iptables-nft package
and symlinks iptables -> iptables-nft (nftables backend).
2026-05-12 14:52:33 -04:00
Thierry Pouplier
d97f1cb1e5 fix: add startup permission fix for data volume (chown critical dirs on boot) 2026-05-09 16:04:32 +00:00
Thierry Pouplier
1a1cfec80a fix: add atomic write permission fix (preserves file mode on os.replace) 2026-05-09 15:50:29 +00:00
Thierry Pouplier
90e227bc4e feat: switch back to Ryan high quality voice 2026-05-09 15:21:49 +00:00
Thierry Pouplier
8e9a75fe5c fix: remove patch step from Dockerfile (build context is just ai/) 2026-05-09 14:28:35 +00:00
Thierry Pouplier
3016d0da2c fix: patch source tts_tool.py path, not site-packages 2026-05-09 14:27:07 +00:00
Thierry Pouplier
b750d26d80 feat: switch to Norman voice (US male, medium) 2026-05-09 14:20:46 +00:00
Thierry Pouplier
0a9507de65 fix: add ca-certificates for HuggingFace download 2026-05-09 14:14:52 +00:00
Thierry Pouplier
b3fa424661 fix: correct COPY path for patch_tts_tool.py (build context is ai/) 2026-05-09 14:12:06 +00:00
Thierry Pouplier
77fe8133ae fix: Dockerfile heredoc for voice download instead of multi-line -c 2026-05-09 14:09:50 +00:00
Thierry Pouplier
3f080da35e fix: clean patch script - only target Edge, no Coqui references 2026-05-09 13:59:09 +00:00
Thierry Pouplier
78f499bde8 fix: use full OPENROUTER_API_KEY variable name 2026-05-09 13:55:38 +00:00
Thierry Pouplier
e779818e73 chore: remove pycache 2026-05-09 13:41:54 +00:00
Thierry Pouplier
25d7611043 fix: clean Dockerfile with Piper TTS, external patch script 2026-05-09 13:41:37 +00:00
6 changed files with 215 additions and 44 deletions

View File

@@ -16,7 +16,8 @@ RUN apt-get update && \
texlive-latex-base texlive-latex-extra texlive-fonts-recommended texlive-xetex texlive-science \ texlive-latex-base texlive-latex-extra texlive-fonts-recommended texlive-xetex texlive-science \
qemu-user-static binfmt-support qemu-user-binfmt \ qemu-user-static binfmt-support qemu-user-binfmt \
emacs-nox \ emacs-nox \
libportaudio2 && \ libportaudio2 \
ca-certificates && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Création de l'utilisateur 'hermes' directement avec les bons accès # Création de l'utilisateur 'hermes' directement avec les bons accès
@@ -38,48 +39,68 @@ USER hermes
# On copie tout le projet d'un coup sans assumer la présence de fichiers de lock spécifiques # On copie tout le projet d'un coup sans assumer la présence de fichiers de lock spécifiques
COPY --chown=hermes:hermes . . COPY --chown=hermes:hermes . .
# ---------- Python virtualenv ---------- # ---------- Python virtualenv avec Piper TTS ----------
RUN uv venv && \ RUN uv venv && \
uv pip install --no-cache-dir sounddevice numpy faster-whisper uv pip install --no-cache-dir piper-tts sounddevice numpy faster-whisper
# ---------- Patch tts_tool.py to add Coqui provider ---------- # ---------- Télécharger la voix Piper Ryan (high quality) ----------
RUN /opt/hermes/.venv/bin/python3 -c " RUN mkdir -p /opt/hermes/.venv/share/piper/voices && \
tts_path = '/opt/hermes/.venv/lib/python3.13/site-packages/tools/tts_tool.py' /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
with open(tts_path) as f: import urllib.request
code = f.read() base = '/opt/hermes/.venv/share/piper/voices'
coqui_block = ''' url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
elif provider == \"coqui\": urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
logger.info(\"Generating speech with Coqui TTS (GPU, local)...\") urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
import subprocess PYEOF
coqui_python = \"/opt/coqui-tts/bin/python3\"
coqui_script = \"/opt/coqui-tts/bin/coqui_synth.py\" # ---------- Patch atomic writes to preserve file permissions ----------
coqui_config = tts_config.get(\"coqui\", {}) # Fixes https://github.com/NousResearch/hermes-agent/issues/14181
model = coqui_config.get(\"model\", \"tts_models/en/vctk/vits\") # tempfile.mkstemp() creates files as 0600; os.replace() preserves that mode,
use_gpu = coqui_config.get(\"use_gpu\", True) # so group-readable files silently collapse to owner-private 0600.
speaker = coqui_config.get(\"speaker\", \"\") # This affects: skills, sessions, memories, and any file written atomically.
cmd = [ RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
coqui_python, coqui_script, import os
\"--text\", text,
\"--out\", file_str, patches = [
\"--model\", model, ("/opt/hermes/tools/skill_manager_tool.py", [
] ("# Restore existing file mode if present", True), # already patched
if use_gpu: ]),
cmd.append(\"--gpu\") ("/opt/hermes/tools/skills_sync.py", [
if speaker: ("# Restore existing file mode if present", True), # already patched
cmd.extend([\"--speaker\", speaker]) ]),
result = subprocess.run(cmd, capture_output=True, text=True, timeout=120) ]
if result.returncode != 0:
stderr = result.stderr.strip() for fpath, checks in patches:
raise RuntimeError(f\"Coqui TTS failed: {stderr or 'unknown error'}\") if not os.path.exists(fpath):
logger.info(\"Coqui TTS audio saved: %s\", file_str) print(f"SKIP {fpath} (not found)")
''' continue
code = code.replace( with open(fpath) as f:
' else:\n # Default: Edge TTS (free), with NeuTTS as local fallback', code = f.read()
coqui_block + ' else:\n # Default: Edge TTS (free), with NeuTTS as local fallback' all_ok = all(marker in code for marker, _ in checks)
) if all_ok:
with open(tts_path, 'w') as f: print(f"OK {fpath} (already patched)")
f.write(code) continue
" print(f"PATCH {fpath}")
# _atomic_write_text in skill_manager_tool.py
code = code.replace(
" os.replace(temp_path, file_path)",
" if file_path.exists():\n"
" existing_mode = file_path.stat().st_mode\n"
" os.chmod(temp_path, existing_mode)\n"
" os.replace(temp_path, file_path)",
)
# _write_manifest in skills_sync.py
code = code.replace(
" os.replace(tmp_path, MANIFEST_FILE)",
" if MANIFEST_FILE.exists():\n"
" existing_mode = MANIFEST_FILE.stat().st_mode\n"
" os.chmod(tmp_path, existing_mode)\n"
" os.replace(tmp_path, MANIFEST_FILE)",
)
with open(fpath, 'w') as f:
f.write(code)
print(f"DONE {fpath}")
PYEOF
# ---------- Runtime ---------- # ---------- Runtime ----------
ENV HERMES_HOME=/opt/data ENV HERMES_HOME=/opt/data
@@ -87,5 +108,9 @@ ENV PATH="/opt/data/.local/bin:${PATH}"
VOLUME [ "/opt/data" ] VOLUME [ "/opt/data" ]
# Copie du script de réparation des permissions (lancement au démarrage)
COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
# Le conteneur tourne de manière ultra-sécurisée sous l'utilisateur hermes dès le départ # 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" ] # fix-permissions.sh chown les répertoires critiques avant de chaîner vers entrypoint.sh
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]

View File

@@ -38,7 +38,7 @@ services:
- API_SERVER_HOST=0.0.0.0 - API_SERVER_HOST=0.0.0.0
- 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=${OPEN...KEY} - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
# ROCm for GPU-accelerated faster-whisper STT # ROCm for GPU-accelerated faster-whisper STT
- HSA_OVERRIDE_GFX_VERSION=9.0.6 - HSA_OVERRIDE_GFX_VERSION=9.0.6
- HCC_AMDGPU_TARGET=gfx906 - HCC_AMDGPU_TARGET=gfx906

31
ai/fix-permissions.sh Normal file
View File

@@ -0,0 +1,31 @@
#!/bin/bash
# Startup permission fix for the Hermes data volume.
# Runs as root before the entrypoint drops to the hermes user.
# Fixes files that were created by root (host agent, cron jobs, etc.)
# becoming inaccessible to the hermes runtime user.
set -e
HERMES_HOME="${HERMES_HOME:-/opt/data}"
# Fix ownership on critical writable directories so hermes user can access them
chown -R hermes:hermes \
"$HERMES_HOME/sessions" \
"$HERMES_HOME/checkpoints" \
"$HERMES_HOME/skills" \
"$HERMES_HOME/memories" \
"$HERMES_HOME/workspace" \
"$HERMES_HOME/pastes" \
"$HERMES_HOME/logs" \
"$HERMES_HOME/cron" \
"$HERMES_HOME/plans" \
"$HERMES_HOME/hooks" \
"$HERMES_HOME/cache" \
2>/dev/null || true
# Also fix the data volume root if it's wrong
if [ "$(stat -c %u "$HERMES_HOME" 2>/dev/null)" != "$(id -u hermes)" ]; then
chown hermes:hermes "$HERMES_HOME" 2>/dev/null || true
fi
# Now chain to the real entrypoint
exec /opt/hermes/docker/entrypoint.sh "$@"

96
ai/patch_tts_tool.py Normal file
View File

@@ -0,0 +1,96 @@
#!/usr/bin/env python3
"""Patch Hermes TTS tool: remove Edge TTS, replace with Piper as default/fallback."""
import sys
tts_path = '/opt/hermes/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")

16
vpn/Dockerfile Normal file
View File

@@ -0,0 +1,16 @@
# Custom wg-easy with iptables-nft (nftables-backed iptables)
# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
FROM weejewel/wg-easy:latest
# Alpine's iptables-nft provides iptables that uses nftables kernel API
# instead of the legacy iptable_nat module. This works on kernels
# where only nftables netfilter modules are available.
RUN apk add --no-cache iptables-nft
# Ensure iptables-nft takes priority over legacy iptables
RUN ln -sf /sbin/iptables-nft /sbin/iptables && \
ln -sf /sbin/iptables-nft-save /sbin/iptables-save && \
ln -sf /sbin/iptables-nft-restore /sbin/iptables-restore && \
ln -sf /sbin/ip6tables-nft /sbin/ip6tables && \
ln -sf /sbin/ip6tables-nft-save /sbin/ip6tables-save && \
ln -sf /sbin/ip6tables-nft-restore /sbin/ip6tables-restore

View File

@@ -2,7 +2,10 @@ version: "3.8"
services: services:
wireguard: wireguard:
image: weejewel/wg-easy:latest build:
context: ./vpn
dockerfile: Dockerfile
image: wg-easy-iptables-nft:latest
container_name: wireguard container_name: wireguard
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN