Merge branch 'master' into feat/hermes43-llamacpp

Conflicts resolved:
- hermes env: keep OLLAMA_HOST=ollama-cpu + master's new vars
- ollama→ollama-cpu rename: keep our rename over master's ollama

ai/compose.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
 
   # webui:
@@ -38,7 +37,7 @@ services:
     # Gateway run enables the internal API server on port 8642
     command: gateway run
     environment:
-      - OLLAMA_HOST=http://ollama:11434
+      - OLLAMA_HOST=http://ollama-cpu: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.
@@ -50,6 +49,7 @@ services:
       - API_SERVER_KEY=hermes_local_key
       - GATEWAY_ALLOW_ALL_USERS=true
       - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
+      - OPENCODE_API_KEY=${OPENCODE_API_KEY}
       # ROCm for GPU-accelerated faster-whisper STT
       - HSA_OVERRIDE_GFX_VERSION=9.0.6
       - HCC_AMDGPU_TARGET=gfx906
@@ -127,13 +127,12 @@ services:
       - "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
       - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
 
-
-  ollama:
+  ollama-cpu:
     build:
       context: ./ollama
       dockerfile: Dockerfile
     image: ollama/ollama:rocm-gfx906
-    container_name: ollama
+    container_name: ollama-cpu
     tty: true
     restart: always 
     ports:
@@ -144,25 +143,45 @@ services:
       - /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
     environment:
       - OLLAMA_VULKAN=0
-      - 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 
       - OLLAMA_HOST=0.0.0.0
-      - OLLAMA_DEBUG=1
-      - OLLAMA_FLASH_ATTENTION=1
-      - OLLAMA_NUM_PARALLEL=2
+
+  llama-cpp-hermes:
+    image: llama-cpp:rocm-gfx906
+    container_name: llama-cpp-hermes
+    restart: unless-stopped
+    networks:
+      - ai_backend
+    ports:
+      - "127.0.0.1:8300:8080"
+    ipc: host
     devices:
-      # Map the render nodes and KFD for ROCm to work inside the container
       - /dev/kfd:/dev/kfd
       - /dev/dri:/dev/dri
     group_add:
       - "303"
       - "26"
+    environment:
+      - HSA_OVERRIDE_GFX_VERSION=9.0.6
+      - HSA_ENABLE_SDMA=0
+      - HIP_VISIBLE_DEVICES=0,1
+      - LLAMA_CACHE=/models
+    volumes:
+      - /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
+      - /mnt/HoardingCow_docker_data/Ollama/ollama/models/blobs/sha256-17823599694fa3503ef54bf748d5078c6ce881f4d01616cafa255dc05d215a08:/model.gguf:ro
+    command: >
+      -m /model.gguf
+      --host 0.0.0.0
+      --port 8080
+      --gpu-layers 99
+      --ctx-size 163840
+      -ctk f16 -ctv f16
+      --flash-attn on
+      --split-mode layer
+      --no-mmap
+      --n-predict -1
 
   # --- Honcho + OpenConcho combiné: API + Web UI nginx/FastAPI ---
-  honcho-ui:
+  honcho:
     build:
       context: ./honcho
       ssh:
@@ -173,13 +192,13 @@ services:
       - 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
+      - EMBEDDING_VECTOR_DIMENSIONS=1024
       - AUTH_USE_AUTH=true
       - AUTH_JWT_SECRET=${HONCHO_AUTH_JWT_SECRET}
       # Needed by deriver/dream to make LLM calls (api_key_env = "HONCHO_OPENAI_API_KEY" in config.toml)
       - HONCHO_OPENAI_API_KEY=${HONCHO_OPENAI_API_KEY}
     volumes:
-      - honcho_data:/app/data
+      - /mnt/HoardingCow_docker_data/Honcho/data:/app/data
       - /mnt/HoardingCow_docker_data/Honcho/config.toml:/app/config.toml:ro
     networks:
       - ai_backend
@@ -260,48 +279,6 @@ volumes:
     external: true
     name: honcho_data
     
