Merge master into fix/matrix-bridge-dependencies to resolve conflicts

Merge pull request #2 : fix: Matrix bridge ModuleNotFoundError - install deps to venv with persistence
# Conflicts: # ai/compose.yml
2026-05-20 14:42:02 -04:00 · 2026-05-20 14:41:06 -04:00 · 2026-04-29 03:34:15 +00:00 · 2026-04-29 02:43:35 +00:00 · 2026-04-29 02:19:24 +00:00
2 changed files with 3 additions and 42 deletions
--- a/ai/Dockerfile
+++ b/ai/Dockerfile
@@ -1,23 +0,0 @@
 FROM debian:13.4
 # Install uv (Python package manager), curl, poppler-utils, and imagemagick
 RUN apt-get update && \
    apt-get install -y --no-install-recommends \
        curl \
        poppler-utils \
        imagemagick && \
    rm -rf /var/lib/apt/lists/*
 # Install uv if not already present (debian:13.4 doesn't ship it)
 COPY --from=ghcr.io/astral-sh/uv:latest /usr/local/bin/uv /usr/local/bin/uv
 RUN uv --version
 # Verify all expected tools are available
 RUN curl --version && \
    pdftotext -v 2>&1 | head -1 && \
    pdfinfo -v 2>&1 | head -1 && \
    pdftoppm -v 2>&1 | head -1 && \
    convert --version | head -1 && \
    identify --version | head -1
 CMD ["/bin/bash"]
--- a/ai/compose.yml
+++ b/ai/compose.yml
@@ -32,11 +32,9 @@ services:
        - default
    container_name: hermes
    entrypoint: ["/bin/bash", "-c",
-      "bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
+      "bash /opt/data/hermes-tools/install.sh && . /opt/hermes/.venv/bin/activate && uv pip install openai 'mautrix[encryption]' -q && 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
      - API_SERVER_ENABLED=true
@@ -58,6 +56,8 @@ services:
      - /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
      # Persist Python venv across container recreation (Matrix bridge deps, etc.)
      - /mnt/HoardingCow_docker_data/Hermes/venv:/opt/hermes/.venv
    devices:
      - /dev/kfd:/dev/kfd
      - /dev/dri:/dev/dri
@@ -129,22 +129,6 @@ services:
      - "303"
      - "26"
  paperclip-db:
    image: postgres:17
    container_name: paperclip-db
    restart: always
    environment:
      - POSTGRES_PASSWORD=${PAPERCLIP_DB_PASSWORD}
    healthcheck:
      test: ["CMD-SHELL", "pg_isready -U postgres"]
      interval: 5s
      timeout: 5s
      retries: 10
    volumes:
      - /mnt/HoardingCow_docker_data/Paperclip/db:/var/lib/postgresql/data
    networks:
      - ai_backend
 networks:
  ai_net:
    external: true
Author	SHA1	Message	Date
Hermes	2ff99b1f57	Merge master into fix/matrix-bridge-dependencies to resolve conflicts Some checks failed Build Hermes agent / build (pull_request) Has been cancelled Details Build ollama (gfx906) / build (pull_request) Has been cancelled Details	2026-05-20 14:42:02 -04:00
Hermes	dea1429a5d	Merge pull request #2 : fix: Matrix bridge ModuleNotFoundError - install deps to venv with persistence # Conflicts: # ai/compose.yml	2026-05-20 14:41:06 -04:00
Thierry Pouplier	2aab06cc1a	fix: use mautrix[encryption] instead of matrix-nio for Matrix bridge The Hermes Matrix gateway uses the mautrix SDK, not matrix-nio. This fixes E2EE support by installing the correct library. Refs: PR #2	2026-04-29 03:34:15 +00:00
Thierry Pouplier	a404f5e2c4	fix: Correct OPENROUTER_API_KEY variable name	2026-04-29 02:43:35 +00:00
Thierry Pouplier	f9afd79f3e	fix: Add openai and matrix-nio dependencies for Hermes Matrix bridge	2026-04-29 02:19:24 +00:00