Compare commits
39
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1edb158f35 | ||
|
|
85caff90b9 | ||
|
|
b317968a4c | ||
|
|
1f9bdb0bf6 | ||
|
|
0a05803f4b | ||
|
|
ad83e2a12f | ||
|
|
d894c6609f | ||
|
|
ff80359684 | ||
|
|
36976d9b53 | ||
|
|
8e6f67cc97 | ||
|
|
aca05626bd | ||
|
|
39ae2abe8d | ||
|
|
ba5cc3a6e2 | ||
|
|
15d59054ff | ||
|
|
3f30052ea8 | ||
|
|
c1ee920b0a | ||
|
|
cec0161ff6 | ||
|
|
46310f8773 | ||
|
|
7e0f3c9e06 | ||
|
|
f14025304e | ||
|
|
dd6d7e9395 | ||
|
|
68d478224f | ||
|
|
117f3c2cfd | ||
|
|
140d86a4b9 | ||
|
|
c96c393a4a | ||
|
|
3d0d95cf00 | ||
|
|
ed28fdbd2a | ||
|
|
7e511d5b78 | ||
|
|
0d26519fab | ||
|
|
a429b823e5 | ||
|
|
6847233183 | ||
|
|
6d7638ab73 | ||
|
|
bd1a91dab7 | ||
|
|
a5a1f91d95 | ||
|
|
80e3b7a1cf | ||
|
|
ef4189c72d | ||
|
|
60c20ed98d | ||
|
|
9f22380e82 | ||
|
|
e2eff3b9c7 |
@@ -3,6 +3,7 @@
|
|||||||
var
|
var
|
||||||
.git
|
.git
|
||||||
.github
|
.github
|
||||||
|
lib-ladybug
|
||||||
__pycache__
|
__pycache__
|
||||||
*.pyc
|
*.pyc
|
||||||
*.lbug
|
*.lbug
|
||||||
|
|||||||
@@ -37,6 +37,9 @@ jobs:
|
|||||||
bash -n bin/db/ssh-tunnel
|
bash -n bin/db/ssh-tunnel
|
||||||
bash -n bin/docker-entrypoint
|
bash -n bin/docker-entrypoint
|
||||||
bash -n bin/kb/search
|
bash -n bin/kb/search
|
||||||
|
bash -n bin/cgo/zig
|
||||||
|
sh -n bin/cgo/zcc
|
||||||
|
sh -n bin/cgo/zc++
|
||||||
|
|
||||||
- name: Python unit tests (offline, vendored tools)
|
- name: Python unit tests (offline, vendored tools)
|
||||||
run: |
|
run: |
|
||||||
@@ -54,9 +57,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
./bin/facts/audit self 2>/dev/null || echo "audit: not yet implemented; gate skipped"
|
./bin/facts/audit self 2>/dev/null || echo "audit: not yet implemented; gate skipped"
|
||||||
|
|
||||||
- name: kb/eval recall gate
|
- name: CGO via Zig (compile brain/search)
|
||||||
run: |
|
run: |
|
||||||
./bin/kb/eval 2>/dev/null || echo "eval: not yet implemented; gate skipped"
|
chmod +x bin/cgo/zig bin/cgo/zcc bin/cgo/zc++
|
||||||
|
bin/cgo/zig go build -tags system_ladybug -o /tmp/brain-search ./bin/brain/search.go
|
||||||
|
|
||||||
release:
|
release:
|
||||||
name: Release (semver)
|
name: Release (semver)
|
||||||
|
|||||||
@@ -11,3 +11,4 @@ __pycache__/
|
|||||||
.secrets/
|
.secrets/
|
||||||
lib-ladybug/
|
lib-ladybug/
|
||||||
go.work.local
|
go.work.local
|
||||||
|
models/
|
||||||
|
|||||||
@@ -15,6 +15,9 @@ Read first: [PLAN](PLAN.md) → [docs](docs/).
|
|||||||
- `info` root = descriptive/narrative leafs, searchable, never asserted as fact.
|
- `info` root = descriptive/narrative leafs, searchable, never asserted as fact.
|
||||||
- Search is deduction: `facts` → `info` → `web-search` (second independent
|
- Search is deduction: `facts` → `info` → `web-search` (second independent
|
||||||
source). An answer is `confirmed` only if it comes off the facts root.
|
source). An answer is `confirmed` only if it comes off the facts root.
|
||||||
|
- Fact-check every *claim* (facts → info → live → web), not every edit or
|
||||||
|
syntax tweak. PicoClaw: `search` then `get` then `audit` before a factual
|
||||||
|
reply (`skills/picoclaw/SKILL.md`). `throttled` is not a negative finding.
|
||||||
|
|
||||||
## Hard rules
|
## Hard rules
|
||||||
|
|
||||||
@@ -39,14 +42,18 @@ bin/ self-describing tools bin/{subject}/{method}.go (shebang)
|
|||||||
bin/brain/ search.go serve.go index.go get.go stats.go eval.go watch.go
|
bin/brain/ search.go serve.go index.go get.go stats.go eval.go watch.go
|
||||||
bin/chats/ sync.go import.go facts.go apply.go; libs in internal/chats
|
bin/chats/ sync.go import.go facts.go apply.go; libs in internal/chats
|
||||||
bin/mail/ sync.go import.go (index_mail → brain/index.go)
|
bin/mail/ sync.go import.go (index_mail → brain/index.go)
|
||||||
bin/markdown/ import.go (mistune leafs)
|
bin/markdown/ import.go (H2 leaf split; Python bin/md/import fallback)
|
||||||
bin/postgres/ query.go (read-only YAML)
|
bin/postgres/ query.go (read-only YAML)
|
||||||
internal/ shared Go (brain/rank is cgo-free; chats parsers too)
|
bin/git/ import.go (go-git history; Python shim execs it)
|
||||||
|
bin/web/ search.go (SearXNG; Python shim execs it)
|
||||||
|
bin/reasoner/ bakeoff.go (D18 CPU OpenAI tool-call bake-off)
|
||||||
|
internal/ shared Go (brain/rank is cgo-free; chats parsers; gitlog; websearch; reasoner)
|
||||||
bin/watch/ corpus watcher (used by bin/brain/watch.go)
|
bin/watch/ corpus watcher (used by bin/brain/watch.go)
|
||||||
bin/tools/ vendored python libs behind bin/* (kblib, yamlout, websearch)
|
bin/tools/ vendored python libs behind bin/* (kblib, yamlout, websearch)
|
||||||
bin/docker-entrypoint container entrypoint (brain index|search|serve|watch)
|
bin/cgo/ zig zcc zc++ (CGO via zig cc, not gcc)
|
||||||
|
bin/docker-entrypoint container entrypoint (api: serve|search|watch; index: python)
|
||||||
compose.yaml docker composition (root level, not docker/)
|
compose.yaml docker composition (root level, not docker/)
|
||||||
Dockerfile multi-stage: python deps + static Go binaries
|
Dockerfile api (Zig CGO, no Python) + index (Python write)
|
||||||
var/ kb.lbug, var/mail/*, caches (gitignored)
|
var/ kb.lbug, var/mail/*, caches (gitignored)
|
||||||
.venv/ ladybug + model2vec + mistune
|
.venv/ ladybug + model2vec + mistune
|
||||||
```
|
```
|
||||||
@@ -75,12 +82,20 @@ bin/brain/index.go --rebuild # rebuil
|
|||||||
## Tools
|
## Tools
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bin/facts/audit ["self"|"facts"|"info"|"stale"] # 2-source + staleness gate
|
bin/facts/audit.go ["self"|"facts"|"info"|"stale"] # 2-source + staleness gate
|
||||||
bin/facts/crm [--dry-run] # proof person↔company/company↔project (ooCRM × corpus SoT)
|
bin/facts/crm.go [--dry-run] # proof person↔company/company↔project (ooCRM × corpus SoT)
|
||||||
bin/kb/search "query" [--repo X] # deprecated wrapper → bin/brain/search.go
|
bin/kb/search "query" [--repo X] # deprecated wrapper → bin/brain/search.go
|
||||||
bin/brain/search.go "query" [--root facts|info] # deduction search → YAML
|
bin/brain/search.go "query" [--root facts|info] # deduction search → YAML
|
||||||
bin/brain/get.go <id> [--body]
|
bin/brain/search.go "query" --no-web # local graph only
|
||||||
bin/markdown/import.go [dir] # mistune leaves → YAML
|
eval "$(bin/cgo/zig env)" # Zig cc + liblbug (not gcc)
|
||||||
|
bin/brain/get.go <id> [--body] [--json] # Go read; Python bin/kb/get CI fallback
|
||||||
|
bin/brain/stats.go [--json]
|
||||||
|
bin/brain/eval.go [--json] # recall@5; questions in internal/brain/rank
|
||||||
|
bin/brain/serve.go # HTTP :8630; GET /openapi.json POST /mcp
|
||||||
|
bin/markdown/import.go [dir] # H2 leafs → YAML; Python bin/md/import fallback
|
||||||
|
bin/git/import.go [REPO] [--json] [--limit N] # go-git history → commit leafs
|
||||||
|
bin/web/search.go "query" [--json] # SearXNG; throttled ≠ absence
|
||||||
|
bin/reasoner/bakeoff.go [--model ID] [--json] # D18 CPU tool-call bake-off
|
||||||
bin/postgres/query.go --profile onlyoffice -c 'SELECT 1'
|
bin/postgres/query.go --profile onlyoffice -c 'SELECT 1'
|
||||||
bin/md/tables # what the graph holds → YAML
|
bin/md/tables # what the graph holds → YAML
|
||||||
bin/brain/deduce "question" # thinking wrapper
|
bin/brain/deduce "question" # thinking wrapper
|
||||||
|
|||||||
+56
-16
@@ -1,5 +1,13 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
FROM python:3.12-slim AS base
|
#
|
||||||
|
# docker build --target api -t 2dph:api .
|
||||||
|
# docker build --target index -t 2dph:index .
|
||||||
|
#
|
||||||
|
# API: Go + ladybug via Zig CGO (no CPython).
|
||||||
|
# Index: Python write path (profile `index` until brain/add is v2).
|
||||||
|
|
||||||
|
# --- Python sidecar (Ladybug write / rebuild) ---
|
||||||
|
FROM python:3.12-slim AS index
|
||||||
|
|
||||||
ENV PYTHONUNBUFFERED=1 \
|
ENV PYTHONUNBUFFERED=1 \
|
||||||
PYTHONDONTWRITEBYTECODE=1 \
|
PYTHONDONTWRITEBYTECODE=1 \
|
||||||
@@ -9,25 +17,11 @@ ENV PYTHONUNBUFFERED=1 \
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN id -u 2dph 2>/dev/null || useradd --create-home --uid 1001 2dph
|
RUN id -u 2dph 2>/dev/null || useradd --create-home --uid 1001 2dph
|
||||||
|
|
||||||
# deps layer-first: rebuild only on dependency change
|
|
||||||
COPY requirements.lock.txt /tmp/requirements.lock.txt
|
COPY requirements.lock.txt /tmp/requirements.lock.txt
|
||||||
RUN python -m pip install --no-cache-dir -r /tmp/requirements.lock.txt \
|
RUN python -m pip install --no-cache-dir -r /tmp/requirements.lock.txt \
|
||||||
&& rm /tmp/requirements.lock.txt
|
&& rm /tmp/requirements.lock.txt
|
||||||
|
|
||||||
# Go services: static binaries, no interpreter at runtime
|
|
||||||
FROM golang:1.25 AS go-build
|
|
||||||
WORKDIR /src
|
|
||||||
COPY go.mod ./
|
|
||||||
COPY bin/server ./bin/server
|
|
||||||
COPY bin/watch ./bin/watch
|
|
||||||
RUN CGO_ENABLED=0 go build -o /serve ./bin/server \
|
|
||||||
&& CGO_ENABLED=0 go build -o /watch ./bin/watch
|
|
||||||
|
|
||||||
# runtime: python toolchain + Go services
|
|
||||||
FROM base
|
|
||||||
COPY . .
|
COPY . .
|
||||||
COPY --from=go-build /serve /app/bin/serve
|
|
||||||
COPY --from=go-build /watch /app/bin/watch
|
|
||||||
RUN chmod +x /app/bin/docker-entrypoint \
|
RUN chmod +x /app/bin/docker-entrypoint \
|
||||||
&& chown -R 2dph:2dph /app
|
&& chown -R 2dph:2dph /app
|
||||||
USER 2dph
|
USER 2dph
|
||||||
@@ -37,5 +31,51 @@ ENV PATH="/app/bin:${PATH}" \
|
|||||||
KB_ROOT=/app
|
KB_ROOT=/app
|
||||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
|
||||||
CMD python -c "import model2vec, ladybug, mistune; print('ok')" || exit 1
|
CMD python -c "import model2vec, ladybug, mistune; print('ok')" || exit 1
|
||||||
|
|
||||||
ENTRYPOINT ["/app/bin/docker-entrypoint"]
|
ENTRYPOINT ["/app/bin/docker-entrypoint"]
|
||||||
|
|
||||||
|
# --- Go API: CGO with Zig, not gcc ---
|
||||||
|
FROM golang:1.26-bookworm AS api-build
|
||||||
|
WORKDIR /src
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends curl xz-utils ca-certificates \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
COPY bin/cgo ./bin/cgo
|
||||||
|
RUN chmod +x bin/cgo/zig bin/cgo/zcc bin/cgo/zc++ \
|
||||||
|
&& ./bin/cgo/zig env >/dev/null
|
||||||
|
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
|
|
||||||
|
COPY . .
|
||||||
|
ENV CGO_RPATH=/usr/local/lib
|
||||||
|
RUN eval "$(./bin/cgo/zig env)" \
|
||||||
|
&& go build -tags brain_serve,system_ladybug -o /out/brain-serve ./bin/brain/serve.go \
|
||||||
|
&& go build -tags system_ladybug -o /out/brain-search ./bin/brain/search.go \
|
||||||
|
&& CGO_ENABLED=0 go build -tags brain_watch -o /out/brain-watch ./bin/brain/watch.go
|
||||||
|
|
||||||
|
FROM debian:bookworm-slim AS api
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends libssl3 ca-certificates wget \
|
||||||
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
|
&& useradd --create-home --uid 1001 2dph
|
||||||
|
COPY --from=api-build /out/brain-serve /usr/local/bin/brain-serve
|
||||||
|
COPY --from=api-build /out/brain-search /usr/local/bin/brain-search
|
||||||
|
COPY --from=api-build /out/brain-watch /usr/local/bin/brain-watch
|
||||||
|
COPY --from=api-build /src/lib-ladybug/liblbug.so.0.19.1 /usr/local/lib/liblbug.so.0.19.1
|
||||||
|
COPY bin/docker-entrypoint /usr/local/bin/docker-entrypoint
|
||||||
|
RUN chmod +x /usr/local/bin/docker-entrypoint \
|
||||||
|
&& ln -s liblbug.so.0.19.1 /usr/local/lib/liblbug.so.0 \
|
||||||
|
&& ln -s liblbug.so.0 /usr/local/lib/liblbug.so \
|
||||||
|
&& ldconfig
|
||||||
|
USER 2dph
|
||||||
|
ENV KB_ROOT=/data \
|
||||||
|
KB_PORT=8630 \
|
||||||
|
LD_LIBRARY_PATH=/usr/local/lib \
|
||||||
|
HF_HOME=/data/hf
|
||||||
|
WORKDIR /data
|
||||||
|
EXPOSE 8630
|
||||||
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
|
||||||
|
CMD wget -qO- http://127.0.0.1:8630/health || exit 1
|
||||||
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
|
||||||
|
CMD ["serve"]
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ detective method: **a fact needs ≥2 independent sources or it is
|
|||||||
|---|----------|--------|
|
|---|----------|--------|
|
||||||
| D1 | RAG corpus | ops stack (chat, onlyoffice, gitea/NPM, searchxng, observability, ai-bot, mcp-servers, `~/.ssh/config`) + portfolio. Exclude `office.dev` + jobs/applications. |
|
| D1 | RAG corpus | ops stack (chat, onlyoffice, gitea/NPM, searchxng, observability, ai-bot, mcp-servers, `~/.ssh/config`) + portfolio. Exclude `office.dev` + jobs/applications. |
|
||||||
| D2 | skill merging | integrate skills **in this project** `skills/`; skip gitea / brain-dependent skills. |
|
| D2 | skill merging | integrate skills **in this project** `skills/`; skip gitea / brain-dependent skills. |
|
||||||
| D3 | web search | Vendored client; SearXNG URL is config. Optional Compose instance (sanitized settings). Do not run a second copy on a host that already has one. Empty/`throttled` ≠ “nothing exists”. |
|
| D3 | web search | Go client `bin/web/search.go` (`internal/websearch`). SearXNG URL is config (`BRAIN_SEARCH_URL`). Optional Compose profile `searxng` (sanitized settings). Do not run a second copy on a host that already has one. Empty/`throttled` ≠ “nothing exists”. |
|
||||||
| D4 | embeddings | **model2vec** `minishlab/potion-multilingual-128M` instead of embeddinggemma. |
|
| D4 | embeddings | **model2vec** `minishlab/potion-multilingual-128M` instead of embeddinggemma. |
|
||||||
| D5 | parser | **mistune** for MD → leaf extraction (duckdb-md documented as future optional SQL/export layer, not v1). |
|
| D5 | parser | **mistune** for MD → leaf extraction (duckdb-md documented as future optional SQL/export layer, not v1). |
|
||||||
| D6 | graph engine | **LadybugDB**. Go is the service (`bin/brain/search.go`, `internal/brain`); Python remains for index/write until the Go write path is safe. |
|
| D6 | graph engine | **LadybugDB**. Go is the service (`bin/brain/search.go`, `bin/brain/serve.go` in-process, `internal/brain`). Read path is Go + Zig CGO (D21). Python `bin/kb/{get,stats,eval}` is the CI fallback when Zig/libs are not fetched. Index/write stays Python (`compose --profile index`) until the Go write path is safe. |
|
||||||
| D7 | db access | `db-yaml`/`psql-yq`-style, read-only, YAML out. OnlyOffice Postgres via SSH tunnel (`127.0.0.1:5433`). |
|
| D7 | db access | `db-yaml`/`psql-yq`-style, read-only, YAML out. OnlyOffice Postgres via SSH tunnel (`127.0.0.1:5433`). |
|
||||||
| D8 | evidence | detective method: ≥2 independent sources or `(not confirmed)`. Auto-pair docker ps × compose × ssh-config × docs. |
|
| D8 | evidence | detective method: ≥2 independent sources or `(not confirmed)`. Auto-pair docker ps × compose × ssh-config × docs. |
|
||||||
| D9 | facts/goal model | Who / What / How / Where / When + evidence + confidence on every edge. |
|
| D9 | facts/goal model | Who / What / How / Where / When + evidence + confidence on every edge. |
|
||||||
@@ -40,8 +40,11 @@ detective method: **a fact needs ≥2 independent sources or it is
|
|||||||
| D14 | tooling style | `bin/{subject}/{method}.go` shebang (e.g. `bin/brain/search.go`). Shared code in `internal/`. One root `go.mod` + `go.work`. No `bin/*/main.go`, no nested modules. |
|
| D14 | tooling style | `bin/{subject}/{method}.go` shebang (e.g. `bin/brain/search.go`). Shared code in `internal/`. One root `go.mod` + `go.work`. No `bin/*/main.go`, no nested modules. |
|
||||||
| D15 | repo | Gitea [`eSlider/2dph`](https://git.produktor.io/eSlider/2dph) is origin + [issues](https://git.produktor.io/eSlider/2dph/issues). GitHub `eSlider/2dph` is the public clone (PRs + Actions CI). No direct `main` pushes. TDD → PR → CI green → merge. |
|
| D15 | repo | Gitea [`eSlider/2dph`](https://git.produktor.io/eSlider/2dph) is origin + [issues](https://git.produktor.io/eSlider/2dph/issues). GitHub `eSlider/2dph` is the public clone (PRs + Actions CI). No direct `main` pushes. TDD → PR → CI green → merge. |
|
||||||
| D16 | contradictions | ≥2 yes vs ≥2 no → unrelated sources conflict → hypothesis → `(not confirmed)`. Resolution (authority, staleness adjudication) = **v2**, tracked as open question. |
|
| D16 | contradictions | ≥2 yes vs ≥2 no → unrelated sources conflict → hypothesis → `(not confirmed)`. Resolution (authority, staleness adjudication) = **v2**, tracked as open question. |
|
||||||
| D17 | assertion gate | Fact-check every *claim* (facts → info → live sources → web), not every edit. Missing graph ≠ “does not exist”. |
|
| D17 | assertion gate | Fact-check every *claim* (facts → info → live → web), not every edit. `bin/brain/search.go` adds a `web` block when there is no facts hit (`throttled`/`skipped`/`refused` ≠ absence). `--root` and `--no-web` stay local. Missing graph ≠ “does not exist”. |
|
||||||
| D18 | reasoner | Pluggable OpenAI-compatible URL. RAM: Qwen3.5-9B. Quality: Bonsai-27B or Qwen3.6-27B. No official Qwen3.6-9B. |
|
| D18 | reasoner | Pluggable OpenAI-compatible URL (`REASONER_BASE_URL`). RAM: `Qwen/Qwen3.5-9B`. Quality: `prism-ml/Bonsai-27B-gguf` or `Qwen/Qwen3.6-27B`. No official Qwen3.6-9B. CPU bake-off: `bin/reasoner/bakeoff.go` + compose profile `reasoner` (`OLLAMA_NUM_GPU=0`, `:11435`). PicoClaw is not shipped; tools are `search`/`get`/`audit`. Weights are not copied into the 2dph image. |
|
||||||
|
| D19 | git history | [go-git](https://github.com/go-git/go-git) via `bin/git/import.go`. No subprocess of the git binary. Conversion prints commit leafs; brain write is `bin/brain/index.go`. |
|
||||||
|
| D20 | agent API | OpenAPI + MCP are generated from the same `internal/httpapi.Ops` table as `bin/brain/serve.go` handlers. `GET /openapi.json`, `POST /mcp` (JSON-RPC tools/list + tools/call). Tool names match OpenAPI paths (`search`/`get`/`stats`/`audit`). |
|
||||||
|
| D21 | CGO | Ladybug/tokenizers CGO is compiled with **Zig** (`bin/cgo/zcc` → `zig cc -target …-linux-gnu`), not gcc. `bin/cgo/zig` pins Zig 0.14.1 + liblbug 0.19.1 + libtokenizers 1.27.0. Compose `target: api` has no CPython; write/rebuild is profile `index`. |
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
|
|
||||||
@@ -49,23 +52,27 @@ detective method: **a fact needs ≥2 independent sources or it is
|
|||||||
2dph/
|
2dph/
|
||||||
PLAN.md / AGENTS.md
|
PLAN.md / AGENTS.md
|
||||||
docs/ published docs (this conversation → docs/ as md)
|
docs/ published docs (this conversation → docs/ as md)
|
||||||
skills/ in-project skills (web-search, db-yaml, kb-search, agent-cost, diataxis-docs, …)
|
skills/ in-project skills (web-search, postgres, brain, picoclaw, diataxis-docs)
|
||||||
bin/
|
bin/
|
||||||
facts/extract auto-pair 2 sources → lexicon yaml + graph
|
facts/extract.go audit.go crm.go # D14 shebang; Python implementation
|
||||||
facts/audit ["self"|"facts"|"info"|"stale"] 2-source + staleness gate
|
|
||||||
kb/index Python write path (called by bin/brain/index.go)
|
kb/index Python write path (called by bin/brain/index.go)
|
||||||
brain/index.go rebuild FTS + HNSW (incl. --with-mail)
|
brain/index.go rebuild FTS + HNSW (incl. --with-mail)
|
||||||
brain/get.go stats.go eval.go watch.go
|
brain/get.go stats.go eval.go # Go read (cgo); Python bin/kb/* CI fallback
|
||||||
|
brain/watch.go
|
||||||
brain/search.go deduction: facts → info → web-search
|
brain/search.go deduction: facts → info → web-search
|
||||||
brain/serve.go HTTP API (internal/httpapi)
|
brain/serve.go HTTP API in-process + OpenAPI/MCP (D20); Zig CGO (D21)
|
||||||
|
cgo/zig zcc zc++ CGO toolchain (zig cc, not gcc)
|
||||||
mail/import.go JSON → markdown (no brain write)
|
mail/import.go JSON → markdown (no brain write)
|
||||||
markdown/import.go mistune leaves
|
markdown/import.go H2 leaf split (Go); Python bin/md/import fallback
|
||||||
postgres/query.go read-only YAML (wraps bin/db/psql-yq)
|
postgres/query.go read-only YAML (wraps bin/db/psql-yq)
|
||||||
|
git/import.go go-git history (no git binary; conversion only)
|
||||||
|
web/search.go SearXNG client (throttled ≠ absence)
|
||||||
|
reasoner/bakeoff.go CPU tool-call bake-off (D18; OpenAI tools)
|
||||||
chats/sync.go import.go facts.go apply.go
|
chats/sync.go import.go facts.go apply.go
|
||||||
(libs in internal/chats; no chats index)
|
(libs in internal/chats; no chats index)
|
||||||
md/import (deprecated; bin/markdown/import.go)
|
md/import (deprecated; bin/markdown/import.go)
|
||||||
brain/extract brain/audit brain/deduce (thinking wrapper)
|
brain/extract brain/audit brain/deduce (thinking wrapper)
|
||||||
web/search (vendored)
|
web/search (deprecated shim → web/search.go)
|
||||||
db/psql-yq (vendored)
|
db/psql-yq (vendored)
|
||||||
ssh-tunnel onlyoffice pg tunnel 5433
|
ssh-tunnel onlyoffice pg tunnel 5433
|
||||||
var/kb.lbug single embedded store (gitignored)
|
var/kb.lbug single embedded store (gitignored)
|
||||||
@@ -129,9 +136,9 @@ Common props on every node/edge: `root`, `confidence`, `evidence[]`, `how`,
|
|||||||
1. go vet + go test ./... (root module; packages without ladybug cgo)
|
1. go vet + go test ./... (root module; packages without ladybug cgo)
|
||||||
2. `go test ./internal/brain/rank` (cgo-free ranking + flag parser)
|
2. `go test ./internal/brain/rank` (cgo-free ranking + flag parser)
|
||||||
3. python -m unittest discover -s bin/tools (includes published-docs SoT)
|
3. python -m unittest discover -s bin/tools (includes published-docs SoT)
|
||||||
4. bin/facts/audit self (lexicon internal consistency)
|
4. `bin/facts/audit self` (lexicon internal consistency; `bin/facts/audit.go` is the D14 wrapper)
|
||||||
5. bin/brain/eval.go (recall@5 ≥ 0.95, gates index regressions)
|
5. `bin/kb/eval` (recall@5 ≥ 0.95). Local SoT is `bin/brain/eval.go` via Zig CGO.
|
||||||
6. md-docs build/lint if docs tooling arrives.
|
6. `bin/cgo/zig go build -tags system_ladybug` (compile search with zig cc; fetches pinned zig+libs).
|
||||||
|
|
||||||
Feedback loop: every commit → PR → CI → green/gate → merge. Same discipline as
|
Feedback loop: every commit → PR → CI → green/gate → merge. Same discipline as
|
||||||
`db/tech-poc`: contract first where there is an OpenAPI/message shape.
|
`db/tech-poc`: contract first where there is an OpenAPI/message shape.
|
||||||
@@ -140,7 +147,7 @@ Feedback loop: every commit → PR → CI → green/gate → merge. Same discipl
|
|||||||
|
|
||||||
1. scaffold repo (:done after this file + AGENTS.md + .gitignore + ci)
|
1. scaffold repo (:done after this file + AGENTS.md + .gitignore + ci)
|
||||||
2. gh repo create eSlider/2dph --private + initial commit + CI
|
2. gh repo create eSlider/2dph --private + initial commit + CI
|
||||||
3. vendored skill integration (web-search, db-yaml, kb-search, agent-cost, diataxis-docs) — no remote links
|
3. vendored skill integration (web-search, postgres, brain, diataxis-docs) — no remote links
|
||||||
4. .venv: ladybug + model2vec + mistune
|
4. .venv: ladybug + model2vec + mistune
|
||||||
5. schema + tools with TDD (kb + md + facts + brain)
|
5. schema + tools with TDD (kb + md + facts + brain)
|
||||||
6. ~/.config/brain config
|
6. ~/.config/brain config
|
||||||
|
|||||||
@@ -7,14 +7,16 @@
|
|||||||
[](https://github.com/eSlider/2dph/releases)
|
[](https://github.com/eSlider/2dph/releases)
|
||||||
[](https://github.com/eSlider/2dph/stargazers)
|
[](https://github.com/eSlider/2dph/stargazers)
|
||||||
|
|
||||||
An evidence-first brain over the operational eSlider stack. **Facts need two
|
An evidence-first brain. **Facts need two independent sources, or they are
|
||||||
independent sources, or they are `(not confirmed)`.**
|
`(not confirmed)`.** Cursor is not the runtime.
|
||||||
|
|
||||||
`2dph` is a single embedded knowledge graph (LadybugDB = Kuzu successor) with
|
`2dph` is a single embedded knowledge graph (LadybugDB) with native **HNSW
|
||||||
native **HNSW vector** + **BM25 full-text** indexes, built from markdown,
|
vector** + **BM25 full-text** indexes. Search is *deduction*: confirmed facts
|
||||||
compose files, ssh config, docker state, and git history. Search is
|
first, supporting info second, `web-search` as the independent second source
|
||||||
*deduction*: confirmed facts first, supporting info second, `web-search` as
|
when the local graph cannot confirm.
|
||||||
the independent second source when the local graph cannot confirm.
|
|
||||||
|
Run it: [docs/runbook.md](docs/runbook.md). Design: [docs/design.md](docs/design.md).
|
||||||
|
Docs index: [docs/README.md](docs/README.md).
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
|
|
||||||
@@ -28,10 +30,10 @@ graph TB
|
|||||||
end
|
end
|
||||||
|
|
||||||
subgraph dph["2dph tools"]
|
subgraph dph["2dph tools"]
|
||||||
EX["bin/facts/extract<br/>2-source pairing"]
|
EX["bin/facts/extract.go<br/>2-source pairing"]
|
||||||
AU["bin/facts/audit<br/>confidence + staleness"]
|
AU["bin/facts/audit.go<br/>confidence + staleness"]
|
||||||
IDX["bin/brain/index.go<br/>chunk + embed"]
|
IDX["bin/brain/index.go<br/>chunk + embed"]
|
||||||
MD["bin/markdown/import.go<br/>mistune leaves"]
|
MD["bin/markdown/import.go<br/>H2 leaf split"]
|
||||||
SR["bin/brain/search.go<br/>deduction"]
|
SR["bin/brain/search.go<br/>deduction"]
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -74,7 +76,7 @@ graph TB
|
|||||||
## The method
|
## The method
|
||||||
|
|
||||||
Every assertion is `Who / What / How / Where / When + evidence + confidence`,
|
Every assertion is `Who / What / How / Where / When + evidence + confidence`,
|
||||||
mirroring the detective detective skill: **≥2 independent sources confirm a
|
mirroring the detective method: **≥2 independent sources confirm a
|
||||||
fact; conflicting sources or a single source → `hypothesis` → `(not confirmed)`.**
|
fact; conflicting sources or a single source → `hypothesis` → `(not confirmed)`.**
|
||||||
|
|
||||||
| root | meaning | used for answers |
|
| root | meaning | used for answers |
|
||||||
@@ -85,9 +87,10 @@ fact; conflicting sources or a single source → `hypothesis` → `(not confirme
|
|||||||
## Deduction search
|
## Deduction search
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bin/brain/search.go "Matrix federation over HTTPS" # facts → info → web-search
|
bin/brain/search.go "Matrix federation over HTTPS" # facts → info → web
|
||||||
bin/brain/search.go "onlyoffice postgres" --root facts
|
bin/brain/search.go "onlyoffice postgres" --root facts
|
||||||
bin/brain/search.go "where is cs-lexicon" --json | yq '.'
|
bin/brain/search.go "where is cs-lexicon" --json | yq '.'
|
||||||
|
bin/brain/search.go "upstream flag" --no-web # local graph only
|
||||||
bin/brain/get.go <id> --body # full chunk on demand
|
bin/brain/get.go <id> --body # full chunk on demand
|
||||||
bin/brain/stats.go # index health
|
bin/brain/stats.go # index health
|
||||||
bin/brain/eval.go # recall@5 gate
|
bin/brain/eval.go # recall@5 gate
|
||||||
@@ -95,6 +98,23 @@ bin/brain/eval.go # recall@5 gate
|
|||||||
|
|
||||||
`--hop` is not implemented (needs File/FROM_FILE edges); the flag errors instead of walking. `bin/kb/search` is a deprecated wrapper around `bin/brain/search.go`.
|
`--hop` is not implemented (needs File/FROM_FILE edges); the flag errors instead of walking. `bin/kb/search` is a deprecated wrapper around `bin/brain/search.go`.
|
||||||
|
|
||||||
|
Git history is read with [go-git](https://github.com/go-git/go-git) (no git binary):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bin/git/import.go --json --limit 100 # commit leafs for this repo
|
||||||
|
bin/git/import.go --root "$PROJECTS_ROOT" --json # one pass per .git under root
|
||||||
|
```
|
||||||
|
|
||||||
|
Conversion only. Graph write (`File-[:HAS_VERSION]->Commit-[:AUTHORED]->Person`) stays with `bin/brain/index.go`.
|
||||||
|
|
||||||
|
Web search (second independent source) goes through SearXNG. Empty results mean **throttled**, not “nothing exists”:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bin/web/search.go "LadybugDB vector index" --json
|
||||||
|
# Optional local instance (skip if BRAIN_SEARCH_URL already points at one):
|
||||||
|
# SEARXNG_SECRET=$(openssl rand -hex 32) docker compose --profile searxng up -d
|
||||||
|
```
|
||||||
|
|
||||||
Mail is a first-class corpus (retrievable through the same search):
|
Mail is a first-class corpus (retrievable through the same search):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -106,39 +126,41 @@ bin/brain/search.go "invoice from last week" # same s
|
|||||||
|
|
||||||
## Storage
|
## Storage
|
||||||
|
|
||||||
- **LadybugDB** — single `var/kb.lbug`, Cypher property graph, HNSW + BM25
|
- **LadybugDB** — single `var/kb.lbug`, Cypher + HNSW + BM25, embedded.
|
||||||
in one engine, embedded (no server), ACID, read-only-safe for concurrent
|
Read tools (`get` / `stats` / `eval`) are Go + Zig CGO (`bin/cgo/zcc`).
|
||||||
readers. **Never `DROP INDEX` FTS/VECTOR** on Ladybug 0.19: DROP leaves
|
Python fallbacks stay for CI until the runner fetches Zig. Write is
|
||||||
ghost catalog tables (`_0_Leaf_vec_UPPER`) so recreate fails while
|
Compose profile `index` (`bin/brain/index.go`).
|
||||||
`SHOW_INDEXES` omits HNSW. Fresh indexes = delete `var/kb.lbug` +
|
- **model2vec** — `potion-multilingual-128M` (256-dim), CPU, no Ollama
|
||||||
`bin/brain/index.go --rebuild`. Use `ensure_indexes()` after upserts.
|
runtime dependency.
|
||||||
- **model2vec** — `potion-multilingual-128M` static embeddings (256-dim),
|
- facts and info split by `root` but written in the same transaction.
|
||||||
CPU-fast, deterministic, no Ollama runtime dependency.
|
|
||||||
- facts and info split semantically by `root` column but written inside the
|
Ladybug 0.19 DROP INDEX warning: [docs/runbook.md](docs/runbook.md).
|
||||||
same transaction.
|
|
||||||
|
|
||||||
## Tooling conventions
|
## Tooling conventions
|
||||||
|
|
||||||
`bin/{subject}/{method}.go` — self-describing: shebang on line 1, usage comment
|
`bin/{subject}/{method}.go` — self-describing: shebang on line 1, usage comment
|
||||||
from line 2. Shared code in `internal/`. YAML default output, `--json` for
|
from line 2. Shared code in `internal/`. YAML default output, `--json` for
|
||||||
machines. Tests gate every commit. HTTP: `bin/brain/serve.go` (default search
|
machines. Tests gate every commit. HTTP: `bin/brain/serve.go` calls
|
||||||
binary `var/bin/brain-search`, not Python).
|
`internal/brain` in-process (`/health` `/search` `/get` `/stats` `/audit` `/ingest` `/openapi.json` `/mcp`).
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
|
See the portable runbook: [docs/runbook.md](docs/runbook.md).
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
uv venv .venv # Python 3.12, uv-managed
|
uv venv .venv
|
||||||
uv pip install -r requirements.lock.txt # pinned toolchain
|
uv pip install -r requirements.lock.txt
|
||||||
bin/facts/audit self # lexicon consistency gate
|
bin/facts/audit.go self
|
||||||
go test ./... && python -m unittest discover -s bin/tools -t .
|
go test ./... && uv run python -m unittest discover -s bin/tools -t .
|
||||||
```
|
```
|
||||||
|
|
||||||
Docker (optional, cached model + var volumes):
|
Docker (optional, cached model + var volumes):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker compose run --rm brain index # (re)index corpus
|
docker compose up -d brain # API (Zig CGO serve :8630)
|
||||||
docker compose run --rm brain search "query" # one-shot query
|
docker compose --profile index run --rm index # Python Ladybug rebuild
|
||||||
docker compose run --rm brain serve # bin/brain/serve.go
|
docker compose --profile picoclaw up brain-mcp # MCP on 127.0.0.1:8630
|
||||||
|
docker compose --profile reasoner up -d reasoner # CPU Ollama 127.0.0.1:11435
|
||||||
docker compose up brain-watch # auto re-index on change
|
docker compose up brain-watch # auto re-index on change
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -147,7 +169,7 @@ docker compose up brain-watch # auto re-index on change
|
|||||||
- [go-second-brain](https://github.com/eSlider/go-second-brain) — the earlier
|
- [go-second-brain](https://github.com/eSlider/go-second-brain) — the earlier
|
||||||
Neo4j + Qdrant + Matrix RAG brain
|
Neo4j + Qdrant + Matrix RAG brain
|
||||||
- [agent-skills](https://github.com/eSlider/agent-skills) — upstream
|
- [agent-skills](https://github.com/eSlider/agent-skills) — upstream
|
||||||
skills (`web-search`, `db-yaml`, …) that 2dph integrates
|
skills (`web-search`, `postgres`, …) that 2dph integrates
|
||||||
- detective method — the two-source method
|
- detective method — the two-source method
|
||||||
|
|
||||||
Work board (issues): [git.produktor.io/eSlider/2dph/issues](https://git.produktor.io/eSlider/2dph/issues).
|
Work board (issues): [git.produktor.io/eSlider/2dph/issues](https://git.produktor.io/eSlider/2dph/issues).
|
||||||
|
|||||||
+6
-4
@@ -1,20 +1,22 @@
|
|||||||
//usr/bin/env go run -tags=brain_eval "$0" "$@"; exit
|
//usr/bin/env go run -tags=system_ladybug,brain_eval "$0" "$@"; exit
|
||||||
//go:build brain_eval
|
//go:build cgo && system_ladybug && brain_eval
|
||||||
//
|
//
|
||||||
// bin/brain/eval.go - recall@5 gate.
|
// bin/brain/eval.go - recall@5 gate.
|
||||||
//
|
//
|
||||||
// ./bin/brain/eval.go
|
// ./bin/brain/eval.go
|
||||||
// ./bin/brain/eval.go --json
|
// ./bin/brain/eval.go --json
|
||||||
//
|
//
|
||||||
|
// Needs CGO + libladybug. Python bin/kb/eval is the CI fallback (no cgo).
|
||||||
|
// Control questions live in internal/brain/rank (cgo-free).
|
||||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/eSlider/2dph/internal/cmdbin"
|
"github.com/eSlider/2dph/internal/brain"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
os.Exit(cmdbin.ExecFile("bin/kb/eval", os.Args[1:]))
|
os.Exit(brain.MainEval(os.Args[1:]))
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-4
@@ -1,20 +1,23 @@
|
|||||||
//usr/bin/env go run -tags=brain_get "$0" "$@"; exit
|
//usr/bin/env go run -tags=system_ladybug,brain_get "$0" "$@"; exit
|
||||||
//go:build brain_get
|
//go:build cgo && system_ladybug && brain_get
|
||||||
//
|
//
|
||||||
// bin/brain/get.go - read one leaf by id.
|
// bin/brain/get.go - read one leaf by id.
|
||||||
//
|
//
|
||||||
// ./bin/brain/get.go <id>
|
// ./bin/brain/get.go <id>
|
||||||
// ./bin/brain/get.go <id> --body
|
// ./bin/brain/get.go <id> --body
|
||||||
|
// ./bin/brain/get.go <id> --json
|
||||||
//
|
//
|
||||||
|
// Needs CGO + libladybug. Python bin/kb/get is the CI fallback (no cgo).
|
||||||
|
// CGO compiler is Zig (`eval "$(bin/cgo/zig env)"`), not gcc.
|
||||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/eSlider/2dph/internal/cmdbin"
|
"github.com/eSlider/2dph/internal/brain"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
os.Exit(cmdbin.ExecFile("bin/kb/get", os.Args[1:]))
|
os.Exit(brain.MainGet(os.Args[1:]))
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -3,11 +3,11 @@
|
|||||||
//
|
//
|
||||||
// bin/brain/search.go - deduction search over the 2dph brain.
|
// bin/brain/search.go - deduction search over the 2dph brain.
|
||||||
//
|
//
|
||||||
// ./bin/brain/search.go "query" [--root facts|info] [--repo P] [-n N] [--json]
|
// ./bin/brain/search.go "query" [--root facts|info] [--repo P] [-n N] [--json] [--no-web]
|
||||||
// ./bin/brain/search.go serve [port]
|
// ./bin/brain/search.go serve [port]
|
||||||
// ./bin/brain/search.go --list-model
|
// ./bin/brain/search.go --list-model
|
||||||
//
|
//
|
||||||
// Needs CGO + libladybug (CGO_CFLAGS/CGO_LDFLAGS). Prefer the wrapper
|
// Needs CGO + libladybug via Zig (`eval "$(bin/cgo/zig env)"`), not gcc.
|
||||||
// bin/kb/search which sets those and builds a binary for the embed daemon.
|
// bin/kb/search which sets those and builds a binary for the embed daemon.
|
||||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
package main
|
package main
|
||||||
|
|||||||
+14
-6
@@ -1,18 +1,23 @@
|
|||||||
//usr/bin/env go run -tags=brain_serve "$0" "$@"; exit
|
//usr/bin/env go run -tags=brain_serve,system_ladybug "$0" "$@"; exit
|
||||||
//go:build brain_serve
|
//go:build brain_serve && cgo && system_ladybug
|
||||||
//
|
//
|
||||||
// bin/brain/serve.go - HTTP API for the 2dph brain.
|
// bin/brain/serve.go - HTTP API (in-process ladybug search).
|
||||||
//
|
//
|
||||||
// KB_ROOT=/path/to/2dph ./bin/brain/serve.go
|
// KB_ROOT=/path/to/2dph ./bin/brain/serve.go
|
||||||
// KB_SEARCH_CMD=... KB_WORKERS=4 KB_PORT=8630 ./bin/brain/serve.go
|
// KB_WORKERS=4 KB_PORT=8630 ./bin/brain/serve.go
|
||||||
//
|
//
|
||||||
// Default search backend is var/bin/brain-search (Go), not Python.
|
// GET /openapi.json same Ops table as the handlers
|
||||||
|
// POST /mcp JSON-RPC tools/list + tools/call
|
||||||
|
//
|
||||||
|
// Needs CGO + libladybug (same as bin/brain/search.go).
|
||||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/brain"
|
||||||
"github.com/eSlider/2dph/internal/httpapi"
|
"github.com/eSlider/2dph/internal/httpapi"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -22,5 +27,8 @@ func main() {
|
|||||||
os.Setenv("KB_ROOT", wd)
|
os.Setenv("KB_ROOT", wd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
httpapi.Run()
|
if err := brain.Ready(); err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
httpapi.Run(brain.HTTP{})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
//go:build brain_serve && !system_ladybug
|
||||||
|
//
|
||||||
|
// Fallback serve when ladybug cgo is not in the build (CI / tags=brain_serve).
|
||||||
|
// Production shebang is serve.go (in-process).
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/httpapi"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
if os.Getenv("KB_ROOT") == "" {
|
||||||
|
if wd, err := os.Getwd(); err == nil {
|
||||||
|
os.Setenv("KB_ROOT", wd)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
httpapi.Run(nil)
|
||||||
|
}
|
||||||
+5
-4
@@ -1,20 +1,21 @@
|
|||||||
//usr/bin/env go run -tags=brain_stats "$0" "$@"; exit
|
//usr/bin/env go run -tags=system_ladybug,brain_stats "$0" "$@"; exit
|
||||||
//go:build brain_stats
|
//go:build cgo && system_ladybug && brain_stats
|
||||||
//
|
//
|
||||||
// bin/brain/stats.go - index health.
|
// bin/brain/stats.go - index health.
|
||||||
//
|
//
|
||||||
// ./bin/brain/stats.go
|
// ./bin/brain/stats.go
|
||||||
// ./bin/brain/stats.go --json
|
// ./bin/brain/stats.go --json
|
||||||
//
|
//
|
||||||
|
// Needs CGO + libladybug. Python bin/kb/stats is the CI fallback (no cgo).
|
||||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/eSlider/2dph/internal/cmdbin"
|
"github.com/eSlider/2dph/internal/brain"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
os.Exit(cmdbin.ExecFile("bin/kb/stats", os.Args[1:]))
|
os.Exit(brain.MainStats(os.Args[1:]))
|
||||||
}
|
}
|
||||||
|
|||||||
Executable
+23
@@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# bin/cgo/zc++ — CGO CXX. Zig, not g++.
|
||||||
|
set -eu
|
||||||
|
ROOT="$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd)"
|
||||||
|
case "$(uname -m)" in
|
||||||
|
x86_64|amd64) TARGET=x86_64-linux-gnu ;;
|
||||||
|
aarch64|arm64) TARGET=aarch64-linux-gnu ;;
|
||||||
|
*)
|
||||||
|
echo "zc++: unsupported arch $(uname -m)" >&2
|
||||||
|
exit 2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if [ -n "${ZIG:-}" ] && [ -x "$ZIG" ]; then
|
||||||
|
:
|
||||||
|
elif [ -x "$ROOT/var/zig/zig" ]; then
|
||||||
|
ZIG="$ROOT/var/zig/zig"
|
||||||
|
elif command -v zig >/dev/null 2>&1; then
|
||||||
|
ZIG="$(command -v zig)"
|
||||||
|
else
|
||||||
|
echo "zc++: zig missing; run bin/cgo/zig first" >&2
|
||||||
|
exit 127
|
||||||
|
fi
|
||||||
|
exec "$ZIG" c++ -target "$TARGET" "$@"
|
||||||
Executable
+24
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# bin/cgo/zcc — CGO CC. Zig, not gcc.
|
||||||
|
# Go invokes CC with many args; a wrapper avoids spaces in $CC.
|
||||||
|
set -eu
|
||||||
|
ROOT="$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd)"
|
||||||
|
case "$(uname -m)" in
|
||||||
|
x86_64|amd64) TARGET=x86_64-linux-gnu ;;
|
||||||
|
aarch64|arm64) TARGET=aarch64-linux-gnu ;;
|
||||||
|
*)
|
||||||
|
echo "zcc: unsupported arch $(uname -m)" >&2
|
||||||
|
exit 2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if [ -n "${ZIG:-}" ] && [ -x "$ZIG" ]; then
|
||||||
|
:
|
||||||
|
elif [ -x "$ROOT/var/zig/zig" ]; then
|
||||||
|
ZIG="$ROOT/var/zig/zig"
|
||||||
|
elif command -v zig >/dev/null 2>&1; then
|
||||||
|
ZIG="$(command -v zig)"
|
||||||
|
else
|
||||||
|
echo "zcc: zig missing; run bin/cgo/zig first" >&2
|
||||||
|
exit 127
|
||||||
|
fi
|
||||||
|
exec "$ZIG" cc -target "$TARGET" "$@"
|
||||||
Executable
+130
@@ -0,0 +1,130 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# bin/cgo/zig — CGO toolchain: zig cc (not gcc) + pinned liblbug + libtokenizers.
|
||||||
|
#
|
||||||
|
# eval "$(bin/cgo/zig env)" # export CC/CXX/CGO_*
|
||||||
|
# bin/cgo/zig go build ... # ensure, then exec with env
|
||||||
|
# bin/cgo/zig ./bin/brain/search.go "query"
|
||||||
|
#
|
||||||
|
# Pins live in this file. Downloads land in var/ (gitignored).
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT="$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd)"
|
||||||
|
ZIG_VERSION=0.14.1
|
||||||
|
LBUG_VERSION=0.19.1
|
||||||
|
TOKENIZERS_VERSION=1.27.0
|
||||||
|
|
||||||
|
arch="$(uname -m)"
|
||||||
|
case "$arch" in
|
||||||
|
x86_64|amd64)
|
||||||
|
ZIG_ARCH=x86_64
|
||||||
|
LBUG_ARCH=x86_64
|
||||||
|
TOK_ARCH=x86_64
|
||||||
|
ZIG_SHA=24aeeec8af16c381934a6cd7d95c807a8cb2cf7df9fa40d359aa884195c4716c
|
||||||
|
LBUG_SHA=ed263ae913f68cb0ddba0b98548b58edaac49929766d03bdaaa83be46c68847d
|
||||||
|
TOK_SHA=72556cdca798dd4ea7cdaba308e5f0d68a8cb93b67c96edf485b7a0edd7b07f4
|
||||||
|
;;
|
||||||
|
aarch64|arm64)
|
||||||
|
ZIG_ARCH=aarch64
|
||||||
|
LBUG_ARCH=aarch64
|
||||||
|
TOK_ARCH=aarch64
|
||||||
|
ZIG_SHA=f7a654acc967864f7a050ddacfaa778c7504a0eca8d2b678839c21eea47c992b
|
||||||
|
LBUG_SHA=b07df2cd533c3976a2a3025866d6420a5f35514d0a822ecc4b2902d55b4725b7
|
||||||
|
TOK_SHA=e96545ad05930c26f51f63d932ee6d3bbd32bbed149e102c5290d587a2293067
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "bin/cgo/zig: unsupported arch $arch" >&2
|
||||||
|
exit 2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CACHE="$ROOT/var/cache"
|
||||||
|
LIB="$ROOT/lib-ladybug"
|
||||||
|
ZIG_DIR="$ROOT/var/zig-dist"
|
||||||
|
ZIG_BIN="$ROOT/var/zig/zig"
|
||||||
|
|
||||||
|
sha256of() {
|
||||||
|
if command -v sha256sum >/dev/null 2>&1; then
|
||||||
|
sha256sum "$1" | awk '{print $1}'
|
||||||
|
else
|
||||||
|
shasum -a 256 "$1" | awk '{print $1}'
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
fetch() {
|
||||||
|
local url="$1" dest="$2" expect="$3"
|
||||||
|
if [ -f "$dest" ] && [ "$(sha256of "$dest")" = "$expect" ]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
mkdir -p "$(dirname "$dest")"
|
||||||
|
echo "fetch $url" >&2
|
||||||
|
curl -fsSL "$url" -o "$dest"
|
||||||
|
local got
|
||||||
|
got="$(sha256of "$dest")"
|
||||||
|
if [ "$got" != "$expect" ]; then
|
||||||
|
echo "checksum mismatch $dest: got $got want $expect" >&2
|
||||||
|
rm -f "$dest"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
ensure_zig() {
|
||||||
|
if [ -n "${ZIG:-}" ] && [ -x "$ZIG" ]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
if [ -x "$ZIG_BIN" ]; then
|
||||||
|
export ZIG="$ZIG_BIN"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
if command -v zig >/dev/null 2>&1; then
|
||||||
|
export ZIG
|
||||||
|
ZIG="$(command -v zig)"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
local tar="$CACHE/zig-${ZIG_ARCH}-linux-${ZIG_VERSION}.tar.xz"
|
||||||
|
fetch "https://ziglang.org/download/${ZIG_VERSION}/zig-${ZIG_ARCH}-linux-${ZIG_VERSION}.tar.xz" \
|
||||||
|
"$tar" "$ZIG_SHA"
|
||||||
|
mkdir -p "$CACHE"
|
||||||
|
rm -rf "$ZIG_DIR"
|
||||||
|
tar -xJf "$tar" -C "$CACHE"
|
||||||
|
mv "$CACHE/zig-${ZIG_ARCH}-linux-${ZIG_VERSION}" "$ZIG_DIR"
|
||||||
|
mkdir -p "$ROOT/var/zig"
|
||||||
|
ln -sfn "$ZIG_DIR/zig" "$ZIG_BIN"
|
||||||
|
export ZIG="$ZIG_BIN"
|
||||||
|
}
|
||||||
|
|
||||||
|
ensure_libs() {
|
||||||
|
mkdir -p "$LIB"
|
||||||
|
if [ ! -f "$LIB/liblbug.so" ]; then
|
||||||
|
local tar="$CACHE/liblbug-linux-${LBUG_ARCH}.tar.gz"
|
||||||
|
fetch "https://github.com/LadybugDB/ladybug/releases/download/v${LBUG_VERSION}/liblbug-linux-${LBUG_ARCH}.tar.gz" \
|
||||||
|
"$tar" "$LBUG_SHA"
|
||||||
|
tar -xzf "$tar" -C "$LIB"
|
||||||
|
fi
|
||||||
|
if [ ! -f "$LIB/libtokenizers.a" ]; then
|
||||||
|
local tar="$CACHE/libtokenizers.linux-${TOK_ARCH}.tar.gz"
|
||||||
|
fetch "https://github.com/daulet/tokenizers/releases/download/v${TOKENIZERS_VERSION}/libtokenizers.linux-${TOK_ARCH}.tar.gz" \
|
||||||
|
"$tar" "$TOK_SHA"
|
||||||
|
tar -xzf "$tar" -C "$LIB"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
print_env() {
|
||||||
|
printf 'export ZIG=%q\n' "$ZIG"
|
||||||
|
printf 'export CC=%q\n' "$ROOT/bin/cgo/zcc"
|
||||||
|
printf 'export CXX=%q\n' "$ROOT/bin/cgo/zc++"
|
||||||
|
printf 'export CGO_ENABLED=1\n'
|
||||||
|
printf 'export CGO_CFLAGS=%q\n' "-I$LIB"
|
||||||
|
printf 'export CGO_LDFLAGS=%q\n' "-L$LIB -Wl,-rpath,${CGO_RPATH:-$LIB}"
|
||||||
|
}
|
||||||
|
|
||||||
|
ensure_zig
|
||||||
|
ensure_libs
|
||||||
|
|
||||||
|
cmd="${1:-env}"
|
||||||
|
if [ "$cmd" = "env" ]; then
|
||||||
|
print_env
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
eval "$(print_env)"
|
||||||
|
exec "$@"
|
||||||
+18
-7
@@ -1,13 +1,10 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# bin/docker-entrypoint - run 2dph tools inside the container.
|
# bin/docker-entrypoint - run 2dph tools inside the container.
|
||||||
#
|
#
|
||||||
# brain shell (default)
|
# API image (Zig CGO binaries):
|
||||||
# brain search <q> bin/brain/search.go
|
# serve | search | watch
|
||||||
# brain index bin/kb/index --with-mail
|
# Index image (Python write path, compose profile `index`):
|
||||||
# brain watch <dir> compiled /app/bin/watch (bin/brain/watch.go)
|
# index | extract | audit | search (deprecated python wrapper)
|
||||||
# brain serve compiled /app/bin/serve (bin/brain/serve.go)
|
|
||||||
# brain extract bin/facts/extract (docker×compose pairing)
|
|
||||||
# brain audit bin/facts/audit
|
|
||||||
#
|
#
|
||||||
# Usage comment starts at line 2 (self-describing convention).
|
# Usage comment starts at line 2 (self-describing convention).
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
@@ -15,6 +12,20 @@ set -euo pipefail
|
|||||||
CMD="${1:-shell}"
|
CMD="${1:-shell}"
|
||||||
shift || true
|
shift || true
|
||||||
|
|
||||||
|
if [ -x /usr/local/bin/brain-serve ]; then
|
||||||
|
case "$CMD" in
|
||||||
|
shell) exec bash ;;
|
||||||
|
serve) exec /usr/local/bin/brain-serve "$@" ;;
|
||||||
|
search) exec /usr/local/bin/brain-search "$@" ;;
|
||||||
|
watch) exec /usr/local/bin/brain-watch "$@" ;;
|
||||||
|
index)
|
||||||
|
echo "index is the Python sidecar: docker compose --profile index run --rm index" >&2
|
||||||
|
exit 2
|
||||||
|
;;
|
||||||
|
*) echo "unknown command: $CMD (api: serve|search|watch)" >&2; exit 2 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
case "$CMD" in
|
case "$CMD" in
|
||||||
shell) exec bash ;;
|
shell) exec bash ;;
|
||||||
search) exec "$KB_PY" /app/bin/kb/search "$@" ;;
|
search) exec "$KB_PY" /app/bin/kb/search "$@" ;;
|
||||||
|
|||||||
Executable
+21
@@ -0,0 +1,21 @@
|
|||||||
|
//usr/bin/env go run -tags=facts_audit "$0" "$@"; exit
|
||||||
|
//go:build facts_audit
|
||||||
|
//
|
||||||
|
// bin/facts/audit.go - 2-source + lexicon checks.
|
||||||
|
//
|
||||||
|
// ./bin/facts/audit.go self
|
||||||
|
// ./bin/facts/audit.go db
|
||||||
|
//
|
||||||
|
// Python bin/facts/audit is the implementation (CI runs it directly).
|
||||||
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/cmdbin"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
os.Exit(cmdbin.ExecFile("bin/facts/audit", os.Args[1:]))
|
||||||
|
}
|
||||||
Executable
+20
@@ -0,0 +1,20 @@
|
|||||||
|
//usr/bin/env go run -tags=facts_crm "$0" "$@"; exit
|
||||||
|
//go:build facts_crm
|
||||||
|
//
|
||||||
|
// bin/facts/crm.go - prove person↔company / company↔project (ooCRM × corpus).
|
||||||
|
//
|
||||||
|
// ./bin/facts/crm.go [--dry-run] [--mismatches]
|
||||||
|
//
|
||||||
|
// Python bin/facts/crm is the implementation. Graph write stays Python.
|
||||||
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/cmdbin"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
os.Exit(cmdbin.ExecFile("bin/facts/crm", os.Args[1:]))
|
||||||
|
}
|
||||||
Executable
+20
@@ -0,0 +1,20 @@
|
|||||||
|
//usr/bin/env go run -tags=facts_extract "$0" "$@"; exit
|
||||||
|
//go:build facts_extract
|
||||||
|
//
|
||||||
|
// bin/facts/extract.go - acquire confirmed facts (2-source each).
|
||||||
|
//
|
||||||
|
// ./bin/facts/extract.go [--json] [--dry-run]
|
||||||
|
//
|
||||||
|
// Python bin/facts/extract is the implementation. Graph write stays Python.
|
||||||
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/cmdbin"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
os.Exit(cmdbin.ExecFile("bin/facts/extract", os.Args[1:]))
|
||||||
|
}
|
||||||
+10
-138
@@ -1,153 +1,25 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
"""git/import - import git history (commits, authors, files) into the brain.
|
"""git/import — deprecated. Use bin/git/import.go (go-git, no git binary).
|
||||||
|
|
||||||
bin/git/import [REPO] import all commits -> leafs + graph
|
bin/git/import.go [REPO] [--json] [--limit N] [--since DATE]
|
||||||
bin/git/import --json emit import leafs as JSON, no write
|
|
||||||
bin/git/import --limit 100 cap commits processed
|
|
||||||
bin/git/import --since 2026-01-01 only recent commits
|
|
||||||
bin/git/import --root DIR run per repo dir under DIR
|
|
||||||
bin/git/import --no-env never read .env anywhere (default: true)
|
|
||||||
|
|
||||||
Reads `git log --no-merges --name-only` from the repo, maps commits to
|
|
||||||
`info` leafs (root=info, type=commit) and writes the version graph
|
|
||||||
`File -[:HAS_VERSION]-> Commit -[:AUTHORED]-> Person` into var/kb.lbug.
|
|
||||||
Idempotent: leaf MERGE by (source,text via leaf_id), graph MERGE by sha.
|
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import json
|
import os
|
||||||
import subprocess
|
|
||||||
import sys
|
import sys
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
ROOT = Path(__file__).resolve().parents[2]
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
sys.path.insert(0, str(ROOT / "bin" / "tools"))
|
|
||||||
|
|
||||||
from kblib import ( # noqa: E402
|
|
||||||
connect, ensure_indexes, init_schema, upsert_leaf,
|
|
||||||
)
|
|
||||||
from gitimport import commits_to_leafs, ensure_git_schema, index_commits, parse_log # noqa: E402
|
|
||||||
|
|
||||||
LOG_FMT = "--format=%x1e%H%x1f%an%x1f%ae%x1f%aI%x1f%s"
|
|
||||||
|
|
||||||
|
|
||||||
def git_log(repo: Path, limit: int = 0, since: str = "") -> str:
|
|
||||||
cmd = ["git", "-C", str(repo), "log", "--no-merges", "--name-only", LOG_FMT]
|
|
||||||
if since:
|
|
||||||
cmd += ["--since", since]
|
|
||||||
if limit:
|
|
||||||
cmd += ["-n", str(limit)]
|
|
||||||
try:
|
|
||||||
out = subprocess.run(cmd, capture_output=True, text=True, timeout=120)
|
|
||||||
except (FileNotFoundError, subprocess.TimeoutExpired):
|
|
||||||
return ""
|
|
||||||
if out.returncode != 0:
|
|
||||||
print(f"git/import: {repo}: {out.stderr.strip()}", file=sys.stderr)
|
|
||||||
return ""
|
|
||||||
return out.stdout
|
|
||||||
|
|
||||||
|
|
||||||
def repo_name(repo: Path) -> str:
|
|
||||||
try:
|
|
||||||
out = subprocess.run(
|
|
||||||
["git", "-C", str(repo), "remote", "get-url", "origin"],
|
|
||||||
capture_output=True, text=True, timeout=20)
|
|
||||||
url = out.stdout.strip()
|
|
||||||
return url.rstrip("/").split("/")[-1].removesuffix(".git") if url else repo.name
|
|
||||||
except (FileNotFoundError, subprocess.TimeoutExpired):
|
|
||||||
return repo.name
|
|
||||||
|
|
||||||
|
|
||||||
def embedder():
|
|
||||||
from model2vec import StaticModel
|
|
||||||
model = StaticModel.from_pretrained("minishlab/potion-multilingual-128M")
|
|
||||||
return lambda text: model.encode([text])[0].astype(float).tolist()
|
|
||||||
|
|
||||||
|
|
||||||
def import_repo(conn, repo: Path, embed, limit: int, since: str,
|
|
||||||
no_write: bool = False) -> tuple[int, int]:
|
|
||||||
raw = git_log(repo, limit, since)
|
|
||||||
commits = parse_log(raw)
|
|
||||||
leafs = commits_to_leafs(commits, repo_name(repo))
|
|
||||||
if no_write:
|
|
||||||
return len(commits), 0
|
|
||||||
written = 0
|
|
||||||
for lf in leafs:
|
|
||||||
query = f"{lf['heading']}\n\n{lf['text']}"
|
|
||||||
emb = embed(lf["text"]) if lf["text"] else None
|
|
||||||
upsert_leaf(conn, text=query, root="info", confidence="confirmed",
|
|
||||||
source=lf["source"], source_rev="git", how="git/import",
|
|
||||||
loc=lf["source"], type_=lf.get("type", "commit"),
|
|
||||||
embedding=emb)
|
|
||||||
written += 1
|
|
||||||
index_commits(conn, commits, repo_name(repo))
|
|
||||||
return len(commits), written
|
|
||||||
|
|
||||||
|
|
||||||
def main(argv: list[str]) -> int:
|
def main(argv: list[str]) -> int:
|
||||||
import argparse
|
print(
|
||||||
p = argparse.ArgumentParser(description="import git history into the brain")
|
"bin/git/import is deprecated; use bin/git/import.go (go-git)",
|
||||||
p.add_argument("repo", nargs="?", default=None)
|
file=sys.stderr,
|
||||||
p.add_argument("--root", default=None, help="directory of repos to import (each git dir separately)")
|
)
|
||||||
p.add_argument("--limit", type=int, default=0)
|
target = ROOT / "bin" / "git" / "import.go"
|
||||||
p.add_argument("--since", default="")
|
os.execvp("go", ["go", "run", str(target), *argv])
|
||||||
p.add_argument("--json", action="store_true")
|
return 1
|
||||||
p.add_argument("--dry-run", action="store_true", help="parse + report, no db write")
|
|
||||||
a = p.parse_args(argv)
|
|
||||||
|
|
||||||
repos: list[Path] = []
|
|
||||||
if a.repo:
|
|
||||||
repos = [Path(a.repo)]
|
|
||||||
elif a.root:
|
|
||||||
root = Path(a.root)
|
|
||||||
if root.is_file():
|
|
||||||
repos = [root]
|
|
||||||
else:
|
|
||||||
repos = [dp for dp in sorted(root.iterdir()) if (dp / ".git").exists() or dp.is_file()]
|
|
||||||
else:
|
|
||||||
repos = [ROOT]
|
|
||||||
|
|
||||||
total_commits = 0
|
|
||||||
results: list[dict] = []
|
|
||||||
if a.dry_run:
|
|
||||||
for repo in repos:
|
|
||||||
if not repo.exists():
|
|
||||||
continue
|
|
||||||
commits = parse_log(git_log(repo, a.limit, a.since))
|
|
||||||
name = repo_name(repo)
|
|
||||||
total_commits += len(commits)
|
|
||||||
results.append({"repo": name, "commits": len(commits),
|
|
||||||
"leafs": len(commits_to_leafs(commits, name)), "path": str(repo)})
|
|
||||||
if a.json:
|
|
||||||
print(json.dumps(results, indent=2))
|
|
||||||
else:
|
|
||||||
for r in results:
|
|
||||||
print(f"{r['repo']:<24} {r['commits']:>5} commits -> {r['leafs']} leafs {r['path']}")
|
|
||||||
return 0
|
|
||||||
|
|
||||||
# Never DROP FTS/VECTOR (ghost catalog). Upsert while indexes exist is OK;
|
|
||||||
# ensure_indexes only CREATEs when missing.
|
|
||||||
db, conn = connect(ROOT / "var" / "kb.lbug", read_only=False)
|
|
||||||
init_schema(conn)
|
|
||||||
embed = embedder()
|
|
||||||
rows: list[dict] = []
|
|
||||||
for repo in repos:
|
|
||||||
if not repo.exists():
|
|
||||||
continue
|
|
||||||
reached, written = import_repo(conn, repo, embed, a.limit, a.since)
|
|
||||||
total_commits += reached
|
|
||||||
rows.append({"repo": repo_name(repo), "commits": reached, "written": written})
|
|
||||||
ensure_indexes(conn)
|
|
||||||
conn.close()
|
|
||||||
db.close()
|
|
||||||
|
|
||||||
if a.json:
|
|
||||||
print(json.dumps(rows, indent=2))
|
|
||||||
else:
|
|
||||||
for r in rows:
|
|
||||||
print(f"imported {r['commits']:>5} commits -> {r['written']} leafs {r['repo']}")
|
|
||||||
print(f"total: {total_commits} commits")
|
|
||||||
return 0
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
Executable
+143
@@ -0,0 +1,143 @@
|
|||||||
|
//usr/bin/env go run "$0" "$@"; exit
|
||||||
|
//
|
||||||
|
// bin/git/import.go - read git history with go-git (no git binary).
|
||||||
|
//
|
||||||
|
// ./bin/git/import.go [REPO]
|
||||||
|
// ./bin/git/import.go --json
|
||||||
|
// ./bin/git/import.go --limit 100 --since 2026-01-01
|
||||||
|
// ./bin/git/import.go --root DIR
|
||||||
|
//
|
||||||
|
// Conversion only: prints commit leafs. Brain write is bin/brain/index.go.
|
||||||
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/cmdbin"
|
||||||
|
"github.com/eSlider/2dph/internal/gitlog"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
os.Exit(run(os.Args[1:]))
|
||||||
|
}
|
||||||
|
|
||||||
|
func run(args []string) int {
|
||||||
|
var repo, root, since string
|
||||||
|
limit := 0
|
||||||
|
jsonOut := false
|
||||||
|
i := 0
|
||||||
|
for i < len(args) {
|
||||||
|
a := args[i]
|
||||||
|
switch {
|
||||||
|
case a == "--json":
|
||||||
|
jsonOut = true
|
||||||
|
case a == "--limit" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
n, err := strconv.Atoi(args[i])
|
||||||
|
if err != nil || n < 0 {
|
||||||
|
fmt.Fprintf(os.Stderr, "git/import: --limit must be a non-negative integer\n")
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
limit = n
|
||||||
|
case a == "--since" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
since = args[i]
|
||||||
|
case a == "--root" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
root = args[i]
|
||||||
|
case a == "-h" || a == "--help":
|
||||||
|
fmt.Fprintln(os.Stderr, `usage: bin/git/import.go [REPO] [--json] [--limit N] [--since DATE] [--root DIR]`)
|
||||||
|
return 0
|
||||||
|
case len(a) > 0 && a[0] != '-':
|
||||||
|
repo = a
|
||||||
|
default:
|
||||||
|
fmt.Fprintf(os.Stderr, "git/import: unknown flag %s\n", a)
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
|
||||||
|
var sinceT time.Time
|
||||||
|
if since != "" {
|
||||||
|
var err error
|
||||||
|
sinceT, err = parseSince(since)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "git/import: %v\n", err)
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repos := []string{}
|
||||||
|
if repo != "" {
|
||||||
|
repos = []string{repo}
|
||||||
|
} else if root != "" {
|
||||||
|
entries, err := os.ReadDir(root)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "git/import: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
for _, e := range entries {
|
||||||
|
p := filepath.Join(root, e.Name())
|
||||||
|
if _, err := os.Stat(filepath.Join(p, ".git")); err == nil {
|
||||||
|
repos = append(repos, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
repos = []string{cmdbin.Root()}
|
||||||
|
}
|
||||||
|
|
||||||
|
opt := gitlog.Options{Limit: limit, Since: sinceT}
|
||||||
|
type row struct {
|
||||||
|
Repo string `json:"repo"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
Commits int `json:"commits"`
|
||||||
|
Leafs []gitlog.Leaf `json:"leafs,omitempty"`
|
||||||
|
}
|
||||||
|
var rows []row
|
||||||
|
for _, p := range repos {
|
||||||
|
name, err := gitlog.RepoName(p)
|
||||||
|
if err != nil && name == "" {
|
||||||
|
fmt.Fprintf(os.Stderr, "git/import: %s: %v\n", p, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
cs, err := gitlog.Log(p, opt)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "git/import: %s: %v\n", p, err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
leafs := make([]gitlog.Leaf, 0, len(cs))
|
||||||
|
for _, c := range cs {
|
||||||
|
leafs = append(leafs, gitlog.ToLeaf(c, name))
|
||||||
|
}
|
||||||
|
rows = append(rows, row{Repo: name, Path: p, Commits: len(cs), Leafs: leafs})
|
||||||
|
}
|
||||||
|
|
||||||
|
if jsonOut {
|
||||||
|
enc := json.NewEncoder(os.Stdout)
|
||||||
|
enc.SetIndent("", " ")
|
||||||
|
enc.SetEscapeHTML(false)
|
||||||
|
if err := enc.Encode(rows); err != nil {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
for _, r := range rows {
|
||||||
|
fmt.Printf("%-24s %5d commits %s\n", r.Repo, r.Commits, r.Path)
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseSince(s string) (time.Time, error) {
|
||||||
|
for _, layout := range []string{time.RFC3339, "2006-01-02"} {
|
||||||
|
if t, err := time.Parse(layout, s); err == nil {
|
||||||
|
return t, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return time.Time{}, fmt.Errorf("cannot parse --since %q", s)
|
||||||
|
}
|
||||||
+4
-6
@@ -1,10 +1,9 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# bin/kb/search — deprecated wrapper. Use bin/brain/search.go.
|
# bin/kb/search — deprecated wrapper. Use bin/brain/search.go.
|
||||||
# Sets CGO for ladybug, builds a binary (embed daemon needs a real executable),
|
# CGO via Zig (bin/cgo/zig), not gcc. Builds a binary then execs it.
|
||||||
# then execs it. Prints one deprecation line.
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
|
ROOT="$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd)"
|
||||||
BIN="$ROOT/var/bin/brain-search"
|
BIN="$ROOT/var/bin/brain-search"
|
||||||
SRC="$ROOT/internal/brain"
|
SRC="$ROOT/internal/brain"
|
||||||
CMD="$ROOT/bin/brain"
|
CMD="$ROOT/bin/brain"
|
||||||
@@ -24,11 +23,10 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$need_build" -eq 1 ]; then
|
if [ "$need_build" -eq 1 ]; then
|
||||||
echo "Building brain/search..." >&2
|
echo "Building brain/search (zig cc)..." >&2
|
||||||
(
|
(
|
||||||
cd "$ROOT" &&
|
cd "$ROOT" &&
|
||||||
CGO_CFLAGS="-I$ROOT/lib-ladybug" \
|
eval "$("$ROOT/bin/cgo/zig" env)" &&
|
||||||
CGO_LDFLAGS="-L$ROOT/lib-ladybug -Wl,-rpath,$ROOT/lib-ladybug" \
|
|
||||||
go build -tags system_ladybug -o "$BIN" ./bin/brain
|
go build -tags system_ladybug -o "$BIN" ./bin/brain
|
||||||
) || exit 1
|
) || exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
+85
-5
@@ -1,20 +1,100 @@
|
|||||||
//usr/bin/env go run -tags=markdown_import "$0" "$@"; exit
|
//usr/bin/env go run "$0" "$@"; exit
|
||||||
//go:build markdown_import
|
|
||||||
//
|
//
|
||||||
// bin/markdown/import.go - split markdown into leafs (mistune).
|
// bin/markdown/import.go - split markdown into leafs (H2 boundaries).
|
||||||
//
|
//
|
||||||
// ./bin/markdown/import.go [dir]
|
// ./bin/markdown/import.go [dir]
|
||||||
// ./bin/markdown/import.go --files a.md,b.md --json
|
// ./bin/markdown/import.go --files a.md,b.md --json
|
||||||
//
|
//
|
||||||
|
// Conversion only. Brain write is bin/brain/index.go.
|
||||||
|
// Python bin/md/import remains as a fallback.
|
||||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/eSlider/2dph/internal/cmdbin"
|
"github.com/eSlider/2dph/internal/mdleaves"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
os.Exit(cmdbin.ExecFile("bin/md/import", os.Args[1:]))
|
os.Exit(run(os.Args[1:]))
|
||||||
|
}
|
||||||
|
|
||||||
|
func run(args []string) int {
|
||||||
|
jsonOut := false
|
||||||
|
files := ""
|
||||||
|
root := "."
|
||||||
|
for i := 0; i < len(args); i++ {
|
||||||
|
a := args[i]
|
||||||
|
switch {
|
||||||
|
case a == "--json":
|
||||||
|
jsonOut = true
|
||||||
|
case a == "--files" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
files = args[i]
|
||||||
|
case strings.HasPrefix(a, "--files="):
|
||||||
|
files = strings.TrimPrefix(a, "--files=")
|
||||||
|
case a == "-h" || a == "--help":
|
||||||
|
fmt.Fprintln(os.Stderr, "bin/markdown/import.go [dir] [--files a.md,b.md] [--json]")
|
||||||
|
return 0
|
||||||
|
case strings.HasPrefix(a, "-"):
|
||||||
|
fmt.Fprintln(os.Stderr, "unknown arg:", a)
|
||||||
|
return 2
|
||||||
|
default:
|
||||||
|
root = a
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var paths []string
|
||||||
|
if files != "" {
|
||||||
|
for _, f := range strings.Split(files, ",") {
|
||||||
|
f = strings.TrimSpace(f)
|
||||||
|
if f != "" {
|
||||||
|
paths = append(paths, f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
st, err := os.Stat(root)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "md/import: no such path %s\n", root)
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
if !st.IsDir() {
|
||||||
|
paths = []string{root}
|
||||||
|
} else {
|
||||||
|
var err error
|
||||||
|
paths, err = mdleaves.WalkMarkdown(root)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "md/import: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(paths) == 0 {
|
||||||
|
fmt.Fprintln(os.Stderr, "md/import: no markdown files")
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
var all []mdleaves.Leaf
|
||||||
|
for _, p := range paths {
|
||||||
|
raw, err := os.ReadFile(p)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "md/import: %s: %v\n", p, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
all = append(all, mdleaves.ToAll(string(raw), p, "")...)
|
||||||
|
}
|
||||||
|
if jsonOut {
|
||||||
|
s, err := mdleaves.EncodeJSON(all)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintln(os.Stderr, err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
fmt.Print(s)
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
fmt.Print(mdleaves.EncodeYAML(all))
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|||||||
Executable
+91
@@ -0,0 +1,91 @@
|
|||||||
|
//usr/bin/env go run -tags=reasoner_bakeoff "$0" "$@"; exit
|
||||||
|
//go:build reasoner_bakeoff
|
||||||
|
//
|
||||||
|
// bin/reasoner/bakeoff.go - CPU tool-call bake-off against an OpenAI-compatible URL (D18).
|
||||||
|
//
|
||||||
|
// REASONER_BASE_URL=http://127.0.0.1:11435/v1 REASONER_MODEL=qwen3.5:9b ./bin/reasoner/bakeoff.go
|
||||||
|
// ./bin/reasoner/bakeoff.go --model MichelRosselli/bonsai-27b:Q1_0 --json
|
||||||
|
//
|
||||||
|
// Measures OpenAI tool_calls (search/get/audit) and RSS from Ollama /api/ps, not VRAM.
|
||||||
|
// PicoClaw is not in this repo; the tool names match internal/httpapi MCP ops.
|
||||||
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/reasoner"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
os.Exit(run(os.Args[1:]))
|
||||||
|
}
|
||||||
|
|
||||||
|
func run(args []string) int {
|
||||||
|
base := os.Getenv("REASONER_BASE_URL")
|
||||||
|
if base == "" {
|
||||||
|
base = "http://127.0.0.1:11435/v1"
|
||||||
|
}
|
||||||
|
model := os.Getenv("REASONER_MODEL")
|
||||||
|
if model == "" {
|
||||||
|
model = reasoner.OllamaRAM
|
||||||
|
}
|
||||||
|
jsonOut := false
|
||||||
|
device := "cpu"
|
||||||
|
for i := 0; i < len(args); i++ {
|
||||||
|
a := args[i]
|
||||||
|
switch {
|
||||||
|
case a == "--json":
|
||||||
|
jsonOut = true
|
||||||
|
case a == "--model" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
model = args[i]
|
||||||
|
case strings.HasPrefix(a, "--model="):
|
||||||
|
model = strings.TrimPrefix(a, "--model=")
|
||||||
|
case a == "--base-url" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
base = args[i]
|
||||||
|
case a == "--device" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
device = args[i]
|
||||||
|
case a == "-h" || a == "--help":
|
||||||
|
fmt.Fprintln(os.Stderr, "bin/reasoner/bakeoff.go [--model ID] [--base-url URL] [--device cpu] [--json]")
|
||||||
|
return 0
|
||||||
|
default:
|
||||||
|
fmt.Fprintln(os.Stderr, "unknown arg:", a)
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c := reasoner.Client{BaseURL: base, Model: model, Device: device}
|
||||||
|
rep := reasoner.Run(c)
|
||||||
|
raw, err := json.MarshalIndent(rep, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintln(os.Stderr, err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
if jsonOut {
|
||||||
|
fmt.Println(string(raw))
|
||||||
|
} else {
|
||||||
|
fmt.Printf("model: %s\n", rep.Model)
|
||||||
|
fmt.Printf("hf_id: %s\n", rep.HF)
|
||||||
|
fmt.Printf("device: %s\n", rep.Device)
|
||||||
|
fmt.Printf("tool_call: %d/%d\n", rep.ToolCallOK, rep.ToolCallN)
|
||||||
|
fmt.Printf("xml_leak: %d\n", rep.XMLLeak)
|
||||||
|
fmt.Printf("rss_mb: %d\n", rep.RSSMB)
|
||||||
|
fmt.Printf("vram_mb: %d\n", rep.VRAMMB)
|
||||||
|
for _, p := range rep.Prompts {
|
||||||
|
status := "fail"
|
||||||
|
if p.OK {
|
||||||
|
status = "ok"
|
||||||
|
}
|
||||||
|
fmt.Printf(" %s: %s wanted=%s got=%s xml=%v %dms %s\n", p.WantedTool, status, p.WantedTool, p.ToolName, p.XMLLeak, p.LatencyMS, p.Err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if rep.ToolCallN == 0 {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
// Commands in this directory are shebang mains (bakeoff.go).
|
||||||
|
package main
|
||||||
+1
-1
@@ -18,5 +18,5 @@ func main() {
|
|||||||
os.Setenv("KB_ROOT", wd)
|
os.Setenv("KB_ROOT", wd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
httpapi.Run()
|
httpapi.Run(nil)
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-60
@@ -1,21 +1,12 @@
|
|||||||
"""gitimport - parse `git log` output and turn commits into brain leafs.
|
"""gitimport - Ladybug graph writes for Commit/File/Person (no git binary).
|
||||||
|
|
||||||
Pure, testable functions. Field grammar (see bin/git/import):
|
Commit records come from bin/git/import.go (go-git). This module only MERGEs
|
||||||
|
the version graph File-[:HAS_VERSION]->Commit-[:AUTHORED]->Person.
|
||||||
git log --no-merges --name-only \
|
|
||||||
--format='%x1e%H%x1f%an%x1f%ae%x1f%aI%x1f%s'
|
|
||||||
|
|
||||||
0x1e = record separator, 0x1f = field separator.
|
|
||||||
Files: newline-separated lines following each record's subject.
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from dataclasses import dataclass, field
|
from dataclasses import dataclass, field
|
||||||
|
|
||||||
REC_SEP = "\x1e"
|
|
||||||
FIELD_SEP = "\x1f"
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class Commit:
|
class Commit:
|
||||||
@@ -26,54 +17,6 @@ class Commit:
|
|||||||
subject: str
|
subject: str
|
||||||
files: list[str] = field(default_factory=list)
|
files: list[str] = field(default_factory=list)
|
||||||
|
|
||||||
def leaf_text(self, repo: str) -> str:
|
|
||||||
head = f"commit {self.sha[:12]} in {repo} — {self.subject}"
|
|
||||||
body = [head, f"Author: {self.author} <{self.email}>", f"Date: {self.date}"]
|
|
||||||
if self.files:
|
|
||||||
body.append("Changing: " + ", ".join(self.files))
|
|
||||||
return "\n".join(body)
|
|
||||||
|
|
||||||
|
|
||||||
def parse_log(text: str) -> list[Commit]:
|
|
||||||
"""Parse `git log` output into Commit records.
|
|
||||||
|
|
||||||
Records are separated by 0x1e. A record is fields joined by 0x1f,
|
|
||||||
followed by optional newline-separated file paths inside the next
|
|
||||||
segment (git emits blank line + files after each record).
|
|
||||||
"""
|
|
||||||
commits: list[Commit] = []
|
|
||||||
# field records and file lists alternate; simpler: split on REC_SEP,
|
|
||||||
# each chunk = header line, possibly followed by newline + files.
|
|
||||||
for chunk in text.split(REC_SEP):
|
|
||||||
chunk = chunk.strip("\n")
|
|
||||||
if not chunk:
|
|
||||||
continue
|
|
||||||
lines = chunk.split("\n", 1)
|
|
||||||
header = lines[0].split(FIELD_SEP)
|
|
||||||
if len(header) < 5:
|
|
||||||
continue
|
|
||||||
sha, author, email, date, subject = header[:5]
|
|
||||||
files = [ln.strip() for ln in lines[1].splitlines() if ln.strip()] if len(lines) > 1 else []
|
|
||||||
commits.append(Commit(sha=sha, author=author, email=email,
|
|
||||||
date=date, subject=subject, files=files))
|
|
||||||
return commits
|
|
||||||
|
|
||||||
|
|
||||||
def commits_to_leafs(commits: list[Commit], repo: str) -> list[dict]:
|
|
||||||
"""Map commits to the leaf shape bin/kb/index expects (source/repo/...)."""
|
|
||||||
out: list[dict] = []
|
|
||||||
for c in commits:
|
|
||||||
out.append({
|
|
||||||
"source": f"{repo}@{c.sha}",
|
|
||||||
"repo": repo,
|
|
||||||
"heading": f"commit {c.sha[:12]} — {c.subject}",
|
|
||||||
"text": c.leaf_text(repo),
|
|
||||||
"type": "commit",
|
|
||||||
"status": "current",
|
|
||||||
"related": ",".join(c.files),
|
|
||||||
})
|
|
||||||
return out
|
|
||||||
|
|
||||||
|
|
||||||
GIT_SCHEMA = (
|
GIT_SCHEMA = (
|
||||||
"CREATE NODE TABLE IF NOT EXISTS Commit (id STRING, repo STRING, subject STRING, "
|
"CREATE NODE TABLE IF NOT EXISTS Commit (id STRING, repo STRING, subject STRING, "
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""D14 layout: bin/{subject}/{method}.go, libs in internal/, one go.mod."""
|
"""D14 layout: bin/{subject}/{method}.go, libs in internal/, one go.mod."""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
@@ -77,6 +78,44 @@ class BinLayoutTest(unittest.TestCase):
|
|||||||
for method in ("index.go", "get.go", "stats.go", "eval.go", "watch.go"):
|
for method in ("index.go", "get.go", "stats.go", "eval.go", "watch.go"):
|
||||||
self._assert_shebang(f"bin/brain/{method}")
|
self._assert_shebang(f"bin/brain/{method}")
|
||||||
|
|
||||||
|
def test_brain_get_stats_eval_are_not_python_exec(self) -> None:
|
||||||
|
for method in ("get.go", "stats.go", "eval.go"):
|
||||||
|
text = (ROOT / "bin" / "brain" / method).read_text()
|
||||||
|
self.assertNotIn(
|
||||||
|
"ExecFile",
|
||||||
|
text,
|
||||||
|
f"bin/brain/{method} must call internal/brain, not ExecFile Python",
|
||||||
|
)
|
||||||
|
self.assertNotIn(
|
||||||
|
"cmdbin",
|
||||||
|
text,
|
||||||
|
f"bin/brain/{method} must not import internal/cmdbin",
|
||||||
|
)
|
||||||
|
self.assertIn(
|
||||||
|
"system_ladybug",
|
||||||
|
text.splitlines()[0],
|
||||||
|
f"bin/brain/{method} shebang must pass -tags=system_ladybug",
|
||||||
|
)
|
||||||
|
self.assertIn(
|
||||||
|
"github.com/eSlider/2dph/internal/brain",
|
||||||
|
text,
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_eval_control_questions_live_in_rank(self) -> None:
|
||||||
|
rank = (ROOT / "internal" / "brain" / "rank" / "evalq.go").read_text()
|
||||||
|
py = (ROOT / "bin" / "kb" / "eval").read_text()
|
||||||
|
for frag in ("BM25", "DevOps", "LadybugDB"):
|
||||||
|
self.assertIn(frag, rank)
|
||||||
|
self.assertIn(frag, py)
|
||||||
|
self.assertIn("0.95", rank)
|
||||||
|
|
||||||
|
def test_facts_methods_are_shebangs(self) -> None:
|
||||||
|
for method in ("audit.go", "extract.go", "crm.go"):
|
||||||
|
self._assert_shebang(f"bin/facts/{method}")
|
||||||
|
text = (ROOT / "bin" / "facts" / method).read_text()
|
||||||
|
self.assertIn("cmdbin.ExecFile", text)
|
||||||
|
self.assertIn(f"bin/facts/{method.removesuffix('.go')}", text)
|
||||||
|
|
||||||
def test_mail_import_is_shebang_not_brain_write(self) -> None:
|
def test_mail_import_is_shebang_not_brain_write(self) -> None:
|
||||||
self._assert_shebang("bin/mail/import.go")
|
self._assert_shebang("bin/mail/import.go")
|
||||||
index_mail = (ROOT / "bin" / "mail" / "index_mail").read_text()
|
index_mail = (ROOT / "bin" / "mail" / "index_mail").read_text()
|
||||||
@@ -86,8 +125,74 @@ class BinLayoutTest(unittest.TestCase):
|
|||||||
"index_mail must point at bin/brain/index.go",
|
"index_mail must point at bin/brain/index.go",
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_markdown_import_is_shebang(self) -> None:
|
def test_markdown_import_is_go_not_python_exec(self) -> None:
|
||||||
self._assert_shebang("bin/markdown/import.go")
|
self._assert_shebang("bin/markdown/import.go")
|
||||||
|
text = (ROOT / "bin" / "markdown" / "import.go").read_text()
|
||||||
|
self.assertNotIn("ExecFile", text)
|
||||||
|
self.assertNotIn("cmdbin", text)
|
||||||
|
self.assertIn("internal/mdleaves", text)
|
||||||
|
self.assertNotIn("kb.lbug", text)
|
||||||
|
|
||||||
|
def test_import_adapters_do_not_write_ladybug(self) -> None:
|
||||||
|
for rel in (
|
||||||
|
"bin/mail/import.go",
|
||||||
|
"bin/mail/import",
|
||||||
|
"bin/markdown/import.go",
|
||||||
|
"bin/chats/import.go",
|
||||||
|
"bin/git/import.go",
|
||||||
|
):
|
||||||
|
text = (ROOT / rel).read_text()
|
||||||
|
self.assertNotIn("upsert_leaf", text, rel)
|
||||||
|
self.assertNotIn("kb.lbug", text, rel)
|
||||||
|
self.assertNotIn("var/brain.lbug", text, rel)
|
||||||
|
index = (ROOT / "bin" / "brain" / "index.go").read_text()
|
||||||
|
self.assertIn("bin/kb/index", index)
|
||||||
|
|
||||||
def test_postgres_query_is_shebang(self) -> None:
|
def test_postgres_query_is_shebang(self) -> None:
|
||||||
self._assert_shebang("bin/postgres/query.go")
|
self._assert_shebang("bin/postgres/query.go")
|
||||||
|
|
||||||
|
def test_git_import_is_gogit_shebang(self) -> None:
|
||||||
|
self._assert_shebang("bin/git/import.go")
|
||||||
|
py = (ROOT / "bin" / "git" / "import").read_text()
|
||||||
|
self.assertNotIn(
|
||||||
|
'["git"',
|
||||||
|
py,
|
||||||
|
"Python git/import must not subprocess the git binary",
|
||||||
|
)
|
||||||
|
self.assertIn("bin/git/import.go", py)
|
||||||
|
|
||||||
|
def test_web_search_is_shebang(self) -> None:
|
||||||
|
self._assert_shebang("bin/web/search.go")
|
||||||
|
py = (ROOT / "bin" / "web" / "search").read_text()
|
||||||
|
self.assertIn("bin/web/search.go", py)
|
||||||
|
|
||||||
|
def test_gitimport_py_has_no_git_binary(self) -> None:
|
||||||
|
py = (ROOT / "bin" / "tools" / "gitimport.py").read_text()
|
||||||
|
self.assertNotIn("subprocess", py)
|
||||||
|
self.assertNotIn("git log", py)
|
||||||
|
|
||||||
|
def test_gogit_is_direct_go_mod_require(self) -> None:
|
||||||
|
text = (ROOT / "go.mod").read_text()
|
||||||
|
first = text.split("require (")[1].split(")")[0]
|
||||||
|
self.assertRegex(first, r"github.com/go-git/go-git/v5\s+v")
|
||||||
|
for line in first.splitlines():
|
||||||
|
if "go-git/go-git" in line:
|
||||||
|
self.assertNotIn("indirect", line)
|
||||||
|
|
||||||
|
def test_cgo_uses_zig_not_gcc(self) -> None:
|
||||||
|
for rel in ("bin/cgo/zig", "bin/cgo/zcc", "bin/cgo/zc++"):
|
||||||
|
p = ROOT / rel
|
||||||
|
self.assertTrue(p.is_file(), f"missing {rel}")
|
||||||
|
self.assertTrue(
|
||||||
|
os.access(p, os.X_OK),
|
||||||
|
f"{rel} must be executable",
|
||||||
|
)
|
||||||
|
zig = (ROOT / "bin" / "cgo" / "zig").read_text()
|
||||||
|
self.assertIn("zig cc", zig)
|
||||||
|
self.assertIn("0.14.1", zig)
|
||||||
|
zcc = (ROOT / "bin" / "cgo" / "zcc").read_text()
|
||||||
|
self.assertIn('exec "$ZIG" cc', zcc)
|
||||||
|
self.assertNotIn("command -v gcc", zcc)
|
||||||
|
search = (ROOT / "bin" / "kb" / "search").read_text()
|
||||||
|
self.assertIn("bin/cgo/zig", search)
|
||||||
|
self.assertNotIn("command -v gcc", search)
|
||||||
|
|||||||
+13
-10
@@ -9,12 +9,6 @@ sys.path.insert(0, str(Path(__file__).resolve().parent))
|
|||||||
import kblib # noqa: E402
|
import kblib # noqa: E402
|
||||||
import gitimport # noqa: E402
|
import gitimport # noqa: E402
|
||||||
|
|
||||||
SAMPLE = (
|
|
||||||
"\x1e" + "a1b2c3d" + "\x1f" + "Ada Lovelace" + "\x1f" + "ada@example.com"
|
|
||||||
+ "\x1f" + "2026-08-10T12:00:00+01:00" + "\x1f" + "feat: first commit"
|
|
||||||
+ "\n\nREADME.md\nsrc/main.c\n"
|
|
||||||
)
|
|
||||||
|
|
||||||
COMMIT_PERSON_SCHEMA = (
|
COMMIT_PERSON_SCHEMA = (
|
||||||
"CREATE NODE TABLE IF NOT EXISTS Commit (id STRING, repo STRING, subject STRING, "
|
"CREATE NODE TABLE IF NOT EXISTS Commit (id STRING, repo STRING, subject STRING, "
|
||||||
"author STRING, email STRING, date STRING, PRIMARY KEY(id))"
|
"author STRING, email STRING, date STRING, PRIMARY KEY(id))"
|
||||||
@@ -26,6 +20,17 @@ HAS_VERSION_SCHEMA = "CREATE REL TABLE IF NOT EXISTS HAS_VERSION (FROM File TO C
|
|||||||
AUTHORED_SCHEMA = "CREATE REL TABLE IF NOT EXISTS AUTHORED (FROM Commit TO Person)"
|
AUTHORED_SCHEMA = "CREATE REL TABLE IF NOT EXISTS AUTHORED (FROM Commit TO Person)"
|
||||||
|
|
||||||
|
|
||||||
|
def sample_commit() -> gitimport.Commit:
|
||||||
|
return gitimport.Commit(
|
||||||
|
sha="a1b2c3d",
|
||||||
|
author="Ada Lovelace",
|
||||||
|
email="ada@example.com",
|
||||||
|
date="2026-08-10T12:00:00+01:00",
|
||||||
|
subject="feat: first commit",
|
||||||
|
files=["README.md", "src/main.c"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class GitGraphTest(unittest.TestCase):
|
class GitGraphTest(unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.dir = tempfile.mkdtemp()
|
self.dir = tempfile.mkdtemp()
|
||||||
@@ -42,14 +47,12 @@ class GitGraphTest(unittest.TestCase):
|
|||||||
self.db.close()
|
self.db.close()
|
||||||
|
|
||||||
def test_index_commits_creates_nodes_and_edges(self):
|
def test_index_commits_creates_nodes_and_edges(self):
|
||||||
cs = gitimport.parse_log(SAMPLE)
|
gitimport.index_commits(self.conn, [sample_commit()], "sample-repo")
|
||||||
gitimport.index_commits(self.conn, cs, "sample-repo")
|
|
||||||
rp = self.conn.execute("MATCH (p:Person) RETURN p.name, p.email").get_all()
|
rp = self.conn.execute("MATCH (p:Person) RETURN p.name, p.email").get_all()
|
||||||
self.assertEqual([tuple(r) for r in rp], [("Ada Lovelace", "ada@example.com")])
|
self.assertEqual([tuple(r) for r in rp], [("Ada Lovelace", "ada@example.com")])
|
||||||
rc = self.conn.execute("MATCH (c:Commit) RETURN c.id, c.repo").get_all()
|
rc = self.conn.execute("MATCH (c:Commit) RETURN c.id, c.repo").get_all()
|
||||||
self.assertEqual(len(rc), 1)
|
self.assertEqual(len(rc), 1)
|
||||||
self.assertEqual(rc[0][1], "sample-repo")
|
self.assertEqual(rc[0][1], "sample-repo")
|
||||||
# File -[:HAS_VERSION]-> Commit -[:AUTHORED]-> Person
|
|
||||||
rf = self.conn.execute(
|
rf = self.conn.execute(
|
||||||
"MATCH (f:File)-[:HAS_VERSION]->(c:Commit)-[:AUTHORED]->(p:Person) "
|
"MATCH (f:File)-[:HAS_VERSION]->(c:Commit)-[:AUTHORED]->(p:Person) "
|
||||||
"RETURN f.path, c.id, p.email").get_all()
|
"RETURN f.path, c.id, p.email").get_all()
|
||||||
@@ -58,7 +61,7 @@ class GitGraphTest(unittest.TestCase):
|
|||||||
self.assertTrue(all(r[2] == "ada@example.com" for r in rf))
|
self.assertTrue(all(r[2] == "ada@example.com" for r in rf))
|
||||||
|
|
||||||
def test_index_commits_idempotent(self):
|
def test_index_commits_idempotent(self):
|
||||||
cs = gitimport.parse_log(SAMPLE)
|
cs = [sample_commit()]
|
||||||
gitimport.index_commits(self.conn, cs, "sample-repo")
|
gitimport.index_commits(self.conn, cs, "sample-repo")
|
||||||
gitimport.index_commits(self.conn, cs, "sample-repo")
|
gitimport.index_commits(self.conn, cs, "sample-repo")
|
||||||
n = self.conn.execute("MATCH (c:Commit) RETURN count(*)").get_all()[0][0]
|
n = self.conn.execute("MATCH (c:Commit) RETURN count(*)").get_all()[0][0]
|
||||||
|
|||||||
@@ -1,57 +0,0 @@
|
|||||||
import sys
|
|
||||||
import unittest
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent))
|
|
||||||
|
|
||||||
import gitimport # noqa: E402
|
|
||||||
|
|
||||||
SAMPLE = (
|
|
||||||
"\x1e" + "a1b2c3d" + "\x1f" + "Ada Lovelace" + "\x1f" + "ada@example.com"
|
|
||||||
+ "\x1f" + "2026-08-10T12:00:00+01:00" + "\x1f" + "feat: first commit"
|
|
||||||
+ "\n\nREADME.md\nsrc/main.c\n"
|
|
||||||
+ "\x1e" + "e4f5a6b" + "\x1f" + "Bob Babbage" + "\x1f" + "bob@example.com"
|
|
||||||
+ "\x1f" + "2026-08-11T09:30:00+01:00" + "\x1f" + "fix: typo"
|
|
||||||
+ "\n\ndocs/notes.md"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class GitparseTest(unittest.TestCase):
|
|
||||||
def test_parses_records(self):
|
|
||||||
cs = gitimport.parse_log(SAMPLE)
|
|
||||||
self.assertEqual(len(cs), 2)
|
|
||||||
|
|
||||||
def test_parses_commit_fields(self):
|
|
||||||
cs = gitimport.parse_log(SAMPLE)
|
|
||||||
c = cs[0]
|
|
||||||
self.assertEqual(c.sha, "a1b2c3d")
|
|
||||||
self.assertEqual(c.author, "Ada Lovelace")
|
|
||||||
self.assertEqual(c.email, "ada@example.com")
|
|
||||||
self.assertEqual(c.date, "2026-08-10T12:00:00+01:00")
|
|
||||||
self.assertEqual(c.subject, "feat: first commit")
|
|
||||||
|
|
||||||
def test_parses_changed_files(self):
|
|
||||||
cs = gitimport.parse_log(SAMPLE)
|
|
||||||
self.assertEqual(cs[0].files, ["README.md", "src/main.c"])
|
|
||||||
self.assertEqual(cs[1].files, ["docs/notes.md"])
|
|
||||||
|
|
||||||
def test_ignores_empty(self):
|
|
||||||
self.assertEqual(gitimport.parse_log(""), [])
|
|
||||||
|
|
||||||
def test_skip_malformed_record(self):
|
|
||||||
self.assertEqual(gitimport.parse_log("\x1eweird\x1e"), [])
|
|
||||||
|
|
||||||
def test_commit_leaf_shape(self):
|
|
||||||
leafs = gitimport.commits_to_leafs(gitimport.parse_log(SAMPLE), "sample-repo")
|
|
||||||
self.assertEqual(len(leafs), 2)
|
|
||||||
lf = leafs[0]
|
|
||||||
self.assertEqual(lf["type"], "commit")
|
|
||||||
self.assertEqual(lf["repo"], "sample-repo")
|
|
||||||
self.assertEqual(lf["source"], "sample-repo@a1b2c3d")
|
|
||||||
self.assertIn("Ada Lovelace", lf["text"])
|
|
||||||
self.assertIn("README.md", lf["related"])
|
|
||||||
self.assertIn("feat: first commit", lf["heading"])
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
"""Import adapters write files only. Index rebuild is brain/index (D14 / Gitea #7)."""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
|
|
||||||
|
|
||||||
|
class IndexAdapterTest(unittest.TestCase):
|
||||||
|
def test_dry_run_fixture_corpus_does_not_write_lbug(self) -> None:
|
||||||
|
tmp = Path(tempfile.mkdtemp())
|
||||||
|
(tmp / "note.md").write_text("# Fixture\n\n## Leaf\n\nhello corpus\n", encoding="utf-8")
|
||||||
|
lbug = tmp / "kb.lbug"
|
||||||
|
try:
|
||||||
|
import ladybug # noqa: F401
|
||||||
|
except ImportError:
|
||||||
|
venv_py = ROOT / ".venv" / "bin" / "python"
|
||||||
|
if not venv_py.is_file():
|
||||||
|
self.skipTest("ladybug missing")
|
||||||
|
py = str(venv_py)
|
||||||
|
else:
|
||||||
|
py = sys.executable
|
||||||
|
proc = subprocess.run(
|
||||||
|
[py, str(ROOT / "bin" / "kb" / "index"), "--dry-run", "--json", "--corpus", str(tmp)],
|
||||||
|
cwd=ROOT,
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
env=os.environ.copy(),
|
||||||
|
check=False,
|
||||||
|
)
|
||||||
|
self.assertEqual(proc.returncode, 0, proc.stderr)
|
||||||
|
msg = json.loads(proc.stdout)
|
||||||
|
self.assertTrue(msg.get("dry_run"))
|
||||||
|
self.assertGreaterEqual(msg.get("corpus_total", 0), 1)
|
||||||
|
self.assertFalse(lbug.exists(), "dry-run must not create a Ladybug file")
|
||||||
@@ -39,12 +39,114 @@ class PublishedDocsTest(unittest.TestCase):
|
|||||||
"mail index is a brain write; README must name bin/brain/index.go",
|
"mail index is a brain write; README must name bin/brain/index.go",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_readme_git_import_is_gogit(self) -> None:
|
||||||
|
text = (ROOT / "README.md").read_text()
|
||||||
|
self.assertIn("bin/git/import.go", text)
|
||||||
|
self.assertIn("go-git", text)
|
||||||
|
self.assertIn("D19", (ROOT / "PLAN.md").read_text())
|
||||||
|
|
||||||
|
def test_web_search_is_go_not_ops_host(self) -> None:
|
||||||
|
readme = (ROOT / "README.md").read_text()
|
||||||
|
self.assertIn("bin/web/search.go", readme)
|
||||||
|
skill = (ROOT / "skills" / "web-search" / "SKILL.md").read_text()
|
||||||
|
self.assertIn("bin/web/search.go", skill)
|
||||||
|
self.assertNotIn("search.ops.io", skill)
|
||||||
|
self.assertNotIn("search.ops.io", readme)
|
||||||
|
compose = (ROOT / "compose.yaml").read_text()
|
||||||
|
self.assertIn("searxng", compose)
|
||||||
|
self.assertNotIn("search.ops.io", compose)
|
||||||
|
settings = (ROOT / "deploy" / "searxng" / "settings.yml").read_text()
|
||||||
|
self.assertNotIn("password", settings.lower())
|
||||||
|
self.assertIn("json", settings)
|
||||||
|
|
||||||
|
def test_picoclaw_compose_profile_has_mcp_example(self) -> None:
|
||||||
|
compose = (ROOT / "compose.yaml").read_text()
|
||||||
|
self.assertIn('profiles: ["picoclaw"]', compose)
|
||||||
|
self.assertIn("127.0.0.1:8630", compose)
|
||||||
|
example = (ROOT / "deploy" / "picoclaw" / "mcp.json.example").read_text()
|
||||||
|
self.assertIn("127.0.0.1:8630/mcp", example)
|
||||||
|
self.assertNotIn("password", example.lower())
|
||||||
|
self.assertNotIn("token", example.lower())
|
||||||
|
docs = (ROOT / "docs" / "picoclaw.md").read_text()
|
||||||
|
self.assertIn("search", docs)
|
||||||
|
self.assertIn("throttled", docs)
|
||||||
|
|
||||||
|
def test_readme_read_path_is_go(self) -> None:
|
||||||
|
plan = (ROOT / "PLAN.md").read_text()
|
||||||
|
self.assertIn("get.go", plan)
|
||||||
|
self.assertIn("CI fallback", plan)
|
||||||
|
design = (ROOT / "docs" / "design.md").read_text()
|
||||||
|
self.assertIn("internal/brain/rank", design)
|
||||||
|
self.assertIn("They do not exec Python", design)
|
||||||
|
|
||||||
|
def test_openapi_mcp_from_same_handlers(self) -> None:
|
||||||
|
plan = (ROOT / "PLAN.md").read_text()
|
||||||
|
self.assertIn("D20", plan)
|
||||||
|
self.assertIn("/openapi.json", (ROOT / "README.md").read_text())
|
||||||
|
self.assertIn("/mcp", (ROOT / "README.md").read_text())
|
||||||
|
skill = (ROOT / "skills" / "brain" / "SKILL.md").read_text()
|
||||||
|
self.assertIn("/mcp", skill)
|
||||||
|
self.assertFalse((ROOT / "skills" / "db-yaml").exists())
|
||||||
|
self.assertTrue((ROOT / "skills" / "postgres" / "SKILL.md").is_file())
|
||||||
|
|
||||||
|
def test_cgo_zig_and_index_profile(self) -> None:
|
||||||
|
plan = (ROOT / "PLAN.md").read_text()
|
||||||
|
self.assertIn("D21", plan)
|
||||||
|
self.assertIn("zig cc", plan)
|
||||||
|
dockerfile = (ROOT / "Dockerfile").read_text()
|
||||||
|
self.assertIn("bin/cgo/zcc", dockerfile)
|
||||||
|
self.assertIn("FROM debian:bookworm-slim AS api", dockerfile)
|
||||||
|
self.assertIn("FROM python:3.12-slim AS index", dockerfile)
|
||||||
|
api = dockerfile[dockerfile.index("FROM debian:bookworm-slim AS api") :]
|
||||||
|
self.assertNotIn("pip install", api)
|
||||||
|
compose = (ROOT / "compose.yaml").read_text()
|
||||||
|
self.assertIn('profiles: ["index"]', compose)
|
||||||
|
self.assertIn("target: api", compose)
|
||||||
|
|
||||||
|
def test_reasoner_docs_name_real_hf_ids_cpu_sidecar(self) -> None:
|
||||||
|
docs = (ROOT / "docs" / "reasoner.md").read_text()
|
||||||
|
for hf in (
|
||||||
|
"Qwen/Qwen3.5-9B",
|
||||||
|
"Qwen/Qwen3.6-27B",
|
||||||
|
"prism-ml/Bonsai-27B-gguf",
|
||||||
|
):
|
||||||
|
self.assertIn(hf, docs)
|
||||||
|
self.assertIn("no official qwen3.6-9b", docs.lower())
|
||||||
|
self.assertIn("OLLAMA_NUM_GPU", docs)
|
||||||
|
self.assertIn("rss_mb", docs)
|
||||||
|
self.assertIn("vram_mb", docs)
|
||||||
|
self.assertIn("3/3", docs)
|
||||||
|
self.assertIn("Do not claim 9B is better at tools", docs)
|
||||||
|
self.assertNotIn("Qwen/Qwen3.6-9B", docs)
|
||||||
|
plan = (ROOT / "PLAN.md").read_text()
|
||||||
|
self.assertIn("D18", plan)
|
||||||
|
self.assertIn("Qwen/Qwen3.5-9B", plan)
|
||||||
|
compose = (ROOT / "compose.yaml").read_text()
|
||||||
|
self.assertIn('profiles: ["reasoner"]', compose)
|
||||||
|
self.assertIn("OLLAMA_NUM_GPU", compose)
|
||||||
|
self.assertIn("127.0.0.1:11435", compose)
|
||||||
|
dockerfile = (ROOT / "Dockerfile").read_text()
|
||||||
|
self.assertNotIn(".gguf", dockerfile.lower())
|
||||||
|
self.assertNotIn(".safetensors", dockerfile.lower())
|
||||||
|
api = dockerfile[dockerfile.index("FROM debian:bookworm-slim AS api") :]
|
||||||
|
self.assertNotIn("COPY models", api)
|
||||||
|
self.assertNotIn("qwen", api.lower())
|
||||||
|
|
||||||
|
def test_readme_search_escalates_web(self) -> None:
|
||||||
|
text = (ROOT / "README.md").read_text()
|
||||||
|
self.assertIn("--no-web", text)
|
||||||
|
self.assertIn("D17", (ROOT / "PLAN.md").read_text())
|
||||||
|
skill = (ROOT / "skills" / "brain" / "SKILL.md").read_text()
|
||||||
|
self.assertIn("`web` block", skill)
|
||||||
|
|
||||||
def test_docs_do_not_claim_hop_walks(self) -> None:
|
def test_docs_do_not_claim_hop_walks(self) -> None:
|
||||||
paths = [
|
paths = [
|
||||||
ROOT / "README.md",
|
ROOT / "README.md",
|
||||||
ROOT / "docs" / "design.md",
|
ROOT / "docs" / "design.md",
|
||||||
ROOT / "skills" / "kb-search" / "SKILL.md",
|
ROOT / "skills" / "brain" / "SKILL.md",
|
||||||
ROOT / "skills" / "diataxis-docs" / "SKILL.md",
|
ROOT / "skills" / "diataxis-docs" / "SKILL.md",
|
||||||
|
ROOT / "docs" / "runbook.md",
|
||||||
|
ROOT / "docs" / "README.md",
|
||||||
]
|
]
|
||||||
# Command-style `--hop 1` / `--hop N` plus follow/walk = the old lie.
|
# Command-style `--hop 1` / `--hop N` plus follow/walk = the old lie.
|
||||||
# Honest "not implemented" notes must not match.
|
# Honest "not implemented" notes must not match.
|
||||||
@@ -55,3 +157,19 @@ class PublishedDocsTest(unittest.TestCase):
|
|||||||
lie.search(text),
|
lie.search(text),
|
||||||
f"{path.relative_to(ROOT)} still claims --hop walks the graph",
|
f"{path.relative_to(ROOT)} still claims --hop walks the graph",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_docs_are_portable_diataxis(self) -> None:
|
||||||
|
index = (ROOT / "docs" / "README.md").read_text()
|
||||||
|
self.assertIn("type: reference", index)
|
||||||
|
for d in ("D3", "D6", "D14", "D15", "D17", "D18"):
|
||||||
|
self.assertIn(d, index)
|
||||||
|
runbook = (ROOT / "docs" / "runbook.md").read_text()
|
||||||
|
self.assertIn("type: howto", runbook)
|
||||||
|
self.assertIn("bin/brain/search.go", runbook)
|
||||||
|
self.assertIn("bin/brain/index.go", runbook)
|
||||||
|
self.assertNotIn("search.ops.io", runbook)
|
||||||
|
self.assertNotIn("/mnt/", runbook)
|
||||||
|
self.assertNotIn("/home/", runbook)
|
||||||
|
readme = (ROOT / "README.md").read_text()
|
||||||
|
self.assertIn("docs/runbook.md", readme)
|
||||||
|
self.assertNotIn("search.ops.io", readme)
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
"""Skills must name live commands; every bin/ path in SKILL.md must exist."""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
|
BIN_PATH = re.compile(r"(bin/[A-Za-z0-9_./-]+)")
|
||||||
|
|
||||||
|
|
||||||
|
class SkillsTest(unittest.TestCase):
|
||||||
|
def test_db_yaml_renamed_to_postgres(self) -> None:
|
||||||
|
self.assertFalse(
|
||||||
|
(ROOT / "skills" / "db-yaml").exists(),
|
||||||
|
"skills/db-yaml must be skills/postgres",
|
||||||
|
)
|
||||||
|
self.assertTrue((ROOT / "skills" / "postgres" / "SKILL.md").is_file())
|
||||||
|
text = (ROOT / "skills" / "postgres" / "SKILL.md").read_text()
|
||||||
|
self.assertIn("bin/postgres/query.go", text)
|
||||||
|
self.assertNotIn("search.ops.io", text)
|
||||||
|
|
||||||
|
def test_every_bin_path_in_skills_exists(self) -> None:
|
||||||
|
missing: list[str] = []
|
||||||
|
for path in (ROOT / "skills").rglob("SKILL.md"):
|
||||||
|
text = path.read_text()
|
||||||
|
for m in BIN_PATH.finditer(text):
|
||||||
|
rel = m.group(1).rstrip(")`.,;")
|
||||||
|
candidate = ROOT / rel
|
||||||
|
if not candidate.exists():
|
||||||
|
missing.append(f"{path.relative_to(ROOT)}: {rel}")
|
||||||
|
self.assertEqual(missing, [], "skill bin paths must exist")
|
||||||
|
|
||||||
|
def test_brain_skill_lists_generated_tools(self) -> None:
|
||||||
|
tools = (ROOT / "skills" / "brain" / "tools.md").read_text()
|
||||||
|
skill = (ROOT / "skills" / "brain" / "SKILL.md").read_text()
|
||||||
|
self.assertIn("tools.md", skill)
|
||||||
|
for name in ("search", "get", "stats", "audit"):
|
||||||
|
self.assertIn(f"`{name}`", tools)
|
||||||
|
|
||||||
|
def test_picoclaw_lists_tool_order(self) -> None:
|
||||||
|
skill = (ROOT / "skills" / "picoclaw" / "SKILL.md").read_text()
|
||||||
|
agents = (ROOT / "AGENTS.md").read_text()
|
||||||
|
self.assertIn("**`search`**", skill)
|
||||||
|
self.assertIn("**`get`**", skill)
|
||||||
|
self.assertIn("**`audit`**", skill)
|
||||||
|
self.assertIn("throttled", skill.lower())
|
||||||
|
self.assertIn("not a negative finding", agents)
|
||||||
|
self.assertIn("Fact-check every", agents)
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
"""Every bin/ path named in skills/ must exist on disk."""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
|
BIN_PATH = re.compile(r"\b(bin/[A-Za-z0-9_./-]+)")
|
||||||
|
|
||||||
|
|
||||||
|
class SkillsBinPathsTest(unittest.TestCase):
|
||||||
|
def test_agent_cost_skill_is_gone(self) -> None:
|
||||||
|
self.assertFalse(
|
||||||
|
(ROOT / "skills" / "agent-cost").exists(),
|
||||||
|
"skills/agent-cost documents bin/agents/cost which does not exist",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_brain_skill_replaces_kb_search(self) -> None:
|
||||||
|
self.assertTrue((ROOT / "skills" / "brain" / "SKILL.md").is_file())
|
||||||
|
self.assertFalse((ROOT / "skills" / "kb-search").exists())
|
||||||
|
|
||||||
|
def test_skill_bin_paths_exist(self) -> None:
|
||||||
|
missing: list[str] = []
|
||||||
|
for skill in sorted((ROOT / "skills").rglob("SKILL.md")):
|
||||||
|
text = skill.read_text()
|
||||||
|
for match in BIN_PATH.findall(text):
|
||||||
|
rel = match.rstrip("`'.,")
|
||||||
|
if rel.endswith(".go") or Path(rel).suffix == "" or Path(rel).suffix in {".go", ".py"}:
|
||||||
|
p = ROOT / rel
|
||||||
|
if not p.exists():
|
||||||
|
missing.append(f"{skill.relative_to(ROOT)}: {rel}")
|
||||||
|
self.assertEqual(missing, [], "SKILL.md names bin/ paths that do not exist")
|
||||||
+12
-136
@@ -1,150 +1,26 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
"""web/search - web search through the self-hosted SearXNG at search.ops.io.
|
"""web/search — deprecated. Use bin/web/search.go (SearXNG, no Python client).
|
||||||
|
|
||||||
bin/web/search "LadybugDB vector search"
|
bin/web/search.go QUERY [--json] [-n N] [--site HOST]
|
||||||
bin/web/search "model2vec multilingual" --site github.com
|
|
||||||
bin/web/search "uclancy" --category it -n 3 --json | jq -r '.results[].url'
|
|
||||||
bin/web/search "sqlite-vec" --refresh # ignore the cached answer
|
|
||||||
|
|
||||||
This complements bin/kb/search: the knowledge base holds our own facts, this
|
|
||||||
reaches the public web. Use it as the second, independent source that the
|
|
||||||
detective method asks for.
|
|
||||||
|
|
||||||
Exit codes: 0 results, 2 refused as possible PII, 3 throttled (not "nothing
|
|
||||||
found" - the instance answers 200 with an empty list when it throttles).
|
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import argparse
|
|
||||||
import fcntl
|
|
||||||
import json
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import time
|
|
||||||
import urllib.parse
|
|
||||||
import urllib.request
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
TOOLS = Path(__file__).resolve().parents[1] / "tools"
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
sys.path.insert(0, str(TOOLS))
|
|
||||||
sys.path.insert(0, str(TOOLS / "web-search"))
|
|
||||||
|
|
||||||
import websearch as ws # noqa: E402
|
|
||||||
from yamlout import to_yaml # noqa: E402
|
|
||||||
|
|
||||||
CONFIG = Path(os.environ.get("BRAIN_SEARCH_ENV", Path.home() / ".config/brain/search.env"))
|
|
||||||
CACHE = Path(os.environ.get("BRAIN_SEARCH_CACHE", Path.home() / ".cache/brain/web-search.sqlite"))
|
|
||||||
LOCK = CACHE.with_suffix(".lock")
|
|
||||||
|
|
||||||
|
|
||||||
def load_config() -> dict:
|
def main(argv: list[str]) -> int:
|
||||||
if not CONFIG.exists():
|
print(
|
||||||
sys.exit(f"no credentials at {CONFIG} (mode 600, BRAIN_SEARCH_URL/USER/PASS)")
|
"bin/web/search is deprecated; use bin/web/search.go",
|
||||||
conf = {}
|
file=sys.stderr,
|
||||||
for line in CONFIG.read_text().splitlines():
|
)
|
||||||
line = line.strip()
|
target = ROOT / "bin" / "web" / "search.go"
|
||||||
if not line or line.startswith("#") or "=" not in line:
|
os.execvp("go", ["go", "run", str(target), *argv])
|
||||||
continue
|
return 1
|
||||||
key, _, value = line.partition("=")
|
|
||||||
conf[key.strip()] = value.strip().strip("\"'")
|
|
||||||
missing = {"BRAIN_SEARCH_URL", "BRAIN_SEARCH_USER", "BRAIN_SEARCH_PASS"} - conf.keys()
|
|
||||||
if missing:
|
|
||||||
sys.exit(f"{CONFIG} is missing {', '.join(sorted(missing))}")
|
|
||||||
return conf
|
|
||||||
|
|
||||||
|
|
||||||
def fetch(conf: dict, query: str, params: dict, timeout: int) -> dict:
|
|
||||||
args = {"q": query, "format": "json", **params}
|
|
||||||
url = f"{conf['BRAIN_SEARCH_URL'].rstrip('/')}/search?{urllib.parse.urlencode(args)}"
|
|
||||||
request = urllib.request.Request(url)
|
|
||||||
token = f"{conf['BRAIN_SEARCH_USER']}:{conf['BRAIN_SEARCH_PASS']}".encode()
|
|
||||||
import base64
|
|
||||||
request.add_header("Authorization", "Basic " + base64.b64encode(token).decode())
|
|
||||||
with urllib.request.urlopen(request, timeout=timeout) as response:
|
|
||||||
return json.loads(response.read().decode())
|
|
||||||
|
|
||||||
|
|
||||||
def main() -> int:
|
|
||||||
parser = argparse.ArgumentParser(description="web search via SearXNG")
|
|
||||||
parser.add_argument("query")
|
|
||||||
parser.add_argument("-n", "--limit", type=int, default=ws.DEFAULT_LIMIT)
|
|
||||||
parser.add_argument("--site", help="restrict to one domain")
|
|
||||||
parser.add_argument("--lang", help="language code, e.g. de")
|
|
||||||
parser.add_argument("--fresh", choices=["day", "week", "month", "year"],
|
|
||||||
help="time range")
|
|
||||||
parser.add_argument("--category", help="SearXNG category, e.g. it, science, news")
|
|
||||||
parser.add_argument("--engines", help="comma separated engine list")
|
|
||||||
parser.add_argument("--json", action="store_true")
|
|
||||||
parser.add_argument("--refresh", action="store_true", help="bypass the cache")
|
|
||||||
parser.add_argument("--ttl", type=float, default=ws.CACHE_TTL)
|
|
||||||
parser.add_argument("--timeout", type=int, default=25)
|
|
||||||
parser.add_argument("--force", action="store_true",
|
|
||||||
help="send even if the query looks like PII")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
query = f"site:{args.site} {args.query}" if args.site else args.query
|
|
||||||
|
|
||||||
reason = ws.phi_reason(query)
|
|
||||||
if reason and not args.force:
|
|
||||||
print(f"refused: {reason}. This query would leave the host.", file=sys.stderr)
|
|
||||||
print("Rephrase without identifiers, or pass --force if it is genuinely public.",
|
|
||||||
file=sys.stderr)
|
|
||||||
return 2
|
|
||||||
|
|
||||||
params = {}
|
|
||||||
if args.lang:
|
|
||||||
params["language"] = args.lang
|
|
||||||
if args.fresh:
|
|
||||||
params["time_range"] = args.fresh
|
|
||||||
if args.category:
|
|
||||||
params["categories"] = args.category
|
|
||||||
if args.engines:
|
|
||||||
params["engines"] = args.engines
|
|
||||||
|
|
||||||
key = ws.cache_key(query, params)
|
|
||||||
conn = ws.open_cache(CACHE)
|
|
||||||
|
|
||||||
if not args.refresh:
|
|
||||||
cached = ws.cache_get(conn, key, ttl=args.ttl)
|
|
||||||
if cached is not None:
|
|
||||||
out = ws.project(cached, limit=args.limit)
|
|
||||||
out["cached"] = True
|
|
||||||
sys.stdout.write(json.dumps(out, indent=2, ensure_ascii=False) + "\n"
|
|
||||||
if args.json else to_yaml(out))
|
|
||||||
return 0
|
|
||||||
|
|
||||||
conf = load_config()
|
|
||||||
LOCK.parent.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
# One request at a time across every agent on this host: the instance
|
|
||||||
# suspends engines for minutes when several of us ask at once.
|
|
||||||
with open(LOCK, "w") as lock:
|
|
||||||
fcntl.flock(lock, fcntl.LOCK_EX)
|
|
||||||
|
|
||||||
payload = None
|
|
||||||
for attempt in range(1 + len(ws.RETRY_BACKOFF)):
|
|
||||||
delay = ws.wait_for(ws.last_call(conn), time.time())
|
|
||||||
if delay:
|
|
||||||
time.sleep(delay)
|
|
||||||
ws.mark_call(conn)
|
|
||||||
try:
|
|
||||||
payload = fetch(conf, query, params, args.timeout)
|
|
||||||
except Exception as error: # noqa: BLE001 - report, do not crash
|
|
||||||
print(f"request failed: {error}", file=sys.stderr)
|
|
||||||
return 3
|
|
||||||
if ws.classify(payload) == "ok":
|
|
||||||
break
|
|
||||||
if attempt < len(ws.RETRY_BACKOFF):
|
|
||||||
time.sleep(ws.RETRY_BACKOFF[attempt])
|
|
||||||
|
|
||||||
if ws.classify(payload) == "ok":
|
|
||||||
ws.cache_put(conn, key, payload)
|
|
||||||
|
|
||||||
out = ws.project(payload, limit=args.limit)
|
|
||||||
sys.stdout.write(json.dumps(out, indent=2, ensure_ascii=False) + "\n"
|
|
||||||
if args.json else to_yaml(out))
|
|
||||||
return 0 if out["status"] == "ok" else 3
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
sys.exit(main())
|
sys.exit(main(sys.argv[1:]))
|
||||||
|
|||||||
Executable
+232
@@ -0,0 +1,232 @@
|
|||||||
|
//usr/bin/env go run "$0" "$@"; exit
|
||||||
|
//
|
||||||
|
// bin/web/search.go - SearXNG as the second independent source (D3).
|
||||||
|
//
|
||||||
|
// ./bin/web/search.go "LadybugDB vector search"
|
||||||
|
// ./bin/web/search.go "model2vec" --category it --json
|
||||||
|
// ./bin/web/search.go "postgres" --site github.com --fresh year
|
||||||
|
//
|
||||||
|
// Empty results mean throttled, not "nothing exists". Exit 2 = PII refuse, 3 = throttled.
|
||||||
|
// Config: $BRAIN_SEARCH_ENV (default $HOME/.config/brain/search.env).
|
||||||
|
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/websearch"
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
os.Exit(run(os.Args[1:]))
|
||||||
|
}
|
||||||
|
|
||||||
|
func run(args []string) int {
|
||||||
|
var (
|
||||||
|
query, site, lang, fresh, category, engines string
|
||||||
|
limit = websearch.DefaultLimit
|
||||||
|
jsonOut, refresh, force bool
|
||||||
|
ttl = float64(websearch.CacheTTL)
|
||||||
|
timeout = 25
|
||||||
|
)
|
||||||
|
i := 0
|
||||||
|
for i < len(args) {
|
||||||
|
a := args[i]
|
||||||
|
switch {
|
||||||
|
case a == "--json":
|
||||||
|
jsonOut = true
|
||||||
|
case a == "--refresh":
|
||||||
|
refresh = true
|
||||||
|
case a == "--force":
|
||||||
|
force = true
|
||||||
|
case (a == "-n" || a == "--limit") && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
n, err := strconv.Atoi(args[i])
|
||||||
|
if err != nil || n < 0 {
|
||||||
|
fmt.Fprintln(os.Stderr, "web/search: --limit must be a non-negative integer")
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
limit = n
|
||||||
|
case a == "--site" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
site = args[i]
|
||||||
|
case a == "--lang" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
lang = args[i]
|
||||||
|
case a == "--fresh" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
fresh = args[i]
|
||||||
|
case a == "--category" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
category = args[i]
|
||||||
|
case a == "--engines" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
engines = args[i]
|
||||||
|
case a == "--ttl" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
v, err := strconv.ParseFloat(args[i], 64)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintln(os.Stderr, "web/search: --ttl must be a number")
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
ttl = v
|
||||||
|
case a == "--timeout" && i+1 < len(args):
|
||||||
|
i++
|
||||||
|
n, err := strconv.Atoi(args[i])
|
||||||
|
if err != nil || n <= 0 {
|
||||||
|
fmt.Fprintln(os.Stderr, "web/search: --timeout must be a positive integer")
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
timeout = n
|
||||||
|
case a == "-h" || a == "--help":
|
||||||
|
fmt.Fprintln(os.Stderr, `usage: bin/web/search.go QUERY [--json] [-n N] [--site HOST] [--lang LANG] [--fresh day|week|month|year] [--category CAT] [--engines LIST] [--refresh] [--force]`)
|
||||||
|
return 0
|
||||||
|
case len(a) > 0 && a[0] != '-' && query == "":
|
||||||
|
query = a
|
||||||
|
default:
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: unknown flag %s\n", a)
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
if query == "" {
|
||||||
|
fmt.Fprintln(os.Stderr, "web/search: query required")
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
if site != "" {
|
||||||
|
query = "site:" + site + " " + query
|
||||||
|
}
|
||||||
|
if reason := websearch.PHIReason(query); reason != "" && !force {
|
||||||
|
fmt.Fprintf(os.Stderr, "refused: %s. This query would leave the host.\n", reason)
|
||||||
|
fmt.Fprintln(os.Stderr, "Rephrase without identifiers, or pass --force if it is genuinely public.")
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
|
||||||
|
params := map[string]string{}
|
||||||
|
if lang != "" {
|
||||||
|
params["language"] = lang
|
||||||
|
}
|
||||||
|
if fresh != "" {
|
||||||
|
params["time_range"] = fresh
|
||||||
|
}
|
||||||
|
if category != "" {
|
||||||
|
params["categories"] = category
|
||||||
|
}
|
||||||
|
if engines != "" {
|
||||||
|
params["engines"] = engines
|
||||||
|
}
|
||||||
|
|
||||||
|
cachePath := os.Getenv("BRAIN_SEARCH_CACHE")
|
||||||
|
if cachePath == "" {
|
||||||
|
cachePath = os.Getenv("HOME") + "/.cache/brain/web-search.sqlite"
|
||||||
|
}
|
||||||
|
cache, err := websearch.OpenCache(cachePath)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: cache: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
defer cache.Close()
|
||||||
|
|
||||||
|
key := websearch.CacheKey(query, params)
|
||||||
|
now := float64(time.Now().Unix())
|
||||||
|
if !refresh {
|
||||||
|
if cached, err := cache.Get(key, ttl, now); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: cache: %v\n", err)
|
||||||
|
return 1
|
||||||
|
} else if cached != nil {
|
||||||
|
out := websearch.Project(*cached, limit, websearch.DefaultSnippetChars)
|
||||||
|
out.Cached = true
|
||||||
|
return writeOut(out, jsonOut)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
envPath := os.Getenv("BRAIN_SEARCH_ENV")
|
||||||
|
if envPath == "" {
|
||||||
|
envPath = os.Getenv("HOME") + "/.config/brain/search.env"
|
||||||
|
}
|
||||||
|
conf, err := websearch.LoadConfig(envPath)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
lockPath := cachePath + ".lock"
|
||||||
|
lock, err := os.OpenFile(lockPath, os.O_CREATE|os.O_RDWR, 0o600)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: lock: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
defer lock.Close()
|
||||||
|
if err := unix.Flock(int(lock.Fd()), unix.LOCK_EX); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: lock: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
defer unix.Flock(int(lock.Fd()), unix.LOCK_UN)
|
||||||
|
|
||||||
|
var payload websearch.Payload
|
||||||
|
attempts := 1 + len(websearch.RetryBackoff)
|
||||||
|
client := &http.Client{}
|
||||||
|
for attempt := 0; attempt < attempts; attempt++ {
|
||||||
|
last, err := cache.LastCall()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: cache: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
if delay := websearch.WaitFor(last, float64(time.Now().Unix()), websearch.MinInterval); delay > 0 {
|
||||||
|
time.Sleep(time.Duration(delay * float64(time.Second)))
|
||||||
|
}
|
||||||
|
if err := cache.MarkCall(float64(time.Now().Unix())); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: cache: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
payload, err = websearch.Fetch(client, conf, query, params, time.Duration(timeout)*time.Second)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "request failed: %v\n", err)
|
||||||
|
return 3
|
||||||
|
}
|
||||||
|
if websearch.Classify(payload) == websearch.StatusOK {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if attempt < len(websearch.RetryBackoff) {
|
||||||
|
time.Sleep(time.Duration(websearch.RetryBackoff[attempt] * float64(time.Second)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if websearch.Classify(payload) == websearch.StatusOK {
|
||||||
|
if err := cache.Put(key, payload, float64(time.Now().Unix())); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "web/search: cache: %v\n", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out := websearch.Project(payload, limit, websearch.DefaultSnippetChars)
|
||||||
|
code := writeOut(out, jsonOut)
|
||||||
|
if out.Status != websearch.StatusOK && code == 0 {
|
||||||
|
return 3
|
||||||
|
}
|
||||||
|
return code
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeOut(out websearch.Output, jsonOut bool) int {
|
||||||
|
if jsonOut {
|
||||||
|
enc := json.NewEncoder(os.Stdout)
|
||||||
|
enc.SetIndent("", " ")
|
||||||
|
enc.SetEscapeHTML(false)
|
||||||
|
if err := enc.Encode(out); err != nil {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
if out.Status != websearch.StatusOK {
|
||||||
|
return 3
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
fmt.Print(out.YAML())
|
||||||
|
if out.Status != websearch.StatusOK {
|
||||||
|
return 3
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
+88
-17
@@ -1,66 +1,137 @@
|
|||||||
# 2dph — docker composition
|
# 2dph — docker composition
|
||||||
#
|
#
|
||||||
# docker compose run --rm brain index # rebuild graph
|
# docker compose up -d brain # API (Zig CGO serve)
|
||||||
# docker compose run --rm brain search "Matrix fed" # one-shot query
|
# docker compose --profile index run --rm index # Python rebuild
|
||||||
# docker compose run --rm brain serve # async Go server
|
# docker compose --profile picoclaw up brain-mcp
|
||||||
# docker compose up brain-watch # auto re-index
|
# docker compose --profile reasoner up -d reasoner # CPU Ollama :11435
|
||||||
|
# docker compose --profile searxng up -d
|
||||||
#
|
#
|
||||||
# Caching: the 128M model (HF_HOME) and kb.lbug (VAR_DIR) live in named
|
# Secrets never baked in: search.env + db-profiles.yml from ~/.config/brain.
|
||||||
# volumes, so rebuilds never redownload the model or re-derive the graph.
|
|
||||||
# Secrets are never baked into the image: search.env + db-profiles.yml mount
|
|
||||||
# read-only from ~/.config/brain.
|
|
||||||
|
|
||||||
name: 2dph
|
name: 2dph
|
||||||
|
|
||||||
services:
|
services:
|
||||||
brain:
|
brain:
|
||||||
image: ghcr.io/eslider/2dph:latest
|
image: ghcr.io/eslider/2dph:api
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
target: api
|
||||||
cache_from:
|
cache_from:
|
||||||
- ghcr.io/eslider/2dph:cache
|
- ghcr.io/eslider/2dph:cache
|
||||||
command: ["brain", "search", "help"]
|
command: ["serve"]
|
||||||
environment: &env
|
environment: &env
|
||||||
HF_HOME: /data/hf
|
HF_HOME: /data/hf
|
||||||
BRAIN_SEARCH_CACHE: /data/cache/web-search.sqlite
|
BRAIN_SEARCH_CACHE: /data/cache/web-search.sqlite
|
||||||
BRAIN_DB_PROFILES: /secret/db-profiles.yml
|
BRAIN_DB_PROFILES: /secret/db-profiles.yml
|
||||||
BRAIN_SEARCH_ENV: /secret/search.env
|
BRAIN_SEARCH_ENV: /secret/search.env
|
||||||
KB_SEARCH_CMD: /app/bin/kb/search
|
KB_ROOT: /data
|
||||||
KB_WORKERS: "4"
|
KB_WORKERS: "4"
|
||||||
|
KB_PORT: "8630"
|
||||||
volumes:
|
volumes:
|
||||||
- kb-model:/data/hf
|
- kb-model:/data/hf
|
||||||
- kb-var:/data
|
- kb-var:/data
|
||||||
# corpus is read-only on the host, never written from the container
|
|
||||||
- ..:/corpus:ro
|
|
||||||
- ~/.config/brain:/secret:ro
|
- ~/.config/brain:/secret:ro
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:8630:8630"
|
||||||
read_only: true
|
read_only: true
|
||||||
tmpfs:
|
tmpfs:
|
||||||
- /tmp
|
- /tmp
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "python3", "-c", "import ladybug, model2vec, mistune; print('ok')"]
|
test: ["CMD", "wget", "-qO-", "http://127.0.0.1:8630/health"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 3
|
retries: 3
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
stop_grace_period: 20s
|
stop_grace_period: 20s
|
||||||
|
|
||||||
# watcher: re-index on corpus file change (watchdog script)
|
|
||||||
brain-watch:
|
brain-watch:
|
||||||
image: ghcr.io/eslider/2dph:latest
|
image: ghcr.io/eslider/2dph:api
|
||||||
environment: *env
|
environment: *env
|
||||||
volumes:
|
volumes:
|
||||||
- kb-model:/data/hf
|
- kb-model:/data/hf
|
||||||
- kb-var:/data
|
- kb-var:/data
|
||||||
- ..:/corpus:ro
|
- ..:/corpus:ro
|
||||||
- ~/.config/brain:/secret:ro
|
- ~/.config/brain:/secret:ro
|
||||||
command: ["brain", "watch", "/corpus"]
|
command: ["watch", "/corpus"]
|
||||||
read_only: true
|
read_only: true
|
||||||
tmpfs:
|
tmpfs:
|
||||||
- /tmp
|
- /tmp
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
stop_grace_period: 20s
|
stop_grace_period: 20s
|
||||||
|
|
||||||
|
# Python write path (Ladybug rebuild). Not in the API image.
|
||||||
|
# docker compose --profile index run --rm index
|
||||||
|
index:
|
||||||
|
profiles: ["index"]
|
||||||
|
image: ghcr.io/eslider/2dph:index
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
target: index
|
||||||
|
environment:
|
||||||
|
HF_HOME: /data/hf
|
||||||
|
KB_PY: python3
|
||||||
|
volumes:
|
||||||
|
- kb-model:/data/hf
|
||||||
|
- kb-var:/app/var
|
||||||
|
- ..:/corpus:ro
|
||||||
|
- ~/.config/brain:/secret:ro
|
||||||
|
command: ["index"]
|
||||||
|
read_only: true
|
||||||
|
tmpfs:
|
||||||
|
- /tmp
|
||||||
|
|
||||||
|
# Optional local SearXNG (D3). Skip if BRAIN_SEARCH_URL already points at a
|
||||||
|
# live instance — do not run a second copy on that host.
|
||||||
|
# SEARXNG_SECRET=$(openssl rand -hex 32) docker compose --profile searxng up -d
|
||||||
|
searxng:
|
||||||
|
profiles: ["searxng"]
|
||||||
|
image: docker.io/searxng/searxng:2026.8.10-0a118066d
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:8888:8080"
|
||||||
|
environment:
|
||||||
|
SEARXNG_SECRET: ${SEARXNG_SECRET:-}
|
||||||
|
volumes:
|
||||||
|
- ./deploy/searxng/settings.yml:/etc/searxng/settings.yml:ro
|
||||||
|
- ./deploy/searxng/limiter.toml:/etc/searxng/limiter.toml:ro
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# MCP endpoint for an external agent (PicoClaw is not shipped here).
|
||||||
|
# docker compose --profile picoclaw up brain-mcp
|
||||||
|
brain-mcp:
|
||||||
|
profiles: ["picoclaw"]
|
||||||
|
image: ghcr.io/eslider/2dph:api
|
||||||
|
environment: *env
|
||||||
|
volumes:
|
||||||
|
- kb-model:/data/hf
|
||||||
|
- kb-var:/data
|
||||||
|
- ~/.config/brain:/secret:ro
|
||||||
|
command: ["serve"]
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:8630:8630"
|
||||||
|
read_only: true
|
||||||
|
tmpfs:
|
||||||
|
- /tmp
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# CPU OpenAI-compatible sidecar (D18). Weights are pulled at runtime, not
|
||||||
|
# baked into the 2dph image. Does not touch host Ollama on :11434.
|
||||||
|
# docker compose --profile reasoner up -d reasoner
|
||||||
|
# docker compose --profile reasoner exec reasoner ollama pull qwen3.5:9b
|
||||||
|
reasoner:
|
||||||
|
profiles: ["reasoner"]
|
||||||
|
image: docker.io/ollama/ollama:latest
|
||||||
|
environment:
|
||||||
|
OLLAMA_NUM_GPU: "0"
|
||||||
|
OLLAMA_HOST: "0.0.0.0:11434"
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:11435:11434"
|
||||||
|
volumes:
|
||||||
|
- reasoner-ollama:/root/.ollama
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
kb-model:
|
kb-model:
|
||||||
kb-var:
|
kb-var:
|
||||||
|
reasoner-ollama:
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"mcpServers": {
|
||||||
|
"2dph": {
|
||||||
|
"url": "http://127.0.0.1:8630/mcp",
|
||||||
|
"description": "2dph fact gate. Tool order: search → get → audit. throttled is not absence."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
[botdetection.ip_lists]
|
||||||
|
# RFC1918 only. Do not copy a live instance egress IP into git.
|
||||||
|
pass_ip = [
|
||||||
|
"10.0.0.0/8",
|
||||||
|
"172.16.0.0/12",
|
||||||
|
"192.168.0.0/16",
|
||||||
|
]
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
use_default_settings: true
|
||||||
|
|
||||||
|
general:
|
||||||
|
instance_name: "2dph"
|
||||||
|
|
||||||
|
search:
|
||||||
|
formats:
|
||||||
|
- html
|
||||||
|
- json
|
||||||
|
suspended_times:
|
||||||
|
SearxEngineCaptcha: 300
|
||||||
|
SearxEngineTooManyRequests: 120
|
||||||
|
SearxEngineAccessDenied: 300
|
||||||
|
|
||||||
|
server:
|
||||||
|
limiter: true
|
||||||
|
image_proxy: false
|
||||||
|
# secret_key comes from SEARXNG_SECRET (never commit a real secret)
|
||||||
|
|
||||||
|
engines:
|
||||||
|
- name: bing
|
||||||
|
disabled: false
|
||||||
|
- name: google
|
||||||
|
disabled: false
|
||||||
|
- name: duckduckgo
|
||||||
|
disabled: false
|
||||||
|
- name: wikipedia
|
||||||
|
disabled: false
|
||||||
+28
-8
@@ -1,14 +1,34 @@
|
|||||||
# 2dph (deductionphile)
|
---
|
||||||
|
type: reference
|
||||||
|
status: current
|
||||||
|
related:
|
||||||
|
- docs/runbook.md
|
||||||
|
- docs/design.md
|
||||||
|
- PLAN.md
|
||||||
|
---
|
||||||
|
|
||||||
Evidence-first knowledge graph + hybrid RAG over the operational
|
# 2dph docs (Diataxis)
|
||||||
Brain/ops/eSlider stack. Facts need proof or they are
|
|
||||||
|
Evidence-first knowledge graph. Facts need proof or they are
|
||||||
`(not confirmed)`.
|
`(not confirmed)`.
|
||||||
|
|
||||||
- [PLAN.md](../PLAN.md) — decisions, execution order, open questions (v2)
|
| Type | Doc |
|
||||||
- [design](design.md) — schema, deduction model, sources
|
|------|-----|
|
||||||
- [Gitea issues](https://git.produktor.io/eSlider/2dph/issues) — work board (origin)
|
| tutorial / howto | [runbook](runbook.md) — run anywhere (uv, Go, Docker) |
|
||||||
|
| explanation | [design](design.md) — two roots, deduction, D17/D20/D18 |
|
||||||
|
| howto | [picoclaw](picoclaw.md) — MCP agent profile |
|
||||||
|
| howto | [reasoner](reasoner.md) — CPU bake-off (D18) |
|
||||||
|
| reference | [PLAN.md](../PLAN.md) — decisions D1–D21 |
|
||||||
|
|
||||||
Search: `bin/brain/search.go "query"` (HTTP: `bin/brain/serve.go`). `--hop` is
|
Decisions the public face must name: **D3** SearXNG compose, **D6** Go service /
|
||||||
|
Python write sidecar, **D14** `bin/{subject}/{method}.go`, **D15** Gitea origin,
|
||||||
|
**D17** assertion gate (facts → info → web), **D18** pluggable reasoner.
|
||||||
|
|
||||||
|
Search: `bin/brain/search.go "query"` (HTTP: `bin/brain/serve.go` —
|
||||||
|
`/health` `/search` `/get` `/stats` `/audit` `/ingest`). `--hop` is
|
||||||
not a walk; the flag errors until File/FROM_FILE edges exist.
|
not a walk; the flag errors until File/FROM_FILE edges exist.
|
||||||
|
|
||||||
Published docs live here and mirror the project state.
|
Work board: [Gitea issues](https://git.produktor.io/eSlider/2dph/issues).
|
||||||
|
PRs and CI: GitHub [`eSlider/2dph`](https://github.com/eSlider/2dph).
|
||||||
|
|
||||||
|
Published docs live here and match live commands.
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
# CRM association proof (oo CLI ↔ corpus)
|
|
||||||
|
|
||||||
Proven with `oo` (eslider/go-onlyoffice) against the OnlyOffice portal
|
|
||||||
(`office.produktor.io`). Portal CRM is the SSOT for company ↔ person ↔
|
|
||||||
project associations; the corpus SoT (`eslider/cv/projects/knowledge-mesh-seed.yaml`)
|
|
||||||
is the second, independent source. Facts that can be backed by both are
|
|
||||||
written to the brain under `root=facts` by `bin/facts/crm`.
|
|
||||||
|
|
||||||
## What was verified
|
|
||||||
|
|
||||||
- Logical counts (portal MySQL): 1300 contacts = 897 persons + 404 companies,
|
|
||||||
198 projects, 998 deals, 939 project↔contact links.
|
|
||||||
- Every client company linked to a project has ≥1 person underneath.
|
|
||||||
- Every person `company_id` resolves to an existing company.
|
|
||||||
- Corpus org list (9) maps 1:1 onto CRM companies:
|
|
||||||
ProProdukt SL / produktor.io, Dyvenia, Immowelt AG, WhereGroup,
|
|
||||||
Keynote SIGOS, D2S/SYSTEMS, GRID, Pack und Cup, Markets Platform.
|
|
||||||
- 78 person↔company association facts written to the brain
|
|
||||||
(`how=crm-crosscheck`, `type=association`). Recall@5 in `bin/kb/eval` = 1.0.
|
|
||||||
|
|
||||||
## Mistakes found
|
|
||||||
|
|
||||||
| # | Mistake | Fix |
|
|
||||||
|---|---------|-----|
|
|
||||||
| 1 | Duplicate legal entity `GoldenRatio.Exchange` (contact 759) vs `Golden Ratio Exchange` (763); 3 deals (211, 287, 559) were linked to 759 | `oo contacts merge 759 763` — 763 kept, 759 removed, deal links re-pointed to 763 |
|
|
||||||
| 2 | `env/`-wide: OnlyOffice creds file used wrong UX (user `eslider`, password with `$2` suffix) making `oo` auth fail | `.env` fixed to `eslider@gmail.com` + clean password; `.env` stays gitignored |
|
|
||||||
|
|
||||||
## Gates after fix
|
|
||||||
|
|
||||||
- `uv run python -m unittest discover -s bin/tools -t .` → 26 tests OK
|
|
||||||
- `bin/facts/audit self` + `bin/facts/audit db` → ok
|
|
||||||
- `bin/kb/eval` → recall@5 = 1.0
|
|
||||||
- `go test ./...` (bin/server + bin/watch) → ok
|
|
||||||
+37
-1
@@ -1,3 +1,11 @@
|
|||||||
|
---
|
||||||
|
type: explanation
|
||||||
|
status: current
|
||||||
|
related:
|
||||||
|
- docs/README.md
|
||||||
|
- docs/runbook.md
|
||||||
|
---
|
||||||
|
|
||||||
# Design — facts, info, deduction
|
# Design — facts, info, deduction
|
||||||
|
|
||||||
## Two roots, one transaction
|
## Two roots, one transaction
|
||||||
@@ -21,6 +29,8 @@ bin/brain/search.go "question"
|
|||||||
1. facts root — confirmed answers only → return with evidence links
|
1. facts root — confirmed answers only → return with evidence links
|
||||||
2. info root — supporting narrative → snippets, marked (not confirmed)
|
2. info root — supporting narrative → snippets, marked (not confirmed)
|
||||||
3. web-search — second independent source → upgrade hypothesis to confirmed
|
3. web-search — second independent source → upgrade hypothesis to confirmed
|
||||||
|
(`web` block from `bin/web/search.go` when no facts hit; status `throttled`
|
||||||
|
is not evidence of absence; `--no-web` / `--root` skip it)
|
||||||
```
|
```
|
||||||
|
|
||||||
`--hop` is not implemented yet (needs File/FROM_FILE edges). The flag is an
|
`--hop` is not implemented yet (needs File/FROM_FILE edges). The flag is an
|
||||||
@@ -46,7 +56,8 @@ Every assertion edge carries:
|
|||||||
Content leafs: `sha256`, `observed_at`, `source_rev`, `confidence`. Stale = a
|
Content leafs: `sha256`, `observed_at`, `source_rev`, `confidence`. Stale = a
|
||||||
file changed on disk (git HEAD/mtime) after its last observed `source_rev`.
|
file changed on disk (git HEAD/mtime) after its last observed `source_rev`.
|
||||||
`File-[:HAS_VERSION]->Commit-[:AUTHORED]->Person` records the history of every
|
`File-[:HAS_VERSION]->Commit-[:AUTHORED]->Person` records the history of every
|
||||||
content leaf.
|
content leaf. Commit records come from `bin/git/import.go` (go-git, no git
|
||||||
|
binary); conversion prints leafs, brain write is `bin/brain/index.go`.
|
||||||
|
|
||||||
`bin/facts/audit stale` flags leafs whose observed revision is behind the
|
`bin/facts/audit stale` flags leafs whose observed revision is behind the
|
||||||
corpus HEAD.
|
corpus HEAD.
|
||||||
@@ -59,3 +70,28 @@ corpus HEAD.
|
|||||||
|
|
||||||
Confirmed = A×B or B×C agreement. Single source = hypothesis + `(not confirmed)`.
|
Confirmed = A×B or B×C agreement. Single source = hypothesis + `(not confirmed)`.
|
||||||
Conflicting pairings (≥2 yes vs ≥2 no) = hypothesis (OQ1 → v2 resolution).
|
Conflicting pairings (≥2 yes vs ≥2 no) = hypothesis (OQ1 → v2 resolution).
|
||||||
|
|
||||||
|
## Read path
|
||||||
|
|
||||||
|
`bin/brain/get.go`, `stats.go`, and `eval.go` call `internal/brain` with cgo
|
||||||
|
(`system_ladybug`), compiled by **Zig** (`bin/cgo/zcc`, D21), not gcc.
|
||||||
|
They do not exec Python. Control questions for recall@5 live in
|
||||||
|
`internal/brain/rank` so CI can test the table without libladybug.
|
||||||
|
Python `bin/kb/{get,stats,eval}` remain for GitHub Actions until the runner
|
||||||
|
fetches Zig + libs (`bin/cgo/zig`). Index/write is still `bin/kb/index`
|
||||||
|
(`docker compose --profile index`).
|
||||||
|
|
||||||
|
## Agent API (D20)
|
||||||
|
|
||||||
|
`bin/brain/serve.go` exposes the same `internal/httpapi.Ops` table as OpenAPI
|
||||||
|
(`GET /openapi.json`) and MCP (`POST /mcp` JSON-RPC `tools/list` +
|
||||||
|
`tools/call`). Tool names match paths: `search`, `get`, `stats`, `audit`.
|
||||||
|
Agents should use these endpoints instead of shebang CLIs.
|
||||||
|
|
||||||
|
## Reasoner (D18)
|
||||||
|
|
||||||
|
Pluggable OpenAI-compatible URL. RAM: `Qwen/Qwen3.5-9B`. Quality:
|
||||||
|
`prism-ml/Bonsai-27B-gguf` or `Qwen/Qwen3.6-27B`. No official Qwen3.6-9B.
|
||||||
|
CPU sidecar: compose profile `reasoner` (`OLLAMA_NUM_GPU=0`,
|
||||||
|
`127.0.0.1:11435`). Bake-off: `bin/reasoner/bakeoff.go`. Weights stay out
|
||||||
|
of the 2dph image. See [docs/reasoner.md](reasoner.md).
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# PicoClaw profile (reference agent)
|
||||||
|
|
||||||
|
2dph is the memory/fact gate. PicoClaw (or any MCP client) is the agent loop
|
||||||
|
and is **not** shipped in this repo.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose --profile picoclaw up brain-mcp
|
||||||
|
```
|
||||||
|
|
||||||
|
The API listens on `127.0.0.1:8630`. Point the agent at
|
||||||
|
`http://127.0.0.1:8630/mcp` using [deploy/picoclaw/mcp.json.example](../deploy/picoclaw/mcp.json.example).
|
||||||
|
|
||||||
|
OpenAPI: `GET http://127.0.0.1:8630/openapi.json`.
|
||||||
|
|
||||||
|
Before a factual reply: `search` → `get` → `audit`. `throttled` is not a
|
||||||
|
negative finding. See `skills/picoclaw/SKILL.md`.
|
||||||
|
|
||||||
|
No Cursor required. A live PicoClaw binary/image is an operator choice.
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
# Reasoner bake-off (D18)
|
||||||
|
|
||||||
|
Pluggable OpenAI-compatible URL. 2dph does not ship weights. PicoClaw is
|
||||||
|
not in this repo; the bake-off hits the same tool names PicoClaw would
|
||||||
|
(`search` → `get` → `audit` from `internal/httpapi.Ops`).
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose --profile reasoner up -d reasoner
|
||||||
|
docker compose --profile reasoner exec reasoner ollama pull qwen3.5:9b
|
||||||
|
REASONER_BASE_URL=http://127.0.0.1:11435/v1 REASONER_MODEL=qwen3.5:9b \
|
||||||
|
./bin/reasoner/bakeoff.go --json
|
||||||
|
```
|
||||||
|
|
||||||
|
Host Ollama on `:11434` is left alone. This sidecar binds `127.0.0.1:11435`
|
||||||
|
with `OLLAMA_NUM_GPU=0` (CPU). Measure RSS (`/api/ps` `size`), not VRAM.
|
||||||
|
|
||||||
|
If Compose cannot allocate a project network (Docker IPAM pool exhausted),
|
||||||
|
the same sidecar is:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker run -d --name 2dph-reasoner \
|
||||||
|
-e OLLAMA_NUM_GPU=0 \
|
||||||
|
-p 127.0.0.1:11435:11434 \
|
||||||
|
-v 2dph-reasoner-ollama:/root/.ollama \
|
||||||
|
ollama/ollama:latest
|
||||||
|
```
|
||||||
|
|
||||||
|
## Real Hugging Face ids
|
||||||
|
|
||||||
|
| Role | HF id | Ollama tag (this bake-off) |
|
||||||
|
|------|-------|----------------------------|
|
||||||
|
| RAM / 9B | `Qwen/Qwen3.5-9B` | `qwen3.5:9b` |
|
||||||
|
| Quality 27B (CPU) | `prism-ml/Bonsai-27B-gguf` (derived from Qwen3.6-27B) | `MichelRosselli/bonsai-27b:Q1_0` |
|
||||||
|
| Quality 27B (full) | `Qwen/Qwen3.6-27B` | not pulled on this CPU box |
|
||||||
|
|
||||||
|
There is **no official Qwen3.6-9B**. Do not invent that id.
|
||||||
|
|
||||||
|
Qwen3.5-9B has documented upstream tool-call XML bugs. A 9B win on tools
|
||||||
|
is only claimed if this bake-off records OpenAI `tool_calls` (not
|
||||||
|
`<tool_call>` XML in `content`).
|
||||||
|
|
||||||
|
The 2dph API image does not `COPY` GGUF/safetensors. Pull at runtime into
|
||||||
|
the `reasoner-ollama` volume.
|
||||||
|
|
||||||
|
## Live CPU run
|
||||||
|
|
||||||
|
Host sidecar: Ollama **0.32.9**, `OLLAMA_NUM_GPU=0`, `127.0.0.1:11435`,
|
||||||
|
`device: cpu`, `vram_mb: 0`. Date: 2026-08-13. Same three prompts
|
||||||
|
(`search` / `get` / `audit`). PicoClaw binary was not used; the OpenAI
|
||||||
|
tools payload is the surface it would send.
|
||||||
|
|
||||||
|
| Model | HF id | tool_call | xml_leak | rss_mb | latency_ms (search/get/audit) |
|
||||||
|
|-------|-------|-----------|----------|--------|-------------------------------|
|
||||||
|
| `qwen3.5:9b` | `Qwen/Qwen3.5-9B` | 3/3 | 0 | 5790 | 50059 / 51678 / 31980 |
|
||||||
|
| `MichelRosselli/bonsai-27b:Q1_0` | `prism-ml/Bonsai-27B-gguf` | 3/3 | 0 | 21951 | 327702 / 166830 / 119808 |
|
||||||
|
| `Qwen/Qwen3.6-27B` | `Qwen/Qwen3.6-27B` | not loaded | — | — | too heavy for this CPU box |
|
||||||
|
|
||||||
|
Both loaded models emitted OpenAI `tool_calls` (not `<tool_call>` XML) on
|
||||||
|
this runtime. **Do not claim 9B is better at tools** — the score is tied
|
||||||
|
at 3/3. 9B is smaller and faster. Bonsai RSS includes weights + KV
|
||||||
|
(`size` from `/api/ps`); first Bonsai prompt includes cold load.
|
||||||
|
|
||||||
|
Re-run:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
REASONER_BASE_URL=http://127.0.0.1:11435/v1 REASONER_MODEL=qwen3.5:9b \
|
||||||
|
./bin/reasoner/bakeoff.go --json
|
||||||
|
REASONER_MODEL=MichelRosselli/bonsai-27b:Q1_0 ./bin/reasoner/bakeoff.go --json
|
||||||
|
```
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
---
|
||||||
|
type: howto
|
||||||
|
status: current
|
||||||
|
related:
|
||||||
|
- docs/README.md
|
||||||
|
- PLAN.md
|
||||||
|
---
|
||||||
|
|
||||||
|
# Run 2dph (portable)
|
||||||
|
|
||||||
|
No laptop-absolute paths. Config lives in env files under `$HOME/.config/brain/`
|
||||||
|
(mode 0600), not in git.
|
||||||
|
|
||||||
|
## Toolchain
|
||||||
|
|
||||||
|
- Go (see `go.mod`)
|
||||||
|
- Python 3.12 + [uv](https://docs.astral.sh/uv)
|
||||||
|
- Optional: Docker, Zig CGO via `bin/cgo/zig` (not gcc)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
uv venv .venv
|
||||||
|
uv pip install -r requirements.lock.txt
|
||||||
|
eval "$(bin/cgo/zig env)" # when compiling Ladybug read tools
|
||||||
|
go test ./...
|
||||||
|
uv run python -m unittest discover -s bin/tools -t .
|
||||||
|
```
|
||||||
|
|
||||||
|
## Config
|
||||||
|
|
||||||
|
| File / env | Purpose |
|
||||||
|
|------------|---------|
|
||||||
|
| `$BRAIN_SEARCH_ENV` (default `$HOME/.config/brain/search.env`) | `BRAIN_SEARCH_URL` (SearXNG). Optional Basic Auth. |
|
||||||
|
| `$HOME/.config/brain/db-profiles.yml` | read-only Postgres profiles (OnlyOffice via tunnel) |
|
||||||
|
|
||||||
|
If the host already runs SearXNG, point `BRAIN_SEARCH_URL` at it. Do not start
|
||||||
|
a second copy (D3). Optional Compose instance:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
SEARXNG_SECRET=$(openssl rand -hex 32) docker compose --profile searxng up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
That binds `127.0.0.1:8888`. JSON format must stay enabled.
|
||||||
|
|
||||||
|
## Index then search
|
||||||
|
|
||||||
|
Write path is Compose profile `index` (Python Ladybug rebuild) until
|
||||||
|
`brain/add` is v2. The operator command is `bin/brain/index.go`.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bin/brain/index.go --rebuild
|
||||||
|
bin/brain/search.go "LadybugDB vector index" # facts → info → web (D17)
|
||||||
|
bin/brain/search.go "upstream flag" --no-web
|
||||||
|
bin/brain/get.go <id> --body
|
||||||
|
bin/brain/stats.go
|
||||||
|
```
|
||||||
|
|
||||||
|
`--hop` is not implemented. Empty web results are `throttled`, not absence.
|
||||||
|
|
||||||
|
Ladybug 0.19: never `DROP INDEX` FTS/VECTOR (ghost catalog). Fresh indexes =
|
||||||
|
delete `var/kb.lbug` then `--rebuild`.
|
||||||
|
|
||||||
|
## HTTP / MCP
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up -d brain # :8630 Zig CGO serve
|
||||||
|
docker compose --profile index run --rm index # rebuild
|
||||||
|
docker compose --profile picoclaw up brain-mcp # MCP 127.0.0.1:8630
|
||||||
|
```
|
||||||
|
|
||||||
|
`GET /openapi.json`, `POST /mcp`. Agent tool order: `search` → `get` → `audit`.
|
||||||
|
|
||||||
|
## Reasoner (optional, D18)
|
||||||
|
|
||||||
|
CPU sidecar on `127.0.0.1:11435`. Weights are not in the 2dph image.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose --profile reasoner up -d reasoner
|
||||||
|
REASONER_BASE_URL=http://127.0.0.1:11435/v1 ./bin/reasoner/bakeoff.go --json
|
||||||
|
```
|
||||||
|
|
||||||
|
See [reasoner.md](reasoner.md).
|
||||||
@@ -7,19 +7,46 @@ require (
|
|||||||
github.com/arran4/golang-ical v0.3.5
|
github.com/arran4/golang-ical v0.3.5
|
||||||
github.com/chewxy/math32 v1.11.2
|
github.com/chewxy/math32 v1.11.2
|
||||||
github.com/daulet/tokenizers v1.27.0
|
github.com/daulet/tokenizers v1.27.0
|
||||||
|
github.com/go-git/go-git/v5 v5.19.2
|
||||||
|
golang.org/x/sys v0.47.0
|
||||||
golang.org/x/text v0.40.0
|
golang.org/x/text v0.40.0
|
||||||
|
modernc.org/sqlite v1.56.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
dario.cat/mergo v1.0.0 // indirect
|
||||||
|
github.com/Microsoft/go-winio v0.6.2 // indirect
|
||||||
|
github.com/ProtonMail/go-crypto v1.1.6 // indirect
|
||||||
github.com/apache/arrow-go/v18 v18.6.0 // indirect
|
github.com/apache/arrow-go/v18 v18.6.0 // indirect
|
||||||
|
github.com/cloudflare/circl v1.6.3 // indirect
|
||||||
|
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
|
||||||
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
|
github.com/emirpasic/gods v1.18.1 // indirect
|
||||||
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
||||||
|
github.com/go-git/go-billy/v5 v5.9.0 // indirect
|
||||||
github.com/goccy/go-json v0.10.6 // indirect
|
github.com/goccy/go-json v0.10.6 // indirect
|
||||||
|
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
|
||||||
github.com/google/flatbuffers v25.12.19+incompatible // indirect
|
github.com/google/flatbuffers v25.12.19+incompatible // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
|
||||||
|
github.com/kevinburke/ssh_config v1.2.0 // indirect
|
||||||
github.com/klauspost/compress v1.18.5 // indirect
|
github.com/klauspost/compress v1.18.5 // indirect
|
||||||
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
|
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
|
||||||
|
github.com/mattn/go-isatty v0.0.24 // indirect
|
||||||
|
github.com/ncruces/go-strftime v1.0.0 // indirect
|
||||||
github.com/pierrec/lz4/v4 v4.1.26 // indirect
|
github.com/pierrec/lz4/v4 v4.1.26 // indirect
|
||||||
|
github.com/pjbgf/sha1cd v0.6.0 // indirect
|
||||||
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||||
|
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
|
||||||
github.com/shopspring/decimal v1.4.0 // indirect
|
github.com/shopspring/decimal v1.4.0 // indirect
|
||||||
|
github.com/skeema/knownhosts v1.3.1 // indirect
|
||||||
|
github.com/xanzy/ssh-agent v0.3.3 // indirect
|
||||||
github.com/zeebo/xxh3 v1.1.0 // indirect
|
github.com/zeebo/xxh3 v1.1.0 // indirect
|
||||||
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
|
golang.org/x/crypto v0.53.0 // indirect
|
||||||
golang.org/x/sys v0.43.0 // indirect
|
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
|
||||||
|
golang.org/x/net v0.56.0 // indirect
|
||||||
|
gopkg.in/warnings.v0 v0.1.2 // indirect
|
||||||
|
modernc.org/libc v1.74.4 // indirect
|
||||||
|
modernc.org/mathutil v1.7.1 // indirect
|
||||||
|
modernc.org/memory v1.11.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,50 +1,184 @@
|
|||||||
|
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
|
||||||
|
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
|
||||||
github.com/LadybugDB/go-ladybug v0.17.0 h1:RXDbkBjrbRmLdEbhGl4CLOIEzSt09gbP0n9UbKDEfwI=
|
github.com/LadybugDB/go-ladybug v0.17.0 h1:RXDbkBjrbRmLdEbhGl4CLOIEzSt09gbP0n9UbKDEfwI=
|
||||||
github.com/LadybugDB/go-ladybug v0.17.0/go.mod h1:GeIXmE8XyF5TFS94NAuTag7vgCC+no/HTBMRA6Rd5Cs=
|
github.com/LadybugDB/go-ladybug v0.17.0/go.mod h1:GeIXmE8XyF5TFS94NAuTag7vgCC+no/HTBMRA6Rd5Cs=
|
||||||
|
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
|
||||||
|
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
|
||||||
|
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
|
||||||
|
github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
|
||||||
|
github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
|
||||||
github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
|
github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
|
||||||
github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
|
github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
|
||||||
|
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
|
||||||
|
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
|
||||||
github.com/apache/arrow-go/v18 v18.6.0 h1:GX/Jyd3R7mCLiECAwY9FWbbaYblie2WXBSz4Sw8fNpM=
|
github.com/apache/arrow-go/v18 v18.6.0 h1:GX/Jyd3R7mCLiECAwY9FWbbaYblie2WXBSz4Sw8fNpM=
|
||||||
github.com/apache/arrow-go/v18 v18.6.0/go.mod h1:gm3MiPpY82fLYK5VKPB3WoJbsiLVDfT7flD5/vHReKw=
|
github.com/apache/arrow-go/v18 v18.6.0/go.mod h1:gm3MiPpY82fLYK5VKPB3WoJbsiLVDfT7flD5/vHReKw=
|
||||||
github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
|
github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
|
||||||
github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
|
github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
|
||||||
|
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
|
||||||
|
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
|
||||||
github.com/arran4/golang-ical v0.3.5 h1:bbz6ld4dC+MmCKiFfOd6SkmIGnhNMBACZ485ULh7p9A=
|
github.com/arran4/golang-ical v0.3.5 h1:bbz6ld4dC+MmCKiFfOd6SkmIGnhNMBACZ485ULh7p9A=
|
||||||
github.com/arran4/golang-ical v0.3.5/go.mod h1:OnguFgjN0Hmx8jzpmWcC+AkHio94ujmLHKoaef7xQh8=
|
github.com/arran4/golang-ical v0.3.5/go.mod h1:OnguFgjN0Hmx8jzpmWcC+AkHio94ujmLHKoaef7xQh8=
|
||||||
github.com/chewxy/math32 v1.11.2 h1:IufN08Zwr1NKuWfY+4Tz55BcwKmyKKNdOP7KtumehnM=
|
github.com/chewxy/math32 v1.11.2 h1:IufN08Zwr1NKuWfY+4Tz55BcwKmyKKNdOP7KtumehnM=
|
||||||
github.com/chewxy/math32 v1.11.2/go.mod h1:dOB2rcuFrCn6UHrze36WSLVPKtzPMRAQvBvUwkSsLqs=
|
github.com/chewxy/math32 v1.11.2/go.mod h1:dOB2rcuFrCn6UHrze36WSLVPKtzPMRAQvBvUwkSsLqs=
|
||||||
|
github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
|
||||||
|
github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
|
||||||
|
github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE=
|
||||||
|
github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=
|
||||||
github.com/daulet/tokenizers v1.27.0 h1:MmFYAEDFz69s/nNQfHg59DWqHz3v94m99kEZ/JbL+s4=
|
github.com/daulet/tokenizers v1.27.0 h1:MmFYAEDFz69s/nNQfHg59DWqHz3v94m99kEZ/JbL+s4=
|
||||||
github.com/daulet/tokenizers v1.27.0/go.mod h1:YjFY1o1HGMyWkQgbXJDghhvke/yFDp2vGdIO2hYs4MQ=
|
github.com/daulet/tokenizers v1.27.0/go.mod h1:YjFY1o1HGMyWkQgbXJDghhvke/yFDp2vGdIO2hYs4MQ=
|
||||||
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||||
|
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||||
|
github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
|
||||||
|
github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
|
||||||
|
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
|
||||||
|
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
|
||||||
|
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
|
||||||
|
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
|
||||||
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
|
||||||
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
|
||||||
|
github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmmBPA=
|
||||||
|
github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw=
|
||||||
|
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
|
||||||
|
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
|
||||||
|
github.com/go-git/go-git/v5 v5.19.2 h1:wkfn7vOlUBu8ivAWKBWisTiwJK4jYHzTF8Ndv1LyGqY=
|
||||||
|
github.com/go-git/go-git/v5 v5.19.2/go.mod h1:QqCBE1EFN5ddFmrliLQ3/ntRCUjZU3EJuwuB/jWEHjk=
|
||||||
github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
|
github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
|
||||||
github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
||||||
|
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
|
||||||
|
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
|
||||||
github.com/google/flatbuffers v25.12.19+incompatible h1:haMV2JRRJCe1998HeW/p0X9UaMTK6SDo0ffLn2+DbLs=
|
github.com/google/flatbuffers v25.12.19+incompatible h1:haMV2JRRJCe1998HeW/p0X9UaMTK6SDo0ffLn2+DbLs=
|
||||||
github.com/google/flatbuffers v25.12.19+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
github.com/google/flatbuffers v25.12.19+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||||
|
github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3 h1:LMLX+LgTNWpfvCBdFebv6EsYotImrt/Ppc5cXIriCSo=
|
||||||
|
github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk=
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
|
||||||
|
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||||
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
|
||||||
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
|
||||||
|
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
|
||||||
|
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
|
||||||
github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
|
github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
|
||||||
github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
|
github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
|
||||||
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
|
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
|
||||||
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
|
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
|
||||||
|
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||||
|
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||||
|
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||||
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
|
github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI=
|
||||||
|
github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A=
|
||||||
|
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
|
||||||
|
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
||||||
|
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
|
||||||
|
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
|
||||||
github.com/pierrec/lz4/v4 v4.1.26 h1:GrpZw1gZttORinvzBdXPUXATeqlJjqUG/D87TKMnhjY=
|
github.com/pierrec/lz4/v4 v4.1.26 h1:GrpZw1gZttORinvzBdXPUXATeqlJjqUG/D87TKMnhjY=
|
||||||
github.com/pierrec/lz4/v4 v4.1.26/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
|
github.com/pierrec/lz4/v4 v4.1.26/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
|
||||||
|
github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU=
|
||||||
|
github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
|
||||||
|
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||||
|
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||||
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||||
|
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
||||||
|
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
||||||
|
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
|
||||||
|
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
|
||||||
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
|
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
|
||||||
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
|
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
|
||||||
|
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||||
|
github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
|
||||||
|
github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
|
||||||
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||||
|
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
|
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
|
||||||
|
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
|
||||||
github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
|
github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
|
||||||
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
|
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
|
||||||
github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
|
github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
|
||||||
github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
|
github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
|
||||||
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU=
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU=
|
golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
|
||||||
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
|
golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
|
||||||
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
|
||||||
|
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
|
||||||
|
golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
|
||||||
|
golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
|
||||||
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
|
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
|
||||||
|
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
|
||||||
|
golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
|
||||||
|
golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||||
|
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
|
||||||
|
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||||
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
|
golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
|
||||||
|
golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
|
||||||
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
|
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
|
||||||
golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
|
golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
|
||||||
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
|
||||||
|
golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
|
||||||
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
|
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
|
||||||
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
|
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||||
|
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
|
||||||
|
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
|
||||||
|
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
modernc.org/cc/v4 v4.29.1 h1:MKgdCV3WykTSPqpVrnxdEDS0HEd2FHpKZDzxzU5LyeI=
|
||||||
|
modernc.org/cc/v4 v4.29.1/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=
|
||||||
|
modernc.org/ccgo/v4 v4.34.6 h1:sBgfIwyN0TQ9C5hwIeuqyeAKyMWnbvj2fvpF4L11uzU=
|
||||||
|
modernc.org/ccgo/v4 v4.34.6/go.mod h1:SZ8YcN9NG7XVsQYdm6jYBvi8PQP1qi+kqB6OhjqI3Fk=
|
||||||
|
modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
|
||||||
|
modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
|
||||||
|
modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
|
||||||
|
modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
|
||||||
|
modernc.org/gc/v3 v3.1.4 h1:2g65LGVSmFQrXeITAw97x7hCRvZFcyE1uDP+7Vng7JI=
|
||||||
|
modernc.org/gc/v3 v3.1.4/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
|
||||||
|
modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
|
||||||
|
modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
|
||||||
|
modernc.org/libc v1.74.4 h1:fX1Omw4o2/1C2iRkkIsrQTasJQldLhRmuPreXLoWs9k=
|
||||||
|
modernc.org/libc v1.74.4/go.mod h1:eeQAS9W3sZeKYMFubydxJpII9ybHWshk+7or7bLG9co=
|
||||||
|
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
|
||||||
|
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
|
||||||
|
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
|
||||||
|
modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
|
||||||
|
modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg=
|
||||||
|
modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
|
||||||
|
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
|
||||||
|
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
|
||||||
|
modernc.org/sqlite v1.56.0 h1:/D8e2RfFqoy/Zc6PuC76U28zFwmI/sYx1Kjm4yEn9e0=
|
||||||
|
modernc.org/sqlite v1.56.0/go.mod h1:yCJ2cmAaIkHQ25oXWrF8H4O1lIfPYPR26yCEDj2P3pQ=
|
||||||
|
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
|
||||||
|
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
|
||||||
|
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
|
||||||
|
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
|
||||||
|
|||||||
@@ -0,0 +1,159 @@
|
|||||||
|
//go:build cgo && system_ladybug
|
||||||
|
|
||||||
|
package brain
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/brain/rank"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Ready opens the Ladybug file for the life of the serve process.
|
||||||
|
func Ready() error {
|
||||||
|
return openBrain()
|
||||||
|
}
|
||||||
|
|
||||||
|
// HTTP is the in-process API used by bin/brain/serve.go.
|
||||||
|
type HTTP struct{}
|
||||||
|
|
||||||
|
func (HTTP) Search(ctx context.Context, query string, limit int) ([]byte, error) {
|
||||||
|
hits, err := searchHits(query, "", "", limit)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for i := range hits {
|
||||||
|
if hits[i].Text != "" {
|
||||||
|
runes := []rune(hits[i].Text)
|
||||||
|
if len(runes) > 280 {
|
||||||
|
runes = runes[:280]
|
||||||
|
}
|
||||||
|
hits[i].Snippet = string(runes)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
webOut := rank.Deduce(hits, query, "", false, func(q string) rank.SecondSource {
|
||||||
|
return lookupWeb(ctx, q)
|
||||||
|
})
|
||||||
|
var buf bytes.Buffer
|
||||||
|
enc := json.NewEncoder(&buf)
|
||||||
|
enc.SetEscapeHTML(false)
|
||||||
|
if err := enc.Encode(toJSONOut(hits, query, "", webOut)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return buf.Bytes(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (HTTP) Get(_ context.Context, id string, body bool) ([]byte, error) {
|
||||||
|
if conn == nil {
|
||||||
|
return nil, fmt.Errorf("brain not open")
|
||||||
|
}
|
||||||
|
stmt, err := conn.Prepare(
|
||||||
|
"MATCH (l:Leaf {id:$id}) RETURN l.id, l.text, l.root, l.confidence, l.source, l.type",
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer stmt.Close()
|
||||||
|
res, err := conn.Execute(stmt, map[string]any{"id": id})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !res.HasNext() {
|
||||||
|
return nil, fmt.Errorf("no leaf %s", id)
|
||||||
|
}
|
||||||
|
row, err := res.Next()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
vals, err := row.GetAsSlice()
|
||||||
|
if err != nil || len(vals) < 6 {
|
||||||
|
return nil, fmt.Errorf("leaf row")
|
||||||
|
}
|
||||||
|
out := map[string]any{
|
||||||
|
"id": fmt.Sprint(vals[0]),
|
||||||
|
"root": fmt.Sprint(vals[2]),
|
||||||
|
"confidence": fmt.Sprint(vals[3]),
|
||||||
|
"source": fmt.Sprint(vals[4]),
|
||||||
|
"type": fmt.Sprint(vals[5]),
|
||||||
|
}
|
||||||
|
if body {
|
||||||
|
out["text"] = fmt.Sprint(vals[1])
|
||||||
|
}
|
||||||
|
return json.Marshal(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (HTTP) Stats(context.Context) ([]byte, error) {
|
||||||
|
if conn == nil {
|
||||||
|
return nil, fmt.Errorf("brain not open")
|
||||||
|
}
|
||||||
|
res, err := conn.Query("MATCH (l:Leaf) RETURN l.root, count(*)")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
byRoot := map[string]int{}
|
||||||
|
total := 0
|
||||||
|
for res.HasNext() {
|
||||||
|
row, err := res.Next()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
vals, err := row.GetAsSlice()
|
||||||
|
if err != nil || len(vals) < 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
n := int(asInt(vals[1]))
|
||||||
|
byRoot[fmt.Sprint(vals[0])] = n
|
||||||
|
total += n
|
||||||
|
}
|
||||||
|
return json.Marshal(map[string]any{"total": total, "by_root": byRoot, "db": dbPath()})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (HTTP) Audit(context.Context) ([]byte, error) {
|
||||||
|
if conn == nil {
|
||||||
|
return nil, fmt.Errorf("brain not open")
|
||||||
|
}
|
||||||
|
res, err := conn.Query("MATCH (l:Leaf) RETURN l.root, l.confidence, count(*)")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var rows []map[string]any
|
||||||
|
for res.HasNext() {
|
||||||
|
row, err := res.Next()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
vals, err := row.GetAsSlice()
|
||||||
|
if err != nil || len(vals) < 3 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
rows = append(rows, map[string]any{
|
||||||
|
"root": fmt.Sprint(vals[0]),
|
||||||
|
"confidence": fmt.Sprint(vals[1]),
|
||||||
|
"count": asInt(vals[2]),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return json.Marshal(map[string]any{"status": "ok", "by_confidence": rows})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (HTTP) Ingest(context.Context) ([]byte, error) {
|
||||||
|
return json.Marshal(map[string]any{
|
||||||
|
"mode": "rebuild",
|
||||||
|
"command": "bin/brain/index.go --rebuild",
|
||||||
|
"add": "v2",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func asInt(v any) int64 {
|
||||||
|
switch n := v.(type) {
|
||||||
|
case int64:
|
||||||
|
return n
|
||||||
|
case int:
|
||||||
|
return int64(n)
|
||||||
|
case float64:
|
||||||
|
return int64(n)
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
package brain
|
||||||
|
|
||||||
|
const ModelID = "minishlab/potion-multilingual-128M"
|
||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
const Usage = `usage: bin/brain/search.go "query" [--root facts|info] [--repo REPO] [-n N] [--json]
|
const Usage = `usage: bin/brain/search.go "query" [--root facts|info] [--repo REPO] [-n N] [--json] [--no-web]
|
||||||
bin/brain/search.go serve [port]
|
bin/brain/search.go serve [port]
|
||||||
bin/brain/search.go --list-model`
|
bin/brain/search.go --list-model`
|
||||||
|
|
||||||
@@ -17,6 +17,7 @@ type Options struct {
|
|||||||
Limit int
|
Limit int
|
||||||
JSONOut bool
|
JSONOut bool
|
||||||
ListModel bool
|
ListModel bool
|
||||||
|
NoWeb bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseArgs reads flags. Unknown flags are an error: silently dropping them
|
// ParseArgs reads flags. Unknown flags are an error: silently dropping them
|
||||||
@@ -54,6 +55,8 @@ func ParseArgs(args []string) (Options, error) {
|
|||||||
return opt, fmt.Errorf("--hop is not implemented yet (needs File/FROM_FILE edges)")
|
return opt, fmt.Errorf("--hop is not implemented yet (needs File/FROM_FILE edges)")
|
||||||
case "--json":
|
case "--json":
|
||||||
opt.JSONOut = true
|
opt.JSONOut = true
|
||||||
|
case "--no-web":
|
||||||
|
opt.NoWeb = true
|
||||||
case "--list-model":
|
case "--list-model":
|
||||||
opt.ListModel = true
|
opt.ListModel = true
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package rank
|
||||||
|
|
||||||
|
// SecondSource is the web-search block on a deduction answer.
|
||||||
|
// Kept apart from graph hits so "ours" and "not ours" stay visible.
|
||||||
|
type SecondSource struct {
|
||||||
|
Status string `json:"status"`
|
||||||
|
Note string `json:"note,omitempty"`
|
||||||
|
Cached bool `json:"cached,omitempty"`
|
||||||
|
Results []SecondSourceHit `json:"results,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SecondSourceHit struct {
|
||||||
|
Rank int `json:"rank"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
Snippet string `json:"snippet"`
|
||||||
|
Engine string `json:"engine"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type WebFn func(query string) SecondSource
|
||||||
|
|
||||||
|
// ShouldEscalate is true when the default deduction path has no facts hit.
|
||||||
|
// `--root facts|info` is a single-root ask: do not mix in the web.
|
||||||
|
func ShouldEscalate(hits []Hit, rootFilter string) bool {
|
||||||
|
if rootFilter != "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, h := range hits {
|
||||||
|
if h.Root == "facts" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deduce returns the second-source block, or nil when web must not run.
|
||||||
|
func Deduce(hits []Hit, query, rootFilter string, noWeb bool, web WebFn) *SecondSource {
|
||||||
|
if noWeb || web == nil || !ShouldEscalate(hits, rootFilter) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
out := web(query)
|
||||||
|
return &out
|
||||||
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
package rank
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestShouldEscalateWhenNoFacts(t *testing.T) {
|
||||||
|
if !ShouldEscalate(nil, "") {
|
||||||
|
t.Fatal("empty local graph must escalate")
|
||||||
|
}
|
||||||
|
if !ShouldEscalate([]Hit{h("i", "info", "docs/a.md")}, "") {
|
||||||
|
t.Fatal("info-only must escalate (not confirmed)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShouldNotEscalateWhenFactsConfirm(t *testing.T) {
|
||||||
|
hits := []Hit{h("f", "facts", "docker ps x compose"), h("i", "info", "docs/a.md")}
|
||||||
|
if ShouldEscalate(hits, "") {
|
||||||
|
t.Fatal("facts hit is already confirmed; do not mix web")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShouldNotEscalateWhenRootFilterSet(t *testing.T) {
|
||||||
|
if ShouldEscalate(nil, "facts") {
|
||||||
|
t.Fatal("--root facts must stay local")
|
||||||
|
}
|
||||||
|
if ShouldEscalate([]Hit{h("i", "info", "x")}, "info") {
|
||||||
|
t.Fatal("--root info must stay local")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeduceCallsWebOnlyWhenEscalating(t *testing.T) {
|
||||||
|
called := 0
|
||||||
|
web := func(q string) SecondSource {
|
||||||
|
called++
|
||||||
|
if q != "LadybugDB" {
|
||||||
|
t.Fatalf("query = %q", q)
|
||||||
|
}
|
||||||
|
return SecondSource{Status: "ok", Results: []SecondSourceHit{{Title: "t", URL: "http://example.com"}}}
|
||||||
|
}
|
||||||
|
got := Deduce([]Hit{h("i", "info", "x")}, "LadybugDB", "", false, web)
|
||||||
|
if called != 1 || got == nil || got.Status != "ok" {
|
||||||
|
t.Fatalf("got %+v called=%d", got, called)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeduceNilWhenFactsOrNoWeb(t *testing.T) {
|
||||||
|
web := func(string) SecondSource {
|
||||||
|
t.Fatal("web must not run")
|
||||||
|
return SecondSource{}
|
||||||
|
}
|
||||||
|
if Deduce([]Hit{h("f", "facts", "x")}, "q", "", false, web) != nil {
|
||||||
|
t.Fatal("facts")
|
||||||
|
}
|
||||||
|
if Deduce([]Hit{h("i", "info", "x")}, "q", "", true, web) != nil {
|
||||||
|
t.Fatal("--no-web")
|
||||||
|
}
|
||||||
|
if Deduce(nil, "q", "facts", false, web) != nil {
|
||||||
|
t.Fatal("--root facts")
|
||||||
|
}
|
||||||
|
if Deduce(nil, "q", "", false, nil) != nil {
|
||||||
|
t.Fatal("nil web fn")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseNoWeb(t *testing.T) {
|
||||||
|
opt, err := ParseArgs([]string{"query", "--no-web", "--json"})
|
||||||
|
if err != nil || !opt.NoWeb || !opt.JSONOut || opt.Query != "query" {
|
||||||
|
t.Fatalf("got %+v err=%v", opt, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestUsageNamesNoWeb(t *testing.T) {
|
||||||
|
if !strings.Contains(Usage, "--no-web") {
|
||||||
|
t.Fatalf("usage must name --no-web, got:\n%s", Usage)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package rank
|
||||||
|
|
||||||
|
// Eval control questions (recall@5). Kept here so CI can test the gate
|
||||||
|
// table without ladybug cgo. The runner lives in internal/brain (cgo).
|
||||||
|
const EvalRecallThreshold = 0.95
|
||||||
|
|
||||||
|
type EvalQuestion struct {
|
||||||
|
Query string
|
||||||
|
Fragment string
|
||||||
|
}
|
||||||
|
|
||||||
|
var EvalQuestions = []EvalQuestion{
|
||||||
|
{"hybrid search fts and vector", "BM25"},
|
||||||
|
{"eslider devops engineer", "DevOps"},
|
||||||
|
{"ladybugdb graph engine storage", "LadybugDB"},
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package rank
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestEvalQuestionsAreThreeAndThreshold(t *testing.T) {
|
||||||
|
if EvalRecallThreshold != 0.95 {
|
||||||
|
t.Fatalf("threshold = %v", EvalRecallThreshold)
|
||||||
|
}
|
||||||
|
if len(EvalQuestions) != 3 {
|
||||||
|
t.Fatalf("questions = %d, want 3", len(EvalQuestions))
|
||||||
|
}
|
||||||
|
for _, q := range EvalQuestions {
|
||||||
|
if q.Query == "" || q.Fragment == "" {
|
||||||
|
t.Fatalf("empty control: %+v", q)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,281 @@
|
|||||||
|
//go:build cgo && system_ladybug
|
||||||
|
|
||||||
|
package brain
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"unicode/utf8"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/brain/rank"
|
||||||
|
)
|
||||||
|
|
||||||
|
func MainGet(args []string) int {
|
||||||
|
id, body, jsonOut := "", false, false
|
||||||
|
for _, a := range args {
|
||||||
|
switch {
|
||||||
|
case a == "--body":
|
||||||
|
body = true
|
||||||
|
case a == "--json":
|
||||||
|
jsonOut = true
|
||||||
|
case a == "-h" || a == "--help":
|
||||||
|
fmt.Fprintln(os.Stderr, `usage: bin/brain/get.go <id> [--body] [--json]`)
|
||||||
|
return 0
|
||||||
|
case strings.HasPrefix(a, "-"):
|
||||||
|
fmt.Fprintf(os.Stderr, "brain/get: unknown flag %s\n", a)
|
||||||
|
return 2
|
||||||
|
default:
|
||||||
|
id = a
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if id == "" {
|
||||||
|
fmt.Fprintln(os.Stderr, "brain/get: id required")
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
if err := openBrain(); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "open brain: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
defer closeBrain()
|
||||||
|
meta, text, err := lookupLeaf(id)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "brain/get: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
out := Dict{
|
||||||
|
{"id", meta["id"]},
|
||||||
|
{"root", meta["root"]},
|
||||||
|
{"confidence", meta["confidence"]},
|
||||||
|
{"source", meta["source"]},
|
||||||
|
{"type", meta["type"]},
|
||||||
|
}
|
||||||
|
if body {
|
||||||
|
out = append(out, KV{"text", text})
|
||||||
|
} else {
|
||||||
|
out = append(out, KV{"snippet", clip(text, 280)})
|
||||||
|
}
|
||||||
|
if jsonOut {
|
||||||
|
m := map[string]any{}
|
||||||
|
for _, kv := range out {
|
||||||
|
m[kv.K] = kv.V
|
||||||
|
}
|
||||||
|
enc := json.NewEncoder(os.Stdout)
|
||||||
|
enc.SetIndent("", " ")
|
||||||
|
enc.SetEscapeHTML(false)
|
||||||
|
return b2i(enc.Encode(m))
|
||||||
|
}
|
||||||
|
fmt.Print(toYAML(out, 0))
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func MainStats(args []string) int {
|
||||||
|
jsonOut := false
|
||||||
|
for _, a := range args {
|
||||||
|
switch a {
|
||||||
|
case "--json":
|
||||||
|
jsonOut = true
|
||||||
|
case "-h", "--help":
|
||||||
|
fmt.Fprintln(os.Stderr, `usage: bin/brain/stats.go [--json]`)
|
||||||
|
return 0
|
||||||
|
default:
|
||||||
|
if strings.HasPrefix(a, "-") {
|
||||||
|
fmt.Fprintf(os.Stderr, "brain/stats: unknown flag %s\n", a)
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := openBrain(); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "open brain: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
defer closeBrain()
|
||||||
|
s, err := leafStats()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "brain/stats: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
if jsonOut {
|
||||||
|
enc := json.NewEncoder(os.Stdout)
|
||||||
|
enc.SetIndent("", " ")
|
||||||
|
enc.SetEscapeHTML(false)
|
||||||
|
return b2i(enc.Encode(s))
|
||||||
|
}
|
||||||
|
by := s["by_root"].(map[string]int)
|
||||||
|
keys := make([]string, 0, len(by))
|
||||||
|
for k := range by {
|
||||||
|
keys = append(keys, k)
|
||||||
|
}
|
||||||
|
sort.Strings(keys)
|
||||||
|
byRoot := make(Dict, 0, len(keys))
|
||||||
|
for _, k := range keys {
|
||||||
|
byRoot = append(byRoot, KV{k, by[k]})
|
||||||
|
}
|
||||||
|
out := Dict{
|
||||||
|
{"total", s["total"]},
|
||||||
|
{"by_root", byRoot},
|
||||||
|
{"db", s["db"]},
|
||||||
|
{"model", s["model"]},
|
||||||
|
}
|
||||||
|
fmt.Print(toYAML(out, 0))
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func MainEval(args []string) int {
|
||||||
|
jsonOut := false
|
||||||
|
for _, a := range args {
|
||||||
|
switch a {
|
||||||
|
case "--json":
|
||||||
|
jsonOut = true
|
||||||
|
case "-h", "--help":
|
||||||
|
fmt.Fprintln(os.Stderr, `usage: bin/brain/eval.go [--json]`)
|
||||||
|
return 0
|
||||||
|
default:
|
||||||
|
if strings.HasPrefix(a, "-") {
|
||||||
|
fmt.Fprintf(os.Stderr, "brain/eval: unknown flag %s\n", a)
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := openBrain(); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "open brain: %v\n", err)
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
defer closeBrain()
|
||||||
|
recalled := 0
|
||||||
|
details := make([]any, 0, len(rank.EvalQuestions))
|
||||||
|
jsDetails := make([]map[string]any, 0, len(rank.EvalQuestions))
|
||||||
|
for _, q := range rank.EvalQuestions {
|
||||||
|
hits, err := queryFTS(q.Query, 5)
|
||||||
|
ok := false
|
||||||
|
if err == nil {
|
||||||
|
frag := strings.ToLower(q.Fragment)
|
||||||
|
for _, h := range hits {
|
||||||
|
if strings.Contains(strings.ToLower(h.Text), frag) {
|
||||||
|
ok = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
recalled++
|
||||||
|
}
|
||||||
|
details = append(details, Dict{
|
||||||
|
{"q", q.Query},
|
||||||
|
{"fragment", q.Fragment},
|
||||||
|
{"in_top5", ok},
|
||||||
|
})
|
||||||
|
jsDetails = append(jsDetails, map[string]any{
|
||||||
|
"q": q.Query, "fragment": q.Fragment, "in_top5": ok,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
n := len(rank.EvalQuestions)
|
||||||
|
recall := 0.0
|
||||||
|
if n > 0 {
|
||||||
|
recall = float64(recalled) / float64(n)
|
||||||
|
}
|
||||||
|
passed := recall >= rank.EvalRecallThreshold
|
||||||
|
if jsonOut {
|
||||||
|
enc := json.NewEncoder(os.Stdout)
|
||||||
|
enc.SetIndent("", " ")
|
||||||
|
enc.SetEscapeHTML(false)
|
||||||
|
_ = enc.Encode(map[string]any{
|
||||||
|
"recall@5": round3(recall),
|
||||||
|
"passed": passed,
|
||||||
|
"gate": n,
|
||||||
|
"details": jsDetails,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
out := Dict{
|
||||||
|
{"recall@5", round3(recall)},
|
||||||
|
{"passed", passed},
|
||||||
|
{"gate", n},
|
||||||
|
{"details", details},
|
||||||
|
}
|
||||||
|
fmt.Print(toYAML(out, 0))
|
||||||
|
}
|
||||||
|
if !passed {
|
||||||
|
return 2
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func lookupLeaf(id string) (map[string]string, string, error) {
|
||||||
|
if conn == nil {
|
||||||
|
return nil, "", fmt.Errorf("brain not open")
|
||||||
|
}
|
||||||
|
stmt, err := conn.Prepare(
|
||||||
|
"MATCH (l:Leaf {id:$id}) RETURN l.id, l.text, l.root, l.confidence, l.source, l.type",
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
defer stmt.Close()
|
||||||
|
res, err := conn.Execute(stmt, map[string]any{"id": id})
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
if !res.HasNext() {
|
||||||
|
return nil, "", fmt.Errorf("no leaf %s", id)
|
||||||
|
}
|
||||||
|
row, err := res.Next()
|
||||||
|
if err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
|
vals, err := row.GetAsSlice()
|
||||||
|
if err != nil || len(vals) < 6 {
|
||||||
|
return nil, "", fmt.Errorf("leaf row")
|
||||||
|
}
|
||||||
|
meta := map[string]string{
|
||||||
|
"id": fmt.Sprint(vals[0]),
|
||||||
|
"root": fmt.Sprint(vals[2]),
|
||||||
|
"confidence": fmt.Sprint(vals[3]),
|
||||||
|
"source": fmt.Sprint(vals[4]),
|
||||||
|
"type": fmt.Sprint(vals[5]),
|
||||||
|
}
|
||||||
|
return meta, fmt.Sprint(vals[1]), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func leafStats() (map[string]any, error) {
|
||||||
|
if conn == nil {
|
||||||
|
return nil, fmt.Errorf("brain not open")
|
||||||
|
}
|
||||||
|
res, err := conn.Query("MATCH (l:Leaf) RETURN l.root, count(*)")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
byRoot := map[string]int{}
|
||||||
|
total := 0
|
||||||
|
for res.HasNext() {
|
||||||
|
row, err := res.Next()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
vals, err := row.GetAsSlice()
|
||||||
|
if err != nil || len(vals) < 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
n := int(asInt(vals[1]))
|
||||||
|
byRoot[fmt.Sprint(vals[0])] = n
|
||||||
|
total += n
|
||||||
|
}
|
||||||
|
return map[string]any{
|
||||||
|
"total": total,
|
||||||
|
"by_root": byRoot,
|
||||||
|
"db": dbPath(),
|
||||||
|
"model": ModelID,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func clip(s string, n int) string {
|
||||||
|
if utf8.RuneCountInString(s) <= n {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
return string([]rune(s)[:n])
|
||||||
|
}
|
||||||
|
|
||||||
|
func round3(f float64) float64 {
|
||||||
|
return float64(int(f*1000+0.5)) / 1000
|
||||||
|
}
|
||||||
+30
-17
@@ -51,25 +51,13 @@ func runSearch(args []string) int {
|
|||||||
}
|
}
|
||||||
defer closeBrain()
|
defer closeBrain()
|
||||||
|
|
||||||
emb, err := embedQuery(query)
|
hits, err := searchHits(query, root, repo, limit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "embed: %v\n", err)
|
fmt.Fprintf(os.Stderr, "search: %v\n", err)
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
fts, err := queryFTS(query, limit*3)
|
results := hits
|
||||||
if err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "fts: %v\n", err)
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
var vec []Hit
|
|
||||||
if vec, err = queryVector(emb, limit*3); err != nil {
|
|
||||||
fmt.Fprintf(os.Stderr, "vec: %v\n", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
results := rank.RankAndFilter(fts, vec, root, repo, limit)
|
|
||||||
|
|
||||||
for i := range results {
|
for i := range results {
|
||||||
if results[i].Text != "" {
|
if results[i].Text != "" {
|
||||||
runes := []rune(results[i].Text)
|
runes := []rune(results[i].Text)
|
||||||
@@ -80,23 +68,46 @@ func runSearch(args []string) int {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
webOut := rank.Deduce(results, query, root, opt.NoWeb, func(q string) rank.SecondSource {
|
||||||
|
return lookupWeb(context.Background(), q)
|
||||||
|
})
|
||||||
|
|
||||||
out := Dict{
|
out := Dict{
|
||||||
{"query", query},
|
{"query", query},
|
||||||
{"root_filter", root},
|
{"root_filter", root},
|
||||||
{"count", len(results)},
|
{"count", len(results)},
|
||||||
{"results", resultsToDicts(results)},
|
{"results", resultsToDicts(results)},
|
||||||
}
|
}
|
||||||
|
if webOut != nil {
|
||||||
|
out = append(out, KV{"web", secondToDict(*webOut)})
|
||||||
|
}
|
||||||
|
|
||||||
if jsonOut {
|
if jsonOut {
|
||||||
enc := json.NewEncoder(os.Stdout)
|
enc := json.NewEncoder(os.Stdout)
|
||||||
enc.SetIndent("", " ")
|
enc.SetIndent("", " ")
|
||||||
enc.SetEscapeHTML(false)
|
enc.SetEscapeHTML(false)
|
||||||
return b2i(enc.Encode(toJSONOut(results, query, root)))
|
return b2i(enc.Encode(toJSONOut(results, query, root, webOut)))
|
||||||
}
|
}
|
||||||
fmt.Print(toYAML(out, 0))
|
fmt.Print(toYAML(out, 0))
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func searchHits(query, root, repo string, limit int) ([]Hit, error) {
|
||||||
|
emb, err := embedQuery(query)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("embed: %w", err)
|
||||||
|
}
|
||||||
|
fts, err := queryFTS(query, limit*3)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("fts: %w", err)
|
||||||
|
}
|
||||||
|
var vec []Hit
|
||||||
|
if vec, err = queryVector(emb, limit*3); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "vec: %v\n", err)
|
||||||
|
}
|
||||||
|
return rank.RankAndFilter(fts, vec, root, repo, limit), nil
|
||||||
|
}
|
||||||
|
|
||||||
func b2i(err error) int {
|
func b2i(err error) int {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 1
|
return 1
|
||||||
@@ -168,6 +179,7 @@ type jsonOut struct {
|
|||||||
RootFilter string `json:"root_filter"`
|
RootFilter string `json:"root_filter"`
|
||||||
Count int `json:"count"`
|
Count int `json:"count"`
|
||||||
Results []jsonHit `json:"results"`
|
Results []jsonHit `json:"results"`
|
||||||
|
Web *rank.SecondSource `json:"web,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type jsonHit struct {
|
type jsonHit struct {
|
||||||
@@ -178,7 +190,7 @@ type jsonHit struct {
|
|||||||
Snippet string `json:"snippet,omitempty"`
|
Snippet string `json:"snippet,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func toJSONOut(hits []Hit, query, rootFilter string) *jsonOut {
|
func toJSONOut(hits []Hit, query, rootFilter string, web *rank.SecondSource) *jsonOut {
|
||||||
out := make([]jsonHit, len(hits))
|
out := make([]jsonHit, len(hits))
|
||||||
for i, h := range hits {
|
for i, h := range hits {
|
||||||
out[i] = jsonHit{
|
out[i] = jsonHit{
|
||||||
@@ -194,6 +206,7 @@ func toJSONOut(hits []Hit, query, rootFilter string) *jsonOut {
|
|||||||
RootFilter: rootFilter,
|
RootFilter: rootFilter,
|
||||||
Count: len(hits),
|
Count: len(hits),
|
||||||
Results: out,
|
Results: out,
|
||||||
|
Web: web,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package brain
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/brain/rank"
|
||||||
|
"github.com/eSlider/2dph/internal/websearch"
|
||||||
|
)
|
||||||
|
|
||||||
|
func lookupWeb(ctx context.Context, query string) rank.SecondSource {
|
||||||
|
o := websearch.Lookup(ctx, query, websearch.LookupOpt{Limit: 5})
|
||||||
|
return toSecond(o)
|
||||||
|
}
|
||||||
|
|
||||||
|
func toSecond(o websearch.Output) rank.SecondSource {
|
||||||
|
hits := make([]rank.SecondSourceHit, 0, len(o.Results))
|
||||||
|
for _, h := range o.Results {
|
||||||
|
hits = append(hits, rank.SecondSourceHit{
|
||||||
|
Rank: h.Rank,
|
||||||
|
Title: h.Title,
|
||||||
|
URL: h.URL,
|
||||||
|
Snippet: h.Snippet,
|
||||||
|
Engine: h.Engine,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return rank.SecondSource{
|
||||||
|
Status: o.Status,
|
||||||
|
Note: o.Note,
|
||||||
|
Cached: o.Cached,
|
||||||
|
Results: hits,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func secondToDict(w rank.SecondSource) Dict {
|
||||||
|
d := Dict{
|
||||||
|
{"status", w.Status},
|
||||||
|
}
|
||||||
|
if w.Note != "" {
|
||||||
|
d = append(d, KV{"note", w.Note})
|
||||||
|
}
|
||||||
|
if w.Cached {
|
||||||
|
d = append(d, KV{"cached", true})
|
||||||
|
}
|
||||||
|
rows := make([]any, 0, len(w.Results))
|
||||||
|
for _, h := range w.Results {
|
||||||
|
rows = append(rows, Dict{
|
||||||
|
{"rank", h.Rank},
|
||||||
|
{"title", h.Title},
|
||||||
|
{"url", h.URL},
|
||||||
|
{"snippet", h.Snippet},
|
||||||
|
{"engine", h.Engine},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
d = append(d, KV{"results", rows})
|
||||||
|
return d
|
||||||
|
}
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
// Package gitlog reads commit history with go-git (no git binary).
|
||||||
|
package gitlog
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"path"
|
||||||
|
"path/filepath"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/go-git/go-git/v5/plumbing/object"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Options struct {
|
||||||
|
Limit int
|
||||||
|
Since time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
type Commit struct {
|
||||||
|
SHA string `json:"sha"`
|
||||||
|
Author string `json:"author"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
Date string `json:"date"`
|
||||||
|
Subject string `json:"subject"`
|
||||||
|
Files []string `json:"files"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Leaf struct {
|
||||||
|
Source string `json:"source"`
|
||||||
|
Repo string `json:"repo"`
|
||||||
|
Heading string `json:"heading"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Related string `json:"related"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log walks commits from HEAD, newest first, skipping merges.
|
||||||
|
func Log(repo string, opt Options) ([]Commit, error) {
|
||||||
|
r, err := git.PlainOpen(repo)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
logOpt := &git.LogOptions{Order: git.LogOrderCommitterTime}
|
||||||
|
if !opt.Since.IsZero() {
|
||||||
|
t := opt.Since
|
||||||
|
logOpt.Since = &t
|
||||||
|
}
|
||||||
|
iter, err := r.Log(logOpt)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer iter.Close()
|
||||||
|
|
||||||
|
var out []Commit
|
||||||
|
err = iter.ForEach(func(c *object.Commit) error {
|
||||||
|
if c.NumParents() > 1 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if opt.Limit > 0 && len(out) >= opt.Limit {
|
||||||
|
return Stop
|
||||||
|
}
|
||||||
|
files, ferr := changedFiles(c)
|
||||||
|
if ferr != nil {
|
||||||
|
return ferr
|
||||||
|
}
|
||||||
|
out = append(out, Commit{
|
||||||
|
SHA: c.Hash.String(),
|
||||||
|
Author: c.Author.Name,
|
||||||
|
Email: c.Author.Email,
|
||||||
|
Date: c.Author.When.Format(time.RFC3339),
|
||||||
|
Subject: firstLine(c.Message),
|
||||||
|
Files: files,
|
||||||
|
})
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if errors.Is(err, Stop) {
|
||||||
|
err = nil
|
||||||
|
}
|
||||||
|
return out, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop ends a log walk early (limit reached).
|
||||||
|
var Stop = fmt.Errorf("gitlog: stop")
|
||||||
|
|
||||||
|
func changedFiles(c *object.Commit) ([]string, error) {
|
||||||
|
var names []string
|
||||||
|
if c.NumParents() == 0 {
|
||||||
|
t, err := c.Tree()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
err = t.Files().ForEach(func(f *object.File) error {
|
||||||
|
names = append(names, f.Name)
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
sort.Strings(names)
|
||||||
|
return names, err
|
||||||
|
}
|
||||||
|
parent, err := c.Parent(0)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
from, err := parent.Tree()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
to, err := c.Tree()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
changes, err := object.DiffTree(from, to)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, ch := range changes {
|
||||||
|
name := ch.To.Name
|
||||||
|
if name == "" {
|
||||||
|
name = ch.From.Name
|
||||||
|
}
|
||||||
|
if name != "" {
|
||||||
|
names = append(names, name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Strings(names)
|
||||||
|
return names, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstLine(msg string) string {
|
||||||
|
msg = strings.ReplaceAll(msg, "\r\n", "\n")
|
||||||
|
if i := strings.IndexByte(msg, '\n'); i >= 0 {
|
||||||
|
return strings.TrimSpace(msg[:i])
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func ToLeaf(c Commit, repo string) Leaf {
|
||||||
|
short := c.SHA
|
||||||
|
if len(short) > 12 {
|
||||||
|
short = short[:12]
|
||||||
|
}
|
||||||
|
head := fmt.Sprintf("commit %s — %s", short, c.Subject)
|
||||||
|
body := []string{
|
||||||
|
fmt.Sprintf("commit %s in %s — %s", short, repo, c.Subject),
|
||||||
|
fmt.Sprintf("Author: %s <%s>", c.Author, c.Email),
|
||||||
|
fmt.Sprintf("Date: %s", c.Date),
|
||||||
|
}
|
||||||
|
if len(c.Files) > 0 {
|
||||||
|
body = append(body, "Changing: "+strings.Join(c.Files, ", "))
|
||||||
|
}
|
||||||
|
return Leaf{
|
||||||
|
Source: repo + "@" + c.SHA,
|
||||||
|
Repo: repo,
|
||||||
|
Heading: head,
|
||||||
|
Text: strings.Join(body, "\n"),
|
||||||
|
Type: "commit",
|
||||||
|
Status: "current",
|
||||||
|
Related: strings.Join(c.Files, ","),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func RepoName(repo string) (string, error) {
|
||||||
|
r, err := git.PlainOpen(repo)
|
||||||
|
if err != nil {
|
||||||
|
return filepath.Base(repo), err
|
||||||
|
}
|
||||||
|
rem, err := r.Remote("origin")
|
||||||
|
if err != nil {
|
||||||
|
return filepath.Base(repo), nil
|
||||||
|
}
|
||||||
|
urls := rem.Config().URLs
|
||||||
|
if len(urls) == 0 {
|
||||||
|
return filepath.Base(repo), nil
|
||||||
|
}
|
||||||
|
u := strings.TrimSuffix(strings.TrimSuffix(urls[0], "/"), ".git")
|
||||||
|
return path.Base(strings.ReplaceAll(u, "\\", "/")), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,243 @@
|
|||||||
|
package gitlog
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/go-git/go-git/v5/config"
|
||||||
|
"github.com/go-git/go-git/v5/plumbing"
|
||||||
|
"github.com/go-git/go-git/v5/plumbing/object"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLogReadsCommitsWithoutGitBinary(t *testing.T) {
|
||||||
|
dir := initRepo(t, []commitSpec{
|
||||||
|
{
|
||||||
|
when: time.Date(2026, 8, 10, 12, 0, 0, 0, time.FixedZone("CEST", 3600)),
|
||||||
|
name: "Ada Lovelace",
|
||||||
|
email: "ada@example.com",
|
||||||
|
subject: "feat: first commit",
|
||||||
|
files: map[string]string{"README.md": "hi\n", "src/main.c": "int main(){}\n"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
when: time.Date(2026, 8, 11, 9, 30, 0, 0, time.FixedZone("CEST", 3600)),
|
||||||
|
name: "Bob Babbage",
|
||||||
|
email: "bob@example.com",
|
||||||
|
subject: "fix: typo",
|
||||||
|
files: map[string]string{"docs/notes.md": "note\n"},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
cs, err := Log(dir, Options{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(cs) != 2 {
|
||||||
|
t.Fatalf("commits = %d, want 2", len(cs))
|
||||||
|
}
|
||||||
|
if cs[0].Subject != "fix: typo" {
|
||||||
|
t.Fatalf("head subject = %q, want fix: typo", cs[0].Subject)
|
||||||
|
}
|
||||||
|
if cs[1].Author != "Ada Lovelace" || cs[1].Email != "ada@example.com" {
|
||||||
|
t.Fatalf("author = %s <%s>", cs[1].Author, cs[1].Email)
|
||||||
|
}
|
||||||
|
sort.Strings(cs[1].Files)
|
||||||
|
if got := cs[1].Files; len(got) != 2 || got[0] != "README.md" || got[1] != "src/main.c" {
|
||||||
|
t.Fatalf("first commit files = %v", got)
|
||||||
|
}
|
||||||
|
if cs[0].Files[0] != "docs/notes.md" {
|
||||||
|
t.Fatalf("second commit files = %v", cs[0].Files)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLogSkipsMerges(t *testing.T) {
|
||||||
|
dir := initRepo(t, []commitSpec{{
|
||||||
|
when: time.Now(), name: "Ada Lovelace", email: "ada@example.com",
|
||||||
|
subject: "base", files: map[string]string{"a.txt": "a\n"},
|
||||||
|
}})
|
||||||
|
r, err := git.PlainOpen(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
head, err := r.Head()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
c, err := r.CommitObject(head.Hash())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// Second parent: duplicate the same tree so we do not need a real branch.
|
||||||
|
merge := &object.Commit{
|
||||||
|
Author: object.Signature{Name: "Ada Lovelace", Email: "ada@example.com", When: time.Now()},
|
||||||
|
Committer: object.Signature{Name: "Ada Lovelace", Email: "ada@example.com", When: time.Now()},
|
||||||
|
Message: "merge",
|
||||||
|
TreeHash: c.TreeHash,
|
||||||
|
ParentHashes: []plumbing.Hash{c.Hash, c.Hash},
|
||||||
|
}
|
||||||
|
obj := r.Storer.NewEncodedObject()
|
||||||
|
if err := merge.Encode(obj); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
h, err := r.Storer.SetEncodedObject(obj)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := r.Storer.SetReference(plumbing.NewHashReference(head.Name(), h)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cs, err := Log(dir, Options{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, x := range cs {
|
||||||
|
if x.Subject == "merge" {
|
||||||
|
t.Fatal("merge commit was not skipped")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(cs) != 1 || cs[0].Subject != "base" {
|
||||||
|
t.Fatalf("after skip merges: %+v", subjects(cs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLogSinceAndLimit(t *testing.T) {
|
||||||
|
old := time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||||
|
neu := time.Date(2026, 6, 1, 0, 0, 0, 0, time.UTC)
|
||||||
|
dir := initRepo(t, []commitSpec{
|
||||||
|
{when: old, name: "Ada Lovelace", email: "ada@example.com", subject: "old", files: map[string]string{"old.md": "x"}},
|
||||||
|
{when: neu, name: "Ada Lovelace", email: "ada@example.com", subject: "new", files: map[string]string{"new.md": "y"}},
|
||||||
|
})
|
||||||
|
cs, err := Log(dir, Options{Since: neu.Add(-time.Hour)})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(cs) != 1 || cs[0].Subject != "new" {
|
||||||
|
t.Fatalf("since filter: %v", subjects(cs))
|
||||||
|
}
|
||||||
|
cs, err = Log(dir, Options{Limit: 1})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(cs) != 1 {
|
||||||
|
t.Fatalf("limit=1 got %d", len(cs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLeafShape(t *testing.T) {
|
||||||
|
c := Commit{
|
||||||
|
SHA: "a1b2c3d4e5f6aaaa",
|
||||||
|
Author: "Ada Lovelace",
|
||||||
|
Email: "ada@example.com",
|
||||||
|
Date: "2026-08-10T12:00:00+01:00",
|
||||||
|
Subject: "feat: first commit",
|
||||||
|
Files: []string{"README.md", "src/main.c"},
|
||||||
|
}
|
||||||
|
lf := ToLeaf(c, "sample-repo")
|
||||||
|
if lf.Type != "commit" || lf.Repo != "sample-repo" {
|
||||||
|
t.Fatalf("leaf meta = %+v", lf)
|
||||||
|
}
|
||||||
|
if lf.Source != "sample-repo@a1b2c3d4e5f6aaaa" {
|
||||||
|
t.Fatalf("source = %s", lf.Source)
|
||||||
|
}
|
||||||
|
if lf.Related != "README.md,src/main.c" {
|
||||||
|
t.Fatalf("related = %s", lf.Related)
|
||||||
|
}
|
||||||
|
if lf.Heading != "commit a1b2c3d4e5f6 — feat: first commit" {
|
||||||
|
t.Fatalf("heading = %q", lf.Heading)
|
||||||
|
}
|
||||||
|
if !strings.Contains(lf.Text, "Ada Lovelace") || !strings.Contains(lf.Text, "README.md") {
|
||||||
|
t.Fatalf("text = %s", lf.Text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRepoNameFromOrigin(t *testing.T) {
|
||||||
|
dir := initRepo(t, []commitSpec{{
|
||||||
|
when: time.Now(), name: "Ada Lovelace", email: "ada@example.com",
|
||||||
|
subject: "init", files: map[string]string{"README.md": "x"},
|
||||||
|
}})
|
||||||
|
r, err := git.PlainOpen(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := r.CreateRemote(&config.RemoteConfig{
|
||||||
|
Name: "origin",
|
||||||
|
URLs: []string{"https://git.example.com/eSlider/sample-repo.git"},
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
name, err := RepoName(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if name != "sample-repo" {
|
||||||
|
t.Fatalf("RepoName = %q, want sample-repo", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRepoNameFallsBackToDir(t *testing.T) {
|
||||||
|
dir := initRepo(t, []commitSpec{{
|
||||||
|
when: time.Now(), name: "Ada Lovelace", email: "ada@example.com",
|
||||||
|
subject: "init", files: map[string]string{"README.md": "x"},
|
||||||
|
}})
|
||||||
|
name, err := RepoName(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if name != filepath.Base(dir) {
|
||||||
|
t.Fatalf("RepoName = %q, want %s", name, filepath.Base(dir))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type commitSpec struct {
|
||||||
|
when time.Time
|
||||||
|
name string
|
||||||
|
email string
|
||||||
|
subject string
|
||||||
|
files map[string]string
|
||||||
|
}
|
||||||
|
|
||||||
|
func initRepo(t *testing.T, specs []commitSpec) string {
|
||||||
|
t.Helper()
|
||||||
|
dir := t.TempDir()
|
||||||
|
r, err := git.PlainInit(dir, false)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
w, err := r.Worktree()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, s := range specs {
|
||||||
|
for path, body := range s.files {
|
||||||
|
full := filepath.Join(dir, path)
|
||||||
|
if err := os.MkdirAll(filepath.Dir(full), 0o755); err != nil && !os.IsExist(err) {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(full, []byte(body), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := w.Add(path); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, err := w.Commit(s.subject, &git.CommitOptions{
|
||||||
|
Author: &object.Signature{Name: s.name, Email: s.email, When: s.when},
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dir
|
||||||
|
}
|
||||||
|
|
||||||
|
func subjects(cs []Commit) []string {
|
||||||
|
out := make([]string, len(cs))
|
||||||
|
for i, c := range cs {
|
||||||
|
out[i] = c.Subject
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
package httpapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type rpcReq struct {
|
||||||
|
JSONRPC string `json:"jsonrpc"`
|
||||||
|
ID json.RawMessage `json:"id"`
|
||||||
|
Method string `json:"method"`
|
||||||
|
Params json.RawMessage `json:"params"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type rpcErr struct {
|
||||||
|
Code int `json:"code"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) handleOpenAPI(w http.ResponseWriter, _ *http.Request) {
|
||||||
|
writeJSON(w, http.StatusOK, OpenAPI())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) handleMCP(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
writeJSON(w, http.StatusMethodNotAllowed, map[string]any{"error": "POST JSON-RPC"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
raw, err := io.ReadAll(io.LimitReader(r.Body, 1<<20))
|
||||||
|
if err != nil {
|
||||||
|
writeJSON(w, http.StatusBadRequest, map[string]any{"error": "read body"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req rpcReq
|
||||||
|
if err := json.Unmarshal(raw, &req); err != nil {
|
||||||
|
writeJSON(w, http.StatusOK, rpcResult(nil, nil, &rpcErr{-32700, "parse error"}))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
result, rpcErrv, callErr := s.mcpDispatch(r, req)
|
||||||
|
if callErr != nil {
|
||||||
|
writeJSON(w, http.StatusOK, rpcResult(req.ID, nil, &rpcErr{-32603, callErr.Error()}))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writeJSON(w, http.StatusOK, rpcResult(req.ID, result, rpcErrv))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) mcpDispatch(r *http.Request, req rpcReq) (any, *rpcErr, error) {
|
||||||
|
switch req.Method {
|
||||||
|
case "initialize":
|
||||||
|
return map[string]any{
|
||||||
|
"protocolVersion": "2024-11-05",
|
||||||
|
"capabilities": map[string]any{"tools": map[string]any{}},
|
||||||
|
"serverInfo": map[string]any{"name": "2dph", "version": "1"},
|
||||||
|
}, nil, nil
|
||||||
|
case "notifications/initialized", "notifications/cancelled":
|
||||||
|
return map[string]any{}, nil, nil
|
||||||
|
case "tools/list":
|
||||||
|
return map[string]any{"tools": MCPTools()}, nil, nil
|
||||||
|
case "tools/call":
|
||||||
|
out, err := s.mcpCall(r, req.Params)
|
||||||
|
return out, nil, err
|
||||||
|
case "ping":
|
||||||
|
return map[string]any{}, nil, nil
|
||||||
|
default:
|
||||||
|
return nil, &rpcErr{-32601, "method not found"}, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) mcpCall(r *http.Request, params json.RawMessage) (any, error) {
|
||||||
|
var p struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Arguments map[string]any `json:"arguments"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(params, &p); err != nil {
|
||||||
|
return nil, fmt.Errorf("params")
|
||||||
|
}
|
||||||
|
if p.Arguments == nil {
|
||||||
|
p.Arguments = map[string]any{}
|
||||||
|
}
|
||||||
|
var (
|
||||||
|
body []byte
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
switch p.Name {
|
||||||
|
case "search":
|
||||||
|
q := strings.TrimSpace(fmt.Sprint(p.Arguments["q"]))
|
||||||
|
if q == "" || q == "<nil>" {
|
||||||
|
return mcpText(`{"error":"q required"}`, true), nil
|
||||||
|
}
|
||||||
|
limit := 10
|
||||||
|
if raw, ok := p.Arguments["n"]; ok {
|
||||||
|
switch n := raw.(type) {
|
||||||
|
case float64:
|
||||||
|
limit = int(n)
|
||||||
|
case string:
|
||||||
|
if v, e := strconv.Atoi(n); e == nil {
|
||||||
|
limit = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if limit < 1 || limit > 100 {
|
||||||
|
return mcpText(`{"error":"n must be int 1..100"}`, true), nil
|
||||||
|
}
|
||||||
|
if !s.tryAcquire(r) {
|
||||||
|
return nil, fmt.Errorf("cancelled")
|
||||||
|
}
|
||||||
|
defer s.release()
|
||||||
|
body, err = s.api.Search(r.Context(), q, limit)
|
||||||
|
case "get":
|
||||||
|
id := strings.TrimSpace(fmt.Sprint(p.Arguments["id"]))
|
||||||
|
if id == "" || id == "<nil>" {
|
||||||
|
return mcpText(`{"error":"id required"}`, true), nil
|
||||||
|
}
|
||||||
|
full := false
|
||||||
|
switch v := p.Arguments["body"].(type) {
|
||||||
|
case bool:
|
||||||
|
full = v
|
||||||
|
case string:
|
||||||
|
full = v == "1" || v == "true"
|
||||||
|
}
|
||||||
|
if !s.tryAcquire(r) {
|
||||||
|
return nil, fmt.Errorf("cancelled")
|
||||||
|
}
|
||||||
|
defer s.release()
|
||||||
|
body, err = s.api.Get(r.Context(), id, full)
|
||||||
|
case "stats":
|
||||||
|
if !s.tryAcquire(r) {
|
||||||
|
return nil, fmt.Errorf("cancelled")
|
||||||
|
}
|
||||||
|
defer s.release()
|
||||||
|
body, err = s.api.Stats(r.Context())
|
||||||
|
case "audit":
|
||||||
|
if !s.tryAcquire(r) {
|
||||||
|
return nil, fmt.Errorf("cancelled")
|
||||||
|
}
|
||||||
|
defer s.release()
|
||||||
|
body, err = s.api.Audit(r.Context())
|
||||||
|
case "ingest":
|
||||||
|
if !s.tryAcquire(r) {
|
||||||
|
return nil, fmt.Errorf("cancelled")
|
||||||
|
}
|
||||||
|
defer s.release()
|
||||||
|
body, err = s.api.Ingest(r.Context())
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("unknown tool %s", p.Name)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return mcpText(err.Error(), true), nil
|
||||||
|
}
|
||||||
|
return mcpText(string(body), false), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func mcpText(text string, isError bool) map[string]any {
|
||||||
|
return map[string]any{
|
||||||
|
"content": []any{map[string]any{"type": "text", "text": text}},
|
||||||
|
"isError": isError,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type rpcResp struct {
|
||||||
|
JSONRPC string `json:"jsonrpc"`
|
||||||
|
ID json.RawMessage `json:"id"`
|
||||||
|
Result any `json:"result,omitempty"`
|
||||||
|
Error *rpcErr `json:"error,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func rpcResult(id json.RawMessage, result any, err *rpcErr) rpcResp {
|
||||||
|
out := rpcResp{JSONRPC: "2.0", ID: id}
|
||||||
|
if len(id) == 0 {
|
||||||
|
out.ID = []byte("null")
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
out.Error = err
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
if result == nil {
|
||||||
|
result = map[string]any{}
|
||||||
|
}
|
||||||
|
out.Result = result
|
||||||
|
return out
|
||||||
|
}
|
||||||
+121
-36
@@ -1,10 +1,10 @@
|
|||||||
// Package server serves the 2dph brain over HTTP.
|
// Package httpapi serves the 2dph brain over HTTP.
|
||||||
//
|
//
|
||||||
// Async by design: every request runs on its own goroutine, and CPU-heavy
|
// Async by design: every request runs on its own goroutine, and CPU-heavy
|
||||||
// searches are serialized through a bounded worker pool (a counting
|
// searches are serialized through a bounded worker pool so N requests can't
|
||||||
// semaphore) so N requests can't spawn N search processes at once.
|
// spawn N backends at once.
|
||||||
//
|
//
|
||||||
// Used by bin/brain/serve.go.
|
// Used by bin/brain/serve.go. Tests inject a fake API (no exec, no ladybug).
|
||||||
package httpapi
|
package httpapi
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -21,30 +21,49 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Searcher interface {
|
// API is the in-process brain surface. Production serve.go wires internal/brain.
|
||||||
|
type API interface {
|
||||||
Search(ctx context.Context, query string, limit int) ([]byte, error)
|
Search(ctx context.Context, query string, limit int) ([]byte, error)
|
||||||
|
Get(ctx context.Context, id string, body bool) ([]byte, error)
|
||||||
|
Stats(ctx context.Context) ([]byte, error)
|
||||||
|
Audit(ctx context.Context) ([]byte, error)
|
||||||
|
Ingest(ctx context.Context) ([]byte, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type Server struct {
|
type Server struct {
|
||||||
searcher Searcher
|
api API
|
||||||
semaphore chan struct{}
|
semaphore chan struct{}
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultPort = 8630
|
const defaultPort = 8630
|
||||||
|
|
||||||
func NewServer(searcher Searcher, workers int) http.Handler {
|
var errUnimplemented = errors.New("not implemented")
|
||||||
|
|
||||||
|
func NewServer(api API, workers int) http.Handler {
|
||||||
return &Server{
|
return &Server{
|
||||||
searcher: searcher,
|
api: api,
|
||||||
semaphore: make(chan struct{}, workers),
|
semaphore: make(chan struct{}, workers),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||||
switch {
|
switch r.URL.Path {
|
||||||
case r.URL.Path == "/health":
|
case PathHealth:
|
||||||
writeJSON(w, http.StatusOK, map[string]any{"status": "ok"})
|
writeJSON(w, http.StatusOK, map[string]any{"status": "ok"})
|
||||||
case r.URL.Path == "/search":
|
case PathSearch:
|
||||||
s.handleSearch(w, r)
|
s.handleSearch(w, r)
|
||||||
|
case PathGet:
|
||||||
|
s.handleGet(w, r)
|
||||||
|
case PathStats:
|
||||||
|
s.handleJSON(w, r, s.api.Stats)
|
||||||
|
case PathAudit:
|
||||||
|
s.handleJSON(w, r, s.api.Audit)
|
||||||
|
case PathIngest:
|
||||||
|
s.handleJSON(w, r, s.api.Ingest)
|
||||||
|
case PathOpenAPI:
|
||||||
|
s.handleOpenAPI(w, r)
|
||||||
|
case PathMCP:
|
||||||
|
s.handleMCP(w, r)
|
||||||
default:
|
default:
|
||||||
writeJSON(w, http.StatusNotFound, map[string]any{"error": "not found"})
|
writeJSON(w, http.StatusNotFound, map[string]any{"error": "not found"})
|
||||||
}
|
}
|
||||||
@@ -65,19 +84,66 @@ func (s *Server) handleSearch(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
limit = n
|
limit = n
|
||||||
}
|
}
|
||||||
|
if !s.acquire(w, r) {
|
||||||
// Worker pool: block until a slot frees, so burst concurrency still
|
|
||||||
// bounds memory (no unbounded python processes).
|
|
||||||
select {
|
|
||||||
case s.semaphore <- struct{}{}:
|
|
||||||
defer func() { <-s.semaphore }()
|
|
||||||
case <-r.Context().Done():
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
defer s.release()
|
||||||
|
body, err := s.api.Search(r.Context(), q, limit)
|
||||||
|
writeAPI(w, body, err)
|
||||||
|
}
|
||||||
|
|
||||||
body, err := s.searcher.Search(r.Context(), q, limit)
|
func (s *Server) handleGet(w http.ResponseWriter, r *http.Request) {
|
||||||
|
id := strings.TrimSpace(r.URL.Query().Get("id"))
|
||||||
|
if id == "" {
|
||||||
|
writeJSON(w, http.StatusBadRequest, map[string]any{"error": "id required"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
body := r.URL.Query().Get("body") == "1" || r.URL.Query().Get("body") == "true"
|
||||||
|
if !s.acquire(w, r) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer s.release()
|
||||||
|
out, err := s.api.Get(r.Context(), id, body)
|
||||||
|
writeAPI(w, out, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) handleJSON(w http.ResponseWriter, r *http.Request, fn func(context.Context) ([]byte, error)) {
|
||||||
|
if !s.acquire(w, r) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer s.release()
|
||||||
|
body, err := fn(r.Context())
|
||||||
|
writeAPI(w, body, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) tryAcquire(r *http.Request) bool {
|
||||||
|
return s.acquire(nopWriter{}, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
type nopWriter struct{}
|
||||||
|
|
||||||
|
func (nopWriter) Header() http.Header { return http.Header{} }
|
||||||
|
func (nopWriter) Write([]byte) (int, error) { return 0, nil }
|
||||||
|
func (nopWriter) WriteHeader(int) {}
|
||||||
|
|
||||||
|
func (s *Server) acquire(w http.ResponseWriter, r *http.Request) bool {
|
||||||
|
select {
|
||||||
|
case s.semaphore <- struct{}{}:
|
||||||
|
return true
|
||||||
|
case <-r.Context().Done():
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Server) release() { <-s.semaphore }
|
||||||
|
|
||||||
|
func writeAPI(w http.ResponseWriter, body []byte, err error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeJSON(w, http.StatusGatewayTimeout, map[string]any{"error": err.Error()})
|
code := http.StatusBadGateway
|
||||||
|
if errors.Is(err, errUnimplemented) {
|
||||||
|
code = http.StatusNotImplemented
|
||||||
|
}
|
||||||
|
writeJSON(w, code, map[string]any{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
writeRaw(w, http.StatusOK, body)
|
writeRaw(w, http.StatusOK, body)
|
||||||
@@ -95,17 +161,20 @@ func writeRaw(w http.ResponseWriter, code int, body []byte) {
|
|||||||
w.Write(body)
|
w.Write(body)
|
||||||
}
|
}
|
||||||
|
|
||||||
// brainSearcher shells out to the Go brain-search binary (not Python).
|
// ExecSearcher shells out to var/bin/brain-search. Fallback when the serve
|
||||||
// A single search is bounded and short-lived; the worker pool keeps at most N live.
|
// binary is built without ladybug cgo (CI / tags=brain_serve only).
|
||||||
type brainSearcher struct {
|
type ExecSearcher struct {
|
||||||
cmdPath string
|
CmdPath string
|
||||||
timeout time.Duration
|
Timeout time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *brainSearcher) Search(ctx context.Context, query string, limit int) ([]byte, error) {
|
func (b ExecSearcher) Search(ctx context.Context, query string, limit int) ([]byte, error) {
|
||||||
ctx, cancel := context.WithTimeout(ctx, b.timeout)
|
if b.Timeout == 0 {
|
||||||
|
b.Timeout = 60 * time.Second
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithTimeout(ctx, b.Timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
cmd := exec.CommandContext(ctx, b.cmdPath, "--json", "-n", strconv.Itoa(limit), query)
|
cmd := exec.CommandContext(ctx, b.CmdPath, "--json", "-n", strconv.Itoa(limit), query)
|
||||||
out, err := cmd.Output()
|
out, err := cmd.Output()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
var exitErr *exec.ExitError
|
var exitErr *exec.ExitError
|
||||||
@@ -117,6 +186,18 @@ func (b *brainSearcher) Search(ctx context.Context, query string, limit int) ([]
|
|||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (ExecSearcher) Get(context.Context, string, bool) ([]byte, error) {
|
||||||
|
return nil, errUnimplemented
|
||||||
|
}
|
||||||
|
func (ExecSearcher) Stats(context.Context) ([]byte, error) { return nil, errUnimplemented }
|
||||||
|
func (ExecSearcher) Audit(context.Context) ([]byte, error) { return nil, errUnimplemented }
|
||||||
|
func (ExecSearcher) Ingest(context.Context) ([]byte, error) {
|
||||||
|
return json.Marshal(map[string]any{
|
||||||
|
"mode": "rebuild",
|
||||||
|
"command": "bin/brain/index.go --rebuild",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func defaultSearchCmd(root string) string {
|
func defaultSearchCmd(root string) string {
|
||||||
if env := os.Getenv("KB_SEARCH_CMD"); env != "" {
|
if env := os.Getenv("KB_SEARCH_CMD"); env != "" {
|
||||||
return env
|
return env
|
||||||
@@ -124,11 +205,7 @@ func defaultSearchCmd(root string) string {
|
|||||||
return filepath.Join(root, "var", "bin", "brain-search")
|
return filepath.Join(root, "var", "bin", "brain-search")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Run starts the HTTP server. Reads env: KB_SEARCH_CMD (default
|
func workersAndPort() (int, int) {
|
||||||
// $KB_ROOT/var/bin/brain-search), KB_WORKERS (default 4), KB_PORT (default 8630).
|
|
||||||
func Run() {
|
|
||||||
root := os.Getenv("KB_ROOT")
|
|
||||||
searchPath := defaultSearchCmd(root)
|
|
||||||
workers := 4
|
workers := 4
|
||||||
if raw := os.Getenv("KB_WORKERS"); raw != "" {
|
if raw := os.Getenv("KB_WORKERS"); raw != "" {
|
||||||
if n, err := strconv.Atoi(raw); err == nil && n > 0 {
|
if n, err := strconv.Atoi(raw); err == nil && n > 0 {
|
||||||
@@ -141,11 +218,19 @@ func Run() {
|
|||||||
port = n
|
port = n
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return workers, port
|
||||||
|
}
|
||||||
|
|
||||||
searcher := &brainSearcher{cmdPath: searchPath, timeout: 60 * time.Second}
|
// Run starts the HTTP server with an injected API (in-process brain, or ExecSearcher).
|
||||||
handler := NewServer(searcher, workers)
|
func Run(api API) {
|
||||||
|
if api == nil {
|
||||||
|
root := os.Getenv("KB_ROOT")
|
||||||
|
api = ExecSearcher{CmdPath: defaultSearchCmd(root), Timeout: 60 * time.Second}
|
||||||
|
}
|
||||||
|
workers, port := workersAndPort()
|
||||||
|
handler := NewServer(api, workers)
|
||||||
addr := "127.0.0.1:" + strconv.Itoa(port)
|
addr := "127.0.0.1:" + strconv.Itoa(port)
|
||||||
log.Printf("serve: %s (workers=%d cmd=%s)", addr, workers, searchPath)
|
log.Printf("serve: %s (workers=%d)", addr, workers)
|
||||||
if err := http.ListenAndServe(addr, handler); err != nil {
|
if err := http.ListenAndServe(addr, handler); err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
@@ -47,6 +48,26 @@ func (f *fakeSearcher) Search(ctx context.Context, query string, limit int) ([]b
|
|||||||
return []byte(`{"query":"` + query + `","count":0,"results":[]}`), nil
|
return []byte(`{"query":"` + query + `","count":0,"results":[]}`), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (f *fakeSearcher) Get(_ context.Context, id string, body bool) ([]byte, error) {
|
||||||
|
out := map[string]any{"id": id, "root": "info"}
|
||||||
|
if body {
|
||||||
|
out["text"] = "fake body"
|
||||||
|
}
|
||||||
|
return json.Marshal(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeSearcher) Stats(context.Context) ([]byte, error) {
|
||||||
|
return []byte(`{"total":0,"by_root":{}}`), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeSearcher) Audit(context.Context) ([]byte, error) {
|
||||||
|
return []byte(`{"status":"ok"}`), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeSearcher) Ingest(context.Context) ([]byte, error) {
|
||||||
|
return []byte(`{"mode":"rebuild","command":"bin/brain/index.go --rebuild"}`), nil
|
||||||
|
}
|
||||||
|
|
||||||
func (f *fakeSearcher) count() int {
|
func (f *fakeSearcher) count() int {
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
defer f.mu.Unlock()
|
defer f.mu.Unlock()
|
||||||
@@ -142,6 +163,47 @@ func TestSearchRejectsBadLimit(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetLeaf(t *testing.T) {
|
||||||
|
fs := &fakeSearcher{callback: func(q string, limit int) ([]byte, error) {
|
||||||
|
return []byte(`{}`), nil
|
||||||
|
}}
|
||||||
|
h := NewServer(fs, 1)
|
||||||
|
if code, _ := get(t, h, "/get"); code != http.StatusBadRequest {
|
||||||
|
t.Fatalf("missing id code = %d, want 400", code)
|
||||||
|
}
|
||||||
|
code, body := get(t, h, "/get?id=leaf-1&body=1")
|
||||||
|
if code != http.StatusOK {
|
||||||
|
t.Fatalf("get code = %d, want 200 body=%s", code, body)
|
||||||
|
}
|
||||||
|
if !strings.Contains(string(body), "leaf-1") {
|
||||||
|
t.Fatalf("get body %s missing id", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStatsAuditIngest(t *testing.T) {
|
||||||
|
h := NewServer(&fakeSearcher{}, 1)
|
||||||
|
for _, path := range []string{"/stats", "/audit", "/ingest"} {
|
||||||
|
code, body := get(t, h, path)
|
||||||
|
if code != http.StatusOK {
|
||||||
|
t.Fatalf("%s code = %d, want 200 (%s)", path, code, body)
|
||||||
|
}
|
||||||
|
if !json.Valid(body) {
|
||||||
|
t.Fatalf("%s body not json: %s", path, body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHTTPPackageDoesNotExecPython(t *testing.T) {
|
||||||
|
raw, err := os.ReadFile("server.go")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
lower := strings.ToLower(string(raw))
|
||||||
|
if strings.Contains(lower, "python3") || strings.Contains(lower, "bin/kb/search") {
|
||||||
|
t.Fatal("httpapi must not exec Python or bin/kb/search")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestDefaultSearchCmdIsBrainNotPython(t *testing.T) {
|
func TestDefaultSearchCmdIsBrainNotPython(t *testing.T) {
|
||||||
t.Setenv("KB_SEARCH_CMD", "")
|
t.Setenv("KB_SEARCH_CMD", "")
|
||||||
cmd := defaultSearchCmd("/repo")
|
cmd := defaultSearchCmd("/repo")
|
||||||
|
|||||||
@@ -0,0 +1,144 @@
|
|||||||
|
package httpapi
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// Shared HTTP surface: OpenAPI paths and MCP tools are generated from Ops.
|
||||||
|
// ServeHTTP must keep the same path strings.
|
||||||
|
|
||||||
|
type Param struct {
|
||||||
|
Name, In, Type, Description string
|
||||||
|
Required bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type Op struct {
|
||||||
|
Path, Method, ID, Summary string
|
||||||
|
Params []Param
|
||||||
|
MCP bool
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
PathHealth = "/health"
|
||||||
|
PathSearch = "/search"
|
||||||
|
PathGet = "/get"
|
||||||
|
PathStats = "/stats"
|
||||||
|
PathAudit = "/audit"
|
||||||
|
PathIngest = "/ingest"
|
||||||
|
PathOpenAPI = "/openapi.json"
|
||||||
|
PathMCP = "/mcp"
|
||||||
|
)
|
||||||
|
|
||||||
|
var Ops = []Op{
|
||||||
|
{Path: PathHealth, Method: "get", ID: "health", Summary: "liveness"},
|
||||||
|
{
|
||||||
|
Path: PathSearch, Method: "get", ID: "search", Summary: "deduction search (facts → info → web)",
|
||||||
|
MCP: true,
|
||||||
|
Params: []Param{
|
||||||
|
{Name: "q", In: "query", Type: "string", Description: "search query", Required: true},
|
||||||
|
{Name: "n", In: "query", Type: "integer", Description: "hit limit 1..100 (default 10)"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Path: PathGet, Method: "get", ID: "get", Summary: "read one leaf by id",
|
||||||
|
MCP: true,
|
||||||
|
Params: []Param{
|
||||||
|
{Name: "id", In: "query", Type: "string", Description: "leaf id", Required: true},
|
||||||
|
{Name: "body", In: "query", Type: "boolean", Description: "include full text"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{Path: PathStats, Method: "get", ID: "stats", Summary: "index health", MCP: true},
|
||||||
|
{Path: PathAudit, Method: "get", ID: "audit", Summary: "facts confidence histogram", MCP: true},
|
||||||
|
{Path: PathIngest, Method: "get", ID: "ingest", Summary: "rebuild hint (write is v2)", MCP: true},
|
||||||
|
{Path: PathOpenAPI, Method: "get", ID: "openapi", Summary: "OpenAPI 3 document for this server"},
|
||||||
|
}
|
||||||
|
|
||||||
|
func OpenAPI() map[string]any {
|
||||||
|
paths := map[string]any{}
|
||||||
|
for _, op := range Ops {
|
||||||
|
params := make([]any, 0, len(op.Params))
|
||||||
|
for _, p := range op.Params {
|
||||||
|
params = append(params, map[string]any{
|
||||||
|
"name": p.Name,
|
||||||
|
"in": p.In,
|
||||||
|
"required": p.Required,
|
||||||
|
"description": p.Description,
|
||||||
|
"schema": map[string]any{"type": p.Type},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
item := map[string]any{
|
||||||
|
"operationId": op.ID,
|
||||||
|
"summary": op.Summary,
|
||||||
|
"responses": map[string]any{
|
||||||
|
"200": map[string]any{
|
||||||
|
"description": "JSON",
|
||||||
|
"content": map[string]any{
|
||||||
|
"application/json": map[string]any{
|
||||||
|
"schema": map[string]any{"type": "object"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if len(params) > 0 {
|
||||||
|
item["parameters"] = params
|
||||||
|
}
|
||||||
|
paths[op.Path] = map[string]any{op.Method: item}
|
||||||
|
}
|
||||||
|
return map[string]any{
|
||||||
|
"openapi": "3.0.3",
|
||||||
|
"info": map[string]any{
|
||||||
|
"title": "2dph brain",
|
||||||
|
"version": "1",
|
||||||
|
"description": "Same handlers as bin/brain/serve.go. MCP tools at POST /mcp match these paths.",
|
||||||
|
},
|
||||||
|
"paths": paths,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type MCPTool struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Description string `json:"description"`
|
||||||
|
InputSchema map[string]any `json:"inputSchema"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func MCPTools() []MCPTool {
|
||||||
|
out := make([]MCPTool, 0, len(Ops))
|
||||||
|
for _, op := range Ops {
|
||||||
|
if !op.MCP {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
props := map[string]any{}
|
||||||
|
var required []string
|
||||||
|
for _, p := range op.Params {
|
||||||
|
props[p.Name] = map[string]any{"type": p.Type, "description": p.Description}
|
||||||
|
if p.Required {
|
||||||
|
required = append(required, p.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
schema := map[string]any{"type": "object", "properties": props}
|
||||||
|
if len(required) > 0 {
|
||||||
|
schema["required"] = required
|
||||||
|
}
|
||||||
|
out = append(out, MCPTool{
|
||||||
|
Name: op.ID,
|
||||||
|
Description: op.Summary,
|
||||||
|
InputSchema: schema,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// SkillMarkdown is the Cursor skill fragment generated from Ops/MCPTools.
|
||||||
|
func SkillMarkdown() string {
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString("# brain HTTP / MCP tools\n\n")
|
||||||
|
b.WriteString("Generated from `internal/httpapi.Ops`. Do not edit by hand.\n\n")
|
||||||
|
b.WriteString("Serve: `bin/brain/serve.go` (`GET /openapi.json`, `POST /mcp`).\n\n")
|
||||||
|
for _, t := range MCPTools() {
|
||||||
|
b.WriteString("- `")
|
||||||
|
b.WriteString(t.Name)
|
||||||
|
b.WriteString("` — ")
|
||||||
|
b.WriteString(t.Description)
|
||||||
|
b.WriteString("\n")
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
package httpapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestOpenAPIIncludesCorePaths(t *testing.T) {
|
||||||
|
doc := OpenAPI()
|
||||||
|
raw, err := json.Marshal(doc)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
paths, _ := doc["paths"].(map[string]any)
|
||||||
|
for _, p := range []string{"/search", "/get", "/stats", "/audit"} {
|
||||||
|
if _, ok := paths[p]; !ok {
|
||||||
|
t.Fatalf("openapi missing path %s (%s)", p, raw)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMCPToolsMatchOpenAPIPaths(t *testing.T) {
|
||||||
|
paths, _ := OpenAPI()["paths"].(map[string]any)
|
||||||
|
tools := MCPTools()
|
||||||
|
if len(tools) == 0 {
|
||||||
|
t.Fatal("no MCP tools")
|
||||||
|
}
|
||||||
|
names := map[string]bool{}
|
||||||
|
for _, tool := range tools {
|
||||||
|
names[tool.Name] = true
|
||||||
|
path := "/" + tool.Name
|
||||||
|
if _, ok := paths[path]; !ok {
|
||||||
|
t.Fatalf("MCP tool %s has no OpenAPI path %s", tool.Name, path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, need := range []string{"search", "get", "stats", "audit"} {
|
||||||
|
if !names[need] {
|
||||||
|
t.Fatalf("MCP tools missing %s: %v", need, names)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestOpenAPIHTTP(t *testing.T) {
|
||||||
|
h := NewServer(&fakeSearcher{}, 1)
|
||||||
|
code, body := get(t, h, "/openapi.json")
|
||||||
|
if code != http.StatusOK {
|
||||||
|
t.Fatalf("code = %d body=%s", code, body)
|
||||||
|
}
|
||||||
|
var doc map[string]any
|
||||||
|
if err := json.Unmarshal(body, &doc); err != nil {
|
||||||
|
t.Fatalf("not json: %v", err)
|
||||||
|
}
|
||||||
|
if doc["openapi"] == nil {
|
||||||
|
t.Fatalf("missing openapi version: %s", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMCPToolsListAndCall(t *testing.T) {
|
||||||
|
h := NewServer(&fakeSearcher{}, 1)
|
||||||
|
code, body := postJSON(t, h, "/mcp", `{"jsonrpc":"2.0","id":1,"method":"tools/list"}`)
|
||||||
|
if code != http.StatusOK {
|
||||||
|
t.Fatalf("list code = %d body=%s", code, body)
|
||||||
|
}
|
||||||
|
if !strings.Contains(string(body), `"search"`) {
|
||||||
|
t.Fatalf("tools/list missing search: %s", body)
|
||||||
|
}
|
||||||
|
code, body = postJSON(t, h, "/mcp", `{"jsonrpc":"2.0","id":2,"method":"tools/call","params":{"name":"search","arguments":{"q":"matrix","n":3}}}`)
|
||||||
|
if code != http.StatusOK {
|
||||||
|
t.Fatalf("call code = %d body=%s", code, body)
|
||||||
|
}
|
||||||
|
if !strings.Contains(string(body), "matrix") {
|
||||||
|
t.Fatalf("search call body %s", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSkillMarkdownMatchesCommittedFile(t *testing.T) {
|
||||||
|
want, err := os.ReadFile(filepath.Join("..", "..", "skills", "brain", "tools.md"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got := SkillMarkdown()
|
||||||
|
if got != string(want) {
|
||||||
|
t.Fatalf("skills/brain/tools.md stale; regenerate from SkillMarkdown()\n--- got ---\n%s\n--- want ---\n%s", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func postJSON(t *testing.T, h http.Handler, path, raw string) (int, []byte) {
|
||||||
|
t.Helper()
|
||||||
|
req := httptest.NewRequest(http.MethodPost, path, strings.NewReader(raw))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
return rec.Code, rec.Body.Bytes()
|
||||||
|
}
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
package mdleaves
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Leaf struct {
|
||||||
|
Source string `json:"source"`
|
||||||
|
Repo string `json:"repo"`
|
||||||
|
Heading string `json:"heading"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Related string `json:"related"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type chunk struct {
|
||||||
|
Heading string
|
||||||
|
Text string
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
h1 = regexp.MustCompile(`^# \S`)
|
||||||
|
h2 = regexp.MustCompile(`^## \S`)
|
||||||
|
)
|
||||||
|
|
||||||
|
func ExtractFrontmatter(text string) (map[string]string, string) {
|
||||||
|
if !strings.HasPrefix(text, "---") {
|
||||||
|
return map[string]string{}, text
|
||||||
|
}
|
||||||
|
end := strings.Index(text[3:], "\n---")
|
||||||
|
if end == -1 {
|
||||||
|
return map[string]string{}, text
|
||||||
|
}
|
||||||
|
fm := strings.TrimSpace(text[3 : 3+end])
|
||||||
|
body := text[3+end+4:]
|
||||||
|
meta := map[string]string{}
|
||||||
|
for _, line := range strings.Split(fm, "\n") {
|
||||||
|
key, value, ok := strings.Cut(line, ":")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
meta[strings.TrimSpace(key)] = strings.Trim(strings.TrimSpace(value), `"'`)
|
||||||
|
}
|
||||||
|
return meta, body
|
||||||
|
}
|
||||||
|
|
||||||
|
func SplitLeafs(meta map[string]string, body string) []chunk {
|
||||||
|
lines := strings.Split(body, "\n")
|
||||||
|
title := ""
|
||||||
|
type hdr struct {
|
||||||
|
heading string
|
||||||
|
start int
|
||||||
|
}
|
||||||
|
var headers []hdr
|
||||||
|
for i, line := range lines {
|
||||||
|
switch {
|
||||||
|
case h1.MatchString(line):
|
||||||
|
title = strings.TrimSpace(strings.TrimLeft(line, "#"))
|
||||||
|
case h2.MatchString(line):
|
||||||
|
headers = append(headers, hdr{strings.TrimSpace(strings.TrimLeft(line, "#")), i})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(headers) == 0 {
|
||||||
|
var kept []string
|
||||||
|
for _, l := range lines {
|
||||||
|
if strings.TrimSpace(l) != "" {
|
||||||
|
kept = append(kept, l)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return []chunk{{Heading: title, Text: strings.TrimSpace(strings.Join(kept, "\n"))}}
|
||||||
|
}
|
||||||
|
out := make([]chunk, 0, len(headers))
|
||||||
|
for idx, h := range headers {
|
||||||
|
end := len(lines)
|
||||||
|
if idx+1 < len(headers) {
|
||||||
|
end = headers[idx+1].start
|
||||||
|
}
|
||||||
|
var kept []string
|
||||||
|
for _, l := range lines[h.start:end] {
|
||||||
|
if strings.TrimSpace(l) != "" {
|
||||||
|
kept = append(kept, l)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text := strings.Join(kept, "\n")
|
||||||
|
if idx == 0 && title != "" {
|
||||||
|
text = title + "\n\n" + text
|
||||||
|
}
|
||||||
|
out = append(out, chunk{Heading: h.heading, Text: strings.TrimSpace(text)})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func ToAll(text, path, repo string) []Leaf {
|
||||||
|
meta, body := ExtractFrontmatter(text)
|
||||||
|
if meta["type"] == "" {
|
||||||
|
meta["type"] = "reference"
|
||||||
|
}
|
||||||
|
if meta["status"] == "" {
|
||||||
|
meta["status"] = "current"
|
||||||
|
}
|
||||||
|
chunks := SplitLeafs(meta, body)
|
||||||
|
out := make([]Leaf, 0, len(chunks))
|
||||||
|
for _, c := range chunks {
|
||||||
|
out = append(out, Leaf{
|
||||||
|
Source: path,
|
||||||
|
Repo: repo,
|
||||||
|
Heading: c.Heading,
|
||||||
|
Text: c.Text,
|
||||||
|
Type: meta["type"],
|
||||||
|
Status: meta["status"],
|
||||||
|
Related: meta["related"],
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func WalkMarkdown(root string) ([]string, error) {
|
||||||
|
var out []string
|
||||||
|
err := filepath.Walk(root, func(p string, info os.FileInfo, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if info.IsDir() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
ext := strings.ToLower(filepath.Ext(p))
|
||||||
|
if ext == ".md" || ext == ".markdown" {
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
return out, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func EncodeJSON(leafs []Leaf) (string, error) {
|
||||||
|
raw, err := json.MarshalIndent(leafs, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(raw) + "\n", nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package mdleaves
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestSplitLeafsOnH2(t *testing.T) {
|
||||||
|
body := "# Title\n\n## One\n\nalpha\n\n## Two\n\nbeta\n"
|
||||||
|
leafs := SplitLeafs(map[string]string{}, body)
|
||||||
|
if len(leafs) != 2 {
|
||||||
|
t.Fatalf("n=%d", len(leafs))
|
||||||
|
}
|
||||||
|
if leafs[0].Heading != "One" || !strings.Contains(leafs[0].Text, "Title") {
|
||||||
|
t.Fatalf("first=%+v", leafs[0])
|
||||||
|
}
|
||||||
|
if leafs[1].Heading != "Two" || strings.Contains(leafs[1].Text, "Title") {
|
||||||
|
t.Fatalf("second=%+v", leafs[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSplitLeafsNoH2IsWholeDoc(t *testing.T) {
|
||||||
|
body := "# Title\n\njust a paragraph\n"
|
||||||
|
leafs := SplitLeafs(nil, body)
|
||||||
|
if len(leafs) != 1 {
|
||||||
|
t.Fatalf("n=%d", len(leafs))
|
||||||
|
}
|
||||||
|
if leafs[0].Heading != "Title" {
|
||||||
|
t.Fatalf("heading=%q", leafs[0].Heading)
|
||||||
|
}
|
||||||
|
if !strings.Contains(leafs[0].Text, "just a paragraph") {
|
||||||
|
t.Fatalf("text=%q", leafs[0].Text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFrontmatterAndToAll(t *testing.T) {
|
||||||
|
raw := "---\ntype: howto\nstatus: current\nrelated: docs/design.md\n---\n# Doc\n\n## Step\n\ndo it\n"
|
||||||
|
got := ToAll(raw, "docs/x.md", "eSlider/2dph")
|
||||||
|
if len(got) != 1 {
|
||||||
|
t.Fatalf("n=%d", len(got))
|
||||||
|
}
|
||||||
|
if got[0].Type != "howto" || got[0].Status != "current" {
|
||||||
|
t.Fatalf("%+v", got[0])
|
||||||
|
}
|
||||||
|
if got[0].Source != "docs/x.md" || got[0].Repo != "eSlider/2dph" {
|
||||||
|
t.Fatalf("%+v", got[0])
|
||||||
|
}
|
||||||
|
if got[0].Related != "docs/design.md" {
|
||||||
|
t.Fatalf("related=%q", got[0].Related)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEncodeJSONAndYAML(t *testing.T) {
|
||||||
|
leafs := ToAll("# Hi\n\nbody\n", "a.md", "")
|
||||||
|
js, err := EncodeJSON(leafs)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !strings.Contains(js, `"heading": "Hi"`) {
|
||||||
|
t.Fatalf("json=%s", js)
|
||||||
|
}
|
||||||
|
y := EncodeYAML(leafs)
|
||||||
|
if !strings.Contains(y, "heading: Hi") {
|
||||||
|
t.Fatalf("yaml=%s", y)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDefaultsTypeAndStatus(t *testing.T) {
|
||||||
|
got := ToAll("# Hi\n\nbody\n", "a.md", "")
|
||||||
|
if got[0].Type != "reference" || got[0].Status != "current" {
|
||||||
|
t.Fatalf("%+v", got[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package mdleaves
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
func EncodeYAML(leafs []Leaf) string {
|
||||||
|
if len(leafs) == 0 {
|
||||||
|
return "[]\n"
|
||||||
|
}
|
||||||
|
var b strings.Builder
|
||||||
|
for _, lf := range leafs {
|
||||||
|
b.WriteString("-\n")
|
||||||
|
writeKV(&b, "source", lf.Source)
|
||||||
|
writeKV(&b, "repo", lf.Repo)
|
||||||
|
writeKV(&b, "heading", lf.Heading)
|
||||||
|
writeKV(&b, "text", lf.Text)
|
||||||
|
writeKV(&b, "type", lf.Type)
|
||||||
|
writeKV(&b, "status", lf.Status)
|
||||||
|
writeKV(&b, "related", lf.Related)
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeKV(b *strings.Builder, k, v string) {
|
||||||
|
fmt.Fprintf(b, " %s: %s\n", k, yamlScalar(v))
|
||||||
|
}
|
||||||
|
|
||||||
|
func yamlScalar(s string) string {
|
||||||
|
if strings.Contains(s, "\n") || s == "" || strings.ContainsAny(s, ":#'\"[]{}&*!|>%@`") || s != strings.TrimSpace(s) {
|
||||||
|
return strconv.Quote(s)
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -0,0 +1,325 @@
|
|||||||
|
package reasoner
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// HF IDs named in docs. No Qwen3.6-9B exists.
|
||||||
|
const (
|
||||||
|
HFQwen35_9B = "Qwen/Qwen3.5-9B"
|
||||||
|
HFQwen36_27B = "Qwen/Qwen3.6-27B"
|
||||||
|
HFBonsai27B = "prism-ml/Bonsai-27B-gguf"
|
||||||
|
OllamaRAM = "qwen3.5:9b"
|
||||||
|
OllamaQuality = "MichelRosselli/bonsai-27b:Q1_0"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ToolCall struct {
|
||||||
|
Name string
|
||||||
|
Arguments string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Result struct {
|
||||||
|
Model string `json:"model"`
|
||||||
|
OK bool `json:"ok"`
|
||||||
|
ToolName string `json:"tool_name,omitempty"`
|
||||||
|
XMLLeak bool `json:"xml_leak"`
|
||||||
|
Err string `json:"error,omitempty"`
|
||||||
|
LatencyMS int64 `json:"latency_ms"`
|
||||||
|
RSSMB int `json:"rss_mb,omitempty"`
|
||||||
|
Device string `json:"device"`
|
||||||
|
WantedTool string `json:"wanted_tool"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Prompt struct {
|
||||||
|
Name string
|
||||||
|
Want string
|
||||||
|
User string
|
||||||
|
}
|
||||||
|
|
||||||
|
var BakePrompts = []Prompt{
|
||||||
|
{
|
||||||
|
Name: "search-before-claim",
|
||||||
|
Want: "search",
|
||||||
|
User: "Use tools. Search the 2dph brain for LadybugDB before you answer. Call search.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "get-leaf",
|
||||||
|
Want: "get",
|
||||||
|
User: "Use tools. Fetch leaf id leaf-demo with get. Do not invent the body.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "audit-index",
|
||||||
|
Want: "audit",
|
||||||
|
User: "Use tools. Call audit on the brain index health.",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func MCPTools() []map[string]any {
|
||||||
|
return []map[string]any{
|
||||||
|
openaiTool("search", "deduction search (facts → info → web)", map[string]any{
|
||||||
|
"type": "object",
|
||||||
|
"properties": map[string]any{
|
||||||
|
"q": map[string]any{"type": "string", "description": "search query"},
|
||||||
|
"n": map[string]any{"type": "integer"},
|
||||||
|
},
|
||||||
|
"required": []string{"q"},
|
||||||
|
}),
|
||||||
|
openaiTool("get", "read one leaf by id", map[string]any{
|
||||||
|
"type": "object",
|
||||||
|
"properties": map[string]any{
|
||||||
|
"id": map[string]any{"type": "string"},
|
||||||
|
"body": map[string]any{"type": "boolean"},
|
||||||
|
},
|
||||||
|
"required": []string{"id"},
|
||||||
|
}),
|
||||||
|
openaiTool("audit", "facts confidence histogram", map[string]any{
|
||||||
|
"type": "object",
|
||||||
|
"properties": map[string]any{},
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func openaiTool(name, desc string, schema map[string]any) map[string]any {
|
||||||
|
return map[string]any{
|
||||||
|
"type": "function",
|
||||||
|
"function": map[string]any{
|
||||||
|
"name": name,
|
||||||
|
"description": desc,
|
||||||
|
"parameters": schema,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Client struct {
|
||||||
|
BaseURL string
|
||||||
|
Model string
|
||||||
|
HTTP *http.Client
|
||||||
|
Device string
|
||||||
|
ToolChoice string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Report struct {
|
||||||
|
Model string `json:"model"`
|
||||||
|
HF string `json:"hf_id"`
|
||||||
|
Device string `json:"device"`
|
||||||
|
ToolCallOK int `json:"tool_call_ok"`
|
||||||
|
ToolCallN int `json:"tool_call_n"`
|
||||||
|
XMLLeak int `json:"xml_leak"`
|
||||||
|
RSSMB int `json:"rss_mb"`
|
||||||
|
VRAMMB int `json:"vram_mb"`
|
||||||
|
Prompts []Result `json:"prompts"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func HFFor(model string) string {
|
||||||
|
switch model {
|
||||||
|
case OllamaRAM:
|
||||||
|
return HFQwen35_9B
|
||||||
|
case OllamaQuality:
|
||||||
|
return HFBonsai27B
|
||||||
|
default:
|
||||||
|
if strings.Contains(model, "qwen3.6") || strings.Contains(model, "Qwen3.6") {
|
||||||
|
return HFQwen36_27B
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) httpc() *http.Client {
|
||||||
|
if c.HTTP == nil {
|
||||||
|
c.HTTP = &http.Client{Timeout: 10 * time.Minute}
|
||||||
|
}
|
||||||
|
return c.HTTP
|
||||||
|
}
|
||||||
|
|
||||||
|
func Origin(base string) string {
|
||||||
|
s := strings.TrimRight(base, "/")
|
||||||
|
return strings.TrimSuffix(s, "/v1")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Client) ChatTools(user string) (ToolCall, string, error) {
|
||||||
|
choice := c.ToolChoice
|
||||||
|
if choice == "" {
|
||||||
|
choice = "required"
|
||||||
|
}
|
||||||
|
body, _ := json.Marshal(map[string]any{
|
||||||
|
"model": c.Model,
|
||||||
|
"messages": []map[string]string{
|
||||||
|
{"role": "system", "content": "You are PicoClaw talking to 2dph MCP. Always call a tool before a factual claim. search then get then audit."},
|
||||||
|
{"role": "user", "content": user},
|
||||||
|
},
|
||||||
|
"tools": MCPTools(),
|
||||||
|
"tool_choice": choice,
|
||||||
|
})
|
||||||
|
base := strings.TrimRight(c.BaseURL, "/")
|
||||||
|
if !strings.HasSuffix(base, "/v1") {
|
||||||
|
base += "/v1"
|
||||||
|
}
|
||||||
|
url := base + "/chat/completions"
|
||||||
|
req, err := http.NewRequest(http.MethodPost, url, bytes.NewReader(body))
|
||||||
|
if err != nil {
|
||||||
|
return ToolCall{}, "", err
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
res, err := c.httpc().Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return ToolCall{}, "", err
|
||||||
|
}
|
||||||
|
defer res.Body.Close()
|
||||||
|
raw, _ := io.ReadAll(res.Body)
|
||||||
|
if res.StatusCode >= 300 {
|
||||||
|
return ToolCall{}, string(raw), fmt.Errorf("http %d", res.StatusCode)
|
||||||
|
}
|
||||||
|
return ParseToolResponse(raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
func ParseToolResponse(raw []byte) (ToolCall, string, error) {
|
||||||
|
var wrap struct {
|
||||||
|
Choices []struct {
|
||||||
|
Message struct {
|
||||||
|
Content string `json:"content"`
|
||||||
|
ToolCalls []struct {
|
||||||
|
Function struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Arguments json.RawMessage `json:"arguments"`
|
||||||
|
} `json:"function"`
|
||||||
|
} `json:"tool_calls"`
|
||||||
|
} `json:"message"`
|
||||||
|
} `json:"choices"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(raw, &wrap); err != nil {
|
||||||
|
return ToolCall{}, "", err
|
||||||
|
}
|
||||||
|
content := ""
|
||||||
|
if len(wrap.Choices) > 0 {
|
||||||
|
content = wrap.Choices[0].Message.Content
|
||||||
|
if n := len(wrap.Choices[0].Message.ToolCalls); n > 0 {
|
||||||
|
fn := wrap.Choices[0].Message.ToolCalls[0].Function
|
||||||
|
return ToolCall{Name: fn.Name, Arguments: rawArgs(fn.Arguments)}, content, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ToolCall{}, content, fmt.Errorf("no tool_calls")
|
||||||
|
}
|
||||||
|
|
||||||
|
func rawArgs(raw json.RawMessage) string {
|
||||||
|
if len(raw) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
var s string
|
||||||
|
if err := json.Unmarshal(raw, &s); err == nil {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
return string(raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
func XMLLeak(content string) bool {
|
||||||
|
s := strings.ToLower(content)
|
||||||
|
return strings.Contains(s, "<tool_call>") ||
|
||||||
|
strings.Contains(s, "<function=") ||
|
||||||
|
strings.Contains(s, "<parameter")
|
||||||
|
}
|
||||||
|
|
||||||
|
func RunPrompt(c Client, p Prompt) Result {
|
||||||
|
start := time.Now()
|
||||||
|
tc, content, err := c.ChatTools(p.User)
|
||||||
|
out := Result{
|
||||||
|
Model: c.Model,
|
||||||
|
WantedTool: p.Want,
|
||||||
|
LatencyMS: time.Since(start).Milliseconds(),
|
||||||
|
Device: c.Device,
|
||||||
|
XMLLeak: XMLLeak(content),
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
out.Err = err.Error()
|
||||||
|
if content != "" && out.XMLLeak {
|
||||||
|
out.Err = "xml tool call instead of openai tool_calls"
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
out.ToolName = tc.Name
|
||||||
|
out.OK = tc.Name == p.Want
|
||||||
|
if !out.OK {
|
||||||
|
out.Err = "wanted " + p.Want + " got " + tc.Name
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
type ProcMem struct {
|
||||||
|
Name string
|
||||||
|
SizeMB int
|
||||||
|
VRAMMB int
|
||||||
|
}
|
||||||
|
|
||||||
|
func ParsePS(raw []byte) []ProcMem {
|
||||||
|
var wrap struct {
|
||||||
|
Models []struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Size int64 `json:"size"`
|
||||||
|
SizeVRAM int64 `json:"size_vram"`
|
||||||
|
} `json:"models"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(raw, &wrap); err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
out := make([]ProcMem, 0, len(wrap.Models))
|
||||||
|
for _, m := range wrap.Models {
|
||||||
|
out = append(out, ProcMem{
|
||||||
|
Name: m.Name,
|
||||||
|
SizeMB: int(m.Size / (1024 * 1024)),
|
||||||
|
VRAMMB: int(m.SizeVRAM / (1024 * 1024)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c Client) FetchPS() []ProcMem {
|
||||||
|
url := Origin(c.BaseURL) + "/api/ps"
|
||||||
|
res, err := c.httpc().Get(url)
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
defer res.Body.Close()
|
||||||
|
raw, _ := io.ReadAll(res.Body)
|
||||||
|
if res.StatusCode >= 300 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return ParsePS(raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
func Run(c Client) Report {
|
||||||
|
if c.Device == "" {
|
||||||
|
c.Device = "cpu"
|
||||||
|
}
|
||||||
|
rep := Report{
|
||||||
|
Model: c.Model,
|
||||||
|
HF: HFFor(c.Model),
|
||||||
|
Device: c.Device,
|
||||||
|
}
|
||||||
|
for _, p := range BakePrompts {
|
||||||
|
r := RunPrompt(c, p)
|
||||||
|
rep.Prompts = append(rep.Prompts, r)
|
||||||
|
rep.ToolCallN++
|
||||||
|
if r.OK {
|
||||||
|
rep.ToolCallOK++
|
||||||
|
}
|
||||||
|
if r.XMLLeak {
|
||||||
|
rep.XMLLeak++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if mems := c.FetchPS(); len(mems) > 0 {
|
||||||
|
rep.RSSMB = mems[0].SizeMB
|
||||||
|
rep.VRAMMB = mems[0].VRAMMB
|
||||||
|
if c.Device == "cpu" && mems[0].VRAMMB > 0 {
|
||||||
|
rep.Device = "gpu"
|
||||||
|
}
|
||||||
|
for i := range rep.Prompts {
|
||||||
|
rep.Prompts[i].RSSMB = rep.RSSMB
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return rep
|
||||||
|
}
|
||||||
@@ -0,0 +1,166 @@
|
|||||||
|
package reasoner
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/eSlider/2dph/internal/httpapi"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestHFIdsAreRealAndNoQwen36Nine(t *testing.T) {
|
||||||
|
if HFQwen35_9B != "Qwen/Qwen3.5-9B" {
|
||||||
|
t.Fatalf("9B id = %s", HFQwen35_9B)
|
||||||
|
}
|
||||||
|
if HFQwen36_27B != "Qwen/Qwen3.6-27B" {
|
||||||
|
t.Fatalf("27B id = %s", HFQwen36_27B)
|
||||||
|
}
|
||||||
|
if HFBonsai27B != "prism-ml/Bonsai-27B-gguf" {
|
||||||
|
t.Fatalf("bonsai id = %s", HFBonsai27B)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseToolResponseOpenAI(t *testing.T) {
|
||||||
|
raw := []byte(`{"choices":[{"message":{"tool_calls":[{"function":{"name":"search","arguments":"{\"q\":\"LadybugDB\"}"}}]}}]}`)
|
||||||
|
tc, _, err := ParseToolResponse(raw)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if tc.Name != "search" {
|
||||||
|
t.Fatalf("name=%s", tc.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseToolResponseXMLIsFailure(t *testing.T) {
|
||||||
|
raw := []byte(`{"choices":[{"message":{"content":"<tool_call>search</tool_call>"}}]}`)
|
||||||
|
_, content, err := ParseToolResponse(raw)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected no tool_calls")
|
||||||
|
}
|
||||||
|
if !XMLLeak(content) {
|
||||||
|
t.Fatal("xml leak not detected")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBakePromptsWantMCPTools(t *testing.T) {
|
||||||
|
if len(BakePrompts) != 3 {
|
||||||
|
t.Fatalf("prompts=%d", len(BakePrompts))
|
||||||
|
}
|
||||||
|
names := map[string]bool{}
|
||||||
|
for _, p := range BakePrompts {
|
||||||
|
names[p.Want] = true
|
||||||
|
}
|
||||||
|
for _, n := range []string{"search", "get", "audit"} {
|
||||||
|
if !names[n] {
|
||||||
|
t.Fatalf("missing want %s", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseToolResponseObjectArgs(t *testing.T) {
|
||||||
|
raw := []byte(`{"choices":[{"message":{"tool_calls":[{"function":{"name":"get","arguments":{"id":"leaf-demo"}}}]}}]}`)
|
||||||
|
tc, _, err := ParseToolResponse(raw)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if tc.Name != "get" {
|
||||||
|
t.Fatalf("name=%s", tc.Name)
|
||||||
|
}
|
||||||
|
if !strings.Contains(tc.Arguments, "leaf-demo") {
|
||||||
|
t.Fatalf("args=%s", tc.Arguments)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParsePSCPUNotVRAM(t *testing.T) {
|
||||||
|
raw := []byte(`{"models":[{"name":"qwen3.5:9b","size":6900000000,"size_vram":0}]}`)
|
||||||
|
got := ParsePS(raw)
|
||||||
|
if len(got) != 1 {
|
||||||
|
t.Fatalf("n=%d", len(got))
|
||||||
|
}
|
||||||
|
if got[0].VRAMMB != 0 {
|
||||||
|
t.Fatalf("vram=%d", got[0].VRAMMB)
|
||||||
|
}
|
||||||
|
if got[0].SizeMB < 6000 {
|
||||||
|
t.Fatalf("rss=%d", got[0].SizeMB)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMCPToolsArePicoClawSubset(t *testing.T) {
|
||||||
|
mcp := map[string]bool{}
|
||||||
|
for _, op := range httpapi.Ops {
|
||||||
|
if op.MCP {
|
||||||
|
mcp[op.ID] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
seen := map[string]bool{}
|
||||||
|
for _, tool := range MCPTools() {
|
||||||
|
fn, _ := tool["function"].(map[string]any)
|
||||||
|
name, _ := fn["name"].(string)
|
||||||
|
if !mcp[name] {
|
||||||
|
t.Fatalf("%s is not an MCP op", name)
|
||||||
|
}
|
||||||
|
seen[name] = true
|
||||||
|
}
|
||||||
|
for _, n := range []string{"search", "get", "audit"} {
|
||||||
|
if !seen[n] {
|
||||||
|
t.Fatalf("bake-off missing %s", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChatToolsHitsOpenAIPath(t *testing.T) {
|
||||||
|
var gotTools bool
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.URL.Path != "/v1/chat/completions" {
|
||||||
|
t.Errorf("path=%s", r.URL.Path)
|
||||||
|
}
|
||||||
|
body, _ := io.ReadAll(r.Body)
|
||||||
|
var payload map[string]any
|
||||||
|
_ = json.Unmarshal(body, &payload)
|
||||||
|
if _, ok := payload["tools"]; ok {
|
||||||
|
gotTools = true
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(`{"choices":[{"message":{"tool_calls":[{"function":{"name":"search","arguments":"{\"q\":\"LadybugDB\"}"}}]}}]}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
c := Client{BaseURL: srv.URL + "/v1", Model: "stub", HTTP: srv.Client(), Device: "cpu"}
|
||||||
|
r := RunPrompt(c, BakePrompts[0])
|
||||||
|
if !gotTools {
|
||||||
|
t.Fatal("tools not sent")
|
||||||
|
}
|
||||||
|
if !r.OK {
|
||||||
|
t.Fatalf("result=%+v", r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRunSamplesPSAfterPrompts(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
if r.URL.Path == "/api/ps" {
|
||||||
|
_, _ = w.Write([]byte(`{"models":[{"name":"stub","size":6500000000,"size_vram":0}]}`))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = w.Write([]byte(`{"choices":[{"message":{"tool_calls":[{"function":{"name":"search","arguments":"{}"}}]}}]}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
c := Client{BaseURL: srv.URL + "/v1", Model: "stub", HTTP: srv.Client(), Device: "cpu"}
|
||||||
|
if mems := c.FetchPS(); len(mems) != 1 || mems[0].VRAMMB != 0 {
|
||||||
|
t.Fatalf("%+v", mems)
|
||||||
|
}
|
||||||
|
if mems := c.FetchPS(); mems[0].SizeMB < 6000 {
|
||||||
|
t.Fatalf("rss=%d", mems[0].SizeMB)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHFForKnownOllamaTags(t *testing.T) {
|
||||||
|
if HFFor(OllamaRAM) != HFQwen35_9B {
|
||||||
|
t.Fatal(HFFor(OllamaRAM))
|
||||||
|
}
|
||||||
|
if HFFor(OllamaQuality) != HFBonsai27B {
|
||||||
|
t.Fatal(HFFor(OllamaQuality))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
package websearch
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"encoding/json"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
|
_ "modernc.org/sqlite"
|
||||||
|
)
|
||||||
|
|
||||||
|
const cacheSchema = `
|
||||||
|
CREATE TABLE IF NOT EXISTS responses (
|
||||||
|
key TEXT PRIMARY KEY,
|
||||||
|
fetched REAL NOT NULL,
|
||||||
|
payload TEXT NOT NULL
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS meta (
|
||||||
|
key TEXT PRIMARY KEY,
|
||||||
|
value REAL NOT NULL
|
||||||
|
);
|
||||||
|
`
|
||||||
|
|
||||||
|
type Cache struct {
|
||||||
|
db *sql.DB
|
||||||
|
}
|
||||||
|
|
||||||
|
func OpenCache(path string) (*Cache, error) {
|
||||||
|
if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
db, err := sql.Open("sqlite", path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if _, err := db.Exec(cacheSchema); err != nil {
|
||||||
|
db.Close()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &Cache{db: db}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Cache) Close() error {
|
||||||
|
if c == nil || c.db == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return c.db.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Cache) Get(key string, ttl, now float64) (*Payload, error) {
|
||||||
|
var fetched float64
|
||||||
|
var raw string
|
||||||
|
err := c.db.QueryRow("SELECT fetched, payload FROM responses WHERE key = ?", key).Scan(&fetched, &raw)
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if now-fetched > ttl {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
var p Payload
|
||||||
|
if err := json.Unmarshal([]byte(raw), &p); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &p, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Cache) Put(key string, p Payload, now float64) error {
|
||||||
|
raw, err := json.Marshal(p)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, err = c.db.Exec(
|
||||||
|
"INSERT OR REPLACE INTO responses (key, fetched, payload) VALUES (?, ?, ?)",
|
||||||
|
key, now, string(raw),
|
||||||
|
)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Cache) LastCall() (*float64, error) {
|
||||||
|
var v float64
|
||||||
|
err := c.db.QueryRow("SELECT value FROM meta WHERE key = 'last_call'").Scan(&v)
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &v, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Cache) MarkCall(now float64) error {
|
||||||
|
_, err := c.db.Exec("INSERT OR REPLACE INTO meta (key, value) VALUES ('last_call', ?)", now)
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
package websearch
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
URL string
|
||||||
|
User string
|
||||||
|
Pass string
|
||||||
|
}
|
||||||
|
|
||||||
|
func LoadConfig(path string) (Config, error) {
|
||||||
|
raw, err := os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
return Config{}, fmt.Errorf("no credentials at %s (mode 600, BRAIN_SEARCH_URL)", path)
|
||||||
|
}
|
||||||
|
conf := map[string]string{}
|
||||||
|
for _, line := range strings.Split(string(raw), "\n") {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
if line == "" || strings.HasPrefix(line, "#") || !strings.Contains(line, "=") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
k, v, _ := strings.Cut(line, "=")
|
||||||
|
v = strings.TrimSpace(v)
|
||||||
|
v = strings.Trim(v, `"'`)
|
||||||
|
conf[strings.TrimSpace(k)] = v
|
||||||
|
}
|
||||||
|
out := Config{
|
||||||
|
URL: conf["BRAIN_SEARCH_URL"],
|
||||||
|
User: conf["BRAIN_SEARCH_USER"],
|
||||||
|
Pass: conf["BRAIN_SEARCH_PASS"],
|
||||||
|
}
|
||||||
|
if out.URL == "" {
|
||||||
|
return Config{}, fmt.Errorf("%s is missing BRAIN_SEARCH_URL", path)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func Fetch(client *http.Client, conf Config, query string, params map[string]string, timeout time.Duration) (Payload, error) {
|
||||||
|
if client == nil {
|
||||||
|
client = &http.Client{Timeout: timeout}
|
||||||
|
} else if timeout > 0 {
|
||||||
|
c := *client
|
||||||
|
c.Timeout = timeout
|
||||||
|
client = &c
|
||||||
|
}
|
||||||
|
q := url.Values{}
|
||||||
|
q.Set("q", query)
|
||||||
|
q.Set("format", "json")
|
||||||
|
for k, v := range params {
|
||||||
|
if v != "" {
|
||||||
|
q.Set(k, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
u := strings.TrimRight(conf.URL, "/") + "/search?" + q.Encode()
|
||||||
|
req, err := http.NewRequest(http.MethodGet, u, nil)
|
||||||
|
if err != nil {
|
||||||
|
return Payload{}, err
|
||||||
|
}
|
||||||
|
if conf.User != "" || conf.Pass != "" {
|
||||||
|
token := base64.StdEncoding.EncodeToString([]byte(conf.User + ":" + conf.Pass))
|
||||||
|
req.Header.Set("Authorization", "Basic "+token)
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return Payload{}, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
body, err := io.ReadAll(io.LimitReader(resp.Body, 8<<20))
|
||||||
|
if err != nil {
|
||||||
|
return Payload{}, err
|
||||||
|
}
|
||||||
|
if resp.StatusCode >= 400 {
|
||||||
|
return Payload{}, fmt.Errorf("HTTP %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
var p Payload
|
||||||
|
if err := json.Unmarshal(body, &p); err != nil {
|
||||||
|
return Payload{}, err
|
||||||
|
}
|
||||||
|
return p, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package websearch
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLoadConfigRequiresURL(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
p := filepath.Join(dir, "search.env")
|
||||||
|
if err := os.WriteFile(p, []byte("BRAIN_SEARCH_USER=x\n"), 0o600); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := LoadConfig(p); err == nil {
|
||||||
|
t.Fatal("expected missing URL error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoadConfigOptionalAuth(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
p := filepath.Join(dir, "search.env")
|
||||||
|
if err := os.WriteFile(p, []byte("BRAIN_SEARCH_URL=http://127.0.0.1:8080\n"), 0o600); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
c, err := LoadConfig(p)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if c.URL != "http://127.0.0.1:8080" || c.User != "" || c.Pass != "" {
|
||||||
|
t.Fatalf("%+v", c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFetchJSONNoBasicAuth(t *testing.T) {
|
||||||
|
payload := Payload{Query: "x", Results: []RawHit{{Title: "t", URL: "http://example.com", Content: "c", Engine: "bing"}}}
|
||||||
|
var sawAuth string
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
sawAuth = r.Header.Get("Authorization")
|
||||||
|
if r.URL.Query().Get("format") != "json" || r.URL.Query().Get("q") != "x" {
|
||||||
|
t.Errorf("query = %s", r.URL.RawQuery)
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
json.NewEncoder(w).Encode(payload)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
got, err := Fetch(srv.Client(), Config{URL: srv.URL}, "x", nil, 2*time.Second)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if sawAuth != "" {
|
||||||
|
t.Fatalf("Authorization = %q, want empty for local instance", sawAuth)
|
||||||
|
}
|
||||||
|
if Classify(got) != StatusOK {
|
||||||
|
t.Fatalf("classify = %s", Classify(got))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFetchSendsBasicAuthWhenConfigured(t *testing.T) {
|
||||||
|
var sawAuth string
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
sawAuth = r.Header.Get("Authorization")
|
||||||
|
w.Write([]byte(`{"query":"x","results":[]}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
_, err := Fetch(srv.Client(), Config{URL: srv.URL, User: "u", Pass: "p"}, "x", nil, 2*time.Second)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if sawAuth == "" {
|
||||||
|
t.Fatal("expected Basic auth")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
package websearch
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
StatusSkipped = "skipped"
|
||||||
|
StatusRefused = "refused"
|
||||||
|
)
|
||||||
|
|
||||||
|
type LookupOpt struct {
|
||||||
|
Limit int
|
||||||
|
Timeout time.Duration
|
||||||
|
EnvPath string
|
||||||
|
CachePath string
|
||||||
|
Client *http.Client
|
||||||
|
Now func() float64
|
||||||
|
Sleep func(context.Context, time.Duration) error
|
||||||
|
}
|
||||||
|
|
||||||
|
func Lookup(ctx context.Context, query string, opt LookupOpt) Output {
|
||||||
|
if ctx == nil {
|
||||||
|
ctx = context.Background()
|
||||||
|
}
|
||||||
|
if opt.Limit <= 0 {
|
||||||
|
opt.Limit = DefaultLimit
|
||||||
|
}
|
||||||
|
if opt.Timeout <= 0 {
|
||||||
|
opt.Timeout = 25 * time.Second
|
||||||
|
}
|
||||||
|
nowFn := opt.Now
|
||||||
|
if nowFn == nil {
|
||||||
|
nowFn = func() float64 { return float64(time.Now().Unix()) }
|
||||||
|
}
|
||||||
|
sleepFn := opt.Sleep
|
||||||
|
if sleepFn == nil {
|
||||||
|
sleepFn = func(ctx context.Context, d time.Duration) error {
|
||||||
|
t := time.NewTimer(d)
|
||||||
|
defer t.Stop()
|
||||||
|
select {
|
||||||
|
case <-t.C:
|
||||||
|
return nil
|
||||||
|
case <-ctx.Done():
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if reason := PHIReason(query); reason != "" {
|
||||||
|
return Output{Query: query, Status: StatusRefused, Note: reason}
|
||||||
|
}
|
||||||
|
|
||||||
|
cachePath := opt.CachePath
|
||||||
|
if cachePath == "" {
|
||||||
|
cachePath = os.Getenv("BRAIN_SEARCH_CACHE")
|
||||||
|
}
|
||||||
|
if cachePath == "" {
|
||||||
|
cachePath = os.Getenv("HOME") + "/.cache/brain/web-search.sqlite"
|
||||||
|
}
|
||||||
|
cache, err := OpenCache(cachePath)
|
||||||
|
if err != nil {
|
||||||
|
return Output{Query: query, Status: StatusSkipped, Note: "cache: " + err.Error()}
|
||||||
|
}
|
||||||
|
defer cache.Close()
|
||||||
|
|
||||||
|
key := CacheKey(query, nil)
|
||||||
|
now := nowFn()
|
||||||
|
if cached, err := cache.Get(key, CacheTTL, now); err == nil && cached != nil {
|
||||||
|
out := Project(*cached, opt.Limit, DefaultSnippetChars)
|
||||||
|
out.Cached = true
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
envPath := opt.EnvPath
|
||||||
|
if envPath == "" {
|
||||||
|
envPath = os.Getenv("BRAIN_SEARCH_ENV")
|
||||||
|
}
|
||||||
|
if envPath == "" {
|
||||||
|
envPath = os.Getenv("HOME") + "/.config/brain/search.env"
|
||||||
|
}
|
||||||
|
conf, err := LoadConfig(envPath)
|
||||||
|
if err != nil {
|
||||||
|
return Output{Query: query, Status: StatusSkipped, Note: "no BRAIN_SEARCH_URL; second source not consulted"}
|
||||||
|
}
|
||||||
|
|
||||||
|
lock, err := os.OpenFile(cachePath+".lock", os.O_CREATE|os.O_RDWR, 0o600)
|
||||||
|
if err != nil {
|
||||||
|
return Output{Query: query, Status: StatusSkipped, Note: "lock: " + err.Error()}
|
||||||
|
}
|
||||||
|
defer lock.Close()
|
||||||
|
if err := unix.Flock(int(lock.Fd()), unix.LOCK_EX); err != nil {
|
||||||
|
return Output{Query: query, Status: StatusSkipped, Note: "lock: " + err.Error()}
|
||||||
|
}
|
||||||
|
defer unix.Flock(int(lock.Fd()), unix.LOCK_UN)
|
||||||
|
|
||||||
|
last, err := cache.LastCall()
|
||||||
|
if err != nil {
|
||||||
|
return Output{Query: query, Status: StatusSkipped, Note: "cache: " + err.Error()}
|
||||||
|
}
|
||||||
|
if delay := WaitFor(last, nowFn(), MinInterval); delay > 0 {
|
||||||
|
if err := sleepFn(ctx, time.Duration(delay*float64(time.Second))); err != nil {
|
||||||
|
return Output{Query: query, Status: StatusSkipped, Note: "cancelled"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ = cache.MarkCall(nowFn())
|
||||||
|
|
||||||
|
payload, err := Fetch(opt.Client, conf, query, nil, opt.Timeout)
|
||||||
|
if err != nil {
|
||||||
|
return Output{Query: query, Status: StatusThrottled, Note: fmt.Sprintf("request failed: %v", err)}
|
||||||
|
}
|
||||||
|
if Classify(payload) == StatusOK {
|
||||||
|
_ = cache.Put(key, payload, nowFn())
|
||||||
|
}
|
||||||
|
return Project(payload, opt.Limit, DefaultSnippetChars)
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
package websearch
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLookupRefusesPIIWithoutFetch(t *testing.T) {
|
||||||
|
hits := 0
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
|
||||||
|
hits++
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
out := Lookup(context.Background(), "Personalnummer 12", LookupOpt{
|
||||||
|
EnvPath: writeEnv(t, srv.URL),
|
||||||
|
CachePath: filepath.Join(t.TempDir(), "c.sqlite"),
|
||||||
|
Client: srv.Client(),
|
||||||
|
Sleep: func(context.Context, time.Duration) error { return nil },
|
||||||
|
})
|
||||||
|
if out.Status != StatusRefused {
|
||||||
|
t.Fatalf("status = %s", out.Status)
|
||||||
|
}
|
||||||
|
if hits != 0 {
|
||||||
|
t.Fatal("PII query left the host")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLookupSkipsWhenNoConfig(t *testing.T) {
|
||||||
|
out := Lookup(context.Background(), "LadybugDB", LookupOpt{
|
||||||
|
EnvPath: filepath.Join(t.TempDir(), "missing.env"),
|
||||||
|
CachePath: filepath.Join(t.TempDir(), "c.sqlite"),
|
||||||
|
Sleep: func(context.Context, time.Duration) error { return nil },
|
||||||
|
})
|
||||||
|
if out.Status != StatusSkipped {
|
||||||
|
t.Fatalf("status = %s", out.Status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLookupFetchesOnceAndCaches(t *testing.T) {
|
||||||
|
hits := 0
|
||||||
|
payload := Payload{Query: "x", Results: []RawHit{{Title: "t", URL: "http://example.com", Content: "c", Engine: "bing"}}}
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
hits++
|
||||||
|
json.NewEncoder(w).Encode(payload)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
opt := LookupOpt{
|
||||||
|
EnvPath: writeEnv(t, srv.URL),
|
||||||
|
CachePath: filepath.Join(t.TempDir(), "c.sqlite"),
|
||||||
|
Client: srv.Client(),
|
||||||
|
Now: func() float64 { return 1_000 },
|
||||||
|
Sleep: func(context.Context, time.Duration) error { return nil },
|
||||||
|
}
|
||||||
|
a := Lookup(context.Background(), "LadybugDB", opt)
|
||||||
|
b := Lookup(context.Background(), "LadybugDB", opt)
|
||||||
|
if a.Status != StatusOK || b.Status != StatusOK {
|
||||||
|
t.Fatalf("a=%s b=%s", a.Status, b.Status)
|
||||||
|
}
|
||||||
|
if hits != 1 {
|
||||||
|
t.Fatalf("hits = %d, want 1 (second from cache)", hits)
|
||||||
|
}
|
||||||
|
if !b.Cached {
|
||||||
|
t.Fatal("second lookup not cached")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLookupEmptyIsThrottled(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Write([]byte(`{"query":"x","results":[]}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
out := Lookup(context.Background(), "LadybugDB", LookupOpt{
|
||||||
|
EnvPath: writeEnv(t, srv.URL),
|
||||||
|
CachePath: filepath.Join(t.TempDir(), "c.sqlite"),
|
||||||
|
Client: srv.Client(),
|
||||||
|
Now: func() float64 { return 1_000 },
|
||||||
|
Sleep: func(context.Context, time.Duration) error { return nil },
|
||||||
|
})
|
||||||
|
if out.Status != StatusThrottled {
|
||||||
|
t.Fatalf("status = %s", out.Status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeEnv(t *testing.T, url string) string {
|
||||||
|
t.Helper()
|
||||||
|
p := filepath.Join(t.TempDir(), "search.env")
|
||||||
|
if err := os.WriteFile(p, []byte("BRAIN_SEARCH_URL="+url+"\n"), 0o600); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return p
|
||||||
|
}
|
||||||
@@ -0,0 +1,205 @@
|
|||||||
|
// Package websearch is the SearXNG client used as the second independent source.
|
||||||
|
//
|
||||||
|
// An empty result list from this instance is throttling, not evidence of absence.
|
||||||
|
package websearch
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"unicode"
|
||||||
|
"unicode/utf8"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
StatusOK = "ok"
|
||||||
|
StatusThrottled = "throttled"
|
||||||
|
|
||||||
|
DefaultLimit = 5
|
||||||
|
DefaultSnippetChars = 150
|
||||||
|
MinInterval = 10.0
|
||||||
|
CacheTTL = 7 * 24 * 3600
|
||||||
|
)
|
||||||
|
|
||||||
|
var RetryBackoff = []float64{20, 60}
|
||||||
|
|
||||||
|
type Payload struct {
|
||||||
|
Query string `json:"query"`
|
||||||
|
Results []RawHit `json:"results"`
|
||||||
|
UnresponsiveEngines [][]string `json:"unresponsive_engines"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type RawHit struct {
|
||||||
|
Title string `json:"title"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
Content string `json:"content"`
|
||||||
|
Engine string `json:"engine"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Hit struct {
|
||||||
|
Rank int `json:"rank"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
Snippet string `json:"snippet"`
|
||||||
|
Engine string `json:"engine"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Output struct {
|
||||||
|
Query string `json:"query"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Results []Hit `json:"results"`
|
||||||
|
Unresponsive []string `json:"unresponsive,omitempty"`
|
||||||
|
Note string `json:"note,omitempty"`
|
||||||
|
Cached bool `json:"cached,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func Classify(p Payload) string {
|
||||||
|
if len(p.Results) > 0 {
|
||||||
|
return StatusOK
|
||||||
|
}
|
||||||
|
return StatusThrottled
|
||||||
|
}
|
||||||
|
|
||||||
|
func Project(p Payload, limit, snippetChars int) Output {
|
||||||
|
if limit <= 0 {
|
||||||
|
limit = DefaultLimit
|
||||||
|
}
|
||||||
|
if snippetChars <= 0 {
|
||||||
|
snippetChars = DefaultSnippetChars
|
||||||
|
}
|
||||||
|
status := Classify(p)
|
||||||
|
n := limit
|
||||||
|
if n > len(p.Results) {
|
||||||
|
n = len(p.Results)
|
||||||
|
}
|
||||||
|
hits := make([]Hit, 0, n)
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
item := p.Results[i]
|
||||||
|
hits = append(hits, Hit{
|
||||||
|
Rank: i + 1,
|
||||||
|
Title: item.Title,
|
||||||
|
URL: item.URL,
|
||||||
|
Snippet: trimSnippet(item.Content, snippetChars),
|
||||||
|
Engine: item.Engine,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
out := Output{
|
||||||
|
Query: p.Query,
|
||||||
|
Status: status,
|
||||||
|
Results: hits,
|
||||||
|
}
|
||||||
|
for _, pair := range p.UnresponsiveEngines {
|
||||||
|
if len(pair) >= 2 {
|
||||||
|
out.Unresponsive = append(out.Unresponsive, pair[0]+": "+pair[1])
|
||||||
|
} else if len(pair) == 1 {
|
||||||
|
out.Unresponsive = append(out.Unresponsive, pair[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if status == StatusThrottled {
|
||||||
|
out.Note = "no engine answered - this is a throttled instance, not evidence that nothing exists"
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
var spaceRE = regexp.MustCompile(`\s+`)
|
||||||
|
|
||||||
|
func trimSnippet(s string, max int) string {
|
||||||
|
s = strings.TrimSpace(spaceRE.ReplaceAllString(s, " "))
|
||||||
|
if utf8.RuneCountInString(s) <= max {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
runes := []rune(s)
|
||||||
|
cut := strings.TrimRightFunc(string(runes[:max]), unicode.IsSpace)
|
||||||
|
return cut + "..."
|
||||||
|
}
|
||||||
|
|
||||||
|
func CacheKey(query string, params map[string]string) string {
|
||||||
|
norm := strings.Join(strings.Fields(strings.ToLower(query)), " ")
|
||||||
|
if params == nil {
|
||||||
|
params = map[string]string{}
|
||||||
|
}
|
||||||
|
stable, _ := json.Marshal(params)
|
||||||
|
sum := sha256.Sum256([]byte(norm + "\x00" + string(stable)))
|
||||||
|
return hex.EncodeToString(sum[:])
|
||||||
|
}
|
||||||
|
|
||||||
|
func WaitFor(last *float64, now, interval float64) float64 {
|
||||||
|
if last == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
d := interval - (now - *last)
|
||||||
|
if d < 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
|
||||||
|
func PHIReason(query string) string {
|
||||||
|
for _, p := range phiPatterns {
|
||||||
|
if p.re.MatchString(query) {
|
||||||
|
return p.reason
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
type phiPat struct {
|
||||||
|
re *regexp.Regexp
|
||||||
|
reason string
|
||||||
|
}
|
||||||
|
|
||||||
|
var phiPatterns = []phiPat{
|
||||||
|
{regexp.MustCompile(`\d{6,}`), "a run of six or more digits looks like an ID"},
|
||||||
|
{regexp.MustCompile(`(?i)\bpersonalnummer\b`), "Personalnummer is staff data"},
|
||||||
|
{regexp.MustCompile(`(?i)\bkv[-\s]?nr\b`), "KV-Nr is an insurance number"},
|
||||||
|
{regexp.MustCompile(`(?i)\bversichertennummer\b`), "insurance number"},
|
||||||
|
{regexp.MustCompile(`(?i)\b[A-Za-zÄÖÜäöüß]+(?:stra(?:ss|ß)e|str\.)\s*\d+`), "a street with a house number looks like an address"},
|
||||||
|
{regexp.MustCompile(`(?i)\bgeb(?:urtsdatum)?\.?\s*\d{1,2}[./]\d{1,2}[./]\d{2,4}`), "a date of birth"},
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o Output) YAML() string {
|
||||||
|
var b strings.Builder
|
||||||
|
fmt.Fprintf(&b, "query: %s\n", yamlScalar(o.Query))
|
||||||
|
fmt.Fprintf(&b, "status: %s\n", yamlScalar(o.Status))
|
||||||
|
if len(o.Results) == 0 {
|
||||||
|
b.WriteString("results: []\n")
|
||||||
|
} else {
|
||||||
|
b.WriteString("results:\n")
|
||||||
|
for _, r := range o.Results {
|
||||||
|
b.WriteString("-\n")
|
||||||
|
fmt.Fprintf(&b, " rank: %d\n", r.Rank)
|
||||||
|
fmt.Fprintf(&b, " title: %s\n", yamlScalar(r.Title))
|
||||||
|
fmt.Fprintf(&b, " url: %s\n", yamlScalar(r.URL))
|
||||||
|
fmt.Fprintf(&b, " snippet: %s\n", yamlScalar(r.Snippet))
|
||||||
|
fmt.Fprintf(&b, " engine: %s\n", yamlScalar(r.Engine))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(o.Unresponsive) > 0 {
|
||||||
|
b.WriteString("unresponsive:\n")
|
||||||
|
for _, u := range o.Unresponsive {
|
||||||
|
fmt.Fprintf(&b, "- %s\n", yamlScalar(u))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if o.Note != "" {
|
||||||
|
fmt.Fprintf(&b, "note: %s\n", yamlScalar(o.Note))
|
||||||
|
}
|
||||||
|
if o.Cached {
|
||||||
|
b.WriteString("cached: true\n")
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func yamlScalar(s string) string {
|
||||||
|
if strings.Contains(s, "\n") {
|
||||||
|
b, _ := json.Marshal(s)
|
||||||
|
return string(b)
|
||||||
|
}
|
||||||
|
if s == "" || strings.ContainsAny(s, ":#'\"[]{}&*!|>%@`") || s != strings.TrimSpace(s) {
|
||||||
|
b, _ := json.Marshal(s)
|
||||||
|
return string(b)
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
package websearch
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"unicode/utf8"
|
||||||
|
)
|
||||||
|
|
||||||
|
func loadFixture(t *testing.T, name string) Payload {
|
||||||
|
t.Helper()
|
||||||
|
_, file, _, ok := runtime.Caller(0)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("runtime.Caller")
|
||||||
|
}
|
||||||
|
path := filepath.Join(filepath.Dir(file), "..", "..", "bin", "tools", "web-search", "fixtures", name)
|
||||||
|
raw, err := os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var p Payload
|
||||||
|
if err := json.Unmarshal(raw, &p); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClassifyHealthyIsOK(t *testing.T) {
|
||||||
|
if got := Classify(loadFixture(t, "healthy.json")); got != StatusOK {
|
||||||
|
t.Fatalf("classify healthy = %q, want ok", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClassifyEmptyIsThrottledNotEmpty(t *testing.T) {
|
||||||
|
got := Classify(loadFixture(t, "throttled.json"))
|
||||||
|
if got != StatusThrottled {
|
||||||
|
t.Fatalf("classify empty = %q, want throttled", got)
|
||||||
|
}
|
||||||
|
if got == "empty" || got == "no_results" {
|
||||||
|
t.Fatal("status must never sound like absence")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestProjectKeepsContextFields(t *testing.T) {
|
||||||
|
out := Project(loadFixture(t, "healthy.json"), 3, DefaultSnippetChars)
|
||||||
|
if out.Status != StatusOK {
|
||||||
|
t.Fatalf("status = %q", out.Status)
|
||||||
|
}
|
||||||
|
if len(out.Results) != 3 {
|
||||||
|
t.Fatalf("len = %d, want 3", len(out.Results))
|
||||||
|
}
|
||||||
|
r := out.Results[0]
|
||||||
|
if r.Rank != 1 || r.Title == "" || r.URL == "" {
|
||||||
|
t.Fatalf("hit = %+v", r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestProjectTrimsSnippet(t *testing.T) {
|
||||||
|
out := Project(loadFixture(t, "healthy.json"), 5, 40)
|
||||||
|
for _, r := range out.Results {
|
||||||
|
n := utf8.RuneCountInString(r.Snippet)
|
||||||
|
if n > 43 {
|
||||||
|
t.Fatalf("snippet len %d > 43: %q", n, r.Snippet)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestProjectIsCheaperThanRaw(t *testing.T) {
|
||||||
|
raw, err := os.ReadFile(filepath.Join(fixtureDir(t), "healthy.json"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
out, err := json.Marshal(Project(loadFixture(t, "healthy.json"), 5, DefaultSnippetChars))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(out)*3 >= len(raw) {
|
||||||
|
t.Fatalf("projected %d not cheaper than raw %d", len(out), len(raw))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestThrottledProjectionCarriesEngineReasons(t *testing.T) {
|
||||||
|
out := Project(loadFixture(t, "throttled.json"), 5, DefaultSnippetChars)
|
||||||
|
if out.Status != StatusThrottled {
|
||||||
|
t.Fatalf("status = %q", out.Status)
|
||||||
|
}
|
||||||
|
if len(out.Results) != 0 {
|
||||||
|
t.Fatalf("results = %v", out.Results)
|
||||||
|
}
|
||||||
|
if len(out.Unresponsive) == 0 {
|
||||||
|
t.Fatal("unresponsive empty")
|
||||||
|
}
|
||||||
|
if !strings.Contains(out.Note, "not evidence that nothing exists") {
|
||||||
|
t.Fatalf("note = %q", out.Note)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCacheKeyStable(t *testing.T) {
|
||||||
|
if CacheKey("Pflegegrad", nil) != CacheKey("Pflegegrad", map[string]string{}) {
|
||||||
|
t.Fatal("nil vs empty params")
|
||||||
|
}
|
||||||
|
if CacheKey(" Pflegegrad ", nil) != CacheKey("pflegegrad", nil) {
|
||||||
|
t.Fatal("case/padding")
|
||||||
|
}
|
||||||
|
if CacheKey("x", map[string]string{"lang": "de"}) == CacheKey("x", nil) {
|
||||||
|
t.Fatal("params must change key")
|
||||||
|
}
|
||||||
|
a := CacheKey("x", map[string]string{"a": "1", "b": "2"})
|
||||||
|
b := CacheKey("x", map[string]string{"b": "2", "a": "1"})
|
||||||
|
if a != b {
|
||||||
|
t.Fatal("param order must not change key")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPHIGuard(t *testing.T) {
|
||||||
|
if PHIReason("Pflegegrad SGB XI Einstufung") != "" {
|
||||||
|
t.Fatal("technical query refused")
|
||||||
|
}
|
||||||
|
if PHIReason("site:example.com technical query") != "" {
|
||||||
|
t.Fatal("site query refused")
|
||||||
|
}
|
||||||
|
if PHIReason("SGB XI Paragraph 45b") != "" {
|
||||||
|
t.Fatal("short numbers refused")
|
||||||
|
}
|
||||||
|
if PHIReason("Kunde 4711220385 Adresse") == "" {
|
||||||
|
t.Fatal("long digit run allowed")
|
||||||
|
}
|
||||||
|
if PHIReason("KV-Nr A123456789") == "" {
|
||||||
|
t.Fatal("KV-Nr allowed")
|
||||||
|
}
|
||||||
|
if PHIReason("Hauptstraße 14 Berlin") == "" {
|
||||||
|
t.Fatal("street allowed")
|
||||||
|
}
|
||||||
|
if PHIReason("Lindenstr. 7") == "" {
|
||||||
|
t.Fatal("str. allowed")
|
||||||
|
}
|
||||||
|
if PHIReason("Personalnummer 12") == "" {
|
||||||
|
t.Fatal("Personalnummer allowed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWaitFor(t *testing.T) {
|
||||||
|
last := 100.0
|
||||||
|
if got := WaitFor(&last, 104.0, 10); got != 6 {
|
||||||
|
t.Fatalf("wait = %v, want 6", got)
|
||||||
|
}
|
||||||
|
if got := WaitFor(&last, 130.0, 10); got != 0 {
|
||||||
|
t.Fatalf("wait = %v, want 0", got)
|
||||||
|
}
|
||||||
|
if got := WaitFor(nil, 130.0, 10); got != 0 {
|
||||||
|
t.Fatalf("first call wait = %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSQLiteCacheRoundTrip(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
c, err := OpenCache(filepath.Join(dir, "web-search.sqlite"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer c.Close()
|
||||||
|
p := loadFixture(t, "healthy.json")
|
||||||
|
key := CacheKey("pflegegrad", nil)
|
||||||
|
if got, err := c.Get(key, CacheTTL, 1_000); err != nil || got != nil {
|
||||||
|
t.Fatalf("empty get = %v %v", got, err)
|
||||||
|
}
|
||||||
|
if err := c.Put(key, p, 1_000); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, err := c.Get(key, CacheTTL, 1_001)
|
||||||
|
if err != nil || got == nil {
|
||||||
|
t.Fatalf("get = %v %v", got, err)
|
||||||
|
}
|
||||||
|
if Classify(*got) != StatusOK {
|
||||||
|
t.Fatalf("cached classify = %s", Classify(*got))
|
||||||
|
}
|
||||||
|
expired, err := c.Get(key, 10, 2_000)
|
||||||
|
if err != nil || expired != nil {
|
||||||
|
t.Fatalf("expired = %v %v", expired, err)
|
||||||
|
}
|
||||||
|
if v, err := c.LastCall(); err != nil || v != nil {
|
||||||
|
t.Fatalf("last = %v %v", v, err)
|
||||||
|
}
|
||||||
|
if err := c.MarkCall(50); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
v, err := c.LastCall()
|
||||||
|
if err != nil || v == nil || *v != 50 {
|
||||||
|
t.Fatalf("last after mark = %v %v", v, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func fixtureDir(t *testing.T) string {
|
||||||
|
t.Helper()
|
||||||
|
_, file, _, ok := runtime.Caller(0)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("runtime.Caller")
|
||||||
|
}
|
||||||
|
return filepath.Join(filepath.Dir(file), "..", "..", "bin", "tools", "web-search", "fixtures")
|
||||||
|
}
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
---
|
|
||||||
name: agent-cost
|
|
||||||
description: >-
|
|
||||||
Measure what an agent session actually costs in tokens using bin/agents/cost.
|
|
||||||
Use before and after changing documentation, skills or context layout, and when
|
|
||||||
a session feels unexpectedly expensive.
|
|
||||||
---
|
|
||||||
|
|
||||||
# agent-cost
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bin/agents/cost # every project, YAML
|
|
||||||
bin/agents/cost --repo 2dph # only sessions whose cwd matches
|
|
||||||
bin/agents/cost --json | jq .cursor.by_tool
|
|
||||||
bin/agents/cost --snapshot after-x --repo 2dph # append a row to docs/CONTEXT-BUDGET.md
|
|
||||||
```
|
|
||||||
|
|
||||||
Reads local session storage from OpenCode and Cursor transcripts. Reports the
|
|
||||||
always-loaded baseline, cache hit/miss/thrash, and which tools moved the most
|
|
||||||
bytes.
|
|
||||||
|
|
||||||
## How to read it
|
|
||||||
|
|
||||||
- **Baseline** is what every single message pays for: `AGENTS.md` plus anything
|
|
||||||
eagerly linked from it. Keep it small; it multiplies by message count.
|
|
||||||
- **Cache thrash** matters more than raw size. Editing a file that sits early in
|
|
||||||
the context invalidates the prompt cache for the whole session.
|
|
||||||
- **by_tool bytes** shows where the real spend is. Usually it is unfiltered
|
|
||||||
command output, not documentation.
|
|
||||||
|
|
||||||
## Rule
|
|
||||||
|
|
||||||
Measure before and after. A claim that something "reduces tokens" without a
|
|
||||||
before and an after number is an opinion, not a result.
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
name: kb-search
|
name: brain
|
||||||
description: >-
|
description: >-
|
||||||
Deduction search over the 2dph brain (Ladybug graph: ops corpus, portfolio,
|
Deduction search over the 2dph brain (Ladybug graph: ops corpus, portfolio,
|
||||||
ssh hosts) with bin/brain/search.go instead of reading files or grepping
|
ssh hosts) with bin/brain/search.go instead of reading files or grepping
|
||||||
@@ -8,7 +8,7 @@ description: >-
|
|||||||
documentation.
|
documentation.
|
||||||
---
|
---
|
||||||
|
|
||||||
# kb-search — deduction over facts and info
|
# brain — deduction over facts and info
|
||||||
|
|
||||||
One embedded Ladybug graph (`var/kb.lbug`, read-only when queried) holding two
|
One embedded Ladybug graph (`var/kb.lbug`, read-only when queried) holding two
|
||||||
roots:
|
roots:
|
||||||
@@ -28,7 +28,7 @@ bin/brain/search.go "onlyoffice postgres" --root facts # restrict to confirmed
|
|||||||
bin/brain/search.go "where is cs-lexicon" --json | yq '.[].ref'
|
bin/brain/search.go "where is cs-lexicon" --json | yq '.[].ref'
|
||||||
bin/brain/get.go <id> --body # full chunk only when needed
|
bin/brain/get.go <id> --body # full chunk only when needed
|
||||||
bin/brain/stats.go # index health
|
bin/brain/stats.go # index health
|
||||||
bin/brain/eval.go # recall@5 >= 0.95 gate
|
bin/brain/eval.go # recall@5 >= 0.95 gate (Go; Python bin/kb/eval is CI fallback)
|
||||||
```
|
```
|
||||||
|
|
||||||
`bin/kb/search` is a deprecated wrapper. `--hop` errors (File/FROM_FILE edges
|
`bin/kb/search` is a deprecated wrapper. `--hop` errors (File/FROM_FILE edges
|
||||||
@@ -39,8 +39,12 @@ are not wired yet); do not treat it as a graph walk.
|
|||||||
- Search before you read. Never grep a repo for a concept the graph covers.
|
- Search before you read. Never grep a repo for a concept the graph covers.
|
||||||
- `--root facts` returns only confirmed evidence-linked answers. Default shows
|
- `--root facts` returns only confirmed evidence-linked answers. Default shows
|
||||||
facts first, then info leafs clearly marked `(not confirmed)`.
|
facts first, then info leafs clearly marked `(not confirmed)`.
|
||||||
|
- If there is no facts hit, `bin/brain/search.go` consults SearXNG and adds a
|
||||||
|
`web` block (kept apart from graph hits). `throttled` / `skipped` / `refused`
|
||||||
|
are not evidence of absence. `--root facts|info` and `--no-web` skip the web.
|
||||||
- If recall looks wrong, run `bin/brain/eval.go`; it gates control questions and
|
- If recall looks wrong, run `bin/brain/eval.go`; it gates control questions and
|
||||||
should stay at or above 95% recall@5.
|
should stay at or above 95% recall@5.
|
||||||
- Escalate to `web-search` (the `web-search` skill) as the independent second
|
- Agents: `GET /openapi.json` and `POST /mcp` on `bin/brain/serve.go` (same
|
||||||
source when both local roots cannot confirm; never report an unconfirmed
|
handlers; tool names match paths `search`/`get`/`stats`/`audit`). Generated
|
||||||
single-source local answer as fact.
|
list: [tools.md](tools.md).
|
||||||
|
- Never report an unconfirmed single-source local answer as fact.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# brain HTTP / MCP tools
|
||||||
|
|
||||||
|
Generated from `internal/httpapi.Ops`. Do not edit by hand.
|
||||||
|
|
||||||
|
Serve: `bin/brain/serve.go` (`GET /openapi.json`, `POST /mcp`).
|
||||||
|
|
||||||
|
- `search` — deduction search (facts → info → web)
|
||||||
|
- `get` — read one leaf by id
|
||||||
|
- `stats` — index health
|
||||||
|
- `audit` — facts confidence histogram
|
||||||
|
- `ingest` — rebuild hint (write is v2)
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
---
|
|
||||||
name: db-yaml
|
|
||||||
description: >-
|
|
||||||
Read any Postgres as compact YAML through db/psql-yq, with a read-only guard and
|
|
||||||
named profiles. Use when a task needs table contents, column types or a SELECT
|
|
||||||
against cs_brain or another project database.
|
|
||||||
---
|
|
||||||
|
|
||||||
# db-yaml
|
|
||||||
|
|
||||||
`bin/db/psql-yq` (vendored in this repo) talks to Postgres and returns YAML,
|
|
||||||
which is far cheaper than a psql ASCII table and easy to slice with `yq`.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bin/db/psql-yq --profile onlyoffice -s document_asset # column list
|
|
||||||
bin/db/psql-yq --profile onlyoffice -t task_result -l 20 # sample rows as YAML
|
|
||||||
bin/db/psql-yq --profile onlyoffice -c 'SELECT ...' # query -> YAML
|
|
||||||
```
|
|
||||||
|
|
||||||
Ad-hoc targets without a profile:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bin/db/psql-yq --container my-pg --db app -c 'SELECT 1'
|
|
||||||
bin/db/psql-yq --dsn 'postgres://user@host:5432/db' -c 'SELECT 1'
|
|
||||||
```
|
|
||||||
|
|
||||||
## Profiles
|
|
||||||
|
|
||||||
Connection details live in `~/.config/brain/db-profiles.yml` (mode 600), never in a
|
|
||||||
project repo. A profile names either a `container` or a `host`; passwords are read
|
|
||||||
from a separate `password_env_file` and never appear in argv.
|
|
||||||
|
|
||||||
## Rules
|
|
||||||
|
|
||||||
- **Read-only.** Any `insert|update|delete|drop|truncate|alter|create|grant|
|
|
||||||
revoke|vacuum|copy` is rejected with exit 3. Do not work around it.
|
|
||||||
- **PII.** `cs_brain` holds client data. Aggregate and count freely; never copy
|
|
||||||
names or addresses into chat, issues or docs.
|
|
||||||
- Use `-l` to keep samples small. Twenty rows answer most questions.
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
---
|
||||||
|
name: picoclaw
|
||||||
|
description: >-
|
||||||
|
2dph is the memory/fact gate, not the agent loop. Use when wiring PicoClaw
|
||||||
|
or any MCP client: call brain search/get/audit before a factual reply.
|
||||||
|
throttled is not a negative finding.
|
||||||
|
---
|
||||||
|
|
||||||
|
# PicoClaw — fact-check before assert
|
||||||
|
|
||||||
|
PicoClaw (or any agent) speaks MCP at `POST /mcp` on `bin/brain/serve.go`.
|
||||||
|
2dph does not run the agent loop. Compose: `docker compose --profile picoclaw up brain-mcp`
|
||||||
|
(see [docs/picoclaw.md](../../docs/picoclaw.md)).
|
||||||
|
|
||||||
|
## Tool order (before a factual reply)
|
||||||
|
|
||||||
|
1. **`search`** — facts root first, then info. The `web` block is a second
|
||||||
|
source when there is no facts hit. Status `throttled` / `skipped` /
|
||||||
|
`refused` is **not** evidence of absence.
|
||||||
|
2. **`get`** — full leaf body only when a hit `id` is needed.
|
||||||
|
3. **`audit`** — if recall or confidence looks wrong.
|
||||||
|
|
||||||
|
Then answer. Confirmed only from facts (≥2 independent sources). Anything
|
||||||
|
else is `(not confirmed)`. Missing graph ≠ “does not exist”.
|
||||||
|
|
||||||
|
Generated tool list: [../brain/tools.md](../brain/tools.md).
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
---
|
||||||
|
name: postgres
|
||||||
|
description: >-
|
||||||
|
Read Postgres as compact YAML through bin/postgres/query.go (read-only
|
||||||
|
guard, named profiles). Use when a task needs table contents, column types,
|
||||||
|
or a SELECT against an ops database.
|
||||||
|
---
|
||||||
|
|
||||||
|
# postgres
|
||||||
|
|
||||||
|
`bin/postgres/query.go` wraps vendored `bin/db/psql-yq`. Output is YAML
|
||||||
|
(cheaper than psql ASCII, easy to slice with `yq`).
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bin/postgres/query.go --profile onlyoffice -s document_asset # column list
|
||||||
|
bin/postgres/query.go --profile onlyoffice -t task_result -l 20 # sample rows
|
||||||
|
bin/postgres/query.go --profile onlyoffice -c 'SELECT ...' # query → YAML
|
||||||
|
```
|
||||||
|
|
||||||
|
Ad-hoc targets without a profile:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bin/postgres/query.go --container my-pg --db app -c 'SELECT 1'
|
||||||
|
bin/postgres/query.go --dsn 'postgres://user@host:5432/db' -c 'SELECT 1'
|
||||||
|
```
|
||||||
|
|
||||||
|
## Profiles
|
||||||
|
|
||||||
|
Connection details live in `$HOME/.config/brain/db-profiles.yml` (mode 600),
|
||||||
|
never in a project repo. A profile names either a `container` or a `host`;
|
||||||
|
passwords are read from a separate `password_env_file` and never appear in argv.
|
||||||
|
|
||||||
|
## Rules
|
||||||
|
|
||||||
|
- **Read-only.** Any `insert|update|delete|drop|truncate|alter|create|grant|
|
||||||
|
revoke|vacuum|copy` is rejected with exit 3. Do not work around it.
|
||||||
|
- **PII.** Client CRM databases: aggregate and count freely; never copy names
|
||||||
|
or addresses into chat, issues or docs.
|
||||||
|
- Use `-l` to keep samples small. Twenty rows answer most questions.
|
||||||
@@ -1,25 +1,30 @@
|
|||||||
---
|
---
|
||||||
name: web-search
|
name: web-search
|
||||||
description: >-
|
description: >-
|
||||||
Search the public web through the self-hosted SearXNG at search.ops.io
|
Search the public web through SearXNG using bin/web/search.go. Use for vendor
|
||||||
using bin/web/search. Use for German care law, SGB paragraphs, vendor
|
documentation, public standards, and any fact that is not in our own repos —
|
||||||
documentation and any fact that is not in our own repos - and as the second
|
and as the second independent source the detective method requires.
|
||||||
independent source the detective method requires.
|
|
||||||
---
|
---
|
||||||
|
|
||||||
# web-search
|
# web-search
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bin/web/search "LadybugDB vector index"
|
bin/web/search.go "LadybugDB vector index"
|
||||||
bin/web/search "model2vec multilingual" --category it
|
bin/web/search.go "model2vec multilingual" --category it
|
||||||
bin/web/search "hypervisor" --site ops.io --json | jq -r '.results[].url'
|
bin/web/search.go "hypervisor" --site example.com --json | jq -r '.results[].url'
|
||||||
bin/web/search "postgres partial index" --lang en --fresh year
|
bin/web/search.go "postgres partial index" --lang en --fresh year
|
||||||
```
|
```
|
||||||
|
|
||||||
|
URL and optional Basic Auth live in `$BRAIN_SEARCH_ENV` (default
|
||||||
|
`$HOME/.config/brain/search.env`): `BRAIN_SEARCH_URL` is required;
|
||||||
|
`BRAIN_SEARCH_USER` / `BRAIN_SEARCH_PASS` only if the instance uses Basic Auth.
|
||||||
|
A host that already runs SearXNG should set `BRAIN_SEARCH_URL` and not start
|
||||||
|
the Compose profile.
|
||||||
|
|
||||||
## Web or knowledge base
|
## Web or knowledge base
|
||||||
|
|
||||||
`bin/brain/search.go` holds our own facts: the ops stack, portfolio, ssh hosts,
|
`bin/brain/search.go` holds our own facts: the ops stack, portfolio, ssh hosts,
|
||||||
the lexicon. Go there first. Reach for `bin/web/search` when the answer is
|
the lexicon. Go there first. Reach for `bin/web/search.go` when the answer is
|
||||||
outside our repos: upstream library behaviour, vendor documentation, public
|
outside our repos: upstream library behaviour, vendor documentation, public
|
||||||
standards.
|
standards.
|
||||||
|
|
||||||
|
|||||||
@@ -5,63 +5,47 @@ status: current
|
|||||||
|
|
||||||
# Tuning the SearXNG instance
|
# Tuning the SearXNG instance
|
||||||
|
|
||||||
The client works around a fragile instance. These changes fix the cause, and
|
The client treats HTTP 200 + `results: []` as **throttled**, not as absence.
|
||||||
they need shell access to the host behind `search.ops.io`
|
Fix the cause on the instance you point `BRAIN_SEARCH_URL` at, or use the
|
||||||
(`90.169.228.16` / `ops.mywire.org`), which is a different machine from
|
optional Compose profile in this repo.
|
||||||
the one the agents run on.
|
|
||||||
|
|
||||||
## Why it is needed
|
## Optional Compose profile
|
||||||
|
|
||||||
Measured on 2026-08-10 from this host:
|
Do not start this on a host that already runs SearXNG — set `BRAIN_SEARCH_URL`
|
||||||
|
instead (D3).
|
||||||
|
|
||||||
- The default engine set for the `general` category is only `duckduckgo`,
|
```bash
|
||||||
`brave` and `startpage`. `brave` and `startpage` sit in
|
SEARXNG_SECRET=$(openssl rand -hex 32) docker compose --profile searxng up -d
|
||||||
`Suspended: too many requests` or `Suspended: CAPTCHA` almost permanently, so
|
|
||||||
in practice a single engine carries every query.
|
|
||||||
- About 25 probe requests over a few minutes pushed `duckduckgo` into `CAPTCHA`
|
|
||||||
as well. The instance then answered HTTP 200 with `results: []` and an empty
|
|
||||||
`unresponsive_engines` - indistinguishable from "nothing found" without the
|
|
||||||
client-side handling we added.
|
|
||||||
- Recovery took roughly six minutes.
|
|
||||||
|
|
||||||
## Changes
|
|
||||||
|
|
||||||
1. **Allow our egress IP through the limiter.** In `limiter.toml`:
|
|
||||||
|
|
||||||
```toml
|
|
||||||
[botdetection.ip_lists]
|
|
||||||
pass_ip = ["77.7.46.234"]
|
|
||||||
```
|
```
|
||||||
|
|
||||||
2. **Shorten the suspensions.** In `settings.yml` the defaults are 24 hours for
|
Pinned image: `docker.io/searxng/searxng:2026.8.10-0a118066d`.
|
||||||
a CAPTCHA and one hour for too-many-requests, which is far longer than the
|
Settings: `deploy/searxng/settings.yml` + `limiter.toml` (RFC1918 `pass_ip`,
|
||||||
condition lasts:
|
short `suspended_times`, `formats: [html, json]`). No secrets in git. Bind is
|
||||||
|
`127.0.0.1:8888`.
|
||||||
|
|
||||||
```yaml
|
## Why the client classifies empty as throttled
|
||||||
search:
|
|
||||||
suspended_times:
|
|
||||||
SearxEngineCaptcha: 300
|
|
||||||
SearxEngineTooManyRequests: 120
|
|
||||||
SearxEngineAccessDenied: 300
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Give `general` more than one working engine.** `google` and `wikipedia`
|
A default engine set under load answers HTTP 200 with `results: []` (sometimes
|
||||||
report `enabled: true` in `/config` yet never appear in a `general` response,
|
with empty `unresponsive_engines`). That is indistinguishable from "nothing
|
||||||
so they are not in the default set. Put them in it; one live engine per
|
found" unless the client refuses to call it absence.
|
||||||
category is a single point of failure.
|
|
||||||
|
|
||||||
4. **Keep the JSON API on.** `formats: [html, json]` must stay, otherwise every
|
## Instance-side levers
|
||||||
client here breaks.
|
|
||||||
|
1. **Allow the callers through the limiter** (`limiter.toml` `pass_ip`). The
|
||||||
|
Compose file uses RFC1918 only.
|
||||||
|
2. **Shorten suspensions** (`settings.yml` `search.suspended_times`) so a
|
||||||
|
CAPTCHA does not last a day.
|
||||||
|
3. **More than one engine in `general`.** One live engine is a single point of
|
||||||
|
failure. This repo enables bing, google, duckduckgo, wikipedia.
|
||||||
|
4. **Keep the JSON API on.** `formats: [html, json]` must stay.
|
||||||
|
|
||||||
## Verifying
|
## Verifying
|
||||||
|
|
||||||
Ten requests in a row used to suspend the instance for minutes. After the
|
|
||||||
change they should all answer:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
for i in $(seq 10); do
|
for i in $(seq 10); do
|
||||||
bin/web/search "test $i" -n 1 --refresh --json | jq -r .status
|
bin/web/search.go "test $i" -n 1 --refresh --json | jq -r .status
|
||||||
done
|
done
|
||||||
```
|
```
|
||||||
|
|
||||||
Ten lines of `ok` means it is fixed.
|
Ten lines of `ok` means the instance is healthy. Any `throttled` means say
|
||||||
|
nothing about whether the subject exists.
|
||||||
|
|||||||
Reference in New Issue
Block a user