-  # llama_cpp_devstral:
-  #   image: ghcr.io/ggml-org/llama.cpp:server-rocm
-  #   container_name: llama_cpp_devstral
-  #   restart: unless-stopped
-  #   networks:
-  #     - ai_backend
-  #   ports:
-  #     - "8300:8080"
-  #   ipc: host
-  #   devices:
-  #     - "/dev/kfd:/dev/kfd"
-  #     - "/dev/dri:/dev/dri"
-  #   group_add:
-  #     - "303" # video
-  #     - "26"  # render
-  #   environment:
-  #     HSA_OVERRIDE_GFX_VERSION: 9.0.6
-  #     HIP_VISIBLE_DEVICES: 0,1
-  #     LLAMA_CACHE: /models
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
-  #     - /mnt/HoardingCow_docker_data/Llama_cpp/devstral-agent.jinja:/template.jinja
-  #   command: >
-  #     -hf unsloth/Devstral-Small-2-24B-Instruct-2512-GGUF:Devstral-Small-2-24B-Instruct-2512-Q8_0.gguf
-  #     -a devstral-2-small-llama_cpp
-  #     --chat-template-file /template.jinja
-  #     --host 0.0.0.0
-  #     --port 8080
-  #     --n-gpu-layers 99
-  #     --ctx-size 163840
-  #     --batch-size 4096
-  #     --ubatch-size 4096
-  #     --cache-type-k f16
-  #     --cache-type-v f16
-  #     --cache-reuse 256
-  #     --flash-attn on
-  #     --context-shift
-  #     --split-mode layer
-  #     --no-mmap
-  #     --n-predict -1
-  #     --parallel 2
-
   # vllm:
   #   image: nalanzeyu/vllm-gfx906:v0.9.0-rocm6.3
   #   container_name: vllm

ai/honcho/Dockerfile

@@ -2,13 +2,14 @@
 FROM python:3.13-slim-bookworm AS honcho-builder
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends git && \
+    apt-get install -y --no-install-recommends git openssh-client && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --from=ghcr.io/astral-sh/uv:0.9.24 /uv /bin/uv
 
 ARG HONCHO_REPO=ssh://git@code.lazyworkhorse.net:2222/Hermes/honcho.git
 ARG HONCHO_REF=main
+RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan -p 2222 code.lazyworkhorse.net >> ~/.ssh/known_hosts 2>/dev/null
 RUN --mount=type=ssh git clone --depth 1 --branch ${HONCHO_REF} ${HONCHO_REPO} /app
 
 WORKDIR /app
@@ -29,8 +30,8 @@ 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 && \
+ARG OPENCONCHO_SHA=3b5c3293fc18d768dbe85285264a8d66c896bd81
+RUN --mount=type=ssh git clone --depth 1 ssh://git@code.lazyworkhorse.net:2222/gortium/openconcho.git /app && \
     git -C /app fetch --depth 1 origin ${OPENCONCHO_SHA} && \
     git -C /app checkout ${OPENCONCHO_SHA}
 
@@ -71,4 +72,4 @@ 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 & python3 -m src.deriver & wait -n"]
+CMD ["bash", "-c", "nginx -g 'daemon off;' & fastapi run --host 127.0.0.1 --port 8000 src/main.py & python3 -m src.deriver & wait -n"]

ai/llama-cpp/Dockerfile

