Compare commits
1 Commits
352f9a9e78
...
feat/drop-
| Author | SHA1 | Date | |
|---|---|---|---|
| b6bb0ad744 |
@@ -72,8 +72,6 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- ai_backend
|
- ai_backend
|
||||||
- ai_net
|
- ai_net
|
||||||
depends_on:
|
|
||||||
- honcho
|
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.docker.network=ai_net"
|
- "traefik.docker.network=ai_net"
|
||||||
@@ -127,7 +125,6 @@ services:
|
|||||||
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
|
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
|
||||||
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
|
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
|
||||||
|
|
||||||
|
|
||||||
ollama:
|
ollama:
|
||||||
build:
|
build:
|
||||||
context: ./ollama
|
context: ./ollama
|
||||||
@@ -161,84 +158,6 @@ services:
|
|||||||
- "303"
|
- "303"
|
||||||
- "26"
|
- "26"
|
||||||
|
|
||||||
# --- Honcho + OpenConcho combiné: API + Web UI nginx/FastAPI ---
|
|
||||||
honcho-ui:
|
|
||||||
build: ./honcho
|
|
||||||
container_name: honcho-ui
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
- DB_CONNECTION_URI=postgresql+psycopg://honcho:honcho_pass@honcho-db:5432/honcho
|
|
||||||
- CACHE_URL=redis://honcho-redis:6379/0
|
|
||||||
- CACHE_ENABLED=true
|
|
||||||
- EMBEDDING_VECTOR_DIMENSIONS=1536
|
|
||||||
- VECTOR_STORE_DIMENSIONS=1536
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Honcho/data:/app/data
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
- ai_net
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
|
|
||||||
# Router for HTTP + redirect to HTTPS
|
|
||||||
- "traefik.http.routers.honcho-http.rule=Host(`honcho.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.honcho-http.entrypoints=web"
|
|
||||||
- "traefik.http.routers.honcho-http.middlewares=redirect-to-https"
|
|
||||||
|
|
||||||
# Router for HTTPS with TLS — protected by Authelia
|
|
||||||
- "traefik.http.routers.honcho-https.rule=Host(`honcho.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.honcho-https.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.honcho-https.tls=true"
|
|
||||||
- "traefik.http.routers.honcho-https.tls.certresolver=njalla"
|
|
||||||
- "traefik.http.routers.honcho-https.middlewares=hermes-auth"
|
|
||||||
|
|
||||||
# Service Loadbalancer (nginx port)
|
|
||||||
- "traefik.http.services.honcho.loadbalancer.server.port=80"
|
|
||||||
depends_on:
|
|
||||||
honcho-db:
|
|
||||||
condition: service_healthy
|
|
||||||
honcho-redis:
|
|
||||||
condition: service_healthy
|
|
||||||
|
|
||||||
honcho-db:
|
|
||||||
image: pgvector/pgvector:pg15
|
|
||||||
container_name: honcho-db
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:5432:5432"
|
|
||||||
command: ["postgres", "-c", "max_connections=200"]
|
|
||||||
environment:
|
|
||||||
- POSTGRES_DB=honcho
|
|
||||||
- POSTGRES_USER=honcho
|
|
||||||
- POSTGRES_PASSWORD=honcho_pass
|
|
||||||
- PGDATA=/var/lib/postgresql/data/pgdata
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Honcho/postgres:/var/lib/postgresql/data
|
|
||||||
- ./honcho/init-db.sql:/docker-entrypoint-initdb.d/init.sql:ro
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U honcho -d honcho"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
|
|
||||||
honcho-redis:
|
|
||||||
image: redis:8
|
|
||||||
container_name: honcho-redis
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:6379:6379"
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Honcho/redis:/data
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "redis-cli ping"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
ai_net:
|
ai_net:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ RUN --mount=type=ssh \
|
|||||||
ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
|
ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
|
||||||
cd /tmp && \
|
cd /tmp && \
|
||||||
GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
|
GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
|
||||||
git clone --depth 1 --branch main \
|
# Branch feat/drop-multi-memory: upstream + Piper TTS patch only (no multi-memory patch)
|
||||||
|
git clone --depth 1 --branch feat/drop-multi-memory \
|
||||||
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 && \
|
rm -rf fork/node_modules fork/.venv fork/.git && \
|
||||||
cp -a fork/. /opt/hermes/ && \
|
cp -a fork/. /opt/hermes/ && \
|
||||||
@@ -43,14 +44,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
|
|
||||||
|
|
||||||
WORKDIR /opt/hermes
|
|
||||||
|
|
||||||
# ---------- Matrix bridge + extra pip deps ----------
|
# ---------- Matrix bridge + extra pip deps ----------
|
||||||
# Previously installed inline at container startup and persisted via volume mount.
|
# 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.
|
# Now baked into the image so the fragile venv volume mount can be removed.
|
||||||
|
|||||||
@@ -1,74 +0,0 @@
|
|||||||
# build stage — fetches and builds Honcho from source
|
|
||||||
FROM python:3.13-slim-bookworm AS honcho-builder
|
|
||||||
|
|
||||||
RUN apt-get update && \
|
|
||||||
apt-get install -y --no-install-recommends git && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY --from=ghcr.io/astral-sh/uv:0.9.24 /uv /bin/uv
|
|
||||||
|
|
||||||
ARG HONCHO_REPO=https://github.com/plastic-labs/honcho
|
|
||||||
ARG HONCHO_REF=main
|
|
||||||
RUN git clone --depth 1 --branch ${HONCHO_REF} ${HONCHO_REPO} /app
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
ENV UV_COMPILE_BYTECODE=1
|
|
||||||
ENV UV_LINK_MODE=copy
|
|
||||||
ENV UV_PYTHON=/usr/local/bin/python3.13
|
|
||||||
|
|
||||||
RUN uv sync --frozen
|
|
||||||
|
|
||||||
# build stage — builds OpenConcho SPA
|
|
||||||
FROM node:22-bookworm AS openconcho-builder
|
|
||||||
|
|
||||||
ENV PNPM_HOME=/pnpm
|
|
||||||
ENV PATH=$PNPM_HOME:$PATH
|
|
||||||
RUN corepack enable && corepack prepare pnpm@latest --activate
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
ARG OPENCONCHO_SHA=e490d911fcb27ee193558fd9a28856cde2057665
|
|
||||||
RUN git clone --depth 1 https://github.com/offendingcommit/openconcho.git /app && \
|
|
||||||
git -C /app fetch --depth 1 origin ${OPENCONCHO_SHA} && \
|
|
||||||
git -C /app checkout ${OPENCONCHO_SHA}
|
|
||||||
|
|
||||||
RUN pnpm install --frozen-lockfile
|
|
||||||
RUN pnpm --filter @openconcho/web build
|
|
||||||
|
|
||||||
# runtime stage — nginx + Honcho FastAPI
|
|
||||||
FROM python:3.13-slim-bookworm
|
|
||||||
|
|
||||||
# Install nginx and create runtime dirs before dropping permissions
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends nginx && \
|
|
||||||
rm -rf /var/log/nginx/* && \
|
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
|
||||||
rm -f /etc/nginx/sites-enabled/default
|
|
||||||
|
|
||||||
# Patch nginx.conf: comment out "user www-data;" so nginx master stays as root
|
|
||||||
# (workers inherit root inside a container — fine for single-service isolation)
|
|
||||||
RUN sed -i 's/^user /# user /' /etc/nginx/nginx.conf
|
|
||||||
|
|
||||||
# Pre-create nginx runtime directories with proper ownership
|
|
||||||
RUN mkdir -p /var/lib/nginx/body /var/lib/nginx/proxy /var/lib/nginx/fastcgi \
|
|
||||||
/var/lib/nginx/uwsgi /var/lib/nginx/scgi /var/lib/nginx/proxy_temp \
|
|
||||||
/var/cache/nginx && \
|
|
||||||
chown -R root:root /var/lib/nginx /var/cache/nginx
|
|
||||||
|
|
||||||
# Honcho
|
|
||||||
COPY --from=honcho-builder /app /app
|
|
||||||
WORKDIR /app
|
|
||||||
ENV PATH="/app/.venv/bin:$PATH"
|
|
||||||
ENV HOME=/app
|
|
||||||
COPY config.toml /app/config.toml
|
|
||||||
|
|
||||||
# OpenConcho SPA
|
|
||||||
COPY --from=openconcho-builder /app/packages/web/dist /usr/share/nginx/html
|
|
||||||
|
|
||||||
# nginx config (proxies /v3/, /v2/ to Honcho on localhost:8000)
|
|
||||||
COPY honcho-nginx.conf /etc/nginx/conf.d/default.conf
|
|
||||||
|
|
||||||
EXPOSE 80
|
|
||||||
|
|
||||||
CMD ["sh", "-c", "nginx -g 'daemon off;' & fastapi run --host 127.0.0.1 --port 8000 src/main.py"]
|
|
||||||
@@ -1,117 +0,0 @@
|
|||||||
[app]
|
|
||||||
LOG_LEVEL = "INFO"
|
|
||||||
MAX_MESSAGE_SIZE = 25000
|
|
||||||
EMBED_MESSAGES = true
|
|
||||||
NAMESPACE = "honcho"
|
|
||||||
|
|
||||||
[db]
|
|
||||||
CONNECTION_URI = "postgresql+psycopg://honcho:honcho_pass@honcho-db:5432/honcho"
|
|
||||||
SCHEMA = "public"
|
|
||||||
POOL_SIZE = 10
|
|
||||||
MAX_OVERFLOW = 20
|
|
||||||
|
|
||||||
[auth]
|
|
||||||
USE_AUTH = false
|
|
||||||
|
|
||||||
[sentry]
|
|
||||||
ENABLED = false
|
|
||||||
|
|
||||||
[telemetry]
|
|
||||||
ENABLED = false
|
|
||||||
|
|
||||||
[webhook]
|
|
||||||
ENABLED = false
|
|
||||||
|
|
||||||
[cache]
|
|
||||||
ENABLED = true
|
|
||||||
URL = "redis://honcho-redis:6379/0"
|
|
||||||
|
|
||||||
[llm]
|
|
||||||
DEFAULT_MAX_TOKENS = 4096
|
|
||||||
|
|
||||||
# Embeddings via Ollama (nomic-embed-text recommended on this system)
|
|
||||||
[embedding]
|
|
||||||
VECTOR_DIMENSIONS = 768
|
|
||||||
MAX_INPUT_TOKENS = 8192
|
|
||||||
|
|
||||||
[embedding.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "nomic-embed-text"
|
|
||||||
base_url = "http://ollama:11434/v1"
|
|
||||||
|
|
||||||
# --- Deriver (user representation builder) ---
|
|
||||||
[deriver]
|
|
||||||
ENABLED = true
|
|
||||||
WORKERS = 1
|
|
||||||
POLLING_SLEEP_INTERVAL_SECONDS = 5.0
|
|
||||||
FLUSH_ENABLED = true
|
|
||||||
|
|
||||||
[deriver.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "hermes-3"
|
|
||||||
base_url = "http://ollama:11434/v1"
|
|
||||||
|
|
||||||
# --- Dialectic ---
|
|
||||||
[dialectic]
|
|
||||||
MAX_INPUT_TOKENS = 4096
|
|
||||||
SESSION_HISTORY_MAX_TOKENS = 8192
|
|
||||||
|
|
||||||
[dialectic.levels.minimal]
|
|
||||||
MAX_TOOL_ITERATIONS = 1
|
|
||||||
MAX_OUTPUT_TOKENS = 512
|
|
||||||
[dialectic.levels.minimal.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "hermes-3"
|
|
||||||
base_url = "http://ollama:11434/v1"
|
|
||||||
|
|
||||||
[dialectic.levels.low]
|
|
||||||
MAX_TOOL_ITERATIONS = 3
|
|
||||||
[dialectic.levels.low.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "hermes-3"
|
|
||||||
base_url = "http://ollama:11434/v1"
|
|
||||||
|
|
||||||
[dialectic.levels.medium]
|
|
||||||
MAX_TOOL_ITERATIONS = 2
|
|
||||||
[dialectic.levels.medium.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "hermes-3"
|
|
||||||
base_url = "http://ollama:11434/v1"
|
|
||||||
|
|
||||||
[dialectic.levels.high]
|
|
||||||
MAX_TOOL_ITERATIONS = 4
|
|
||||||
[dialectic.levels.high.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "hermes-3"
|
|
||||||
base_url = "http://ollama:11434/v1"
|
|
||||||
|
|
||||||
[dialectic.levels.max]
|
|
||||||
MAX_TOOL_ITERATIONS = 10
|
|
||||||
[dialectic.levels.max.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "hermes-3"
|
|
||||||
base_url = "http://ollama:11434/v1"
|
|
||||||
|
|
||||||
# --- Summary ---
|
|
||||||
[summary]
|
|
||||||
ENABLED = true
|
|
||||||
MESSAGES_PER_SHORT_SUMMARY = 20
|
|
||||||
MESSAGES_PER_LONG_SUMMARY = 60
|
|
||||||
|
|
||||||
[summary.model_config]
|
|
||||||
transport = "openai"
|
|
||||||
model = "hermes-3"
|
|
||||||
base_url = "http://ollama:11434/v1"
|
|
||||||
|
|
||||||
# --- Dream ---
|
|
||||||
[dream]
|
|
||||||
ENABLED = false
|
|
||||||
|
|
||||||
# --- Peer Card ---
|
|
||||||
[peer_card]
|
|
||||||
ENABLED = true
|
|
||||||
|
|
||||||
# --- Vector Store ---
|
|
||||||
[vector_store]
|
|
||||||
TYPE = "pgvector"
|
|
||||||
DIMENSIONS = 768
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
server {
|
|
||||||
listen 80 default_server;
|
|
||||||
listen [::]:80 default_server;
|
|
||||||
server_name _;
|
|
||||||
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
index index.html;
|
|
||||||
|
|
||||||
# Honcho API proxy
|
|
||||||
location /v3/ {
|
|
||||||
proxy_pass http://127.0.0.1:8000;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /v2/ {
|
|
||||||
proxy_pass http://127.0.0.1:8000;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Honcho health
|
|
||||||
location /health {
|
|
||||||
proxy_pass http://127.0.0.1:8000;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
# OpenAPI docs
|
|
||||||
location /openapi.json {
|
|
||||||
proxy_pass http://127.0.0.1:8000;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
# SPA: fallback to index.html for client-side routing
|
|
||||||
location / {
|
|
||||||
try_files $uri $uri/ /index.html;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
CREATE EXTENSION IF NOT EXISTS vector;
|
|
||||||
Reference in New Issue
Block a user