feat(fabric): decommission Swapper from critical path, NCS = source of truth
- Node Worker: replace swapper_vision with ollama_vision (direct Ollama API) - Node Worker: add NATS subjects for stt/tts/image (stubs ready) - Node Worker: remove SWAPPER_URL dependency from config - Router: vision calls go directly to Ollama /api/generate with images - Router: local LLM calls go directly to Ollama /api/generate - Router: add OLLAMA_URL and PREFER_NODE_WORKER=true feature flag - Router: /v1/models now uses NCS global capabilities pool - NCS: SWAPPER_URL="" -> skip Swapper probing (status=disabled) - Swapper configs: remove all hardcoded model lists, keep only runtime URLs, timeouts, limits - docker-compose.node1.yml: add OLLAMA_URL, PREFER_NODE_WORKER for router; SWAPPER_URL= for NCS; remove swapper-service from node-worker depends_on - docker-compose.node2-sofiia.yml: same changes for NODA2 Swapper service still runs but is NOT in the critical inference path. Source of truth for models is now NCS -> Ollama /api/tags. Made-with: Cursor
This commit is contained in:
@@ -48,9 +48,11 @@ services:
|
||||
- ROUTER_TOOL_MAX_ROUNDS=${ROUTER_TOOL_MAX_ROUNDS:-10}
|
||||
- AGROMATRIX_REVIEW_AUTH_MODE=${AGROMATRIX_REVIEW_AUTH_MODE:-bearer}
|
||||
- AGROMATRIX_REVIEW_BEARER_TOKENS=${AGROMATRIX_REVIEW_BEARER_TOKENS}
|
||||
# ── Node Capabilities (multi-node model selection) ──
|
||||
# ── Fabric Layer (NCS + Node Worker, Swapper being decommissioned) ──
|
||||
- NODE_CAPABILITIES_URL=http://node-capabilities:8099/capabilities
|
||||
- ENABLE_GLOBAL_CAPS_NATS=true
|
||||
- OLLAMA_URL=http://172.18.0.1:11434
|
||||
- PREFER_NODE_WORKER=true
|
||||
volumes:
|
||||
- ${DEPLOY_ROOT:-.}/services/router/router_config.yaml:/app/router_config.yaml:ro
|
||||
- ${DEPLOY_ROOT:-.}/services/router/router-config.yml:/app/router-config.yml:ro
|
||||
@@ -498,8 +500,8 @@ services:
|
||||
container_name: node-capabilities-node1
|
||||
environment:
|
||||
- NODE_ID=noda1
|
||||
- OLLAMA_BASE_URL=http://host.docker.internal:11434
|
||||
- SWAPPER_URL=http://swapper-service:8890
|
||||
- OLLAMA_BASE_URL=http://172.18.0.1:11434
|
||||
- SWAPPER_URL=
|
||||
- CACHE_TTL_SEC=15
|
||||
- ENABLE_NATS_CAPS=true
|
||||
- NATS_URL=nats://nats:4222
|
||||
@@ -527,15 +529,13 @@ services:
|
||||
environment:
|
||||
- NODE_ID=noda1
|
||||
- NATS_URL=nats://nats:4222
|
||||
- OLLAMA_BASE_URL=http://host.docker.internal:11434
|
||||
- SWAPPER_URL=http://swapper-service:8890
|
||||
- OLLAMA_BASE_URL=http://172.18.0.1:11434
|
||||
- NODE_DEFAULT_LLM=qwen3.5:27b
|
||||
- NODE_DEFAULT_VISION=qwen3-vl-8b
|
||||
- NODE_DEFAULT_VISION=qwen3-vl:8b
|
||||
- NODE_WORKER_MAX_CONCURRENCY=2
|
||||
- NCS_REPORT_URL=http://node-capabilities:8099
|
||||
depends_on:
|
||||
- nats
|
||||
- swapper-service
|
||||
networks:
|
||||
- dagi-network
|
||||
restart: unless-stopped
|
||||
|
||||
Reference in New Issue
Block a user