@@ -0,0 +1,30 @@
+# llama-cpp-rocm6/Dockerfile
+# Custom llama.cpp server with ROCm 6.1 + gfx906 (MI50) support.
+# Build: docker build -t llama-cpp:rocm-gfx906 .
+
+FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl git build-essential pkg-config cmake make && rm -rf /var/lib/apt/lists/*
+ARG LLAMACPP_VERSION=b9596
+RUN git clone --depth 1 --branch ${LLAMACPP_VERSION} https://github.com/ggml-org/llama.cpp.git /build
+WORKDIR /build
+ENV HIP_PATH=/opt/rocm ROCM_PATH=/opt/rocm PATH=/opt/rocm/bin:/opt/rocm/llvm/bin:${PATH} CMAKE_PREFIX_PATH=/opt/rocm
+RUN mkdir build && cd build && \
+    cmake .. -DGGML_HIP=ON -DCMAKE_BUILD_TYPE=Release \
+      -DAMDGPU_TARGETS="gfx906:xnack-" \
+      -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+      -DGGML_CUDA=OFF -DGGML_VULKAN=OFF -DGGML_METAL=OFF \
+      -DBUILD_SHARED_LIBS=OFF && \
+    cmake --build . --target llama-server -- -j $(nproc)
+
+FROM ubuntu:24.04
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    ca-certificates curl libstdc++6 libgomp1 libopenblas0 \
+    libnuma1 libelf1 libdrm2 libdrm-amdgpu1 \
+    && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
+COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
+COPY --from=builder /build/build/bin/llama-server /usr/local/bin/llama-server
+RUN echo /opt/rocm/lib > /etc/ld.so.conf.d/rocm.conf && ldconfig
+ENV HSA_OVERRIDE_GFX_VERSION=9.0.6 HCC_AMDGPU_TARGET=gfx906 HSA_ENABLE_SDMA=0
+EXPOSE 8080
+ENTRYPOINT ["/usr/local/bin/llama-server"]

copy_script.txt

@@ -1,7 +0,0 @@
-import shutil, os
-src = "/opt/data/projects/gortium/compose/ai/compose_updated.txt"
-dst = "/opt/data/projects/gortium/compose/ai/compose.yml"
-print(f"Source exists: {os.path.exists(src)}, size: {os.path.getsize(src)}")
-print(f"Dest exists: {os.path.exists(dst)}")
-shutil.copy2(src, dst)
-print(f"Copied, dest size: {os.path.getsize(dst)}")

entrypoint-combined.sh

@@ -1,154 +0,0 @@
-#!/bin/bash
-# ── Hermes Workspace Combined Entrypoint ──
-# Waits for the Hermes gateway container (hermes:8642) to become healthy,
-# then starts the Hermes Workspace web UI in the foreground.
-# Supports graceful shutdown via SIGTERM/SIGINT.
-# ──────────────────────────────────────────
-
-set -euo pipefail
-
-# ── Configuration ──────────────────────────────────────────────
-GATEWAY_HOST="${GATEWAY_HOST:-hermes}"
-GATEWAY_PORT="${GATEWAY_PORT:-8642}"
-GATEWAY_URL="http://${GATEWAY_HOST}:${GATEWAY_PORT}"
-
-HEALTH_ENDPOINT="${HEALTH_ENDPOINT:-/health}"
-MAX_RETRIES="${HEALTH_MAX_RETRIES:-60}"
-RETRY_INTERVAL="${HEALTH_RETRY_INTERVAL:-2}"
-
-WORKSPACE_DIR="${WORKSPACE_DIR:-/workspace}"
-WORKSPACE_ENTRY="${WORKSPACE_ENTRY:-server-entry.js}"
-
-PID_FILE="${PID_FILE:-/tmp/workspace.pid}"
-
-# ── Logging ────────────────────────────────────────────────────
-log_info()  { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [INFO]  $*"; }
-log_warn()  { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [WARN]  $*"; }
-log_error() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [ERROR] $*"; }
-
-# ── Graceful Shutdown ──────────────────────────────────────────
-_workspace_pid=""
-_shutting_down=false
-
-cleanup() {
-    if [ "$_shutting_down" = true ]; then
-        return
-    fi
-    _shutting_down=true
-
-    log_info "Shutdown signal received, cleaning up..."
-
-    # Stop workspace process if running
-    if [ -n "$_workspace_pid" ] && kill -0 "$_workspace_pid" 2>/dev/null; then
-        log_info "Stopping workspace (PID: $_workspace_pid)..."
-        kill -TERM "$_workspace_pid" 2>/dev/null || true
-
-        # Give it time to shut down gracefully
-        local wait_sec=10
-        while kill -0 "$_workspace_pid" 2>/dev/null && [ "$wait_sec" -gt 0 ]; do
-            sleep 1
-            wait_sec=$((wait_sec - 1))
-        done
-
-        # Force kill if still running
-        if kill -0 "$_workspace_pid" 2>/dev/null; then
-            log_warn "Workspace did not shut down gracefully, force killing..."
-            kill -KILL "$_workspace_pid" 2>/dev/null || true
-        fi
-    fi
-
-    # Clean up PID file
-    [ -f "$PID_FILE" ] && rm -f "$PID_FILE"
-
-    log_info "Shutdown complete."
-    exit 0
-}
-
-# Trap termination signals for graceful shutdown
-trap cleanup SIGTERM SIGINT
-
-# ── Gateway Health Check ───────────────────────────────────────
-wait_for_gateway() {
-    local url="${GATEWAY_URL}${HEALTH_ENDPOINT}"
-    local retries="$MAX_RETRIES"
-    local interval="$RETRY_INTERVAL"
-    local attempt=0
-
-    log_info "Waiting for Hermes gateway at ${GATEWAY_URL}..."
-    log_info "Max retries: ${retries}, interval: ${interval}s"
-
-    while [ "$attempt" -lt "$retries" ]; do
-        attempt=$((attempt + 1))
-
-        if curl -fsS "${url}" >/dev/null 2>&1; then
-            log_info "Gateway is healthy after ${attempt} attempt(s) (${GATEWAY_URL})"
-            return 0
-        fi
-
-        if [ "$attempt" -lt "$retries" ]; then
-            log_info "Gateway not ready yet (attempt ${attempt}/${retries}), retrying in ${interval}s..."
-            sleep "$interval"
-        fi
-    done
-
-    log_error "Gateway did not become healthy after ${retries} attempts (${retries * interval}s)"
-    return 1
-}
-
-# ── Workspace Startup ──────────────────────────────────────────
-start_workspace() {
-    local entry="${WORKSPACE_DIR}/${WORKSPACE_ENTRY}"
-
-    if [ ! -d "$WORKSPACE_DIR" ]; then
-        log_error "Workspace directory not found: ${WORKSPACE_DIR}"
-        return 1
-    fi
-
-    if [ ! -f "$entry" ]; then
-        log_error "Workspace entry point not found: ${entry}"
-        return 1
-    fi
-
-    log_info "Starting Hermes Workspace web UI..."
-    log_info "  Directory: ${WORKSPACE_DIR}"
-    log_info "  Entry:     ${entry}"
-
-    cd "$WORKSPACE_DIR"
-
-    # Start workspace in background so we can trap signals
-    exec node --max-old-space-size=2048 "${entry}" &
-    _workspace_pid=$!
-    echo "$_workspace_pid" > "$PID_FILE"
-
-    log_info "Workspace started (PID: ${_workspace_pid})"
-
-    # Wait for workspace process
-    wait "$_workspace_pid"
-    local exit_code=$?
-
-    log_info "Workspace exited with code ${exit_code}"
-    return "$exit_code"
-}
-
-# ── Main ───────────────────────────────────────────────────────
-main() {
-    log_info "=== Hermes Workspace Combined Entrypoint ==="
-    log_info "Gateway:   ${GATEWAY_URL}"
-    log_info "Workspace: ${WORKSPACE_DIR}/${WORKSPACE_ENTRY}"
-    log_info "PID file:  ${PID_FILE}"
-
-    # Wait for gateway to be healthy
-    if ! wait_for_gateway; then
-        log_warn "Proceeding without confirmed gateway health..."
-    fi
-
-    # Start the workspace
-    start_workspace
-    local exit_code=$?
-
-    log_info "Entrypoint exiting with code ${exit_code}"
-    return "$exit_code"
-}
-
-# Run main; exit with its return code
-main "$@"

network/compose.yml

@@ -82,37 +82,37 @@ networks:
     driver: bridge
     name: traefik_backend
   ai_net:
-    external: true
+    driver: bridge
     name: ai_net
   auth_net:
-    external: true
+    driver: bridge
     name: auth_net
   backup_net:
-    external: true
+    driver: bridge
     name: backup_net
   cloud_net:
-    external: true
+    driver: bridge
     name: cloud_net
   coms_net:
-    external: true
+    driver: bridge
     name: coms_net
   finance_net:
-    external: true
+    driver: bridge
     name: finance_net
   home_auto_net:
-    external: true
+    driver: bridge
     name: home_auto_net
   homepage_net:
-    external: true
+    driver: bridge
     name: homepage_net
   passman_net:
-    external: true
+    driver: bridge
     name: passman_net
   tak_net:
-    external: true
+    driver: bridge
     name: tak_net
   vc_net:
-    external: true
+    driver: bridge
     name: vc_net
 
   # duckdns:

replace_compose.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-"""Copy the updated txt file over the original yml file."""
-import shutil
-import os
-
-src = "/opt/data/projects/gortium/compose/ai/compose_updated.txt"
-dst = "/opt/data/projects/gortium/compose/ai/compose.yml"
-
-# Check src exists
-print(f"Source exists: {os.path.exists(src)}")
-print(f"Source size: {os.path.getsize(src)} bytes")
-print(f"Destination exists: {os.path.exists(dst)}")
-
-# Copy
-shutil.copy2(src, dst)
-print(f"Copied {src} -> {dst}")
-print(f"Destination size: {os.path.getsize(dst)} bytes")