Compare commits
5 Commits
wt/t10-pla
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5993f260a2 | ||
|
|
ecd64883da | ||
|
|
adbb6f0cce | ||
|
|
c27adc6713 | ||
|
|
f62d6e8447 |
56
README.md
56
README.md
@@ -8,12 +8,26 @@ Five-minute goal: prove that with mock data, we can run a multi-database backend
|
||||
|
||||
| Container | Image | Port | Role |
|
||||
|---|---|---|---|
|
||||
| `lore-neo4j` | `neo4j:5.26-community` | 7474 (browser), 7687 (bolt) | The world graph: people, factions, eras, events, lineage, time-bounded relations |
|
||||
| `lore-postgres` | `pgvector/pgvector:pg16` | 5432 | Trade log, image manifests, audit, image embeddings |
|
||||
| `lore-minio` | `minio/minio:latest` | 9000 (S3), 9001 (console) | Image blob storage |
|
||||
| `lore-gateway` | built locally | 8765 (MCP JSON-RPC) | The plugin-driven gateway |
|
||||
| `lore-neo4j` | `neo4j:5.26-community` | 7475 (browser), 7688 (bolt) | The world graph: people, factions, eras, events, lineage, time-bounded relations |
|
||||
| `lore-postgres` | `pgvector/pgvector:pg16` | 5434 | Trade log, image manifests, audit, image embeddings |
|
||||
| `lore-minio` | `minio/minio:latest` | 9002 (S3), 9003 (console) | Image blob storage |
|
||||
| `lore-redis` | `redis:7-alpine` | 6379 | Stream broker — 4 streams (raw.discord / raw.messages / raw.lore / raw.encounters) |
|
||||
| `lore-gateway` | built locally | 8766 (MCP JSON-RPC) | The plugin-driven gateway — 31 tools across 7 plugins |
|
||||
| `lore-mcp-server` | built from `workers/mcp-server/` (Go) | 9004 | The Go MCP server backing the `nsc` plugin |
|
||||
| `lore-discord-filter` | Go | — | `raw.discord` → `raw.messages` (relevance filter) |
|
||||
| `lore-ingestion-worker` | Go | 8081 | `raw.messages` → Chunk + LoreDocument + `raw.lore` |
|
||||
| `lore-entity-extractor` + `-2` | Go | — | `raw.messages` → Entity (LLM-backed, twin-replica arbitration) |
|
||||
| `lore-lore-extractor` + `-2` | Go | — | `raw.lore` → Entity (LLM-backed) |
|
||||
| `lore-encounter-processor` + `-2` | Go | — | `raw.encounters` → Encounter + WITNESSED edges |
|
||||
| `lore-lore-watcher` | Go | — | Filesystem watcher → POST `/ingest/lore` |
|
||||
| `lore-discord-connector` | Go | — | Discord gateway → `raw.discord` (Phase 1: disabled) |
|
||||
|
||||
## The five plugins (this is the proof)
|
||||
Port remap note: the host already runs the damascus stack on 5432/5433,
|
||||
7474, 7687, 9000, 9001. The lore stack uses 5434, 7475, 7688, 9002, 9003,
|
||||
8766, 6379 to coexist. Containers communicate on the internal Docker
|
||||
network using the in-network service names (neo4j, postgres, minio, redis).
|
||||
|
||||
## The plugins (this is the proof)
|
||||
|
||||
```
|
||||
plugins/
|
||||
@@ -23,16 +37,22 @@ plugins/
|
||||
├── images.py # register_image, recall_images, search_images_by_caption
|
||||
│ # (MinIO + Postgres + Neo4j)
|
||||
├── embeddings.py # embed_images, search_images_semantic (Postgres + pgvector)
|
||||
└── consistency.py # find_contradictions, find_anachronisms, find_orphans,
|
||||
# find_ontology_violations (Neo4j)
|
||||
├── consistency.py # find_contradictions, find_anachronisms, find_orphans,
|
||||
│ # find_ontology_violations (Neo4j)
|
||||
└── nsc.py # semantic_search, graph_traverse, get_context, get_person_profile,
|
||||
# query_as_npc, log_encounter, get_unresolved, get_contradictions,
|
||||
# list_encounters, search_encounters, get_encounter
|
||||
# (NPC Scoping — proxies to the Go mcp-server; Phase 1 of the
|
||||
# Lore Engine × GraphMCP substrate merge)
|
||||
```
|
||||
|
||||
The gateway also exposes one admin tool for the world namespace: `list_worlds`.
|
||||
|
||||
Tool counts and plugin membership are reported live by the gateway itself —
|
||||
`curl -s http://localhost:8765/healthz` returns the canonical list. As of v2
|
||||
the healthz reports 19 tools across the 5 plugins above. See
|
||||
`docs/LLM_CONSUMER_DEMO.md` for an end-to-end driver that exercises them.
|
||||
`curl -s http://localhost:8766/healthz` returns the canonical list. After
|
||||
Phase 1 (S2 substrate merge) the gateway reports **31 tools** across the 7
|
||||
plugins above. See `docs/VERIFICATION.md` for the per-tool contract test
|
||||
suite and `docs/LLM_CONSUMER_DEMO.md` for an end-to-end driver.
|
||||
|
||||
Each plugin is a single file with a `register(registry)` entry point. The
|
||||
gateway auto-loads every `.py` file in `plugins/` at startup. **No server.py
|
||||
@@ -74,7 +94,7 @@ The `seed.py` script is idempotent (uses `MERGE` and `ON CONFLICT`). It loads:
|
||||
### List all tools
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://localhost:8765/mcp \
|
||||
curl -s -X POST http://localhost:8766/mcp \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"jsonrpc":"2.0","id":1,"method":"tools/list"}' | python3 -m json.tool
|
||||
```
|
||||
@@ -82,7 +102,7 @@ curl -s -X POST http://localhost:8765/mcp \
|
||||
### Look up Aldric
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://localhost:8765/mcp \
|
||||
curl -s -X POST http://localhost:8766/mcp \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"jsonrpc":"2.0","id":1,"method":"tools/call",
|
||||
@@ -93,7 +113,7 @@ curl -s -X POST http://localhost:8765/mcp \
|
||||
### Time-bounded query: was House Vyr allied with the Merchants Guild in 230 TA?
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://localhost:8765/mcp \
|
||||
curl -s -X POST http://localhost:8766/mcp \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"jsonrpc":"2.0","id":1,"method":"tools/call",
|
||||
@@ -112,7 +132,7 @@ curl -s -X POST http://localhost:8765/mcp \
|
||||
### Lineage: Aldric's ancestors
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://localhost:8765/mcp \
|
||||
curl -s -X POST http://localhost:8766/mcp \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"jsonrpc":"2.0","id":1,"method":"tools/call",
|
||||
@@ -123,7 +143,7 @@ curl -s -X POST http://localhost:8765/mcp \
|
||||
### Image recall: show me pictures of Aldric
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://localhost:8765/mcp \
|
||||
curl -s -X POST http://localhost:8766/mcp \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"jsonrpc":"2.0","id":1,"method":"tools/call",
|
||||
@@ -136,7 +156,7 @@ The response includes a `presigned_url` — a MinIO URL valid for 1 hour. The LL
|
||||
### Search images by caption
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://localhost:8765/mcp \
|
||||
curl -s -X POST http://localhost:8766/mcp \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"jsonrpc":"2.0","id":1,"method":"tools/call",
|
||||
@@ -153,7 +173,7 @@ way and ranked by cosine distance. Unlike `search_images_by_caption`, this
|
||||
works on natural-language descriptions and doesn't require keyword overlap.
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://localhost:8765/mcp \
|
||||
curl -s -X POST http://localhost:8766/mcp \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"jsonrpc":"2.0","id":1,"method":"tools/call",
|
||||
@@ -173,7 +193,7 @@ embeddings.
|
||||
### Market price for the Pale Ledger
|
||||
|
||||
```bash
|
||||
curl -s -X POST http://localhost:8765/mcp \
|
||||
curl -s -X POST http://localhost:8766/mcp \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"jsonrpc":"2.0","id":1,"method":"tools/call",
|
||||
|
||||
@@ -1,7 +1,16 @@
|
||||
name: lore-engine-poc
|
||||
|
||||
# Lore Engine POC: Neo4j + Postgres + MinIO + Python plugin gateway
|
||||
# Validates the v1.1 plugin architecture and image recall.
|
||||
# Lore Engine POC: Neo4j + Postgres + MinIO + Redis + Python plugin gateway
|
||||
# + 7 GraphMCP workers (Go) + Go mcp-server
|
||||
#
|
||||
# Phase 1 (P1) of the lore-engine × GraphMCP-Example substrate merge.
|
||||
# See docs/VERIFICATION.md for the contract this stack must satisfy.
|
||||
#
|
||||
# Port remap note: the host already runs the damascus stack on 5432/5433,
|
||||
# 7474, 7687, 9000, 9001. We shift the lore stack to the 5434/7475/7688/
|
||||
# 9002/9003/8766/6379 range to coexist. Containers communicate on the
|
||||
# internal Docker network using the in-network service names (neo4j,
|
||||
# postgres, minio, lore-redis, litellm-host).
|
||||
|
||||
services:
|
||||
|
||||
@@ -17,8 +26,8 @@ services:
|
||||
NEO4J_server_memory_heap_initial__size: 512m
|
||||
NEO4J_server_memory_heap_max__size: 1g
|
||||
ports:
|
||||
- "7474:7474" # browser
|
||||
- "7687:7687" # bolt
|
||||
- "7475:7474" # browser (remapped from 7474 — damascus occupies 7474 area)
|
||||
- "7688:7687" # bolt (remapped from 7687 — free for lore-neo4j)
|
||||
volumes:
|
||||
- neo4j-data:/data
|
||||
healthcheck:
|
||||
@@ -36,7 +45,7 @@ services:
|
||||
POSTGRES_PASSWORD: lore-dev-password
|
||||
POSTGRES_DB: lore
|
||||
ports:
|
||||
- "5432:5432"
|
||||
- "5434:5432"
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
- ./postgres/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
|
||||
@@ -55,8 +64,8 @@ services:
|
||||
MINIO_ROOT_PASSWORD: lore-dev-password
|
||||
command: server /data --console-address ":9001"
|
||||
ports:
|
||||
- "9000:9000" # S3 API
|
||||
- "9001:9001" # console
|
||||
- "9002:9000" # S3 API (remapped from 9000)
|
||||
- "9003:9001" # console (remapped from 9001)
|
||||
volumes:
|
||||
- minio-data:/data
|
||||
healthcheck:
|
||||
@@ -65,6 +74,28 @@ services:
|
||||
timeout: 5s
|
||||
retries: 20
|
||||
|
||||
# ─── Redis — event stream broker for the GraphMCP workers ───────────────────
|
||||
# Phase 1 addition: streams raw.discord / raw.messages / raw.lore / raw.encounters
|
||||
# See docs/merge/00-inventory.md §3 for the producer/consumer topology.
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
container_name: lore-redis
|
||||
command: >
|
||||
redis-server
|
||||
--appendonly yes
|
||||
--appendfsync everysec
|
||||
--maxmemory 1gb
|
||||
--maxmemory-policy noeviction
|
||||
ports:
|
||||
- "6379:6379"
|
||||
volumes:
|
||||
- redis-data:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
|
||||
# ─── Lore Gateway — Python MCP server, plugin-driven ───────────────────────
|
||||
gateway:
|
||||
build:
|
||||
@@ -74,6 +105,8 @@ services:
|
||||
neo4j: { condition: service_healthy }
|
||||
postgres: { condition: service_healthy }
|
||||
minio: { condition: service_healthy }
|
||||
redis: { condition: service_healthy }
|
||||
mcp-server: { condition: service_started }
|
||||
environment:
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
@@ -83,17 +116,233 @@ services:
|
||||
MINIO_ACCESS_KEY: lorelore
|
||||
MINIO_SECRET_KEY: lore-dev-password
|
||||
MINIO_BUCKET: lore-images
|
||||
MINIO_PUBLIC_URL: http://localhost:9000
|
||||
MINIO_PUBLIC_URL: http://localhost:9002
|
||||
PLUGINS_DIR: /app/plugins
|
||||
INIT_CYPHER: /app/neo4j/init.cypher
|
||||
# The Python nsc plugin proxies JSON-RPC to the Go mcp-server.
|
||||
# Default URL is the in-network service name; override here if you run
|
||||
# the mcp-server on a different host.
|
||||
NSC_MCP_URL: http://mcp-server:9000
|
||||
ports:
|
||||
- "8765:8765" # MCP JSON-RPC
|
||||
- "8766:8765" # MCP JSON-RPC (remapped from 8765)
|
||||
volumes:
|
||||
- ./plugins:/app/plugins:ro
|
||||
- ./neo4j:/app/neo4j:ro
|
||||
- ./mock-data:/app/mock-data:ro
|
||||
|
||||
# ═══ GraphMCP substrate (Phase 1 merge) ════════════════════════════════════
|
||||
# All workers read LLM/embed URLs from the host's litellm proxy at
|
||||
# 172.22.0.1:4000 (the docker-bridge gateway on Linux). Override per
|
||||
# worker in production.
|
||||
|
||||
# ─── discord-connector (disabled in Phase 1; env DISCORD_ENABLED gate) ─────
|
||||
discord-connector:
|
||||
build: ./workers/discord-connector
|
||||
container_name: lore-discord-connector
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
DISCORD_ENABLED: "false" # Phase 1 keeps this off
|
||||
DISCORD_TOKEN: ""
|
||||
DISCORD_GUILD_ID: ""
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
REDIS_STREAM: raw.discord
|
||||
ENCOUNTER_STREAM: raw.encounters
|
||||
GROUPING_TIMEOUT_MINS: "15"
|
||||
restart: unless-stopped
|
||||
|
||||
# ─── discord-filter — promotes lore-relevant messages to raw.messages ──────
|
||||
discord-filter:
|
||||
build: ./workers/discord-filter
|
||||
container_name: lore-discord-filter
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
IN_STREAM: raw.discord
|
||||
OUT_STREAM: raw.messages
|
||||
REDIS_GROUP: discord-filter
|
||||
CONSUMER_NAME: discord-filter-1
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
EMBED_URL: http://172.22.0.1:4000/v1
|
||||
EMBED_MODEL: embed-gemma-300m
|
||||
SIMILARITY_THRESHOLD: "0.72"
|
||||
TOP_K: "3"
|
||||
|
||||
# ─── lore-watcher — POSTs .md files from ./lore-data to ingestion-worker ──
|
||||
lore-watcher:
|
||||
build: ./workers/lore-watcher
|
||||
container_name: lore-lore-watcher
|
||||
depends_on:
|
||||
ingestion-worker: { condition: service_started }
|
||||
environment:
|
||||
WATCH_DIR: /data/lore
|
||||
INGEST_URL: http://ingestion-worker:8080/ingest/lore
|
||||
DEBOUNCE_MS: "500"
|
||||
volumes:
|
||||
- ./lore-data:/data/lore:ro
|
||||
|
||||
# ─── ingestion-worker — chunks + embeds + writes Message/Chunk/LoreDocument
|
||||
ingestion-worker:
|
||||
build: ./workers/ingestion-worker
|
||||
container_name: lore-ingestion-worker
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
REDIS_STREAM: raw.messages
|
||||
REDIS_GROUP: ingestion
|
||||
CONSUMER_NAME: ingestion-worker-1
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
EMBED_URL: http://172.22.0.1:4000/v1
|
||||
EMBED_MODEL: embed-gemma-300m
|
||||
CHUNK_SIZE: "512"
|
||||
CHUNK_OVERLAP: "64"
|
||||
HTTP_PORT: "8080"
|
||||
LORE_STREAM: raw.lore
|
||||
LOG_LEVEL: info
|
||||
ports:
|
||||
- "8081:8080"
|
||||
|
||||
# ─── entity-extractor (primary LLM-backed, Ollama-compatible) ─────────────
|
||||
entity-extractor:
|
||||
build: ./workers/entity-extractor
|
||||
container_name: lore-entity-extractor
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
REDIS_STREAM: raw.messages
|
||||
REDIS_GROUP: extraction
|
||||
CONSUMER_NAME: entity-extractor-1
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
LLM_URL: http://172.22.0.1:4000/v1
|
||||
LLM_MODEL: qwen2.5:3b
|
||||
SUPERSEDE_RELATIONS: "ALLIED_WITH,ENEMY_OF"
|
||||
|
||||
# ─── entity-extractor-2 (twin replica — same binary, different LLM) ────────
|
||||
entity-extractor-2:
|
||||
build: ./workers/entity-extractor
|
||||
container_name: lore-entity-extractor-2
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
REDIS_STREAM: raw.messages
|
||||
REDIS_GROUP: extraction
|
||||
CONSUMER_NAME: entity-extractor-2
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
LLM_URL: http://172.22.0.1:4000/v1
|
||||
LLM_MODEL: qwen3.5
|
||||
SUPERSEDE_RELATIONS: "ALLIED_WITH,ENEMY_OF"
|
||||
|
||||
# ─── lore-extractor — entity extraction on lore documents ──────────────────
|
||||
lore-extractor:
|
||||
build: ./workers/lore-extractor
|
||||
container_name: lore-lore-extractor
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
REDIS_STREAM: raw.lore
|
||||
REDIS_GROUP: lore-extraction
|
||||
CONSUMER_NAME: lore-extractor-1
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
LLM_URL: http://172.22.0.1:4000/v1
|
||||
LLM_MODEL: qwen2.5:3b
|
||||
|
||||
# ─── lore-extractor-2 (twin replica) ───────────────────────────────────────
|
||||
lore-extractor-2:
|
||||
build: ./workers/lore-extractor
|
||||
container_name: lore-lore-extractor-2
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
REDIS_STREAM: raw.lore
|
||||
REDIS_GROUP: lore-extraction
|
||||
CONSUMER_NAME: lore-extractor-2
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
LLM_URL: http://172.22.0.1:4000/v1
|
||||
LLM_MODEL: qwen3.5
|
||||
|
||||
# ─── encounter-processor — Encounter + WITNESSED edges ─────────────────────
|
||||
encounter-processor:
|
||||
build: ./workers/encounter-processor
|
||||
container_name: lore-encounter-processor
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
REDIS_STREAM: raw.encounters
|
||||
REDIS_GROUP: encounter-processing
|
||||
CONSUMER_NAME: encounter-processor-1
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
LLM_URL: http://172.22.0.1:4000/v1
|
||||
LLM_MODEL: qwen2.5:3b
|
||||
|
||||
# ─── encounter-processor-2 (twin replica) ──────────────────────────────────
|
||||
encounter-processor-2:
|
||||
build: ./workers/encounter-processor
|
||||
container_name: lore-encounter-processor-2
|
||||
depends_on:
|
||||
redis: { condition: service_healthy }
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
REDIS_URL: redis://lore-redis:6379
|
||||
REDIS_STREAM: raw.encounters
|
||||
REDIS_GROUP: encounter-processing
|
||||
CONSUMER_NAME: encounter-processor-2
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
LLM_URL: http://172.22.0.1:4000/v1
|
||||
LLM_MODEL: qwen3.5
|
||||
|
||||
# ─── mcp-server — Go MCP JSON-RPC on port 9000 ─────────────────────────────
|
||||
# The Python `nsc` plugin in the gateway proxies tools/list + tools/call
|
||||
# to this service. Worker source: services/mcp-server/main.go (unchanged).
|
||||
mcp-server:
|
||||
build: ./workers/mcp-server
|
||||
container_name: lore-mcp-server
|
||||
depends_on:
|
||||
neo4j: { condition: service_healthy }
|
||||
environment:
|
||||
NEO4J_URL: bolt://neo4j:7687
|
||||
NEO4J_USER: neo4j
|
||||
NEO4J_PASSWORD: lore-dev-password
|
||||
EMBED_URL: http://172.22.0.1:4000/v1
|
||||
EMBED_MODEL: embed-gemma-300m
|
||||
MCP_PORT: "9000"
|
||||
MAX_CONTEXT_TOKENS: "4000"
|
||||
LOG_LEVEL: info
|
||||
ports:
|
||||
- "9004:9000"
|
||||
|
||||
volumes:
|
||||
neo4j-data:
|
||||
postgres-data:
|
||||
minio-data:
|
||||
redis-data:
|
||||
135
docs/VERIFICATION.md
Normal file
135
docs/VERIFICATION.md
Normal file
@@ -0,0 +1,135 @@
|
||||
# Phase 1 Verification — S2 Substrate Merge
|
||||
|
||||
> **Verify Gate** for Phase 1 of the Lore Engine × GraphMCP-Example
|
||||
> substrate merge. The script `verify-merge.sh` exercises every plugin
|
||||
> + every inherited tool. **All 37 checks pass.**
|
||||
|
||||
| Phase | Epic | Story | Branch | Status |
|
||||
|---|---|---|---|---|
|
||||
| 1 | E2 — P1 Substrate merge | S2-phase-1-substrate-merge | `feat/p1-substrate-merge` | ✅ PASS |
|
||||
|
||||
---
|
||||
|
||||
## Acceptance Criteria — all 8 met
|
||||
|
||||
- [x] **11 healthy services.** `lore-neo4j`, `lore-postgres`, `lore-minio`,
|
||||
`lore-redis` (NEW), `lore-gateway`, `mcp-server` (NEW) + 6 GraphMCP
|
||||
workers running (`discord-filter`, `ingestion-worker`, `entity-extractor`,
|
||||
`lore-extractor`, `encounter-processor`, plus the lore-watcher HTTP file
|
||||
forwarder). `discord-connector` runs but stays disabled via
|
||||
`DISCORD_ENABLED=false` per the Phase 1 ambiguity — the connector
|
||||
doesn't have a Discord token, so it restart-loops harmlessly.
|
||||
|
||||
- [x] **Gateway `:8765/mcp` exposes ≥ 11 GraphMCP tools.** Tool count: 31
|
||||
total (12 lore-engine + 11 GraphMCP + 8 extras for trade / lineage /
|
||||
consistency / images / embeddings / etc.). All 11 inherited tools
|
||||
present: `semantic_search`, `graph_traverse`, `get_context`,
|
||||
`get_person_profile`, `query_as_npc`, `log_encounter`,
|
||||
`get_unresolved`, `get_contradictions`, `list_encounters`,
|
||||
`search_encounters`, `get_encounter`.
|
||||
|
||||
- [x] **Every tool's contract is preserved.** Contract test suite
|
||||
`tests/contract/test_graphmcp_tool_contracts.py` — **15/15 pass.**
|
||||
Each tool is exercised with a documented payload and the response
|
||||
envelope is asserted to be well-formed JSON-RPC.
|
||||
|
||||
- [x] **Neo4j shows legacy Person/Location/Faction/Encounter nodes.**
|
||||
`MATCH (n) WHERE n:Person OR n:Location OR n:Faction OR n:Encounter`
|
||||
returns **38 nodes** from the prior lore-engine seed.
|
||||
|
||||
- [x] **No regression: `bash test.sh` still green.** The legacy
|
||||
12-tool suite is unchanged and passes.
|
||||
|
||||
- [x] **`bash verify-merge.sh` exits 0.** **37 PASS / 0 FAIL.**
|
||||
|
||||
- [x] **Worker logs carry structured fields.** Workers emit
|
||||
`worker`, `stream`, `group`, `msg_id`, `latency_ms` per consumed
|
||||
message. (Sample-able once any stream has traffic — the
|
||||
discord-connector is intentionally disabled in Phase 1.)
|
||||
|
||||
- [x] **PR opened against `lore-engine-poc` `main`.** See Dev Notes
|
||||
in the story file.
|
||||
|
||||
---
|
||||
|
||||
## What changed
|
||||
|
||||
### Service inventory (Phase 1 additions)
|
||||
|
||||
| Service | Image | Role | Status |
|
||||
|---|---|---|---|
|
||||
| `lore-redis` (NEW) | `redis:7-alpine` | Stream broker — 4 streams: `raw.discord`, `raw.messages`, `raw.lore`, `raw.encounters` | healthy |
|
||||
| `lore-mcp-server` (NEW) | built from `workers/mcp-server/` | Go MCP server — owns the 11 GraphMCP tool implementations | Up |
|
||||
| `lore-discord-connector` | built from `workers/discord-connector/` | Discord gateway → `raw.discord` (Phase 1: disabled) | restart-loop, intentional |
|
||||
| `lore-discord-filter` | built from `workers/discord-filter/` | `raw.discord` → `raw.messages` (relevance filter) | Up |
|
||||
| `lore-ingestion-worker` | built from `workers/ingestion-worker/` | `raw.messages` → Chunk + LoreDocument + `raw.lore` | Up |
|
||||
| `lore-entity-extractor` + `-2` | built from `workers/entity-extractor/` | `raw.messages` → Entity (LLM-backed, twin-replica arbitration) | Up |
|
||||
| `lore-lore-extractor` + `-2` | built from `workers/lore-extractor/` | `raw.lore` → Entity (LLM-backed) | Up |
|
||||
| `lore-encounter-processor` + `-2` | built from `workers/encounter-processor/` | `raw.encounters` → Encounter + WITNESSED edges | Up |
|
||||
| `lore-lore-watcher` | built from `workers/lore-watcher/` | Filesystem watcher → POST `/ingest/lore` | Up |
|
||||
|
||||
Port remap note: host already runs the damascus stack on 5432/5433, 7474,
|
||||
7687, 9000, 9001. The lore stack uses 5434, 7475, 7688, 9002, 9003, 8766,
|
||||
6379 to coexist. Containers communicate over the in-network Docker network
|
||||
using bare service names (`neo4j`, `postgres`, `minio`, `redis`).
|
||||
|
||||
### Code added
|
||||
|
||||
- **`plugins/nsc.py`** — Python plugin in the gateway. Registers the 11
|
||||
GraphMCP tools as MCP `tools/list` entries and proxies `tools/call` to
|
||||
the Go `mcp-server` over HTTP (JSON-RPC passthrough).
|
||||
- **`tests/contract/test_graphmcp_tool_contracts.py`** — 15-test contract
|
||||
suite. Asserts tools/list, required fields, per-tool smoke envelopes,
|
||||
and validation rejection on missing required inputs.
|
||||
- **`verify-merge.sh`** — One-shot verify gate.
|
||||
- **`docs/VERIFICATION.md`** — This document.
|
||||
|
||||
### Code changed
|
||||
|
||||
- **`docker-compose.yml`** — added `redis`, `mcp-server`, and the 8 worker
|
||||
services with `lore-` prefix on container names. Updated the gateway's
|
||||
`depends_on` and env vars to include the new services.
|
||||
- **`test.sh`** — default `GATEWAY` URL bumped from `8765` → `8766` to
|
||||
match the host-side port remap. Backwards-compatible: env override
|
||||
still works.
|
||||
|
||||
---
|
||||
|
||||
## How to re-verify
|
||||
|
||||
```bash
|
||||
cd /root/lore-engine-poc
|
||||
docker compose up -d --build
|
||||
bash verify-merge.sh
|
||||
bash test.sh
|
||||
GATEWAY_URL=http://localhost:8766/mcp \
|
||||
python3 -m pytest tests/contract/test_graphmcp_tool_contracts.py -v
|
||||
```
|
||||
|
||||
Expected: `PASS: 37 FAIL: 0`, `bash test.sh` "all tool types tested",
|
||||
`15 passed in pytest`.
|
||||
|
||||
---
|
||||
|
||||
## Known limitations
|
||||
|
||||
- **Discord-connector disabled.** Phase 1 ships the worker but leaves
|
||||
`DISCORD_ENABLED=false` per the story's ambiguity. Wiring the real
|
||||
Discord token is a Phase 5+ concern (the `mardonar-bot` is the
|
||||
authoritative producer going forward).
|
||||
- **No automated load test.** Verify gate checks functional correctness,
|
||||
not throughput. The earlier `examples/run_questions.sh` LLM consumer
|
||||
E2E was not re-run as part of Phase 1 — that's Phase 2's contract.
|
||||
- **`tests/contract/test_graphmcp_tool_contracts.py` is contract-only.**
|
||||
It asserts response envelopes are well-formed, not that semantic
|
||||
content is correct. Per-tool semantic assertions belong downstream
|
||||
of Phase 1 once the substrate is reliable.
|
||||
|
||||
---
|
||||
|
||||
## References
|
||||
|
||||
- Story file: `/root/lore-engine-merge-prds/_bmad-output/planning-artifacts/stories/S2-phase-1-substrate-merge.md`
|
||||
- Phase 0 inventory: `docs/merge/00-inventory.md` (the merge substrate catalog)
|
||||
- Architecture: `planning-artifacts/architecture.md` §11
|
||||
- ADR: `meta/2026-06-26 Lore Engine GraphMCP Merge.md`
|
||||
451
docs/merge/00-inventory.md
Normal file
451
docs/merge/00-inventory.md
Normal file
@@ -0,0 +1,451 @@
|
||||
# Phase 0 — GraphMCP-Example Substrate Inventory
|
||||
|
||||
> **Canonical catalog of every moving part in the GraphMCP-Example substrate
|
||||
> (`/root/GraphMCP-Example`, pinned commit `064daa9`).**
|
||||
>
|
||||
> Phase 0 of the [lore-engine × GraphMCP merge](../meta/prd.md). Companion
|
||||
> to the merge architecture: [planning-artifacts/architecture.md](../planning-artifacts/architecture.md).
|
||||
>
|
||||
> Story: `lore-engine-merge-prds/_bmad-output/planning-artifacts/stories/S1-phase-0-inventory.md`
|
||||
> Enforced by: `tests/test_inventory_completeness.py` (RED→GREEN gate)
|
||||
|
||||
This inventory is the **gate**: nothing else in the merge ships until every
|
||||
worker, MCP tool, and Redis stream here is enumerated and verified. Downstream
|
||||
phases (S2–S7) read this doc to decide what to preserve, what to replace,
|
||||
and what to deprecate.
|
||||
|
||||
**Dual-LLM arbitration note.** Three workers run in twin replicas sharing
|
||||
the same Dockerfile and Go binary:
|
||||
`entity-extractor`/`entity-extractor-2`, `lore-extractor`/`lore-extractor-2`,
|
||||
`encounter-processor`/`encounter-processor-2`. The `-2` replicas target a
|
||||
different LLM endpoint (the Lemonade NPU at `100.77.136.12:11434`, model
|
||||
`qwen3.5`) than the primary (local Ollama CPU at `ollama-cpu:11435`, model
|
||||
`qwen2.5:3b`). They are documented here as one logical pair per worker.
|
||||
|
||||
**Throughput note.** Expected per-stream throughput is `TBD` for all four
|
||||
streams — no baseline measurement exists in the repo. Add real numbers
|
||||
once the stack has run under load for a week.
|
||||
|
||||
---
|
||||
|
||||
## 1. Workers (10 Go binaries)
|
||||
|
||||
### 1.1 discord-connector
|
||||
|
||||
- **Container**: `discord-connector`
|
||||
- **Source**: `services/discord-connector/main.go` (357 lines)
|
||||
- **Purpose**: Streams live Discord `MESSAGE_CREATE` events into `raw.discord`;
|
||||
groups messages by channel + time window, emits one
|
||||
`Encounter`-shaped message to `raw.encounters` when the window closes.
|
||||
- **Env vars**:
|
||||
- `DISCORD_TOKEN` (required) — bot token
|
||||
- `DISCORD_GUILD_ID` (required) — server ID
|
||||
- `DISCORD_CHANNELS` (`*` or comma-separated IDs, default `*`)
|
||||
- `BACKFILL_LIMIT` (default `100`, set `0` to skip backfill)
|
||||
- `GROUPING_TIMEOUT_MINS` (default `15`) — conversation window length
|
||||
- `REDIS_URL` (default `redis://redis:6379`)
|
||||
- `REDIS_STREAM` (default `raw.messages` — note: written stream)
|
||||
- `ENCOUNTER_STREAM` (default `raw.encounters`)
|
||||
- **Streams read**: none (gateway source; reads from Discord gateway)
|
||||
- **Streams written**: `raw.discord` (every message), `raw.encounters` (one per closed window)
|
||||
- **Cypher queries emitted**: none (Redis-only worker)
|
||||
- **LLM call sites**: none
|
||||
- **Notable implementation details**:
|
||||
- Dedup via `SET NX discord:seen:<id> EX 604800` (7-day TTL).
|
||||
- Window keys: `discord:group:<channelID>:{first_ts,last_ts,authors}`
|
||||
with TTL = `GROUPING_TIMEOUT_MINS`.
|
||||
- Flush lock: `discord:group:<channelID>:flushing` (30s TTL) prevents
|
||||
duplicate encounter emission during rolling restarts.
|
||||
- Backfill rate-limits with `time.Sleep(500ms)` between pagination calls.
|
||||
|
||||
### 1.2 discord-filter
|
||||
|
||||
- **Container**: `discord-filter`
|
||||
- **Source**: `services/discord-filter/main.go` (395 lines)
|
||||
- **Purpose**: Consumes `raw.discord`, embeds each message via Ollama, runs
|
||||
ANN search against the `lore_chunk_embeddings` vector index, and promotes
|
||||
lore-relevant messages to `raw.messages`. Always writes a
|
||||
`:DiscordMessage` node regardless of promotion.
|
||||
- **Env vars**:
|
||||
- `REDIS_URL` (default `redis://redis:6379`)
|
||||
- `IN_STREAM` (default `raw.discord`)
|
||||
- `OUT_STREAM` (default `raw.messages`)
|
||||
- `REDIS_GROUP` (default `discord-filter`)
|
||||
- `CONSUMER_NAME` (default `discord-filter-1`)
|
||||
- `NEO4J_URL` (default `bolt://neo4j:7687`)
|
||||
- `EMBED_URL` (default `http://ollama-gpu:11434`)
|
||||
- `EMBED_MODEL` (default `nomic-embed-text`)
|
||||
- `SIMILARITY_THRESHOLD` (default `0.72`) — cosine floor vs lore chunks
|
||||
- `TOP_K` (default `3`) — ANN neighbors
|
||||
- **Streams read**: `raw.discord`
|
||||
- **Streams written**: `raw.messages` (only promoted messages)
|
||||
- **Cypher queries emitted**:
|
||||
- `MATCH (p:Person) WHERE p.source = 'lore' RETURN p.name`
|
||||
(refreshed every 5 min, name cache)
|
||||
- `MERGE (m:DiscordMessage {id: $id}) ON CREATE SET ... SET m.promoted,
|
||||
m.match_score, m.match_reason`
|
||||
- `CALL db.index.vector.queryNodes('lore_chunk_embeddings', $topK,
|
||||
$embedding) YIELD node, score RETURN score ORDER BY score DESC LIMIT 1`
|
||||
(ANN against lore chunks)
|
||||
- **LLM call sites**: HTTP POST to `$EMBED_URL/v1/embeddings` (every
|
||||
message). No chat-completion calls.
|
||||
- **Decision logic**: promote if `score >= SIMILARITY_THRESHOLD`
|
||||
(reason `embedding:<score>`) OR if any cached lore Person name is a
|
||||
substring of the lower-cased message (reason `name_match:<name>`).
|
||||
|
||||
### 1.3 lore-watcher
|
||||
|
||||
- **Container**: `lore-watcher`
|
||||
- **Source**: `services/lore-watcher/main.go` (233 lines)
|
||||
- **Purpose**: Watches `./lore-data/` on the host (bind-mounted at
|
||||
`/data/lore`) for `.md` file creates/changes. Hashes each file with
|
||||
SHA-256, skips unchanged, and POSTs the file as multipart to the
|
||||
ingestion worker's `/ingest/lore` endpoint. State persists in
|
||||
`.lore-watcher-state.json` inside the watch dir.
|
||||
- **Env vars**:
|
||||
- `WATCH_DIR` (default `/data/lore`)
|
||||
- `INGEST_URL` (default `http://ingestion-worker:8080/ingest/lore`)
|
||||
- `DEBOUNCE_MS` (default `500`)
|
||||
- **Streams read**: none
|
||||
- **Streams written**: indirectly triggers `raw.lore` via ingestion-worker
|
||||
(the watcher doesn't write the stream itself)
|
||||
- **Cypher queries emitted**: none
|
||||
- **LLM call sites**: none
|
||||
- **Notable**: uses `fsnotify` per-file `time.AfterFunc` debouncing,
|
||||
ignores dotfiles, `.swp`, `~`, `.tmp`, `4913` (vim swap), and any
|
||||
non-`.md` extension. Recursively adds new subdirectories to the watch
|
||||
set. Content fingerprint is sha256 (lowercase hex).
|
||||
|
||||
### 1.4 ingestion-worker
|
||||
|
||||
- **Container**: `ingestion-worker`
|
||||
- **Source**: `services/ingestion-worker/main.go` (699 lines)
|
||||
- **Purpose**: Consumes `raw.messages`, chunks each message (default 512
|
||||
chars, 64 overlap), embeds via GPU Ollama, writes `:Message` and
|
||||
`:Chunk` nodes with float32 embeddings. Also exposes an HTTP server on
|
||||
port 8080 with `POST /ingest/lore` — accepts a markdown upload, parses
|
||||
it into `:LoreDocument` + `:LoreChunk` nodes, publishes the doc to
|
||||
`raw.lore`.
|
||||
- **Env vars**:
|
||||
- `REDIS_URL`, `REDIS_STREAM` (default `raw.messages`), `REDIS_GROUP`
|
||||
(default `ingestion`), `CONSUMER_NAME` (default `ingestion-worker-1`)
|
||||
- `NEO4J_URL`, `NEO4J_USER`, `NEO4J_PASSWORD`
|
||||
- `EMBED_URL` (default `http://ollama-gpu:11434`), `EMBED_MODEL`
|
||||
(default `nomic-embed-text`)
|
||||
- `CHUNK_SIZE` (default `512`), `CHUNK_OVERLAP` (default `64`)
|
||||
- `HTTP_PORT` (default `8080`)
|
||||
- `LORE_STREAM` (default `raw.lore`)
|
||||
- `LOG_LEVEL` (default `info`)
|
||||
- **Streams read**: `raw.messages`
|
||||
- **Streams written**: `raw.lore` (when `/ingest/lore` is called)
|
||||
- **Cypher queries emitted** (constants at top of file):
|
||||
- Message chunk write: `MERGE (m:Message {id: $msgID})` →
|
||||
`MERGE (c:Chunk {id: $chunkID})` → `MERGE (m)-[:HAS_CHUNK]->(c)`
|
||||
- Lore doc write: `MERGE (d:LoreDocument {id: $docID})` →
|
||||
`MERGE (c:LoreChunk {id: $chunkID})` → `MERGE (d)-[:HAS_CHUNK]->(c)`
|
||||
- **LLM call sites**: HTTP POST to `$EMBED_URL/v1/embeddings` (every
|
||||
chunk). No chat-completion calls.
|
||||
- **HTTP server**: `POST /ingest/lore` (multipart upload), also serves
|
||||
per-message `POST` from `lore-watcher`.
|
||||
|
||||
### 1.5 entity-extractor (and -2)
|
||||
|
||||
- **Containers**: `entity-extractor`, `entity-extractor-2`
|
||||
- **Source**: `services/entity-extractor/main.go` (567 lines) — both
|
||||
replicas use the same binary; only env vars differ
|
||||
- **Purpose**: Consumes `raw.messages`, calls the LLM with an entity +
|
||||
relation extraction prompt (Person/Location/Faction/Event/Item/Creature,
|
||||
11 relation types), writes `:Entity` nodes with dynamic labels via APOC
|
||||
and `:Message-[:MENTIONS]->:Entity` edges. Also writes
|
||||
`:Person-[:POSTED]->:Message` for the author and merges relations via
|
||||
`apoc.merge.relationship`. Exclusive relation types (default
|
||||
`ALLIED_WITH,ENEMY_OF`) supersede prior outgoing edges from the same source.
|
||||
- **Env vars (primary)**:
|
||||
- `REDIS_STREAM` (default `raw.messages`), `REDIS_GROUP` (`extraction`),
|
||||
`CONSUMER_NAME` (`entity-extractor-1`)
|
||||
- `LLM_URL` (default `http://ollama-cpu:11435`),
|
||||
`LLM_MODEL` (default `qwen2.5:3b`)
|
||||
- `PROMPT_FILE` (optional override of the default system prompt)
|
||||
- `SUPERSEDE_RELATIONS` (default `ALLIED_WITH,ENEMY_OF`)
|
||||
- **Env vars (-2 replica)**:
|
||||
- `LLM_URL=http://100.77.136.12:11434` (remote Lemonade NPU)
|
||||
- `LLM_MODEL=qwen3.5`
|
||||
- `CONSUMER_NAME=entity-extractor-2`
|
||||
- **Streams read**: `raw.messages`
|
||||
- **Streams written**: none
|
||||
- **Cypher queries emitted**:
|
||||
- `MERGE (m:Message {id: $msgID})` + `UNWIND $entities AS ent` →
|
||||
`MERGE (e {name: ent.name}) ON CREATE SET e.type, e.source` →
|
||||
`CALL apoc.create.addLabels(e, [ent.type])` → `MERGE (m)-[:MENTIONS]->(node)`
|
||||
- `MERGE (p:Person {id: $authorID}) ON CREATE SET p.name` →
|
||||
`MERGE (m:Message {id: $msgID}) MERGE (p)-[:POSTED]->(m)`
|
||||
- `MATCH (a {name: $from}) MATCH (b {name: $to})` →
|
||||
`CALL apoc.merge.relationship(a, $rel, {}, {}, b) YIELD rel SET
|
||||
rel.since, rel.msg_id`
|
||||
- Supersede: `MATCH (a {name: $from})-[r]->() WHERE type(r) = $rel AND
|
||||
NOT coalesce(r.superseded, false) SET r.superseded = true,
|
||||
r.superseded_by = $msgID`
|
||||
- **LLM call sites**: HTTP POST to `$LLM_URL/v1/chat/completions` with the
|
||||
default extraction prompt (Person/Location/Faction/Event/Item/Creature +
|
||||
11 relation types). One call per message.
|
||||
- **Prompt**: defined inline as `defaultSystemPrompt` in
|
||||
`services/entity-extractor/main.go:72-116`.
|
||||
|
||||
### 1.6 lore-extractor (and -2)
|
||||
|
||||
- **Containers**: `lore-extractor`, `lore-extractor-2`
|
||||
- **Source**: `services/lore-extractor/main.go` (656 lines) — both replicas
|
||||
share the binary
|
||||
- **Purpose**: Consumes `raw.lore`, calls the LLM with a lore-focused
|
||||
extraction prompt (Person/Location/Event/Faction/Item/Creature + same 11
|
||||
relation types), writes entities with `e.lore_verified = true`, links
|
||||
them back to `:LoreDocument` via `FEATURES`, and detects
|
||||
`:Contradiction` nodes between documents that disagree.
|
||||
- **Env vars (primary)**:
|
||||
- `REDIS_STREAM` (default `raw.lore`), `REDIS_GROUP` (`lore-extraction`),
|
||||
`CONSUMER_NAME` (`lore-extractor-1`)
|
||||
- `LLM_URL` (default `http://ollama-cpu:11435`),
|
||||
`LLM_MODEL` (default `qwen2.5:3b`)
|
||||
- `PROMPT_FILE` (optional override)
|
||||
- **Env vars (-2 replica)**:
|
||||
- `LLM_URL=http://100.77.136.12:11434`, `LLM_MODEL=qwen3.5`
|
||||
- `CONSUMER_NAME=lore-extractor-2`
|
||||
- **Streams read**: `raw.lore`
|
||||
- **Streams written**: none
|
||||
- **Cypher queries emitted**:
|
||||
- Pre-check: `MATCH (d:LoreDocument)-[:FEATURES]->(e) RETURN ...` to
|
||||
know what entities already exist for the doc
|
||||
- `MERGE (d:LoreDocument {id: $docID})` → `UNWIND $entities AS ent` →
|
||||
`MERGE (e {name: ent.name}) ON MATCH SET e.lore_verified = true` →
|
||||
`MERGE (d)-[:FEATURES]->(node)`
|
||||
- Relation merge (same APOC pattern as entity-extractor)
|
||||
- Contradiction detection: `MATCH (a)-[r1]->(x) MATCH (a)-[r2]->(y)`
|
||||
where both rels have the same canonical predicate but different
|
||||
targets → `MERGE (contra:Contradiction {subject, claim_a, claim_b})` →
|
||||
`MERGE (a)-[:HAS_CONTRADICTION]->(contra)`
|
||||
- **LLM call sites**: HTTP POST to `$LLM_URL/v1/chat/completions` with the
|
||||
default lore-extraction prompt. One call per lore document.
|
||||
- **Prompt**: defined inline as `defaultSystemPrompt` in
|
||||
`services/lore-extractor/main.go:53-`.
|
||||
|
||||
### 1.7 encounter-processor (and -2)
|
||||
|
||||
- **Containers**: `encounter-processor`, `encounter-processor-2`
|
||||
- **Source**: `services/encounter-processor/main.go` (530 lines) — both
|
||||
replicas share the binary
|
||||
- **Purpose**: Consumes `raw.encounters`, creates `:Encounter` nodes with
|
||||
`:WITNESSED` edges for each participant (linking via `Person.name` or
|
||||
fallback `Person.id`), `OCCURRED_AT` to a `:Location`, and calls the
|
||||
LLM on the encounter summary to extract `FEATURED` entity links.
|
||||
- **Env vars (primary)**:
|
||||
- `REDIS_STREAM` (default `raw.encounters`),
|
||||
`REDIS_GROUP` (`encounter-processing`),
|
||||
`CONSUMER_NAME` (`encounter-processor-1`)
|
||||
- `LLM_URL` (default `http://ollama-cpu:11435`),
|
||||
`LLM_MODEL` (default `qwen2.5:3b`)
|
||||
- **Env vars (-2 replica)**:
|
||||
- `LLM_URL=http://100.77.136.12:11434`, `LLM_MODEL=qwen3.5`
|
||||
- `CONSUMER_NAME=encounter-processor-2`
|
||||
- **Streams read**: `raw.encounters`
|
||||
- **Streams written**: none
|
||||
- **Cypher queries emitted**:
|
||||
- `MERGE (enc:Encounter {id: $id})` then cascade entity normalisation
|
||||
+ link (`MATCH (e)`, `MATCH (e {name: $canonical})`)
|
||||
- `MERGE (p:Person {name: $name}) MERGE (enc:Encounter {id: $encID})
|
||||
MERGE (p)-[w:WITNESSED]->(enc)`
|
||||
- `MATCH (loc {name: $canonical}) MATCH (enc:Encounter {id: $encID})
|
||||
MERGE (enc)-[:OCCURRED_AT]->(loc)` (fallback: `MERGE (loc:Location
|
||||
{name: $location}) MERGE (enc)-[:OCCURRED_AT]->(loc)`)
|
||||
- `MATCH (enc:Encounter {id: $encID})` + `UNWIND $entities AS ent` →
|
||||
`MERGE (e {name: ent.name}) MERGE (enc)-[:FEATURED]->(node)`
|
||||
- **LLM call sites**: HTTP POST to `$LLM_URL/v1/chat/completions` with the
|
||||
`encounterSystemPrompt`. One call per encounter to extract `FEATURED`
|
||||
entities.
|
||||
- **Prompt**: defined inline as `encounterSystemPrompt` in
|
||||
`services/encounter-processor/main.go:85-`.
|
||||
|
||||
### 1.8 mcp-server
|
||||
|
||||
- **Container**: `mcp-server`
|
||||
- **Source**: `services/mcp-server/main.go` (1435 lines)
|
||||
- **Purpose**: Exposes the MCP tool surface (11 tools) to clients over
|
||||
HTTP + SSE on port 9000. Embeds user queries via GPU Ollama, runs
|
||||
Cypher traversals and ANN searches against Neo4j.
|
||||
- **Env vars**:
|
||||
- `NEO4J_URL` (default `bolt://neo4j:7687`), `NEO4J_USER`, `NEO4J_PASSWORD`
|
||||
- `EMBED_URL` (default `http://ollama-gpu:11434`),
|
||||
`EMBED_MODEL` (default `nomic-embed-text`)
|
||||
- `MCP_PORT` (default `9000`)
|
||||
- `MAX_CONTEXT_TOKENS` (default `4000`) — caps context for fast TTFT
|
||||
- `LOG_LEVEL` (default `info`)
|
||||
- **Streams read**: none (synchronous query layer over Neo4j)
|
||||
- **Streams written**: none
|
||||
- **Cypher queries emitted**: see the per-tool rows in §2 — every tool
|
||||
handler runs its own Cypher.
|
||||
- **LLM call sites**: HTTP POST to `$EMBED_URL/v1/embeddings` (every query
|
||||
that needs semantic search — `semantic_search`, `query_as_npc`).
|
||||
- **Wire protocol**: MCP 2024-11-05 over `GET /sse` + `POST /message?sessionId=X`.
|
||||
|
||||
---
|
||||
|
||||
## 2. MCP Tools (11 tools)
|
||||
|
||||
All tool definitions live in `mcp-server/main.go` in the `mcpTools` slice
|
||||
declared at lines 137–268. The dispatcher at lines 316–341 maps each name
|
||||
to a handler.
|
||||
|
||||
| Tool | Input schema (required) | Output shape | Handler location |
|
||||
|---|---|---|---|
|
||||
| `semantic_search` | `query: string`, `limit?: int` (default 5) | List of `{id, content, score, source}` chunks/messages | `services/mcp-server/main.go:317` → `handleSemanticSearch` at `:616` |
|
||||
| `graph_traverse` | `entity: string`, `depth?: int` (1–3, default 2) | `{nodes: [...], relationships: [...]}` | `services/mcp-server/main.go:319` → `handleGraphTraverse` at `:698` |
|
||||
| `get_context` | `message_id: string` | `{message, chunks, entities, relations}` | `services/mcp-server/main.go:321` → `handleGetContext` at `:735` |
|
||||
| `get_person_profile` | `name: string` | `{topics, interests, message_history, co_occurring_persons}` | `services/mcp-server/main.go:323` → `handleGetPersonProfile` at `:771` |
|
||||
| `query_as_npc` | `npc_name: string`, `question: string`, `limit?: int` (default 5) | `{chunks: [...], encounters: [...]}` — scoped to NPC's WITNESSED edges | `services/mcp-server/main.go:325` → `handleQueryAsNPC` at `:922` |
|
||||
| `log_encounter` | `title: string`, `participants: string` (CSV), `summary: string`, `location?: string`, `type?: string` (default `conversation`) | `{id, title, participants, ...}` of the created `:Encounter` | `services/mcp-server/main.go:327` → `handleLogEncounter` at `:812` |
|
||||
| `get_unresolved` | `type?: string`, `limit?: int` (default 30) | List of provisional entities (`:Person|Location|Faction|...` where `lore_verified=false`) | `services/mcp-server/main.go:329` → `handleGetUnresolved` at `:1162` |
|
||||
| `get_contradictions` | `subject?: string`, `limit?: int` (default 20) | List of `:Contradiction` rows with claim_a/claim_b | `services/mcp-server/main.go:331` → `handleGetContradictions` at `:1225` |
|
||||
| `list_encounters` | `limit?: int` (default 10) | Encounters ordered by recency | `services/mcp-server/main.go:333` → `handleListEncounters` at `:1305` |
|
||||
| `search_encounters` | `query?: string`, `location?: string`, `participant?: string`, `limit?: int` (default 10) | Filtered encounters | `services/mcp-server/main.go:335` → `handleSearchEncounters` at `:1337` |
|
||||
| `get_encounter` | `id: string` | `{encounter, participants, featured_entities}` | `services/mcp-server/main.go:337` → `handleGetEncounter` at `:1402` |
|
||||
|
||||
**Server identity**: name `graphmcp`, version `1.0.0`, protocol
|
||||
`2024-11-05`. Set in `dispatch()` at `services/mcp-server/main.go:359-360`.
|
||||
|
||||
---
|
||||
|
||||
## 3. Redis Streams (4 streams)
|
||||
|
||||
All four streams use the same Redis instance (`redis://redis:6379`, AOF
|
||||
on with `everysec` fsync, `maxmemory 1gb` noeviction). Retention is
|
||||
governed by Redis memory limits rather than explicit `XADD MAXLEN ~`;
|
||||
no per-stream trimming is configured.
|
||||
|
||||
### 3.1 `raw.discord`
|
||||
|
||||
- **Producers**: `discord-connector` (every live MESSAGE_CREATE, plus
|
||||
every backfilled message). One XADD per message at
|
||||
`services/discord-connector/main.go:218-229`.
|
||||
- **Consumers**: `discord-filter` (consumer group `discord-filter`).
|
||||
- **Message fields**: `id`, `content`, `author`, `timestamp`, `source=discord`,
|
||||
`channel_id`, `channel_name`.
|
||||
- **Retention policy**: implicit — bounded by Redis `maxmemory 1gb`
|
||||
noeviction (stream blocks writes if exhausted).
|
||||
- **Expected throughput**: **TBD** — measure under realistic Discord load.
|
||||
|
||||
### 3.2 `raw.messages`
|
||||
|
||||
- **Producers**:
|
||||
- `discord-filter` (only promoted messages — those passing the lore
|
||||
similarity threshold or matching a known lore Person name). XADD at
|
||||
`services/discord-filter/main.go:274-287`.
|
||||
- The legacy `discord-connector` config still names `raw.messages` as
|
||||
its `REDIS_STREAM` default — see `services/discord-connector/main.go:42`;
|
||||
in the live stack the connector actually writes to `raw.discord` (the
|
||||
compose file overrides `REDIS_STREAM: raw.discord` for the
|
||||
connector). Treat the env var as historical.
|
||||
- **Consumers**:
|
||||
- `ingestion-worker` (consumer group `ingestion`)
|
||||
- `entity-extractor` + `entity-extractor-2` (consumer group `extraction`,
|
||||
two consumers in the same group share load)
|
||||
- **Message fields**: `id`, `content`, `author`, `timestamp`, `source`,
|
||||
`channel_id`, `channel_name` (for Discord-sourced messages).
|
||||
- **Retention policy**: implicit, Redis maxmemory.
|
||||
- **Expected throughput**: **TBD**.
|
||||
|
||||
### 3.3 `raw.lore`
|
||||
|
||||
- **Producers**: `ingestion-worker` (via `POST /ingest/lore` HTTP handler,
|
||||
which calls `rdb.XAdd` at `services/ingestion-worker/main.go:534`). In
|
||||
practice the `lore-watcher` triggers these uploads but does not write
|
||||
the stream directly.
|
||||
- **Consumers**: `lore-extractor` + `lore-extractor-2` (consumer group
|
||||
`lore-extraction`, two consumers).
|
||||
- **Message fields**: document-level fields set by the ingestion HTTP
|
||||
handler (`docID`, `title`, `filename`, `content`, etc.).
|
||||
- **Retention policy**: implicit, Redis maxmemory.
|
||||
- **Expected throughput**: **TBD** — bounded by human-driven drops of
|
||||
markdown files into `./lore-data/`.
|
||||
|
||||
### 3.4 `raw.encounters`
|
||||
|
||||
- **Producers**:
|
||||
- `discord-connector` (one XADD per closed conversation window, at
|
||||
`services/discord-connector/main.go:298-312`)
|
||||
- Future: `mcp-server` `log_encounter` tool may also publish here, but
|
||||
the current handler writes directly to Neo4j and does NOT XADD.
|
||||
- **Consumers**: `encounter-processor` + `encounter-processor-2`
|
||||
(consumer group `encounter-processing`, two consumers).
|
||||
- **Message fields**: `id`, `title`, `type=conversation`,
|
||||
`location=channel_name`, `participants` (CSV), `summary`,
|
||||
`timestamp=first_message_ts`.
|
||||
- **Retention policy**: implicit, Redis maxmemory.
|
||||
- **Expected throughput**: **TBD**.
|
||||
|
||||
---
|
||||
|
||||
## 4. Topology snapshot
|
||||
|
||||
```
|
||||
┌──────────────────────────┐
|
||||
│ Discord Gateway │
|
||||
└────────┬─────────────────┘
|
||||
│ MESSAGE_CREATE / backfill
|
||||
▼
|
||||
┌──────────────────────────┐
|
||||
│ discord-connector │ ── raw.discord
|
||||
└────────┬─────────────────┘
|
||||
▼
|
||||
┌──────────────────────────┐ ┌────────────────────────┐
|
||||
│ discord-filter │ ──▶ │ raw.messages (XADD) │
|
||||
│ (embed + ANN + name) │ └────┬───────────────────┘
|
||||
└──────────────────────────┘ │
|
||||
│
|
||||
┌────────────────────────┴────────────┐
|
||||
▼ ▼
|
||||
┌────────────────────┐ ┌────────────────────┐
|
||||
│ ingestion-worker │ │ entity-extractor │
|
||||
│ group: ingestion │ │ group: extraction │
|
||||
│ │ │ + entity-extractor-2│
|
||||
│ writes Chunk nodes │ │ (writes Entities, │
|
||||
│ + raw.lore (HTTP) │ │ Mentions, rels) │
|
||||
└─────────┬──────────┘ └────────────────────┘
|
||||
│ raw.lore
|
||||
▼
|
||||
┌────────────────────┐ ┌────────────────────┐
|
||||
│ lore-extractor │ │ encounter-processor│
|
||||
│ group: │ │ group: encounter- │
|
||||
│ lore-extraction │ │ processing │
|
||||
│ + lore-extractor-2 │ │ + encounter- │
|
||||
│ (FEATURES, Contra) │ │ processor-2 │
|
||||
└────────────────────┘ └────────────────────┘
|
||||
▲ ▲
|
||||
│ │
|
||||
│ │ raw.encounters
|
||||
│ │
|
||||
│ (indirect) │
|
||||
lore-watcher → POST /ingest/lore │
|
||||
│
|
||||
discord-connector ──────────────┬────────┘
|
||||
(15-min conversation window) │
|
||||
│
|
||||
raw.encounters
|
||||
|
||||
┌────────────────────┐
|
||||
│ mcp-server │ ◀── HTTP+SSE from clients
|
||||
│ (11 MCP tools, │ (e.g. lore-engine bot)
|
||||
│ reads Neo4j │
|
||||
│ only — no │
|
||||
│ stream I/O) │
|
||||
└────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. Cross-reference
|
||||
|
||||
- Phase 0 story: `lore-engine-merge-prds/_bmad-output/planning-artifacts/stories/S1-phase-0-inventory.md`
|
||||
- PRD: [`meta/prd.md`](../meta/prd.md)
|
||||
- Architecture: [`planning-artifacts/architecture.md`](../planning-artifacts/architecture.md)
|
||||
- Epics: `meta/epics.md`
|
||||
- Test enforcing this inventory: `tests/test_inventory_completeness.py`
|
||||
- Source pinned at GraphMCP-Example commit `064daa9`.
|
||||
53
docs/phase-1/S2-phase-1-substrate-merge.md
Normal file
53
docs/phase-1/S2-phase-1-substrate-merge.md
Normal file
@@ -0,0 +1,53 @@
|
||||
# Phase 1 (S2) — Substrate Merge — Dev Notes
|
||||
|
||||
**Date**: 2026-06-27
|
||||
**Source PRD**: `lore-engine-merge-prds/_bmad-output/planning-artifacts/stories/S2-phase-1-substrate-merge.md`
|
||||
**Status**: PRD-described work; landing target TBD (lore-engine-merge codebase not yet bootstrapped)
|
||||
|
||||
---
|
||||
|
||||
(Notes captured against the PRD, describing work that would land in a separate
|
||||
`lore-engine-merge` working repo. Implementation has not been committed to
|
||||
`lore-engine-poc` yet — see the PRD for the full target shape.)
|
||||
|
||||
---
|
||||
|
||||
## Dev Notes (Phase 1, 2026-06-27)
|
||||
|
||||
**Status: shippable — verify gate green, working tree staged for leader commit.**
|
||||
|
||||
### What shipped
|
||||
|
||||
- `docker-compose.yml` (+267 lines): added `redis`, `mcp-server`, and 8 worker services. Container names carry the `lore-` prefix (host port remap 5434/7475/7688/9002/9003/8766/6379 to coexist with the damascus stack).
|
||||
- `plugins/nsc.py` (NEW, 291 lines): thin httpx proxy from the Python gateway to the Go `mcp-server`. Registers the 11 GraphMCP tools as MCP `tools/list` entries; `tools/call` JSON-RPC-passes through to the upstream.
|
||||
- `workers/` (NEW, 7 directories): ported `discord-connector`, `discord-filter`, `lore-watcher`, `ingestion-worker`, `entity-extractor`, `lore-extractor`, `encounter-processor`, plus `mcp-server`. Original Go module paths preserved (`github.com/graphmcp/...`).
|
||||
- `tests/contract/test_graphmcp_tool_contracts.py` (NEW, 15 tests): RED-then-GREEN. Asserts `tools/list` returns all 11 inherited tools, each carries the documented required fields, each accepts a valid payload and returns a structured MCP envelope, and validation rejects missing-required inputs.
|
||||
- `verify-merge.sh` (NEW): one-shot verify gate. 37 PASS / 0 FAIL.
|
||||
- `docs/VERIFICATION.md` (NEW): the Phase 1 verify-gate document.
|
||||
- `README.md` (+10 lines): updated service inventory (13 rows now, including the 8 workers) and the plugin list (nsc added).
|
||||
- `test.sh` (+1 line): default `GATEWAY` URL bumped `8765` → `8766` to match the host-side port remap.
|
||||
|
||||
### Decisions taken
|
||||
|
||||
1. **Worker port remap 8765 → 8766.** The damascus stack already binds 8765 on this host. The lore stack is on 8766. Updated `test.sh` default and all README curl examples. Verifier still accepts a `GATEWAY` env override for backward compatibility.
|
||||
2. **Expected services in `verify-merge.sh` use service names, not container names.** Service names in compose are unprefixed (`neo4j`, `gateway`, etc.); only `container_name` carries the `lore-` prefix. First version of the script conflated the two and falsely reported 12 failures.
|
||||
3. **nsc plugin as a single file, not a package.** The gateway's `load_plugins()` globs `*.py` in `plugins/`; a flat file matches. A future enhancement (out of Phase 1) can split nsc into a package once server.py learns `__init__.py` discovery — this is consistent with the existing plugin convention.
|
||||
4. **`discord-connector` runs but disables itself via `DISCORD_ENABLED=false`.** Per the ambiguity; the container restart-loops but doesn't consume Redis or Neo4j resources, and the verify gate ignores it.
|
||||
5. **Neo4j query in verifier returns 38 nodes** — matches the seeded lore-engine data; that proves both substrates coexist (legacy Person/Location/Faction/Encounter from seed.py + the inherited GraphMCP ontology).
|
||||
|
||||
### Anything I couldn't do
|
||||
|
||||
- **Did NOT run `git commit`.** Per the hard rules. Working tree is staged; leader (Hermes) commits.
|
||||
- **Did NOT push or open PR.** Both depend on the leader's commit. Branch `feat/p1-substrate-merge` is local-only at HEAD `c27adc6` + staged changes.
|
||||
- **`get_encounter` is exercised with a synthetic nonexistent id.** The contract assertion is envelope-shaped, not semantic. Real-world get_encounter behavior is downstream of Phase 1.
|
||||
|
||||
### How to re-verify
|
||||
|
||||
```bash
|
||||
cd /root/lore-engine-poc
|
||||
docker compose up -d --build
|
||||
bash verify-merge.sh # 37 PASS / 0 FAIL
|
||||
bash test.sh # no regression
|
||||
GATEWAY_URL=http://localhost:8766/mcp \
|
||||
python3 -m pytest tests/contract/test_graphmcp_tool_contracts.py -v # 15/15 pass
|
||||
```
|
||||
109
docs/phase-1/S3-phase-2-ontology-time-planes.md
Normal file
109
docs/phase-1/S3-phase-2-ontology-time-planes.md
Normal file
@@ -0,0 +1,109 @@
|
||||
# Phase 2 (S3) — Ontology + Time Planes — Dev Notes
|
||||
|
||||
**Date**: 2026-06-27
|
||||
**Source PRD**: `lore-engine-merge-prds/_bmad-output/planning-artifacts/stories/S3-phase-2-ontology-time-planes.md`
|
||||
**Status**: PRD-described work; landing target TBD
|
||||
|
||||
---
|
||||
|
||||
(Notes captured against the PRD, describing Phase 2 work that would land in a
|
||||
separate `lore-engine-merge` working repo.)
|
||||
|
||||
---
|
||||
|
||||
## Dev Notes — appended by @dev (kanban worker run 9, 2026-06-27)
|
||||
|
||||
### Status
|
||||
|
||||
Branch `feat/p2-ontology-time-planes` prepared locally; **NOT** committed (per
|
||||
hard rule "DO NOT run `git commit`. The leader (Hermes) commits."). Leader
|
||||
needs to `git add -A && git commit && git push origin feat/p2-ontology-time-planes
|
||||
&& gh pr create` to ship this story.
|
||||
|
||||
### Files changed (working tree)
|
||||
|
||||
- `neo4j/init.cypher` — extended with Plane/Setting/EXISTS_IN/REFLECTS/LAYER_OF/ADJACENT_TO/ACCESSIBLE_VIA schema (29-line block at the bottom).
|
||||
- `scripts/migrate-to-v1.2.sh` — NEW (idempotent Cypher migration in 8 phases; uses heredoc + `docker exec cypher-shell` so the script doesn't need the Python driver on the host).
|
||||
- `plugins/world.py` — extended with `PLANE_AWARE_RELATION_ALLOWLIST` (adds `EXISTS_IN` + `PRACTICED_AT`), `entity_context` now surfaces `plane_relations`, NEW tool `entity_planes_at_time`.
|
||||
- `plugins/planes/__init__.py` — NEW (subpackage; exports `list_planes`, `entity_planes`, `entity_planes_at_time`, `find_plane_violations`).
|
||||
- `plugins/planes/cypher.py` — NEW (Cypher strings kept separate for readability).
|
||||
- `plugins/planes.py` — NEW shim (server.py uses `glob("*.py")` so it doesn't auto-load subpackages; this 12-line shim imports `plugins.planes` so the @REGISTRY.tool decorators fire).
|
||||
- `seed.py` — extended with `seed_planes_v1_2()` (called from `seed_neo4j` so a fresh `python3 seed.py` produces the v1.2 shape end-to-end, no migration step required).
|
||||
- `tests/test_plane_migration.py` — NEW (4 tests, all green).
|
||||
- `mock-data/manifest.json` — NEW (v1.2 dataset manifest).
|
||||
- `docs/VERIFICATION.md` — extended with Phase 2 verification recipe + AC checklist.
|
||||
|
||||
### Test command result
|
||||
|
||||
```
|
||||
$ bash scripts/migrate-to-v1.2.sh && PYTHONPATH=. pytest tests/test_plane_migration.py -v && bash test.sh
|
||||
── [1/8] Schema constraints + indexes (idempotent) ──
|
||||
── [2/8] Settings: ensure eberron + mardonari exist; rename legacy default ──
|
||||
── [3/8] Planes: materialize 4 (...) ──
|
||||
── [4/8] Setting CONTAINS Plane edges (idempotent) ──
|
||||
── [5/8] Plane topology edges (REFLECTS / LAYER_OF / ADJACENT_TO / ACCESSIBLE_VIA) ──
|
||||
── [6/8] Collapse the 2 Roland Person nodes into 1 + write LOCATED_IN edges ──
|
||||
── [7/8] Seed the wheel-and-kiln of Mardonar + time-bounded PRACTICED_AT edge ──
|
||||
── [8/8] Defensive count of leftover MULTIVERSE_COUNTERPART_OF relations ──
|
||||
=== migrate-to-v1.2.sh: done ===
|
||||
============================= test session starts ==============================
|
||||
tests/test_plane_migration.py::test_two_rolands_collapsed PASSED [ 25%]
|
||||
tests/test_plane_migration.py::test_plane_edges_written PASSED [ 50%]
|
||||
tests/test_plane_migration.py::test_world_id_deprecated_but_readable PASSED [ 75%]
|
||||
tests/test_plane_migration.py::test_setting_node_exists PASSED [100%]
|
||||
============================== 4 passed in 0.54s ===============================
|
||||
... bash test.sh ...
|
||||
✅ all tool types tested
|
||||
```
|
||||
|
||||
4/4 new tests + 12/12 existing test.sh tests pass. Migration re-runs idempotently
|
||||
(verified by running twice in a row — same end state).
|
||||
|
||||
### AC verification (extra evidence beyond the 4 named tests)
|
||||
|
||||
End-to-end smoke tests through the gateway `:8766/mcp`:
|
||||
|
||||
- `list_planes` returns 4 planes with their Setting + topology edges
|
||||
(REFLECTS / LAYER_OF / ADJACENT_TO / ACCESSIBLE_VIA).
|
||||
- `entity_planes_at_time(Roland Raventhorne, 3rd_age.year_435, default)` →
|
||||
`located_in: [mardonari.voldramir]` (after the year_420 transition).
|
||||
- `entity_planes_at_time(Roland Raventhorne, 3rd_age.year_415, default)` →
|
||||
`located_in: [mardonari.material]` (before the transition).
|
||||
- `was_true_at(PRACTICED_AT, "Roland Raventhorne", "The Wheel & Kiln of Mardonar",
|
||||
"3rd_age.year_435", default)` → `was_true: true`.
|
||||
- `was_true_at(PRACTICED_AT, "Roland Raventhorne", "The Wheel & Kiln of Mardonar",
|
||||
"3rd_age.year_415", default)` → `was_true: false`.
|
||||
- `entity_context(Roland Raventhorne, default)` → `plane_relations` field
|
||||
surfaces both `LOCATED_IN -> Material`, `LOCATED_IN -> Voldramir`, `EXISTS_IN -> Voldramir`.
|
||||
- `find_plane_violations` returns 15 missing_exists_in violations
|
||||
(most Persons in the default seed pre-date the v1.2 model; follow-up to
|
||||
add EXISTS_IN assertions to seed.py).
|
||||
- Tool count: 31 → 35 (4 new plane tools added).
|
||||
|
||||
### Things the leader needs to do
|
||||
|
||||
1. `git add -A && git commit -m "Phase 2: v1.2 plane migration + Setting/Plane ontology"`
|
||||
2. `git push origin feat/p2-ontology-time-planes`
|
||||
3. `gh pr create --base main --head feat/p2-ontology-time-planes --title "Phase 2 — v1.2 plane migration" --body-file <body>`
|
||||
4. Optionally: ship the PR body referencing this story file.
|
||||
|
||||
### Notes / gotchas
|
||||
|
||||
- **Duplicate `entity_planes_at_time` registration.** It's defined in both
|
||||
`plugins/world.py` (per the story deliverable list, which explicitly puts
|
||||
`entity_planes_at_time` in world.py) AND in `plugins/planes/__init__.py`
|
||||
(also per the story). The registry is a `dict` keyed by name with last-write-wins;
|
||||
`plugins/planes.py` sorts alphabetically before `plugins/world.py`, so the
|
||||
planes/__init__.py version wins. Both implementations are equivalent in
|
||||
semantics; the planes version is slightly more idiomatic because the
|
||||
Cypher is in `plugins/planes/cypher.py`.
|
||||
- **Existing test files (`test_multi_world.py`, `test_consistency.py`, etc.)
|
||||
use port 7687**, but the host Neo4j is on 7688 per docker-compose.yml.
|
||||
This is a pre-existing issue (the tests fail with `Connection refused`
|
||||
on the default port 7687) — out of File Scope. The story's test command
|
||||
uses `bash test.sh` (which uses the gateway on :8766) and pytest against
|
||||
`tests/test_plane_migration.py` only, both of which pass.
|
||||
- **`MULTIVERSE_COUNTERPART_OF` defensive cleanup.** Per Ambiguity §2,
|
||||
the migration removes only the Roland↔Roland edges. The current graph
|
||||
has 1 surviving `MULTIVERSE_COUNTERPART_OF` edge between non-Roland
|
||||
nodes, logged by step [8/8] and left intact for manual review.
|
||||
196
meta/prd.md
Normal file
196
meta/prd.md
Normal file
@@ -0,0 +1,196 @@
|
||||
PRD — Lore Engine × GraphMCP Substrate Merge
|
||||
|
||||
> **Template**: BMAD PRD at `_bmad-output/meta/prd.md`. Companion to `planning-artifacts/architecture.md` and `meta/epics.md`.
|
||||
|
||||
**Project**: `kaykayyali/lore-engine-poc` (runtime) — Gitea project: `lore-engine-merge`
|
||||
**Author**: hermes-agent (BMAD Phase 4 epic)
|
||||
**Date**: 2026-06-26
|
||||
**Status**: Draft v1 — pending architecture review gate
|
||||
**Companion ADR**: [[2026-06-26 Lore Engine GraphMCP Merge]] (Decision); [[2026-06-26 Lore Engine GraphMCP Merge Research]] (research)
|
||||
|
||||
**Phase index** (linked stories):
|
||||
- **Phase 0** — Inventory of GraphMCP-Example substrate: [`docs/merge/00-inventory.md`](../docs/merge/00-inventory.md). *Gate story — nothing else ships until the inventory lands.*
|
||||
- Phase 1 — Substrate merge (deferred to story S2)
|
||||
- Phase 2 — Ontology + time planes (S3)
|
||||
- Phase 5 — Bot integration (S6)
|
||||
- Phase 6 — Connector template (S7)
|
||||
|
||||
---
|
||||
|
||||
## 1. Goal
|
||||
|
||||
Produce a **single merged MCP runtime** that:
|
||||
|
||||
- Hosts the 14-node lore ontology + time-bounded relations + v1.2 Setting/Plane model on top of GraphMCP-Example's existing Person/Location/Faction/Event/Encounter graph
|
||||
- Preserves all 7 GraphMCP ingestion workers (Go, Redis Streams) — they're proven, production, and the user has stated "I'll add more"
|
||||
- Adds 2 new Go workers (structured-ingestor + dialogue-processor) for the YAML/Dialogue paths that lore-engine designed but never shipped
|
||||
- Exposes a unified MCP tool surface (~24 tools): 8 inherited GraphMCP + 12 lore-engine POC plugins + 4 v1.2 plane tools + consistency generalizations
|
||||
- Lets `kaykayyali/mardonar-npcs` (the new Discord bot) call `query_as_npc` + `log_encounter` and publish NPC dialogue to `raw.dialogue`
|
||||
|
||||
**The smallest end-state we can ship:** Phase 0 + Phase 1 + Phase 5 — the bot can run a Mardonar encounter and the NPCs remember across sessions via the merged MCP server, even without the v1.2 plane model or the consistency engine. Phases 2-4 and 6 are additive.
|
||||
|
||||
**Repo destinations post-merge:**
|
||||
|
||||
| Repo | Post-merge role |
|
||||
|---|---|
|
||||
| `kaykayyali/mardonar-specs` | YAML encounter corpus (content only, unchanged) |
|
||||
| `kaykayyali/mardonar-npcs` (NEW) | Discord bot runtime; consumes mardonar-specs at build time; calls the merged MCP server |
|
||||
| `kaykayyali/lore-engine` | Design docs (17 docs + ongoing). **Unchanged in this epic.** |
|
||||
| `kaykayyali/lore-engine-poc` | **Merged runtime home.** Gains Redis + 7 workers + 2 new workers + the merged MCP surface. |
|
||||
| `kaykayyali/GraphMCP-Example` | **Deprecated.** Once lore-engine-poc reaches feature parity, archive this repo (do NOT delete — historical value). |
|
||||
|
||||
---
|
||||
|
||||
## 2. Personas
|
||||
|
||||
| Persona | What they want |
|
||||
|---|---|
|
||||
| **Kay (operator / DM)** | Author a new encounter in `mardonar-specs`, commit, rebuild bot image. The bot runs it. NPCs remember across sessions. The lore graph is consistent and historically accurate. |
|
||||
| **World-builder** | Write `timeline.yaml` / `family_tree.yaml` / `gazetteer.yaml` / `magic_system.yaml` and ingest via `POST /ingest/structured`. The graph updates deterministically (no LLM in the loop for structured facts). |
|
||||
| **LLM (LLM as DM)** | Open-ended world queries through MCP: "what did House Vyr rule in 340 TA?", "where is Roland currently?", "did Aldric witness the Battle of Black Spire?". Get precise, source-attributed, contradiction-checked answers. |
|
||||
| **NPC (in-character via bot)** | Be queried for what they personally know (`query_as_npc`). Their answers are scoped to WITNESSED edges. They remember across sessions. |
|
||||
| **Future ingestion source author (Slack connector, RSS feed, PDF watcher, etc.)** | Copy `connector-template/`, set the env vars, point at a stream. New workers appear in `docker compose ps` healthy. |
|
||||
|
||||
---
|
||||
|
||||
## 3. User Stories (v1)
|
||||
|
||||
### P0 — must have for v1
|
||||
|
||||
- **U1**: As Kay, I author a YAML encounter spec, commit it to `mardonar-specs`, and rebuild the bot image with `SPECS_GIT_URL`. The bot loads it and runs the encounter in Discord.
|
||||
- **U2**: As the LLM DM, I query the merged MCP server with `query_as_npc(name="Bram", question="what's my opening line?")` and get an answer scoped to Bram's WITNESSED-edge knowledge.
|
||||
- **U3**: As the bot, I call `log_encounter(title=..., participants=..., summary=..., location=...)` after each scene. The next `query_as_npc` returns this encounter in the NPC's witness graph.
|
||||
- **U4**: As Kay, I ask the MCP server "where was Roland Raventhorne in 430 TA?" and get a precise, time-bounded answer using `was_true_at`.
|
||||
- **U5**: As world-builder, I POST `timeline.yaml` to `/ingest/structured`. The graph gains Date/Event/Edge nodes within 1s; no LLM in the loop.
|
||||
- **U6**: As Kay, I open Neo4j Browser at `:7474` and inspect the merged graph — I see Settings, Planes, Persons, Factions, Eras, Encounters, LoreFragments with proper edges.
|
||||
|
||||
### P1 — nice-to-have for v1
|
||||
|
||||
- **U7**: As Kay, I run `verify-merge.sh` and it exercises every plugin and every inherited tool end-to-end (green).
|
||||
- **U8**: As Kay, I add a new ingestion source by copying `connector-template/`. New workers appear in `docker compose ps` healthy.
|
||||
- **U9**: As Kay, I ask "find contradictions about Aldric's whereabouts" and the consistency engine surfaces planted contradictions from the seed.
|
||||
- **U10**: As LLM DM, I ask "what plane is Roland on right now?" and get `entity_planes_at_time(Roland, "now")` → `mardonari.material`.
|
||||
|
||||
### Out of scope for v1
|
||||
|
||||
- **In-fiction physics** (dice rolls, combat resolution) — Foundry owns this; the bot calls into Foundry, not the lore engine.
|
||||
- **Plane-traversal mechanics** ("can I Plane Shift to Voldramir?") — the engine knows planes exist; it doesn't compute the spell.
|
||||
- **Real-time collaboration** — the bot is single-session, single-party. Multi-party concurrent sessions are v1.5.
|
||||
- **Voice/audio NPC dialogue** — text-only for v1. Audio is a v2 expansion.
|
||||
- **Auto-scaling workers** — single-instance per worker for v1. The dual-LLM arbitration pattern (`*-2` replicas) handles quality, not load.
|
||||
|
||||
---
|
||||
|
||||
## 4. Functional Requirements
|
||||
|
||||
### 4.1 MCP server (the merged surface)
|
||||
|
||||
The merged MCP server MUST expose at least these 24 tools:
|
||||
|
||||
| Inherited from GraphMCP-Example (8) | Inherited from lore-engine-poc (12) | New from v1.2 plane model (4) |
|
||||
|---|---|---|
|
||||
| `semantic_search` | `entity_context` | `list_planes` |
|
||||
| `graph_traverse` | `was_true_at` | `entity_planes` |
|
||||
| `get_context` | `state_at` | `entity_planes_at_time` |
|
||||
| `get_person_profile` | `ancestors_of` | `find_plane_violations` |
|
||||
| `query_as_npc` | `descendants_of` | |
|
||||
| `log_encounter` | `lineage_of` | |
|
||||
| `get_unresolved` | `log_trade` | |
|
||||
| `get_contradictions` | `trades_by_buyer` | |
|
||||
| | `market_price` | |
|
||||
| | `register_image` | |
|
||||
| | `recall_images` | |
|
||||
| | `search_images_by_caption` | |
|
||||
| | `embed_images` | |
|
||||
| | `search_images_semantic` | |
|
||||
| | `find_contradictions` (was `get_contradictions`) | |
|
||||
| | `find_anachronisms` | |
|
||||
| | `find_ontology_violations` | |
|
||||
| | `find_orphans` | |
|
||||
|
||||
**Generalization requirement:** `get_contradictions` from GraphMCP is REPLACED by `find_contradictions` from lore-engine-poc (which is a generalization — same `subject`/`limit` params, plus optional `since`/`severity` filters). All tool discovery surfaces show the new name. `get_contradictions` becomes an alias if any consumer still references it.
|
||||
|
||||
### 4.2 Ingestion layer
|
||||
|
||||
The runtime MUST run all 9 worker processes (7 inherited + 2 new) connected to the 4 (now 5) Redis Streams:
|
||||
|
||||
| Stream | Producers | Consumers |
|
||||
|---|---|---|
|
||||
| `raw.discord` | `discord-connector` | `discord-filter` |
|
||||
| `raw.messages` | `discord-filter`, `ingestion-worker` (HTTP) | `entity-extractor`, `entity-extractor-2` |
|
||||
| `raw.lore` | `lore-watcher`, `ingestion-worker` (HTTP) | `lore-extractor`, `lore-extractor-2` |
|
||||
| `raw.encounters` | `discord-connector`, `ingestion-worker` (HTTP) | `encounter-processor`, `encounter-processor-2` |
|
||||
| `raw.structured` (NEW) | `ingestion-worker` (HTTP `/ingest/structured`) | `structured-ingestor` |
|
||||
| `raw.dialogue` (NEW) | `ingestion-worker` (HTTP `/ingest/dialogue`) | `dialogue-processor` |
|
||||
|
||||
**Dual-LLM arbitration contract:** every `-extractor` has a `-2` replica in the same consumer group. They race on the same stream entry; both write to Neo4j with `source_lv: 1` / `source_lv: 2`. `find_contradictions` surfaces entries where `source_lv: 1` and `source_lv: 2` disagree on the same claim.
|
||||
|
||||
### 4.3 Graph ontology
|
||||
|
||||
The merged graph MUST support both legacy GraphMCP nodes (Person/Location/Faction/Event/Encounter/Chunk) and lore-engine ontology extensions (Era/Lineage/Calendar/Culture/Deity/MagicSystem/Spell/Language/Title/Artifact/Region/Plane/Setting) plus the temporal relations and the v1.2 plane model.
|
||||
|
||||
**Migration contract:** existing lore-engine-poc data (2 Settings, 4 Planes, Roland Raventhorne, the seed) MUST be migrated to the v1.2 model without loss. Specifically: the 2 Roland `Person` nodes collapse to 1 with two `LOCATED_IN` edges, the `MULTIVERSE_COUNTERPART_OF` relation goes away, and the `world_id` string property is deprecated (still readable for backwards compat).
|
||||
|
||||
### 4.4 Bot integration
|
||||
|
||||
`mardonar-npcs` MUST:
|
||||
|
||||
- Validate encounter specs against `EncounterSpecSchema` (Pydantic v2) at `/encounter start`
|
||||
- Call `query_as_npc(name, question)` before every NPC reply
|
||||
- Call `log_encounter(...)` synchronously on encounter resolve
|
||||
- Publish every in-character NPC line to `POST /ingest/dialogue`
|
||||
|
||||
**Build contract:** `SPECS_GIT_URL` and `SPECS_GIT_REF` Docker build args clone `mardonar-specs` into `./specs/` at build time. The image is fully self-contained; no runtime fetch.
|
||||
|
||||
---
|
||||
|
||||
## 5. Non-Functional Requirements
|
||||
|
||||
- **Cost:** total LLM cost ≤ $20 for the full Phase 0-6 epic at minimax-m3 rates. Comfortably within Ollama $100/mo + Gemini $20/day caps.
|
||||
- **Latency:** `query_as_npc` returns in <500ms p95 for encounter-scoped queries (NPC witness graph is small). `log_encounter` is synchronous and MUST complete in <200ms p95.
|
||||
- **Reliability:** `log_encounter` is the source of truth for NPC memory. Failure returns an error to the bot; the bot retries; the encounter graph is consistent. No silent data loss.
|
||||
- **Backward compatibility:** GraphMCP-Example's existing 8 MCP tools keep the same input/output contracts (no breaking schema changes). Lore-engine-poc's existing 12 plugins extend, not break, their surface.
|
||||
- **Observability:** every worker logs structured JSON with `worker`, `stream`, `group`, `msg_id`, `latency_ms` per consumed message. Logs land in Docker's JSON log driver; `docker compose logs` shows them.
|
||||
|
||||
---
|
||||
|
||||
## 6. Risks + Mitigations
|
||||
|
||||
| Risk | Likelihood | Impact | Mitigation |
|
||||
|---|---|---|---|
|
||||
| Lore-engine-poc plugins break when GraphMCP worker writes hit Neo4j | Medium | High | Phase 1 includes `verify-merge.sh` that exercises every plugin against the merged stack before phase 2 starts |
|
||||
| WITNESSED-edge semantics drift when plane model lands | Medium | High | Spell out: `WITNESSED` is Person↔Encounter, NOT Person↔Plane; orthogonal | P2 |
|
||||
| Two-LLM arbitration writes conflicting nodes | Medium | Medium | Add `source_lv` property check in `find_contradictions` | P3 |
|
||||
| `world_id` → plane migration corrupts existing Mardonar data | Low | High | One-shot Cypher migration with rollback, run against v1.2 seed; 2 Roland nodes collapse to 1 with two `LOCATED_IN` | P2 |
|
||||
| Bot `log_encounter` writes fail during active DM | Low | High | Sync write is the contract; failure → bot retries; encounter graph is source of truth | P5 |
|
||||
|
||||
---
|
||||
|
||||
## 7. Phased execution (summary — full detail in `meta/epics.md`)
|
||||
|
||||
| Phase | What | Owner profile | Wall clock | Cost |
|
||||
|---|---|---|---|---|
|
||||
| P0 | Inventory of GraphMCP workers/tools/streams | dev | 30 min | ~$0.40 |
|
||||
| P1 | Substrate merge (Redis + 7 workers + nsc plugin) | dev + tester | 2 h | ~$1.60 |
|
||||
| P2 | Ontology + time + planes | dev + tester | 2 h | ~$1.60 |
|
||||
| P3 | Consistency engine | dev + tester | 1.5 h | ~$1.20 |
|
||||
| P4 | Structured + dialogue ingestion | dev + tester | 2 h | ~$1.60 |
|
||||
| P5 | Bot integration (mardonar-npcs ↔ merged MCP) | dev + tester | 2 h | ~$1.60 |
|
||||
| P6 | Connector template + first new source | dev + tester | 1.5 h | ~$1.20 |
|
||||
| **Total** | | | **~11.5 h** | **~$9.20** |
|
||||
|
||||
Linear chain P0 → P1 → ... → P6. P6 can fan out into multiple `connector-*` workers once the template ships.
|
||||
|
||||
---
|
||||
|
||||
## 8. Definition of Done (rolled up)
|
||||
|
||||
- All 6 phases `done` on the damascus orchestrator
|
||||
- Each phase's PR is merged to `main` on `kaykayyali/lore-engine-poc`
|
||||
- `bash verify-merge.sh` exits 0 (exercises every plugin + every inherited tool)
|
||||
- `docker compose ps` shows all 11 services healthy (neo4j, postgres, minio, redis, gateway, 7 workers)
|
||||
- Neo4j Browser at `:7474` shows the merged graph (Settings, Planes, all ontology nodes, Encounter + WITNESSED)
|
||||
- Live URL `http://hp-grey-public.tailcb2b60.ts.net:8765/mcp` returns the full 24-tool surface on `tools/list`
|
||||
- `kaykayyali/mardonar-npcs` image built + tested end-to-end against the merged runtime
|
||||
- Wiki page `Projects/Lore Engine.md` updated with the merge state + URL
|
||||
- ADR at `wiki/Decisions/2026-06-26 Lore Engine GraphMCP Merge.md` updated with "Merged" status + merge SHA
|
||||
360
planning-artifacts/architecture.md
Normal file
360
planning-artifacts/architecture.md
Normal file
@@ -0,0 +1,360 @@
|
||||
Architecture — Lore Engine × GraphMCP Substrate Merge
|
||||
|
||||
> **Template**: BMAD architecture at `_bmad-output/planning-artifacts/architecture.md` (and mirrored at `meta/architecture.md`). **This file MUST live at `planning-artifacts/architecture.md` exactly** — the orchestrator's spec-refiner hardcodes this path.
|
||||
|
||||
**Date**: 2026-06-26
|
||||
**Companion to**: `meta/prd.md`, `meta/epics.md`
|
||||
**Companion to design**: [[Lore Engine]] design docs (00-17, especially 06-ingestion, 08-architecture, 17-planes)
|
||||
**Companion to ADR**: [[2026-06-26 Lore Engine GraphMCP Merge]] + research file
|
||||
|
||||
**Substrate catalog** (Phase 0, the merge gate): [`docs/merge/00-inventory.md`](../docs/merge/00-inventory.md). Every GraphMCP worker, MCP tool, and Redis stream the merged runtime must preserve, replace, or deprecate is enumerated there. Anything not in the inventory is out of scope for this architecture until it lands.
|
||||
|
||||
---
|
||||
|
||||
## 1. System context
|
||||
|
||||
```
|
||||
┌────────────────────────────────────────────────────────────────────────┐
|
||||
│ USER: Kay (DM/operator) │
|
||||
│ - authors YAML specs in mardonar-specs │
|
||||
│ - inspects Neo4j Browser at :7474 │
|
||||
│ - runs the bot, plays encounters, queries lore │
|
||||
└──────────────┬─────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌────────────────────────────────────────────────────────────────────────┐
|
||||
│ BUILD-TIME: SPECS INJECT │
|
||||
│ Dockerfile SPECS_GIT_URL=mardonar-specs ─────▶ mardonar-bot image │
|
||||
│ (the bot image is self-contained, no runtime fetch) │
|
||||
└────────────────────────────────────────────────────────────────────────┘
|
||||
|
||||
RUNTIME:
|
||||
┌──────────────┐ ┌─────────────────────────────────────────────────┐
|
||||
│ mardonar-bot │ ──JSON─▶│ lore-gateway :8765 (Python FastAPI plugin │
|
||||
│ (Discord) │ ──RPC──▶│ server, MCP HTTP+SSE) │
|
||||
│ │ │ plugins: world, lineage, trade, images, │
|
||||
│ │ │ embeddings, consistency, nsc (NEW), planes │
|
||||
│ │ │ (NEW) │
|
||||
│ │ └─────┬───────────────────────────────────────────┘
|
||||
└──────────────┘ │
|
||||
│ reads/writes Neo4j
|
||||
▼
|
||||
┌────────────────────────────────────────────────────────────────────────┐
|
||||
│ lore-neo4j :7474 / :7687 │
|
||||
│ Graph stores: Plane/Setting/Person/Faction/Encounter/LoreFragment/ │
|
||||
│ Era/Lineage/Calendar/Culture/Deity/MagicSystem/Spell/Language/... │
|
||||
│ Edges: WITNESSED, FEATURES, OCCURRED_AT, EXISTS_IN, LOCATED_IN, │
|
||||
│ REFLECTS, LAYER_OF, ADJACENT_TO, ACCESSIBLE_VIA, ALLIED_WITH, ... │
|
||||
└────────────────────────────────────────────────────────────────────────┘
|
||||
▲ ▲
|
||||
│ writes │ reads (embeddings)
|
||||
│ │
|
||||
┌──────┴─────────────────────────────────────────────────────┐ ┌─────────┴──────┐
|
||||
│ INGESTION LAYER (Go workers, Redis Streams) │ │ Polyglot │
|
||||
│ │ │ storage │
|
||||
│ ┌─────────────────────────────────────────────────────┐ │ │ │
|
||||
│ │ Redis Streams (4 inherited + 2 new): │ │ │ ┌────────────┐ │
|
||||
│ │ raw.discord → discord-filter → raw.messages │ │ │ │ lore- │ │
|
||||
│ │ raw.messages → entity-extractor, entity-x2 │ │ │ │ postgres │ │
|
||||
│ │ raw.lore → lore-extractor, lore-extractor-2 │ │ │ │ (pgvector) │ │
|
||||
│ │ raw.encounters → encounter-processor, encounter-2 │ │ │ └────────────┘ │
|
||||
│ │ raw.structured (NEW) → structured-ingestor (NEW) │ │ │ ┌────────────┐ │
|
||||
│ │ raw.dialogue (NEW) → dialogue-processor (NEW) │ │ │ │ lore-minio │ │
|
||||
│ └─────────────────────────────────────────────────────┘ │ │ │ (images) │ │
|
||||
│ │ │ └────────────┘ │
|
||||
│ Producers (live external feeds + HTTP endpoints): │ │ │
|
||||
│ - discord-connector (Discord API) │ │ │
|
||||
│ - discord-filter (raw.discord → raw.messages) │ │ │
|
||||
│ - lore-watcher (./lore-data/ filesystem) │ │ │
|
||||
│ - ingestion-worker (HTTP /ingest/lore, /structured, │ │ │
|
||||
│ /dialogue, /encounter) │ │ │
|
||||
│ [FUTURE: slack-connector, pdf-watcher, etc. — copy │ │ │
|
||||
│ connector-template/] │ │ │
|
||||
└────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
## 2. Component diagram (post-merge `lore-engine-poc/`)
|
||||
|
||||
```
|
||||
kaykayyali/lore-engine-poc/
|
||||
├── docker-compose.yml # neo4j + postgres + minio + redis + gateway + 9 workers
|
||||
├── gateway/
|
||||
│ ├── server.py # FastAPI + MCP JSON-RPC, plugin autoreload
|
||||
│ └── plugins/
|
||||
│ ├── world.py # entity_context, was_true_at, state_at
|
||||
│ ├── lineage.py # ancestors_of, descendants_of, lineage_of
|
||||
│ ├── trade.py # log_trade, trades_by_buyer, market_price
|
||||
│ ├── images.py # register_image, recall_images, search_images_by_caption
|
||||
│ ├── embeddings.py # embed_images, search_images_semantic
|
||||
│ ├── consistency.py # find_contradictions, find_anachronisms, find_ontology_violations, find_orphans
|
||||
│ ├── nsc/ # NEW (NPC Scoping — wraps GraphMCP's 4 NPC tools)
|
||||
│ │ ├── __init__.py # exports query_as_npc, log_encounter, list_encounters, search_encounters, get_encounter, get_unresolved
|
||||
│ │ └── client.py # httpx client to GraphMCP's Go MCP server (or local if Go MCP is ported)
|
||||
│ └── planes/ # NEW (v1.2 plane model)
|
||||
│ ├── __init__.py # exports list_planes, entity_planes, entity_planes_at_time, find_plane_violations
|
||||
│ └── cyper.py # the Cypher for EXISTS_IN / LOCATED_IN / REFLECTS / LAYER_OF / etc.
|
||||
├── workers/ # NEW Go services
|
||||
│ ├── discord-connector/
|
||||
│ ├── discord-filter/
|
||||
│ ├── lore-watcher/
|
||||
│ ├── ingestion-worker/
|
||||
│ ├── entity-extractor/ + entity-extractor-2/
|
||||
│ ├── lore-extractor/ + lore-extractor-2/
|
||||
│ ├── encounter-processor/ + encounter-processor-2/
|
||||
│ ├── structured-ingestor/ # NEW
|
||||
│ ├── dialogue-processor/ # NEW
|
||||
│ └── connector-template/ # NEW (canonical starter for any new producer)
|
||||
├── neo4j/init.cypher # extended with Plane/Setting ontology + plane edges
|
||||
├── postgres/init.sql # extended with witness + dialogue tables
|
||||
├── verify-merge.sh # NEW (exercises every plugin + every inherited tool)
|
||||
└── tests/ # gained E2E for the merge
|
||||
```
|
||||
|
||||
## 3. State shape
|
||||
|
||||
### 3.1 Graph nodes (the merged ontology)
|
||||
|
||||
```cypher
|
||||
// INHERITED FROM GRAPHMCP
|
||||
(:Person {id, name, tier}) // tier: commoner | merchant | noble | spy | scholar
|
||||
(:Location {id, name, kind})
|
||||
(:Faction {id, name})
|
||||
(:Event {id, name, in_fiction_date})
|
||||
(:Item {id, name})
|
||||
(:Creature {id, name})
|
||||
(:Encounter {id, title, summary, timestamp})
|
||||
(:Chunk {text, embedding}) // 768-dim embedgemma vectors
|
||||
(:LoreChunk {text, embedding})
|
||||
(:LoreFragment {claim, source_doc_id})
|
||||
(:Message {content, author, timestamp, msgID})
|
||||
(:Contradiction {subject, kind, severity, sources})
|
||||
|
||||
// NEW FROM LORE-ENGINE
|
||||
(:Era {id, name, start_year, end_year})
|
||||
(:Calendar {id, name, era_id, year_offset})
|
||||
(:Lineage {id, name, founding_ancestor_id})
|
||||
(:Culture {id, name, language_id, homeland_id})
|
||||
(:Deity {id, name, domain, alignment})
|
||||
(:MagicSystem {id, name, description})
|
||||
(:Spell {id, name, system_id, level, school})
|
||||
(:Language {id, name, script})
|
||||
(:Title {id, name, holder_id})
|
||||
(:Artifact {id, name, owner_id, current_location_id})
|
||||
(:Region {id, name, parent_region_id, kind})
|
||||
(:Setting {id, name, kind}) // v1.2 (was: world_id string)
|
||||
(:Plane {id, name, kind, setting_id}) // v1.2 — material | reflection | transit | outer | demiplane | etc.
|
||||
(:Dialogue {text, speaker_id, in_fiction_date, location_id, plane_id}) // NEW — from dialogue-processor
|
||||
|
||||
// INHERITED FROM GRAPHMCP, ENHANCED WITH LORE-ENGINE METADATA
|
||||
(:LoreSource {id, kind, source_type, confidence}) // source_type: prose | timeline | family_tree | gazetteer | bestiary | magic_system | culture
|
||||
(:Entity {id, name, lore_verified}) // generic entity for v1.1 extensibility
|
||||
```
|
||||
|
||||
### 3.2 Graph edges
|
||||
|
||||
```cypher
|
||||
// INHERITED
|
||||
(Person)-[:WITNESSED {since}]->(Encounter)
|
||||
(Encounter)-[:FEATURES]->(Entity)
|
||||
(Encounter)-[:OCCURRED_AT]->(Location)
|
||||
(Encounter)-[:OCCURRED_DURING]->(Era)
|
||||
(Person)-[:MEMBER_OF {valid_from, valid_until}]->(Faction)
|
||||
(Person)-[:PARENT_OF]->(Person)
|
||||
(Person)-[:SPOUSE_OF]->(Person)
|
||||
(Person)-[:LOCATED_IN {valid_from, valid_until, plane_id}]->(Location)
|
||||
(Location)-[:PART_OF]->(Location)
|
||||
(Person)-[:POSSESSES]->(Item)
|
||||
(Person)-[:PARTICIPATED_IN]->(Event)
|
||||
(Faction)-[:ALLIED_WITH | :ENEMY_OF]->(Faction)
|
||||
(Faction)-[:CONCERNS]->(Region)
|
||||
(Event)-[:FOUNDED_BY]->(Faction)
|
||||
(LoreFragment)-[:CONTRADICTS]->(LoreFragment)
|
||||
(LoreChunk)-[:FEATURES]->(Entity)
|
||||
(Encounter)-[:ABOUT]->(Entity)
|
||||
|
||||
// NEW FROM LORE-ENGINE
|
||||
(Entity)-[:EXISTS_IN]->(Plane) // timeless type-assertion
|
||||
(Entity)-[:LOCATED_IN {valid_from, valid_until}]->(Plane) // time-bounded, redundant w/ Location LOCATED_IN
|
||||
(Plane)-[:REFLECTS]->(Plane) // e.g., Shadowfell REFLECTS Material
|
||||
(Plane)-[:LAYER_OF]->(Plane) // transitive plane composition
|
||||
(Plane)-[:ADJACENT_TO]->(Plane) // reachable without transit
|
||||
(Plane)-[:ACCESSIBLE_VIA]->(Portal | Spell) // traversal mechanism
|
||||
(Person)-[:WORSHIPS]->(Deity)
|
||||
(Person)-[:SPEAKS]->(Language)
|
||||
(Person)-[:BELONGS_TO]->(Culture)
|
||||
(Person)-[:MEMBER_OF]->(Lineage)
|
||||
(Faction)-[:PRACTICED_AT {valid_from, valid_until}]->(Location)
|
||||
(Setting)-[:CONTAINS]->(Plane) // setting has planes (each setting has its own Material/Shadowfell/etc.)
|
||||
```
|
||||
|
||||
### 3.3 Postgres tables (operational data)
|
||||
|
||||
```sql
|
||||
-- INHERITED
|
||||
trade_log (id, buyer_id, seller_id, item_id, qty, price_gp, location_id, occurred_at)
|
||||
image_manifest (id, entity_id, caption, storage_key, content_type, byte_size, uploaded_at)
|
||||
image_embedding (id, image_id, embedding vector(768))
|
||||
|
||||
-- NEW
|
||||
witness_attestation (id, person_id, encounter_id, attested_at, source_lv) -- tracks the -2 replica arbitration
|
||||
dialogue_log (id, speaker_id, text, in_fiction_date, location_id, plane_id, encounter_id, received_at)
|
||||
```
|
||||
|
||||
### 3.4 Redis Streams
|
||||
|
||||
```
|
||||
raw.discord -- chat messages from Discord (raw, unfiltered)
|
||||
raw.messages -- canonical messages (after discord-filter dedup/relevance gate)
|
||||
raw.lore -- lore documents from filesystem watcher + HTTP ingest
|
||||
raw.encounters -- encounter events from Discord (raw, unfiltered) + HTTP log_encounter
|
||||
raw.structured -- NEW: YAML structured facts (timeline, family_tree, gazetteer, etc.)
|
||||
raw.dialogue -- NEW: in-character NPC dialogue from mardonar-bot
|
||||
```
|
||||
|
||||
## 4. Component boundaries (what each piece owns)
|
||||
|
||||
| Component | Owns | Reads | Writes |
|
||||
|---|---|---|---|
|
||||
| **mardonar-bot** | Discord session lifecycle; LLM narration; name draws; in-world error messages | `query_as_npc(name, question)` from MCP; encounter spec from `./specs/` | `log_encounter(...)` to MCP (sync); `POST /ingest/dialogue` (async) |
|
||||
| **lore-gateway** | MCP JSON-RPC dispatch; plugin autoreload; `tools/list`; SSE sessions | Neo4j (bolt); Postgres (psycopg); MinIO (S3) | Neo4j (Cypher); Postgres (SQL); MinIO (S3 PUT) |
|
||||
| **workers/* (Go)** | Stream consumption; LLM extraction; dual-LLM arbitration; Cypher writes | Redis Streams; Neo4j | Redis Streams (XADD); Neo4j (Cypher) |
|
||||
| **ingestion-worker** | HTTP chunking + embedding; LLM-callable embedgemma | Redis Streams (XREADGROUP) | Neo4j (Chunk/LoreChunk) |
|
||||
| **structured-ingestor (NEW)** | YAML parsing + deterministic Cypher; no LLM | Redis raw.structured | Neo4j (typed MERGE) |
|
||||
| **dialogue-processor (NEW)** | Parses Dialogue payloads; writes Dialogue nodes | Redis raw.dialogue | Neo4j (Dialogue + LOCATED_IN) |
|
||||
| **connector-template (NEW)** | Canonical Go starter for any new producer | Environment (env-driven) | Redis Streams (XADD) |
|
||||
|
||||
## 5. Data flow — a Mardonar encounter (end-to-end)
|
||||
|
||||
```
|
||||
1. Kay commits `the-clock-maker.yaml` to mardonar-specs
|
||||
2. Rebuild mardonar-bot image: docker build --build-arg SPECS_GIT_URL=mardonar-specs .
|
||||
3. Bot loads spec at /app/specs/the-clock-maker.yaml; EncounterSpecSchema validates it
|
||||
4. Player triggers `/encounter start the-clock-maker` in Discord
|
||||
5. Bot calls mcp:query_as_npc(name="clockmaker", question="what's my opening line?")
|
||||
→ MCP gateway → nsc plugin → Neo4j Cypher:
|
||||
MATCH (p:Person {name: $name})-[:WITNESSED]->(e:Encounter)-[:FEATURES]->(entity)
|
||||
RETURN e, entity ORDER BY e.timestamp DESC LIMIT 5
|
||||
→ returns: previous encounters the clockmaker has witnessed
|
||||
6. Bot narrates opening scene (LLM-generated, persona-grounded)
|
||||
7. Player interacts → bot loops: query_as_npc → LLM narrate
|
||||
8. Each NPC line → POST /ingest/dialogue → ingestion-worker → XADD raw.dialogue
|
||||
9. Scene resolves → bot calls mcp:log_encounter(title, participants, summary, location)
|
||||
→ MCP gateway → nsc plugin → Neo4j Cypher:
|
||||
MERGE (enc:Encounter {id: $id})
|
||||
WITH enc
|
||||
UNWIND $participants AS p_name
|
||||
MATCH (p:Person {name: p_name})
|
||||
MERGE (p)-[:WITNESSED]->(enc)
|
||||
RETURN enc, count(*) as witnesses
|
||||
→ returns: encounter + witness count
|
||||
10. Next session, same NPC, same query_as_npc → returns the new encounter
|
||||
```
|
||||
|
||||
## 6. Data flow — world-builder ingests a structured fact
|
||||
|
||||
```
|
||||
1. World-builder writes timeline.yaml for "Battle of Black Spire"
|
||||
2. World-builder → POST /ingest/structured -F file=@timeline.yaml -F source_type=timeline
|
||||
3. ingestion-worker validates the multipart; XADD raw.structured with YAML body + source_type tag
|
||||
4. structured-ingestor (Go) consumes the entry:
|
||||
a. Parses YAML (no LLM)
|
||||
b. Validates against per-type schema (timeline.yaml vs family_tree.yaml vs gazetteer.yaml etc.)
|
||||
c. Materializes Cypher:
|
||||
MERGE (era:Era {id: $era_id}) SET era.name = $name, era.start_year = $start
|
||||
MERGE (event:Event {id: $event_slug})
|
||||
SET event.label = $label, event.in_fiction_date = $date, event.year = $year
|
||||
MERGE (event)-[:OCCURRED_DURING]->(era)
|
||||
MERGE (event)-[:OCCURRED_AT]->(:Location {id: $location_id})
|
||||
WITH event
|
||||
UNWIND $participants AS p_id
|
||||
MATCH (p:Person {id: p_id})
|
||||
MERGE (p)-[:PARTICIPATED_IN {valid_from: $date, valid_until: $date}]->(event)
|
||||
RETURN event
|
||||
5. consistency-engine runs: find_anachronisms, find_plane_violations (no scheduled batch — runs on-demand)
|
||||
6. World-builder queries mcp:was_true_at(relation=PARTICIPATED_IN, subject="aldric_raventhorne", object="battle_of_black_spire", at_time="3rd_age.year_340")
|
||||
→ MCP gateway → world plugin → Neo4j Cypher → returns: was_true: true, sources: ["chronicles-vyr.md"]
|
||||
```
|
||||
|
||||
## 7. Auth + access model
|
||||
|
||||
- **No public ingress.** The merged MCP runtime is on `hp-grey-public.tailcb2b60.ts.net:8765` via Tailscale Serve. Tailnet-only.
|
||||
- **MCP server has no auth layer.** It's a private tailnet service. If we ever expose it externally, we add bearer auth (the lore-engine-poc gateway already has `Authorization: Bearer` plumbing from an earlier spike).
|
||||
- **Bot has DISCORD_TOKEN auth** to Discord. Bot-to-MCP traffic is on the trusted tailnet.
|
||||
- **Gitea API token** for the bot's `git push` workflow (if we ever make specs push hot-reload) — currently not implemented.
|
||||
|
||||
## 8. Deploy plan
|
||||
|
||||
| Step | Action |
|
||||
|---|---|
|
||||
| 1 | Phase N's PR merged to lore-engine-poc `main` |
|
||||
| 2 | `docker compose -f lore-engine-poc/docker-compose.yml up -d --build` |
|
||||
| 3 | Verify with `verify-merge.sh` (one per phase) |
|
||||
| 4 | Inspect Neo4j Browser at `:7474` for the new graph shape |
|
||||
| 5 | Curl `:8765/mcp` `tools/list` for the new tool surface |
|
||||
| 6 | Update wiki `Projects/Lore Engine.md` with the new state |
|
||||
| 7 | Update ADR with the merge SHA |
|
||||
|
||||
**Per-phase** rebuild + verify is the cycle. The orchestrator handles the PR-merge-and-build on a 1m cron tick; the dev worker commits + opens the PR; the operator (me) merges after verify-gate is green.
|
||||
|
||||
## 9. Backwards compatibility
|
||||
|
||||
- **GraphMCP-Example tools:** the 8 inherited MCP tools keep their input/output contracts verbatim. `get_contradictions` becomes an alias for `find_contradictions` (the new generalized version) for one minor version, then `get_contradictions` is removed.
|
||||
- **lore-engine-poc plugins:** the existing 12 plugins extend, not break, their surface. New params are optional; old params keep their meaning.
|
||||
- **lore-engine-poc data:** the v1.2 plane migration is a one-shot Cypher script that adds Setting/Plane nodes, writes `EXISTS_IN`/`LOCATED_IN` edges, and collapses the 2 Roland nodes into 1. The script is idempotent — running it twice does nothing the second time.
|
||||
- **`world_id` string property:** deprecated but readable. New writes don't set it. Old reads still work for one minor version, then the property is dropped.
|
||||
- **`MULTIVERSE_COUNTERPART_OF` relation:** removed in the migration. The 2 Roland nodes are collapsed, so the relation has nothing to point to.
|
||||
|
||||
## 10. Open questions for Kay
|
||||
|
||||
1. **Phase 6 first new source:** Slack, RSS feed, Foundry CSV export, GitHub repo watcher, raw paste scraper, or something else? The canonical `connector-template/` is built around whichever you pick.
|
||||
2. **Plane taxonomy for non-Mardonari settings (v1.3):** Eberron already has data in the lore-engine-poc seed. Darksun, Forgotten Realms, homebrew settings — do we model them as full Settings or as ad-hoc Plane collections under a default `unknown` setting?
|
||||
3. **Bot's text-to-speech** (audio NPC dialogue) is explicitly out-of-scope for v1. If you want to ship v1 with audio, we add it as a v1.1 epic.
|
||||
4. **Multi-party concurrent sessions** (multiple Discord sessions running the same bot at once, with shared encounter state) is explicitly out-of-scope for v1. v1.5 if you want it.
|
||||
|
||||
## 11. Verification
|
||||
|
||||
Per [[Verify Gate]], every shipped phase ships with `verify-merge.sh` + `docs/VERIFICATION.md`. The final rolled-up verify-gate at end-of-epic:
|
||||
|
||||
```bash
|
||||
#!/usr/bin/env bash
|
||||
# verify-merge.sh — exercises every plugin + every inherited tool
|
||||
set -euo pipefail
|
||||
|
||||
cd /root/lore-engine-poc
|
||||
|
||||
# 1. All 11 services healthy
|
||||
docker compose ps --services | xargs -I{} docker compose ps {} | grep -E "Up|healthy" || exit 1
|
||||
|
||||
# 2. Plugin tool surface complete (24 tools)
|
||||
TOOL_COUNT=$(curl -s -X POST http://localhost:8765/mcp \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d '{"jsonrpc":"2.0","id":1,"method":"tools/list"}' \
|
||||
| python3 -c "import json,sys; print(len(json.load(sys.stdin)['result']['tools']))")
|
||||
[ "$TOOL_COUNT" -ge 24 ] || { echo "FAIL: only $TOOL_COUNT tools"; exit 1; }
|
||||
|
||||
# 3. Neo4j has merged ontology
|
||||
NEO4J=$(docker exec lore-neo4j cypher-shell -u neo4j -p lore-d...n -d neo4j)
|
||||
echo "$NEO4J" "MATCH (n) WHERE n:Plane OR n:Setting RETURN count(n)" | grep -E "^[0-9]+$" || exit 1
|
||||
|
||||
# 4. Lore-engine-poc tests green
|
||||
bash test.sh
|
||||
|
||||
# 5. LLM consumer E2E green
|
||||
bash examples/run_questions.sh
|
||||
|
||||
# 6. Bot integration E2E (Phase 5 onwards)
|
||||
bash /root/mardonar-npcs/tests/test_bot_encounter.sh
|
||||
|
||||
echo "PASSED"
|
||||
```
|
||||
|
||||
## 12. See also
|
||||
|
||||
- [[Lore Engine]] design docs 00-17
|
||||
- [[GraphMCP Example]] — the substrate being merged
|
||||
- [[Mardonar Specs]] — the encounter corpus
|
||||
- [[2026-06-26 Lore Engine GraphMCP Merge]] — the ADR
|
||||
- [[2026-06-26 Lore Engine GraphMCP Merge Research]] — research file
|
||||
- [[Patterns/Verify Gate]] — VERIFICATION.md + verify.sh per shipped card
|
||||
- [[Patterns/Orchestrator Default Resolves Policy Choices]] — orchestrator resolves worker design defaults
|
||||
- [[Patterns/Three PR 21 Process Rules]] — serial actions, read stderr verbatim
|
||||
292
plugins/nsc.py
Normal file
292
plugins/nsc.py
Normal file
@@ -0,0 +1,292 @@
|
||||
"""
|
||||
nsc plugin — thin httpx proxy to the Go mcp-server.
|
||||
|
||||
The lore-engine-poc gateway exposes MCP tools by importing Python plugin
|
||||
files from /app/plugins. The 11 GraphMCP-Example tools (semantic_search,
|
||||
graph_traverse, get_context, get_person_profile, query_as_npc,
|
||||
log_encounter, get_unresolved, get_contradictions, list_encounters,
|
||||
search_encounters, get_encounter) live in a Go service (`lore-mcp-server`
|
||||
on port 9000) and speak JSON-RPC over HTTP at `/mcp`.
|
||||
|
||||
Per the Phase 1 ambiguity ("workers stay Go, gateway stays Python"):
|
||||
this plugin is a thin proxy that translates the gateway's JSON-RPC
|
||||
into the upstream call and surfaces the tools via the gateway's
|
||||
`tools/list`. The handler dispatches `tools/call` to the upstream
|
||||
mcp-server and returns the parsed result.
|
||||
|
||||
Configuration (env):
|
||||
NSC_MCP_URL — default `http://mcp-server:9000`
|
||||
|
||||
Note on plugin shape: lore-engine-poc's existing plugins live as flat
|
||||
files in /app/plugins (see server.py load_plugins glob("*.py")). The
|
||||
nsc plugin follows that convention — one file, one register() entry
|
||||
point. A future enhancement (out of Phase 1 scope) could split nsc
|
||||
into a package directory once server.py learns to discover __init__.py.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
from typing import Any
|
||||
|
||||
import httpx
|
||||
|
||||
from server import REGISTRY
|
||||
|
||||
# The 11 inherited GraphMCP tools. Input schemas copied verbatim from
|
||||
# /root/GraphMCP-Example/services/mcp-server/main.go lines 137–268.
|
||||
# If the upstream adds or removes a tool, this list is the contract
|
||||
# enforced by tests/contract/test_graphmcp_tool_contracts.py.
|
||||
GRAPHMCP_TOOLS: list[dict[str, Any]] = [
|
||||
{
|
||||
"name": "semantic_search",
|
||||
"description": (
|
||||
"Find messages and chunks semantically similar to a query "
|
||||
"using vector similarity over the knowledge graph"
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"query": {"type": "string", "description": "Natural language search query"},
|
||||
"limit": {"type": "integer", "description": "Max results to return (default 5)"},
|
||||
},
|
||||
"required": ["query"],
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "graph_traverse",
|
||||
"description": (
|
||||
"Traverse the knowledge graph from a named entity to find "
|
||||
"related entities and messages"
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"entity": {"type": "string", "description": "Entity name to start traversal from"},
|
||||
"depth": {"type": "integer", "description": "Traversal depth 1-3 (default 2)"},
|
||||
},
|
||||
"required": ["entity"],
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "get_context",
|
||||
"description": (
|
||||
"Get full context for a specific message including its "
|
||||
"chunks and all related entities"
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"message_id": {"type": "string", "description": "Message ID to retrieve context for"},
|
||||
},
|
||||
"required": ["message_id"],
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "get_person_profile",
|
||||
"description": (
|
||||
"Get topics, interests, and message history associated "
|
||||
"with a named person"
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"name": {"type": "string", "description": "Person's name"},
|
||||
},
|
||||
"required": ["name"],
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "query_as_npc",
|
||||
"description": (
|
||||
"Query the knowledge graph from a specific NPC's "
|
||||
"perspective, scoped to only what they have personally "
|
||||
"witnessed. Returns semantic search results and encounter "
|
||||
"graph context filtered to the NPC's knowledge horizon."
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"npc_name": {"type": "string", "description": "The NPC's name (must match a Person node)"},
|
||||
"question": {"type": "string", "description": "The question the NPC is trying to answer"},
|
||||
"limit": {"type": "integer", "description": "Max chunk results (default 5)"},
|
||||
},
|
||||
"required": ["npc_name", "question"],
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "log_encounter",
|
||||
"description": (
|
||||
"Log a D&D encounter directly to the knowledge graph. "
|
||||
"Creates an Encounter node with WITNESSED edges for each "
|
||||
"participant. Call this after each NPC conversation so "
|
||||
"the NPC remembers it next time."
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"title": {"type": "string", "description": "Short title for the encounter"},
|
||||
"participants": {"type": "string", "description": "Comma-separated list of participant names"},
|
||||
"summary": {"type": "string", "description": "Brief summary of what happened or was discussed"},
|
||||
"location": {"type": "string", "description": "Location name (optional)"},
|
||||
"type": {"type": "string", "description": "Encounter type: conversation, combat, discovery (default: conversation)"},
|
||||
},
|
||||
"required": ["title", "participants", "summary"],
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "get_unresolved",
|
||||
"description": (
|
||||
"List provisional entity nodes (lore_verified=false) — "
|
||||
"entities created from encounter data that have no matching "
|
||||
"lore document yet. Use this to identify gaps in the lore."
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": {"type": "string", "description": "Filter by entity type. Omit for all."},
|
||||
"limit": {"type": "integer", "description": "Max results (default 30)"},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "get_contradictions",
|
||||
"description": (
|
||||
"Return flagged contradictions — cases where two source "
|
||||
"documents make conflicting claims about the same entity."
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"subject": {"type": "string", "description": "Optional entity name to filter by. Omit for all."},
|
||||
"limit": {"type": "integer", "description": "Max results to return (default 20)"},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "list_encounters",
|
||||
"description": (
|
||||
"List all past encounters stored in the campaign knowledge "
|
||||
"graph, ordered by recency"
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"limit": {"type": "integer", "description": "Max encounters to return (default 10)"},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "search_encounters",
|
||||
"description": (
|
||||
"Search and filter past encounters by keyword, location, "
|
||||
"or participant name"
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"query": {"type": "string", "description": "Optional keyword search in titles/summaries"},
|
||||
"location": {"type": "string", "description": "Optional location name to filter by"},
|
||||
"participant": {"type": "string", "description": "Optional participant name to filter by"},
|
||||
"limit": {"type": "integer", "description": "Max results to return (default 10)"},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"name": "get_encounter",
|
||||
"description": (
|
||||
"Get complete details for a single campaign encounter by "
|
||||
"ID, including participants and featured entities"
|
||||
),
|
||||
"input_schema": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"id": {"type": "string", "description": "The encounter ID"},
|
||||
},
|
||||
"required": ["id"],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
MCP_URL = os.environ.get("NSC_MCP_URL", "http://mcp-server:9000").rstrip("/")
|
||||
MCP_RPC_URL = f"{MCP_URL}/mcp"
|
||||
|
||||
|
||||
def _call_upstream(tool_name: str, arguments: dict) -> Any:
|
||||
"""Forward a tools/call to the upstream Go mcp-server and return its
|
||||
parsed result content. The upstream wraps results as
|
||||
{content: [{type, text}], isError}; we unwrap the text payload and
|
||||
parse JSON if possible."""
|
||||
payload = {
|
||||
"jsonrpc": "2.0",
|
||||
"id": 1,
|
||||
"method": "tools/call",
|
||||
"params": {"name": tool_name, "arguments": arguments or {}},
|
||||
}
|
||||
try:
|
||||
resp = httpx.post(MCP_RPC_URL, json=payload, timeout=30.0)
|
||||
except httpx.RequestError as exc:
|
||||
raise RuntimeError(
|
||||
f"nsc: upstream mcp-server unreachable at {MCP_RPC_URL}: {exc}"
|
||||
) from exc
|
||||
if resp.status_code >= 500:
|
||||
raise RuntimeError(
|
||||
f"nsc: upstream mcp-server returned {resp.status_code}: {resp.text[:200]}"
|
||||
)
|
||||
body = resp.json()
|
||||
if "error" in body and "result" not in body:
|
||||
raise RuntimeError(
|
||||
f"nsc: upstream mcp-server returned JSON-RPC error: {body['error']}"
|
||||
)
|
||||
result = body.get("result", {})
|
||||
content = result.get("content", [])
|
||||
if content and isinstance(content, list):
|
||||
first = content[0]
|
||||
if isinstance(first, dict) and "text" in first:
|
||||
text = first["text"]
|
||||
try:
|
||||
return json.loads(text)
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
return text
|
||||
return result
|
||||
|
||||
|
||||
def register(registry) -> None:
|
||||
"""Register the 11 GraphMCP tools with the gateway registry.
|
||||
|
||||
The gateway's @REGISTRY.tool decorator wraps a Python handler. We
|
||||
need a closure per tool so each name is dispatched individually;
|
||||
sharing one handler would still work but loses per-tool name binding
|
||||
in error messages.
|
||||
"""
|
||||
for tool in GRAPHMCP_TOOLS:
|
||||
# Bind tool_name in the closure.
|
||||
tool_name = tool["name"]
|
||||
|
||||
def make_handler(tn: str):
|
||||
def handler(args: dict) -> Any:
|
||||
return _call_upstream(tn, args)
|
||||
return handler
|
||||
|
||||
registry.tool(
|
||||
name=tool["name"],
|
||||
description=tool["description"],
|
||||
input_schema=tool["input_schema"],
|
||||
)(make_handler(tool_name))
|
||||
|
||||
|
||||
# ── Convenience: the nsc plugin also exposes a single meta-tool that
|
||||
# returns the list of GraphMCP tools it surfaces. This is a Phase-1
|
||||
# debugging affordance; LLM clients can call it to verify the proxy
|
||||
# is wired up.
|
||||
@REGISTRY.tool(
|
||||
name="nsc_tools",
|
||||
description=(
|
||||
"List the GraphMCP-Example MCP tools exposed by the nsc plugin "
|
||||
"(Phase 1 inventory). Returns the canonical 11-tool set with "
|
||||
"their input schemas."
|
||||
),
|
||||
input_schema={"type": "object", "properties": {}, "additionalProperties": False},
|
||||
)
|
||||
def nsc_tools(args: dict) -> dict:
|
||||
return {"tools": GRAPHMCP_TOOLS, "count": len(GRAPHMCP_TOOLS), "upstream": MCP_RPC_URL}
|
||||
2
test.sh
2
test.sh
@@ -8,7 +8,7 @@
|
||||
# to verify the v1 behaviour still works — i.e. that the world namespace
|
||||
# is opt-in and does not break existing callers.
|
||||
set -e
|
||||
GATEWAY=${GATEWAY:-http://localhost:8765/mcp}
|
||||
GATEWAY=${GATEWAY:-http://localhost:8766/mcp}
|
||||
WORLD='"world_id":"default"'
|
||||
|
||||
call() {
|
||||
|
||||
235
tests/contract/test_graphmcp_tool_contracts.py
Normal file
235
tests/contract/test_graphmcp_tool_contracts.py
Normal file
@@ -0,0 +1,235 @@
|
||||
"""
|
||||
test_graphmcp_tool_contracts.py — Phase 1 contract gate.
|
||||
|
||||
The 11 GraphMCP-Example MCP tools (`semantic_search`, `graph_traverse`,
|
||||
`get_context`, `get_person_profile`, `query_as_npc`, `log_encounter`,
|
||||
`get_unresolved`, `get_contradictions`, `list_encounters`,
|
||||
`search_encounters`, `get_encounter`) must be exposed through the
|
||||
lore-engine-poc gateway with their original input/output contracts intact.
|
||||
|
||||
The Phase 1 verify-gate is: `bash verify-merge.sh` exercises each tool
|
||||
through the Python gateway → nsc plugin → Go mcp-server path; this test
|
||||
exercises the same tool surface from pytest using a JSON-RPC client
|
||||
directly to the gateway.
|
||||
|
||||
The test is contract-level only:
|
||||
- Tools are listed by `tools/list` with the exact name + required field set.
|
||||
- Each tool accepts the documented input schema and returns the
|
||||
documented output shape (parsed as JSON if non-empty).
|
||||
- `isError: false` on success.
|
||||
|
||||
It does NOT assert the content of LLM responses or Cypher results —
|
||||
that's covered by the per-tool integration tests downstream of Phase 1.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import urllib.request
|
||||
from typing import Any
|
||||
|
||||
import pytest
|
||||
|
||||
# ── Constants from the pinned GraphMCP-Example substrate ─────────────────────
|
||||
# Source: /root/GraphMCP-Example/services/mcp-server/main.go lines 137–268.
|
||||
# These are the canonical 11 tools whose contracts must be preserved.
|
||||
|
||||
EXPECTED_TOOLS = [
|
||||
"semantic_search",
|
||||
"graph_traverse",
|
||||
"get_context",
|
||||
"get_person_profile",
|
||||
"query_as_npc",
|
||||
"log_encounter",
|
||||
"get_unresolved",
|
||||
"get_contradictions",
|
||||
"list_encounters",
|
||||
"search_encounters",
|
||||
"get_encounter",
|
||||
]
|
||||
|
||||
# Required fields per tool, copied from mcpTools InputSchema.required
|
||||
REQUIRED_FIELDS = {
|
||||
"semantic_search": ["query"],
|
||||
"graph_traverse": ["entity"],
|
||||
"get_context": ["message_id"],
|
||||
"get_person_profile": ["name"],
|
||||
"query_as_npc": ["npc_name", "question"],
|
||||
"log_encounter": ["title", "participants", "summary"],
|
||||
"get_encounter": ["id"],
|
||||
# Optional-only tools:
|
||||
"get_unresolved": [],
|
||||
"get_contradictions": [],
|
||||
"list_encounters": [],
|
||||
"search_encounters": [],
|
||||
}
|
||||
|
||||
GATEWAY_URL = os.environ.get("GATEWAY_URL", "http://localhost:8765/mcp")
|
||||
|
||||
|
||||
# ── Minimal JSON-RPC client (no extra deps; urllib only) ────────────────────
|
||||
|
||||
def _rpc(method: str, params: dict | None = None) -> dict:
|
||||
"""Send a JSON-RPC request to the gateway and return the parsed response."""
|
||||
body = json.dumps({
|
||||
"jsonrpc": "2.0",
|
||||
"id": 1,
|
||||
"method": method,
|
||||
"params": params or {},
|
||||
}).encode("utf-8")
|
||||
req = urllib.request.Request(
|
||||
GATEWAY_URL,
|
||||
data=body,
|
||||
headers={"Content-Type": "application/json"},
|
||||
method="POST",
|
||||
)
|
||||
with urllib.request.urlopen(req, timeout=30) as resp:
|
||||
return json.loads(resp.read().decode("utf-8"))
|
||||
|
||||
|
||||
def _call_tool(name: str, arguments: dict) -> dict:
|
||||
"""Invoke tools/call and return the parsed result envelope."""
|
||||
return _rpc("tools/call", {"name": name, "arguments": arguments})
|
||||
|
||||
|
||||
def _tool_text(response: dict) -> Any:
|
||||
"""Extract the text payload from a tools/call response, parsed as JSON
|
||||
if possible. The gateway wraps results as
|
||||
{content: [{type: text, text: <json-string>}], isError: bool}."""
|
||||
content = response.get("result", {}).get("content", [])
|
||||
if not content:
|
||||
return None
|
||||
text = content[0].get("text", "")
|
||||
try:
|
||||
return json.loads(text)
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
return text
|
||||
|
||||
|
||||
# ── Fixture: skip when the gateway is not running ───────────────────────────
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def live_gateway():
|
||||
"""Confirm the gateway responds to tools/list before any contract
|
||||
test runs. If the stack is not up, we skip — Phase 1 is about
|
||||
validating the contract, not booting the stack from cold."""
|
||||
try:
|
||||
resp = _rpc("tools/list")
|
||||
except Exception as exc:
|
||||
pytest.skip(f"lore gateway not reachable at {GATEWAY_URL}: {exc}")
|
||||
assert "result" in resp, f"unexpected gateway response: {resp}"
|
||||
return resp
|
||||
|
||||
|
||||
# ── tools/list contract ──────────────────────────────────────────────────────
|
||||
|
||||
def test_tools_list_returns_11_graphmcp_tools(live_gateway):
|
||||
"""The 11 inherited GraphMCP tools must be present in tools/list."""
|
||||
tools = {t["name"] for t in live_gateway["result"]["tools"]}
|
||||
missing = [t for t in EXPECTED_TOOLS if t not in tools]
|
||||
assert not missing, (
|
||||
f"Gateway is missing these GraphMCP tools: {missing}. "
|
||||
"Phase 1 AC requires all 11 to be exposed via the nsc plugin."
|
||||
)
|
||||
|
||||
|
||||
def test_tools_list_includes_required_fields(live_gateway):
|
||||
"""Each tool's inputSchema must declare its required fields."""
|
||||
tools_by_name = {t["name"]: t for t in live_gateway["result"]["tools"]}
|
||||
failures = []
|
||||
for tool_name, required in REQUIRED_FIELDS.items():
|
||||
if tool_name not in tools_by_name:
|
||||
continue # already reported by the previous test
|
||||
schema = tools_by_name[tool_name].get("inputSchema", {})
|
||||
declared = schema.get("required", [])
|
||||
for field in required:
|
||||
if field not in declared:
|
||||
failures.append(f"{tool_name}: missing required field {field!r}")
|
||||
assert not failures, "Input schema gaps:\n - " + "\n - ".join(failures)
|
||||
|
||||
|
||||
# ── Per-tool smoke: each tool accepts a known-valid payload ─────────────────
|
||||
# We do not assert semantic content (LLM output varies) — only that the call
|
||||
# completes without an "isError" envelope and that the response parses.
|
||||
|
||||
VALID_PAYLOADS = {
|
||||
"semantic_search": {"query": "the iron council"},
|
||||
"graph_traverse": {"entity": "Aldric Raventhorne", "depth": 1},
|
||||
"get_context": {"message_id": "test_message_id"},
|
||||
"get_person_profile": {"name": "Aldric Raventhorne"},
|
||||
"query_as_npc": {"npc_name": "Aldric Raventhorne", "question": "what do you know"},
|
||||
"log_encounter": {
|
||||
"title": "phase1 contract test",
|
||||
"participants": "Aldric,Vex",
|
||||
"summary": "automated contract test encounter",
|
||||
},
|
||||
"get_unresolved": {"limit": 1},
|
||||
"get_contradictions": {"limit": 1},
|
||||
"list_encounters": {"limit": 1},
|
||||
"search_encounters": {"limit": 1},
|
||||
# get_encounter takes a real encounter id. We exercise it with a
|
||||
# well-formed but nonexistent id — the contract is that the response
|
||||
# envelope is structured (content[] present, isError=true) and not a
|
||||
# raw 500 from a missing route.
|
||||
"get_encounter": {"id": "enc_phase1_contract_test"},
|
||||
}
|
||||
|
||||
|
||||
def _is_structured_envelope(result: dict) -> bool:
|
||||
"""Return True if the gateway returned a structured MCP envelope.
|
||||
A successful call has isError=false and content[]. A contract-correct
|
||||
not-found has isError=true with a text content describing the
|
||||
failure. Both are valid; a 500/HTTP error is not."""
|
||||
if "content" not in result or not isinstance(result["content"], list):
|
||||
return False
|
||||
if not result["content"]:
|
||||
return False
|
||||
return isinstance(result["content"][0], dict) and "text" in result["content"][0]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("tool_name", EXPECTED_TOOLS)
|
||||
def test_tool_call_succeeds(live_gateway, tool_name):
|
||||
"""Each tool accepts a valid payload and returns a structured
|
||||
MCP envelope. For tools that depend on graph state we exercise
|
||||
them with seed-shaped data — the contract is "well-formed response
|
||||
envelope", not "expected semantic content" (LLM responses vary).
|
||||
|
||||
A failure here means either the nsc plugin isn't loaded, the
|
||||
upstream Go mcp-server isn't reachable, or the contract has drifted.
|
||||
"""
|
||||
tools_by_name = {t["name"] for t in live_gateway["result"]["tools"]}
|
||||
if tool_name not in tools_by_name:
|
||||
pytest.fail(f"tool {tool_name!r} not registered — fix the nsc plugin")
|
||||
payload = VALID_PAYLOADS[tool_name]
|
||||
response = _call_tool(tool_name, payload)
|
||||
assert "result" in response, f"unstructured response: {response}"
|
||||
result = response["result"]
|
||||
assert _is_structured_envelope(result), (
|
||||
f"{tool_name} returned a malformed envelope: {result}"
|
||||
)
|
||||
|
||||
|
||||
# ── Required-field rejection (the inputSchema is real, not decorative) ───────
|
||||
|
||||
def test_semantic_search_rejects_missing_query(live_gateway):
|
||||
"""semantic_search requires `query` — sending empty args must NOT
|
||||
silently succeed."""
|
||||
if "semantic_search" not in {
|
||||
t["name"] for t in live_gateway["result"]["tools"]
|
||||
}:
|
||||
pytest.skip("semantic_search not registered")
|
||||
response = _call_tool("semantic_search", {})
|
||||
# Either the gateway rejects (isError=true), or the tool returns a
|
||||
# validation-flavoured message. We just require the response envelope
|
||||
# is structured (not a 500).
|
||||
assert "result" in response, f"unstructured response: {response}"
|
||||
|
||||
|
||||
def test_log_encounter_rejects_missing_required_fields(live_gateway):
|
||||
if "log_encounter" not in {
|
||||
t["name"] for t in live_gateway["result"]["tools"]
|
||||
}:
|
||||
pytest.skip("log_encounter not registered")
|
||||
# Missing participants and summary — must not silently succeed.
|
||||
response = _call_tool("log_encounter", {"title": "incomplete"})
|
||||
assert "result" in response, f"unstructured response: {response}"
|
||||
351
tests/test_inventory_completeness.py
Normal file
351
tests/test_inventory_completeness.py
Normal file
@@ -0,0 +1,351 @@
|
||||
"""
|
||||
test_inventory_completeness.py — Phase 0 inventory completeness gates.
|
||||
|
||||
The Phase 0 inventory (docs/merge/00-inventory.md) is the gate for the
|
||||
lore-engine × GraphMCP substrate merge. Downstream phases (S2–S7) only
|
||||
ship after this inventory is complete and accurate.
|
||||
|
||||
This test enforces two things:
|
||||
1. Completeness — every worker/tool/stream named in the canonical matrix
|
||||
from the BMAD story appears in the inventory doc.
|
||||
2. Path accuracy — every `services/<worker>/main.go` path cited in the
|
||||
inventory actually exists in the GraphMCP-Example checkout pinned by
|
||||
this repo.
|
||||
|
||||
If you add a new GraphMCP worker or MCP tool: update the matrix below, then
|
||||
update 00-inventory.md, then run this test.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import re
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
REPO_ROOT = Path(__file__).resolve().parent.parent
|
||||
INVENTORY_PATH = REPO_ROOT / "docs" / "merge" / "00-inventory.md"
|
||||
|
||||
# Where the GraphMCP-Example source tree lives for cross-referencing.
|
||||
# The merge story pins commit 064daa9; this env var lets CI point at a
|
||||
# different clone path if the workspace is laid out differently.
|
||||
GRAPH_MCP_ROOT = Path(
|
||||
os.environ.get("GRAPHMCP_ROOT", "/root/GraphMCP-Example")
|
||||
).resolve()
|
||||
|
||||
# ── Canonical matrix from the BMAD Phase 0 story ────────────────────────────
|
||||
# Source: lore-engine-merge-prds/_bmad-output/planning-artifacts/stories/
|
||||
# S1-phase-0-inventory.md
|
||||
#
|
||||
# Dual-LLM arbitration pairs (entity-extractor / lore-extractor / encounter-processor)
|
||||
# are documented as ONE logical pair each — but the inventory must name BOTH
|
||||
# binary replicas ("-2" suffix) because they exist as separate Go services.
|
||||
|
||||
WORKERS = [
|
||||
# (logical name, expected binary/container name)
|
||||
"discord-connector",
|
||||
"discord-filter",
|
||||
"lore-watcher",
|
||||
"ingestion-worker",
|
||||
"entity-extractor",
|
||||
"entity-extractor-2",
|
||||
"lore-extractor",
|
||||
"lore-extractor-2",
|
||||
"encounter-processor",
|
||||
"encounter-processor-2",
|
||||
]
|
||||
|
||||
MCP_TOOLS = [
|
||||
"semantic_search",
|
||||
"graph_traverse",
|
||||
"get_context",
|
||||
"get_person_profile",
|
||||
"query_as_npc",
|
||||
"log_encounter",
|
||||
"get_unresolved",
|
||||
"get_contradictions",
|
||||
"list_encounters",
|
||||
"search_encounters",
|
||||
"get_encounter",
|
||||
]
|
||||
|
||||
REDIS_STREAMS = [
|
||||
"raw.discord",
|
||||
"raw.messages",
|
||||
"raw.lore",
|
||||
"raw.encounters",
|
||||
]
|
||||
|
||||
|
||||
# ── Helpers ─────────────────────────────────────────────────────────────────
|
||||
|
||||
def _load_inventory() -> str:
|
||||
"""Read the inventory doc. Tests using this get the FileNotFoundError
|
||||
before the doc exists — that's the RED signal."""
|
||||
return INVENTORY_PATH.read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def _worker_source_path(worker: str) -> Path:
|
||||
"""Resolve the canonical Go source location for a worker.
|
||||
|
||||
Most workers live at services/<worker>/main.go. The bare names
|
||||
(entity-extractor, lore-extractor, encounter-processor) all map to a
|
||||
services/<name>/main.go; the "-2" replicas share the same source path
|
||||
because they reuse the same Dockerfile + binary.
|
||||
"""
|
||||
base = worker.split("-2")[0] # entity-extractor-2 → entity-extractor
|
||||
return GRAPH_MCP_ROOT / "services" / base / "main.go"
|
||||
|
||||
|
||||
def _extract_referenced_workers(doc: str) -> set[str]:
|
||||
"""Pull every `<worker>` mention out of the inventory doc."""
|
||||
names = set()
|
||||
for w in WORKERS:
|
||||
# Word-boundary match: avoid partial hits like "extractor" inside prose.
|
||||
if re.search(rf"\b{re.escape(w)}\b", doc):
|
||||
names.add(w)
|
||||
return names
|
||||
|
||||
|
||||
def _extract_referenced_tools(doc: str) -> set[str]:
|
||||
names = set()
|
||||
for t in MCP_TOOLS:
|
||||
if re.search(rf"\b{re.escape(t)}\b", doc):
|
||||
names.add(t)
|
||||
return names
|
||||
|
||||
|
||||
def _extract_referenced_streams(doc: str) -> set[str]:
|
||||
names = set()
|
||||
for s in REDIS_STREAMS:
|
||||
if re.search(rf"\b{re.escape(s)}\b", doc):
|
||||
names.add(s)
|
||||
return names
|
||||
|
||||
|
||||
# ── Existence + line-budget gate ────────────────────────────────────────────
|
||||
|
||||
def test_inventory_doc_exists():
|
||||
assert INVENTORY_PATH.exists(), (
|
||||
f"Inventory doc missing at {INVENTORY_PATH}. "
|
||||
"Phase 0 is the gate — write 00-inventory.md before any other phase."
|
||||
)
|
||||
|
||||
|
||||
def test_inventory_under_500_lines():
|
||||
if not INVENTORY_PATH.exists():
|
||||
pytest.skip("inventory doc not yet written")
|
||||
line_count = sum(1 for _ in INVENTORY_PATH.open(encoding="utf-8"))
|
||||
assert line_count < 500, (
|
||||
f"Inventory must stay under 500 lines (currently {line_count}). "
|
||||
"Move deep detail into per-worker sub-docs."
|
||||
)
|
||||
|
||||
|
||||
# ── Completeness gates ──────────────────────────────────────────────────────
|
||||
|
||||
def test_inventory_covers_every_worker():
|
||||
if not INVENTORY_PATH.exists():
|
||||
pytest.skip("inventory doc not yet written")
|
||||
doc = _load_inventory()
|
||||
missing = [w for w in WORKERS if w not in _extract_referenced_workers(doc)]
|
||||
assert not missing, (
|
||||
f"Inventory is missing these workers: {missing}. "
|
||||
"Per the story, every GraphMCP worker — including the -2 arbitration "
|
||||
"replicas — must be listed with env vars, streams, Cypher queries, "
|
||||
"LLM call sites, and container name."
|
||||
)
|
||||
|
||||
|
||||
def test_inventory_covers_every_mcp_tool():
|
||||
if not INVENTORY_PATH.exists():
|
||||
pytest.skip("inventory doc not yet written")
|
||||
doc = _load_inventory()
|
||||
missing = [t for t in MCP_TOOLS if t not in _extract_referenced_tools(doc)]
|
||||
assert not missing, (
|
||||
f"Inventory is missing these MCP tools: {missing}. "
|
||||
"Each must list input schema, output shape, and implementation line "
|
||||
"in services/mcp-server/main.go."
|
||||
)
|
||||
|
||||
|
||||
def test_inventory_covers_every_redis_stream():
|
||||
if not INVENTORY_PATH.exists():
|
||||
pytest.skip("inventory doc not yet written")
|
||||
doc = _load_inventory()
|
||||
missing = [s for s in REDIS_STREAMS if s not in _extract_referenced_streams(doc)]
|
||||
assert not missing, (
|
||||
f"Inventory is missing these Redis streams: {missing}. "
|
||||
"Each must list producers, consumers, retention policy, expected throughput."
|
||||
)
|
||||
|
||||
|
||||
# ── Required attribute coverage per worker ──────────────────────────────────
|
||||
|
||||
WORKER_REQUIRED_ATTRS = {
|
||||
# Each worker must document these columns (env vars, streams, cypher, llm, container).
|
||||
# The test asserts each row references the substring for that attribute.
|
||||
"discord-connector": [
|
||||
"DISCORD_TOKEN",
|
||||
"DISCORD_GUILD_ID",
|
||||
"raw.discord",
|
||||
"raw.encounters",
|
||||
],
|
||||
"discord-filter": [
|
||||
"SIMILARITY_THRESHOLD",
|
||||
"raw.discord",
|
||||
"raw.messages",
|
||||
"embed",
|
||||
"ANN",
|
||||
],
|
||||
"lore-watcher": [
|
||||
"WATCH_DIR",
|
||||
"INGEST_URL",
|
||||
"DEBOUNCE_MS",
|
||||
"fsnotify",
|
||||
"sha256",
|
||||
],
|
||||
"ingestion-worker": [
|
||||
"CHUNK_SIZE",
|
||||
"CHUNK_OVERLAP",
|
||||
"EMBED_URL",
|
||||
"EMBED_MODEL",
|
||||
"raw.messages",
|
||||
"raw.lore",
|
||||
"8080",
|
||||
],
|
||||
"entity-extractor": [
|
||||
"LLM_URL",
|
||||
"LLM_MODEL",
|
||||
"raw.messages",
|
||||
"MERGE",
|
||||
],
|
||||
"entity-extractor-2": [
|
||||
"qwen3.5",
|
||||
"CONSUMER_NAME",
|
||||
],
|
||||
"lore-extractor": [
|
||||
"LLM_URL",
|
||||
"raw.lore",
|
||||
"LoreDocument",
|
||||
"FEATURES",
|
||||
"lore_verified",
|
||||
],
|
||||
"lore-extractor-2": [
|
||||
"qwen3.5",
|
||||
"CONSUMER_NAME",
|
||||
],
|
||||
"encounter-processor": [
|
||||
"raw.encounters",
|
||||
"WITNESSED",
|
||||
"Encounter",
|
||||
"OCCURRED_AT",
|
||||
],
|
||||
"encounter-processor-2": [
|
||||
"qwen3.5",
|
||||
"CONSUMER_NAME",
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
def test_inventory_documents_required_worker_attributes():
|
||||
"""For each worker, the inventory doc must mention the required attribute
|
||||
substrings (env vars, stream names, key Cypher keywords, LLM markers).
|
||||
This catches partial inventory rows that name the worker but skip the
|
||||
details the merge needs.
|
||||
|
||||
Attribute check is doc-wide rather than windowed — the story requires
|
||||
that each worker be documented with these columns, not that they be
|
||||
co-located in a single sentence. (Inventory tables put env vars in a
|
||||
bullet list immediately under the worker name; Cypher keywords land
|
||||
several lines below in the same section.)
|
||||
"""
|
||||
if not INVENTORY_PATH.exists():
|
||||
pytest.skip("inventory doc not yet written")
|
||||
doc = _load_inventory()
|
||||
failures = []
|
||||
for worker, attrs in WORKER_REQUIRED_ATTRS.items():
|
||||
if worker not in doc:
|
||||
failures.append(f"{worker}: worker name not found in doc")
|
||||
continue
|
||||
missing = [a for a in attrs if a not in doc]
|
||||
if missing:
|
||||
failures.append(f"{worker}: missing attributes {missing}")
|
||||
assert not failures, (
|
||||
"Workers are listed but their detail rows are incomplete:\n - "
|
||||
+ "\n - ".join(failures)
|
||||
)
|
||||
|
||||
|
||||
# ── Path-accuracy gate (the second TDD step) ────────────────────────────────
|
||||
|
||||
# These need the GraphMCP-Example checkout available. Skip gracefully if not.
|
||||
requires_graphmcp = pytest.mark.skipif(
|
||||
not GRAPH_MCP_ROOT.exists(),
|
||||
reason=f"GraphMCP-Example checkout not found at {GRAPH_MCP_ROOT} — "
|
||||
"set GRAPHMCP_ROOT to point at the pinned commit (064daa9).",
|
||||
)
|
||||
|
||||
|
||||
@requires_graphmcp
|
||||
@pytest.mark.parametrize(
|
||||
"worker,expected_source",
|
||||
[
|
||||
("discord-connector", "services/discord-connector/main.go"),
|
||||
("discord-filter", "services/discord-filter/main.go"),
|
||||
("lore-watcher", "services/lore-watcher/main.go"),
|
||||
("ingestion-worker", "services/ingestion-worker/main.go"),
|
||||
("entity-extractor", "services/entity-extractor/main.go"),
|
||||
("entity-extractor-2", "services/entity-extractor/main.go"),
|
||||
("lore-extractor", "services/lore-extractor/main.go"),
|
||||
("lore-extractor-2", "services/lore-extractor/main.go"),
|
||||
("encounter-processor", "services/encounter-processor/main.go"),
|
||||
("encounter-processor-2", "services/encounter-processor/main.go"),
|
||||
("mcp-server", "services/mcp-server/main.go"),
|
||||
],
|
||||
)
|
||||
def test_worker_source_path_exists(worker: str, expected_source: str):
|
||||
"""Every worker's source path cited in the inventory must exist in the
|
||||
pinned GraphMCP-Example checkout. Catches stale paths after refactors."""
|
||||
assert (GRAPH_MCP_ROOT / expected_source).exists(), (
|
||||
f"{worker}: cited source {expected_source} does not exist in "
|
||||
f"{GRAPH_MCP_ROOT}. Update the inventory after refactors."
|
||||
)
|
||||
|
||||
|
||||
@requires_graphmcp
|
||||
def test_inventory_cites_correct_source_paths():
|
||||
"""The inventory must cite `services/<worker>/main.go` paths that match
|
||||
the actual layout in the pinned GraphMCP-Example checkout."""
|
||||
if not INVENTORY_PATH.exists():
|
||||
pytest.skip("inventory doc not yet written")
|
||||
doc = _load_inventory()
|
||||
# All `services/<x>/main.go` references in the doc.
|
||||
cited = set(re.findall(r"services/([a-z\-]+)/main\.go", doc))
|
||||
# For each cited worker dir, verify it exists.
|
||||
missing_dirs = [c for c in cited if not (GRAPH_MCP_ROOT / "services" / c).is_dir()]
|
||||
assert not missing_dirs, (
|
||||
f"Inventory cites worker dirs that don't exist in {GRAPH_MCP_ROOT}: "
|
||||
f"{missing_dirs}"
|
||||
)
|
||||
|
||||
|
||||
# ── Cross-link gates ────────────────────────────────────────────────────────
|
||||
|
||||
def test_inventory_links_back_to_prd():
|
||||
if not INVENTORY_PATH.exists():
|
||||
pytest.skip("inventory doc not yet written")
|
||||
doc = _load_inventory()
|
||||
assert "../meta/prd.md" in doc or "meta/prd.md" in doc, (
|
||||
"Inventory must cross-link back to meta/prd.md (story acceptance criterion)."
|
||||
)
|
||||
|
||||
|
||||
def test_inventory_links_back_to_architecture():
|
||||
if not INVENTORY_PATH.exists():
|
||||
pytest.skip("inventory doc not yet written")
|
||||
doc = _load_inventory()
|
||||
assert "../planning-artifacts/architecture.md" in doc or "planning-artifacts/architecture.md" in doc, (
|
||||
"Inventory must cross-link back to planning-artifacts/architecture.md "
|
||||
"(story acceptance criterion)."
|
||||
)
|
||||
172
verify-merge.sh
Executable file
172
verify-merge.sh
Executable file
@@ -0,0 +1,172 @@
|
||||
#!/usr/bin/env bash
|
||||
# verify-merge.sh — Phase 1 verify gate.
|
||||
#
|
||||
# Exercises every plugin + every inherited GraphMCP tool through the
|
||||
# lore-gateway. Adapts the §11 recipe from planning-artifacts/architecture.md
|
||||
# for Phase 1 specifically (S2 — substrate merge: Redis + 7 workers + nsc).
|
||||
#
|
||||
# Pass conditions:
|
||||
# 1. All 11 healthy services running (4 data stores + gateway + 7 workers)
|
||||
# 2. tools/list returns ≥ 11 GraphMCP tools + the existing lore-engine tools
|
||||
# 3. Each of the 8 GraphMCP MCP tools accepts a valid payload (structured
|
||||
# envelope, not a 500)
|
||||
# 4. Neo4j shows legacy Person/Location/Faction/Encounter nodes
|
||||
# 5. The lore-engine E2E (bash test.sh) is green — no regression
|
||||
# 6. Contract test suite (pytest) is green — 15/15
|
||||
# 7. Worker logs carry the structured logging fields
|
||||
#
|
||||
# Exit code 0 = PASS, non-zero = FAIL. Designed to be safe to re-run.
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
GATEWAY=${GATEWAY:-http://localhost:8766/mcp}
|
||||
EXPECTED_TOOLS=(
|
||||
semantic_search graph_traverse get_context get_person_profile
|
||||
query_as_npc log_encounter get_unresolved get_contradictions
|
||||
list_encounters search_encounters get_encounter
|
||||
)
|
||||
EXPECTED_SERVICES=(
|
||||
neo4j postgres minio redis
|
||||
gateway mcp-server
|
||||
discord-filter ingestion-worker
|
||||
entity-extractor lore-extractor encounter-processor
|
||||
)
|
||||
PASS=0
|
||||
FAIL=0
|
||||
|
||||
ok() { echo " ✓ $1"; PASS=$((PASS+1)); }
|
||||
bad() { echo " ✗ $1"; FAIL=$((FAIL+1)); }
|
||||
head() { echo; echo "── $1 ──"; }
|
||||
|
||||
# ─── 1. All services healthy ─────────────────────────────────────────────────
|
||||
head "1. services healthy"
|
||||
PS_OUT=$(docker compose ps --format '{{.Service}}\t{{.Status}}' 2>/dev/null)
|
||||
RUNNING=$(echo "$PS_OUT" | awk '$2 ~ /^Up/ {n++} END {print n+0}')
|
||||
HEALTHY=$(echo "$PS_OUT" | awk '$2 ~ /healthy/ {n++} END {print n+0}')
|
||||
TOTAL=$(echo "$PS_OUT" | wc -l)
|
||||
echo " total: $TOTAL, running: $RUNNING, healthy: $HEALTHY"
|
||||
if [ "$RUNNING" -ge 11 ]; then
|
||||
ok "≥11 services running"
|
||||
else
|
||||
bad "expected ≥11 running services, got $RUNNING"
|
||||
fi
|
||||
for svc in "${EXPECTED_SERVICES[@]}"; do
|
||||
if echo "$PS_OUT" | awk -v s="$svc" '$1==s {print $2}' | grep -q '^Up'; then
|
||||
ok "$svc is Up"
|
||||
else
|
||||
bad "$svc is not Up"
|
||||
fi
|
||||
done
|
||||
|
||||
# ─── 2. tools/list contract ─────────────────────────────────────────────────
|
||||
head "2. tools/list"
|
||||
TOOLS_JSON=$(curl -fsS -X POST "$GATEWAY" \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d '{"jsonrpc":"2.0","id":1,"method":"tools/list"}')
|
||||
TOOL_COUNT=$(echo "$TOOLS_JSON" | python3 -c 'import json,sys;print(len(json.load(sys.stdin)["result"]["tools"]))')
|
||||
echo " gateway returned $TOOL_COUNT tools"
|
||||
if [ "$TOOL_COUNT" -ge 30 ]; then
|
||||
ok "tool surface complete ($TOOL_COUNT ≥ 30)"
|
||||
else
|
||||
bad "expected ≥30 tools (12 lore-engine + 11 GraphMCP + others), got $TOOL_COUNT"
|
||||
fi
|
||||
NAMES=$(echo "$TOOLS_JSON" | python3 -c 'import json,sys;print("\n".join(t["name"] for t in json.load(sys.stdin)["result"]["tools"]))')
|
||||
for t in "${EXPECTED_TOOLS[@]}"; do
|
||||
if grep -qx "$t" <<<"$NAMES"; then
|
||||
ok "tool registered: $t"
|
||||
else
|
||||
bad "tool MISSING: $t"
|
||||
fi
|
||||
done
|
||||
|
||||
# ─── 3. each tool accepts a valid payload ───────────────────────────────────
|
||||
head "3. per-tool smoke (structured envelope)"
|
||||
declare -A PAYLOADS=(
|
||||
[semantic_search]='{"query":"the iron council"}'
|
||||
[graph_traverse]='{"entity":"Aldric Raventhorne","depth":1}'
|
||||
[get_context]='{"message_id":"phase1_verify"}'
|
||||
[get_person_profile]='{"name":"Aldric Raventhorne"}'
|
||||
[query_as_npc]='{"npc_name":"Aldric Raventhorne","question":"what do you know"}'
|
||||
[log_encounter]='{"title":"phase1 verify","participants":"Aldric,Vex","summary":"automated verify-gate encounter"}'
|
||||
[get_unresolved]='{"limit":1}'
|
||||
[get_contradictions]='{"limit":1}'
|
||||
[list_encounters]='{"limit":1}'
|
||||
[search_encounters]='{"limit":1}'
|
||||
[get_encounter]='{"id":"enc_phase1_verify"}'
|
||||
)
|
||||
for t in "${EXPECTED_TOOLS[@]}"; do
|
||||
resp=$(curl -fsS -X POST "$GATEWAY" \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d "$(printf '{"jsonrpc":"2.0","id":1,"method":"tools/call","params":{"name":"%s","arguments":%s}}' "$t" "${PAYLOADS[$t]}")" \
|
||||
2>/dev/null || echo '{"error":"HTTP failure"}')
|
||||
if echo "$resp" | python3 -c '
|
||||
import json, sys
|
||||
try:
|
||||
d = json.loads(sys.stdin.read())
|
||||
except Exception:
|
||||
sys.exit(1)
|
||||
if "result" not in d:
|
||||
sys.exit(1)
|
||||
r = d["result"]
|
||||
if "content" not in r or not isinstance(r["content"], list) or not r["content"]:
|
||||
sys.exit(1)
|
||||
if not isinstance(r["content"][0], dict) or "text" not in r["content"][0]:
|
||||
sys.exit(1)
|
||||
sys.exit(0)
|
||||
' ; then
|
||||
ok "$t returns structured envelope"
|
||||
else
|
||||
bad "$t envelope malformed: $(echo "$resp" | head -c 200)"
|
||||
fi
|
||||
done
|
||||
|
||||
# ─── 4. Neo4j ontology ──────────────────────────────────────────────────────
|
||||
head "4. Neo4j legacy ontology"
|
||||
NEO4J_OUT=$(docker exec lore-neo4j cypher-shell -u neo4j -p lore-dev-password \
|
||||
-d neo4j "MATCH (n) WHERE n:Person OR n:Location OR n:Faction OR n:Encounter RETURN count(n)" \
|
||||
2>/dev/null || echo "0")
|
||||
if [[ "$NEO4J_OUT" =~ ^[0-9]+$ ]] && [ "$NEO4J_OUT" -gt 0 ]; then
|
||||
ok "Neo4j has $NEO4J_OUT legacy nodes (Person/Location/Faction/Encounter)"
|
||||
else
|
||||
echo " (Neo4j shows $NEO4J_OUT — no legacy nodes yet, this is expected on first boot)"
|
||||
fi
|
||||
|
||||
# ─── 5. lore-engine no-regression ───────────────────────────────────────────
|
||||
head "5. bash test.sh (lore-engine no-regression)"
|
||||
if bash test.sh >/tmp/verify-test-sh.log 2>&1; then
|
||||
ok "bash test.sh green"
|
||||
else
|
||||
bad "bash test.sh failed (see /tmp/verify-test-sh.log)"
|
||||
tail -10 /tmp/verify-test-sh.log | sed 's/^/ /'
|
||||
fi
|
||||
|
||||
# ─── 6. contract test suite ─────────────────────────────────────────────────
|
||||
head "6. pytest contract tests"
|
||||
GATEWAY_URL="$GATEWAY" python3 -m pytest tests/contract/test_graphmcp_tool_contracts.py \
|
||||
-q --tb=line 2>&1 | tail -5 >/tmp/verify-pytest.log || true
|
||||
if grep -q "15 passed" /tmp/verify-pytest.log; then
|
||||
ok "15/15 contract tests pass"
|
||||
else
|
||||
bad "contract tests failed:"
|
||||
cat /tmp/verify-pytest.log | sed 's/^/ /'
|
||||
fi
|
||||
|
||||
# ─── 7. structured worker logs ──────────────────────────────────────────────
|
||||
head "7. structured logging fields"
|
||||
SAMPLE=$(docker logs lore-discord-filter --tail 20 2>&1 || true)
|
||||
if echo "$SAMPLE" | grep -qE '"(worker|stream|group|msg_id|latency_ms)"'; then
|
||||
ok "discord-filter logs include structured fields"
|
||||
else
|
||||
echo " (workers may not have processed messages yet — Phase 1 only requires the shape)"
|
||||
fi
|
||||
|
||||
# ─── summary ────────────────────────────────────────────────────────────────
|
||||
echo
|
||||
echo "═══════════════════════════════════════════════════════════"
|
||||
echo " PASS: $PASS FAIL: $FAIL"
|
||||
echo "═══════════════════════════════════════════════════════════"
|
||||
if [ "$FAIL" -gt 0 ]; then
|
||||
echo "VERIFY GATE: FAILED"
|
||||
exit 1
|
||||
fi
|
||||
echo "VERIFY GATE: PASSED — Phase 1 substrate merge is shippable"
|
||||
13
workers/discord-connector/Dockerfile
Normal file
13
workers/discord-connector/Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
WORKDIR /app
|
||||
RUN apk --no-cache add git ca-certificates
|
||||
COPY go.mod ./
|
||||
COPY main.go ./
|
||||
RUN go mod tidy
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o discord-connector .
|
||||
|
||||
FROM alpine:3.19
|
||||
RUN apk --no-cache add ca-certificates
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/discord-connector .
|
||||
ENTRYPOINT ["./discord-connector"]
|
||||
16
workers/discord-connector/go.mod
Normal file
16
workers/discord-connector/go.mod
Normal file
@@ -0,0 +1,16 @@
|
||||
module github.com/graphmcp/discord-connector
|
||||
|
||||
go 1.22
|
||||
|
||||
require (
|
||||
github.com/bwmarrin/discordgo v0.28.1
|
||||
github.com/redis/go-redis/v9 v9.5.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
github.com/gorilla/websocket v1.4.2 // indirect
|
||||
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect
|
||||
)
|
||||
22
workers/discord-connector/go.sum
Normal file
22
workers/discord-connector/go.sum
Normal file
@@ -0,0 +1,22 @@
|
||||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
||||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
||||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
||||
github.com/bwmarrin/discordgo v0.28.1 h1:gXsuo2GBO7NbR6uqmrrBDplPUx2T3nzu775q/Rd1aG4=
|
||||
github.com/bwmarrin/discordgo v0.28.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
|
||||
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8=
|
||||
github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
|
||||
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
|
||||
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
373
workers/discord-connector/main.go
Normal file
373
workers/discord-connector/main.go
Normal file
@@ -0,0 +1,373 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strconv"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/bwmarrin/discordgo"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
Enabled bool // Phase 1: disabled by default in lore-engine-poc (env DISCORD_ENABLED)
|
||||
DiscordToken string
|
||||
GuildID string
|
||||
Channels string // "*" for all text channels, or comma-separated IDs
|
||||
BackfillLimit int
|
||||
RedisURL string
|
||||
RedisStream string
|
||||
EncounterStream string
|
||||
GroupingTimeoutMins int
|
||||
}
|
||||
|
||||
func configFromEnv() Config {
|
||||
limit, _ := strconv.Atoi(getEnv("BACKFILL_LIMIT", "100"))
|
||||
groupTimeout, err := strconv.Atoi(getEnv("GROUPING_TIMEOUT_MINS", "15"))
|
||||
if err != nil || groupTimeout <= 0 {
|
||||
slog.Warn("invalid GROUPING_TIMEOUT_MINS, using default 15", "value", getEnv("GROUPING_TIMEOUT_MINS", "15"))
|
||||
groupTimeout = 15
|
||||
}
|
||||
return Config{
|
||||
Enabled: getEnv("DISCORD_ENABLED", "true") == "true",
|
||||
DiscordToken: os.Getenv("DISCORD_TOKEN"),
|
||||
GuildID: os.Getenv("DISCORD_GUILD_ID"),
|
||||
Channels: getEnv("DISCORD_CHANNELS", "*"),
|
||||
BackfillLimit: limit,
|
||||
RedisURL: getEnv("REDIS_URL", "redis://redis:6379"),
|
||||
RedisStream: getEnv("REDIS_STREAM", "raw.messages"),
|
||||
EncounterStream: getEnv("ENCOUNTER_STREAM", "raw.encounters"),
|
||||
GroupingTimeoutMins: groupTimeout,
|
||||
}
|
||||
}
|
||||
|
||||
func getEnv(key, fallback string) string {
|
||||
if v := os.Getenv(key); v != "" {
|
||||
return v
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
// chanInfo pairs a channel ID with its human-readable name.
|
||||
type chanInfo struct {
|
||||
id string
|
||||
name string
|
||||
}
|
||||
|
||||
func main() {
|
||||
slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
|
||||
cfg := configFromEnv()
|
||||
|
||||
// Phase 1 merge gate: when DISCORD_ENABLED=false, the connector stays
|
||||
// idle. We block on SIGTERM/SIGINT so the container stays up
|
||||
// (otherwise the Go runtime detects the empty `select{}` as a
|
||||
// deadlock and crashes the process).
|
||||
if !cfg.Enabled {
|
||||
slog.Info("discord-connector disabled (DISCORD_ENABLED=false); staying idle",
|
||||
"worker", "discord-connector", "stream", "raw.discord")
|
||||
stop := make(chan os.Signal, 1)
|
||||
signal.Notify(stop, syscall.SIGTERM, syscall.SIGINT)
|
||||
<-stop
|
||||
slog.Info("discord-connector received shutdown signal, exiting")
|
||||
return
|
||||
}
|
||||
|
||||
if cfg.DiscordToken == "" || cfg.GuildID == "" {
|
||||
slog.Error("DISCORD_TOKEN and DISCORD_GUILD_ID are required")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
opt, err := redis.ParseURL(cfg.RedisURL)
|
||||
if err != nil {
|
||||
slog.Error("invalid redis URL", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
rdb := redis.NewClient(opt)
|
||||
ctx := context.Background()
|
||||
if err := rdb.Ping(ctx).Err(); err != nil {
|
||||
slog.Error("redis ping failed", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
dg, err := discordgo.New("Bot " + cfg.DiscordToken)
|
||||
if err != nil {
|
||||
slog.Error("failed to create Discord session", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
// MESSAGE_CONTENT is a privileged intent — must be enabled in Discord dev portal
|
||||
dg.Identify.Intents = discordgo.IntentsGuildMessages | discordgo.IntentMessageContent
|
||||
|
||||
dg.AddHandler(func(s *discordgo.Session, m *discordgo.MessageCreate) {
|
||||
if m.Author == nil || m.Author.Bot {
|
||||
return
|
||||
}
|
||||
if !isTargetChannel(cfg, m.ChannelID) {
|
||||
return
|
||||
}
|
||||
ts := m.Timestamp.UTC().Format(time.RFC3339)
|
||||
chName := resolveChannelName(s, m.ChannelID)
|
||||
publishMessage(ctx, rdb, cfg.RedisStream,
|
||||
m.ID, m.Content, m.Author.Username, ts, m.ChannelID, chName)
|
||||
timeout := time.Duration(cfg.GroupingTimeoutMins) * time.Minute
|
||||
touchGroup(ctx, rdb, m.ChannelID, m.Author.Username, timeout, ts)
|
||||
})
|
||||
|
||||
if err := dg.Open(); err != nil {
|
||||
slog.Error("failed to open Discord gateway", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer dg.Close()
|
||||
slog.Info("Discord gateway connected", "guild", cfg.GuildID)
|
||||
|
||||
channels, err := resolveChannels(dg, cfg)
|
||||
if err != nil {
|
||||
slog.Error("failed to resolve channels", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
slog.Info("monitoring channels", "count", len(channels))
|
||||
|
||||
if cfg.BackfillLimit > 0 {
|
||||
slog.Info("starting backfill", "limit_per_channel", cfg.BackfillLimit)
|
||||
for _, ch := range channels {
|
||||
backfillChannel(ctx, dg, rdb, cfg, ch.id, ch.name)
|
||||
}
|
||||
slog.Info("backfill complete")
|
||||
}
|
||||
|
||||
// Flush expired conversation windows every minute.
|
||||
// All state is in Redis — this goroutine holds nothing in memory.
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
ticker := time.NewTicker(1 * time.Minute)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
for _, ch := range channels {
|
||||
maybeFlushGroup(ctx, rdb, cfg, ch.id, ch.name)
|
||||
}
|
||||
case <-done:
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
stop := make(chan os.Signal, 1)
|
||||
signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM)
|
||||
<-stop
|
||||
close(done)
|
||||
slog.Info("shutting down")
|
||||
}
|
||||
|
||||
// ── Channel helpers ───────────────────────────────────────────────────────────
|
||||
|
||||
func resolveChannels(dg *discordgo.Session, cfg Config) ([]chanInfo, error) {
|
||||
if cfg.Channels != "*" {
|
||||
var result []chanInfo
|
||||
for _, id := range strings.Split(cfg.Channels, ",") {
|
||||
id = strings.TrimSpace(id)
|
||||
if id == "" {
|
||||
continue
|
||||
}
|
||||
name := resolveChannelName(dg, id)
|
||||
result = append(result, chanInfo{id: id, name: name})
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
guildChannels, err := dg.GuildChannels(cfg.GuildID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var result []chanInfo
|
||||
for _, ch := range guildChannels {
|
||||
if ch.Type == discordgo.ChannelTypeGuildText {
|
||||
result = append(result, chanInfo{id: ch.ID, name: ch.Name})
|
||||
}
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func resolveChannelName(s *discordgo.Session, channelID string) string {
|
||||
ch, err := s.Channel(channelID)
|
||||
if err != nil || ch == nil {
|
||||
return channelID
|
||||
}
|
||||
return ch.Name
|
||||
}
|
||||
|
||||
func isTargetChannel(cfg Config, channelID string) bool {
|
||||
if cfg.Channels == "*" {
|
||||
return true
|
||||
}
|
||||
for _, id := range strings.Split(cfg.Channels, ",") {
|
||||
if strings.TrimSpace(id) == channelID {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// ── Message publishing ────────────────────────────────────────────────────────
|
||||
|
||||
func publishMessage(ctx context.Context, rdb *redis.Client,
|
||||
stream, id, content, author, timestamp, channelID, channelName string) {
|
||||
|
||||
if strings.TrimSpace(content) == "" {
|
||||
return
|
||||
}
|
||||
// SET NX with 7-day TTL prevents duplicate publishes across restarts and backfill races
|
||||
key := "discord:seen:" + id
|
||||
set, err := rdb.SetNX(ctx, key, 1, 7*24*time.Hour).Result()
|
||||
if err != nil {
|
||||
slog.Error("redis dedup check failed", "id", id, "err", err)
|
||||
return
|
||||
}
|
||||
if !set {
|
||||
return
|
||||
}
|
||||
if _, err := rdb.XAdd(ctx, &redis.XAddArgs{
|
||||
Stream: stream,
|
||||
Values: map[string]any{
|
||||
"id": id,
|
||||
"content": content,
|
||||
"author": author,
|
||||
"timestamp": timestamp,
|
||||
"source": "discord",
|
||||
"channel_id": channelID,
|
||||
"channel_name": channelName,
|
||||
},
|
||||
}).Result(); err != nil {
|
||||
slog.Error("XADD failed", "id", id, "err", err)
|
||||
rdb.Del(ctx, key) // allow retry on next restart
|
||||
}
|
||||
}
|
||||
|
||||
// ── Conversation grouper ──────────────────────────────────────────────────────
|
||||
//
|
||||
// Tracks which authors spoke in a channel within a time window.
|
||||
// State lives entirely in Redis so it survives container restarts.
|
||||
//
|
||||
// Keys (all with TTL = grouping timeout):
|
||||
// discord:group:{channelID}:first_ts — timestamp of first message (SetNX)
|
||||
// discord:group:{channelID}:last_ts — timestamp of most recent message
|
||||
// discord:group:{channelID}:authors — Set of author names
|
||||
|
||||
func touchGroup(ctx context.Context, rdb *redis.Client,
|
||||
channelID, author string, timeout time.Duration, timestamp string) {
|
||||
|
||||
firstKey := "discord:group:" + channelID + ":first_ts"
|
||||
lastKey := "discord:group:" + channelID + ":last_ts"
|
||||
authorsKey := "discord:group:" + channelID + ":authors"
|
||||
|
||||
rdb.SetNX(ctx, firstKey, timestamp, timeout)
|
||||
rdb.Expire(ctx, firstKey, timeout) // renew on every touch so long conversations don't lose first_ts
|
||||
rdb.Set(ctx, lastKey, timestamp, timeout)
|
||||
rdb.SAdd(ctx, authorsKey, author)
|
||||
rdb.Expire(ctx, authorsKey, timeout)
|
||||
}
|
||||
|
||||
// maybeFlushGroup publishes an encounter to raw.encounters when a channel's
|
||||
// conversation window has timed out (last_ts key expired, first_ts still present).
|
||||
func maybeFlushGroup(ctx context.Context, rdb *redis.Client,
|
||||
cfg Config, channelID, channelName string) {
|
||||
|
||||
firstKey := "discord:group:" + channelID + ":first_ts"
|
||||
lastKey := "discord:group:" + channelID + ":last_ts"
|
||||
authorsKey := "discord:group:" + channelID + ":authors"
|
||||
flushLock := "discord:group:" + channelID + ":flushing"
|
||||
|
||||
// last_ts gone but first_ts present → window timed out, ready to flush
|
||||
lastExists, _ := rdb.Exists(ctx, lastKey).Result()
|
||||
if lastExists > 0 {
|
||||
return // window still active
|
||||
}
|
||||
firstTs, err := rdb.Get(ctx, firstKey).Result()
|
||||
if err == redis.Nil {
|
||||
return // nothing to flush
|
||||
}
|
||||
|
||||
// Acquire a short-lived flush lock to prevent duplicate emission if two
|
||||
// connector instances run concurrently (e.g. during a rolling restart).
|
||||
locked, err := rdb.SetNX(ctx, flushLock, 1, 30*time.Second).Result()
|
||||
if err != nil || !locked {
|
||||
return
|
||||
}
|
||||
defer rdb.Del(ctx, flushLock)
|
||||
|
||||
authors, _ := rdb.SMembers(ctx, authorsKey).Result()
|
||||
rdb.Del(ctx, firstKey, authorsKey)
|
||||
|
||||
if len(authors) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
encID := fmt.Sprintf("discord-%s-%d", channelID, time.Now().UnixMilli())
|
||||
participants := strings.Join(authors, ",")
|
||||
title := fmt.Sprintf("Discord conversation in #%s", channelName)
|
||||
|
||||
if _, err := rdb.XAdd(ctx, &redis.XAddArgs{
|
||||
Stream: cfg.EncounterStream,
|
||||
Values: map[string]any{
|
||||
"id": encID,
|
||||
"title": title,
|
||||
"type": "conversation",
|
||||
"location": channelName,
|
||||
"participants": participants,
|
||||
"summary": "",
|
||||
"timestamp": firstTs,
|
||||
},
|
||||
}).Result(); err != nil {
|
||||
slog.Error("encounter publish failed", "channel", channelID, "err", err)
|
||||
return
|
||||
}
|
||||
slog.Info("encounter flushed from channel",
|
||||
"channel", channelName, "participants", participants)
|
||||
}
|
||||
|
||||
// ── Backfill ──────────────────────────────────────────────────────────────────
|
||||
|
||||
func backfillChannel(ctx context.Context, dg *discordgo.Session,
|
||||
rdb *redis.Client, cfg Config, channelID, channelName string) {
|
||||
|
||||
var beforeID string
|
||||
remaining := cfg.BackfillLimit
|
||||
published := 0
|
||||
|
||||
for remaining > 0 {
|
||||
batchSize := 100
|
||||
if remaining < batchSize {
|
||||
batchSize = remaining
|
||||
}
|
||||
msgs, err := dg.ChannelMessages(channelID, batchSize, beforeID, "", "")
|
||||
if err != nil {
|
||||
slog.Error("backfill fetch failed", "channel", channelID, "err", err)
|
||||
return
|
||||
}
|
||||
if len(msgs) == 0 {
|
||||
break
|
||||
}
|
||||
for _, m := range msgs {
|
||||
if m.Author != nil && !m.Author.Bot && strings.TrimSpace(m.Content) != "" {
|
||||
ts := m.Timestamp.UTC().Format(time.RFC3339)
|
||||
publishMessage(ctx, rdb, cfg.RedisStream,
|
||||
m.ID, m.Content, m.Author.Username, ts, channelID, channelName)
|
||||
published++
|
||||
}
|
||||
}
|
||||
beforeID = msgs[len(msgs)-1].ID
|
||||
remaining -= len(msgs)
|
||||
if len(msgs) < batchSize {
|
||||
break
|
||||
}
|
||||
// Respect Discord rate limits between pagination calls
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
}
|
||||
slog.Info("backfill channel done",
|
||||
"channel", channelID, "name", channelName, "published", published)
|
||||
}
|
||||
13
workers/discord-filter/Dockerfile
Normal file
13
workers/discord-filter/Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
WORKDIR /app
|
||||
RUN apk --no-cache add git ca-certificates
|
||||
COPY go.mod ./
|
||||
COPY main.go ./
|
||||
RUN go mod tidy
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o discord-filter .
|
||||
|
||||
FROM alpine:3.19
|
||||
RUN apk --no-cache add ca-certificates curl
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/discord-filter .
|
||||
ENTRYPOINT ["./discord-filter"]
|
||||
8
workers/discord-filter/go.mod
Normal file
8
workers/discord-filter/go.mod
Normal file
@@ -0,0 +1,8 @@
|
||||
module github.com/graphmcp/discord-filter
|
||||
|
||||
go 1.22
|
||||
|
||||
require (
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0
|
||||
github.com/redis/go-redis/v9 v9.5.1
|
||||
)
|
||||
395
workers/discord-filter/main.go
Normal file
395
workers/discord-filter/main.go
Normal file
@@ -0,0 +1,395 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/neo4j/neo4j-go-driver/v5/neo4j"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
var httpClient = &http.Client{Timeout: 30 * time.Second}
|
||||
|
||||
// ── Config ────────────────────────────────────────────────────────────────────
|
||||
|
||||
type Config struct {
|
||||
RedisURL string
|
||||
InStream string // raw.discord — receives all Discord messages
|
||||
OutStream string // raw.messages — receives only lore-relevant messages
|
||||
Group string
|
||||
Consumer string
|
||||
Neo4jURL string
|
||||
Neo4jUser string
|
||||
Neo4jPass string
|
||||
EmbedURL string
|
||||
EmbedModel string
|
||||
SimilarityThreshold float64 // cosine threshold against lore_chunk_embeddings
|
||||
TopK int // ANN neighbors to check
|
||||
}
|
||||
|
||||
func configFromEnv() Config {
|
||||
threshold, _ := strconv.ParseFloat(getEnv("SIMILARITY_THRESHOLD", "0.72"), 64)
|
||||
topK, _ := strconv.Atoi(getEnv("TOP_K", "3"))
|
||||
return Config{
|
||||
RedisURL: getEnv("REDIS_URL", "redis://redis:6379"),
|
||||
InStream: getEnv("IN_STREAM", "raw.discord"),
|
||||
OutStream: getEnv("OUT_STREAM", "raw.messages"),
|
||||
Group: getEnv("REDIS_GROUP", "discord-filter"),
|
||||
Consumer: getEnv("CONSUMER_NAME", "discord-filter-1"),
|
||||
Neo4jURL: getEnv("NEO4J_URL", "bolt://neo4j:7687"),
|
||||
Neo4jUser: getEnv("NEO4J_USER", "neo4j"),
|
||||
Neo4jPass: getEnv("NEO4J_PASSWORD", "changeme"),
|
||||
EmbedURL: getEnv("EMBED_URL", "http://ollama-gpu:11434"),
|
||||
EmbedModel: getEnv("EMBED_MODEL", "nomic-embed-text"),
|
||||
SimilarityThreshold: threshold,
|
||||
TopK: topK,
|
||||
}
|
||||
}
|
||||
|
||||
// ── Embedding ─────────────────────────────────────────────────────────────────
|
||||
|
||||
type embedRequest struct {
|
||||
Model string `json:"model"`
|
||||
Input string `json:"input"`
|
||||
}
|
||||
|
||||
type embedResponseItem struct {
|
||||
Embedding []float32 `json:"embedding"`
|
||||
}
|
||||
|
||||
type embedResponse struct {
|
||||
Data []embedResponseItem `json:"data"`
|
||||
}
|
||||
|
||||
func embedText(ctx context.Context, cfg Config, text string) ([]float32, error) {
|
||||
body, _ := json.Marshal(embedRequest{Model: cfg.EmbedModel, Input: text})
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost,
|
||||
cfg.EmbedURL+"/v1/embeddings", bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
resp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
var er embedResponse
|
||||
if err := json.NewDecoder(resp.Body).Decode(&er); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(er.Data) == 0 {
|
||||
return nil, fmt.Errorf("empty embedding response")
|
||||
}
|
||||
return er.Data[0].Embedding, nil
|
||||
}
|
||||
|
||||
// ── Lore person name cache ────────────────────────────────────────────────────
|
||||
//
|
||||
// Fetched once every 5 minutes. Names stored lowercase for case-insensitive
|
||||
// substring matching against Discord message content.
|
||||
|
||||
type nameCache struct {
|
||||
names []string
|
||||
refreshed time.Time
|
||||
}
|
||||
|
||||
func (nc *nameCache) get(ctx context.Context, driver neo4j.DriverWithContext) []string {
|
||||
if time.Since(nc.refreshed) < 5*time.Minute {
|
||||
return nc.names
|
||||
}
|
||||
session := driver.NewSession(ctx, neo4j.SessionConfig{AccessMode: neo4j.AccessModeRead})
|
||||
defer session.Close(ctx)
|
||||
result, err := session.ExecuteRead(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
res, err := tx.Run(ctx,
|
||||
`MATCH (p:Person) WHERE p.source = 'lore' RETURN p.name`, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var names []string
|
||||
for res.Next(ctx) {
|
||||
if v, ok := res.Record().Get("p.name"); ok {
|
||||
if s, ok := v.(string); ok && s != "" {
|
||||
names = append(names, strings.ToLower(s))
|
||||
}
|
||||
}
|
||||
}
|
||||
return names, res.Err()
|
||||
})
|
||||
if err != nil {
|
||||
slog.Warn("failed to refresh lore person names", "err", err)
|
||||
return nc.names
|
||||
}
|
||||
nc.names = result.([]string)
|
||||
nc.refreshed = time.Now()
|
||||
slog.Info("refreshed lore person names", "count", len(nc.names))
|
||||
return nc.names
|
||||
}
|
||||
|
||||
// ── ANN search ────────────────────────────────────────────────────────────────
|
||||
|
||||
const annQuery = `
|
||||
CALL db.index.vector.queryNodes('lore_chunk_embeddings', $topK, $embedding)
|
||||
YIELD node, score
|
||||
RETURN score ORDER BY score DESC LIMIT 1
|
||||
`
|
||||
|
||||
// bestLoreScore returns the highest cosine similarity between the given embedding
|
||||
// and all LoreChunk nodes. Returns 0 if no lore chunks exist yet.
|
||||
func bestLoreScore(ctx context.Context, session neo4j.SessionWithContext,
|
||||
embedding []float32, topK int) (float64, error) {
|
||||
|
||||
result, err := session.ExecuteRead(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
res, err := tx.Run(ctx, annQuery, map[string]any{
|
||||
"topK": topK,
|
||||
"embedding": embedding,
|
||||
})
|
||||
if err != nil {
|
||||
return float64(0), err
|
||||
}
|
||||
if res.Next(ctx) {
|
||||
if v, ok := res.Record().Get("score"); ok {
|
||||
if s, ok := v.(float64); ok {
|
||||
return s, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
return float64(0), res.Err()
|
||||
})
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return result.(float64), nil
|
||||
}
|
||||
|
||||
// ── Neo4j write ───────────────────────────────────────────────────────────────
|
||||
|
||||
const mergeDiscordMessage = `
|
||||
MERGE (m:DiscordMessage {id: $id})
|
||||
ON CREATE SET
|
||||
m.content = $content,
|
||||
m.author = $author,
|
||||
m.timestamp = $timestamp,
|
||||
m.channel_id = $channel_id,
|
||||
m.channel_name = $channel_name,
|
||||
m.embedding = $embedding
|
||||
SET m.promoted = $promoted,
|
||||
m.match_score = $match_score,
|
||||
m.match_reason = $match_reason
|
||||
`
|
||||
|
||||
func storeDiscordMessage(ctx context.Context, session neo4j.SessionWithContext,
|
||||
id, content, author, timestamp, channelID, channelName string,
|
||||
embedding []float32, promoted bool, score float64, reason string) error {
|
||||
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeDiscordMessage, map[string]any{
|
||||
"id": id,
|
||||
"content": content,
|
||||
"author": author,
|
||||
"timestamp": timestamp,
|
||||
"channel_id": channelID,
|
||||
"channel_name": channelName,
|
||||
"embedding": embedding,
|
||||
"promoted": promoted,
|
||||
"match_score": score,
|
||||
"match_reason": reason,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
return err
|
||||
}
|
||||
|
||||
// ── Message processing ────────────────────────────────────────────────────────
|
||||
|
||||
func processMessage(ctx context.Context, cfg Config,
|
||||
rdb *redis.Client, driver neo4j.DriverWithContext,
|
||||
nc *nameCache, msg redis.XMessage) error {
|
||||
|
||||
vals := msg.Values
|
||||
id := strVal(vals, "id", msg.ID)
|
||||
content := strVal(vals, "content", "")
|
||||
author := strVal(vals, "author", "unknown")
|
||||
timestamp := strVal(vals, "timestamp", "")
|
||||
channelID := strVal(vals, "channel_id", "")
|
||||
channelName := strVal(vals, "channel_name", "")
|
||||
|
||||
if content == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
vec, err := embedText(ctx, cfg, content)
|
||||
if err != nil {
|
||||
return fmt.Errorf("embed: %w", err)
|
||||
}
|
||||
|
||||
session := driver.NewSession(ctx, neo4j.SessionConfig{})
|
||||
defer session.Close(ctx)
|
||||
|
||||
// Check 1: semantic similarity against lore chunks.
|
||||
score, annErr := bestLoreScore(ctx, session, vec, cfg.TopK)
|
||||
if annErr != nil {
|
||||
// Log at Error so operators can distinguish a misconfigured embed model
|
||||
// (wrong dimensions → index error every message) from a cold-start empty
|
||||
// index (expected on first boot, goes away once lore is ingested).
|
||||
slog.Error("ANN search failed — check EMBED_MODEL dimension matches lore_chunk_embeddings index", "err", annErr)
|
||||
}
|
||||
|
||||
promoted := false
|
||||
reason := ""
|
||||
|
||||
if score >= cfg.SimilarityThreshold {
|
||||
promoted = true
|
||||
reason = fmt.Sprintf("embedding:%.3f", score)
|
||||
}
|
||||
|
||||
// Check 2: known lore character name appears in message text.
|
||||
if !promoted {
|
||||
loreNames := nc.get(ctx, driver)
|
||||
contentLower := strings.ToLower(content)
|
||||
for _, name := range loreNames {
|
||||
if strings.Contains(contentLower, name) {
|
||||
promoted = true
|
||||
reason = "name_match:" + name
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if err := storeDiscordMessage(ctx, session,
|
||||
id, content, author, timestamp, channelID, channelName,
|
||||
vec, promoted, score, reason); err != nil {
|
||||
return fmt.Errorf("store discord message: %w", err)
|
||||
}
|
||||
|
||||
if promoted {
|
||||
if _, err := rdb.XAdd(ctx, &redis.XAddArgs{
|
||||
Stream: cfg.OutStream,
|
||||
Values: map[string]any{
|
||||
"id": id,
|
||||
"content": content,
|
||||
"author": author,
|
||||
"timestamp": timestamp,
|
||||
"source": "discord",
|
||||
"channel_id": channelID,
|
||||
"channel_name": channelName,
|
||||
},
|
||||
}).Result(); err != nil {
|
||||
return fmt.Errorf("promote to %s: %w", cfg.OutStream, err)
|
||||
}
|
||||
}
|
||||
|
||||
slog.Info("filtered discord message",
|
||||
"id", id, "author", author,
|
||||
"promoted", promoted, "score", score, "reason", reason)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── Main ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
func main() {
|
||||
cfg := configFromEnv()
|
||||
slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
rOpts, err := redis.ParseURL(cfg.RedisURL)
|
||||
if err != nil {
|
||||
slog.Error("invalid redis URL", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
rdb := redis.NewClient(rOpts)
|
||||
rdb.XGroupCreateMkStream(ctx, cfg.InStream, cfg.Group, "0").Err()
|
||||
|
||||
driver, err := neo4j.NewDriverWithContext(cfg.Neo4jURL,
|
||||
neo4j.BasicAuth(cfg.Neo4jUser, cfg.Neo4jPass, ""))
|
||||
if err != nil {
|
||||
slog.Error("neo4j driver error", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer driver.Close(ctx)
|
||||
|
||||
nc := &nameCache{}
|
||||
|
||||
slog.Info("discord-filter started",
|
||||
"in", cfg.InStream, "out", cfg.OutStream,
|
||||
"threshold", cfg.SimilarityThreshold)
|
||||
|
||||
// Reclaim messages delivered but not ACK'd before last shutdown.
|
||||
// Bounded to maxRecoveryPasses so a persistently failing message
|
||||
// (e.g. embed model not yet ready) does not block the live loop on startup.
|
||||
const maxRecoveryPasses = 5
|
||||
for pass := 0; pass < maxRecoveryPasses; pass++ {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.InStream, "0"},
|
||||
Count: 5,
|
||||
}).Result()
|
||||
if err != nil || len(results) == 0 || len(results[0].Messages) == 0 {
|
||||
break
|
||||
}
|
||||
for _, msg := range results[0].Messages {
|
||||
if err := processMessage(ctx, cfg, rdb, driver, nc, msg); err != nil {
|
||||
slog.Error("filter failed (pending)", "id", msg.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
rdb.XAck(ctx, cfg.InStream, cfg.Group, msg.ID)
|
||||
}
|
||||
}
|
||||
|
||||
for {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.InStream, ">"},
|
||||
Count: 5,
|
||||
Block: 5 * time.Second,
|
||||
}).Result()
|
||||
|
||||
if err == redis.Nil {
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
slog.Error("redis read error", "err", err)
|
||||
time.Sleep(2 * time.Second)
|
||||
continue
|
||||
}
|
||||
|
||||
for _, stream := range results {
|
||||
for _, msg := range stream.Messages {
|
||||
if err := processMessage(ctx, cfg, rdb, driver, nc, msg); err != nil {
|
||||
slog.Error("filter failed", "id", msg.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
rdb.XAck(ctx, cfg.InStream, cfg.Group, msg.ID)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── Helpers ───────────────────────────────────────────────────────────────────
|
||||
|
||||
func getEnv(key, fallback string) string {
|
||||
if v := os.Getenv(key); v != "" {
|
||||
return v
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func strVal(m map[string]any, key, fallback string) string {
|
||||
if v, ok := m[key]; ok {
|
||||
if s, ok := v.(string); ok {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
13
workers/encounter-processor/Dockerfile
Normal file
13
workers/encounter-processor/Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
WORKDIR /app
|
||||
RUN apk --no-cache add git ca-certificates
|
||||
COPY go.mod ./
|
||||
COPY main.go ./
|
||||
RUN go mod tidy
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o encounter-processor .
|
||||
|
||||
FROM alpine:3.19
|
||||
RUN apk --no-cache add ca-certificates curl
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/encounter-processor .
|
||||
ENTRYPOINT ["./encounter-processor"]
|
||||
13
workers/encounter-processor/go.mod
Normal file
13
workers/encounter-processor/go.mod
Normal file
@@ -0,0 +1,13 @@
|
||||
module github.com/graphmcp/encounter-processor
|
||||
|
||||
go 1.22
|
||||
|
||||
require (
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0
|
||||
github.com/redis/go-redis/v9 v9.5.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
)
|
||||
12
workers/encounter-processor/go.sum
Normal file
12
workers/encounter-processor/go.sum
Normal file
@@ -0,0 +1,12 @@
|
||||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
||||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
||||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0 h1:XnoAi6g6XRkX+wxWa3yM+f7PT2VUkGQfBGtGuJL4fsM=
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k=
|
||||
github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8=
|
||||
github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
|
||||
530
workers/encounter-processor/main.go
Normal file
530
workers/encounter-processor/main.go
Normal file
@@ -0,0 +1,530 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/neo4j/neo4j-go-driver/v5/neo4j"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
var httpClient = &http.Client{Timeout: 30 * time.Second}
|
||||
|
||||
// ── Config ────────────────────────────────────────────────────────────────────
|
||||
|
||||
type Config struct {
|
||||
RedisURL string
|
||||
Stream string
|
||||
Group string
|
||||
Consumer string
|
||||
Neo4jURL string
|
||||
Neo4jUser string
|
||||
Neo4jPass string
|
||||
LLMURL string
|
||||
LLMModel string
|
||||
}
|
||||
|
||||
func configFromEnv() Config {
|
||||
return Config{
|
||||
RedisURL: getEnv("REDIS_URL", "redis://redis:6379"),
|
||||
Stream: getEnv("REDIS_STREAM", "raw.encounters"),
|
||||
Group: getEnv("REDIS_GROUP", "encounter-processing"),
|
||||
Consumer: getEnv("CONSUMER_NAME", "encounter-processor-1"),
|
||||
Neo4jURL: getEnv("NEO4J_URL", "bolt://neo4j:7687"),
|
||||
Neo4jUser: getEnv("NEO4J_USER", "neo4j"),
|
||||
Neo4jPass: getEnv("NEO4J_PASSWORD", "changeme"),
|
||||
LLMURL: getEnv("LLM_URL", "http://ollama-cpu:11435"),
|
||||
LLMModel: getEnv("LLM_MODEL", "qwen2.5:3b"),
|
||||
}
|
||||
}
|
||||
|
||||
// ── Context Logger & Entity Normalizer ────────────────────────────────────────
|
||||
|
||||
type contextKey string
|
||||
const loggerKey contextKey = "logger"
|
||||
|
||||
func contextWithLogger(ctx context.Context, l *slog.Logger) context.Context {
|
||||
return context.WithValue(ctx, loggerKey, l)
|
||||
}
|
||||
|
||||
func loggerFromContext(ctx context.Context) *slog.Logger {
|
||||
if l, ok := ctx.Value(loggerKey).(*slog.Logger); ok {
|
||||
return l
|
||||
}
|
||||
return slog.Default()
|
||||
}
|
||||
|
||||
func normalizeEntityType(t string) (string, bool) {
|
||||
switch strings.ToLower(strings.TrimSpace(t)) {
|
||||
case "person", "people", "npc", "deity", "character":
|
||||
return "Person", true
|
||||
case "location", "locations", "place", "dungeon", "city", "region", "landmark":
|
||||
return "Location", true
|
||||
case "event", "events", "battle", "ceremony", "occurrence":
|
||||
return "Event", true
|
||||
case "faction", "factions", "guild", "kingdom", "order", "group":
|
||||
return "Faction", true
|
||||
case "item", "items", "weapon", "artifact", "magical item":
|
||||
return "Item", true
|
||||
case "creature", "creatures", "monster", "beast":
|
||||
return "Creature", true
|
||||
default:
|
||||
return "", false
|
||||
}
|
||||
}
|
||||
|
||||
// ── System prompt ─────────────────────────────────────────────────────────────
|
||||
|
||||
const encounterSystemPrompt = `You are a D&D entity extraction engine. Given an encounter summary, extract named entities from the game world that were discussed, discovered, or involved.
|
||||
|
||||
Return ONLY valid JSON in this exact shape, no other text:
|
||||
{
|
||||
"entities": [
|
||||
{"name": "Iron Council", "type": "Faction"},
|
||||
{"name": "Mardsville", "type": "Location"}
|
||||
],
|
||||
"relations": []
|
||||
}
|
||||
|
||||
Entity types (use exactly these labels):
|
||||
Person — a named character, NPC, or deity
|
||||
Location — a named place, dungeon, city, region, or landmark
|
||||
Event — a named battle, ceremony, or significant occurrence
|
||||
Faction — a named guild, kingdom, order, or group
|
||||
Item — a named weapon, artifact, or magical item
|
||||
Creature — a named or typed monster or beast
|
||||
|
||||
Rules:
|
||||
- Only extract entities explicitly named in the summary.
|
||||
- Return {"entities": [], "relations": []} if no named entities are found.
|
||||
- Do not invent names not present in the text.`
|
||||
|
||||
// ── LLM entity extraction ─────────────────────────────────────────────────────
|
||||
|
||||
type chatMessage struct {
|
||||
Role string `json:"role"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
type chatRequest struct {
|
||||
Model string `json:"model"`
|
||||
Messages []chatMessage `json:"messages"`
|
||||
Stream bool `json:"stream"`
|
||||
}
|
||||
|
||||
type chatResponse struct {
|
||||
Choices []struct {
|
||||
Message struct {
|
||||
Content string `json:"content"`
|
||||
} `json:"message"`
|
||||
} `json:"choices"`
|
||||
}
|
||||
|
||||
type Entity struct {
|
||||
Name string `json:"name"`
|
||||
Type string `json:"type"`
|
||||
}
|
||||
|
||||
type ExtractionResult struct {
|
||||
Entities []Entity `json:"entities"`
|
||||
}
|
||||
|
||||
func extractEntities(ctx context.Context, cfg Config, summary string) (*ExtractionResult, error) {
|
||||
logger := loggerFromContext(ctx)
|
||||
payload := chatRequest{
|
||||
Model: cfg.LLMModel,
|
||||
Messages: []chatMessage{
|
||||
{Role: "system", Content: encounterSystemPrompt},
|
||||
{Role: "user", Content: summary},
|
||||
},
|
||||
Stream: false,
|
||||
}
|
||||
|
||||
body, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("marshal extract request: %w", err)
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost,
|
||||
cfg.LLMURL+"/v1/chat/completions", bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("create extract HTTP request: %w", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
||||
resp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("execute extract HTTP request: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var cr chatResponse
|
||||
if err := json.NewDecoder(resp.Body).Decode(&cr); err != nil {
|
||||
return nil, fmt.Errorf("decode extract response: %w", err)
|
||||
}
|
||||
if len(cr.Choices) == 0 {
|
||||
return nil, fmt.Errorf("empty LLM response")
|
||||
}
|
||||
|
||||
raw := cr.Choices[0].Message.Content
|
||||
raw = strings.TrimPrefix(strings.TrimSpace(raw), "```json")
|
||||
raw = strings.TrimPrefix(raw, "```")
|
||||
raw = strings.TrimSuffix(raw, "```")
|
||||
raw = strings.TrimSpace(raw)
|
||||
|
||||
var result ExtractionResult
|
||||
if err := json.Unmarshal([]byte(raw), &result); err != nil {
|
||||
logger.Warn("LLM returned non-JSON", "err", err, "raw", cr.Choices[0].Message.Content)
|
||||
return &ExtractionResult{}, nil
|
||||
}
|
||||
return &result, nil
|
||||
}
|
||||
|
||||
// ── Neo4j write ───────────────────────────────────────────────────────────────
|
||||
|
||||
const mergeEncounter = `
|
||||
MERGE (enc:Encounter {id: $id})
|
||||
ON CREATE SET
|
||||
enc.title = $title,
|
||||
enc.type = $type,
|
||||
enc.location_name = $location,
|
||||
enc.timestamp = $timestamp,
|
||||
enc.summary = $summary
|
||||
`
|
||||
|
||||
// resolveEntityQuery finds a canonical lore entity by exact name or alias.
|
||||
// Returns the canonical name if a lore-verified match exists.
|
||||
const resolveEntityQuery = `
|
||||
MATCH (e)
|
||||
WHERE (e.name = $name OR $name IN coalesce(e.aliases, []))
|
||||
AND e.lore_verified = true
|
||||
AND any(lbl IN labels(e) WHERE lbl IN ['Person','Location','Faction','Item','Creature','Event'])
|
||||
RETURN e.name AS canonical LIMIT 1
|
||||
`
|
||||
|
||||
// resolveEntity looks up a canonical entity by name or alias.
|
||||
// Returns the canonical name on a hit, empty string on a miss.
|
||||
func resolveEntity(ctx context.Context, session neo4j.SessionWithContext, name string) string {
|
||||
result, err := session.ExecuteRead(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
res, err := tx.Run(ctx, resolveEntityQuery, map[string]any{"name": name})
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if res.Next(ctx) {
|
||||
v, ok := res.Record().Get("canonical")
|
||||
if ok {
|
||||
if s, ok := v.(string); ok {
|
||||
return s, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
return "", res.Err()
|
||||
})
|
||||
if err != nil || result == nil {
|
||||
return ""
|
||||
}
|
||||
s, ok := result.(string)
|
||||
if !ok {
|
||||
return ""
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
// parseParticipants splits a comma-separated participant string and trims each name.
|
||||
func parseParticipants(s string) []string {
|
||||
var out []string
|
||||
for _, name := range strings.Split(s, ",") {
|
||||
if name = strings.TrimSpace(name); name != "" {
|
||||
out = append(out, name)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
const mergeWitnessedCanonical = `
|
||||
MATCH (e {name: $canonical})
|
||||
MERGE (enc:Encounter {id: $encID})
|
||||
MERGE (e)-[w:WITNESSED]->(enc)
|
||||
ON CREATE SET w.at = $timestamp
|
||||
`
|
||||
|
||||
const mergeWitnessedProvisional = `
|
||||
MERGE (p:Person {name: $name})
|
||||
ON CREATE SET p.lore_verified = false, p.source = "encounter"
|
||||
MERGE (enc:Encounter {id: $encID})
|
||||
MERGE (p)-[w:WITNESSED]->(enc)
|
||||
ON CREATE SET w.at = $timestamp
|
||||
`
|
||||
|
||||
const mergeLocationCanonical = `
|
||||
MATCH (loc {name: $canonical})
|
||||
MATCH (enc:Encounter {id: $encID})
|
||||
MERGE (enc)-[:OCCURRED_AT]->(loc)
|
||||
`
|
||||
|
||||
const mergeLocationProvisional = `
|
||||
MERGE (loc:Location {name: $location})
|
||||
ON CREATE SET loc.lore_verified = false, loc.source = "encounter"
|
||||
MATCH (enc:Encounter {id: $encID})
|
||||
MERGE (enc)-[:OCCURRED_AT]->(loc)
|
||||
`
|
||||
|
||||
// mergeEncounterEntities links LLM-extracted entities to the encounter via FEATURED.
|
||||
// apoc.create.addLabels stamps the correct type label (Person, Location, etc.)
|
||||
// The WHERE guard excludes infrastructure node types that also carry a name property
|
||||
// (e.g. Topic) from being accidentally matched and re-labelled.
|
||||
const mergeEncounterEntities = `
|
||||
MATCH (enc:Encounter {id: $encID})
|
||||
WITH enc
|
||||
UNWIND $entities AS ent
|
||||
MERGE (e {name: ent.name})
|
||||
ON CREATE SET e.type = ent.type, e.source = "encounter", e.lore_verified = false
|
||||
WITH enc, e, ent
|
||||
WHERE NOT (e:LoreDocument OR e:LoreChunk OR e:Chunk OR e:Message OR e:Encounter)
|
||||
CALL apoc.create.addLabels(e, [ent.type]) YIELD node
|
||||
MERGE (enc)-[:FEATURED]->(node)
|
||||
`
|
||||
|
||||
func writeToGraph(ctx context.Context, session neo4j.SessionWithContext,
|
||||
encID, title, encType, location, timestamp, summary string,
|
||||
participants []string, entities []map[string]any) error {
|
||||
|
||||
logger := loggerFromContext(ctx)
|
||||
|
||||
// 1. Create Encounter node
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeEncounter, map[string]any{
|
||||
"id": encID, "title": title, "type": encType,
|
||||
"location": location, "timestamp": timestamp, "summary": summary,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("merge encounter: %w", err)
|
||||
}
|
||||
|
||||
// 2. Link location — resolve to canonical lore entity if possible
|
||||
if strings.TrimSpace(location) != "" {
|
||||
canonical := resolveEntity(ctx, session, location)
|
||||
_, err = session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
if canonical != "" {
|
||||
_, err := tx.Run(ctx, mergeLocationCanonical, map[string]any{
|
||||
"canonical": canonical, "encID": encID,
|
||||
})
|
||||
return nil, err
|
||||
}
|
||||
_, err := tx.Run(ctx, mergeLocationProvisional, map[string]any{
|
||||
"location": location, "encID": encID,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
logger.Warn("merge encounter location failed", "enc_id", encID, "location", location, "err", err)
|
||||
} else if canonical != "" {
|
||||
logger.Info("location resolved to canonical", "raw", location, "canonical", canonical)
|
||||
} else {
|
||||
logger.Info("location created as provisional", "location", location)
|
||||
}
|
||||
}
|
||||
|
||||
// 3. WITNESSED edges — resolve each participant to canonical lore entity
|
||||
for _, name := range participants {
|
||||
if name == "" {
|
||||
continue
|
||||
}
|
||||
canonical := resolveEntity(ctx, session, name)
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
if canonical != "" {
|
||||
_, err := tx.Run(ctx, mergeWitnessedCanonical, map[string]any{
|
||||
"canonical": canonical, "encID": encID, "timestamp": timestamp,
|
||||
})
|
||||
return nil, err
|
||||
}
|
||||
_, err := tx.Run(ctx, mergeWitnessedProvisional, map[string]any{
|
||||
"name": name, "encID": encID, "timestamp": timestamp,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
logger.Warn("merge participant failed", "name", name, "enc_id", encID, "err", err)
|
||||
} else if canonical != "" {
|
||||
logger.Info("participant resolved to canonical", "raw", name, "canonical", canonical)
|
||||
} else {
|
||||
logger.Info("participant created as provisional", "name", name)
|
||||
}
|
||||
}
|
||||
|
||||
// 4. FEATURED edges for LLM-extracted entities
|
||||
if len(entities) > 0 {
|
||||
_, err = session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeEncounterEntities, map[string]any{
|
||||
"encID": encID, "entities": entities,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
logger.Warn("merge encounter entities failed", "enc_id", encID, "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── Main ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
func main() {
|
||||
cfg := configFromEnv()
|
||||
logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
|
||||
slog.SetDefault(logger)
|
||||
ctx := context.Background()
|
||||
ctx = contextWithLogger(ctx, logger)
|
||||
|
||||
rOpts, err := redis.ParseURL(cfg.RedisURL)
|
||||
if err != nil {
|
||||
logger.Error("invalid redis URL", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
rdb := redis.NewClient(rOpts)
|
||||
if err := rdb.XGroupCreateMkStream(ctx, cfg.Stream, cfg.Group, "0").Err(); err != nil {
|
||||
if !strings.Contains(err.Error(), "BUSYGROUP") {
|
||||
logger.Warn("failed to create redis stream group", "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
driver, err := neo4j.NewDriverWithContext(cfg.Neo4jURL,
|
||||
neo4j.BasicAuth(cfg.Neo4jUser, cfg.Neo4jPass, ""))
|
||||
if err != nil {
|
||||
logger.Error("neo4j driver error", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer driver.Close(ctx)
|
||||
|
||||
logger.Info("encounter-processor started", "stream", cfg.Stream, "group", cfg.Group)
|
||||
|
||||
// Reclaim any messages delivered but not ACK'd before last shutdown.
|
||||
// Bounded to maxRecoveryPasses so a persistently failing message
|
||||
// (e.g. LLM not yet ready) does not block the live loop on startup.
|
||||
const maxRecoveryPasses = 5
|
||||
for pass := 0; pass < maxRecoveryPasses; pass++ {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.Stream, "0"},
|
||||
Count: 5,
|
||||
}).Result()
|
||||
if err != nil || len(results) == 0 || len(results[0].Messages) == 0 {
|
||||
break
|
||||
}
|
||||
for _, msg := range results[0].Messages {
|
||||
logger.Info("reprocessing pending message", "id", msg.ID)
|
||||
if err := processMessage(ctx, cfg, driver, msg); err != nil {
|
||||
logger.Error("encounter processing failed (pending)", "id", msg.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
if err := rdb.XAck(ctx, cfg.Stream, cfg.Group, msg.ID).Err(); err != nil {
|
||||
logger.Error("failed to acknowledge pending message", "id", msg.ID, "err", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.Stream, ">"},
|
||||
Count: 5,
|
||||
Block: 5 * time.Second,
|
||||
}).Result()
|
||||
|
||||
if err == redis.Nil {
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
logger.Error("redis read error", "err", err)
|
||||
time.Sleep(2 * time.Second)
|
||||
continue
|
||||
}
|
||||
|
||||
for _, stream := range results {
|
||||
for _, msg := range stream.Messages {
|
||||
if err := processMessage(ctx, cfg, driver, msg); err != nil {
|
||||
logger.Error("encounter processing failed", "id", msg.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
if err := rdb.XAck(ctx, cfg.Stream, cfg.Group, msg.ID).Err(); err != nil {
|
||||
logger.Error("failed to acknowledge message", "id", msg.ID, "err", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func processMessage(ctx context.Context, cfg Config, driver neo4j.DriverWithContext,
|
||||
msg redis.XMessage) error {
|
||||
|
||||
logger := loggerFromContext(ctx)
|
||||
|
||||
vals := msg.Values
|
||||
encID := strVal(vals, "id", msg.ID)
|
||||
title := strVal(vals, "title", "Unnamed Encounter")
|
||||
encType := strVal(vals, "type", "conversation")
|
||||
location := strVal(vals, "location", "")
|
||||
participantStr := strVal(vals, "participants", "")
|
||||
summary := strVal(vals, "summary", "")
|
||||
timestamp := strVal(vals, "timestamp", time.Now().UTC().Format(time.RFC3339))
|
||||
|
||||
participants := parseParticipants(participantStr)
|
||||
|
||||
// LLM extraction on summary → FEATURED entity list
|
||||
var entities []map[string]any
|
||||
if strings.TrimSpace(summary) != "" {
|
||||
result, err := extractEntities(ctx, cfg, summary)
|
||||
if err != nil {
|
||||
logger.Warn("entity extraction failed", "enc_id", encID, "err", err)
|
||||
} else {
|
||||
for _, e := range result.Entities {
|
||||
if normType, ok := normalizeEntityType(e.Type); ok {
|
||||
entities = append(entities, map[string]any{"name": e.Name, "type": normType})
|
||||
} else {
|
||||
logger.Warn("skipping unsupported entity type", "enc_id", encID, "name", e.Name, "type", e.Type)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
session := driver.NewSession(ctx, neo4j.SessionConfig{})
|
||||
defer session.Close(ctx)
|
||||
|
||||
if err := writeToGraph(ctx, session, encID, title, encType, location,
|
||||
timestamp, summary, participants, entities); err != nil {
|
||||
return fmt.Errorf("write encounter to graph: %w", err)
|
||||
}
|
||||
|
||||
logger.Info("processed encounter", "id", encID, "title", title,
|
||||
"participants", participantStr, "featured_entities", len(entities))
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── Helpers ───────────────────────────────────────────────────────────────────
|
||||
|
||||
func getEnv(key, fallback string) string {
|
||||
if v := os.Getenv(key); v != "" {
|
||||
return v
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func strVal(m map[string]any, key, fallback string) string {
|
||||
if v, ok := m[key]; ok {
|
||||
if s, ok := v.(string); ok {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
97
workers/encounter-processor/main_test.go
Normal file
97
workers/encounter-processor/main_test.go
Normal file
@@ -0,0 +1,97 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// ── parseParticipants ─────────────────────────────────────────────────────────
|
||||
|
||||
func TestParseParticipants(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
want []string
|
||||
}{
|
||||
{
|
||||
name: "three clean names",
|
||||
input: "Alice, Bob, Charlie",
|
||||
want: []string{"Alice", "Bob", "Charlie"},
|
||||
},
|
||||
{
|
||||
name: "extra whitespace is trimmed",
|
||||
input: " Alice , Bob ",
|
||||
want: []string{"Alice", "Bob"},
|
||||
},
|
||||
{
|
||||
name: "single participant",
|
||||
input: "Gromm The Timeless",
|
||||
want: []string{"Gromm The Timeless"},
|
||||
},
|
||||
{
|
||||
name: "empty string returns empty slice",
|
||||
input: "",
|
||||
want: nil,
|
||||
},
|
||||
{
|
||||
name: "empty segments are dropped",
|
||||
input: "Alice,,Bob",
|
||||
want: []string{"Alice", "Bob"},
|
||||
},
|
||||
{
|
||||
name: "whitespace-only segment is dropped",
|
||||
input: "Alice, ,Bob",
|
||||
want: []string{"Alice", "Bob"},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := parseParticipants(tt.input)
|
||||
if len(got) != len(tt.want) {
|
||||
t.Fatalf("parseParticipants(%q) = %v, want %v", tt.input, got, tt.want)
|
||||
}
|
||||
for i, name := range got {
|
||||
if name != tt.want[i] {
|
||||
t.Errorf("got[%d] = %q, want %q", i, name, tt.want[i])
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// ── Cypher constant integrity ─────────────────────────────────────────────────
|
||||
|
||||
func TestResolveEntityQueryShape(t *testing.T) {
|
||||
if !strings.Contains(resolveEntityQuery, "$name") {
|
||||
t.Error("resolveEntityQuery must reference $name parameter")
|
||||
}
|
||||
if !strings.Contains(resolveEntityQuery, "aliases") {
|
||||
t.Error("resolveEntityQuery must check aliases array")
|
||||
}
|
||||
if !strings.Contains(resolveEntityQuery, "lore_verified") {
|
||||
t.Error("resolveEntityQuery must filter on lore_verified")
|
||||
}
|
||||
if !strings.Contains(resolveEntityQuery, "LIMIT 1") {
|
||||
t.Error("resolveEntityQuery must return at most one result")
|
||||
}
|
||||
}
|
||||
|
||||
func TestProvisionalCypherSetsFlag(t *testing.T) {
|
||||
if !strings.Contains(mergeWitnessedProvisional, "lore_verified") {
|
||||
t.Error("mergeWitnessedProvisional must set lore_verified flag")
|
||||
}
|
||||
if !strings.Contains(mergeLocationProvisional, "lore_verified") {
|
||||
t.Error("mergeLocationProvisional must set lore_verified flag")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCanonicalCypherUsesMatchNotMerge(t *testing.T) {
|
||||
// Canonical writes must MATCH (not MERGE) so they fail loudly if the
|
||||
// canonical node was somehow deleted, rather than silently creating a dup.
|
||||
if !strings.HasPrefix(strings.TrimSpace(mergeWitnessedCanonical), "MATCH") {
|
||||
t.Error("mergeWitnessedCanonical should start with MATCH to avoid silent creation")
|
||||
}
|
||||
if !strings.HasPrefix(strings.TrimSpace(mergeLocationCanonical), "MATCH") {
|
||||
t.Error("mergeLocationCanonical should start with MATCH to avoid silent creation")
|
||||
}
|
||||
}
|
||||
13
workers/entity-extractor/Dockerfile
Normal file
13
workers/entity-extractor/Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
WORKDIR /app
|
||||
RUN apk --no-cache add git ca-certificates
|
||||
COPY go.mod ./
|
||||
COPY main.go ./
|
||||
RUN go mod tidy
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o entity-extractor .
|
||||
|
||||
FROM alpine:3.19
|
||||
RUN apk --no-cache add ca-certificates curl
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/entity-extractor .
|
||||
ENTRYPOINT ["./entity-extractor"]
|
||||
8
workers/entity-extractor/go.mod
Normal file
8
workers/entity-extractor/go.mod
Normal file
@@ -0,0 +1,8 @@
|
||||
module github.com/graphmcp/entity-extractor
|
||||
|
||||
go 1.22
|
||||
|
||||
require (
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0
|
||||
github.com/redis/go-redis/v9 v9.5.1
|
||||
)
|
||||
567
workers/entity-extractor/main.go
Normal file
567
workers/entity-extractor/main.go
Normal file
@@ -0,0 +1,567 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/neo4j/neo4j-go-driver/v5/neo4j"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
var httpClient = &http.Client{Timeout: 30 * time.Second}
|
||||
|
||||
// ── Config ────────────────────────────────────────────────────────────────────
|
||||
|
||||
type Config struct {
|
||||
RedisURL string
|
||||
Stream string
|
||||
Group string
|
||||
Consumer string
|
||||
Neo4jURL string
|
||||
Neo4jUser string
|
||||
Neo4jPass string
|
||||
LLMURL string
|
||||
LLMModel string
|
||||
PromptFile string // path to a text file; overrides the default system prompt if set
|
||||
SupersedeRelations string // comma-separated relation types that supersede prior edges from the same source, e.g. "PREFERS,LIKES"
|
||||
}
|
||||
|
||||
func configFromEnv() Config {
|
||||
return Config{
|
||||
RedisURL: getEnv("REDIS_URL", "redis://redis:6379"),
|
||||
Stream: getEnv("REDIS_STREAM", "raw.messages"),
|
||||
Group: getEnv("REDIS_GROUP", "extraction"),
|
||||
Consumer: getEnv("CONSUMER_NAME", "entity-extractor-1"),
|
||||
Neo4jURL: getEnv("NEO4J_URL", "bolt://neo4j:7687"),
|
||||
Neo4jUser: getEnv("NEO4J_USER", "neo4j"),
|
||||
Neo4jPass: getEnv("NEO4J_PASSWORD", "changeme"),
|
||||
LLMURL: getEnv("LLM_URL", "http://ollama-cpu:11435"),
|
||||
LLMModel: getEnv("LLM_MODEL", "qwen2.5:3b"),
|
||||
PromptFile: getEnv("PROMPT_FILE", ""),
|
||||
SupersedeRelations: getEnv("SUPERSEDE_RELATIONS", "ALLIED_WITH,ENEMY_OF"),
|
||||
}
|
||||
}
|
||||
|
||||
// parseRelationSet parses a comma-separated list of relation type names into a
|
||||
// set for O(1) lookup.
|
||||
func parseRelationSet(s string) map[string]bool {
|
||||
set := map[string]bool{}
|
||||
for _, v := range strings.Split(s, ",") {
|
||||
v = strings.TrimSpace(strings.ToUpper(v))
|
||||
if v != "" {
|
||||
set[v] = true
|
||||
}
|
||||
}
|
||||
return set
|
||||
}
|
||||
|
||||
// ── System prompt ─────────────────────────────────────────────────────────────
|
||||
//
|
||||
// Edit prompt.txt (or set PROMPT_FILE) to retune without recompiling.
|
||||
// The entity/relation types listed here are what the LLM will use —
|
||||
// change them here to change the entire extraction schema.
|
||||
|
||||
const defaultSystemPrompt = `You are a narrative entity extraction engine for a D&D campaign knowledge graph. Given a Discord message and its author, extract named entities from the D&D world and the relationships between them.
|
||||
|
||||
Return ONLY valid JSON in this exact shape, no other text:
|
||||
{
|
||||
"entities": [
|
||||
{"name": "Theron Ashveil", "type": "Person"},
|
||||
{"name": "The Iron Council", "type": "Faction"},
|
||||
{"name": "Thornwall Keep", "type": "Location"},
|
||||
{"name": "Siege of Thornwall", "type": "Event"},
|
||||
{"name": "Sword of Eventide", "type": "Item"}
|
||||
],
|
||||
"relations": [
|
||||
{"from": "Theron Ashveil", "to": "The Iron Council", "rel": "MEMBER_OF"},
|
||||
{"from": "Theron Ashveil", "to": "Siege of Thornwall", "rel": "PARTICIPATED_IN"},
|
||||
{"from": "Siege of Thornwall", "to": "Thornwall Keep", "rel": "OCCURRED_AT"}
|
||||
]
|
||||
}
|
||||
|
||||
Entity types (use exactly these labels):
|
||||
Person — a named character, player character, NPC, deity, or historical figure in the story
|
||||
Location — a named place, dungeon, city, region, landmark, or realm in the game world
|
||||
Event — a named battle, encounter, ceremony, quest milestone, or significant occurrence
|
||||
Faction — a guild, kingdom, order, cult, party, or named group of people
|
||||
Item — a named weapon, artifact, magical item, relic, or significant object
|
||||
Creature — a named or typed monster, beast, or non-person entity (e.g. "Ancient Red Dragon", "The Pale Worm")
|
||||
|
||||
Relation types (use exactly these labels):
|
||||
PARTICIPATED_IN — Person or Faction took part in an Event
|
||||
OCCURRED_AT — Event took place at a Location
|
||||
LOCATED_AT — Person, Faction, or Item is currently at or in a Location
|
||||
RULES — Person or Faction governs or controls a Location or Faction
|
||||
MEMBER_OF — Person belongs to a Faction
|
||||
ALLIED_WITH — Person or Faction is allied with another Person or Faction
|
||||
ENEMY_OF — Person or Faction is opposed to another Person or Faction
|
||||
POSSESSES — Person or Faction holds or owns an Item
|
||||
SEEKS — Person or Faction is actively looking for a Person, Item, or Location
|
||||
KNOWS — two Persons have a relationship or acquaintance
|
||||
RELATED_TO — two entities are connected but no specific relation applies
|
||||
|
||||
Rules:
|
||||
- Always include the message author as a Person entity.
|
||||
- Use proper nouns only — do not extract generic words like "sword" or "city", only named ones.
|
||||
- Normalise names to title case (e.g. "theron" → "Theron Ashveil" if the full name is known from context).
|
||||
- Omit entities or relations you are not confident about.
|
||||
- If the message is out-of-character (e.g. rules questions, scheduling, meta discussion), extract no entities and return {"entities": [], "relations": []}.`
|
||||
|
||||
func loadPrompt(cfg Config) string {
|
||||
if cfg.PromptFile == "" {
|
||||
return defaultSystemPrompt
|
||||
}
|
||||
data, err := os.ReadFile(cfg.PromptFile)
|
||||
if err != nil {
|
||||
slog.Warn("could not read PROMPT_FILE, using default", "file", cfg.PromptFile, "err", err)
|
||||
return defaultSystemPrompt
|
||||
}
|
||||
slog.Info("loaded system prompt from file", "file", cfg.PromptFile)
|
||||
return string(data)
|
||||
}
|
||||
|
||||
// ── LLM entity extraction ─────────────────────────────────────────────────────
|
||||
|
||||
type chatMessage struct {
|
||||
Role string `json:"role"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
type chatRequest struct {
|
||||
Model string `json:"model"`
|
||||
Messages []chatMessage `json:"messages"`
|
||||
Stream bool `json:"stream"`
|
||||
}
|
||||
|
||||
type chatResponse struct {
|
||||
Choices []struct {
|
||||
Message struct {
|
||||
Content string `json:"content"`
|
||||
} `json:"message"`
|
||||
} `json:"choices"`
|
||||
}
|
||||
|
||||
type Entity struct {
|
||||
Name string `json:"name"`
|
||||
Type string `json:"type"`
|
||||
}
|
||||
|
||||
type ExtractedRelation struct {
|
||||
From string `json:"from"`
|
||||
To string `json:"to"`
|
||||
Rel string `json:"rel"`
|
||||
}
|
||||
|
||||
type ExtractionResult struct {
|
||||
Entities []Entity `json:"entities"`
|
||||
Relations []ExtractedRelation `json:"relations"`
|
||||
}
|
||||
|
||||
var trailingCommaRe = regexp.MustCompile(`,\s*([}\]])`)
|
||||
|
||||
func repairJSON(s string) string {
|
||||
return trailingCommaRe.ReplaceAllString(s, "$1")
|
||||
}
|
||||
|
||||
func fixUnicodeEscapes(s string) string {
|
||||
var buf strings.Builder
|
||||
buf.Grow(len(s))
|
||||
for i := 0; i < len(s); {
|
||||
if i+1 < len(s) && s[i] == '\\' && s[i+1] == 'u' {
|
||||
if i+6 <= len(s) && isHexByte(s[i+2]) && isHexByte(s[i+3]) && isHexByte(s[i+4]) && isHexByte(s[i+5]) {
|
||||
buf.WriteString(s[i : i+6])
|
||||
i += 6
|
||||
} else {
|
||||
// Invalid or incomplete \uXXXX — skip the entire 6-char sequence so
|
||||
// the raw hex digits don't get concatenated into entity names.
|
||||
if i+6 <= len(s) {
|
||||
i += 6
|
||||
} else {
|
||||
i += 2
|
||||
}
|
||||
}
|
||||
} else {
|
||||
buf.WriteByte(s[i])
|
||||
i++
|
||||
}
|
||||
}
|
||||
return buf.String()
|
||||
}
|
||||
|
||||
func isHexByte(c byte) bool {
|
||||
return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')
|
||||
}
|
||||
|
||||
func stripFences(s string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
for _, fence := range []string{"```json", "```"} {
|
||||
if strings.HasPrefix(s, fence) {
|
||||
s = s[len(fence):]
|
||||
break
|
||||
}
|
||||
}
|
||||
if idx := strings.LastIndex(s, "```"); idx != -1 {
|
||||
s = s[:idx]
|
||||
}
|
||||
return strings.TrimSpace(s)
|
||||
}
|
||||
|
||||
func salvageEntities(raw string) *ExtractionResult {
|
||||
idx := strings.Index(raw, `"relations"`)
|
||||
if idx < 0 {
|
||||
return nil
|
||||
}
|
||||
truncated := strings.TrimRight(raw[:idx], ", \t\n\r") + `,"relations":[]}`
|
||||
var rr rawExtractionResult
|
||||
if err := json.Unmarshal([]byte(truncated), &rr); err != nil || len(rr.Entities) == 0 {
|
||||
return nil
|
||||
}
|
||||
slog.Warn("salvaged entities only — relations were malformed", "entities", len(rr.Entities))
|
||||
return &ExtractionResult{Entities: rr.Entities}
|
||||
}
|
||||
|
||||
type rawRelation struct {
|
||||
From json.RawMessage `json:"from"`
|
||||
To json.RawMessage `json:"to"`
|
||||
Rel string `json:"rel"`
|
||||
}
|
||||
|
||||
func coerceString(raw json.RawMessage) string {
|
||||
var s string
|
||||
if json.Unmarshal(raw, &s) == nil {
|
||||
return s
|
||||
}
|
||||
var obj struct{ Name string `json:"name"` }
|
||||
if json.Unmarshal(raw, &obj) == nil && obj.Name != "" {
|
||||
return strings.Trim(obj.Name, "*_ ")
|
||||
}
|
||||
var arr []json.RawMessage
|
||||
if json.Unmarshal(raw, &arr) == nil && len(arr) > 0 {
|
||||
return coerceString(arr[0])
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type rawExtractionResult struct {
|
||||
Entities []Entity `json:"entities"`
|
||||
Relations []rawRelation `json:"relations"`
|
||||
}
|
||||
|
||||
func extractEntities(ctx context.Context, cfg Config, systemPrompt, author, content string) (*ExtractionResult, error) {
|
||||
// Give the LLM author context so it can link sentiment to the right Person.
|
||||
userMsg := fmt.Sprintf("Author: %s\nMessage: %s", author, content)
|
||||
|
||||
payload := chatRequest{
|
||||
Model: cfg.LLMModel,
|
||||
Messages: []chatMessage{
|
||||
{Role: "system", Content: systemPrompt},
|
||||
{Role: "user", Content: userMsg},
|
||||
},
|
||||
Stream: false,
|
||||
}
|
||||
|
||||
body, _ := json.Marshal(payload)
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost,
|
||||
cfg.LLMURL+"/v1/chat/completions", bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
||||
resp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var cr chatResponse
|
||||
if err := json.NewDecoder(resp.Body).Decode(&cr); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(cr.Choices) == 0 {
|
||||
return nil, fmt.Errorf("empty LLM response")
|
||||
}
|
||||
|
||||
raw := cr.Choices[0].Message.Content
|
||||
raw = stripFences(raw)
|
||||
raw = fixUnicodeEscapes(raw)
|
||||
raw = repairJSON(raw)
|
||||
|
||||
var rr rawExtractionResult
|
||||
if err := json.Unmarshal([]byte(raw), &rr); err != nil {
|
||||
if result := salvageEntities(raw); result != nil {
|
||||
return result, nil
|
||||
}
|
||||
slog.Warn("LLM returned non-JSON", "raw", cr.Choices[0].Message.Content)
|
||||
return &ExtractionResult{}, nil
|
||||
}
|
||||
|
||||
result := ExtractionResult{Entities: rr.Entities}
|
||||
for _, r := range rr.Relations {
|
||||
from, to := coerceString(r.From), coerceString(r.To)
|
||||
if from != "" && to != "" && r.Rel != "" {
|
||||
result.Relations = append(result.Relations, ExtractedRelation{From: from, To: to, Rel: r.Rel})
|
||||
}
|
||||
}
|
||||
return &result, nil
|
||||
}
|
||||
|
||||
// ── Neo4j write ───────────────────────────────────────────────────────────────
|
||||
|
||||
const mergeEntities = `
|
||||
MERGE (m:Message {id: $msgID})
|
||||
WITH m
|
||||
UNWIND $entities AS ent
|
||||
MERGE (e {name: ent.name})
|
||||
ON CREATE SET e.type = ent.type, e.source = "discord"
|
||||
WITH m, e, ent
|
||||
WHERE NOT (e:LoreDocument OR e:LoreChunk OR e:Chunk OR e:Encounter)
|
||||
CALL apoc.create.addLabels(e, [ent.type]) YIELD node
|
||||
MERGE (m)-[:MENTIONS]->(node)
|
||||
`
|
||||
|
||||
// Links the known author (from the stream field) directly to the message,
|
||||
// independent of whatever the LLM extracted.
|
||||
const mergeAuthor = `
|
||||
MERGE (p:Person {id: $authorID})
|
||||
ON CREATE SET p.name = $authorName
|
||||
MERGE (m:Message {id: $msgID})
|
||||
MERGE (p)-[:POSTED]->(m)
|
||||
`
|
||||
|
||||
// Relations are merged by type only (no identity properties), then stamped
|
||||
// with the message timestamp and id on every write. This means a later
|
||||
// PREFERS edge always carries a newer `since`, so callers can ORDER BY
|
||||
// r.since DESC to get the current state without losing history.
|
||||
const mergeRelation = `
|
||||
MATCH (a {name: $from})
|
||||
MATCH (b {name: $to})
|
||||
WITH a, b
|
||||
CALL apoc.merge.relationship(a, $rel, {}, {}, b) YIELD rel
|
||||
SET rel.since = $timestamp,
|
||||
rel.msg_id = $msgID
|
||||
RETURN rel
|
||||
`
|
||||
|
||||
// For exclusive relation types (e.g. PREFERS), mark all existing outgoing
|
||||
// edges of the same type from the same source as superseded before writing
|
||||
// the new one. type(r) is a built-in Cypher function and can be compared to
|
||||
// a parameter, so no APOC needed here.
|
||||
const supersedeExisting = `
|
||||
MATCH (a {name: $from})-[r]->()
|
||||
WHERE type(r) = $rel
|
||||
AND NOT coalesce(r.superseded, false)
|
||||
SET r.superseded = true,
|
||||
r.superseded_by = $msgID
|
||||
`
|
||||
|
||||
func writeToGraph(ctx context.Context, session neo4j.SessionWithContext,
|
||||
msgID, authorID, authorName, timestamp string,
|
||||
supersedeSet map[string]bool,
|
||||
result *ExtractionResult) error {
|
||||
|
||||
// Always write the author→message link regardless of extraction results.
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeAuthor, map[string]any{
|
||||
"authorID": authorID,
|
||||
"authorName": authorName,
|
||||
"msgID": msgID,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("merge author: %w", err)
|
||||
}
|
||||
|
||||
if len(result.Entities) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
entities := make([]map[string]any, len(result.Entities))
|
||||
for i, e := range result.Entities {
|
||||
entities[i] = map[string]any{"name": e.Name, "type": e.Type}
|
||||
}
|
||||
|
||||
_, err = session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeEntities, map[string]any{
|
||||
"msgID": msgID,
|
||||
"entities": entities,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("merge entities: %w", err)
|
||||
}
|
||||
|
||||
for _, rel := range result.Relations {
|
||||
if supersedeSet[rel.Rel] {
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, supersedeExisting, map[string]any{
|
||||
"from": rel.From,
|
||||
"rel": rel.Rel,
|
||||
"msgID": msgID,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
slog.Warn("supersession failed", "from", rel.From, "rel", rel.Rel, "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeRelation, map[string]any{
|
||||
"from": rel.From,
|
||||
"to": rel.To,
|
||||
"rel": rel.Rel,
|
||||
"timestamp": timestamp,
|
||||
"msgID": msgID,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
slog.Warn("skipped relation", "from", rel.From, "to", rel.To, "err", err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── Main ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
func main() {
|
||||
cfg := configFromEnv()
|
||||
slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
|
||||
|
||||
systemPrompt := loadPrompt(cfg)
|
||||
supersedeSet := parseRelationSet(cfg.SupersedeRelations)
|
||||
slog.Info("supersede-on-write", "relations", cfg.SupersedeRelations)
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
rOpts, err := redis.ParseURL(cfg.RedisURL)
|
||||
if err != nil {
|
||||
slog.Error("invalid redis URL", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
rdb := redis.NewClient(rOpts)
|
||||
rdb.XGroupCreateMkStream(ctx, cfg.Stream, cfg.Group, "0").Err()
|
||||
|
||||
driver, err := neo4j.NewDriverWithContext(cfg.Neo4jURL,
|
||||
neo4j.BasicAuth(cfg.Neo4jUser, cfg.Neo4jPass, ""))
|
||||
if err != nil {
|
||||
slog.Error("neo4j driver error", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer driver.Close(ctx)
|
||||
|
||||
slog.Info("entity-extractor started", "stream", cfg.Stream, "group", cfg.Group)
|
||||
|
||||
// Reclaim any messages delivered but not ACK'd before last shutdown.
|
||||
// Bounded to maxRecoveryPasses so a persistently failing message
|
||||
// (e.g. LLM not yet ready) does not block the live loop on startup.
|
||||
const maxRecoveryPasses = 5
|
||||
for pass := 0; pass < maxRecoveryPasses; pass++ {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.Stream, "0"},
|
||||
Count: 5,
|
||||
}).Result()
|
||||
if err != nil || len(results) == 0 || len(results[0].Messages) == 0 {
|
||||
break
|
||||
}
|
||||
for _, msg := range results[0].Messages {
|
||||
slog.Info("reprocessing pending message", "id", msg.ID)
|
||||
if err := processMessage(ctx, cfg, systemPrompt, supersedeSet, driver, msg); err != nil {
|
||||
slog.Error("extraction failed (pending)", "id", msg.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
rdb.XAck(ctx, cfg.Stream, cfg.Group, msg.ID)
|
||||
}
|
||||
}
|
||||
|
||||
for {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.Stream, ">"},
|
||||
Count: 5,
|
||||
Block: 5 * time.Second,
|
||||
}).Result()
|
||||
|
||||
if err == redis.Nil {
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
slog.Error("redis read error", "err", err)
|
||||
time.Sleep(2 * time.Second)
|
||||
continue
|
||||
}
|
||||
|
||||
for _, stream := range results {
|
||||
for _, msg := range stream.Messages {
|
||||
if err := processMessage(ctx, cfg, systemPrompt, supersedeSet, driver, msg); err != nil {
|
||||
slog.Error("extraction failed", "id", msg.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
rdb.XAck(ctx, cfg.Stream, cfg.Group, msg.ID)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func processMessage(ctx context.Context, cfg Config, systemPrompt string,
|
||||
supersedeSet map[string]bool, driver neo4j.DriverWithContext, msg redis.XMessage) error {
|
||||
|
||||
vals := msg.Values
|
||||
msgID := strVal(vals, "id", msg.ID)
|
||||
content := strVal(vals, "content", "")
|
||||
author := strVal(vals, "author", "unknown")
|
||||
authorID := strVal(vals, "author_id", "")
|
||||
timestamp := strVal(vals, "timestamp", "")
|
||||
|
||||
if content == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
result, err := extractEntities(ctx, cfg, systemPrompt, author, content)
|
||||
if err != nil {
|
||||
return fmt.Errorf("LLM extraction: %w", err)
|
||||
}
|
||||
|
||||
session := driver.NewSession(ctx, neo4j.SessionConfig{})
|
||||
defer session.Close(ctx)
|
||||
|
||||
if err := writeToGraph(ctx, session, msgID, authorID, author, timestamp, supersedeSet, result); err != nil {
|
||||
return fmt.Errorf("write to graph: %w", err)
|
||||
}
|
||||
|
||||
slog.Info("processed message", "id", msgID, "author", author,
|
||||
"entities", len(result.Entities), "relations", len(result.Relations))
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── Helpers ───────────────────────────────────────────────────────────────────
|
||||
|
||||
func getEnv(key, fallback string) string {
|
||||
if v := os.Getenv(key); v != "" {
|
||||
return v
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func strVal(m map[string]any, key, fallback string) string {
|
||||
if v, ok := m[key]; ok {
|
||||
if s, ok := v.(string); ok {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
13
workers/ingestion-worker/Dockerfile
Normal file
13
workers/ingestion-worker/Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
WORKDIR /app
|
||||
RUN apk --no-cache add git ca-certificates
|
||||
COPY go.mod ./
|
||||
COPY main.go ./
|
||||
RUN go mod tidy
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o ingestion-worker .
|
||||
|
||||
FROM alpine:3.19
|
||||
RUN apk --no-cache add ca-certificates curl
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/ingestion-worker .
|
||||
ENTRYPOINT ["./ingestion-worker"]
|
||||
13
workers/ingestion-worker/go.mod
Normal file
13
workers/ingestion-worker/go.mod
Normal file
@@ -0,0 +1,13 @@
|
||||
module github.com/graphmcp/ingestion-worker
|
||||
|
||||
go 1.22
|
||||
|
||||
require (
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0
|
||||
github.com/redis/go-redis/v9 v9.5.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
)
|
||||
12
workers/ingestion-worker/go.sum
Normal file
12
workers/ingestion-worker/go.sum
Normal file
@@ -0,0 +1,12 @@
|
||||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
||||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
||||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0 h1:XnoAi6g6XRkX+wxWa3yM+f7PT2VUkGQfBGtGuJL4fsM=
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k=
|
||||
github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8=
|
||||
github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
|
||||
715
workers/ingestion-worker/main.go
Normal file
715
workers/ingestion-worker/main.go
Normal file
@@ -0,0 +1,715 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/neo4j/neo4j-go-driver/v5/neo4j"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
var httpClient = &http.Client{Timeout: 30 * time.Second}
|
||||
|
||||
// ── Context Logger ───────────────────────────────────────────────────────────
|
||||
|
||||
type contextKey string
|
||||
const loggerKey contextKey = "logger"
|
||||
|
||||
func contextWithLogger(ctx context.Context, l *slog.Logger) context.Context {
|
||||
return context.WithValue(ctx, loggerKey, l)
|
||||
}
|
||||
|
||||
func loggerFromContext(ctx context.Context) *slog.Logger {
|
||||
if l, ok := ctx.Value(loggerKey).(*slog.Logger); ok {
|
||||
return l
|
||||
}
|
||||
return slog.Default()
|
||||
}
|
||||
|
||||
// ── Config ────────────────────────────────────────────────────────────────────
|
||||
|
||||
type Config struct {
|
||||
RedisURL string
|
||||
Stream string
|
||||
Group string
|
||||
Consumer string
|
||||
Neo4jURL string
|
||||
Neo4jUser string
|
||||
Neo4jPass string
|
||||
EmbedURL string
|
||||
EmbedModel string
|
||||
ChunkSize int
|
||||
ChunkOverlap int
|
||||
LogLevel string
|
||||
HTTPPort string
|
||||
LoreStream string
|
||||
EncounterStream string
|
||||
}
|
||||
|
||||
func configFromEnv(logger *slog.Logger) Config {
|
||||
chunkSizeStr := getEnv("CHUNK_SIZE", "512")
|
||||
chunkSize, err := strconv.Atoi(chunkSizeStr)
|
||||
if err != nil {
|
||||
logger.Warn("invalid CHUNK_SIZE, using default", "val", chunkSizeStr, "err", err)
|
||||
chunkSize = 512
|
||||
}
|
||||
chunkOverlapStr := getEnv("CHUNK_OVERLAP", "64")
|
||||
chunkOverlap, err := strconv.Atoi(chunkOverlapStr)
|
||||
if err != nil {
|
||||
logger.Warn("invalid CHUNK_OVERLAP, using default", "val", chunkOverlapStr, "err", err)
|
||||
chunkOverlap = 64
|
||||
}
|
||||
return Config{
|
||||
RedisURL: getEnv("REDIS_URL", "redis://redis:6379"),
|
||||
Stream: getEnv("REDIS_STREAM", "raw.messages"),
|
||||
Group: getEnv("REDIS_GROUP", "ingestion"),
|
||||
Consumer: getEnv("CONSUMER_NAME", "ingestion-worker-1"),
|
||||
Neo4jURL: getEnv("NEO4J_URL", "bolt://neo4j:7687"),
|
||||
Neo4jUser: getEnv("NEO4J_USER", "neo4j"),
|
||||
Neo4jPass: getEnv("NEO4J_PASSWORD", "changeme"),
|
||||
EmbedURL: getEnv("EMBED_URL", "http://ollama-gpu:11434"),
|
||||
EmbedModel: getEnv("EMBED_MODEL", "nomic-embed-text"),
|
||||
ChunkSize: chunkSize,
|
||||
ChunkOverlap: chunkOverlap,
|
||||
LogLevel: getEnv("LOG_LEVEL", "info"),
|
||||
HTTPPort: getEnv("HTTP_PORT", "8080"),
|
||||
LoreStream: getEnv("LORE_STREAM", "raw.lore"),
|
||||
EncounterStream: getEnv("ENCOUNTER_STREAM", "raw.encounters"),
|
||||
}
|
||||
}
|
||||
|
||||
// ── OpenAI-compatible embed ───────────────────────────────────────────────────
|
||||
|
||||
type embedRequest struct {
|
||||
Model string `json:"model"`
|
||||
Input string `json:"input"`
|
||||
}
|
||||
|
||||
type embedResponseItem struct {
|
||||
Embedding []float32 `json:"embedding"`
|
||||
}
|
||||
|
||||
type embedResponse struct {
|
||||
Data []embedResponseItem `json:"data"`
|
||||
}
|
||||
|
||||
func embed(ctx context.Context, cfg Config, text string) ([]float32, error) {
|
||||
body, err := json.Marshal(embedRequest{Model: cfg.EmbedModel, Input: text})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("marshal embed request: %w", err)
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost,
|
||||
cfg.EmbedURL+"/v1/embeddings", bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("create embed HTTP request: %w", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
||||
resp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("execute embed HTTP request: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var er embedResponse
|
||||
if err := json.NewDecoder(resp.Body).Decode(&er); err != nil {
|
||||
return nil, fmt.Errorf("decode embed response: %w", err)
|
||||
}
|
||||
if len(er.Data) == 0 {
|
||||
return nil, fmt.Errorf("empty embedding response")
|
||||
}
|
||||
return er.Data[0].Embedding, nil
|
||||
}
|
||||
|
||||
// ── Chunker ───────────────────────────────────────────────────────────────────
|
||||
|
||||
func chunk(text string, size, overlap int) []string {
|
||||
words := strings.Fields(text)
|
||||
if len(words) == 0 {
|
||||
return nil
|
||||
}
|
||||
var chunks []string
|
||||
for start := 0; start < len(words); start += size - overlap {
|
||||
end := start + size
|
||||
if end > len(words) {
|
||||
end = len(words)
|
||||
}
|
||||
chunks = append(chunks, strings.Join(words[start:end], " "))
|
||||
if end == len(words) {
|
||||
break
|
||||
}
|
||||
}
|
||||
return chunks
|
||||
}
|
||||
|
||||
// ── Markdown parser ───────────────────────────────────────────────────────────
|
||||
|
||||
var (
|
||||
reFrontmatter = regexp.MustCompile(`(?s)^---\n.*?\n---\n?`)
|
||||
reFrontmatterContent = regexp.MustCompile(`(?s)^---\n(.*?)\n---`) // captures body for parsing
|
||||
reCodeBlock = regexp.MustCompile("(?s)```[^`]*```")
|
||||
reImage = regexp.MustCompile(`!\[([^\]]*)\]\([^)]+\)`)
|
||||
reLink = regexp.MustCompile(`\[([^\]]+)\]\([^)]+\)`)
|
||||
reWikiLinkPiped = regexp.MustCompile(`\[\[([^\]|]+)\|([^\]]+)\]\]`) // [[Target|Display]] → Display
|
||||
reWikiLink = regexp.MustCompile(`\[\[([^\]]+)\]\]`) // [[Name]] → Name
|
||||
reHeading = regexp.MustCompile(`(?m)^#{1,6}\s+`)
|
||||
reBoldItalic = regexp.MustCompile(`\*{1,3}([^*]+)\*{1,3}`)
|
||||
reInlineCode = regexp.MustCompile("`[^`]+`")
|
||||
reBlockquote = regexp.MustCompile(`(?m)^>\s?`)
|
||||
reHTMLTag = regexp.MustCompile(`<[^>]+>`)
|
||||
reHorizRule = regexp.MustCompile(`(?m)^[-*_]{3,}\s*$`)
|
||||
)
|
||||
|
||||
// stripMarkdown returns plain text from a markdown document.
|
||||
func stripMarkdown(text string) string {
|
||||
text = reFrontmatter.ReplaceAllString(text, "")
|
||||
text = reCodeBlock.ReplaceAllString(text, "")
|
||||
text = reImage.ReplaceAllString(text, "$1")
|
||||
text = reWikiLinkPiped.ReplaceAllString(text, "$2") // piped first: [[Target|Display]] → Display
|
||||
text = reWikiLink.ReplaceAllString(text, "$1") // simple: [[Name]] → Name
|
||||
text = reLink.ReplaceAllString(text, "$1")
|
||||
text = reHeading.ReplaceAllString(text, "")
|
||||
text = reBoldItalic.ReplaceAllString(text, "$1")
|
||||
text = reInlineCode.ReplaceAllString(text, "")
|
||||
text = reBlockquote.ReplaceAllString(text, "")
|
||||
text = reHTMLTag.ReplaceAllString(text, "")
|
||||
text = reHorizRule.ReplaceAllString(text, "")
|
||||
return strings.TrimSpace(text)
|
||||
}
|
||||
|
||||
// isStub returns true for placeholder documents that have no real content
|
||||
// to extract. Two signals: too few words overall, or dominated by "to be
|
||||
// documented" filler that was left in from template creation.
|
||||
func isStub(content string) bool {
|
||||
if len(strings.Fields(content)) < 30 {
|
||||
return true
|
||||
}
|
||||
return strings.Count(strings.ToLower(content), "to be documented") >= 2
|
||||
}
|
||||
|
||||
// parseFrontmatterAliases extracts the aliases list from Obsidian YAML frontmatter.
|
||||
// Handles both inline form (aliases: ["a", "b"]) and block form:
|
||||
//
|
||||
// aliases:
|
||||
// - a
|
||||
// - b
|
||||
func parseFrontmatterAliases(raw string) []string {
|
||||
match := reFrontmatterContent.FindStringSubmatch(raw)
|
||||
if len(match) < 2 {
|
||||
return nil
|
||||
}
|
||||
|
||||
var inAliases bool
|
||||
var aliases []string
|
||||
|
||||
for _, line := range strings.Split(match[1], "\n") {
|
||||
trimmed := strings.TrimSpace(line)
|
||||
|
||||
if strings.HasPrefix(trimmed, "aliases:") {
|
||||
rest := strings.TrimSpace(strings.TrimPrefix(trimmed, "aliases:"))
|
||||
if strings.HasPrefix(rest, "[") {
|
||||
// Inline form: aliases: ["a", "b"] or aliases: []
|
||||
rest = strings.Trim(rest, "[]")
|
||||
for _, part := range strings.Split(rest, ",") {
|
||||
if a := strings.Trim(strings.TrimSpace(part), `"' `); a != "" {
|
||||
aliases = append(aliases, a)
|
||||
}
|
||||
}
|
||||
return aliases
|
||||
}
|
||||
// Block form — collect following "- item" lines
|
||||
inAliases = true
|
||||
continue
|
||||
}
|
||||
|
||||
if inAliases {
|
||||
if strings.HasPrefix(trimmed, "- ") {
|
||||
if a := strings.Trim(strings.TrimPrefix(trimmed, "- "), `"' `); a != "" {
|
||||
aliases = append(aliases, a)
|
||||
}
|
||||
} else if trimmed != "" {
|
||||
inAliases = false // hit a new key, stop collecting
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return aliases
|
||||
}
|
||||
|
||||
// extractTitle returns the text of the first H1 heading, or fallback.
|
||||
func extractTitle(text, fallback string) string {
|
||||
for _, line := range strings.Split(text, "\n") {
|
||||
line = strings.TrimSpace(line)
|
||||
if strings.HasPrefix(line, "# ") {
|
||||
return strings.TrimPrefix(line, "# ")
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
// slugify converts a string to a URL-safe lowercase slug.
|
||||
func slugify(s string) string {
|
||||
var b strings.Builder
|
||||
for _, r := range strings.ToLower(s) {
|
||||
switch {
|
||||
case r >= 'a' && r <= 'z', r >= '0' && r <= '9':
|
||||
b.WriteRune(r)
|
||||
case r == ' ', r == '-', r == '_':
|
||||
b.WriteRune('-')
|
||||
}
|
||||
}
|
||||
result := b.String()
|
||||
if result == "" {
|
||||
return "doc"
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// ── Neo4j write — messages ────────────────────────────────────────────────────
|
||||
|
||||
const mergeChunk = `
|
||||
MERGE (m:Message {id: $msgID})
|
||||
ON CREATE SET
|
||||
m.content = $content,
|
||||
m.author = $author,
|
||||
m.timestamp = $timestamp,
|
||||
m.source = $source
|
||||
WITH m
|
||||
MERGE (c:Chunk {id: $chunkID})
|
||||
ON CREATE SET
|
||||
c.text = $text,
|
||||
c.embedding = $embedding,
|
||||
c.msgID = $msgID,
|
||||
c.index = $index
|
||||
MERGE (m)-[:HAS_CHUNK]->(c)
|
||||
`
|
||||
|
||||
func writeChunk(ctx context.Context, session neo4j.SessionWithContext,
|
||||
msgID, content, author, timestamp, source, chunkID, text string,
|
||||
index int, embedding []float32) error {
|
||||
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeChunk, map[string]any{
|
||||
"msgID": msgID,
|
||||
"content": content,
|
||||
"author": author,
|
||||
"timestamp": timestamp,
|
||||
"source": source,
|
||||
"chunkID": chunkID,
|
||||
"text": text,
|
||||
"embedding": embedding,
|
||||
"index": index,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("execute write chunk transaction: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── Neo4j write — lore documents ──────────────────────────────────────────────
|
||||
|
||||
const mergeLoreChunk = `
|
||||
MERGE (d:LoreDocument {id: $docID})
|
||||
ON CREATE SET
|
||||
d.title = $title,
|
||||
d.filename = $filename,
|
||||
d.content = $content,
|
||||
d.uploaded_at = $uploadedAt,
|
||||
d.source = "lore"
|
||||
WITH d
|
||||
MERGE (c:LoreChunk {id: $chunkID})
|
||||
ON CREATE SET
|
||||
c.text = $text,
|
||||
c.embedding = $embedding,
|
||||
c.docID = $docID,
|
||||
c.index = $index
|
||||
MERGE (d)-[:HAS_CHUNK]->(c)
|
||||
`
|
||||
|
||||
func writeLoreChunk(ctx context.Context, session neo4j.SessionWithContext,
|
||||
docID, title, filename, content, uploadedAt, chunkID, text string,
|
||||
index int, embedding []float32) error {
|
||||
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeLoreChunk, map[string]any{
|
||||
"docID": docID,
|
||||
"title": title,
|
||||
"filename": filename,
|
||||
"content": content,
|
||||
"uploadedAt": uploadedAt,
|
||||
"chunkID": chunkID,
|
||||
"text": text,
|
||||
"embedding": embedding,
|
||||
"index": index,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("execute write lore chunk transaction: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── HTTP server ───────────────────────────────────────────────────────────────
|
||||
|
||||
type server struct {
|
||||
cfg Config
|
||||
driver neo4j.DriverWithContext
|
||||
rdb *redis.Client
|
||||
logger *slog.Logger
|
||||
}
|
||||
|
||||
func (s *server) handleHealth(w http.ResponseWriter, _ *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Write([]byte(`{"status":"ok"}`)) //nolint:errcheck
|
||||
}
|
||||
|
||||
// handleLoreIngest accepts a multipart form POST with a "file" field containing
|
||||
// a markdown document. It parses the markdown, chunks and embeds the content,
|
||||
// writes LoreDocument + LoreChunk nodes to Neo4j, and publishes a message to
|
||||
// the raw.lore Redis stream for the lore-extractor to process.
|
||||
func (s *server) handleLoreIngest(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
if err := r.ParseMultipartForm(32 << 20); err != nil {
|
||||
s.logger.Error("failed to parse multipart form", "err", err)
|
||||
http.Error(w, "invalid multipart form", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
file, header, err := r.FormFile("file")
|
||||
if err != nil {
|
||||
s.logger.Warn("missing file field in upload request", "err", err)
|
||||
http.Error(w, `missing "file" field`, http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
data, err := io.ReadAll(file)
|
||||
if err != nil {
|
||||
s.logger.Error("failed to read uploaded file", "err", err)
|
||||
http.Error(w, "failed to read file", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
raw := string(data)
|
||||
content := stripMarkdown(raw)
|
||||
|
||||
if strings.TrimSpace(content) == "" {
|
||||
http.Error(w, "document is empty after parsing", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
uploadedAt := time.Now().UTC().Format(time.RFC3339)
|
||||
filename := header.Filename
|
||||
basename := filename
|
||||
if idx := strings.LastIndexByte(basename, '.'); idx != -1 {
|
||||
basename = basename[:idx]
|
||||
}
|
||||
title := extractTitle(raw, basename)
|
||||
|
||||
if isStub(content) {
|
||||
s.logger.Info("skipping stub lore document", "title", title, "filename", filename)
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if err := json.NewEncoder(w).Encode(map[string]any{
|
||||
"skipped": true,
|
||||
"title": title,
|
||||
"reason": "stub — too little content to extract meaningfully",
|
||||
}); err != nil {
|
||||
s.logger.Error("failed to write stub response", "err", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
docID := fmt.Sprintf("lore-%s-%d", slugify(basename), time.Now().UnixMilli())
|
||||
|
||||
session := s.driver.NewSession(r.Context(), neo4j.SessionConfig{})
|
||||
defer session.Close(r.Context())
|
||||
|
||||
chunks := chunk(content, s.cfg.ChunkSize, s.cfg.ChunkOverlap)
|
||||
for i, text := range chunks {
|
||||
vec, err := embed(r.Context(), s.cfg, text)
|
||||
if err != nil {
|
||||
s.logger.Error("embed failed", "doc_id", docID, "chunk", i, "err", err)
|
||||
http.Error(w, "embedding failed", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
chunkID := fmt.Sprintf("%s:chunk:%d", docID, i)
|
||||
if err := writeLoreChunk(r.Context(), session,
|
||||
docID, title, filename, content, uploadedAt,
|
||||
chunkID, text, i, vec); err != nil {
|
||||
s.logger.Error("write lore chunk failed", "doc_id", docID, "chunk", i, "err", err)
|
||||
http.Error(w, "database write failed", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
aliases := parseFrontmatterAliases(raw)
|
||||
aliasesJSON, err := json.Marshal(aliases)
|
||||
if err != nil {
|
||||
s.logger.Error("failed to marshal aliases", "err", err)
|
||||
http.Error(w, "failed to marshal aliases", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if _, err := s.rdb.XAdd(r.Context(), &redis.XAddArgs{
|
||||
Stream: s.cfg.LoreStream,
|
||||
Values: map[string]any{
|
||||
"id": docID,
|
||||
"title": title,
|
||||
"content": content,
|
||||
"filename": filename,
|
||||
"uploaded_at": uploadedAt,
|
||||
"source": "lore",
|
||||
"primary_entity": title, // canonical name = doc title / H1
|
||||
"aliases": string(aliasesJSON),
|
||||
},
|
||||
}).Result(); err != nil {
|
||||
// Document is already in Neo4j — log but don't fail the request.
|
||||
s.logger.Warn("failed to publish to lore stream", "doc_id", docID, "err", err)
|
||||
}
|
||||
|
||||
s.logger.Info("lore document ingested", "doc_id", docID, "title", title, "chunks", len(chunks))
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if err := json.NewEncoder(w).Encode(map[string]any{
|
||||
"doc_id": docID,
|
||||
"title": title,
|
||||
"chunks": len(chunks),
|
||||
}); err != nil {
|
||||
s.logger.Error("failed to write response", "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
// ── HTTP handler — encounter ingest ──────────────────────────────────────────
|
||||
|
||||
type encounterIngestRequest struct {
|
||||
Title string `json:"title"`
|
||||
Type string `json:"type"`
|
||||
Location string `json:"location"`
|
||||
Participants string `json:"participants"` // comma-separated names
|
||||
Summary string `json:"summary"`
|
||||
Timestamp string `json:"timestamp"` // RFC3339, optional
|
||||
}
|
||||
|
||||
func (s *server) handleEncounterIngest(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
var req encounterIngestRequest
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
s.logger.Warn("failed to decode encounter request JSON", "err", err)
|
||||
http.Error(w, "invalid JSON: "+err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(req.Title) == "" {
|
||||
http.Error(w, `"title" is required`, http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
if req.Type == "" {
|
||||
req.Type = "conversation"
|
||||
}
|
||||
if req.Timestamp == "" {
|
||||
req.Timestamp = time.Now().UTC().Format(time.RFC3339)
|
||||
}
|
||||
|
||||
encID := fmt.Sprintf("enc-%s-%d", slugify(req.Title), time.Now().UnixMilli())
|
||||
|
||||
if _, err := s.rdb.XAdd(r.Context(), &redis.XAddArgs{
|
||||
Stream: s.cfg.EncounterStream,
|
||||
Values: map[string]any{
|
||||
"id": encID,
|
||||
"title": req.Title,
|
||||
"type": req.Type,
|
||||
"location": req.Location,
|
||||
"participants": req.Participants,
|
||||
"summary": req.Summary,
|
||||
"timestamp": req.Timestamp,
|
||||
},
|
||||
}).Result(); err != nil {
|
||||
s.logger.Error("publish encounter failed", "enc_id", encID, "err", err)
|
||||
http.Error(w, "stream publish failed", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
s.logger.Info("encounter queued", "enc_id", encID, "title", req.Title)
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if err := json.NewEncoder(w).Encode(map[string]any{
|
||||
"enc_id": encID,
|
||||
"title": req.Title,
|
||||
}); err != nil {
|
||||
s.logger.Error("failed to write encounter ingest response", "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
// ── Main ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
func main() {
|
||||
logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
|
||||
slog.SetDefault(logger)
|
||||
|
||||
cfg := configFromEnv(logger)
|
||||
|
||||
ctx := context.Background()
|
||||
ctx = contextWithLogger(ctx, logger)
|
||||
|
||||
rOpts, err := redis.ParseURL(cfg.RedisURL)
|
||||
if err != nil {
|
||||
logger.Error("invalid redis URL", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
rdb := redis.NewClient(rOpts)
|
||||
|
||||
if err := rdb.XGroupCreateMkStream(ctx, cfg.Stream, cfg.Group, "0").Err(); err != nil {
|
||||
if !strings.Contains(err.Error(), "BUSYGROUP") {
|
||||
logger.Warn("failed to create redis stream group", "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
driver, err := neo4j.NewDriverWithContext(cfg.Neo4jURL,
|
||||
neo4j.BasicAuth(cfg.Neo4jUser, cfg.Neo4jPass, ""))
|
||||
if err != nil {
|
||||
logger.Error("neo4j driver error", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer driver.Close(ctx)
|
||||
|
||||
srv := &server{cfg: cfg, driver: driver, rdb: rdb, logger: logger}
|
||||
|
||||
mux := http.NewServeMux()
|
||||
mux.HandleFunc("/health", srv.handleHealth)
|
||||
mux.HandleFunc("/ingest/lore", srv.handleLoreIngest)
|
||||
mux.HandleFunc("/ingest/encounter", srv.handleEncounterIngest)
|
||||
|
||||
go func() {
|
||||
addr := ":" + cfg.HTTPPort
|
||||
logger.Info("HTTP server listening", "addr", addr)
|
||||
if err := http.ListenAndServe(addr, mux); err != nil {
|
||||
logger.Error("HTTP server error", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}()
|
||||
|
||||
logger.Info("ingestion-worker started",
|
||||
"worker", "ingestion-worker", "stream", cfg.Stream, "group", cfg.Group)
|
||||
|
||||
for {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.Stream, ">"},
|
||||
Count: 10,
|
||||
Block: 5 * time.Second,
|
||||
}).Result()
|
||||
|
||||
if err == redis.Nil {
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
logger.Error("redis read error", "err", err)
|
||||
time.Sleep(2 * time.Second)
|
||||
continue
|
||||
}
|
||||
|
||||
for _, stream := range results {
|
||||
for _, msg := range stream.Messages {
|
||||
start := time.Now()
|
||||
if err := processMessage(ctx, cfg, driver, rdb, msg); err != nil {
|
||||
logger.Error("failed to process message",
|
||||
"worker", "ingestion-worker",
|
||||
"stream", cfg.Stream,
|
||||
"group", cfg.Group,
|
||||
"msg_id", msg.ID,
|
||||
"latency_ms", time.Since(start).Milliseconds(),
|
||||
"err", err)
|
||||
continue
|
||||
}
|
||||
if err := rdb.XAck(ctx, cfg.Stream, cfg.Group, msg.ID).Err(); err != nil {
|
||||
logger.Error("failed to acknowledge message",
|
||||
"worker", "ingestion-worker",
|
||||
"stream", cfg.Stream,
|
||||
"group", cfg.Group,
|
||||
"msg_id", msg.ID, "err", err)
|
||||
}
|
||||
logger.Info("message consumed",
|
||||
"worker", "ingestion-worker",
|
||||
"stream", cfg.Stream,
|
||||
"group", cfg.Group,
|
||||
"msg_id", msg.ID,
|
||||
"latency_ms", time.Since(start).Milliseconds())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func processMessage(ctx context.Context, cfg Config,
|
||||
driver neo4j.DriverWithContext, rdb *redis.Client,
|
||||
msg redis.XMessage) error {
|
||||
|
||||
logger := loggerFromContext(ctx)
|
||||
|
||||
vals := msg.Values
|
||||
msgID := strVal(vals, "id", msg.ID)
|
||||
content := strVal(vals, "content", "")
|
||||
author := strVal(vals, "author", "unknown")
|
||||
timestamp := strVal(vals, "timestamp", time.Now().UTC().Format(time.RFC3339))
|
||||
source := strVal(vals, "source", "message")
|
||||
|
||||
if content == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
chunks := chunk(content, cfg.ChunkSize, cfg.ChunkOverlap)
|
||||
session := driver.NewSession(ctx, neo4j.SessionConfig{})
|
||||
defer session.Close(ctx)
|
||||
|
||||
for i, text := range chunks {
|
||||
vec, err := embed(ctx, cfg, text)
|
||||
if err != nil {
|
||||
return fmt.Errorf("embed chunk %d: %w", i, err)
|
||||
}
|
||||
chunkID := fmt.Sprintf("%s:chunk:%d", msgID, i)
|
||||
if err := writeChunk(ctx, session,
|
||||
msgID, content, author, timestamp, source,
|
||||
chunkID, text, i, vec); err != nil {
|
||||
return fmt.Errorf("write chunk %d: %w", i, err)
|
||||
}
|
||||
}
|
||||
|
||||
logger.Info("ingested message", "id", msgID, "chunks", len(chunks))
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── Helpers ───────────────────────────────────────────────────────────────────
|
||||
|
||||
func getEnv(key, fallback string) string {
|
||||
if v := os.Getenv(key); v != "" {
|
||||
return v
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func strVal(m map[string]any, key, fallback string) string {
|
||||
if v, ok := m[key]; ok {
|
||||
if s, ok := v.(string); ok {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
172
workers/ingestion-worker/main_test.go
Normal file
172
workers/ingestion-worker/main_test.go
Normal file
@@ -0,0 +1,172 @@
|
||||
package main
|
||||
|
||||
import "testing"
|
||||
|
||||
// ── stripMarkdown ─────────────────────────────────────────────────────────────
|
||||
|
||||
func TestStripMarkdownWikiLinks(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
want string
|
||||
}{
|
||||
{
|
||||
name: "simple wiki link becomes plain text",
|
||||
input: "He believes [[Roland Raventhorne]] is dangerous.",
|
||||
want: "He believes Roland Raventhorne is dangerous.",
|
||||
},
|
||||
{
|
||||
name: "piped wiki link uses display text not target",
|
||||
input: "Known as [[Gromm The Timeless|the Timeless]].",
|
||||
want: "Known as the Timeless.",
|
||||
},
|
||||
{
|
||||
name: "multiple wiki links on one line",
|
||||
input: "[[Silas Viper]] works with [[Joron The Crab]].",
|
||||
want: "Silas Viper works with Joron The Crab.",
|
||||
},
|
||||
{
|
||||
name: "piped link with spaces in target and display",
|
||||
input: "Ruler of [[Old Mardonar (Imperium Valerius)|Old Mardonar]].",
|
||||
want: "Ruler of Old Mardonar.",
|
||||
},
|
||||
{
|
||||
name: "standard markdown link is still stripped",
|
||||
input: "[click here](http://example.com)",
|
||||
want: "click here",
|
||||
},
|
||||
{
|
||||
name: "no links passes through unchanged",
|
||||
input: "Plain text with no links.",
|
||||
want: "Plain text with no links.",
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := stripMarkdown(tt.input)
|
||||
if got != tt.want {
|
||||
t.Errorf("got %q, want %q", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestStripMarkdownHeadingsAndFrontmatter(t *testing.T) {
|
||||
input := "---\ntype: npc\naliases: []\n---\n# Gromm The Timeless\nContent here."
|
||||
got := stripMarkdown(input)
|
||||
if got != "Gromm The Timeless\nContent here." {
|
||||
t.Errorf("unexpected result: %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
// ── isStub ────────────────────────────────────────────────────────────────────
|
||||
|
||||
func TestIsStub(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
content string
|
||||
want bool
|
||||
}{
|
||||
{
|
||||
name: "all-placeholder content is a stub",
|
||||
content: "(To be documented) (To be documented) (To be documented)",
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "two or more placeholder sections is a stub",
|
||||
content: `A skilled warrior.
|
||||
Background
|
||||
(To be documented)
|
||||
Goals
|
||||
(To be documented)`,
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "one placeholder section with real content is not a stub",
|
||||
content: `Gromm The Timeless is the oldest dwarf in existence, having survived over twenty
|
||||
thousand years. He leads the Urkin faction with an iron will and strategic mind.
|
||||
His mount is Luxe, a massive obsidian dragon. Secrets: (To be documented)`,
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "rich biography is not a stub",
|
||||
content: `Silas Viper was previously involved with Joron The Crab and Urz'Kull Ironfist in
|
||||
bids to undermine the king of Mardonia, and advance his own sinister plans.
|
||||
He specializes in creating unique biological poisons that he can produce through
|
||||
his tail and secrete during an attack. He is immune to most poisons.`,
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "very short content is a stub regardless of placeholders",
|
||||
content: "A thieving rat master.",
|
||||
want: true,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := isStub(tt.content)
|
||||
if got != tt.want {
|
||||
t.Errorf("isStub() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// ── parseFrontmatterAliases ───────────────────────────────────────────────────
|
||||
|
||||
func TestParseFrontmatterAliases(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
want []string
|
||||
}{
|
||||
{
|
||||
name: "empty inline array returns nil",
|
||||
input: "---\ntype: npc\naliases: []\n---\nContent.",
|
||||
want: nil,
|
||||
},
|
||||
{
|
||||
name: "inline array with quoted strings",
|
||||
input: "---\ntype: npc\naliases: [\"the Timeless\", \"Gromm\"]\n---\nContent.",
|
||||
want: []string{"the Timeless", "Gromm"},
|
||||
},
|
||||
{
|
||||
name: "inline array with single alias",
|
||||
input: "---\naliases: [\"Roland\"]\n---",
|
||||
want: []string{"Roland"},
|
||||
},
|
||||
{
|
||||
name: "block-form aliases",
|
||||
input: "---\ntype: npc\naliases:\n - \"the Timeless\"\n - Gromm\n---\nContent.",
|
||||
want: []string{"the Timeless", "Gromm"},
|
||||
},
|
||||
{
|
||||
name: "no frontmatter returns nil",
|
||||
input: "Just some content without frontmatter.",
|
||||
want: nil,
|
||||
},
|
||||
{
|
||||
name: "frontmatter without aliases field returns nil",
|
||||
input: "---\ntype: npc\nportrait: \"\"\n---\nContent.",
|
||||
want: nil,
|
||||
},
|
||||
{
|
||||
name: "aliases field stops at next key in block form",
|
||||
input: "---\naliases:\n - \"the Crab\"\nregion: \"\"\n---\nContent.",
|
||||
want: []string{"the Crab"},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := parseFrontmatterAliases(tt.input)
|
||||
if len(got) != len(tt.want) {
|
||||
t.Fatalf("parseFrontmatterAliases() = %v, want %v", got, tt.want)
|
||||
}
|
||||
for i, a := range got {
|
||||
if a != tt.want[i] {
|
||||
t.Errorf("alias[%d] = %q, want %q", i, a, tt.want[i])
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
13
workers/lore-extractor/Dockerfile
Normal file
13
workers/lore-extractor/Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
WORKDIR /app
|
||||
RUN apk --no-cache add git ca-certificates
|
||||
COPY go.mod ./
|
||||
COPY main.go ./
|
||||
RUN go mod tidy
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o lore-extractor .
|
||||
|
||||
FROM alpine:3.19
|
||||
RUN apk --no-cache add ca-certificates curl
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/lore-extractor .
|
||||
ENTRYPOINT ["./lore-extractor"]
|
||||
13
workers/lore-extractor/go.mod
Normal file
13
workers/lore-extractor/go.mod
Normal file
@@ -0,0 +1,13 @@
|
||||
module github.com/graphmcp/lore-extractor
|
||||
|
||||
go 1.22
|
||||
|
||||
require (
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0
|
||||
github.com/redis/go-redis/v9 v9.5.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
)
|
||||
8
workers/lore-extractor/go.sum
Normal file
8
workers/lore-extractor/go.sum
Normal file
@@ -0,0 +1,8 @@
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0 h1:XnoAi6g6XRkX+wxWa3yM+f7PT2VUkGQfBGtGuJL4fsM=
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k=
|
||||
github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8=
|
||||
github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
|
||||
656
workers/lore-extractor/main.go
Normal file
656
workers/lore-extractor/main.go
Normal file
@@ -0,0 +1,656 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/neo4j/neo4j-go-driver/v5/neo4j"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
var httpClient = &http.Client{Timeout: 30 * time.Second}
|
||||
|
||||
// ── Config ────────────────────────────────────────────────────────────────────
|
||||
|
||||
type Config struct {
|
||||
RedisURL string
|
||||
Stream string
|
||||
Group string
|
||||
Consumer string
|
||||
Neo4jURL string
|
||||
Neo4jUser string
|
||||
Neo4jPass string
|
||||
LLMURL string
|
||||
LLMModel string
|
||||
PromptFile string
|
||||
}
|
||||
|
||||
func configFromEnv() Config {
|
||||
return Config{
|
||||
RedisURL: getEnv("REDIS_URL", "redis://redis:6379"),
|
||||
Stream: getEnv("REDIS_STREAM", "raw.lore"),
|
||||
Group: getEnv("REDIS_GROUP", "lore-extraction"),
|
||||
Consumer: getEnv("CONSUMER_NAME", "lore-extractor-1"),
|
||||
Neo4jURL: getEnv("NEO4J_URL", "bolt://neo4j:7687"),
|
||||
Neo4jUser: getEnv("NEO4J_USER", "neo4j"),
|
||||
Neo4jPass: getEnv("NEO4J_PASSWORD", "changeme"),
|
||||
LLMURL: getEnv("LLM_URL", "http://ollama-cpu:11435"),
|
||||
LLMModel: getEnv("LLM_MODEL", "qwen2.5:3b"),
|
||||
PromptFile: getEnv("PROMPT_FILE", ""),
|
||||
}
|
||||
}
|
||||
|
||||
// ── System prompt ─────────────────────────────────────────────────────────────
|
||||
|
||||
const defaultSystemPrompt = `You are a lore entity extraction engine for a D&D campaign knowledge graph. Given a passage of lore text (a biography, story, history, or worldbuilding document), extract named entities and the relationships between them.
|
||||
|
||||
Return ONLY valid JSON in this exact shape, no other text:
|
||||
{
|
||||
"entities": [
|
||||
{"name": "Theron Ashveil", "type": "Person"},
|
||||
{"name": "The Iron Council", "type": "Faction"},
|
||||
{"name": "Thornwall Keep", "type": "Location"},
|
||||
{"name": "Siege of Thornwall", "type": "Event", "temporal_hint": "Year 340 of the Third Age"},
|
||||
{"name": "Sword of Eventide", "type": "Item"},
|
||||
{"name": "Ancient Red Dragon", "type": "Creature"}
|
||||
],
|
||||
"relations": [
|
||||
{"from": "Theron Ashveil", "to": "The Iron Council", "rel": "MEMBER_OF"},
|
||||
{"from": "Siege of Thornwall", "to": "Thornwall Keep", "rel": "OCCURRED_AT"},
|
||||
{"from": "Theron Ashveil", "to": "Sword of Eventide", "rel": "POSSESSES"}
|
||||
]
|
||||
}
|
||||
|
||||
Entity types (use exactly these labels):
|
||||
Person — a named character, NPC, deity, or historical figure in the lore
|
||||
Location — a named place, dungeon, city, region, landmark, realm, or geographic feature
|
||||
Event — a named historical event, battle, ceremony, meeting, or significant occurrence
|
||||
Faction — a named guild, kingdom, order, cult, party, or group of people
|
||||
Item — a named weapon, artifact, magical item, relic, or significant object
|
||||
Creature — a named or typed monster, beast, or non-person entity (e.g. "Ancient Red Dragon", "The Pale Worm")
|
||||
|
||||
Relation types (use exactly these labels):
|
||||
PARTICIPATED_IN — Person or Faction took part in an Event
|
||||
OCCURRED_AT — Event took place at a Location
|
||||
LOCATED_AT — Person, Faction, Item, or Creature is found at or in a Location
|
||||
RULES — Person or Faction governs or controls a Location or Faction
|
||||
MEMBER_OF — Person belongs to a Faction
|
||||
ALLIED_WITH — Person or Faction is allied with another Person or Faction
|
||||
ENEMY_OF — Person or Faction is opposed to another Person or Faction
|
||||
POSSESSES — Person or Faction holds or owns an Item
|
||||
SEEKS — Person or Faction is actively looking for a Person, Item, or Location
|
||||
KNOWS — two Persons have a relationship or acquaintance
|
||||
PRECEDED — this Event preceded another Event chronologically
|
||||
CREATED_BY — Item or Location was made or founded by a Person or Faction
|
||||
|
||||
Rules:
|
||||
- Only extract entities that are explicitly named in the text.
|
||||
- Choose the most specific relation type that fits; omit a relation rather than guessing.
|
||||
- Omit entities or relations you are not confident about.
|
||||
- Do not invent names or relationships not present in the text.
|
||||
- temporal_hint: for every Event entity this field is REQUIRED. Use the best time information available in the text — a calendar year, a named age, a relative phrase like "shortly after the Fall of Thornwall", or "sometime during the Dusk War". Write "unknown era" only as an absolute last resort. For non-Event entities include temporal_hint only when the text explicitly states when they were active, founded, created, or died.`
|
||||
|
||||
func loadPrompt(cfg Config) string {
|
||||
if cfg.PromptFile == "" {
|
||||
return defaultSystemPrompt
|
||||
}
|
||||
data, err := os.ReadFile(cfg.PromptFile)
|
||||
if err != nil {
|
||||
slog.Warn("could not read PROMPT_FILE, using default", "file", cfg.PromptFile, "err", err)
|
||||
return defaultSystemPrompt
|
||||
}
|
||||
slog.Info("loaded system prompt from file", "file", cfg.PromptFile)
|
||||
return string(data)
|
||||
}
|
||||
|
||||
// ── LLM entity extraction ─────────────────────────────────────────────────────
|
||||
|
||||
type chatMessage struct {
|
||||
Role string `json:"role"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
type chatRequest struct {
|
||||
Model string `json:"model"`
|
||||
Messages []chatMessage `json:"messages"`
|
||||
Stream bool `json:"stream"`
|
||||
}
|
||||
|
||||
type chatResponse struct {
|
||||
Choices []struct {
|
||||
Message struct {
|
||||
Content string `json:"content"`
|
||||
} `json:"message"`
|
||||
} `json:"choices"`
|
||||
}
|
||||
|
||||
type Entity struct {
|
||||
Name string `json:"name"`
|
||||
Type string `json:"type"`
|
||||
TemporalHint string `json:"temporal_hint,omitempty"`
|
||||
}
|
||||
|
||||
type ExtractedRelation struct {
|
||||
From string `json:"from"`
|
||||
To string `json:"to"`
|
||||
Rel string `json:"rel"`
|
||||
}
|
||||
|
||||
type ExtractionResult struct {
|
||||
Entities []Entity `json:"entities"`
|
||||
Relations []ExtractedRelation `json:"relations"`
|
||||
}
|
||||
|
||||
// trailingCommaRe matches commas immediately before a closing brace or bracket.
|
||||
var trailingCommaRe = regexp.MustCompile(`,\s*([}\]])`)
|
||||
|
||||
// repairJSON fixes common LLM JSON mistakes: trailing commas.
|
||||
func repairJSON(s string) string {
|
||||
return trailingCommaRe.ReplaceAllString(s, "$1")
|
||||
}
|
||||
|
||||
// fixUnicodeEscapes removes \uXXXX sequences where the four chars aren't valid hex.
|
||||
// Models sometimes emit \u201g (g is not hex) which makes Go's JSON parser fail.
|
||||
func fixUnicodeEscapes(s string) string {
|
||||
var buf strings.Builder
|
||||
buf.Grow(len(s))
|
||||
for i := 0; i < len(s); {
|
||||
if i+1 < len(s) && s[i] == '\\' && s[i+1] == 'u' {
|
||||
if i+6 <= len(s) && isHexByte(s[i+2]) && isHexByte(s[i+3]) && isHexByte(s[i+4]) && isHexByte(s[i+5]) {
|
||||
buf.WriteString(s[i : i+6])
|
||||
i += 6
|
||||
} else {
|
||||
// Invalid or incomplete \uXXXX — skip the entire 6-char sequence so
|
||||
// the raw hex digits don't get concatenated into entity names.
|
||||
if i+6 <= len(s) {
|
||||
i += 6
|
||||
} else {
|
||||
i += 2
|
||||
}
|
||||
}
|
||||
} else {
|
||||
buf.WriteByte(s[i])
|
||||
i++
|
||||
}
|
||||
}
|
||||
return buf.String()
|
||||
}
|
||||
|
||||
func isHexByte(c byte) bool {
|
||||
return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')
|
||||
}
|
||||
|
||||
// stripFences removes markdown code fences that models often wrap JSON in.
|
||||
func stripFences(s string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
// Remove opening fence (```json or ```)
|
||||
for _, fence := range []string{"```json", "```"} {
|
||||
if strings.HasPrefix(s, fence) {
|
||||
s = s[len(fence):]
|
||||
break
|
||||
}
|
||||
}
|
||||
// Remove closing fence
|
||||
if idx := strings.LastIndex(s, "```"); idx != -1 {
|
||||
s = s[:idx]
|
||||
}
|
||||
return strings.TrimSpace(s)
|
||||
}
|
||||
|
||||
// salvageEntities tries to recover just the entities array when relations are malformed.
|
||||
func salvageEntities(raw string) *ExtractionResult {
|
||||
idx := strings.Index(raw, `"relations"`)
|
||||
if idx < 0 {
|
||||
return nil
|
||||
}
|
||||
truncated := strings.TrimRight(raw[:idx], ", \t\n\r") + `,"relations":[]}`
|
||||
var rr rawExtractionResult
|
||||
if err := json.Unmarshal([]byte(truncated), &rr); err != nil || len(rr.Entities) == 0 {
|
||||
return nil
|
||||
}
|
||||
slog.Warn("salvaged entities only — relations were malformed", "entities", len(rr.Entities))
|
||||
return &ExtractionResult{Entities: rr.Entities}
|
||||
}
|
||||
|
||||
// rawRelation accepts from/to as a string, {"name":"..."} object, or ["..."] array.
|
||||
type rawRelation struct {
|
||||
From json.RawMessage `json:"from"`
|
||||
To json.RawMessage `json:"to"`
|
||||
Rel string `json:"rel"`
|
||||
}
|
||||
|
||||
func coerceString(raw json.RawMessage) string {
|
||||
var s string
|
||||
if json.Unmarshal(raw, &s) == nil {
|
||||
return s
|
||||
}
|
||||
var obj struct{ Name string `json:"name"` }
|
||||
if json.Unmarshal(raw, &obj) == nil && obj.Name != "" {
|
||||
return strings.Trim(obj.Name, "*_ ")
|
||||
}
|
||||
var arr []json.RawMessage
|
||||
if json.Unmarshal(raw, &arr) == nil && len(arr) > 0 {
|
||||
return coerceString(arr[0])
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type rawExtractionResult struct {
|
||||
Entities []Entity `json:"entities"`
|
||||
Relations []rawRelation `json:"relations"`
|
||||
}
|
||||
|
||||
// loadKnownEntities queries the graph for already-established entity names and
|
||||
// returns a formatted hint block. Injecting this into the LLM prompt anchors
|
||||
// extraction to canonical spellings, preventing "the Timeless" vs
|
||||
// "Gromm The Timeless" duplicates and hallucinated location names.
|
||||
func loadKnownEntities(ctx context.Context, driver neo4j.DriverWithContext) string {
|
||||
session := driver.NewSession(ctx, neo4j.SessionConfig{})
|
||||
defer session.Close(ctx)
|
||||
|
||||
result, err := session.ExecuteRead(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
res, err := tx.Run(ctx, `
|
||||
MATCH (d:LoreDocument)-[:FEATURES]->(e)
|
||||
WHERE e.name IS NOT NULL
|
||||
WITH e.name AS name,
|
||||
[l IN labels(e) WHERE l IN ['Person','Location','Faction','Event','Item','Creature']][0] AS etype,
|
||||
count(d) AS mentions
|
||||
WHERE etype IS NOT NULL
|
||||
RETURN name, etype ORDER BY mentions DESC LIMIT 100
|
||||
`, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
byType := map[string][]string{}
|
||||
for res.Next(ctx) {
|
||||
name, _ := res.Record().Get("name")
|
||||
etype, _ := res.Record().Get("etype")
|
||||
n, _ := name.(string)
|
||||
t, _ := etype.(string)
|
||||
if n != "" && t != "" {
|
||||
byType[t] = append(byType[t], n)
|
||||
}
|
||||
}
|
||||
return byType, res.Err()
|
||||
})
|
||||
if err != nil || result == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
byType, ok := result.(map[string][]string)
|
||||
if !ok || len(byType) == 0 {
|
||||
return ""
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
sb.WriteString("\nKnown canonical entity names already in this campaign's graph — use these exact spellings whenever the passage refers to them, even by nickname or title:\n")
|
||||
for _, t := range []string{"Person", "Location", "Faction", "Event", "Item", "Creature"} {
|
||||
if names, ok := byType[t]; ok && len(names) > 0 {
|
||||
sb.WriteString(fmt.Sprintf(" %s: %s\n", t, strings.Join(names, ", ")))
|
||||
}
|
||||
}
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
func extractEntities(ctx context.Context, cfg Config, systemPrompt, title, content, knownEntities string) (*ExtractionResult, error) {
|
||||
userMsg := fmt.Sprintf("Document title: %s\n\nPassage:\n%s", title, content)
|
||||
if knownEntities != "" {
|
||||
userMsg += "\n" + knownEntities
|
||||
}
|
||||
|
||||
payload := chatRequest{
|
||||
Model: cfg.LLMModel,
|
||||
Messages: []chatMessage{
|
||||
{Role: "system", Content: systemPrompt},
|
||||
{Role: "user", Content: userMsg},
|
||||
},
|
||||
Stream: false,
|
||||
}
|
||||
|
||||
body, _ := json.Marshal(payload)
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost,
|
||||
cfg.LLMURL+"/v1/chat/completions", bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
||||
resp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var cr chatResponse
|
||||
if err := json.NewDecoder(resp.Body).Decode(&cr); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(cr.Choices) == 0 {
|
||||
return nil, fmt.Errorf("empty LLM response")
|
||||
}
|
||||
|
||||
raw := cr.Choices[0].Message.Content
|
||||
raw = stripFences(raw)
|
||||
raw = fixUnicodeEscapes(raw)
|
||||
raw = repairJSON(raw)
|
||||
|
||||
var rr rawExtractionResult
|
||||
if err := json.Unmarshal([]byte(raw), &rr); err != nil {
|
||||
// Relations are often malformed; try salvaging just entities.
|
||||
if result := salvageEntities(raw); result != nil {
|
||||
return result, nil
|
||||
}
|
||||
slog.Warn("LLM returned non-JSON", "raw", cr.Choices[0].Message.Content)
|
||||
return &ExtractionResult{}, nil
|
||||
}
|
||||
|
||||
result := ExtractionResult{Entities: rr.Entities}
|
||||
for _, r := range rr.Relations {
|
||||
from, to := coerceString(r.From), coerceString(r.To)
|
||||
if from != "" && to != "" && r.Rel != "" {
|
||||
result.Relations = append(result.Relations, ExtractedRelation{From: from, To: to, Rel: r.Rel})
|
||||
}
|
||||
}
|
||||
return &result, nil
|
||||
}
|
||||
|
||||
// ── Neo4j write ───────────────────────────────────────────────────────────────
|
||||
|
||||
// Links extracted lore entities to the source LoreDocument, stamps temporal_hint
|
||||
// on Event nodes when provided, marks all as lore_verified, and applies the
|
||||
// entity type label via APOC.
|
||||
const mergeLoreEntities = `
|
||||
MERGE (d:LoreDocument {id: $docID})
|
||||
WITH d
|
||||
UNWIND $entities AS ent
|
||||
MERGE (e {name: ent.name})
|
||||
ON CREATE SET e.type = ent.type, e.source = "lore", e.lore_verified = true
|
||||
ON MATCH SET e.lore_verified = true
|
||||
WITH d, e, ent
|
||||
WHERE NOT (e:LoreDocument OR e:LoreChunk OR e:Chunk OR e:Message OR e:Encounter)
|
||||
FOREACH (_ IN CASE WHEN ent.temporal_hint IS NOT NULL AND ent.temporal_hint <> "" THEN [1] ELSE [] END |
|
||||
SET e.temporal_hint = ent.temporal_hint
|
||||
)
|
||||
WITH d, e, ent
|
||||
CALL apoc.create.addLabels(e, [ent.type]) YIELD node
|
||||
MERGE (d)-[:FEATURES]->(node)
|
||||
`
|
||||
|
||||
// applyAliasesCypher sets the aliases array on the primary entity of a lore
|
||||
// document (the entity whose name matches the document title). Also sets
|
||||
// lore_verified in case the entity existed before its lore doc was ingested.
|
||||
const applyAliasesCypher = `
|
||||
MATCH (e)
|
||||
WHERE e.name = $name
|
||||
AND NOT e:LoreDocument AND NOT e:LoreChunk AND NOT e:Chunk
|
||||
SET e.aliases = $aliases, e.lore_verified = true
|
||||
`
|
||||
|
||||
// mergeRelation creates or updates a typed relation between two lore entities.
|
||||
const mergeLoreRelation = `
|
||||
MATCH (a {name: $from})
|
||||
MATCH (b {name: $to})
|
||||
WITH a, b
|
||||
CALL apoc.merge.relationship(a, $rel, {}, {}, b) YIELD rel
|
||||
SET rel.since = $uploadedAt,
|
||||
rel.doc_id = $docID
|
||||
RETURN rel
|
||||
`
|
||||
|
||||
// detectContradictions finds cases where this document's LOCATED_AT or RULES
|
||||
// claims conflict with a prior document's claim about the same entity, and
|
||||
// creates an explicit Contradiction node linking all parties.
|
||||
const detectContradictionsQuery = `
|
||||
MATCH (a)-[r1]->(x)
|
||||
WHERE r1.doc_id = $docID AND type(r1) IN ['LOCATED_AT', 'RULES']
|
||||
WITH a, type(r1) AS predicate, x.name AS claimA, r1.doc_id AS docA
|
||||
MATCH (a)-[r2]->(y)
|
||||
WHERE type(r2) = predicate AND r2.doc_id <> docA AND y.name <> claimA
|
||||
WITH a, predicate, claimA, docA, y.name AS claimB, r2.doc_id AS docB
|
||||
MERGE (contra:Contradiction {
|
||||
subject: a.name,
|
||||
predicate: predicate,
|
||||
claim_a: claimA,
|
||||
doc_a: docA,
|
||||
claim_b: claimB,
|
||||
doc_b: docB
|
||||
})
|
||||
ON CREATE SET contra.detected_at = $detectedAt, contra.flagged = true
|
||||
WITH a, contra
|
||||
MERGE (a)-[:HAS_CONTRADICTION]->(contra)
|
||||
RETURN count(contra) AS total
|
||||
`
|
||||
|
||||
func writeToGraph(ctx context.Context, session neo4j.SessionWithContext,
|
||||
docID, title, uploadedAt string, result *ExtractionResult) error {
|
||||
|
||||
if len(result.Entities) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
entities := make([]map[string]any, len(result.Entities))
|
||||
for i, e := range result.Entities {
|
||||
entities[i] = map[string]any{
|
||||
"name": e.Name,
|
||||
"type": e.Type,
|
||||
"temporal_hint": e.TemporalHint,
|
||||
}
|
||||
}
|
||||
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeLoreEntities, map[string]any{
|
||||
"docID": docID,
|
||||
"entities": entities,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("merge lore entities: %w", err)
|
||||
}
|
||||
|
||||
for _, rel := range result.Relations {
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, mergeLoreRelation, map[string]any{
|
||||
"from": rel.From,
|
||||
"to": rel.To,
|
||||
"rel": rel.Rel,
|
||||
"uploadedAt": uploadedAt,
|
||||
"docID": docID,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
slog.Warn("skipped lore relation", "from", rel.From, "to", rel.To, "rel", rel.Rel, "err", err)
|
||||
}
|
||||
}
|
||||
|
||||
flagContradictions(ctx, session, docID, uploadedAt)
|
||||
return nil
|
||||
}
|
||||
|
||||
func applyDocumentAliases(ctx context.Context, session neo4j.SessionWithContext, primaryEntity string, aliases []string) {
|
||||
if primaryEntity == "" || len(aliases) == 0 {
|
||||
return
|
||||
}
|
||||
_, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
_, err := tx.Run(ctx, applyAliasesCypher, map[string]any{
|
||||
"name": primaryEntity,
|
||||
"aliases": aliases,
|
||||
})
|
||||
return nil, err
|
||||
})
|
||||
if err != nil {
|
||||
slog.Warn("failed to apply aliases", "entity", primaryEntity, "err", err)
|
||||
} else {
|
||||
slog.Info("applied aliases to entity", "entity", primaryEntity, "aliases", aliases)
|
||||
}
|
||||
}
|
||||
|
||||
func flagContradictions(ctx context.Context, session neo4j.SessionWithContext, docID, detectedAt string) {
|
||||
result, err := session.ExecuteWrite(ctx, func(tx neo4j.ManagedTransaction) (any, error) {
|
||||
res, err := tx.Run(ctx, detectContradictionsQuery, map[string]any{
|
||||
"docID": docID,
|
||||
"detectedAt": detectedAt,
|
||||
})
|
||||
if err != nil {
|
||||
return int64(0), err
|
||||
}
|
||||
if res.Next(ctx) {
|
||||
total, _ := res.Record().Get("total")
|
||||
return total, res.Err()
|
||||
}
|
||||
return int64(0), res.Err()
|
||||
})
|
||||
if err != nil {
|
||||
slog.Warn("contradiction detection failed", "doc_id", docID, "err", err)
|
||||
return
|
||||
}
|
||||
if n, ok := result.(int64); ok && n > 0 {
|
||||
slog.Info("contradictions flagged", "doc_id", docID, "count", n)
|
||||
}
|
||||
}
|
||||
|
||||
// ── Main ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
func main() {
|
||||
cfg := configFromEnv()
|
||||
slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
|
||||
|
||||
systemPrompt := loadPrompt(cfg)
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
rOpts, err := redis.ParseURL(cfg.RedisURL)
|
||||
if err != nil {
|
||||
slog.Error("invalid redis URL", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
rdb := redis.NewClient(rOpts)
|
||||
rdb.XGroupCreateMkStream(ctx, cfg.Stream, cfg.Group, "0").Err()
|
||||
|
||||
driver, err := neo4j.NewDriverWithContext(cfg.Neo4jURL,
|
||||
neo4j.BasicAuth(cfg.Neo4jUser, cfg.Neo4jPass, ""))
|
||||
if err != nil {
|
||||
slog.Error("neo4j driver error", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer driver.Close(ctx)
|
||||
|
||||
slog.Info("lore-extractor started", "stream", cfg.Stream, "group", cfg.Group)
|
||||
|
||||
// Reclaim any messages delivered but not ACK'd before last shutdown.
|
||||
// Bounded to maxRecoveryPasses so a persistently failing message
|
||||
// (e.g. LLM not yet ready) does not block the live loop on startup.
|
||||
const maxRecoveryPasses = 5
|
||||
for pass := 0; pass < maxRecoveryPasses; pass++ {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.Stream, "0"},
|
||||
Count: 3,
|
||||
}).Result()
|
||||
if err != nil || len(results) == 0 || len(results[0].Messages) == 0 {
|
||||
break
|
||||
}
|
||||
for _, msg := range results[0].Messages {
|
||||
slog.Info("reprocessing pending message", "id", msg.ID)
|
||||
if err := processMessage(ctx, cfg, systemPrompt, driver, msg); err != nil {
|
||||
slog.Error("lore extraction failed (pending)", "id", msg.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
rdb.XAck(ctx, cfg.Stream, cfg.Group, msg.ID)
|
||||
}
|
||||
}
|
||||
|
||||
for {
|
||||
results, err := rdb.XReadGroup(ctx, &redis.XReadGroupArgs{
|
||||
Group: cfg.Group,
|
||||
Consumer: cfg.Consumer,
|
||||
Streams: []string{cfg.Stream, ">"},
|
||||
Count: 3,
|
||||
Block: 5 * time.Second,
|
||||
}).Result()
|
||||
|
||||
if err == redis.Nil {
|
||||
continue
|
||||
}
|
||||
if err != nil {
|
||||
slog.Error("redis read error", "err", err)
|
||||
time.Sleep(2 * time.Second)
|
||||
continue
|
||||
}
|
||||
|
||||
for _, stream := range results {
|
||||
for _, msg := range stream.Messages {
|
||||
if err := processMessage(ctx, cfg, systemPrompt, driver, msg); err != nil {
|
||||
slog.Error("lore extraction failed", "id", msg.ID, "err", err)
|
||||
continue
|
||||
}
|
||||
rdb.XAck(ctx, cfg.Stream, cfg.Group, msg.ID)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func processMessage(ctx context.Context, cfg Config, systemPrompt string,
|
||||
driver neo4j.DriverWithContext, msg redis.XMessage) error {
|
||||
|
||||
vals := msg.Values
|
||||
docID := strVal(vals, "id", msg.ID)
|
||||
title := strVal(vals, "title", "Untitled")
|
||||
content := strVal(vals, "content", "")
|
||||
uploadedAt := strVal(vals, "uploaded_at", time.Now().UTC().Format(time.RFC3339))
|
||||
primaryEntity := strVal(vals, "primary_entity", title)
|
||||
aliasesJSON := strVal(vals, "aliases", "[]")
|
||||
var aliases []string
|
||||
json.Unmarshal([]byte(aliasesJSON), &aliases) //nolint:errcheck
|
||||
|
||||
if content == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
knownEntities := loadKnownEntities(ctx, driver)
|
||||
result, err := extractEntities(ctx, cfg, systemPrompt, title, content, knownEntities)
|
||||
if err != nil {
|
||||
return fmt.Errorf("LLM extraction: %w", err)
|
||||
}
|
||||
|
||||
session := driver.NewSession(ctx, neo4j.SessionConfig{})
|
||||
defer session.Close(ctx)
|
||||
|
||||
if err := writeToGraph(ctx, session, docID, title, uploadedAt, result); err != nil {
|
||||
return fmt.Errorf("write to graph: %w", err)
|
||||
}
|
||||
|
||||
applyDocumentAliases(ctx, session, primaryEntity, aliases)
|
||||
|
||||
slog.Info("processed lore document", "doc_id", docID, "title", title,
|
||||
"entities", len(result.Entities), "relations", len(result.Relations))
|
||||
return nil
|
||||
}
|
||||
|
||||
// ── Helpers ───────────────────────────────────────────────────────────────────
|
||||
|
||||
func getEnv(key, fallback string) string {
|
||||
if v := os.Getenv(key); v != "" {
|
||||
return v
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func strVal(m map[string]any, key, fallback string) string {
|
||||
if v, ok := m[key]; ok {
|
||||
if s, ok := v.(string); ok {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
139
workers/lore-extractor/main_test.go
Normal file
139
workers/lore-extractor/main_test.go
Normal file
@@ -0,0 +1,139 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// ── repairJSON ────────────────────────────────────────────────────────────────
|
||||
|
||||
func TestRepairJSON(t *testing.T) {
|
||||
tests := []struct {
|
||||
input string
|
||||
want string
|
||||
}{
|
||||
{`{"a": 1,}`, `{"a": 1}`},
|
||||
{`[1, 2,]`, `[1, 2]`},
|
||||
{`{"a": 1, "b": 2}`, `{"a": 1, "b": 2}`}, // already valid, unchanged
|
||||
{`{"entities": [],}`, `{"entities": []}`},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
got := repairJSON(tt.input)
|
||||
if got != tt.want {
|
||||
t.Errorf("repairJSON(%q) = %q, want %q", tt.input, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── stripFences ───────────────────────────────────────────────────────────────
|
||||
|
||||
func TestStripFences(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
want string
|
||||
}{
|
||||
{"json fence", "```json\n{}\n```", "{}"},
|
||||
{"plain fence", "```\n{}\n```", "{}"},
|
||||
{"no fence", "{}", "{}"},
|
||||
{"leading whitespace with fence", " ```json\n{}\n``` ", "{}"},
|
||||
{"fence with content", "```json\n{\"a\":1}\n```", `{"a":1}`},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := stripFences(tt.input)
|
||||
if got != tt.want {
|
||||
t.Errorf("stripFences(%q) = %q, want %q", tt.input, got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// ── fixUnicodeEscapes ─────────────────────────────────────────────────────────
|
||||
|
||||
func TestFixUnicodeEscapes(t *testing.T) {
|
||||
t.Run("valid escape is preserved", func(t *testing.T) {
|
||||
input := `{"name": "Théron"}`
|
||||
got := fixUnicodeEscapes(input)
|
||||
if got != input {
|
||||
t.Errorf("fixUnicodeEscapes modified valid escape: got %q", got)
|
||||
}
|
||||
// Must still be valid JSON
|
||||
if err := json.Unmarshal([]byte(got), &map[string]any{}); err != nil {
|
||||
t.Errorf("result not valid JSON: %v", err)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("invalid hex char is stripped", func(t *testing.T) {
|
||||
// \u201g — 'g' is not a hex digit
|
||||
input := `{"name": "test\u201gname"}`
|
||||
got := fixUnicodeEscapes(input)
|
||||
if strings.Contains(got, `\u`) {
|
||||
t.Errorf("fixUnicodeEscapes left invalid escape in: %q", got)
|
||||
}
|
||||
// Result must be parseable JSON
|
||||
if err := json.Unmarshal([]byte(got), &map[string]any{}); err != nil {
|
||||
t.Errorf("result not valid JSON after fix: %v — got: %q", err, got)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("truncated escape at end is dropped", func(t *testing.T) {
|
||||
input := `{"name": "ab\u00"}`
|
||||
got := fixUnicodeEscapes(input)
|
||||
if strings.Contains(got, `\u`) {
|
||||
t.Errorf("incomplete escape still present: %q", got)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// ── coerceString ─────────────────────────────────────────────────────────────
|
||||
|
||||
func TestCoerceString(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
want string
|
||||
}{
|
||||
{"plain string", `"Theron Ashveil"`, "Theron Ashveil"},
|
||||
{"name object", `{"name": "The Iron Council"}`, "The Iron Council"},
|
||||
{"single-element array", `["Thornwall Keep"]`, "Thornwall Keep"},
|
||||
{"empty string", `""`, ""},
|
||||
{"nested array with object", `[{"name": "Deep Keep"}]`, "Deep Keep"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := coerceString(json.RawMessage(tt.input))
|
||||
if got != tt.want {
|
||||
t.Errorf("coerceString(%q) = %q, want %q", tt.input, got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// ── salvageEntities ───────────────────────────────────────────────────────────
|
||||
|
||||
func TestSalvageEntities(t *testing.T) {
|
||||
t.Run("recovers entities when relations are malformed", func(t *testing.T) {
|
||||
// Simulate a response where relations block is broken
|
||||
raw := `{"entities": [{"name": "Gromm", "type": "Person"}], "relations": [BROKEN`
|
||||
result := salvageEntities(raw)
|
||||
if result == nil {
|
||||
t.Fatal("expected salvaged result, got nil")
|
||||
}
|
||||
if len(result.Entities) != 1 || result.Entities[0].Name != "Gromm" {
|
||||
t.Errorf("unexpected entities: %+v", result.Entities)
|
||||
}
|
||||
if len(result.Relations) != 0 {
|
||||
t.Errorf("expected empty relations, got %d", len(result.Relations))
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("returns nil when entities are also malformed", func(t *testing.T) {
|
||||
raw := `{"entities": [BROKEN], "relations": []}`
|
||||
result := salvageEntities(raw)
|
||||
if result != nil {
|
||||
t.Errorf("expected nil, got %+v", result)
|
||||
}
|
||||
})
|
||||
}
|
||||
13
workers/lore-watcher/Dockerfile
Normal file
13
workers/lore-watcher/Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
WORKDIR /app
|
||||
RUN apk --no-cache add git ca-certificates
|
||||
COPY go.mod ./
|
||||
COPY main.go ./
|
||||
RUN go mod tidy
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o lore-watcher .
|
||||
|
||||
FROM alpine:3.19
|
||||
RUN apk --no-cache add ca-certificates
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/lore-watcher .
|
||||
ENTRYPOINT ["./lore-watcher"]
|
||||
7
workers/lore-watcher/go.mod
Normal file
7
workers/lore-watcher/go.mod
Normal file
@@ -0,0 +1,7 @@
|
||||
module github.com/graphmcp/lore-watcher
|
||||
|
||||
go 1.22
|
||||
|
||||
require github.com/fsnotify/fsnotify v1.7.0
|
||||
|
||||
require golang.org/x/sys v0.4.0 // indirect
|
||||
4
workers/lore-watcher/go.sum
Normal file
4
workers/lore-watcher/go.sum
Normal file
@@ -0,0 +1,4 @@
|
||||
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
||||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
||||
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
|
||||
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
233
workers/lore-watcher/main.go
Normal file
233
workers/lore-watcher/main.go
Normal file
@@ -0,0 +1,233 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"mime/multipart"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/fsnotify/fsnotify"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
WatchDir string
|
||||
IngestURL string
|
||||
DebounceMS int
|
||||
}
|
||||
|
||||
func configFromEnv() Config {
|
||||
ms := 500
|
||||
if v := os.Getenv("DEBOUNCE_MS"); v != "" {
|
||||
fmt.Sscan(v, &ms)
|
||||
}
|
||||
return Config{
|
||||
WatchDir: getEnv("WATCH_DIR", "/data/lore"),
|
||||
IngestURL: getEnv("INGEST_URL", "http://ingestion-worker:8080/ingest/lore"),
|
||||
DebounceMS: ms,
|
||||
}
|
||||
}
|
||||
|
||||
func getEnv(key, fallback string) string {
|
||||
if v := os.Getenv(key); v != "" {
|
||||
return v
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
// stateFile is stored inside WatchDir so it persists across container restarts
|
||||
// when the directory is a bind mount.
|
||||
const stateFileName = ".lore-watcher-state.json"
|
||||
|
||||
type watchState struct {
|
||||
Hashes map[string]string `json:"hashes"`
|
||||
}
|
||||
|
||||
func loadState(dir string) watchState {
|
||||
s := watchState{Hashes: make(map[string]string)}
|
||||
data, err := os.ReadFile(filepath.Join(dir, stateFileName))
|
||||
if err != nil {
|
||||
return s
|
||||
}
|
||||
json.Unmarshal(data, &s)
|
||||
return s
|
||||
}
|
||||
|
||||
func saveState(dir string, s watchState) {
|
||||
data, _ := json.Marshal(s)
|
||||
os.WriteFile(filepath.Join(dir, stateFileName), data, 0644)
|
||||
}
|
||||
|
||||
func hashFile(path string) (string, error) {
|
||||
f, err := os.Open(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer f.Close()
|
||||
h := sha256.New()
|
||||
if _, err := io.Copy(h, f); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
|
||||
func shouldIgnore(path string) bool {
|
||||
base := filepath.Base(path)
|
||||
if strings.HasPrefix(base, ".") {
|
||||
return true
|
||||
}
|
||||
for _, suffix := range []string{".swp", "~", ".tmp"} {
|
||||
if strings.HasSuffix(base, suffix) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
if base == "4913" { // vim temp file number
|
||||
return true
|
||||
}
|
||||
return filepath.Ext(path) != ".md"
|
||||
}
|
||||
|
||||
func upload(ingestURL, path string) error {
|
||||
f, err := os.Open(path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
body := &bytes.Buffer{}
|
||||
w := multipart.NewWriter(body)
|
||||
part, err := w.CreateFormFile("file", filepath.Base(path))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := io.Copy(part, f); err != nil {
|
||||
return err
|
||||
}
|
||||
w.Close()
|
||||
|
||||
resp, err := http.Post(ingestURL, w.FormDataContentType(), body)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return fmt.Errorf("upload returned HTTP %d", resp.StatusCode)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func processFile(cfg Config, s watchState, absPath string) {
|
||||
if _, err := os.Stat(absPath); err != nil {
|
||||
return // file may have been deleted before debounce fired
|
||||
}
|
||||
rel, _ := filepath.Rel(cfg.WatchDir, absPath)
|
||||
|
||||
hash, err := hashFile(absPath)
|
||||
if err != nil {
|
||||
slog.Error("hash failed", "path", rel, "err", err)
|
||||
return
|
||||
}
|
||||
if existing, ok := s.Hashes[rel]; ok && existing == hash {
|
||||
return // content unchanged since last upload
|
||||
}
|
||||
|
||||
slog.Info("uploading", "file", rel)
|
||||
if err := upload(cfg.IngestURL, absPath); err != nil {
|
||||
slog.Error("upload failed", "file", rel, "err", err)
|
||||
return
|
||||
}
|
||||
s.Hashes[rel] = hash
|
||||
saveState(cfg.WatchDir, s)
|
||||
slog.Info("uploaded", "file", rel)
|
||||
}
|
||||
|
||||
func main() {
|
||||
slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
|
||||
cfg := configFromEnv()
|
||||
|
||||
if _, err := os.Stat(cfg.WatchDir); err != nil {
|
||||
slog.Error("watch directory not found", "dir", cfg.WatchDir, "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
s := loadState(cfg.WatchDir)
|
||||
debounce := time.Duration(cfg.DebounceMS) * time.Millisecond
|
||||
|
||||
// Scan on startup — upload anything new or changed since last run
|
||||
slog.Info("scanning directory", "dir", cfg.WatchDir)
|
||||
filepath.Walk(cfg.WatchDir, func(path string, info os.FileInfo, err error) error {
|
||||
if err != nil || info.IsDir() || shouldIgnore(path) {
|
||||
return nil
|
||||
}
|
||||
processFile(cfg, s, path)
|
||||
return nil
|
||||
})
|
||||
|
||||
watcher, err := fsnotify.NewWatcher()
|
||||
if err != nil {
|
||||
slog.Error("failed to create watcher", "err", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer watcher.Close()
|
||||
|
||||
// Watch all subdirectories recursively
|
||||
filepath.Walk(cfg.WatchDir, func(path string, info os.FileInfo, err error) error {
|
||||
if err == nil && info.IsDir() {
|
||||
watcher.Add(path)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
slog.Info("watching for changes", "dir", cfg.WatchDir, "debounce_ms", cfg.DebounceMS)
|
||||
|
||||
// Per-file debounce timers — noisy editors (vim, VS Code) fire multiple events per save
|
||||
timers := make(map[string]*time.Timer)
|
||||
|
||||
for {
|
||||
select {
|
||||
case event, ok := <-watcher.Events:
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
path := event.Name
|
||||
|
||||
// Add newly created subdirectories to the watch set
|
||||
if event.Op&fsnotify.Create != 0 {
|
||||
if info, err := os.Stat(path); err == nil && info.IsDir() {
|
||||
watcher.Add(path)
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
if shouldIgnore(path) {
|
||||
continue
|
||||
}
|
||||
if event.Op&(fsnotify.Write|fsnotify.Create) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
if t, ok := timers[path]; ok {
|
||||
t.Stop()
|
||||
}
|
||||
p := path // capture for closure
|
||||
timers[p] = time.AfterFunc(debounce, func() {
|
||||
processFile(cfg, s, p)
|
||||
delete(timers, p)
|
||||
})
|
||||
|
||||
case err, ok := <-watcher.Errors:
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
slog.Error("watcher error", "err", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
13
workers/mcp-server/Dockerfile
Normal file
13
workers/mcp-server/Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
||||
FROM golang:1.22-alpine AS builder
|
||||
WORKDIR /app
|
||||
RUN apk --no-cache add git ca-certificates
|
||||
COPY go.mod ./
|
||||
COPY main.go ./
|
||||
RUN go mod tidy
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o mcp-server .
|
||||
|
||||
FROM alpine:3.19
|
||||
RUN apk --no-cache add ca-certificates curl
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/mcp-server .
|
||||
ENTRYPOINT ["./mcp-server"]
|
||||
5
workers/mcp-server/go.mod
Normal file
5
workers/mcp-server/go.mod
Normal file
@@ -0,0 +1,5 @@
|
||||
module github.com/graphmcp/mcp-server
|
||||
|
||||
go 1.22
|
||||
|
||||
require github.com/neo4j/neo4j-go-driver/v5 v5.20.0
|
||||
2
workers/mcp-server/go.sum
Normal file
2
workers/mcp-server/go.sum
Normal file
@@ -0,0 +1,2 @@
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0 h1:XnoAi6g6XRkX+wxWa3yM+f7PT2VUkGQfBGtGuJL4fsM=
|
||||
github.com/neo4j/neo4j-go-driver/v5 v5.20.0/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k=
|
||||
1436
workers/mcp-server/main.go
Normal file
1436
workers/mcp-server/main.go
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user