Compare commits
51
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b612d3cc97 | ||
|
|
5ccca2fac9 | ||
|
|
fc2723c39f | ||
|
|
0c4bb87001 | ||
|
|
0065655e03 | ||
|
|
a331042488 | ||
|
|
f99dfea104 | ||
|
|
bae1494258 | ||
|
|
c5be3f19be | ||
|
|
a88dbb490c | ||
|
|
9d1a3f3c70 | ||
|
|
8b5be9b659 | ||
|
|
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
|
||||
.git
|
||||
.github
|
||||
lib-ladybug
|
||||
__pycache__
|
||||
*.pyc
|
||||
*.lbug
|
||||
|
||||
@@ -37,31 +37,61 @@ jobs:
|
||||
bash -n bin/db/ssh-tunnel
|
||||
bash -n bin/docker-entrypoint
|
||||
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)
|
||||
run: |
|
||||
uv run python -m unittest discover -s bin/tools -t .
|
||||
|
||||
- name: Go tests (root module, no ladybug cgo)
|
||||
- name: Go tests (root module; duckdb-go CGO via gcc, no ladybug)
|
||||
run: |
|
||||
go vet ./...
|
||||
go test ./... -count=1
|
||||
CC=gcc CXX=g++ CGO_CFLAGS= CGO_LDFLAGS= go vet ./...
|
||||
CC=gcc CXX=g++ CGO_CFLAGS= CGO_LDFLAGS= go test ./... -count=1
|
||||
|
||||
- name: brain ranking tests (no cgo / no ladybug)
|
||||
run: go test ./internal/brain/rank -count=1
|
||||
|
||||
- name: facts/audit self (lexicon consistency, no network)
|
||||
run: |
|
||||
./bin/facts/audit self 2>/dev/null || echo "audit: not yet implemented; gate skipped"
|
||||
run: ./bin/facts/audit self
|
||||
|
||||
- name: kb/eval recall gate
|
||||
- name: CGO via Zig (compile brain/search + eval)
|
||||
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
|
||||
bin/cgo/zig go build -tags 'system_ladybug,brain_eval' -o /tmp/brain-eval ./bin/brain/eval.go
|
||||
|
||||
- uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.cache/huggingface
|
||||
key: ${{ runner.os }}-hf-potion-multilingual-128M
|
||||
|
||||
- name: recall@5 SoT (Zig bin/brain/eval.go)
|
||||
run: |
|
||||
uv run python bin/kb/index --rebuild --json
|
||||
KB_ROOT="$PWD" /tmp/brain-eval --json
|
||||
|
||||
ocr:
|
||||
name: OCR (tesseract fixture)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version-file: go.mod
|
||||
- name: Install tesseract + poppler
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --no-install-recommends \
|
||||
tesseract-ocr tesseract-ocr-eng tesseract-ocr-deu poppler-utils
|
||||
- name: Go OCR tests (synthetic HELLO PNG)
|
||||
run: go test ./internal/ocr -count=1
|
||||
|
||||
release:
|
||||
name: Release (semver)
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
needs: test
|
||||
needs: [test, ocr]
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
@@ -11,3 +11,12 @@ __pycache__/
|
||||
.secrets/
|
||||
lib-ladybug/
|
||||
go.work.local
|
||||
models/
|
||||
# Purged from git history. Do not re-add.
|
||||
docs/crm-associations-proof.md
|
||||
|
||||
# mount scaffold for the 8TB volume, never part of the repo
|
||||
mnt/
|
||||
|
||||
# go build ./bin/mail/sync.go drops a binary named `sync` in cwd
|
||||
/sync
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
Evidence-first brain over the ops/eSlider stack. Facts need proof or they are
|
||||
`(not confirmed)`.
|
||||
|
||||
Read first: [PLAN](PLAN.md) → [docs](docs/).
|
||||
Read first: [PLAN](PLAN.md) → [docs](docs/) → [roadmap](docs/roadmap.md)
|
||||
(epic [#16](https://git.produktor.io/eSlider/2dph/issues/16)).
|
||||
|
||||
## Method (detective, no fork)
|
||||
|
||||
@@ -15,6 +16,9 @@ Read first: [PLAN](PLAN.md) → [docs](docs/).
|
||||
- `info` root = descriptive/narrative leafs, searchable, never asserted as fact.
|
||||
- Search is deduction: `facts` → `info` → `web-search` (second independent
|
||||
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
|
||||
|
||||
@@ -36,17 +40,23 @@ PLAN.md decisions + execution + open questions
|
||||
docs/ published docs
|
||||
skills/ in-project agent skills (vendored, no external links)
|
||||
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 add.go get.go stats.go eval.go watch.go
|
||||
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/markdown/ import.go (mistune leafs)
|
||||
bin/mail/ sync.go import.go ocr.go (index_mail → brain/index.go)
|
||||
bin/markdown/ import.go (H2 leaf split; Python bin/md/import fallback)
|
||||
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; facts D16; cli flaggy D23; chats; gitlog; websearch; reasoner; duckstats)
|
||||
bin/qa/ stats.go (DuckDB quantiles / JSONL count; gcc CGO, not Zig)
|
||||
bin/watch/ corpus watcher (used by bin/brain/watch.go)
|
||||
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/stack/ start start-assistant stop status (compose + PicoClaw agent)
|
||||
bin/docker-entrypoint container entrypoint (api: serve|search|watch; index: python)
|
||||
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)
|
||||
.venv/ ladybug + model2vec + mistune
|
||||
```
|
||||
@@ -56,38 +66,67 @@ var/ kb.lbug, var/mail/*, caches (gitignored)
|
||||
```bash
|
||||
bin/mail/sync.go --source onlyoffice,gmail --workers 8 --out var/mail # raw message.json + attachments
|
||||
bin/mail/sync.go --source gmail --query 'from:example.com' --out var/mail # Gmail search (default in:inbox)
|
||||
bin/mail/sync.go --source m365 --env ~/.config/brain/mail.env --out var/mail # Microsoft Graph (delta)
|
||||
bin/mail/import.go --from-raw var/mail # message.json → message.md (convert only)
|
||||
bin/brain/index.go --rebuild # rebuild brain incl. all mail (fresh DB)
|
||||
bin/brain/index.go --rebuild --with-facts --with-chats
|
||||
bin/stack/start-mail-sync # compose ETL: sync→import every 300s
|
||||
```
|
||||
|
||||
- `sync` (Go) downloads messages + attachments; Gmail uses paginated list +
|
||||
`body.attachmentId` (not partId) for attachments.
|
||||
`body.attachmentId` (not partId) for attachments. Sources: `onlyoffice`,
|
||||
`gmail`, `m365` (client-credentials + delta link; commit after success).
|
||||
- Compose `mail-sync` / `bin/stack/start-mail-sync`: ETL loop (default
|
||||
`onlyoffice,gmail`, 300s). On `new>0` runs import; full `--rebuild` only if
|
||||
`MAIL_SYNC_INDEX=1`. Secrets: `~/.config/brain/mail.env` + `~/.gmail-mcp`.
|
||||
Case wrappers (e.g. family `gmail-sync-la-quinta.sh`) and ai-bot
|
||||
`gmail-reauth.sh` reuse this sync/OAuth — do not fork corpus download.
|
||||
- `import` converts body + attachments to markdown. PDFs use poppler
|
||||
`pdftotext -layout` fast path (~15ms); textless/scanned PDFs fall back to
|
||||
docling (isolated subprocess — its native onnx can segfault the parent).
|
||||
Conversion never touches the brain DB (crash safety).
|
||||
- `index_mail` is a deprecation shim for `bin/brain/index.go --rebuild`. Ladybug
|
||||
corrupts its WAL when brand-new leafs are bulk-inserted while FTS/vector
|
||||
indexes exist; a fresh DB with indexes created last is the only safe path.
|
||||
`pdftotext -layout` fast path (~15ms); textless/scanned PDFs use
|
||||
`pdftoppm` + tesseract `eng+deu` (`bin/mail/ocr.go`). Optional
|
||||
`OCR_ENGINE=paddle`. Conversion never touches the brain DB (crash safety).
|
||||
- `index_mail` is a deprecation shim for `bin/brain/index.go --rebuild`. Bulk
|
||||
rebuild still deletes `var/kb.lbug` and creates FTS/HNSW last. Single-leaf
|
||||
write is `bin/brain/add.go` (safe while indexes exist; do not DROP INDEX).
|
||||
Keep conversion + indexing separate so a conversion crash can't leave the
|
||||
DB mid-transaction.
|
||||
|
||||
## Tools
|
||||
|
||||
```bash
|
||||
bin/facts/audit ["self"|"facts"|"info"|"stale"] # 2-source + staleness gate
|
||||
bin/facts/crm [--dry-run] # proof person↔company/company↔project (ooCRM × corpus SoT)
|
||||
bin/facts/audit.go ["self"|"db"|"contradict"] # 2-source + D16 adjudication
|
||||
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/brain/search.go "query" [--root facts|info] # deduction search → YAML
|
||||
bin/brain/get.go <id> [--body]
|
||||
bin/markdown/import.go [dir] # mistune leaves → YAML
|
||||
bin/brain/search.go "query" --as-of 2025-01-01 # D24 fact intervals
|
||||
bin/brain/search.go "query" --no-web # local graph only
|
||||
source <(./bin/cli/complete.go bash) # flaggy completions (D23)
|
||||
eval "$(bin/cgo/zig env)" # Zig cc + liblbug (not gcc)
|
||||
bin/brain/index.go --rebuild [--with-mail] [--with-facts] [--with-chats]
|
||||
bin/brain/add.go --text T --root facts --source "a.md x b.md" # incremental write
|
||||
bin/brain/add.go --json # stdin leaf or {leafs:[...]}
|
||||
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/stack/start # brain HTTP/MCP (reuse healthy :8630)
|
||||
bin/stack/start-assistant # + reasoner + PicoClaw agent
|
||||
bin/stack/status # YAML health
|
||||
bin/stack/stop # compose stop; volumes kept
|
||||
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/qa/stats.go # D22 DuckDB quantiles / JSONL (gcc CGO)
|
||||
bin/mail/ocr.go <image|pdf> # tesseract eng+deu (scans)
|
||||
bin/md/tables # what the graph holds → YAML
|
||||
bin/brain/deduce "question" # thinking wrapper
|
||||
```
|
||||
|
||||
Never start a shell command with `cd` — use the tool working-directory
|
||||
parameter. Search before reading whole files.
|
||||
parameter. Search before reading whole files. For YAML/JSON/XML/CSV/TOML/HCL
|
||||
prefer mikefarah/yq (`skills/yq/SKILL.md`). For bulk rows and quantiles use
|
||||
duckdb-go (`internal/duckstats`, `skills/duckdb/SKILL.md`), not Ladybug.
|
||||
|
||||
## GitHub safety rules (ABSOLUTE — never violate)
|
||||
|
||||
|
||||
+70
-16
@@ -1,5 +1,22 @@
|
||||
# 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).
|
||||
|
||||
# --- mail-sync: standalone M365/OnlyOffice/Gmail puller (pure Go, no CGO) ---
|
||||
FROM golang:1.26-bookworm AS mail-build
|
||||
WORKDIR /src
|
||||
COPY go.mod go.sum ./
|
||||
RUN go mod download
|
||||
COPY bin/mail ./bin/mail
|
||||
COPY internal ./internal
|
||||
RUN CGO_ENABLED=0 go build -o /mail-sync ./bin/mail/sync.go
|
||||
|
||||
# --- Python sidecar (Ladybug write / rebuild) ---
|
||||
FROM python:3.12-slim AS index
|
||||
|
||||
ENV PYTHONUNBUFFERED=1 \
|
||||
PYTHONDONTWRITEBYTECODE=1 \
|
||||
@@ -8,28 +25,19 @@ ENV PYTHONUNBUFFERED=1 \
|
||||
|
||||
WORKDIR /app
|
||||
RUN id -u 2dph 2>/dev/null || useradd --create-home --uid 1001 2dph
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
poppler-utils tesseract-ocr tesseract-ocr-eng tesseract-ocr-deu \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# deps layer-first: rebuild only on dependency change
|
||||
COPY requirements.lock.txt /tmp/requirements.lock.txt
|
||||
RUN python -m pip install --no-cache-dir -r /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 --from=go-build /serve /app/bin/serve
|
||||
COPY --from=go-build /watch /app/bin/watch
|
||||
RUN chmod +x /app/bin/docker-entrypoint \
|
||||
&& chown -R 2dph:2dph /app
|
||||
COPY --from=mail-build /mail-sync /app/bin/mail-sync
|
||||
USER 2dph
|
||||
|
||||
ENV PATH="/app/bin:${PATH}" \
|
||||
@@ -37,5 +45,51 @@ ENV PATH="/app/bin:${PATH}" \
|
||||
KB_ROOT=/app
|
||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
|
||||
CMD python -c "import model2vec, ladybug, mistune; print('ok')" || exit 1
|
||||
|
||||
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"]
|
||||
|
||||
@@ -4,7 +4,14 @@ A brain that loves facts and deduction. Evidence-first knowledge graph + hybrid
|
||||
RAG over the operational Brain/ops/eSlider stack. Built like Sherlock
|
||||
Holmes: nothing is asserted unless it has proof.
|
||||
|
||||
Status: **in progress** — this file is the plan and the record of decisions.
|
||||
Status: **v1 in** (epic [#16](https://git.produktor.io/eSlider/2dph/issues/16) closed).
|
||||
v2 board: milestone [v2](https://git.produktor.io/eSlider/2dph/milestone/13) —
|
||||
OCR [#6](https://git.produktor.io/eSlider/2dph/issues/6) in,
|
||||
[#29](https://git.produktor.io/eSlider/2dph/issues/29) OQ1 in,
|
||||
[#30](https://git.produktor.io/eSlider/2dph/issues/30) OQ3 in,
|
||||
[#34](https://git.produktor.io/eSlider/2dph/issues/34) D23 in,
|
||||
[#36](https://git.produktor.io/eSlider/2dph/issues/36) OQ5/D24 in.
|
||||
Gap: [docs/roadmap.md](docs/roadmap.md).
|
||||
|
||||
## What
|
||||
|
||||
@@ -26,12 +33,12 @@ 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. |
|
||||
| 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. |
|
||||
| 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. Incremental write is Python `bin/kb/add` (`bin/brain/add.go`). Bulk rebuild stays `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`). |
|
||||
| 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)`. 2-source auto-pair docker ps × compose × ssh-config × docs. |
|
||||
| D9 | facts/goal model | Who / What / How / Where / When + evidence + confidence on every edge. |
|
||||
| D10 | versioning | everything is a leaf with `sha256 + observed_at + source_rev`; `File-[:HAS_VERSION]->Commit-[:AUTHORED]->Person`. Stale = `source_rev` < git HEAD. |
|
||||
| D11 | strong/weak | `root` column: `facts` (strong) vs `info` (weak). Answer is `confirmed` only from facts root. |
|
||||
@@ -39,9 +46,15 @@ detective method: **a fact needs ≥2 independent sources or it is
|
||||
| D13 | portfolio | start graph `(Person:eslider)-[:HAS]->(Portfolio)`, associate other natural/juristic persons later. |
|
||||
| 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. |
|
||||
| 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”. |
|
||||
| D18 | reasoner | Pluggable OpenAI-compatible URL. RAM: Qwen3.5-9B. Quality: Bonsai-27B or Qwen3.6-27B. No official Qwen3.6-9B. |
|
||||
| D16 | contradictions | ≥2 yes vs ≥2 no → hypothesis → `(not confirmed)` until a rule fires. Order: **temporal_freshness** (fresh ≥2 vs stale minority), then **authority_pairing** (runtime/config A×B beats narrative C). Store as `a x b vs c x d` on hypothesis leafs. `bin/facts/audit contradict`. [#29](https://git.produktor.io/eSlider/2dph/issues/29). |
|
||||
| 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 (`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 compose profile `picoclaw`; tools are `search`/`get`/`audit`. Weights are not copied into the 2dph image. Agent lever/loop: [#15](https://git.produktor.io/eSlider/2dph/issues/15). |
|
||||
| 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`/`ingest`). |
|
||||
| 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`. |
|
||||
| D22 | analytics | **duckdb-go** in-process (`internal/duckstats`, `bin/qa/stats.go`) for quantiles/JSONL. Links with **gcc/g++**, not Zig. Ladybug stays the graph; web-search cache stays modernc sqlite. Slice small structured docs with **mikefarah/yq**, not kislyuk/jq. [#30](https://git.produktor.io/eSlider/2dph/issues/30). |
|
||||
| D23 | CLI | **flaggy** (`github.com/integrii/flaggy`, 0 deps). Flags at any position. Wrapper `internal/cli`. Bash complete: `source <(./bin/cli/complete.go bash)`. No cobra, no stdlib `flag` in Go tools. Search does not intercept the word `completion`. [#34](https://git.produktor.io/eSlider/2dph/issues/34). |
|
||||
| D24 | fact intervals | Leaf `valid_from` / `valid_to` (YYYY-MM-DD, inclusive; empty = open/legacy). Search `--as-of` / MCP `as_of` keeps facts active that day. Not D16 `temporal_freshness` (source stale vs HEAD). Empty interval = always visible. [#36](https://git.produktor.io/eSlider/2dph/issues/36). |
|
||||
|
||||
## Architecture
|
||||
|
||||
@@ -49,23 +62,32 @@ detective method: **a fact needs ≥2 independent sources or it is
|
||||
2dph/
|
||||
PLAN.md / AGENTS.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/
|
||||
facts/extract auto-pair 2 sources → lexicon yaml + graph
|
||||
facts/audit ["self"|"facts"|"info"|"stale"] 2-source + staleness gate
|
||||
kb/index Python write path (called by bin/brain/index.go)
|
||||
facts/extract.go audit.go crm.go # D14 shebang; Python implementation
|
||||
kb/index Python bulk write (called by bin/brain/index.go)
|
||||
kb/add Python incremental write (called by bin/brain/add.go)
|
||||
brain/index.go rebuild FTS + HNSW (incl. --with-mail)
|
||||
brain/get.go stats.go eval.go watch.go
|
||||
brain/search.go deduction: facts → info → web-search
|
||||
brain/serve.go HTTP API (internal/httpapi)
|
||||
brain/add.go incremental leaf write (no rebuild)
|
||||
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
|
||||
cli/complete.go flaggy bash/zsh/fish complete (D23)
|
||||
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)
|
||||
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)
|
||||
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
|
||||
(libs in internal/chats; no chats index)
|
||||
mail/ocr.go tesseract eng+deu (pdftoppm scans)
|
||||
md/import (deprecated; bin/markdown/import.go)
|
||||
brain/extract brain/audit brain/deduce (thinking wrapper)
|
||||
web/search (vendored)
|
||||
stack/start start-assistant start-mail-sync stop status
|
||||
web/search (deprecated shim → web/search.go)
|
||||
db/psql-yq (vendored)
|
||||
ssh-tunnel onlyoffice pg tunnel 5433
|
||||
var/kb.lbug single embedded store (gitignored)
|
||||
@@ -76,10 +98,14 @@ detective method: **a fact needs ≥2 independent sources or it is
|
||||
|
||||
Node tables: `Person, Service, Host, Container, Repo, File, Commit, Leaf`.
|
||||
`Leaf(embedding FLOAT[N])` — FTS on `text`, HNSW vector index on `embedding`.
|
||||
Edges: `RUNS / USES / HAS_VERSION / AUTHORED / ABOUT / ASSOCIATED / SIMILAR_0.85`.
|
||||
Edges: `RUNS / USES / FROM_FILE / HAS_VERSION / AUTHORED / ABOUT / ASSOCIATED / SIMILAR_0.85`.
|
||||
`FROM_FILE` / `HAS_VERSION` / `AUTHORED`: `bin/brain/search.go --hop N` walks
|
||||
them from each hit (1=File, 2=Commit, 3=Person). Rebuild writes
|
||||
`Leaf-[:FROM_FILE]->File`; git import writes the rest.
|
||||
|
||||
Common props on every node/edge: `root`, `confidence`, `evidence[]`, `how`,
|
||||
`where`, `when`, `source_rev`.
|
||||
`where`, `when`, `source_rev`. Leaf interval of truth (D24): `valid_from`,
|
||||
`valid_to`.
|
||||
|
||||
## Config
|
||||
|
||||
@@ -94,32 +120,43 @@ Common props on every node/edge: `root`, `confidence`, `evidence[]`, `how`,
|
||||
|
||||
- `bin/{subject}/{method}` — line 2 is a usage comment (mirrors `psql-yq`).
|
||||
- bash + python primary; golang via Go shebang when a compiled helper is right.
|
||||
- YAML default output, `--json` for machines. Slice with `yq`.
|
||||
- YAML default output, `--json` for machines. Slice with mikefarah/yq.
|
||||
- Everything that touches the network / DB is read-only, throttled, cached.
|
||||
- Tests (TDD) gate every commit; `gh` + CI/CD on every push.
|
||||
|
||||
## Open questions (v2)
|
||||
|
||||
- OQ1: mutually-contradicting evidence — how to resolve (authority weighting,
|
||||
temporal freshness, audit adjudication).
|
||||
- OQ2: OCR pipeline for pdfs/images/docs — mostly solved: poppler pdftotext
|
||||
fast-path for born-digital PDFs, docling fallback for the ~5% textless ones.
|
||||
- OQ3: optional duckdb-md layer for `SELECT … FORMAT MARKDOWN` export/write-back.
|
||||
- OQ1: **in** — D16 adjudication: `temporal_freshness` then `authority_pairing`.
|
||||
Unresolved 2v2 stays hypothesis. [#29](https://git.produktor.io/eSlider/2dph/issues/29).
|
||||
- OQ2: OCR — **in**. `pdftotext -layout` first; scans `pdftoppm` + tesseract
|
||||
`eng+deu` (`bin/mail/ocr.go`, `internal/ocr`). No gocv, no gosseract CGO
|
||||
(D21 Zig owns Ladybug CGO). Optional `OCR_ENGINE=paddle` / compose profile
|
||||
`ocr-paddle`. Docling left the default path. [#6](https://git.produktor.io/eSlider/2dph/issues/6).
|
||||
- OQ3: **in** — duckdb-go (`internal/duckstats`, `bin/qa/stats.go`) for
|
||||
quantiles / JSONL count. Not a second graph. [#30](https://git.produktor.io/eSlider/2dph/issues/30).
|
||||
- OQ4: YAML-first storage for leafs — deferred: JSON is ~10x faster to
|
||||
serialize and unambiguous; YAML only where humans edit files.
|
||||
- OQ5: **in** — fact `valid_from` / `valid_to` + `--as-of` / MCP `as_of` (D24).
|
||||
Not D16 `temporal_freshness`. [#36](https://git.produktor.io/eSlider/2dph/issues/36).
|
||||
|
||||
## Mail pipeline (done)
|
||||
|
||||
1. `bin/mail/sync.go` (Go, 8 workers) — paginated Gmail/OnlyOffice download.
|
||||
Gmail attachments key off `body.attachmentId`, not MIME `partId`.
|
||||
1. `bin/mail/sync.go` (Go, 8 workers) — paginated Gmail / OnlyOffice / M365
|
||||
Graph download. Gmail attachments key off `body.attachmentId`, not MIME
|
||||
`partId`. M365 uses client-credentials + delta link (commit after success).
|
||||
2. `bin/mail/import.go --from-raw` — message.json → message.md; PDFs via
|
||||
`pdftotext -layout` (~15ms) with docling subprocess fallback; ICS sidecars
|
||||
`pdftotext -layout` (~15ms); textless/scanned PDFs `pdftoppm` + tesseract
|
||||
`eng+deu`. ICS sidecars
|
||||
Latin-1→UTF-8 normalized.
|
||||
3. `bin/brain/index.go --rebuild` — fresh rebuild (repo corpus + mail) because ladybug
|
||||
corrupts its WAL on bulk-insert into an already-indexed DB. Conversion and
|
||||
indexing stay separate for crash safety. `bin/mail/index_mail` is a
|
||||
deprecation shim.
|
||||
4. Result: 17,835 messages → 28,918 info leafs, FTS + HNSW healthy, searchable
|
||||
4. Compose `mail-sync` / `bin/stack/start-mail-sync` — ETL loop (default
|
||||
`onlyoffice,gmail`, 300s): sync → import on `new>0`; full rebuild only if
|
||||
`MAIL_SYNC_INDEX=1`. Bot digests (ai-bot) and case wrappers reuse sync/OAuth;
|
||||
they do not replace the corpus path.
|
||||
5. Result: 17,835 messages → 28,918 info leafs, FTS + HNSW healthy, searchable
|
||||
via `bin/brain/search.go`.
|
||||
|
||||
## CI/CD pipeline (D15)
|
||||
@@ -129,9 +166,10 @@ Common props on every node/edge: `root`, `confidence`, `evidence[]`, `how`,
|
||||
1. go vet + go test ./... (root module; packages without ladybug cgo)
|
||||
2. `go test ./internal/brain/rank` (cgo-free ranking + flag parser)
|
||||
3. python -m unittest discover -s bin/tools (includes published-docs SoT)
|
||||
4. bin/facts/audit self (lexicon internal consistency)
|
||||
5. bin/brain/eval.go (recall@5 ≥ 0.95, gates index regressions)
|
||||
6. md-docs build/lint if docs tooling arrives.
|
||||
4. `bin/facts/audit self` (lexicon internal consistency; `bin/facts/audit.go` is the D14 wrapper)
|
||||
5. `bin/brain/eval.go` via Zig (recall@5 ≥ 0.95). Python `bin/kb/eval` is an
|
||||
explicit fallback, not the CI SoT.
|
||||
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
|
||||
`db/tech-poc`: contract first where there is an OpenAPI/message shape.
|
||||
@@ -140,9 +178,26 @@ Feedback loop: every commit → PR → CI → green/gate → merge. Same discipl
|
||||
|
||||
1. scaffold repo (:done after this file + AGENTS.md + .gitignore + 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
|
||||
5. schema + tools with TDD (kb + md + facts + brain)
|
||||
6. ~/.config/brain config
|
||||
7. corpus extraction (facts/info)
|
||||
7. corpus extraction (facts/info) — **in**: [#18](https://git.produktor.io/eSlider/2dph/issues/18)
|
||||
8. verify: web-search smoke, onlyoffice pg, md-db round-trip, eval, audit
|
||||
|
||||
## Gap to v1 (epic #16)
|
||||
|
||||
Remaining: none for epic #16 (v1). Board:
|
||||
[epic #16](https://git.produktor.io/eSlider/2dph/issues/16),
|
||||
milestone [v1 detective brain](https://git.produktor.io/eSlider/2dph/milestone/12).
|
||||
Narrative: [docs/roadmap.md](docs/roadmap.md).
|
||||
|
||||
| Order | Issue | Gap |
|
||||
|-------|-------|-----|
|
||||
| 1 | [#14](https://git.produktor.io/eSlider/2dph/issues/14) | **in** — `bin/brain/add.go` / `POST /ingest` write facts+info without deleting `kb.lbug`. Bulk corpus still `--rebuild`. Leftover Python (mail/facts) is not the living-graph blocker. |
|
||||
| 2 | [#17](https://git.produktor.io/eSlider/2dph/issues/17) | **in** — `--hop N` walks `FROM_FILE` → `HAS_VERSION` → `AUTHORED` (max 3). |
|
||||
| 3 | [#18](https://git.produktor.io/eSlider/2dph/issues/18) | **in** — `--with-facts` / `--facts-json` land `root=facts`; `--with-chats` indexes `var/chats/md`. WhatsApp sync is out of v1. |
|
||||
| 4 | [#15](https://git.produktor.io/eSlider/2dph/issues/15) | **in** — lever/loop documented (`search` → `get` → `audit`). |
|
||||
| 5 | [#19](https://git.produktor.io/eSlider/2dph/issues/19) | **in** — CI recall SoT is `bin/brain/eval.go` via Zig. Python `bin/kb/eval` stays as an explicit fallback. |
|
||||
|
||||
Does **not** block epic close: OQ4. OCR [#6](https://git.produktor.io/eSlider/2dph/issues/6), OQ1 [#29](https://git.produktor.io/eSlider/2dph/issues/29), OQ3 [#30](https://git.produktor.io/eSlider/2dph/issues/30) are **in**.
|
||||
@@ -7,14 +7,16 @@
|
||||
[](https://github.com/eSlider/2dph/releases)
|
||||
[](https://github.com/eSlider/2dph/stargazers)
|
||||
|
||||
An evidence-first brain over the operational eSlider stack. **Facts need two
|
||||
independent sources, or they are `(not confirmed)`.**
|
||||
An evidence-first brain. **Facts need two independent sources, or they are
|
||||
`(not confirmed)`.** Cursor is not the runtime.
|
||||
|
||||
`2dph` is a single embedded knowledge graph (LadybugDB = Kuzu successor) with
|
||||
native **HNSW vector** + **BM25 full-text** indexes, built from markdown,
|
||||
compose files, ssh config, docker state, and git history. Search is
|
||||
*deduction*: confirmed facts first, supporting info second, `web-search` as
|
||||
the independent second source when the local graph cannot confirm.
|
||||
`2dph` is a single embedded knowledge graph (LadybugDB) with native **HNSW
|
||||
vector** + **BM25 full-text** indexes. Search is *deduction*: confirmed facts
|
||||
first, supporting info second, `web-search` as 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
|
||||
|
||||
@@ -28,10 +30,10 @@ graph TB
|
||||
end
|
||||
|
||||
subgraph dph["2dph tools"]
|
||||
EX["bin/facts/extract<br/>2-source pairing"]
|
||||
AU["bin/facts/audit<br/>confidence + staleness"]
|
||||
EX["bin/facts/extract.go<br/>2-source pairing"]
|
||||
AU["bin/facts/audit.go<br/>confidence + staleness"]
|
||||
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"]
|
||||
end
|
||||
|
||||
@@ -74,7 +76,7 @@ graph TB
|
||||
## The method
|
||||
|
||||
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)`.**
|
||||
|
||||
| root | meaning | used for answers |
|
||||
@@ -85,72 +87,106 @@ fact; conflicting sources or a single source → `hypothesis` → `(not confirme
|
||||
## Deduction search
|
||||
|
||||
```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 "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/stats.go # index health
|
||||
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 N` walks File/Commit/Person from each hit (max 3). `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):
|
||||
|
||||
```bash
|
||||
bin/mail/sync.go --source onlyoffice,gmail --workers 8 --out var/mail # raw sync (Go)
|
||||
bin/mail/sync.go --source m365 --env ~/.config/brain/mail.env # Microsoft 365 Graph
|
||||
bin/stack/start-mail-sync # compose ETL (300s; no auto-rebuild)
|
||||
bin/mail/import.go --from-raw var/mail # JSON → markdown
|
||||
bin/brain/add.go --text T --root facts --source "a.md x b.md"
|
||||
bin/brain/index.go --rebuild --with-facts --with-chats # facts extract + chats md
|
||||
bin/brain/index.go --rebuild # rebuild brain (incl. mail)
|
||||
bin/brain/search.go "invoice from last week" # same search over mail leafs
|
||||
```
|
||||
|
||||
## Storage
|
||||
|
||||
- **LadybugDB** — single `var/kb.lbug`, Cypher property graph, HNSW + BM25
|
||||
in one engine, embedded (no server), ACID, read-only-safe for concurrent
|
||||
readers. **Never `DROP INDEX` FTS/VECTOR** on Ladybug 0.19: DROP leaves
|
||||
ghost catalog tables (`_0_Leaf_vec_UPPER`) so recreate fails while
|
||||
`SHOW_INDEXES` omits HNSW. Fresh indexes = delete `var/kb.lbug` +
|
||||
`bin/brain/index.go --rebuild`. Use `ensure_indexes()` after upserts.
|
||||
- **model2vec** — `potion-multilingual-128M` static embeddings (256-dim),
|
||||
CPU-fast, deterministic, no Ollama runtime dependency.
|
||||
- facts and info split semantically by `root` column but written inside the
|
||||
same transaction.
|
||||
- **LadybugDB** — single `var/kb.lbug`, Cypher + HNSW + BM25, embedded.
|
||||
Read tools (`get` / `stats` / `eval`) are Go + Zig CGO (`bin/cgo/zcc`).
|
||||
Python fallbacks stay for CI until the runner fetches Zig. Incremental
|
||||
write is `bin/brain/add.go` (Python `kblib.add_leafs`). Bulk rebuild is
|
||||
Compose profile `index` (`bin/brain/index.go --rebuild`).
|
||||
- **model2vec** — `potion-multilingual-128M` (256-dim), CPU, no Ollama
|
||||
runtime dependency.
|
||||
- facts and info split by `root` but written in the same transaction.
|
||||
|
||||
Ladybug 0.19 DROP INDEX warning: [docs/runbook.md](docs/runbook.md).
|
||||
|
||||
## Tooling conventions
|
||||
|
||||
`bin/{subject}/{method}.go` — self-describing: shebang on line 1, usage comment
|
||||
from line 2. Shared code in `internal/`. YAML default output, `--json` for
|
||||
machines. Tests gate every commit. HTTP: `bin/brain/serve.go` (default search
|
||||
binary `var/bin/brain-search`, not Python).
|
||||
machines. Tests gate every commit. HTTP: `bin/brain/serve.go` calls
|
||||
`internal/brain` in-process (`/health` `/search` `/get` `/stats` `/audit` `/ingest` `/openapi.json` `/mcp`).
|
||||
|
||||
## Development
|
||||
|
||||
See the portable runbook: [docs/runbook.md](docs/runbook.md).
|
||||
|
||||
```bash
|
||||
uv venv .venv # Python 3.12, uv-managed
|
||||
uv pip install -r requirements.lock.txt # pinned toolchain
|
||||
bin/facts/audit self # lexicon consistency gate
|
||||
go test ./... && python -m unittest discover -s bin/tools -t .
|
||||
uv venv .venv
|
||||
uv pip install -r requirements.lock.txt
|
||||
bin/facts/audit.go self
|
||||
go test ./... && uv run python -m unittest discover -s bin/tools -t .
|
||||
```
|
||||
|
||||
Docker (optional, cached model + var volumes):
|
||||
|
||||
```bash
|
||||
docker compose run --rm brain index # (re)index corpus
|
||||
docker compose run --rm brain search "query" # one-shot query
|
||||
docker compose run --rm brain serve # bin/brain/serve.go
|
||||
bin/stack/start # brain HTTP/MCP :8630
|
||||
bin/stack/start-assistant # + qwen3.5:9b + PicoClaw agent
|
||||
bin/stack/status
|
||||
bin/stack/stop
|
||||
docker compose up -d brain # API (Zig CGO serve :8630)
|
||||
docker compose --profile index run --rm index # Python Ladybug rebuild
|
||||
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
|
||||
```
|
||||
|
||||
## Related
|
||||
|
||||
eSlider DevOps engineer practice: ops, OnlyOffice, and mail feed the facts
|
||||
root through `bin/facts/extract` (two-source pairing).
|
||||
|
||||
- [go-second-brain](https://github.com/eSlider/go-second-brain) — the earlier
|
||||
Neo4j + Qdrant + Matrix RAG brain
|
||||
- [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
|
||||
|
||||
Work board (issues): [git.produktor.io/eSlider/2dph/issues](https://git.produktor.io/eSlider/2dph/issues).
|
||||
Work board (issues): [epic #16](https://git.produktor.io/eSlider/2dph/issues/16)
|
||||
on [git.produktor.io/eSlider/2dph/issues](https://git.produktor.io/eSlider/2dph/issues).
|
||||
PRs and CI: GitHub [`eSlider/2dph`](https://github.com/eSlider/2dph).
|
||||
|
||||
See [PLAN.md](PLAN.md) for decisions, execution status, and v2 open questions.
|
||||
See [PLAN.md](PLAN.md) for decisions, [docs/roadmap.md](docs/roadmap.md) for
|
||||
the gap to v1, and v2 open questions.
|
||||
|
||||
Executable
+21
@@ -0,0 +1,21 @@
|
||||
//usr/bin/env go run -tags=brain_add "$0" "$@"; exit
|
||||
//go:build brain_add
|
||||
//
|
||||
// bin/brain/add.go - incremental leaf write (Python kblib, no rebuild).
|
||||
//
|
||||
// ./bin/brain/add.go --text T --root facts --source "a.md x b.md"
|
||||
// ./bin/brain/add.go --json
|
||||
//
|
||||
// D6: write stays Python. Does not delete var/kb.lbug.
|
||||
// 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/kb/add", os.Args[1:]))
|
||||
}
|
||||
+6
-4
@@ -1,20 +1,22 @@
|
||||
//usr/bin/env go run -tags=brain_eval "$0" "$@"; exit
|
||||
//go:build brain_eval
|
||||
//usr/bin/env go run -tags=system_ladybug,brain_eval "$0" "$@"; exit
|
||||
//go:build cgo && system_ladybug && brain_eval
|
||||
//
|
||||
// bin/brain/eval.go - recall@5 gate.
|
||||
//
|
||||
// ./bin/brain/eval.go
|
||||
// ./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.
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/eSlider/2dph/internal/cmdbin"
|
||||
"github.com/eSlider/2dph/internal/brain"
|
||||
)
|
||||
|
||||
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
|
||||
//go:build brain_get
|
||||
//usr/bin/env go run -tags=system_ladybug,brain_get "$0" "$@"; exit
|
||||
//go:build cgo && system_ladybug && brain_get
|
||||
//
|
||||
// bin/brain/get.go - read one leaf by id.
|
||||
//
|
||||
// ./bin/brain/get.go <id>
|
||||
// ./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.
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/eSlider/2dph/internal/cmdbin"
|
||||
"github.com/eSlider/2dph/internal/brain"
|
||||
)
|
||||
|
||||
func main() {
|
||||
os.Exit(cmdbin.ExecFile("bin/kb/get", os.Args[1:]))
|
||||
os.Exit(brain.MainGet(os.Args[1:]))
|
||||
}
|
||||
|
||||
+3
-3
@@ -3,12 +3,12 @@
|
||||
//
|
||||
// bin/brain/index.go - rebuild the Ladybug graph (Python write path).
|
||||
//
|
||||
// ./bin/brain/index.go --rebuild
|
||||
// ./bin/brain/index.go --rebuild --with-facts --with-chats
|
||||
// ./bin/brain/index.go --rebuild --with-mail
|
||||
// ./bin/brain/index.go --dry-run --with-mail
|
||||
//
|
||||
// v1 write is always a rebuild when mail is included (live FTS/HNSW + bulk
|
||||
// insert corrupts Ladybug 0.19 WAL). `add` is v2.
|
||||
// v1 write: bin/brain/add.go for one/few leafs (indexes may already exist).
|
||||
// Bulk mail/corpus still --rebuild (fresh file, indexes last).
|
||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||
package main
|
||||
|
||||
|
||||
+2
-2
@@ -3,11 +3,11 @@
|
||||
//
|
||||
// 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] [--hop N] [--json] [--no-web]
|
||||
// ./bin/brain/search.go serve [port]
|
||||
// ./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.
|
||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||
package main
|
||||
|
||||
+14
-6
@@ -1,18 +1,23 @@
|
||||
//usr/bin/env go run -tags=brain_serve "$0" "$@"; exit
|
||||
//go:build brain_serve
|
||||
//usr/bin/env go run -tags=brain_serve,system_ladybug "$0" "$@"; exit
|
||||
//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_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.
|
||||
package main
|
||||
|
||||
import (
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/eSlider/2dph/internal/brain"
|
||||
"github.com/eSlider/2dph/internal/httpapi"
|
||||
)
|
||||
|
||||
@@ -22,5 +27,8 @@ func main() {
|
||||
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
|
||||
//go:build brain_stats
|
||||
//usr/bin/env go run -tags=system_ladybug,brain_stats "$0" "$@"; exit
|
||||
//go:build cgo && system_ladybug && brain_stats
|
||||
//
|
||||
// bin/brain/stats.go - index health.
|
||||
//
|
||||
// ./bin/brain/stats.go
|
||||
// ./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.
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/eSlider/2dph/internal/cmdbin"
|
||||
"github.com/eSlider/2dph/internal/brain"
|
||||
)
|
||||
|
||||
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 "$@"
|
||||
+3
-2
@@ -29,10 +29,11 @@ func main() {
|
||||
case "linkedin":
|
||||
os.Exit(chats.RunSyncLinkedIn(args))
|
||||
case "whatsapp":
|
||||
fmt.Fprintln(os.Stderr, "chats: WhatsApp not implemented yet")
|
||||
fmt.Fprintln(os.Stderr, "chats: WhatsApp sync is out of v1")
|
||||
os.Exit(1)
|
||||
case "help", "-h", "--help":
|
||||
fmt.Fprintln(os.Stderr, `usage: bin/chats/sync.go telegram|linkedin [flags]`)
|
||||
fmt.Fprintln(os.Stderr, `usage: bin/chats/sync.go telegram|linkedin [flags]
|
||||
WhatsApp sync is out of v1.`)
|
||||
return
|
||||
default:
|
||||
fmt.Fprintf(os.Stderr, "chats: unknown platform %q\n", platform)
|
||||
|
||||
Executable
+91
@@ -0,0 +1,91 @@
|
||||
//usr/bin/env go run "$0" "$@"; exit
|
||||
//
|
||||
// bin/cli/complete.go - dump flaggy shell completions for all Go shebang tools (D23).
|
||||
//
|
||||
// source <(./bin/cli/complete.go bash)
|
||||
// ./bin/cli/complete.go zsh|fish|powershell|nushell
|
||||
//
|
||||
// Search does not steal the word "completion"; this binary dumps scripts.
|
||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
mailsync "github.com/eSlider/2dph/bin/mail/sync"
|
||||
"github.com/eSlider/2dph/internal/brain/rank"
|
||||
"github.com/eSlider/2dph/internal/chats"
|
||||
"github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/eSlider/2dph/internal/gitlog"
|
||||
"github.com/eSlider/2dph/internal/mdleaves"
|
||||
"github.com/eSlider/2dph/internal/ocr"
|
||||
"github.com/eSlider/2dph/internal/reasoner"
|
||||
"github.com/eSlider/2dph/internal/websearch"
|
||||
"github.com/integrii/flaggy"
|
||||
)
|
||||
|
||||
func tools() []cli.Tool {
|
||||
return []cli.Tool{
|
||||
{Path: "bin/brain/search.go", Name: "brain-search", New: rank.Parser},
|
||||
{Path: "bin/brain/get.go", Name: "brain-get", New: func() *flaggy.Parser {
|
||||
o := rank.GetOptions{}
|
||||
return rank.GetParser(&o)
|
||||
}},
|
||||
{Path: "bin/brain/stats.go", Name: "brain-stats", New: rank.StatsParser},
|
||||
{Path: "bin/brain/eval.go", Name: "brain-eval", New: rank.EvalParser},
|
||||
{Path: "bin/web/search.go", Name: "web-search", New: websearch.Parser},
|
||||
{Path: "bin/git/import.go", Name: "git-import", New: gitlog.Parser},
|
||||
{Path: "bin/markdown/import.go", Name: "markdown-import", New: mdleaves.Parser},
|
||||
{Path: "bin/qa/stats.go", Name: "qa-stats", New: cli.QAParser},
|
||||
{Path: "bin/reasoner/bakeoff.go", Name: "reasoner-bakeoff", New: reasoner.Parser},
|
||||
{Path: "bin/mail/ocr.go", Name: "mail-ocr", New: ocr.Parser},
|
||||
{Path: "bin/mail/sync.go", Name: "mail-sync", New: mailsync.Parser},
|
||||
{Path: "bin/chats/sync.go", Name: "chats-sync", New: chats.SyncParser},
|
||||
{Path: "bin/chats/import.go", Name: "chats-import", New: chats.ImportParser},
|
||||
{Path: "bin/chats/facts.go", Name: "chats-facts", New: chats.FactsParser},
|
||||
{Path: "bin/chats/apply.go", Name: "chats-apply", New: chats.ApplyParser},
|
||||
}
|
||||
}
|
||||
|
||||
func main() {
|
||||
os.Exit(run(os.Args[1:]))
|
||||
}
|
||||
|
||||
func run(args []string) int {
|
||||
shell := "bash"
|
||||
if len(args) > 0 {
|
||||
switch args[0] {
|
||||
case "bash", "zsh", "fish", "powershell", "nushell":
|
||||
shell = args[0]
|
||||
case "-h", "--help", "help":
|
||||
fmt.Fprintln(os.Stderr, "usage: bin/cli/complete.go [bash|zsh|fish|powershell|nushell]")
|
||||
return 0
|
||||
default:
|
||||
fmt.Fprintf(os.Stderr, "cli/complete: unknown shell %q\n", args[0])
|
||||
return 2
|
||||
}
|
||||
}
|
||||
if shell == "bash" {
|
||||
fmt.Print(cli.BashScript(tools()))
|
||||
return 0
|
||||
}
|
||||
var b strings.Builder
|
||||
for _, t := range tools() {
|
||||
p := t.New()
|
||||
p.Name = t.Name
|
||||
switch shell {
|
||||
case "zsh":
|
||||
b.WriteString(flaggy.GenerateZshCompletion(p))
|
||||
case "fish":
|
||||
b.WriteString(flaggy.GenerateFishCompletion(p))
|
||||
case "powershell":
|
||||
b.WriteString(flaggy.GeneratePowerShellCompletion(p))
|
||||
case "nushell":
|
||||
b.WriteString(flaggy.GenerateNushellCompletion(p))
|
||||
}
|
||||
}
|
||||
fmt.Print(b.String())
|
||||
return 0
|
||||
}
|
||||
+41
-7
@@ -1,13 +1,11 @@
|
||||
#!/usr/bin/env bash
|
||||
# bin/docker-entrypoint - run 2dph tools inside the container.
|
||||
#
|
||||
# brain shell (default)
|
||||
# brain search <q> bin/brain/search.go
|
||||
# brain index bin/kb/index --with-mail
|
||||
# brain watch <dir> compiled /app/bin/watch (bin/brain/watch.go)
|
||||
# brain serve compiled /app/bin/serve (bin/brain/serve.go)
|
||||
# brain extract bin/facts/extract (docker×compose pairing)
|
||||
# brain audit bin/facts/audit
|
||||
# API image (Zig CGO binaries):
|
||||
# serve | search | watch
|
||||
# Index image (Python write path, compose profile `index`):
|
||||
# index | extract | audit | search (deprecated python wrapper)
|
||||
# mail-sync [N] ETL loop: sync -> import; optional index (default 300s)
|
||||
#
|
||||
# Usage comment starts at line 2 (self-describing convention).
|
||||
set -euo pipefail
|
||||
@@ -15,6 +13,20 @@ set -euo pipefail
|
||||
CMD="${1:-shell}"
|
||||
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
|
||||
shell) exec bash ;;
|
||||
search) exec "$KB_PY" /app/bin/kb/search "$@" ;;
|
||||
@@ -23,5 +35,27 @@ case "$CMD" in
|
||||
serve) exec /app/bin/serve "$@" ;;
|
||||
extract) exec "$KB_PY" /app/bin/facts/extract "$@" ;;
|
||||
audit) exec "$KB_PY" /app/bin/facts/audit "$@" ;;
|
||||
mail-sync)
|
||||
# ETL: pull mail, convert to md when new>0. Full --rebuild is opt-in
|
||||
# (MAIL_SYNC_INDEX=1) — ~29k leaf rebuild is minutes, not a 10s loop.
|
||||
interval="${1:-300}"
|
||||
[ "$interval" -gt 0 ] 2>/dev/null || interval=300
|
||||
: "${MAIL_SYNC_ENV:=/secret/mail.env}"
|
||||
: "${MAIL_SYNC_SRC:=onlyoffice,gmail}"
|
||||
: "${MAIL_SYNC_OUT:=/app/var/mail}"
|
||||
: "${MAIL_SYNC_INDEX:=0}"
|
||||
while true; do
|
||||
out="$("/app/bin/mail-sync" --source "$MAIL_SYNC_SRC" --env "$MAIL_SYNC_ENV" --out "$MAIL_SYNC_OUT" 2>&1)" || true
|
||||
echo "$out"
|
||||
new="$(printf '%s\n' "$out" | sed -n 's/.*new=\([0-9]*\).*/\1/p' | tail -1)"
|
||||
if [ -n "$new" ] && [ "$new" -gt 0 ] 2>/dev/null; then
|
||||
"$KB_PY" /app/bin/mail/import --from-raw "$MAIL_SYNC_OUT" 2>&1 | tail -1
|
||||
if [ "$MAIL_SYNC_INDEX" = "1" ]; then
|
||||
"$KB_PY" /app/bin/kb/index --rebuild --with-mail 2>&1 | tail -1
|
||||
fi
|
||||
fi
|
||||
sleep "$interval"
|
||||
done
|
||||
;;
|
||||
*) echo "unknown command: $CMD" >&2; exit 2 ;;
|
||||
esac
|
||||
|
||||
+45
-18
@@ -1,14 +1,15 @@
|
||||
#!/usr/bin/env python3
|
||||
"""facts/audit - evidence & lexicon checks for the 2dph brain.
|
||||
|
||||
bin/facts/audit self # lexicon: every fact in db has >=2 sources
|
||||
bin/facts/audit db # evidence gate: run against var/kb.lbug
|
||||
bin/facts/audit self # lexicon: docs + two-source rule
|
||||
bin/facts/audit db # evidence gate against var/kb.lbug
|
||||
bin/facts/audit contradict # D16 adjudication (JSON claim(s) on stdin)
|
||||
|
||||
`self` mode checks the repo itself (no network, no runtime deps). It greps
|
||||
for known-good two-source pairings and confirms the docs are consistent.
|
||||
`db` mode loads every Leaf with root=facts and asserts each has source_rev
|
||||
and a non-empty `loc` (the "where did you see it" evidence pointer) and that
|
||||
'confirmed' facts carry a two-source `source` field.
|
||||
`self` mode checks the repo itself (no network, no runtime deps).
|
||||
`db` mode loads every Leaf with root=facts. Confirmed facts need ` x `;
|
||||
hypothesis contradictions need `a x b vs c x d` (both sides ≥2).
|
||||
`contradict` applies temporal_freshness then authority_pairing; ≥2 vs ≥2
|
||||
with no rule stays hypothesis / `(not confirmed)`.
|
||||
|
||||
Exit 0 = all checks pass, 1 = audit failures, 2 = could not evaluate.
|
||||
"""
|
||||
@@ -22,6 +23,8 @@ from pathlib import Path
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
sys.path.insert(0, str(ROOT / "bin" / "tools"))
|
||||
|
||||
from contradict import adjudicate, check_fact_row # noqa: E402
|
||||
|
||||
|
||||
def audit_db() -> list[str]:
|
||||
from kblib import connect
|
||||
@@ -33,14 +36,8 @@ def audit_db() -> list[str]:
|
||||
r = conn.execute("MATCH (l:Leaf {root:'facts'}) RETURN l.id, l.source, l.loc, l.how, l.confidence")
|
||||
problems: list[str] = []
|
||||
for lid, source, loc, how, conf in r.get_all():
|
||||
if conf != "confirmed":
|
||||
problems.append(f"{lid}: facts require confidence='confirmed', got '{conf}'")
|
||||
if not source or " x " not in source:
|
||||
problems.append(f"{lid}: needs 2-source evidence in source, got '{source}'")
|
||||
if not loc:
|
||||
problems.append(f"{lid}: missing loc (evidence pointer)")
|
||||
if not how:
|
||||
problems.append(f"{lid}: missing how")
|
||||
problems.extend(check_fact_row(str(lid), str(source or ""), str(loc or ""),
|
||||
str(how or ""), str(conf or "")))
|
||||
conn.close()
|
||||
db.close()
|
||||
return problems
|
||||
@@ -54,20 +51,50 @@ def audit_self() -> list[str]:
|
||||
problems.append("PLAN.md missing recall@5 gate")
|
||||
if re.search(r"(?i)facts must have.*2 sources|2.source", plan) is None:
|
||||
problems.append("PLAN.md missing the two-source evidence rule for facts")
|
||||
if "temporal_freshness" not in plan or "authority_pairing" not in plan:
|
||||
problems.append("PLAN.md missing D16 adjudication rules")
|
||||
if re.search(r"(?i)HNSW|BM25|deduction", (ROOT / "README.md").read_text()) is None:
|
||||
problems.append("README.md missing search/retrieval description")
|
||||
return problems
|
||||
|
||||
|
||||
def audit_contradict(raw: str) -> tuple[list[str], list[dict]]:
|
||||
raw = raw.strip()
|
||||
if not raw:
|
||||
return ["contradict: empty stdin (JSON claim or {claims:[...]})"], []
|
||||
try:
|
||||
payload = json.loads(raw)
|
||||
except json.JSONDecodeError as e:
|
||||
return [f"contradict: invalid JSON: {e}"], []
|
||||
if isinstance(payload, dict) and "claims" in payload:
|
||||
claims = list(payload.get("claims") or [])
|
||||
elif isinstance(payload, dict):
|
||||
claims = [payload]
|
||||
elif isinstance(payload, list):
|
||||
claims = payload
|
||||
else:
|
||||
return ["contradict: expected object or list"], []
|
||||
details = [adjudicate(c) for c in claims]
|
||||
return [], details
|
||||
|
||||
|
||||
def main(argv: list[str]) -> int:
|
||||
import argparse
|
||||
p = argparse.ArgumentParser(description="evidence & lexicon audit")
|
||||
p.add_argument("mode", choices=("self", "db"))
|
||||
p.add_argument("mode", choices=("self", "db", "contradict"))
|
||||
p.add_argument("--json", action="store_true")
|
||||
a = p.parse_args(argv)
|
||||
|
||||
problems = audit_self() if a.mode == "self" else audit_db()
|
||||
out = {"mode": a.mode, "ok": not problems, "problems": problems}
|
||||
details: list[dict] = []
|
||||
if a.mode == "self":
|
||||
problems = audit_self()
|
||||
elif a.mode == "db":
|
||||
problems = audit_db()
|
||||
else:
|
||||
problems, details = audit_contradict(sys.stdin.read())
|
||||
out: dict = {"mode": a.mode, "ok": not problems, "problems": problems}
|
||||
if details:
|
||||
out["contradictions"] = details
|
||||
if a.json:
|
||||
print(json.dumps(out, indent=2))
|
||||
else:
|
||||
|
||||
Executable
+22
@@ -0,0 +1,22 @@
|
||||
//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
|
||||
// ./bin/facts/audit.go contradict --json < claim.json
|
||||
//
|
||||
// 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
|
||||
"""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 --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.
|
||||
bin/git/import.go [REPO] [--json] [--limit N] [--since DATE]
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import subprocess
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
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:
|
||||
import argparse
|
||||
p = argparse.ArgumentParser(description="import git history into the brain")
|
||||
p.add_argument("repo", nargs="?", default=None)
|
||||
p.add_argument("--root", default=None, help="directory of repos to import (each git dir separately)")
|
||||
p.add_argument("--limit", type=int, default=0)
|
||||
p.add_argument("--since", default="")
|
||||
p.add_argument("--json", action="store_true")
|
||||
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
|
||||
print(
|
||||
"bin/git/import is deprecated; use bin/git/import.go (go-git)",
|
||||
file=sys.stderr,
|
||||
)
|
||||
target = ROOT / "bin" / "git" / "import.go"
|
||||
os.execvp("go", ["go", "run", str(target), *argv])
|
||||
return 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Executable
+100
@@ -0,0 +1,100 @@
|
||||
//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"
|
||||
|
||||
cliparse "github.com/eSlider/2dph/internal/cli"
|
||||
"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 {
|
||||
c, err := gitlog.ParseArgs(args)
|
||||
if err != nil {
|
||||
return cliparse.Fail(err)
|
||||
}
|
||||
repo, root, since, limit, jsonOut := c.Repo, c.Root, c.Since, c.Limit, c.JSONOut
|
||||
|
||||
sinceT, err := gitlog.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
|
||||
}
|
||||
Executable
+120
@@ -0,0 +1,120 @@
|
||||
#!/usr/bin/env python3
|
||||
"""kb/add - incremental leaf write (no rebuild).
|
||||
|
||||
bin/kb/add --text T --root facts|info --source S
|
||||
bin/kb/add --json # stdin: one object or {"leafs":[...]}
|
||||
bin/kb/add --db PATH --json
|
||||
|
||||
Writes facts+info in one Ladybug transaction. Does not delete kb.lbug.
|
||||
Embedding is used when provided; otherwise model2vec encodes the text.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
sys.path.insert(0, str(ROOT / "bin" / "tools"))
|
||||
|
||||
from kblib import ( # noqa: E402
|
||||
EMBED_DIM,
|
||||
add_leafs,
|
||||
connect,
|
||||
ensure_indexes,
|
||||
init_schema,
|
||||
)
|
||||
|
||||
|
||||
def _as_leafs(payload: object) -> list[dict]:
|
||||
if isinstance(payload, list):
|
||||
return [dict(x) for x in payload]
|
||||
if isinstance(payload, dict):
|
||||
if "leafs" in payload:
|
||||
return [dict(x) for x in payload["leafs"]]
|
||||
return [dict(payload)]
|
||||
raise ValueError("json must be an object, a list, or {leafs:[...]}")
|
||||
|
||||
|
||||
def _embed_missing(leafs: list[dict]) -> None:
|
||||
missing = [lf for lf in leafs if not lf.get("embedding")]
|
||||
if not missing:
|
||||
return
|
||||
from model2vec import StaticModel
|
||||
|
||||
model = StaticModel.from_pretrained("minishlab/potion-multilingual-128M")
|
||||
for lf in missing:
|
||||
text = str(lf.get("text") or "")
|
||||
vec = model.encode([text])[0].astype(float).tolist()
|
||||
if len(vec) != EMBED_DIM:
|
||||
vec = (vec + [0.0] * EMBED_DIM)[:EMBED_DIM]
|
||||
lf["embedding"] = vec
|
||||
|
||||
|
||||
def main(argv: list[str]) -> int:
|
||||
import argparse
|
||||
|
||||
p = argparse.ArgumentParser(description="add leafs without rebuilding the brain")
|
||||
p.add_argument("--db", default="", help="path to kb.lbug (default var/kb.lbug)")
|
||||
p.add_argument("--json", action="store_true", help="read leaf JSON from stdin")
|
||||
p.add_argument("--text", default="", help="leaf text")
|
||||
p.add_argument("--root", default="info", choices=("facts", "info"))
|
||||
p.add_argument("--source", default="")
|
||||
p.add_argument("--confidence", default="confirmed")
|
||||
p.add_argument("--source-rev", default="working-tree")
|
||||
p.add_argument("--how", default="brain/add")
|
||||
p.add_argument("--loc", default="")
|
||||
p.add_argument("--type", default="reference", dest="type_")
|
||||
p.add_argument("--valid-from", default="", dest="valid_from",
|
||||
help="fact interval start YYYY-MM-DD (D24)")
|
||||
p.add_argument("--valid-to", default="", dest="valid_to",
|
||||
help="fact interval end YYYY-MM-DD inclusive; empty=open (D24)")
|
||||
args = p.parse_args(argv)
|
||||
|
||||
if args.json:
|
||||
raw = sys.stdin.read()
|
||||
if not raw.strip():
|
||||
print("kb/add: empty stdin", file=sys.stderr)
|
||||
return 2
|
||||
leafs = _as_leafs(json.loads(raw))
|
||||
else:
|
||||
if not args.text or not args.source:
|
||||
print("kb/add: --text and --source are required (or --json)", file=sys.stderr)
|
||||
return 2
|
||||
leafs = [{
|
||||
"text": args.text,
|
||||
"root": args.root,
|
||||
"source": args.source,
|
||||
"confidence": args.confidence,
|
||||
"source_rev": args.source_rev,
|
||||
"how": args.how,
|
||||
"loc": args.loc or args.source,
|
||||
"type": args.type_,
|
||||
"valid_from": args.valid_from,
|
||||
"valid_to": args.valid_to,
|
||||
}]
|
||||
|
||||
for lf in leafs:
|
||||
if not lf.get("text") or not lf.get("source"):
|
||||
print("kb/add: each leaf needs text and source", file=sys.stderr)
|
||||
return 2
|
||||
|
||||
_embed_missing(leafs)
|
||||
|
||||
from kblib import DB_PATH, VAR
|
||||
|
||||
dbpath = Path(args.db) if args.db else DB_PATH
|
||||
dbpath.parent.mkdir(parents=True, exist_ok=True)
|
||||
VAR.mkdir(exist_ok=True)
|
||||
db, conn = connect(dbpath, read_only=False)
|
||||
init_schema(conn)
|
||||
ids = add_leafs(conn, leafs)
|
||||
ensure_indexes(conn)
|
||||
conn.close()
|
||||
db.close()
|
||||
print(json.dumps({"mode": "add", "ids": ids, "db": str(dbpath)}))
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main(sys.argv[1:]))
|
||||
+98
-14
@@ -2,12 +2,15 @@
|
||||
"""kb/index - build the 2dph brain from markdown + factual leafs.
|
||||
|
||||
bin/kb/index [--corpus DIR] [--rebuild] [--limit N]
|
||||
bin/kb/index --rebuild --with-facts --with-chats
|
||||
bin/kb/index --json # emit stats as JSON
|
||||
|
||||
Reads every .md under the corpus (default: repo root docs, skills, READMEs)
|
||||
as `info` leafs, embeds them with model2vec (potion-multilingual-128M), and
|
||||
writes them into var/kb.lbug with FTS + HNSW indexes. `facts` leafs come
|
||||
from bin/facts/extract (docker x compose x ssh-config pairing).
|
||||
from bin/facts/extract (docker × compose × ssh-config pairing) when
|
||||
`--with-facts` is set. `--with-chats` indexes markdown under var/chats/md
|
||||
(or a given dir) as info. WhatsApp sync stays out of v1.
|
||||
|
||||
--rebuild drops the database file and indexes from scratch. Without it a run
|
||||
is idempotent (MERGE by (source,text) id).
|
||||
@@ -22,7 +25,7 @@ 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,
|
||||
add_leafs, connect, ensure_indexes, init_schema, upsert_leaf, link_from_file,
|
||||
open_readonly, stats,
|
||||
)
|
||||
from mdleaves import read_markdown, to_all, walk_markdown # noqa: E402
|
||||
@@ -81,10 +84,11 @@ def index_leafs(conn, leafs: list[dict], embed_fn, limit: int) -> tuple[int, int
|
||||
for lf in leafs[:limit] if limit else leafs:
|
||||
query = f"{lf['heading']}\n\n{lf['text']}"
|
||||
emb = embed_fn(lf["text"]) if lf["text"] else None
|
||||
upsert_leaf(conn, text=query, root="info", confidence="confirmed",
|
||||
lid = upsert_leaf(conn, text=query, root="info", confidence="confirmed",
|
||||
source=lf["source"], source_rev="working-tree",
|
||||
how="kb/index", loc=lf["source"], type_=lf.get("type", "reference"),
|
||||
embedding=emb)
|
||||
link_from_file(conn, lid, lf["source"], repo=str(lf.get("repo") or ""))
|
||||
count += 1
|
||||
return count, len(leafs)
|
||||
|
||||
@@ -95,12 +99,65 @@ def embedder():
|
||||
return lambda text: model.encode([text])[0].astype(float).tolist()
|
||||
|
||||
|
||||
def index_fact_dicts(conn, facts: list[dict], embed_fn) -> int:
|
||||
"""Write extract-shaped dicts as root=facts leafs (2-source source field)."""
|
||||
leafs = []
|
||||
for f in facts:
|
||||
text = str(f.get("text") or "")
|
||||
source = str(f.get("source") or "")
|
||||
if not text or not source:
|
||||
continue
|
||||
leafs.append({
|
||||
"text": text,
|
||||
"root": "facts",
|
||||
"confidence": "confirmed",
|
||||
"source": source,
|
||||
"source_rev": f.get("source_rev") or "working-tree",
|
||||
"how": f.get("how") or "facts/extract",
|
||||
"loc": f.get("loc") or source,
|
||||
"type": "fact",
|
||||
"embedding": embed_fn(text) if text else None,
|
||||
})
|
||||
return len(add_leafs(conn, leafs))
|
||||
|
||||
|
||||
def facts_from_extract() -> list[dict]:
|
||||
import subprocess
|
||||
proc = subprocess.run(
|
||||
[sys.executable, str(ROOT / "bin" / "facts" / "extract"), "--json", "--dry-run"],
|
||||
cwd=ROOT,
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
if proc.returncode != 0:
|
||||
print(f"kb/index: facts/extract failed: {proc.stderr}", file=sys.stderr)
|
||||
return []
|
||||
try:
|
||||
payload = json.loads(proc.stdout)
|
||||
except json.JSONDecodeError:
|
||||
print("kb/index: facts/extract produced non-JSON", file=sys.stderr)
|
||||
return []
|
||||
return list(payload.get("facts") or [])
|
||||
|
||||
|
||||
def main(argv: list[str]) -> int:
|
||||
import argparse
|
||||
p = argparse.ArgumentParser(description="build the 2dph brain index")
|
||||
p.add_argument("--corpus", action="append", help="extra markdown dir/file to index (may repeat)")
|
||||
p.add_argument("--rebuild", action="store_true", help="fresh db + indexes")
|
||||
p.add_argument("--db", default="", help="path to kb.lbug (default var/kb.lbug)")
|
||||
p.add_argument("--no-defaults", action="store_true", help="do not index repo README/docs/skills")
|
||||
p.add_argument("--with-mail", action="store_true", help="include var/mail message.md leafs")
|
||||
p.add_argument("--with-facts", action="store_true", help="run facts/extract into root=facts")
|
||||
p.add_argument("--facts-json", default="", help="JSON list (or {facts:[...]}) of fact dicts")
|
||||
p.add_argument(
|
||||
"--with-chats",
|
||||
nargs="?",
|
||||
const=str(ROOT / "var" / "chats" / "md"),
|
||||
default="",
|
||||
help="index chat markdown as info (default var/chats/md)",
|
||||
)
|
||||
p.add_argument("--since", default="", help="with --with-mail, only messages dated >= YYYY-MM-DD")
|
||||
p.add_argument("--dry-run", action="store_true", help="count leafs, write nothing")
|
||||
p.add_argument(
|
||||
@@ -114,44 +171,71 @@ def main(argv: list[str]) -> int:
|
||||
|
||||
from kblib import DB_PATH, VAR
|
||||
|
||||
leafs = load_corpus(ROOT)
|
||||
dbpath = Path(a.db) if a.db else DB_PATH
|
||||
leafs: list[dict] = [] if a.no_defaults else load_corpus(ROOT)
|
||||
if a.corpus:
|
||||
for source in a.corpus:
|
||||
leafs.extend(load_corpus_glob(source))
|
||||
chat_n = 0
|
||||
if a.with_chats:
|
||||
chats = load_corpus_glob(a.with_chats)
|
||||
chat_n = len(chats)
|
||||
leafs.extend(chats)
|
||||
mail_n = 0
|
||||
if a.with_mail:
|
||||
mail = from_mail_root(ROOT / "var" / "mail", since=a.since)
|
||||
mail_n = len(mail)
|
||||
leafs.extend(mail)
|
||||
|
||||
facts: list[dict] = []
|
||||
if a.facts_json:
|
||||
raw = Path(a.facts_json).read_text(encoding="utf-8")
|
||||
payload = json.loads(raw)
|
||||
facts = list(payload.get("facts") if isinstance(payload, dict) else payload)
|
||||
if a.with_facts:
|
||||
facts.extend(facts_from_extract())
|
||||
|
||||
if a.dry_run:
|
||||
msg = {"indexed": 0, "corpus_total": len(leafs), "mail_leafs": mail_n, "dry_run": True}
|
||||
msg = {
|
||||
"indexed": 0,
|
||||
"corpus_total": len(leafs),
|
||||
"mail_leafs": mail_n,
|
||||
"chat_leafs": chat_n,
|
||||
"facts_leafs": len(facts),
|
||||
"dry_run": True,
|
||||
}
|
||||
print(json.dumps(msg, indent=2) if a.json else
|
||||
f"brain/index: {len(leafs)} leafs would be indexed (mail={mail_n})")
|
||||
f"brain/index: {len(leafs)} info + {len(facts)} facts would be indexed")
|
||||
return 0
|
||||
|
||||
VAR.mkdir(exist_ok=True)
|
||||
if a.rebuild and DB_PATH.exists():
|
||||
DB_PATH.unlink()
|
||||
dbpath.parent.mkdir(parents=True, exist_ok=True)
|
||||
if a.rebuild and dbpath.exists():
|
||||
dbpath.unlink()
|
||||
|
||||
db, conn = connect(DB_PATH, read_only=False)
|
||||
db, conn = connect(dbpath, read_only=False)
|
||||
init_schema(conn)
|
||||
|
||||
# Never DROP FTS/VECTOR (ghost catalog). Write leafs, then ensure indexes
|
||||
# unless --skip-indexes (seed facts first — MERGE under live FTS corrupts it).
|
||||
# --rebuild already deleted kb.lbug above, so CREATE runs on a clean DB.
|
||||
embed = embedder()
|
||||
done, total = index_leafs(conn, leafs, embed, a.limit)
|
||||
fact_n = index_fact_dicts(conn, facts, embed) if facts else 0
|
||||
if not a.skip_indexes:
|
||||
ensure_indexes(conn)
|
||||
s = stats(conn)
|
||||
conn.close()
|
||||
db.close()
|
||||
|
||||
result = {"indexed": done, "corpus_total": total, **{k: v for k, v in s.items() if k in ("total", "by_root")}}
|
||||
result = {
|
||||
"indexed": done,
|
||||
"corpus_total": total,
|
||||
"facts_leafs": fact_n,
|
||||
"chat_leafs": chat_n,
|
||||
**{k: v for k, v in s.items() if k in ("total", "by_root")},
|
||||
}
|
||||
if a.skip_indexes:
|
||||
result["indexes"] = "skipped"
|
||||
print(json.dumps(result, indent=2) if a.json else f"indexed {done}/{total} leafs; db total {s['total']}")
|
||||
print(json.dumps(result, indent=2) if a.json else
|
||||
f"indexed {done}/{total} info + {fact_n} facts; db total {s['total']}")
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
+4
-6
@@ -1,10 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
# bin/kb/search — deprecated wrapper. Use bin/brain/search.go.
|
||||
# Sets CGO for ladybug, builds a binary (embed daemon needs a real executable),
|
||||
# then execs it. Prints one deprecation line.
|
||||
# CGO via Zig (bin/cgo/zig), not gcc. Builds a binary then execs it.
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
|
||||
ROOT="$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd)"
|
||||
BIN="$ROOT/var/bin/brain-search"
|
||||
SRC="$ROOT/internal/brain"
|
||||
CMD="$ROOT/bin/brain"
|
||||
@@ -24,11 +23,10 @@ else
|
||||
fi
|
||||
|
||||
if [ "$need_build" -eq 1 ]; then
|
||||
echo "Building brain/search..." >&2
|
||||
echo "Building brain/search (zig cc)..." >&2
|
||||
(
|
||||
cd "$ROOT" &&
|
||||
CGO_CFLAGS="-I$ROOT/lib-ladybug" \
|
||||
CGO_LDFLAGS="-L$ROOT/lib-ladybug -Wl,-rpath,$ROOT/lib-ladybug" \
|
||||
eval "$("$ROOT/bin/cgo/zig" env)" &&
|
||||
go build -tags system_ladybug -o "$BIN" ./bin/brain
|
||||
) || exit 1
|
||||
fi
|
||||
|
||||
+11
-77
@@ -7,7 +7,7 @@
|
||||
bin/mail/import --since 2026-01-01 only messages after a date
|
||||
bin/mail/import --limit 50 cap messages per run
|
||||
bin/mail/import --no-attachments body only, skip attachment conversion
|
||||
bin/mail/import --ocr OCR scanned PDFs/images via docling
|
||||
bin/mail/import --ocr OCR images (PDFs OCR when textless)
|
||||
bin/mail/import --dry-run list messages without writing anything
|
||||
|
||||
Writes one directory per message: var/mail/{folder}/{message_id}/
|
||||
@@ -16,10 +16,11 @@ Writes one directory per message: var/mail/{folder}/{message_id}/
|
||||
attachments/*.md converted attachment content
|
||||
|
||||
Indexing is a separate step (`bin/brain/index.go --rebuild`): conversion can
|
||||
crash in native docling and must not leave the brain DB mid-transaction.
|
||||
crash and must not leave the brain DB mid-transaction.
|
||||
|
||||
Requires ONLYOFFICE_URL/USER/PASS in .env (or env). Idempotent: a message
|
||||
already present (message.md exists) is skipped unless --force.
|
||||
Requires ONLYOFFICE_URL/USER/PASS in .env (or env) except `--from-raw`.
|
||||
Idempotent: a message already present (message.md exists) is skipped unless
|
||||
--force.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
@@ -41,10 +42,10 @@ from mailconv import ( # noqa: E402
|
||||
IMAGE_SUFFIXES,
|
||||
LEGACY_OFFICE_SUFFIXES,
|
||||
TEXT_SUFFIXES,
|
||||
convert_pdf,
|
||||
html_to_markdown,
|
||||
is_convertible,
|
||||
normalize_markdown,
|
||||
subject_to_filename,
|
||||
ocr_image,
|
||||
zip_extract_safe,
|
||||
)
|
||||
|
||||
@@ -147,9 +148,9 @@ def convert_file_to_md(path: Path, ocr: bool) -> str | None:
|
||||
except Exception as e:
|
||||
return f"\n<!-- conversion failed: {e} -->\n"
|
||||
if suffix == ".pdf":
|
||||
return _convert_pdf(path, ocr)
|
||||
return convert_pdf(path, ocr)
|
||||
if suffix in IMAGE_SUFFIXES and ocr:
|
||||
return _convert_pdf(path, ocr)
|
||||
return ocr_image(path) or "\n<!-- ocr unavailable -->\n"
|
||||
if suffix in LEGACY_OFFICE_SUFFIXES:
|
||||
return _convert_legacy(path)
|
||||
if suffix in ARCHIVE_SUFFIXES:
|
||||
@@ -157,67 +158,6 @@ def convert_file_to_md(path: Path, ocr: bool) -> str | None:
|
||||
return None
|
||||
|
||||
|
||||
def _convert_pdf(path: Path, ocr: bool) -> str:
|
||||
"""Convert one PDF to markdown.
|
||||
|
||||
Fast path: poppler's pdftotext (-layout) extracts exact text from
|
||||
born-digital PDFs in ~15ms vs docling's 1-3s. Only textless PDFs (scanned
|
||||
pages, layout-heavy) fall back to docling, which runs isolated in a
|
||||
subprocess because its native onnx/RT-DETR has segfaulted the main process.
|
||||
"""
|
||||
text = _pdf_fast_text(path)
|
||||
if ocr or text is None or not text.strip():
|
||||
return _convert_pdf_docling(path, ocr)
|
||||
return normalize_markdown(text)
|
||||
|
||||
|
||||
def _pdf_fast_text(path: Path) -> str | None:
|
||||
"""pdftotext -layout; None when poppler is unavailable (or the PDF has no text layer)."""
|
||||
try:
|
||||
proc = subprocess.run(
|
||||
["pdftotext", "-layout", str(path), "-"],
|
||||
capture_output=True, timeout=60)
|
||||
except (OSError, subprocess.TimeoutExpired):
|
||||
return None
|
||||
if proc.returncode != 0:
|
||||
return None
|
||||
return proc.stdout.decode("utf-8", errors="replace")
|
||||
|
||||
|
||||
def _convert_pdf_docling(path: Path, ocr: bool) -> str:
|
||||
try:
|
||||
proc = subprocess.run(
|
||||
[sys.executable, os.path.abspath(__file__), "--pdf-worker", str(path),
|
||||
"--ocr" if ocr else "--no-ocr"],
|
||||
capture_output=True, text=True, timeout=600)
|
||||
except subprocess.TimeoutExpired:
|
||||
return "\n<!-- pdf conversion timed out -->\n"
|
||||
if proc.returncode != 0:
|
||||
tail = proc.stderr.strip().splitlines()[-3:]
|
||||
return f"\n<!-- pdf conversion failed: {proc.returncode}: {' | '.join(tail)} -->\n"
|
||||
return proc.stdout
|
||||
|
||||
|
||||
def _pdf_worker(path: Path, ocr: bool) -> None:
|
||||
"""docling worker entry: prints converted markdown on stdout, exits non-zero on error."""
|
||||
try:
|
||||
from docling.document_converter import DocumentConverter, PdfFormatOption
|
||||
from docling.datamodel.pipeline_options import PdfPipelineOptions
|
||||
opts = PdfPipelineOptions()
|
||||
opts.do_ocr = bool(ocr)
|
||||
opts.do_table_structure = True
|
||||
conv = DocumentConverter(format_options={"pdf": PdfFormatOption(pipeline_options=opts)})
|
||||
res = conv.convert(str(path))
|
||||
sys.stdout.write(normalize_markdown(res.document.export_to_markdown()))
|
||||
sys.exit(0)
|
||||
except Exception as e:
|
||||
# errors/stacktraces to stderr; the caller only reports a one-liner
|
||||
print(f"pdf-worker: {e}", file=sys.stderr)
|
||||
import traceback
|
||||
traceback.print_exc(file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def _convert_legacy(path: Path) -> str:
|
||||
"""Legacy .doc/.xls/.ppt -> md via pandoc (installed) or a stub."""
|
||||
try:
|
||||
@@ -356,19 +296,12 @@ def main(argv: list[str]) -> int:
|
||||
p.add_argument("--from-raw", default="",
|
||||
help="convert Go-synced dirs (var/mail/<folder>/<id>/message.json) to markdown")
|
||||
p.add_argument("--no-attachments", action="store_true", help="skip attachment download+convert")
|
||||
p.add_argument("--ocr", action="store_true", help="OCR scanned PDFs/images via docling")
|
||||
p.add_argument("--ocr", action="store_true", help="OCR images (PDFs OCR when textless)")
|
||||
p.add_argument("--force", action="store_true", help="re-import even if message.md exists")
|
||||
p.add_argument("--dry-run", action="store_true", help="list messages, write nothing")
|
||||
p.add_argument("--json", action="store_true")
|
||||
p.add_argument("--pdf-worker", default="", help=argparse.SUPPRESS)
|
||||
p.add_argument("--no-ocr", action="store_true", help=argparse.SUPPRESS)
|
||||
a = p.parse_args(argv)
|
||||
|
||||
if a.pdf_worker:
|
||||
_pdf_worker(Path(a.pdf_worker), ocr=not a.no_ocr)
|
||||
return 0
|
||||
|
||||
conf = load_env()
|
||||
fid = folder_id(a.folder)
|
||||
out_root = ROOT / "var" / "mail"
|
||||
summary: list[dict] = []
|
||||
@@ -394,6 +327,7 @@ def main(argv: list[str]) -> int:
|
||||
target_dir=msg_dir.parent))
|
||||
summary.append(entry)
|
||||
else:
|
||||
conf = load_env()
|
||||
OOCLIENT = OOClient(conf)
|
||||
if a.id:
|
||||
messages = [{"id": i} for i in a.id]
|
||||
|
||||
Executable
+46
@@ -0,0 +1,46 @@
|
||||
//usr/bin/env go run -tags=mail_ocr "$0" "$@"; exit
|
||||
//go:build mail_ocr
|
||||
//
|
||||
// bin/mail/ocr.go - OCR an image or scanned PDF (tesseract eng+deu).
|
||||
//
|
||||
// ./bin/mail/ocr.go scan.png
|
||||
// ./bin/mail/ocr.go scan.pdf
|
||||
// OCR_ENGINE=paddle ./bin/mail/ocr.go scan.png
|
||||
//
|
||||
// PDFs try pdftotext -layout first; empty text layer uses pdftoppm + tesseract.
|
||||
// No gocv. Tesseract CGO bindings are not used (D21 Zig owns Ladybug CGO).
|
||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
cliparse "github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/eSlider/2dph/internal/ocr"
|
||||
)
|
||||
|
||||
func main() {
|
||||
os.Exit(run(os.Args[1:]))
|
||||
}
|
||||
|
||||
func run(args []string) int {
|
||||
c, err := ocr.ParseArgs(args)
|
||||
if err != nil {
|
||||
return cliparse.Fail(err)
|
||||
}
|
||||
path := c.Path
|
||||
var text string
|
||||
if strings.HasSuffix(strings.ToLower(path), ".pdf") {
|
||||
text, err = ocr.PDFFile(path)
|
||||
} else {
|
||||
text, err = ocr.ImageFile(path)
|
||||
}
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "mail/ocr: %v\n", err)
|
||||
return 1
|
||||
}
|
||||
fmt.Println(text)
|
||||
return 0
|
||||
}
|
||||
+3
-2
@@ -1,8 +1,9 @@
|
||||
//usr/bin/env go run "$0" "$@"; exit
|
||||
// bin/mail/sync.go - async download of OnlyOffice and Gmail mail to var/mail/.
|
||||
// bin/mail/sync.go - async download of OnlyOffice, Gmail and M365 mail to var/mail/.
|
||||
//
|
||||
// ./bin/mail/sync.go --source onlyoffice,gmail --limit 50 --workers 8
|
||||
// ./bin/mail/sync.go --source onlyoffice,gmail,m365 --limit 50 --workers 8
|
||||
// ./bin/mail/sync.go --source gmail --force
|
||||
// ./bin/mail/sync.go --source m365 --env .secrets/m365.env
|
||||
// ./bin/mail/sync.go --dry-run
|
||||
//
|
||||
// Writes raw message.json + attachments under var/mail/<folder>/<id>/; run
|
||||
|
||||
+89
-42
@@ -5,12 +5,15 @@ package sync
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
cliparse "github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/integrii/flaggy"
|
||||
)
|
||||
|
||||
// CLIConfig is a superset of SyncConfig plus flag parsing results.
|
||||
@@ -21,58 +24,84 @@ type CLIConfig struct {
|
||||
Help bool
|
||||
}
|
||||
|
||||
// ParseCLI reads os.Args into a CLIConfig. Exit codes: 0 ok, 2 usage.
|
||||
type flagVals struct {
|
||||
env, out, srcs, query string
|
||||
workers, limit, offset int
|
||||
force, dryRun bool
|
||||
}
|
||||
|
||||
func Parser() *flaggy.Parser {
|
||||
v := flagVals{workers: 4, query: "in:inbox", srcs: "onlyoffice"}
|
||||
return bind(&v)
|
||||
}
|
||||
|
||||
func bind(v *flagVals) *flaggy.Parser {
|
||||
if v.workers == 0 {
|
||||
v.workers = 4
|
||||
}
|
||||
if v.query == "" {
|
||||
v.query = "in:inbox"
|
||||
}
|
||||
if v.srcs == "" {
|
||||
v.srcs = "onlyoffice"
|
||||
}
|
||||
p := cliparse.New("mail-sync")
|
||||
p.Description = "download mail to var/mail"
|
||||
p.String(&v.env, "", "env", ".env file")
|
||||
p.String(&v.out, "", "out", "var/mail root")
|
||||
p.Int(&v.workers, "", "workers", "concurrent downloads")
|
||||
p.Int(&v.limit, "", "limit", "max messages per source (0 = all)")
|
||||
p.Int(&v.offset, "", "offset", "skip first N messages per source")
|
||||
p.Bool(&v.force, "", "force", "overwrite existing message.json")
|
||||
p.Bool(&v.dryRun, "", "dry-run", "list counts without writing")
|
||||
p.String(&v.query, "", "query", "Gmail search query")
|
||||
p.String(&v.srcs, "", "source", "comma list: onlyoffice,gmail,m365")
|
||||
return p
|
||||
}
|
||||
|
||||
// ParseCLI reads args into a CLIConfig. Exit codes: 0 ok, 2 usage.
|
||||
func ParseCLI(args []string) (CLIConfig, int, error) {
|
||||
fs := flag.NewFlagSet("mail/sync", flag.ContinueOnError)
|
||||
var (
|
||||
env = fs.String("env", "", ".env file (default: <cwd>/.env)")
|
||||
out = fs.String("out", "", "var/mail root (default: <cwd>/var/mail)")
|
||||
workers = fs.Int("workers", 4, "concurrent downloads")
|
||||
limit = fs.Int("limit", 0, "max messages per source (0 = all)")
|
||||
offset = fs.Int("offset", 0, "skip first N messages per source")
|
||||
force = fs.Bool("force", false, "overwrite existing message.json + attachments")
|
||||
dryRun = fs.Bool("dry-run", false, "list message counts without writing")
|
||||
query = fs.String("query", "in:inbox", "Gmail search query (gmail source only)")
|
||||
srcs = fs.String("source", "onlyoffice", "comma list: onlyoffice,gmail (default onlyoffice)")
|
||||
help = fs.Bool("help", false, "usage")
|
||||
)
|
||||
fs.SetOutput(os.Stderr)
|
||||
if err := fs.Parse(args); err != nil {
|
||||
v := flagVals{workers: 4, query: "in:inbox", srcs: "onlyoffice"}
|
||||
p := bind(&v)
|
||||
if err := cliparse.Parse(p, args); err != nil {
|
||||
if errors.Is(err, cliparse.ErrHelp) {
|
||||
return CLIConfig{Help: true}, 0, nil
|
||||
}
|
||||
return CLIConfig{}, 2, err
|
||||
}
|
||||
if *help || fs.NArg() > 0 {
|
||||
if len(p.TrailingArguments) > 0 {
|
||||
return CLIConfig{Help: true}, 0, nil
|
||||
}
|
||||
wd, err := os.Getwd()
|
||||
if err != nil {
|
||||
return CLIConfig{}, 2, err
|
||||
}
|
||||
if *env == "" {
|
||||
*env = filepath.Join(wd, ".env")
|
||||
if v.env == "" {
|
||||
v.env = filepath.Join(wd, ".env")
|
||||
}
|
||||
if *out == "" {
|
||||
*out = filepath.Join(wd, "var", "mail")
|
||||
if v.out == "" {
|
||||
v.out = filepath.Join(wd, "var", "mail")
|
||||
}
|
||||
envVars := readEnv(*env)
|
||||
envVars := readEnv(v.env)
|
||||
cfg := SyncConfig{
|
||||
Out: *out,
|
||||
Workers: *workers,
|
||||
Limit: *limit,
|
||||
Offset: *offset,
|
||||
Force: *force,
|
||||
DryRun: *dryRun,
|
||||
Query: *query,
|
||||
Out: v.out,
|
||||
Workers: v.workers,
|
||||
Limit: v.limit,
|
||||
Offset: v.offset,
|
||||
Force: v.force,
|
||||
DryRun: v.dryRun,
|
||||
Query: v.query,
|
||||
Policy: RetryPolicy{},
|
||||
}
|
||||
cli := CLIConfig{Sync: cfg, Env: *env, Sources: *srcs}
|
||||
for _, s := range strings.Split(*srcs, ",") {
|
||||
out := CLIConfig{Sync: cfg, Env: v.env, Sources: v.srcs}
|
||||
for _, s := range strings.Split(v.srcs, ",") {
|
||||
switch strings.TrimSpace(s) {
|
||||
case "onlyoffice":
|
||||
u := pick(envVars["ONLYOFFICE_URL"], envVars["OO_URL"])
|
||||
user := pick(envVars["ONLYOFFICE_USER"], envVars["OO_USER"])
|
||||
pass := pick(envVars["ONLYOFFICE_PASS"], envVars["OO_PASSWORD"])
|
||||
if u == "" || user == "" || pass == "" {
|
||||
return CLIConfig{}, 2, fmt.Errorf("onlyoffice source needs ONLYOFFICE_URL/USER/PASS in %s", *env)
|
||||
return CLIConfig{}, 2, fmt.Errorf("onlyoffice source needs ONLYOFFICE_URL/USER/PASS in %s", v.env)
|
||||
}
|
||||
cfg.OO = &OOConfig{URL: u, User: user, Password: pass}
|
||||
case "gmail":
|
||||
@@ -81,34 +110,52 @@ func ParseCLI(args []string) (CLIConfig, int, error) {
|
||||
CredentialsPath: filepath.Join(home, ".gmail-mcp", "credentials.json"),
|
||||
KeysPath: filepath.Join(home, ".gmail-mcp", "gcp-oauth.keys.json"),
|
||||
}
|
||||
case "m365":
|
||||
tenant := pick(envVars["M365_TENANT"], envVars["MS_TENANT"])
|
||||
cid := pick(envVars["M365_CLIENT_ID"], envVars["MS_CLIENT_ID"])
|
||||
sec := pick(envVars["M365_CLIENT_SECRET"], envVars["MS_CLIENT_SECRET"])
|
||||
users := pick(envVars["M365_USERS"], envVars["MS_USERS"])
|
||||
if tenant == "" || cid == "" || sec == "" || users == "" {
|
||||
return CLIConfig{}, 2, fmt.Errorf("m365 source needs M365_TENANT/CLIENT_ID/CLIENT_SECRET/USERS in %s", v.env)
|
||||
}
|
||||
var userList []string
|
||||
for _, u := range strings.Split(users, ",") {
|
||||
if u = strings.TrimSpace(u); u != "" {
|
||||
userList = append(userList, u)
|
||||
}
|
||||
}
|
||||
if len(userList) == 0 {
|
||||
return CLIConfig{}, 2, fmt.Errorf("m365 source: M365_USERS empty")
|
||||
}
|
||||
cfg.M365 = &M365Credentials{Tenant: tenant, ClientID: cid, ClientSecret: sec, Users: userList}
|
||||
default:
|
||||
return CLIConfig{}, 2, fmt.Errorf("unknown source %q", s)
|
||||
}
|
||||
}
|
||||
cli.Sync = cfg
|
||||
return cli, 0, nil
|
||||
out.Sync = cfg
|
||||
return out, 0, nil
|
||||
}
|
||||
|
||||
// Main is the CLI entry: returns process exit code.
|
||||
func Main(args []string) int {
|
||||
cli, code, err := ParseCLI(args)
|
||||
cfg, code, err := ParseCLI(args)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "mail/sync:", err)
|
||||
return code
|
||||
}
|
||||
if cli.Help {
|
||||
fmt.Fprintln(os.Stderr, "usage: bin/mail/sync.go [--source onlyoffice,gmail] [--query GMAIL_Q] [--limit N] [--offset N] [--workers N] [--force] [--dry-run]")
|
||||
if cfg.Help {
|
||||
fmt.Fprintln(os.Stderr, "usage: bin/mail/sync.go [--source onlyoffice,gmail,m365] [--query GMAIL_Q] [--limit N] [--offset N] [--workers N] [--force] [--dry-run]")
|
||||
return 0
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 6*time.Hour)
|
||||
defer cancel()
|
||||
start := time.Now()
|
||||
stats, err := Run(ctx, cli.Sync)
|
||||
stats, err := Run(ctx, cfg.Sync)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "mail/sync:", err)
|
||||
return 1
|
||||
}
|
||||
if cli.Sync.DryRun {
|
||||
if cfg.Sync.DryRun {
|
||||
fmt.Printf("mail/sync: dry-run checked=%d (no writes)\n", stats.Checked)
|
||||
return 0
|
||||
}
|
||||
@@ -135,13 +182,13 @@ func readEnv(path string) map[string]string {
|
||||
k, v, _ := strings.Cut(line, "=")
|
||||
out[strings.TrimSpace(k)] = strings.Trim(strings.TrimSpace(v), "\"'")
|
||||
}
|
||||
// env overrides file
|
||||
for _, kv := range os.Environ() {
|
||||
k, v, ok := strings.Cut(kv, "=")
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
if strings.HasPrefix(k, "ONLYOFFICE_") || strings.HasPrefix(k, "OO_") {
|
||||
if strings.HasPrefix(k, "ONLYOFFICE_") || strings.HasPrefix(k, "OO_") ||
|
||||
strings.HasPrefix(k, "M365_") || strings.HasPrefix(k, "MS_") {
|
||||
out[k] = v
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,382 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// M365Credentials holds a Microsoft Graph app registration with the Mail.Read
|
||||
// application permission. Client credentials are read from env/.env, never
|
||||
// committed.
|
||||
type M365Credentials struct {
|
||||
Tenant string
|
||||
ClientID string
|
||||
ClientSecret string
|
||||
Users []string // mailbox addresses to sync, e.g. info@example.com
|
||||
}
|
||||
|
||||
// m365Token is the cached access token with expiry.
|
||||
type m365Token struct {
|
||||
AccessToken string
|
||||
Expiry time.Time
|
||||
}
|
||||
|
||||
// M365Client talks to the Microsoft Graph API using the client-credentials
|
||||
// flow (app registration with Mail.Read application permission). GET-only:
|
||||
// messages are never marked as read or deleted.
|
||||
type M365Client struct {
|
||||
creds M365Credentials
|
||||
base string // graph base URL; default https://graph.microsoft.com
|
||||
tokenEndpoint string // login endpoint; default https://login.microsoftonline.com
|
||||
client *http.Client
|
||||
mu chan struct{}
|
||||
token *m365Token
|
||||
}
|
||||
|
||||
func NewM365Client(creds M365Credentials) (*M365Client, error) {
|
||||
if creds.Tenant == "" || creds.ClientID == "" || creds.ClientSecret == "" {
|
||||
return nil, errors.New("m365 needs tenant, client id and client secret")
|
||||
}
|
||||
c := &M365Client{
|
||||
creds: creds,
|
||||
base: "https://graph.microsoft.com",
|
||||
client: &http.Client{Timeout: 90 * time.Second},
|
||||
mu: make(chan struct{}, 1),
|
||||
}
|
||||
c.mu <- struct{}{}
|
||||
return c, nil
|
||||
}
|
||||
|
||||
// accessToken returns a fresh bearer token, refreshing via the Azure AD token
|
||||
// endpoint when the cached one is missing or about to expire (within 2 min).
|
||||
func (c *M365Client) accessToken(ctx context.Context) (string, error) {
|
||||
select {
|
||||
case <-c.mu:
|
||||
case <-ctx.Done():
|
||||
return "", ctx.Err()
|
||||
}
|
||||
defer func() { c.mu <- struct{}{} }()
|
||||
if c.token != nil && c.token.AccessToken != "" && time.Now().Before(c.token.Expiry.Add(-2*time.Minute)) {
|
||||
return c.token.AccessToken, nil
|
||||
}
|
||||
return c.refreshLocked(ctx)
|
||||
}
|
||||
|
||||
func (c *M365Client) refreshLocked(ctx context.Context) (string, error) {
|
||||
form := url.Values{}
|
||||
form.Set("grant_type", "client_credentials")
|
||||
form.Set("client_id", c.creds.ClientID)
|
||||
form.Set("client_secret", c.creds.ClientSecret)
|
||||
form.Set("scope", "https://graph.microsoft.com/.default")
|
||||
|
||||
endpoint := c.tokenEndpoint
|
||||
if endpoint == "" {
|
||||
endpoint = fmt.Sprintf("https://login.microsoftonline.com/%s/oauth2/v2.0/token", c.creds.Tenant)
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, strings.NewReader(form.Encode()))
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
resp, err := c.client.Do(req)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("m365 token: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
body, _ := io.ReadAll(io.LimitReader(resp.Body, 1<<20))
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
var e struct {
|
||||
Error string `json:"error"`
|
||||
Desc string `json:"error_description"`
|
||||
}
|
||||
_ = json.Unmarshal(body, &e)
|
||||
return "", fmt.Errorf("m365 token status %d: %s (%s)", resp.StatusCode, e.Error, truncate(e.Desc, 200))
|
||||
}
|
||||
var out struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
ExpiresIn int64 `json:"expires_in"`
|
||||
}
|
||||
if err := json.Unmarshal(body, &out); err != nil {
|
||||
return "", fmt.Errorf("m365 token parse: %w", err)
|
||||
}
|
||||
c.token = &m365Token{
|
||||
AccessToken: out.AccessToken,
|
||||
Expiry: time.Now().Add(time.Duration(out.ExpiresIn) * time.Second),
|
||||
}
|
||||
return out.AccessToken, nil
|
||||
}
|
||||
|
||||
// deltaPage is one response page of the Graph delta query.
|
||||
type deltaPage struct {
|
||||
Value []struct {
|
||||
ID string `json:"id"`
|
||||
RemovedReason string `json:"@odata.removedReason"`
|
||||
} `json:"value"`
|
||||
NextLink string `json:"@odata.nextLink"`
|
||||
DeltaLink string `json:"@odata.deltaLink"`
|
||||
}
|
||||
|
||||
// ListDeltaIDs walks the inbox delta query and returns live message ids since
|
||||
// the previous deltaLink (or the full inbox when deltaLink is empty). Returns
|
||||
// the new deltaLink for the next run. GET-only; nothing is mutated server-side.
|
||||
func (c *M365Client) ListDeltaIDs(ctx context.Context, mailbox, deltaLink string, limit int) ([]string, string, error) {
|
||||
var (
|
||||
ids []string
|
||||
url string
|
||||
link = deltaLink
|
||||
)
|
||||
if link == "" {
|
||||
url = fmt.Sprintf("/v1.0/users/%s/mailFolders/inbox/messages/delta", pathEscape(mailbox))
|
||||
} else {
|
||||
url = link
|
||||
}
|
||||
for url != "" {
|
||||
var page deltaPage
|
||||
if err := c.getJSON(ctx, url, &page); err != nil {
|
||||
return ids, link, err
|
||||
}
|
||||
for _, m := range page.Value {
|
||||
if m.RemovedReason != "" {
|
||||
continue
|
||||
}
|
||||
if m.ID == "" {
|
||||
continue
|
||||
}
|
||||
ids = append(ids, m.ID)
|
||||
if limit > 0 && len(ids) >= limit {
|
||||
if page.DeltaLink != "" {
|
||||
link = page.DeltaLink
|
||||
}
|
||||
return ids, link, nil
|
||||
}
|
||||
}
|
||||
if page.DeltaLink != "" {
|
||||
link = page.DeltaLink
|
||||
url = ""
|
||||
break
|
||||
}
|
||||
url = page.NextLink
|
||||
}
|
||||
return ids, link, nil
|
||||
}
|
||||
|
||||
// GetMessage fetches a single message by id and normalizes it to the Message
|
||||
// contract. GET-only.
|
||||
func (c *M365Client) GetMessage(ctx context.Context, mailbox, id string) (*Message, error) {
|
||||
path := fmt.Sprintf("/v1.0/users/%s/messages/%s?$expand=attachments($select=id,name,contentType,size,isInline)",
|
||||
pathEscape(mailbox), pathEscape(id))
|
||||
var raw struct {
|
||||
ID string `json:"id"`
|
||||
Subject string `json:"subject"`
|
||||
From m365Recipient `json:"from"`
|
||||
ToRecipients []m365Recipient `json:"toRecipients"`
|
||||
CCRecipients []m365Recipient `json:"ccRecipients"`
|
||||
BCCRecipients []m365Recipient `json:"bccRecipients"`
|
||||
ReceivedDateTime string `json:"receivedDateTime"`
|
||||
Body m365Body `json:"body"`
|
||||
BodyPreview string `json:"bodyPreview"`
|
||||
InternetMessageID string `json:"internetMessageId"`
|
||||
Attachments []m365Attachment `json:"attachments"`
|
||||
}
|
||||
if err := c.getJSON(ctx, path, &raw); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
m := &Message{
|
||||
Source: "m365",
|
||||
ID: raw.ID,
|
||||
Folder: "m365",
|
||||
Subject: raw.Subject,
|
||||
From: formatRecipient(raw.From),
|
||||
To: formatRecipients(raw.ToRecipients),
|
||||
CC: formatRecipients(raw.CCRecipients),
|
||||
BCC: formatRecipients(raw.BCCRecipients),
|
||||
MimeMessageID: raw.InternetMessageID,
|
||||
}
|
||||
if t, err := time.Parse(time.RFC3339, raw.ReceivedDateTime); err == nil {
|
||||
m.ReceivedAt = t
|
||||
}
|
||||
switch strings.ToLower(raw.Body.ContentType) {
|
||||
case "html":
|
||||
m.HTMLBody = raw.Body.Content
|
||||
if raw.BodyPreview != "" {
|
||||
m.TextBody = raw.BodyPreview
|
||||
}
|
||||
default:
|
||||
m.TextBody = raw.Body.Content
|
||||
if raw.BodyPreview != "" {
|
||||
m.HTMLBody = raw.BodyPreview
|
||||
}
|
||||
}
|
||||
for _, a := range raw.Attachments {
|
||||
if a.IsInline || a.ID == "" || a.Name == "" {
|
||||
continue
|
||||
}
|
||||
m.Attachments = append(m.Attachments, Attachment{
|
||||
FileID: a.ID,
|
||||
FileName: a.Name,
|
||||
StoredName: a.Name,
|
||||
Size: a.Size,
|
||||
ContentType: a.ContentType,
|
||||
})
|
||||
}
|
||||
m.HasAttachments = len(m.Attachments) > 0
|
||||
return m, nil
|
||||
}
|
||||
|
||||
type m365Recipient struct {
|
||||
EmailAddress struct {
|
||||
Name string `json:"name"`
|
||||
Address string `json:"address"`
|
||||
} `json:"emailAddress"`
|
||||
}
|
||||
|
||||
type m365Body struct {
|
||||
ContentType string `json:"contentType"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
type m365Attachment struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
ContentType string `json:"contentType"`
|
||||
Size int64 `json:"size"`
|
||||
IsInline bool `json:"isInline"`
|
||||
ContentID string `json:"contentId"`
|
||||
}
|
||||
|
||||
func formatRecipients(rs []m365Recipient) string {
|
||||
var parts []string
|
||||
for _, r := range rs {
|
||||
if s := formatRecipient(r); s != "" {
|
||||
parts = append(parts, s)
|
||||
}
|
||||
}
|
||||
return strings.Join(parts, ", ")
|
||||
}
|
||||
|
||||
func formatRecipient(r m365Recipient) string { a := r.EmailAddress.Address
|
||||
n := r.EmailAddress.Name
|
||||
switch {
|
||||
case n == "" || n == a:
|
||||
return a
|
||||
case a == "":
|
||||
return n
|
||||
default:
|
||||
return fmt.Sprintf("%s <%s>", n, a)
|
||||
}
|
||||
}
|
||||
|
||||
// DownloadAttachment fetches an attachment's raw bytes via the /$value stream.
|
||||
func (c *M365Client) DownloadAttachment(ctx context.Context, mailbox, msgID, attID string) ([]byte, error) {
|
||||
path := fmt.Sprintf("/v1.0/users/%s/messages/%s/attachments/%s/$value",
|
||||
pathEscape(mailbox), pathEscape(msgID), pathEscape(attID))
|
||||
tok, err := c.accessToken(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.base+path, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Authorization", "Bearer "+tok)
|
||||
resp, err := c.client.Do(req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("m365 attachment: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
body, _ := io.ReadAll(io.LimitReader(resp.Body, 256<<20))
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return nil, fmt.Errorf("m365 attachment %s: status %d: %s", attID, resp.StatusCode, truncate(string(body), 300))
|
||||
}
|
||||
return body, nil
|
||||
}
|
||||
|
||||
func (c *M365Client) getJSON(ctx context.Context, path string, out any) error {
|
||||
tok, err := c.accessToken(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
u := path
|
||||
if !strings.HasPrefix(u, "http") {
|
||||
u = c.base + u
|
||||
}
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req.Header.Set("Authorization", "Bearer "+tok)
|
||||
resp, err := c.client.Do(req)
|
||||
if err != nil {
|
||||
return fmt.Errorf("m365 %s: %w", path, err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
body, _ := io.ReadAll(io.LimitReader(resp.Body, 16<<20))
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return fmt.Errorf("m365 %s: status %d: %s", path, resp.StatusCode, truncate(string(body), 300))
|
||||
}
|
||||
if out != nil {
|
||||
return json.Unmarshal(body, out)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// m365Source adapts a mailbox to the Source worker-pool contract. Each mailbox
|
||||
// gets its own folder under var/mail/m365/<localpart>/ and a delta state file.
|
||||
type m365Source struct {
|
||||
c *M365Client
|
||||
mailbox string
|
||||
localpart string
|
||||
stateDir string
|
||||
pending string // delta link to persist on Commit()
|
||||
hasPending bool
|
||||
}
|
||||
|
||||
func (s *m365Source) Folder() string { return filepath.Join("m365", s.localpart) }
|
||||
|
||||
func (s *m365Source) ListIDs(ctx context.Context, limit int, cursor string) ([]string, string, error) {
|
||||
link, _ := os.ReadFile(filepath.Join(s.stateDir, s.localpart+".deltalink"))
|
||||
ids, newLink, err := s.c.ListDeltaIDs(ctx, s.mailbox, strings.TrimSpace(string(link)), limit)
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
// Buffer the new delta link; persist it only in Commit() after the full
|
||||
// batch downloaded, so a failed run stays retryable without gaps.
|
||||
if newLink != "" {
|
||||
s.pending = newLink
|
||||
s.hasPending = true
|
||||
}
|
||||
return ids, "", nil
|
||||
}
|
||||
|
||||
// Commit persists the buffered delta link. Called by the sync runner only when
|
||||
// every listed message downloaded successfully.
|
||||
func (s *m365Source) Commit() error {
|
||||
if !s.hasPending || s.pending == "" {
|
||||
return nil
|
||||
}
|
||||
if err := os.MkdirAll(s.stateDir, 0o755); err != nil {
|
||||
return err
|
||||
}
|
||||
return os.WriteFile(filepath.Join(s.stateDir, s.localpart+".deltalink"), []byte(s.pending), 0o644)
|
||||
}
|
||||
|
||||
func (s *m365Source) Get(ctx context.Context, id string) (*Message, error) {
|
||||
return s.c.GetMessage(ctx, s.mailbox, id)
|
||||
}
|
||||
|
||||
func (s *m365Source) DownloadAttachment(ctx context.Context, msg *Message, att Attachment) ([]byte, error) {
|
||||
return s.c.DownloadAttachment(ctx, s.mailbox, msg.ID, att.FileID)
|
||||
}
|
||||
|
||||
func pathEscape(s string) string {
|
||||
return url.PathEscape(s)
|
||||
}
|
||||
@@ -0,0 +1,188 @@
|
||||
package sync
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// newM365TestClient serves the Graph delta + message endpoints against a fake
|
||||
// token endpoint, so unit tests never touch the network.
|
||||
func newM365TestClient(t *testing.T, graph http.Handler) *M365Client {
|
||||
t.Helper()
|
||||
tok := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Write([]byte(`{"access_token":"test-token","expires_in":3600}`))
|
||||
}))
|
||||
gr := httptest.NewServer(graph)
|
||||
t.Cleanup(func() {
|
||||
tok.Close()
|
||||
gr.Close()
|
||||
})
|
||||
client, err := NewM365Client(M365Credentials{Tenant: "t.onmicrosoft.com", ClientID: "c", ClientSecret: "s"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client.base = gr.URL
|
||||
client.tokenEndpoint = tok.URL
|
||||
return client
|
||||
}
|
||||
|
||||
func TestM365AccessToken(t *testing.T) {
|
||||
c := newM365TestClient(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
|
||||
got, err := c.accessToken(context.Background())
|
||||
if err != nil {
|
||||
t.Fatalf("accessToken: %v", err)
|
||||
}
|
||||
if got != "test-token" {
|
||||
t.Errorf("token = %q", got)
|
||||
}
|
||||
// Second call must reuse the cached token (no token request).
|
||||
again, err := c.accessToken(context.Background())
|
||||
if err != nil || again != "test-token" {
|
||||
t.Fatalf("cached token: %q, %v", again, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestM365DeltaSkipsTombstones(t *testing.T) {
|
||||
first := true
|
||||
graph := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if first {
|
||||
first = false
|
||||
w.Write([]byte(`{"value":[
|
||||
{"id":"m1"},
|
||||
{"id":"m2","@odata.removedReason":"deleted"},
|
||||
{"id":"m3"}
|
||||
],"@odata.deltaLink":"` + deltaNext + `"}`))
|
||||
return
|
||||
}
|
||||
// Second call must use the stored deltaLink (points at this server).
|
||||
if r.URL.Path != "/v1.0/delta-next" {
|
||||
w.WriteHeader(500)
|
||||
w.Write([]byte(`{"error":{"message":"unexpected path"}}`))
|
||||
return
|
||||
}
|
||||
w.Write([]byte(`{"value":[{"id":"m4"}],"@odata.deltaLink":"` + deltaFinal + `"}`))
|
||||
})
|
||||
c := newM365TestClient(t, graph)
|
||||
deltaNext = c.base + "/v1.0/delta-next"
|
||||
deltaFinal = c.base + "/v1.0/delta-final"
|
||||
|
||||
ids, link, err := c.ListDeltaIDs(context.Background(), "a@x.de", "", 0)
|
||||
if err != nil {
|
||||
t.Fatalf("delta: %v", err)
|
||||
}
|
||||
if len(ids) != 2 || ids[0] != "m1" || ids[1] != "m3" {
|
||||
t.Errorf("ids = %v", ids)
|
||||
}
|
||||
if link == "" {
|
||||
t.Error("expected new deltaLink")
|
||||
}
|
||||
// Incremental: pass the deltaLink, get only the new id.
|
||||
ids2, link2, err := c.ListDeltaIDs(context.Background(), "a@x.de", link, 0)
|
||||
if err != nil {
|
||||
t.Fatalf("delta incremental: %v", err)
|
||||
}
|
||||
if len(ids2) != 1 || ids2[0] != "m4" {
|
||||
t.Errorf("ids2 = %v", ids2)
|
||||
}
|
||||
if link2 == "" {
|
||||
t.Error("expected updated deltaLink")
|
||||
}
|
||||
}
|
||||
|
||||
func TestM365GetMessageNormalizes(t *testing.T) {
|
||||
graph := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if pathLast(r.URL.Path) == "messages" {
|
||||
w.Write([]byte(`{"value":[{"id":"m1"}]}`))
|
||||
return
|
||||
}
|
||||
w.Write([]byte(`{
|
||||
"id":"m1",
|
||||
"subject":"Hallo",
|
||||
"from":{"emailAddress":{"name":"Max","address":"max@x.de"}},
|
||||
"toRecipients":[{"emailAddress":{"address":"a@x.de"}}],
|
||||
"receivedDateTime":"2026-08-14T08:15:00Z",
|
||||
"body":{"contentType":"html","content":"<p>body</p>"},
|
||||
"bodyPreview":"body",
|
||||
"internetMessageId":"<mid@x.de>",
|
||||
"attachments":[
|
||||
{"id":"att1","name":"doc.pdf","contentType":"application/pdf","size":10},
|
||||
{"id":"img1","name":"logo.png","contentType":"image/png","isInline":true}
|
||||
]
|
||||
}`))
|
||||
})
|
||||
c := newM365TestClient(t, graph)
|
||||
m, err := c.GetMessage(context.Background(), "a@x.de", "m1")
|
||||
if err != nil {
|
||||
t.Fatalf("GetMessage: %v", err)
|
||||
}
|
||||
if m.ID != "m1" || m.Subject != "Hallo" || m.From != "Max <max@x.de>" || m.To != "a@x.de" {
|
||||
t.Errorf("headers mismatch: %+v", m)
|
||||
}
|
||||
if m.HTMLBody != "<p>body</p>" {
|
||||
t.Errorf("html = %q", m.HTMLBody)
|
||||
}
|
||||
if m.ReceivedAt.IsZero() {
|
||||
t.Error("receivedAt zero")
|
||||
}
|
||||
if m.MimeMessageID != "<mid@x.de>" {
|
||||
t.Errorf("mime id = %q", m.MimeMessageID)
|
||||
}
|
||||
if len(m.Attachments) != 1 || m.Attachments[0].FileName != "doc.pdf" || m.Attachments[0].FileID != "att1" {
|
||||
t.Errorf("atts = %+v", m.Attachments)
|
||||
}
|
||||
if !m.HasAttachments {
|
||||
t.Error("expected hasAttachments")
|
||||
}
|
||||
}
|
||||
|
||||
func TestM365SourceDeltaState(t *testing.T) {
|
||||
graph := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Write([]byte(`{"value":[{"id":"m1"}],"@odata.deltaLink":"` + deltaNext + `"}`))
|
||||
})
|
||||
c := newM365TestClient(t, graph)
|
||||
deltaNext = c.base + "/v1.0/delta-next"
|
||||
stateDir := filepath.Join(t.TempDir(), ".m365")
|
||||
s := &m365Source{c: c, mailbox: "info@x.de", localpart: "info", stateDir: stateDir}
|
||||
|
||||
if s.Folder() != "m365/info" {
|
||||
t.Errorf("folder = %q", s.Folder())
|
||||
}
|
||||
ids, _, err := s.ListIDs(context.Background(), 0, "")
|
||||
if err != nil {
|
||||
t.Fatalf("ListIDs: %v", err)
|
||||
}
|
||||
if len(ids) != 1 || ids[0] != "m1" {
|
||||
t.Errorf("ids = %v", ids)
|
||||
}
|
||||
if err := s.Commit(); err != nil {
|
||||
t.Fatalf("Commit: %v", err)
|
||||
}
|
||||
data, err := os.ReadFile(filepath.Join(stateDir, "info.deltalink"))
|
||||
if err != nil {
|
||||
t.Fatalf("read delta state: %v", err)
|
||||
}
|
||||
if string(data) != deltaNext {
|
||||
t.Errorf("delta state = %q, want %q", string(data), deltaNext)
|
||||
}
|
||||
}
|
||||
|
||||
func pathLast(p string) string {
|
||||
for i := len(p) - 1; i >= 0; i-- {
|
||||
if p[i] == '/' {
|
||||
return p[i+1:]
|
||||
}
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
// deltaNext/deltaFinal are set per-test from the fake graph server URL so
|
||||
// deltaLink values always point back at the fake (never the real Graph).
|
||||
var deltaNext, deltaFinal string
|
||||
+43
-1
@@ -106,6 +106,7 @@ func Retry(ctx context.Context, policy RetryPolicy, fn func() error) error {
|
||||
type SyncConfig struct {
|
||||
OO *OOConfig // OnlyOffice source (optional)
|
||||
Gmail *GmailCredentials // Gmail source (optional)
|
||||
M365 *M365Credentials // Microsoft 365 Graph source (optional)
|
||||
Out string // var/mail root; default <repo>/var/mail
|
||||
Workers int // concurrency; default 4
|
||||
Limit int // max messages per source (0 = all)
|
||||
@@ -133,6 +134,14 @@ type Source interface {
|
||||
Folder() string
|
||||
}
|
||||
|
||||
// Committer is an optional Source capability: Commit is called after all listed
|
||||
// ids have been downloaded successfully. Sources that only advance durable state
|
||||
// on success (e.g. a Graph delta link) implement this so a killed or failed run
|
||||
// stays retryable without gaps.
|
||||
type Committer interface {
|
||||
Commit() error
|
||||
}
|
||||
|
||||
type ooSource struct {
|
||||
c *OOClient
|
||||
page int
|
||||
@@ -222,8 +231,22 @@ func Run(ctx context.Context, cfg SyncConfig) (*SyncStats, error) {
|
||||
}
|
||||
sources = append(sources, &gmailSource{c: gm, query: cfg.Query})
|
||||
}
|
||||
if cfg.M365 != nil {
|
||||
stateDir := filepath.Join(cfg.Out, ".m365")
|
||||
for _, mb := range cfg.M365.Users {
|
||||
if !strings.Contains(mb, "@") {
|
||||
return nil, fmt.Errorf("m365 user %q is not an email address", mb)
|
||||
}
|
||||
c, err := NewM365Client(*cfg.M365)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("m365 init for %s: %w", mb, err)
|
||||
}
|
||||
local := strings.SplitN(mb, "@", 2)[0]
|
||||
sources = append(sources, &m365Source{c: c, mailbox: mb, localpart: strings.ToLower(local), stateDir: stateDir})
|
||||
}
|
||||
}
|
||||
if len(sources) == 0 {
|
||||
return nil, errors.New("sync: no source configured (need OO, Gmail, or both)")
|
||||
return nil, errors.New("sync: no source configured (need OO, Gmail, M365, or a combination)")
|
||||
}
|
||||
|
||||
stats := &SyncStats{}
|
||||
@@ -296,6 +319,25 @@ func Run(ctx context.Context, cfg SyncConfig) (*SyncStats, error) {
|
||||
close(jobsCh)
|
||||
wg.Wait()
|
||||
|
||||
// Only advance durable source state (e.g. delta links) when everything
|
||||
// downloaded. A killed or failed run must be retryable without gaps.
|
||||
if len(failures) == 0 {
|
||||
seen := map[Source]bool{}
|
||||
for _, j := range jobs {
|
||||
if seen[j.src] {
|
||||
continue
|
||||
}
|
||||
seen[j.src] = true
|
||||
if c, ok := j.src.(Committer); ok {
|
||||
if err := c.Commit(); err != nil {
|
||||
mu.Lock()
|
||||
failures = append(failures, j.src.Folder()+"/commit: "+err.Error())
|
||||
mu.Unlock()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(failures) > 0 {
|
||||
fmt.Fprintf(os.Stderr, "sync: %d failures:\n %s\n", len(failures), strings.Join(failures, "\n "))
|
||||
}
|
||||
|
||||
+70
-5
@@ -1,20 +1,85 @@
|
||||
//usr/bin/env go run -tags=markdown_import "$0" "$@"; exit
|
||||
//go:build markdown_import
|
||||
//usr/bin/env go run "$0" "$@"; exit
|
||||
//
|
||||
// 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 --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.
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/eSlider/2dph/internal/cmdbin"
|
||||
cliparse "github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/eSlider/2dph/internal/mdleaves"
|
||||
)
|
||||
|
||||
func main() {
|
||||
os.Exit(cmdbin.ExecFile("bin/md/import", os.Args[1:]))
|
||||
os.Exit(run(os.Args[1:]))
|
||||
}
|
||||
|
||||
func run(args []string) int {
|
||||
c, err := mdleaves.ParseArgs(args)
|
||||
if err != nil {
|
||||
return cliparse.Fail(err)
|
||||
}
|
||||
jsonOut := c.JSONOut
|
||||
files := c.Files
|
||||
root := c.Root
|
||||
|
||||
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
+61
@@ -0,0 +1,61 @@
|
||||
//usr/bin/env go run -tags=qa_stats "$0" "$@"; exit
|
||||
//go:build qa_stats
|
||||
//
|
||||
// bin/qa/stats.go - DuckDB quantiles over a JSON number array or JSONL count.
|
||||
//
|
||||
// ./bin/qa/stats.go <<< '[1,2,3,4,5]'
|
||||
// ./bin/qa/stats.go --jsonl rows.jsonl
|
||||
//
|
||||
// NOTE: never run `gofmt -w` on this file — it breaks the shebang.
|
||||
// DuckDB CGO needs gcc/g++ (not Zig). After eval "$(bin/cgo/zig env)":
|
||||
// CC=gcc CXX=g++ CGO_CFLAGS= CGO_LDFLAGS= ./bin/qa/stats.go
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
|
||||
cliparse "github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/eSlider/2dph/internal/duckstats"
|
||||
)
|
||||
|
||||
func main() {
|
||||
os.Exit(run(os.Args[1:]))
|
||||
}
|
||||
|
||||
func run(args []string) int {
|
||||
c, err := cliparse.ParseQAStats(args)
|
||||
if err != nil {
|
||||
return cliparse.Fail(err)
|
||||
}
|
||||
jsonl := c.JSONL
|
||||
if jsonl != "" {
|
||||
n, err := duckstats.CountJSONL(jsonl)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
return 1
|
||||
}
|
||||
fmt.Printf("n: %d\n", n)
|
||||
return 0
|
||||
}
|
||||
raw, err := io.ReadAll(os.Stdin)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
return 1
|
||||
}
|
||||
var samples []float64
|
||||
if err := json.Unmarshal(raw, &samples); err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
return 1
|
||||
}
|
||||
s, err := duckstats.Quantiles(samples)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
return 1
|
||||
}
|
||||
fmt.Printf("n: %d\nmin: %g\np50: %g\np95: %g\nmax: %g\navg: %g\n",
|
||||
s.N, s.Min, s.P50, s.P95, s.Max, s.Avg)
|
||||
return 0
|
||||
}
|
||||
Executable
+73
@@ -0,0 +1,73 @@
|
||||
//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 compose profile picoclaw; 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"
|
||||
|
||||
cliparse "github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/eSlider/2dph/internal/duckstats"
|
||||
"github.com/eSlider/2dph/internal/reasoner"
|
||||
)
|
||||
|
||||
func main() {
|
||||
os.Exit(run(os.Args[1:]))
|
||||
}
|
||||
|
||||
func run(args []string) int {
|
||||
c, err := reasoner.ParseArgs(args)
|
||||
if err != nil {
|
||||
return cliparse.Fail(err)
|
||||
}
|
||||
base, model, jsonOut, device := c.Base, c.Model, c.JSONOut, c.Device
|
||||
client := reasoner.Client{BaseURL: base, Model: model, Device: device}
|
||||
rep := reasoner.Run(client)
|
||||
lat := make([]float64, 0, len(rep.Prompts))
|
||||
for _, p := range rep.Prompts {
|
||||
lat = append(lat, float64(p.LatencyMS))
|
||||
}
|
||||
if st, err := duckstats.Quantiles(lat); err == nil {
|
||||
rep.LatencyP50MS = st.P50
|
||||
rep.LatencyP95MS = st.P95
|
||||
}
|
||||
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)
|
||||
fmt.Printf("latency_p50_ms: %g\n", rep.LatencyP50MS)
|
||||
fmt.Printf("latency_p95_ms: %g\n", rep.LatencyP95MS)
|
||||
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)
|
||||
}
|
||||
}
|
||||
httpapi.Run()
|
||||
httpapi.Run(nil)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,248 @@
|
||||
# bin/stack/lib.sh — compose helpers for start / start-assistant / stop / status.
|
||||
# Sourced, not executed. No secrets. No host-absolute paths.
|
||||
|
||||
BRAIN_URL="${BRAIN_URL:-http://127.0.0.1:8630}"
|
||||
REASONER_URL="${REASONER_URL:-http://127.0.0.1:11435}"
|
||||
PICOCLAW_URL="${PICOCLAW_URL:-http://127.0.0.1:18790}"
|
||||
REASONER_MODEL="${REASONER_MODEL:-qwen3.5:9b}"
|
||||
STACK_WAIT_SECS="${STACK_WAIT_SECS:-90}"
|
||||
STACK_WAIT_INTERVAL="${STACK_WAIT_INTERVAL:-2}"
|
||||
STACK_PULL_SECS="${STACK_PULL_SECS:-600}"
|
||||
|
||||
if [[ -z "${ROOT:-}" ]]; then
|
||||
STACK_DIR="$(CDPATH= cd -- "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
ROOT="$(CDPATH= cd -- "$STACK_DIR/../.." && pwd)"
|
||||
fi
|
||||
|
||||
stack_usage() {
|
||||
awk 'NR == 1 { next } /^#/ { sub(/^# ?/, ""); print; next } { exit }' "$1"
|
||||
}
|
||||
|
||||
stack_die() {
|
||||
echo "bin/stack: $*" >&2
|
||||
return 1
|
||||
}
|
||||
|
||||
compose() {
|
||||
docker compose -f "$ROOT/compose.yaml" --project-directory "$ROOT" "$@"
|
||||
}
|
||||
|
||||
http_get() {
|
||||
local url=$1
|
||||
local timeout=${2:-5}
|
||||
curl -sS --max-time "$timeout" "$url" 2>/dev/null || return 1
|
||||
}
|
||||
|
||||
health_ok() {
|
||||
local url=$1
|
||||
local timeout=${2:-5}
|
||||
local body
|
||||
body=$(http_get "$url" "$timeout") || return 1
|
||||
printf '%s' "$body" | grep -q '"status":"ok"'
|
||||
}
|
||||
|
||||
wait_health() {
|
||||
local url=$1
|
||||
local n=0
|
||||
while ((n <= STACK_WAIT_SECS)); do
|
||||
if health_ok "$url"; then
|
||||
return 0
|
||||
fi
|
||||
n=$((n + 1))
|
||||
if ((n <= STACK_WAIT_SECS)); then
|
||||
sleep "$STACK_WAIT_INTERVAL"
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
wait_http() {
|
||||
local url=$1
|
||||
local n=0
|
||||
while ((n <= STACK_WAIT_SECS)); do
|
||||
if http_get "$url" 5 >/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
n=$((n + 1))
|
||||
if ((n <= STACK_WAIT_SECS)); then
|
||||
sleep "$STACK_WAIT_INTERVAL"
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
mcp_body() {
|
||||
curl -sS --max-time 10 \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d '{"jsonrpc":"2.0","id":1,"method":"tools/list"}' \
|
||||
"$BRAIN_URL/mcp" 2>/dev/null || return 1
|
||||
}
|
||||
|
||||
mcp_ok() {
|
||||
local body
|
||||
body=$(mcp_body) || return 1
|
||||
printf '%s' "$body" | grep -Eq '"name": ?"search"' || return 1
|
||||
printf '%s' "$body" | grep -Eq '"name": ?"get"' || return 1
|
||||
printf '%s' "$body" | grep -Eq '"name": ?"audit"' || return 1
|
||||
return 0
|
||||
}
|
||||
|
||||
reasoner_tags() {
|
||||
http_get "$REASONER_URL/api/tags" 5
|
||||
}
|
||||
|
||||
reasoner_has_model() {
|
||||
local body
|
||||
body=$(reasoner_tags) || return 1
|
||||
printf '%s' "$body" | grep -Fq "$REASONER_MODEL"
|
||||
}
|
||||
|
||||
ensure_mcp() {
|
||||
mcp_ok || stack_die "MCP tools/list missing search/get/audit at $BRAIN_URL/mcp"
|
||||
}
|
||||
|
||||
ensure_brain() {
|
||||
if health_ok "$BRAIN_URL/health"; then
|
||||
echo "brain: reuse $BRAIN_URL" >&2
|
||||
else
|
||||
echo "brain: compose up" >&2
|
||||
compose up -d brain
|
||||
wait_health "$BRAIN_URL/health" || stack_die "brain health failed at $BRAIN_URL/health"
|
||||
fi
|
||||
ensure_mcp
|
||||
}
|
||||
|
||||
pull_reasoner_model() {
|
||||
echo "reasoner: pulling $REASONER_MODEL (CPU, may take minutes)" >&2
|
||||
curl -sS --max-time "$STACK_PULL_SECS" \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d "{\"name\":\"$REASONER_MODEL\"}" \
|
||||
"$REASONER_URL/api/pull" >/dev/null
|
||||
}
|
||||
|
||||
ensure_reasoner() {
|
||||
if reasoner_has_model; then
|
||||
echo "reasoner: reuse $REASONER_URL model $REASONER_MODEL" >&2
|
||||
return 0
|
||||
fi
|
||||
if ! reasoner_tags >/dev/null; then
|
||||
echo "reasoner: compose up" >&2
|
||||
compose --profile reasoner up -d reasoner
|
||||
wait_http "$REASONER_URL/api/tags" || stack_die "reasoner not listening at $REASONER_URL"
|
||||
fi
|
||||
if reasoner_has_model; then
|
||||
return 0
|
||||
fi
|
||||
pull_reasoner_model
|
||||
reasoner_has_model || stack_die "reasoner missing model $REASONER_MODEL"
|
||||
}
|
||||
|
||||
ensure_picoclaw() {
|
||||
echo "picoclaw: compose up --no-deps (reuse healthy :8630/:11435)" >&2
|
||||
compose --profile picoclaw up -d --no-deps picoclaw
|
||||
wait_health "$PICOCLAW_URL/health" || stack_die "picoclaw health failed at $PICOCLAW_URL/health"
|
||||
}
|
||||
|
||||
mail_sync_running() {
|
||||
compose ps --status running --services 2>/dev/null | grep -qx mail-sync
|
||||
}
|
||||
|
||||
stack_status() {
|
||||
local bh=down mcp=down ph=down present=false ms=down
|
||||
health_ok "$BRAIN_URL/health" && bh=ok
|
||||
mcp_ok && mcp=ok
|
||||
reasoner_has_model && present=true
|
||||
health_ok "$PICOCLAW_URL/health" && ph=ok
|
||||
mail_sync_running && ms=ok
|
||||
cat <<EOF
|
||||
brain:
|
||||
url: $BRAIN_URL
|
||||
health: $bh
|
||||
mcp: $mcp
|
||||
reasoner:
|
||||
url: $REASONER_URL
|
||||
model: $REASONER_MODEL
|
||||
present: $present
|
||||
picoclaw:
|
||||
url: $PICOCLAW_URL
|
||||
health: $ph
|
||||
mail_sync:
|
||||
service: mail-sync
|
||||
running: $ms
|
||||
EOF
|
||||
}
|
||||
|
||||
stack_start() {
|
||||
ensure_brain
|
||||
}
|
||||
|
||||
stack_start_mail_sync() {
|
||||
echo "mail-sync: compose up (ETL sync→import; index only if MAIL_SYNC_INDEX=1)" >&2
|
||||
compose up -d mail-sync
|
||||
}
|
||||
|
||||
stack_attach_agent() {
|
||||
local opts=()
|
||||
if [[ -t 0 && -t 1 ]]; then
|
||||
opts+=(-it)
|
||||
else
|
||||
opts+=(-T)
|
||||
fi
|
||||
if [[ (! -t 0 || ! -t 1) && $# -eq 0 ]]; then
|
||||
echo "picoclaw: no TTY. Attach with:" >&2
|
||||
echo " $ROOT/bin/stack/start-assistant" >&2
|
||||
echo " docker compose --profile picoclaw exec -it picoclaw picoclaw agent" >&2
|
||||
return 0
|
||||
fi
|
||||
echo "picoclaw: agent (search → get → audit before a factual reply)" >&2
|
||||
exec docker compose -f "$ROOT/compose.yaml" --project-directory "$ROOT" \
|
||||
--profile picoclaw exec "${opts[@]}" picoclaw picoclaw agent "$@"
|
||||
}
|
||||
|
||||
stack_start_assistant() {
|
||||
local attach=1
|
||||
local agent_args=()
|
||||
while (($#)); do
|
||||
case "$1" in
|
||||
-h | --help)
|
||||
stack_usage "$ROOT/bin/stack/start-assistant"
|
||||
return 0
|
||||
;;
|
||||
--no-attach)
|
||||
attach=0
|
||||
shift
|
||||
;;
|
||||
--)
|
||||
shift
|
||||
agent_args+=("$@")
|
||||
break
|
||||
;;
|
||||
*)
|
||||
agent_args+=("$1")
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
stack_start
|
||||
ensure_reasoner
|
||||
ensure_picoclaw
|
||||
stack_status
|
||||
if ((attach == 0)); then
|
||||
echo "picoclaw: gateway $PICOCLAW_URL (agent not attached)" >&2
|
||||
echo "ask the brain: $ROOT/bin/stack/start-assistant" >&2
|
||||
echo "one-shot: $ROOT/bin/stack/start-assistant -- -m \"search the 2dph brain for LadybugDB\"" >&2
|
||||
return 0
|
||||
fi
|
||||
stack_attach_agent "${agent_args[@]}"
|
||||
}
|
||||
|
||||
stack_stop() {
|
||||
case "${1:-}" in
|
||||
-h | --help)
|
||||
stack_usage "$ROOT/bin/stack/stop"
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
echo "stack: stop brain brain-mcp reasoner picoclaw mail-sync (volumes kept)" >&2
|
||||
compose --profile picoclaw --profile reasoner stop picoclaw brain-mcp reasoner brain mail-sync
|
||||
}
|
||||
Executable
+21
@@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env bash
|
||||
# bin/stack/start - bring up brain HTTP/MCP and wait until search/get/audit respond.
|
||||
#
|
||||
# bin/stack/start
|
||||
# bin/stack/status
|
||||
#
|
||||
# Reuses a healthy process on :8630 (host serve or compose). Does not start
|
||||
# PicoClaw. Does not rebuild Ladybug.
|
||||
set -euo pipefail
|
||||
|
||||
STACK_DIR="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
|
||||
# shellcheck source=lib.sh
|
||||
source "$STACK_DIR/lib.sh"
|
||||
case "${1:-}" in
|
||||
-h | --help)
|
||||
stack_usage "$0"
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
stack_start "$@"
|
||||
stack_status
|
||||
Executable
+15
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
# bin/stack/start-assistant - start + CPU reasoner + PicoClaw, then attach agent.
|
||||
#
|
||||
# bin/stack/start-assistant
|
||||
# bin/stack/start-assistant --no-attach
|
||||
# bin/stack/start-assistant -- -m "search the 2dph brain for LadybugDB"
|
||||
#
|
||||
# Pulls qwen3.5:9b if missing. Gateway :18790. Agent uses MCP search → get → audit.
|
||||
# --no-attach leaves the gateway up without exec.
|
||||
set -euo pipefail
|
||||
|
||||
STACK_DIR="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
|
||||
# shellcheck source=lib.sh
|
||||
source "$STACK_DIR/lib.sh"
|
||||
stack_start_assistant "$@"
|
||||
Executable
+21
@@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env bash
|
||||
# bin/stack/start-mail-sync - compose up mail-sync ETL (sync → import; optional index).
|
||||
#
|
||||
# bin/stack/start-mail-sync
|
||||
#
|
||||
# Default: onlyoffice,gmail every 300s into kb-var. Full --rebuild only if
|
||||
# MAIL_SYNC_INDEX=1 in compose/env. Secrets: ~/.config/brain/mail.env +
|
||||
# ~/.gmail-mcp (mounted). Does not start brain/picoclaw.
|
||||
set -euo pipefail
|
||||
|
||||
STACK_DIR="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
|
||||
# shellcheck source=lib.sh
|
||||
source "$STACK_DIR/lib.sh"
|
||||
case "${1:-}" in
|
||||
-h | --help)
|
||||
stack_usage "$0"
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
stack_start_mail_sync "$@"
|
||||
stack_status
|
||||
Executable
+17
@@ -0,0 +1,17 @@
|
||||
#!/usr/bin/env bash
|
||||
# bin/stack/status - YAML health for brain MCP, reasoner model, PicoClaw gateway.
|
||||
#
|
||||
# bin/stack/status
|
||||
# bin/stack/status | yq '.picoclaw'
|
||||
set -euo pipefail
|
||||
|
||||
STACK_DIR="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
|
||||
# shellcheck source=lib.sh
|
||||
source "$STACK_DIR/lib.sh"
|
||||
case "${1:-}" in
|
||||
-h | --help)
|
||||
stack_usage "$0"
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
stack_status
|
||||
Executable
+13
@@ -0,0 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
# bin/stack/stop - stop compose brain / brain-mcp / reasoner / picoclaw / mail-sync.
|
||||
#
|
||||
# bin/stack/stop
|
||||
#
|
||||
# Volumes kept (kb, reasoner weights, picoclaw-home). Does not kill a host
|
||||
# bin/brain/serve.go that is not a compose service.
|
||||
set -euo pipefail
|
||||
|
||||
STACK_DIR="$(CDPATH= cd -- "$(dirname "$0")" && pwd)"
|
||||
# shellcheck source=lib.sh
|
||||
source "$STACK_DIR/lib.sh"
|
||||
stack_stop "$@"
|
||||
@@ -0,0 +1,103 @@
|
||||
"""D16 contradiction adjudication (same rules as internal/facts)."""
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
CONF_CONFIRMED = "confirmed"
|
||||
CONF_HYPOTHESIS = "hypothesis"
|
||||
|
||||
RULE_UNRESOLVED = "unresolved"
|
||||
RULE_TEMPORAL = "temporal_freshness"
|
||||
RULE_AUTHORITY = "authority_pairing"
|
||||
RULE_TWO_SOURCE = "two_source"
|
||||
RULE_SINGLE = "single_source"
|
||||
|
||||
KIND_RUNTIME = "runtime"
|
||||
KIND_CONFIG = "config"
|
||||
KIND_NARRATIVE = "narrative"
|
||||
|
||||
|
||||
def _independent(sources: list[dict]) -> int:
|
||||
seen: set[str] = set()
|
||||
for i, s in enumerate(sources):
|
||||
sid = str(s.get("id") or "") or f"{s.get('kind', '')}#{i}"
|
||||
seen.add(sid)
|
||||
return len(seen)
|
||||
|
||||
|
||||
def _fresh_n(sources: list[dict]) -> int:
|
||||
return sum(1 for s in sources if not s.get("stale"))
|
||||
|
||||
|
||||
def _strong_n(sources: list[dict]) -> int:
|
||||
return sum(1 for s in sources if s.get("kind") in (KIND_RUNTIME, KIND_CONFIG))
|
||||
|
||||
|
||||
def adjudicate(claim: dict[str, Any]) -> dict[str, Any]:
|
||||
yes = list(claim.get("yes") or [])
|
||||
no = list(claim.get("no") or [])
|
||||
yes_n, no_n = _independent(yes), _independent(no)
|
||||
text = str(claim.get("text") or "")
|
||||
|
||||
def out(conf: str, rule: str, winner: str = "") -> dict[str, Any]:
|
||||
return {
|
||||
"text": text,
|
||||
"confidence": conf,
|
||||
"confirmed": conf == CONF_CONFIRMED,
|
||||
"rule": rule,
|
||||
"winner": winner,
|
||||
"yes": yes_n,
|
||||
"no": no_n,
|
||||
}
|
||||
|
||||
if yes_n < 2 or no_n < 2:
|
||||
if yes_n >= 2:
|
||||
return out(CONF_CONFIRMED, RULE_TWO_SOURCE, "yes")
|
||||
if no_n >= 2:
|
||||
return out(CONF_CONFIRMED, RULE_TWO_SOURCE, "no")
|
||||
return out(CONF_HYPOTHESIS, RULE_SINGLE)
|
||||
yf, nf = _fresh_n(yes), _fresh_n(no)
|
||||
if yf >= 2 and nf < 2:
|
||||
return out(CONF_CONFIRMED, RULE_TEMPORAL, "yes")
|
||||
if nf >= 2 and yf < 2:
|
||||
return out(CONF_CONFIRMED, RULE_TEMPORAL, "no")
|
||||
ys, ns = _strong_n(yes), _strong_n(no)
|
||||
if ys >= 2 and ns < 2:
|
||||
return out(CONF_CONFIRMED, RULE_AUTHORITY, "yes")
|
||||
if ns >= 2 and ys < 2:
|
||||
return out(CONF_CONFIRMED, RULE_AUTHORITY, "no")
|
||||
return out(CONF_HYPOTHESIS, RULE_UNRESOLVED)
|
||||
|
||||
|
||||
def parse_source_field(source: str) -> tuple[str, str]:
|
||||
"""Split `a x b vs c x d` into (yes, no). Empty no if no ` vs `."""
|
||||
if " vs " not in source:
|
||||
return source, ""
|
||||
yes, _, no = source.partition(" vs ")
|
||||
return yes.strip(), no.strip()
|
||||
|
||||
|
||||
def check_fact_row(lid: str, source: str, loc: str, how: str, conf: str) -> list[str]:
|
||||
"""Lexicon checks for one facts leaf (no Ladybug)."""
|
||||
problems: list[str] = []
|
||||
src = source or ""
|
||||
if conf == CONF_CONFIRMED:
|
||||
if " vs " in src:
|
||||
problems.append(f"{lid}: confirmed fact cannot keep a vs-contradiction")
|
||||
if " x " not in src:
|
||||
problems.append(f"{lid}: needs 2-source evidence in source, got '{source}'")
|
||||
elif conf == CONF_HYPOTHESIS:
|
||||
yes, no = parse_source_field(src)
|
||||
if not no or " x " not in yes or " x " not in no:
|
||||
problems.append(
|
||||
f"{lid}: hypothesis contradiction needs 'a x b vs c x d', got '{source}'"
|
||||
)
|
||||
elif conf == "partial":
|
||||
pass
|
||||
else:
|
||||
problems.append(f"{lid}: unknown confidence '{conf}'")
|
||||
if not loc:
|
||||
problems.append(f"{lid}: missing loc (evidence pointer)")
|
||||
if not how:
|
||||
problems.append(f"{lid}: missing how")
|
||||
return problems
|
||||
+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):
|
||||
|
||||
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.
|
||||
Commit records come from bin/git/import.go (go-git). This module only MERGEs
|
||||
the version graph File-[:HAS_VERSION]->Commit-[:AUTHORED]->Person.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass, field
|
||||
|
||||
REC_SEP = "\x1e"
|
||||
FIELD_SEP = "\x1f"
|
||||
|
||||
|
||||
@dataclass
|
||||
class Commit:
|
||||
@@ -26,54 +17,6 @@ class Commit:
|
||||
subject: str
|
||||
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 = (
|
||||
"CREATE NODE TABLE IF NOT EXISTS Commit (id STRING, repo STRING, subject STRING, "
|
||||
|
||||
+165
-12
@@ -4,7 +4,7 @@ Single embedded graph `var/kb.lbug`. Two roots: facts (assertions backed by
|
||||
>=2 independent sources) and info (narrative leafs). Hybrid retrieval: BM25
|
||||
(FTS extension) + HNSW cosine (VECTOR extension) + Cypher graph hops.
|
||||
|
||||
All access is read-only unless `--rebuild` is passed to kb/index.
|
||||
All access is read-only unless `--rebuild` (kb/index) or `kb/add`.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
@@ -62,7 +62,9 @@ def init_schema(conn: ladybug.Connection) -> None:
|
||||
"CREATE NODE TABLE IF NOT EXISTS Leaf ("
|
||||
" id STRING, text STRING, root STRING, confidence STRING, "
|
||||
" sha256 STRING, source STRING, source_rev STRING, observed_at STRING, "
|
||||
" how STRING, loc STRING, type STRING, embedding FLOAT[256], "
|
||||
" how STRING, loc STRING, type STRING, "
|
||||
" valid_from STRING, valid_to STRING, "
|
||||
" embedding FLOAT[256], "
|
||||
" PRIMARY KEY(id))"
|
||||
)
|
||||
conn.execute(
|
||||
@@ -91,6 +93,46 @@ def init_schema(conn: ladybug.Connection) -> None:
|
||||
conn.execute(
|
||||
"CREATE REL TABLE IF NOT EXISTS AUTHORED (FROM Commit TO Person)"
|
||||
)
|
||||
ensure_interval_columns(conn)
|
||||
|
||||
|
||||
def ensure_interval_columns(conn: ladybug.Connection) -> None:
|
||||
"""D24: add valid_from/valid_to on older Leaf tables (idempotent ALTER)."""
|
||||
for col in ("valid_from", "valid_to"):
|
||||
try:
|
||||
conn.execute(f"ALTER TABLE Leaf ADD {col} STRING")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def normalize_day(s: str) -> str:
|
||||
s = (s or "").strip()
|
||||
if len(s) >= 10 and s[4] == "-" and s[7] == "-":
|
||||
return s[:10]
|
||||
return s
|
||||
|
||||
|
||||
def active_at(valid_from: str, valid_to: str, as_of: str) -> bool:
|
||||
"""D24: fact interval of truth. Empty ends = always; empty as_of = no filter."""
|
||||
as_of = normalize_day(as_of)
|
||||
if not as_of:
|
||||
return True
|
||||
fro = normalize_day(valid_from)
|
||||
to = normalize_day(valid_to)
|
||||
if fro and as_of < fro:
|
||||
return False
|
||||
if to and as_of > to:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def filter_as_of(hits: list[dict], as_of: str) -> list[dict]:
|
||||
if not as_of:
|
||||
return hits
|
||||
return [
|
||||
h for h in hits
|
||||
if active_at(str(h.get("valid_from") or ""), str(h.get("valid_to") or ""), as_of)
|
||||
]
|
||||
|
||||
|
||||
def leaf_id(text: str, source: str) -> str:
|
||||
@@ -99,25 +141,124 @@ def leaf_id(text: str, source: str) -> str:
|
||||
|
||||
def upsert_leaf(conn: ladybug.Connection, *, text: str, root: str, confidence: str,
|
||||
source: str, source_rev: str, how: str, loc: str, type_: str,
|
||||
embedding: list[float] | None) -> str:
|
||||
embedding: list[float] | None,
|
||||
valid_from: str = "", valid_to: str = "") -> str:
|
||||
lid = leaf_id(text, source)
|
||||
obs = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())
|
||||
vf = normalize_day(valid_from)
|
||||
vt = normalize_day(valid_to)
|
||||
conn.execute(
|
||||
"MERGE (l:Leaf {id:$id}) "
|
||||
"SET l.text=$text, l.root=$root, l.confidence=$confidence, "
|
||||
" l.sha256=$sha, l.source=$source, l.source_rev=$rev, l.observed_at=$obs, "
|
||||
" l.how=$how, l.loc=$location, l.type=$type"
|
||||
" l.how=$how, l.loc=$location, l.type=$type, "
|
||||
" l.valid_from=$vf, l.valid_to=$vt"
|
||||
+ (", l.embedding=$emb" if embedding else ""),
|
||||
parameters={
|
||||
"id": lid, "text": text, "root": root, "confidence": confidence,
|
||||
"sha": sha256_b64(text), "source": source, "rev": source_rev,
|
||||
"obs": obs, "how": how, "location": loc, "type": type_,
|
||||
"vf": vf, "vt": vt,
|
||||
"emb": (embedding if embedding else None),
|
||||
},
|
||||
)
|
||||
return lid
|
||||
|
||||
|
||||
def add_leafs(conn: ladybug.Connection, leafs: list[dict]) -> list[str]:
|
||||
"""Write facts+info leafs in one transaction. Safe while FTS/HNSW exist.
|
||||
|
||||
Each leaf dict: text, source, optional root/confidence/source_rev/how/loc/type/
|
||||
embedding/valid_from/valid_to. Does not delete the database file. Measured on
|
||||
Ladybug 0.19: MERGE of new ids (and updates) stays FTS+HNSW queryable; DROP
|
||||
INDEX is the fatal path.
|
||||
"""
|
||||
if not leafs:
|
||||
return []
|
||||
started = False
|
||||
try:
|
||||
conn.execute("BEGIN TRANSACTION")
|
||||
started = True
|
||||
except Exception:
|
||||
started = False
|
||||
ids: list[str] = []
|
||||
try:
|
||||
for lf in leafs:
|
||||
ids.append(
|
||||
upsert_leaf(
|
||||
conn,
|
||||
text=str(lf["text"]),
|
||||
root=str(lf.get("root") or ROOT_INFO),
|
||||
confidence=str(lf.get("confidence") or CONF_CONFIRMED),
|
||||
source=str(lf["source"]),
|
||||
source_rev=str(lf.get("source_rev") or "working-tree"),
|
||||
how=str(lf.get("how") or "brain/add"),
|
||||
loc=str(lf.get("loc") or lf.get("source") or ""),
|
||||
type_=str(lf.get("type") or lf.get("type_") or "reference"),
|
||||
embedding=lf.get("embedding"),
|
||||
valid_from=str(lf.get("valid_from") or ""),
|
||||
valid_to=str(lf.get("valid_to") or ""),
|
||||
)
|
||||
)
|
||||
if started:
|
||||
conn.execute("COMMIT")
|
||||
except Exception:
|
||||
if started:
|
||||
try:
|
||||
conn.execute("ROLLBACK")
|
||||
except Exception:
|
||||
pass
|
||||
raise
|
||||
return ids
|
||||
|
||||
|
||||
def file_id(repo: str, path: str) -> str:
|
||||
"""Stable File.id matching gitimport (`repo:path`)."""
|
||||
return f"{repo}:{path}" if repo else path
|
||||
|
||||
|
||||
def link_from_file(conn: ladybug.Connection, leaf_id: str, path: str,
|
||||
repo: str = "", mtime: str = "") -> str:
|
||||
"""MERGE File and Leaf-[:FROM_FILE]->File so --hop 1 can walk."""
|
||||
fid = file_id(repo, path)
|
||||
conn.execute(
|
||||
"MERGE (f:File {id:$id}) SET f.path=$path, f.repo=$repo, f.mtime=$mtime",
|
||||
parameters={"id": fid, "path": path, "repo": repo, "mtime": mtime},
|
||||
)
|
||||
conn.execute(
|
||||
"MATCH (l:Leaf {id:$lid}), (f:File {id:$fid}) "
|
||||
"MERGE (l)-[:FROM_FILE]->(f)",
|
||||
parameters={"lid": leaf_id, "fid": fid},
|
||||
)
|
||||
return fid
|
||||
|
||||
|
||||
HOP_STMTS = {
|
||||
1: "MATCH (l:Leaf {id:$id})-[:FROM_FILE]->(f:File) RETURN f.id, f.path, 1",
|
||||
2: ("MATCH (l:Leaf {id:$id})-[:FROM_FILE]->(f:File)-[:HAS_VERSION]->(c:Commit) "
|
||||
"RETURN c.id, c.subject, 2"),
|
||||
3: ("MATCH (l:Leaf {id:$id})-[:FROM_FILE]->(f:File)-[:HAS_VERSION]->(c:Commit)"
|
||||
"-[:AUTHORED]->(p:Person) RETURN p.id, p.name, 3"),
|
||||
}
|
||||
HOP_LABELS = {1: "File", 2: "Commit", 3: "Person"}
|
||||
|
||||
|
||||
def hop_walk(conn: ladybug.Connection, leaf_id: str, n: int) -> list[dict]:
|
||||
"""Walk Leaf → File → Commit → Person up to n hops (max 3)."""
|
||||
depth = min(max(int(n), 0), 3)
|
||||
out: list[dict] = []
|
||||
for d in range(1, depth + 1):
|
||||
rows = conn.execute(HOP_STMTS[d], parameters={"id": leaf_id}).get_all()
|
||||
for row in rows:
|
||||
out.append({
|
||||
"id": row[0],
|
||||
"label": HOP_LABELS[d],
|
||||
"name": row[1],
|
||||
"depth": int(row[2]),
|
||||
})
|
||||
return out
|
||||
|
||||
|
||||
def leaf_index_names(conn: ladybug.Connection) -> set[str]:
|
||||
"""Return index names on the Leaf table (e.g. {'id', 'Leaf_vec', '_PK'})."""
|
||||
rows = conn.execute("CALL SHOW_INDEXES() RETURN *").get_all()
|
||||
@@ -194,29 +335,39 @@ def drop_indexes(conn: ladybug.Connection) -> None:
|
||||
def query_fts(conn: ladybug.Connection, text: str, limit: int = 10) -> list[dict]:
|
||||
r = conn.execute(
|
||||
"CALL QUERY_FTS_INDEX('Leaf', 'id', $q) "
|
||||
"RETURN node.id, node.text, node.root, score ORDER BY score DESC LIMIT $n",
|
||||
"RETURN node.id, node.text, node.root, score, node.valid_from, node.valid_to "
|
||||
"ORDER BY score DESC LIMIT $n",
|
||||
parameters={"q": text, "n": limit},
|
||||
)
|
||||
return [{"id": row[0], "text": row[1], "root": row[2], "score": row[3]} for row in r.get_all()]
|
||||
return [
|
||||
{
|
||||
"id": row[0], "text": row[1], "root": row[2], "score": row[3],
|
||||
"valid_from": row[4] or "", "valid_to": row[5] or "",
|
||||
}
|
||||
for row in r.get_all()
|
||||
]
|
||||
|
||||
|
||||
def query_vector(conn: ladybug.Connection, embedding: list[float], limit: int = 10) -> list[dict]:
|
||||
r = conn.execute(
|
||||
"CALL QUERY_VECTOR_INDEX('Leaf', 'Leaf_vec', $q, $n) "
|
||||
"RETURN node.id, node.text, node.root, distance ORDER BY distance LIMIT $n",
|
||||
"RETURN node.id, node.text, node.root, distance, node.valid_from, node.valid_to "
|
||||
"ORDER BY distance LIMIT $n",
|
||||
parameters={"q": embedding, "n": limit},
|
||||
)
|
||||
out = []
|
||||
for row in r.get_all():
|
||||
# distance -> similarity reasonable for cosine
|
||||
score = 1.0 - row[3] if row[3] is not None else 0.0
|
||||
out.append({"id": row[0], "text": row[1], "root": row[2], "score": score})
|
||||
out.append({
|
||||
"id": row[0], "text": row[1], "root": row[2], "score": score,
|
||||
"valid_from": row[4] or "", "valid_to": row[5] or "",
|
||||
})
|
||||
return out
|
||||
|
||||
|
||||
def hybrid_search(conn: ladybug.Connection, embedding: list[float], fts_hits: list[dict],
|
||||
limit: int = 10) -> list[dict]:
|
||||
"""Merge FTS + vector by reciprocal rank fusion."""
|
||||
limit: int = 10, as_of: str = "") -> list[dict]:
|
||||
"""Merge FTS + vector by reciprocal rank fusion; optional D24 as-of filter."""
|
||||
fused: dict[str, dict] = {}
|
||||
for rank, hit in enumerate(fts_hits):
|
||||
fused.setdefault(hit["id"], {**hit, "rrf": 0.0})["rrf"] = 1.0 / (60 + rank + 1)
|
||||
@@ -224,8 +375,10 @@ def hybrid_search(conn: ladybug.Connection, embedding: list[float], fts_hits: li
|
||||
entry = fused.setdefault(hit["id"], {**hit, "rrf": 0.0})
|
||||
entry["rrf"] += 1.0 / (60 + rank + 1)
|
||||
entry.setdefault("score", hit.get("score", 0.0))
|
||||
entry.setdefault("valid_from", hit.get("valid_from") or "")
|
||||
entry.setdefault("valid_to", hit.get("valid_to") or "")
|
||||
ranked = sorted(fused.values(), key=lambda h: h.get("rrf", 0.0), reverse=True)
|
||||
return ranked[:limit]
|
||||
return filter_as_of(ranked, as_of)[:limit]
|
||||
|
||||
|
||||
def stats(conn: ladybug.Connection) -> dict:
|
||||
|
||||
+84
-1
@@ -7,7 +7,10 @@ offline against fixtures.
|
||||
from __future__ import annotations
|
||||
|
||||
import html
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import tempfile
|
||||
import zipfile
|
||||
from pathlib import Path
|
||||
|
||||
@@ -18,9 +21,10 @@ OFFICE_SUFFIXES = {".docx", ".pptx", ".xlsx", ".html", ".htm", ".epub", ".eml",
|
||||
PDF_SUFFIXES = {".pdf"}
|
||||
IMAGE_SUFFIXES = {".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".tif", ".webp"}
|
||||
ARCHIVE_SUFFIXES = {".zip"}
|
||||
# Legacy binary Office (doc/xls/ppt) — markitdown/docling skip them; we try
|
||||
# Legacy binary Office (doc/xls/ppt) — markitdown skip them; we try
|
||||
# pandoc first, else leave a stub.
|
||||
LEGACY_OFFICE_SUFFIXES = {".doc", ".xls", ".ppt"}
|
||||
TESS_LANG = "eng+deu"
|
||||
|
||||
CONVERTIBLE_SUFFIXES = (
|
||||
TEXT_SUFFIXES | OFFICE_SUFFIXES | PDF_SUFFIXES | IMAGE_SUFFIXES | ARCHIVE_SUFFIXES | LEGACY_OFFICE_SUFFIXES
|
||||
@@ -146,3 +150,82 @@ def zip_extract_safe(zip_path: Path, dest: Path) -> list[Path]:
|
||||
|
||||
def is_convertible(suffix: str) -> bool:
|
||||
return suffix.lower() in CONVERTIBLE_SUFFIXES
|
||||
|
||||
|
||||
def convert_pdf(path: Path, ocr: bool = False) -> str:
|
||||
"""pdftotext -layout first; empty text layer → pdftoppm + tesseract.
|
||||
|
||||
`ocr` is unused for born-digital PDFs (text layer wins). Scans OCR
|
||||
automatically. This path never execs an ONNX document converter.
|
||||
"""
|
||||
del ocr # scans OCR when the text layer is empty; flag is for images
|
||||
text = pdf_fast_text(path)
|
||||
if text and text.strip():
|
||||
return normalize_markdown(text)
|
||||
scanned = ocr_pdf(path)
|
||||
if scanned and scanned.strip():
|
||||
return normalize_markdown(scanned)
|
||||
if text:
|
||||
return normalize_markdown(text)
|
||||
return "\n<!-- pdf has no text layer (ocr unavailable) -->\n"
|
||||
|
||||
|
||||
def pdf_fast_text(path: Path) -> str | None:
|
||||
"""pdftotext -layout; None when poppler is missing or the command fails."""
|
||||
try:
|
||||
proc = subprocess.run(
|
||||
["pdftotext", "-layout", str(path), "-"],
|
||||
capture_output=True, timeout=60)
|
||||
except (OSError, subprocess.TimeoutExpired):
|
||||
return None
|
||||
if proc.returncode != 0:
|
||||
return None
|
||||
return proc.stdout.decode("utf-8", errors="replace")
|
||||
|
||||
|
||||
def ocr_pdf(path: Path) -> str:
|
||||
"""Rasterize with pdftoppm and OCR each page (tesseract or paddle)."""
|
||||
try:
|
||||
with tempfile.TemporaryDirectory(prefix="2dph-ocr-") as tmp:
|
||||
prefix = str(Path(tmp) / "page")
|
||||
proc = subprocess.run(
|
||||
["pdftoppm", "-png", "-r", "200", str(path), prefix],
|
||||
capture_output=True, timeout=120)
|
||||
if proc.returncode != 0:
|
||||
return ""
|
||||
pages = sorted(Path(tmp).glob("page*.png"))
|
||||
parts = [ocr_image(p) for p in pages]
|
||||
return "\n\n".join(p for p in parts if p and p.strip())
|
||||
except (OSError, subprocess.TimeoutExpired):
|
||||
return ""
|
||||
|
||||
|
||||
def ocr_image(path: Path) -> str:
|
||||
engine = os.environ.get("OCR_ENGINE", "tesseract")
|
||||
if engine == "paddle":
|
||||
return _ocr_paddle(path)
|
||||
return _ocr_tesseract(path)
|
||||
|
||||
|
||||
def _ocr_tesseract(path: Path) -> str:
|
||||
try:
|
||||
proc = subprocess.run(
|
||||
["tesseract", str(path), "stdout", "-l", TESS_LANG, "--psm", "6"],
|
||||
capture_output=True, timeout=120)
|
||||
except (OSError, subprocess.TimeoutExpired):
|
||||
return ""
|
||||
if proc.returncode != 0:
|
||||
return ""
|
||||
return proc.stdout.decode("utf-8", errors="replace").strip()
|
||||
|
||||
|
||||
def _ocr_paddle(path: Path) -> str:
|
||||
try:
|
||||
proc = subprocess.run(
|
||||
["paddleocr", "ocr", "-i", str(path)],
|
||||
capture_output=True, timeout=180)
|
||||
except (OSError, subprocess.TimeoutExpired):
|
||||
return ""
|
||||
if proc.returncode != 0:
|
||||
return ""
|
||||
return proc.stdout.decode("utf-8", errors="replace").strip()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
"""D14 layout: bin/{subject}/{method}.go, libs in internal/, one go.mod."""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
@@ -74,9 +75,90 @@ class BinLayoutTest(unittest.TestCase):
|
||||
)
|
||||
|
||||
def test_brain_methods_are_shebangs(self) -> None:
|
||||
for method in ("index.go", "get.go", "stats.go", "eval.go", "watch.go"):
|
||||
for method in ("index.go", "add.go", "get.go", "stats.go", "eval.go", "watch.go"):
|
||||
self._assert_shebang(f"bin/brain/{method}")
|
||||
|
||||
def test_brain_add_is_python_write_not_rebuild(self) -> None:
|
||||
self._assert_shebang("bin/brain/add.go")
|
||||
text = (ROOT / "bin" / "brain" / "add.go").read_text()
|
||||
self.assertIn("cmdbin.ExecFile", text)
|
||||
self.assertIn("bin/kb/add", text)
|
||||
self.assertNotIn("--rebuild", text)
|
||||
py = (ROOT / "bin" / "kb" / "add").read_text()
|
||||
self.assertIn("add_leafs", py)
|
||||
self.assertIn("--json", py)
|
||||
self.assertNotIn("unlink", py.lower())
|
||||
|
||||
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_d16_adjudication_is_cgo_free(self) -> None:
|
||||
self.assertTrue((ROOT / "internal" / "facts" / "contradict.go").is_file())
|
||||
go = (ROOT / "internal" / "facts" / "contradict.go").read_text()
|
||||
py = (ROOT / "bin" / "tools" / "contradict.py").read_text()
|
||||
audit = (ROOT / "bin" / "facts" / "audit").read_text()
|
||||
for token in ("temporal_freshness", "authority_pairing", "unresolved"):
|
||||
self.assertIn(token, go)
|
||||
self.assertIn(token, py)
|
||||
self.assertIn("contradict", audit)
|
||||
self.assertIn(" vs ", py)
|
||||
plan = (ROOT / "PLAN.md").read_text()
|
||||
self.assertIn("temporal_freshness", plan)
|
||||
self.assertIn("authority_pairing", plan)
|
||||
shebang = (ROOT / "bin" / "facts" / "audit.go").read_text()
|
||||
self.assertIn("contradict", shebang)
|
||||
|
||||
def test_d23_flaggy_cli(self) -> None:
|
||||
self.assertTrue((ROOT / "internal" / "cli" / "cli.go").is_file())
|
||||
self.assertIn("github.com/integrii/flaggy", (ROOT / "go.mod").read_text())
|
||||
plan = (ROOT / "PLAN.md").read_text()
|
||||
self.assertIn("D23", plan)
|
||||
self.assertIn("flaggy", plan)
|
||||
complete = (ROOT / "bin" / "cli" / "complete.go").read_text()
|
||||
first = complete.splitlines()[0]
|
||||
self.assertTrue(first.startswith("//usr/bin/env go run"), first)
|
||||
self.assertIn("complete.go bash", complete)
|
||||
self.assertIn("brain-search", complete)
|
||||
chats_import = (ROOT / "internal" / "chats" / "import.go").read_text()
|
||||
self.assertNotIn("flag.NewFlagSet", chats_import)
|
||||
args = (ROOT / "internal" / "brain" / "rank" / "args.go").read_text()
|
||||
self.assertIn("internal/cli", args)
|
||||
|
||||
def test_mail_import_is_shebang_not_brain_write(self) -> None:
|
||||
self._assert_shebang("bin/mail/import.go")
|
||||
index_mail = (ROOT / "bin" / "mail" / "index_mail").read_text()
|
||||
@@ -86,8 +168,149 @@ class BinLayoutTest(unittest.TestCase):
|
||||
"index_mail must point at bin/brain/index.go",
|
||||
)
|
||||
|
||||
def test_markdown_import_is_shebang(self) -> None:
|
||||
def test_mail_ocr_is_tesseract_not_docling(self) -> None:
|
||||
self._assert_shebang("bin/mail/ocr.go")
|
||||
ocr = (ROOT / "bin" / "mail" / "ocr.go").read_text()
|
||||
self.assertIn("internal/ocr", ocr)
|
||||
self.assertIn("mail_ocr", ocr)
|
||||
self.assertNotIn("github.com/otiai10/gosseract", ocr)
|
||||
py = (ROOT / "bin" / "mail" / "import").read_text()
|
||||
self.assertNotIn("from docling", py)
|
||||
self.assertNotIn("import docling", py)
|
||||
self.assertIn("convert_pdf", py)
|
||||
conv = (ROOT / "bin" / "tools" / "mailconv.py").read_text()
|
||||
self.assertIn("pdftotext", conv)
|
||||
self.assertIn("pdftoppm", conv)
|
||||
self.assertIn("tesseract", conv)
|
||||
self.assertIn("eng+deu", conv)
|
||||
self.assertNotIn("from docling", conv)
|
||||
self.assertNotIn("import docling", conv)
|
||||
self.assertNotIn("gocv", conv.lower())
|
||||
proj = (ROOT / "pyproject.toml").read_text()
|
||||
self.assertNotIn("docling", proj)
|
||||
ci = (ROOT / ".github" / "workflows" / "ci.yml").read_text()
|
||||
self.assertIn("tesseract-ocr", ci)
|
||||
self.assertIn("./internal/ocr", ci)
|
||||
compose = (ROOT / "compose.yaml").read_text()
|
||||
self.assertIn("ocr-paddle", compose)
|
||||
self.assertIn("OCR_ENGINE", compose)
|
||||
|
||||
def test_markdown_import_is_go_not_python_exec(self) -> None:
|
||||
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:
|
||||
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_duckdb_go_is_direct_require(self) -> None:
|
||||
text = (ROOT / "go.mod").read_text()
|
||||
first = text.split("require (")[1].split(")")[0]
|
||||
self.assertRegex(first, r"github.com/duckdb/duckdb-go/v2\s+v")
|
||||
for line in first.splitlines():
|
||||
if "duckdb/duckdb-go" in line:
|
||||
self.assertNotIn("indirect", line)
|
||||
skill = (ROOT / "skills" / "duckdb" / "SKILL.md").read_text()
|
||||
self.assertIn("github.com/duckdb/duckdb-go", skill)
|
||||
self.assertIn("Ladybug", skill)
|
||||
self.assertIn("sqlite", skill.lower())
|
||||
self.assertIn("gcc", skill.lower())
|
||||
self.assertIn("Zig", skill)
|
||||
plan = (ROOT / "PLAN.md").read_text()
|
||||
self.assertIn("D22", plan)
|
||||
self.assertIn("duckdb-go", plan)
|
||||
self._assert_shebang("bin/qa/stats.go")
|
||||
reasoner = (ROOT / "internal" / "reasoner" / "client.go").read_text()
|
||||
self.assertNotIn("duckdb", reasoner)
|
||||
self.assertNotIn("duckstats", reasoner)
|
||||
bakeoff = (ROOT / "bin" / "reasoner" / "bakeoff.go").read_text()
|
||||
self.assertIn("internal/duckstats", bakeoff)
|
||||
webcache = (ROOT / "internal" / "websearch" / "cache.go").read_text()
|
||||
self.assertNotIn("duckdb", webcache)
|
||||
self.assertIn("modernc.org/sqlite", webcache)
|
||||
|
||||
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)
|
||||
|
||||
def test_ci_recall_sot_is_zig_brain_eval(self) -> None:
|
||||
ci = (ROOT / ".github" / "workflows" / "ci.yml").read_text()
|
||||
self.assertIn("bin/brain/eval.go", ci)
|
||||
self.assertIn("system_ladybug,brain_eval", ci)
|
||||
self.assertIn("/tmp/brain-eval", ci)
|
||||
self.assertIn("KB_ROOT", ci)
|
||||
self.assertNotIn("bin/kb/eval", ci)
|
||||
self.assertNotIn("gate skipped", ci)
|
||||
self.assertIn("./bin/facts/audit self", ci)
|
||||
|
||||
def test_eval_fragments_live_in_default_corpus(self) -> None:
|
||||
"""CI --rebuild indexes README/PLAN/docs/skills; fragments must be there."""
|
||||
corpus = []
|
||||
for rel in ("README.md", "PLAN.md", "AGENTS.md"):
|
||||
corpus.append((ROOT / rel).read_text())
|
||||
for d in ("docs", "skills"):
|
||||
for p in (ROOT / d).rglob("*.md"):
|
||||
corpus.append(p.read_text())
|
||||
blob = "\n".join(corpus)
|
||||
for frag in ("BM25", "DevOps", "LadybugDB"):
|
||||
self.assertIn(frag, blob, f"{frag} must appear in default index corpus")
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
sys.path.insert(0, os.path.dirname(__file__))
|
||||
|
||||
from contradict import ( # noqa: E402
|
||||
RULE_AUTHORITY,
|
||||
RULE_SINGLE,
|
||||
RULE_TEMPORAL,
|
||||
RULE_TWO_SOURCE,
|
||||
RULE_UNRESOLVED,
|
||||
adjudicate,
|
||||
check_fact_row,
|
||||
parse_source_field,
|
||||
)
|
||||
|
||||
|
||||
def src(i, kind, stale=False):
|
||||
return {"id": i, "kind": kind, "stale": stale}
|
||||
|
||||
|
||||
class TestContradict(unittest.TestCase):
|
||||
def test_two_vs_two_stays_hypothesis(self):
|
||||
r = adjudicate({
|
||||
"text": "svc listens on 443",
|
||||
"yes": [src("docker-ps", "runtime"), src("compose", "config")],
|
||||
"no": [src("docker-old", "runtime"), src("compose-old", "config")],
|
||||
})
|
||||
self.assertFalse(r["confirmed"])
|
||||
self.assertEqual(r["rule"], RULE_UNRESOLVED)
|
||||
self.assertEqual(r["winner"], "")
|
||||
|
||||
def test_temporal_freshness(self):
|
||||
r = adjudicate({
|
||||
"text": "svc listens on 443",
|
||||
"yes": [src("docker-ps", "runtime"), src("compose", "config")],
|
||||
"no": [src("old-readme", "narrative", True), src("old-wiki", "narrative", True)],
|
||||
})
|
||||
self.assertTrue(r["confirmed"])
|
||||
self.assertEqual(r["rule"], RULE_TEMPORAL)
|
||||
self.assertEqual(r["winner"], "yes")
|
||||
|
||||
def test_authority_pairing(self):
|
||||
r = adjudicate({
|
||||
"text": "svc listens on 443",
|
||||
"yes": [src("docker-ps", "runtime"), src("compose", "config")],
|
||||
"no": [src("readme", "narrative"), src("wiki", "narrative")],
|
||||
})
|
||||
self.assertTrue(r["confirmed"])
|
||||
self.assertEqual(r["rule"], RULE_AUTHORITY)
|
||||
self.assertEqual(r["winner"], "yes")
|
||||
|
||||
def test_two_source_and_single(self):
|
||||
two = adjudicate({
|
||||
"text": "arc-1 runs Matrix",
|
||||
"yes": [src("compose", "config"), src("docker-ps", "runtime")],
|
||||
})
|
||||
self.assertTrue(two["confirmed"])
|
||||
self.assertEqual(two["rule"], RULE_TWO_SOURCE)
|
||||
one = adjudicate({"text": "maybe", "yes": [src("readme", "narrative")]})
|
||||
self.assertFalse(one["confirmed"])
|
||||
self.assertEqual(one["rule"], RULE_SINGLE)
|
||||
|
||||
def test_parse_source_field(self):
|
||||
yes, no = parse_source_field("docker ps x compose.yml vs old.md x wiki.md")
|
||||
self.assertIn(" x ", yes)
|
||||
self.assertIn(" x ", no)
|
||||
|
||||
def test_check_fact_row_allows_hypothesis_vs(self):
|
||||
p = check_fact_row(
|
||||
"L1", "a.md x b.md vs c.md x d.md", "var/", "audit", "hypothesis",
|
||||
)
|
||||
self.assertEqual(p, [])
|
||||
p = check_fact_row("L2", "a.md x b.md", "var/", "audit", "confirmed")
|
||||
self.assertEqual(p, [])
|
||||
p = check_fact_row("L3", "a.md x b.md vs c.md x d.md", "var/", "audit", "confirmed")
|
||||
self.assertTrue(any("vs-contradiction" in x for x in p))
|
||||
p = check_fact_row("L4", "only-one.md", "var/", "audit", "hypothesis")
|
||||
self.assertTrue(any("a x b vs" in x for x in p))
|
||||
|
||||
def test_audit_contradict_cli_unresolved(self):
|
||||
import json
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
root = Path(__file__).resolve().parents[2]
|
||||
payload = json.dumps({
|
||||
"text": "svc 443",
|
||||
"yes": [src("a", "runtime"), src("b", "config")],
|
||||
"no": [src("c", "runtime"), src("d", "config")],
|
||||
})
|
||||
proc = subprocess.run(
|
||||
[sys.executable, str(root / "bin" / "facts" / "audit"), "contradict", "--json"],
|
||||
input=payload, capture_output=True, text=True, check=False,
|
||||
)
|
||||
self.assertEqual(proc.returncode, 0, proc.stderr)
|
||||
out = json.loads(proc.stdout)
|
||||
self.assertTrue(out["ok"])
|
||||
self.assertEqual(out["contradictions"][0]["rule"], RULE_UNRESOLVED)
|
||||
self.assertFalse(out["contradictions"][0]["confirmed"])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
+13
-10
@@ -9,12 +9,6 @@ sys.path.insert(0, str(Path(__file__).resolve().parent))
|
||||
import kblib # 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 = (
|
||||
"CREATE NODE TABLE IF NOT EXISTS Commit (id STRING, repo STRING, subject STRING, "
|
||||
"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)"
|
||||
|
||||
|
||||
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):
|
||||
def setUp(self):
|
||||
self.dir = tempfile.mkdtemp()
|
||||
@@ -42,14 +47,12 @@ class GitGraphTest(unittest.TestCase):
|
||||
self.db.close()
|
||||
|
||||
def test_index_commits_creates_nodes_and_edges(self):
|
||||
cs = gitimport.parse_log(SAMPLE)
|
||||
gitimport.index_commits(self.conn, cs, "sample-repo")
|
||||
gitimport.index_commits(self.conn, [sample_commit()], "sample-repo")
|
||||
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")])
|
||||
rc = self.conn.execute("MATCH (c:Commit) RETURN c.id, c.repo").get_all()
|
||||
self.assertEqual(len(rc), 1)
|
||||
self.assertEqual(rc[0][1], "sample-repo")
|
||||
# File -[:HAS_VERSION]-> Commit -[:AUTHORED]-> Person
|
||||
rf = self.conn.execute(
|
||||
"MATCH (f:File)-[:HAS_VERSION]->(c:Commit)-[:AUTHORED]->(p:Person) "
|
||||
"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))
|
||||
|
||||
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")
|
||||
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,97 @@
|
||||
"""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")
|
||||
|
||||
def test_facts_json_and_chats_land_on_rebuild(self) -> None:
|
||||
"""Gitea #18: facts (2-source) + chats markdown become leafs on rebuild."""
|
||||
tmp = Path(tempfile.mkdtemp())
|
||||
dbpath = tmp / "kb.lbug"
|
||||
chats = tmp / "chats"
|
||||
chats.mkdir()
|
||||
(chats / "alice.md").write_text(
|
||||
"# Chat\n\n## Alice and Bob\n\nhello from chats fixture unique-chat-token\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
facts_path = tmp / "facts.json"
|
||||
facts_path.write_text(json.dumps([{
|
||||
"text": "container 'brain' unique-fact-token is running and declared in compose.yaml",
|
||||
"source": "docker ps x compose.yaml",
|
||||
"loc": "compose.yaml:brain",
|
||||
"how": "facts/extract",
|
||||
}]), encoding="utf-8")
|
||||
venv_py = ROOT / ".venv" / "bin" / "python"
|
||||
py = str(venv_py) if venv_py.is_file() else sys.executable
|
||||
proc = subprocess.run(
|
||||
[
|
||||
py, str(ROOT / "bin" / "kb" / "index"),
|
||||
"--rebuild", "--db", str(dbpath), "--no-defaults",
|
||||
"--with-chats", str(chats),
|
||||
"--facts-json", str(facts_path),
|
||||
"--json",
|
||||
],
|
||||
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.assertGreaterEqual(msg.get("facts_leafs", 0), 1)
|
||||
self.assertGreaterEqual(msg.get("chat_leafs", 0), 1)
|
||||
self.assertTrue(dbpath.exists())
|
||||
sys.path.insert(0, str(ROOT / "bin" / "tools"))
|
||||
import kblib
|
||||
db, conn = kblib.connect(dbpath, read_only=True)
|
||||
try:
|
||||
stats = kblib.stats(conn)
|
||||
self.assertGreaterEqual(stats["by_root"].get("facts", 0), 1)
|
||||
fts = kblib.query_fts(conn, "unique-chat-token", 5)
|
||||
self.assertTrue(fts, "chats markdown must be FTS-searchable")
|
||||
fact_hits = kblib.query_fts(conn, "unique-fact-token", 5)
|
||||
self.assertTrue(any(h.get("root") == "facts" for h in fact_hits))
|
||||
src = conn.execute(
|
||||
"MATCH (l:Leaf {root:'facts'}) RETURN l.source"
|
||||
).get_all()
|
||||
self.assertTrue(any(" x " in str(r[0]) for r in src))
|
||||
finally:
|
||||
conn.close()
|
||||
db.close()
|
||||
@@ -0,0 +1,69 @@
|
||||
"""Incremental add writes leafs without deleting kb.lbug."""
|
||||
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 KbAddCLITest(unittest.TestCase):
|
||||
def test_json_add_does_not_delete_db(self) -> None:
|
||||
tmp = Path(tempfile.mkdtemp())
|
||||
dbpath = tmp / "kb.lbug"
|
||||
py = sys.executable
|
||||
venv_py = ROOT / ".venv" / "bin" / "python"
|
||||
if venv_py.is_file():
|
||||
py = str(venv_py)
|
||||
payload = {
|
||||
"text": "cli zebra leaf",
|
||||
"root": "info",
|
||||
"source": "cli-test",
|
||||
"confidence": "confirmed",
|
||||
"how": "test",
|
||||
"loc": str(tmp),
|
||||
"type": "reference",
|
||||
"embedding": [0.0] * 256,
|
||||
}
|
||||
payload["embedding"][0] = 0.3
|
||||
proc = subprocess.run(
|
||||
[py, str(ROOT / "bin" / "kb" / "add"), "--db", str(dbpath), "--json"],
|
||||
cwd=ROOT,
|
||||
input=json.dumps(payload),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
env=os.environ.copy(),
|
||||
check=False,
|
||||
)
|
||||
self.assertEqual(proc.returncode, 0, proc.stderr)
|
||||
self.assertTrue(dbpath.exists(), "add must create the db, not skip write")
|
||||
out = json.loads(proc.stdout)
|
||||
self.assertEqual(out.get("mode"), "add")
|
||||
self.assertEqual(len(out.get("ids") or []), 1)
|
||||
again = subprocess.run(
|
||||
[py, str(ROOT / "bin" / "kb" / "add"), "--db", str(dbpath), "--json"],
|
||||
cwd=ROOT,
|
||||
input=json.dumps({
|
||||
**payload,
|
||||
"text": "second moose leaf",
|
||||
"source": "cli-test-2",
|
||||
}),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
env=os.environ.copy(),
|
||||
check=False,
|
||||
)
|
||||
self.assertEqual(again.returncode, 0, again.stderr)
|
||||
self.assertTrue(dbpath.exists())
|
||||
second = json.loads(again.stdout)
|
||||
self.assertEqual(len(second.get("ids") or []), 1)
|
||||
self.assertNotEqual(out["ids"][0], second["ids"][0])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -71,6 +71,69 @@ class KblibTest(unittest.TestCase):
|
||||
self.assertTrue(hits)
|
||||
self.assertIn("Leaf_vec", kblib.leaf_index_names(self.conn))
|
||||
|
||||
def test_add_after_indexes_keeps_fts_queryable(self):
|
||||
"""Incremental add after FTS+HNSW must find the new leaf on both indexes."""
|
||||
kblib.upsert_leaf(self.conn, text="seed fox leaf", root="info",
|
||||
confidence="confirmed", source="s", source_rev="r1",
|
||||
how="test", loc="/tmp", type_="reference",
|
||||
embedding=make_emb(0.1))
|
||||
kblib.ensure_indexes(self.conn)
|
||||
ids = kblib.add_leafs(self.conn, [{
|
||||
"text": "added zebra after index",
|
||||
"root": "facts",
|
||||
"confidence": "confirmed",
|
||||
"source": "a.md x b.md",
|
||||
"source_rev": "r1",
|
||||
"how": "test",
|
||||
"loc": "/tmp",
|
||||
"type": "fact",
|
||||
"embedding": make_emb(0.9),
|
||||
}])
|
||||
self.assertEqual(len(ids), 1)
|
||||
fts = kblib.query_fts(self.conn, "zebra", 5)
|
||||
self.assertTrue(fts)
|
||||
self.assertIn("zebra", fts[0]["text"])
|
||||
self.assertEqual(fts[0]["root"], "facts")
|
||||
vec = kblib.query_vector(self.conn, make_emb(0.9), 5)
|
||||
self.assertTrue(any("zebra" in h["text"] for h in vec))
|
||||
fox = kblib.query_fts(self.conn, "fox", 5)
|
||||
self.assertTrue(fox)
|
||||
self.assertIn("fox", fox[0]["text"])
|
||||
|
||||
def test_add_facts_and_info_one_transaction(self):
|
||||
"""D12: facts and info land in the same transaction."""
|
||||
kblib.ensure_indexes(self.conn)
|
||||
ids = kblib.add_leafs(self.conn, [
|
||||
{
|
||||
"text": "tx fact leaf two-source",
|
||||
"root": "facts",
|
||||
"confidence": "confirmed",
|
||||
"source": "compose.yml x docker ps",
|
||||
"source_rev": "r1",
|
||||
"how": "test",
|
||||
"loc": "/tmp",
|
||||
"type": "fact",
|
||||
"embedding": make_emb(0.4),
|
||||
},
|
||||
{
|
||||
"text": "tx info narrative",
|
||||
"root": "info",
|
||||
"confidence": "confirmed",
|
||||
"source": "note.md",
|
||||
"source_rev": "r1",
|
||||
"how": "test",
|
||||
"loc": "/tmp",
|
||||
"type": "reference",
|
||||
"embedding": make_emb(0.5),
|
||||
},
|
||||
])
|
||||
self.assertEqual(len(ids), 2)
|
||||
stats = kblib.stats(self.conn)
|
||||
self.assertEqual(stats["by_root"].get("facts"), 1)
|
||||
self.assertEqual(stats["by_root"].get("info"), 1)
|
||||
self.assertTrue(kblib.query_fts(self.conn, "two-source", 5))
|
||||
self.assertTrue(kblib.query_fts(self.conn, "narrative", 5))
|
||||
|
||||
def test_drop_vector_then_create_raises_clear_error(self):
|
||||
"""DROP INDEX leaves ghost catalog; create_fts_and_vector must raise."""
|
||||
kblib.upsert_leaf(self.conn, text="seed", root="info",
|
||||
@@ -98,6 +161,71 @@ class KblibTest(unittest.TestCase):
|
||||
self.assertEqual(stats["total"], 2)
|
||||
self.assertEqual(stats["by_root"], {"facts": 1, "info": 1})
|
||||
|
||||
def test_hop_1_returns_file_hop_3_reaches_person(self):
|
||||
"""--hop walks FROM_FILE / HAS_VERSION / AUTHORED (Gitea #17)."""
|
||||
import gitimport
|
||||
|
||||
lid = kblib.upsert_leaf(
|
||||
self.conn, text="readme hop fixture", root="info",
|
||||
confidence="confirmed", source="README.md", source_rev="r1",
|
||||
how="test", loc="README.md", type_="reference",
|
||||
embedding=make_emb(0.3),
|
||||
)
|
||||
kblib.link_from_file(self.conn, lid, "README.md", repo="sample-repo")
|
||||
gitimport.index_commits(self.conn, [gitimport.Commit(
|
||||
sha="a1b2c3d",
|
||||
author="Ada Lovelace",
|
||||
email="ada@example.com",
|
||||
date="2026-08-10T12:00:00Z",
|
||||
subject="feat: first commit",
|
||||
files=["README.md"],
|
||||
)], "sample-repo")
|
||||
hop1 = kblib.hop_walk(self.conn, lid, 1)
|
||||
self.assertEqual(len(hop1), 1)
|
||||
self.assertEqual(hop1[0]["label"], "File")
|
||||
self.assertEqual(hop1[0]["name"], "README.md")
|
||||
self.assertEqual(hop1[0]["depth"], 1)
|
||||
hop3 = kblib.hop_walk(self.conn, lid, 3)
|
||||
labels = {n["label"] for n in hop3}
|
||||
self.assertIn("File", labels)
|
||||
self.assertIn("Commit", labels)
|
||||
self.assertIn("Person", labels)
|
||||
person = [n for n in hop3 if n["label"] == "Person"][0]
|
||||
self.assertEqual(person["name"], "Ada Lovelace")
|
||||
self.assertEqual(person["depth"], 3)
|
||||
|
||||
def test_as_of_keeps_x_drops_y(self) -> None:
|
||||
"""OQ5/#36: as of 2025-01-01 → works-at-X, not works-at-Y."""
|
||||
kblib.upsert_leaf(
|
||||
self.conn, text="Andrey works at X", root="facts",
|
||||
confidence="confirmed", source="crm.md x contract.md",
|
||||
source_rev="r1", how="test", loc="/tmp", type_="fact",
|
||||
embedding=make_emb(0.5),
|
||||
valid_from="2024-03-01", valid_to="2025-07-15",
|
||||
)
|
||||
kblib.upsert_leaf(
|
||||
self.conn, text="Andrey works at Y", root="facts",
|
||||
confidence="confirmed", source="offer.md x payroll.md",
|
||||
source_rev="r1", how="test", loc="/tmp", type_="fact",
|
||||
embedding=make_emb(0.6),
|
||||
valid_from="2025-07-16", valid_to="",
|
||||
)
|
||||
kblib.ensure_indexes(self.conn)
|
||||
hits = kblib.query_fts(self.conn, "Andrey works", 10)
|
||||
kept = kblib.filter_as_of(hits, "2025-01-01")
|
||||
texts = [h["text"] for h in kept]
|
||||
self.assertTrue(any("works at X" in t for t in texts), texts)
|
||||
self.assertFalse(any("works at Y" in t for t in texts), texts)
|
||||
later = kblib.filter_as_of(hits, "2025-08-01")
|
||||
later_texts = [h["text"] for h in later]
|
||||
self.assertTrue(any("works at Y" in t for t in later_texts), later_texts)
|
||||
self.assertFalse(any("works at X" in t for t in later_texts), later_texts)
|
||||
|
||||
def test_active_at_pure(self) -> None:
|
||||
self.assertTrue(kblib.active_at("2024-03-01", "2025-07-15", "2025-01-01"))
|
||||
self.assertFalse(kblib.active_at("2025-07-16", "", "2025-01-01"))
|
||||
self.assertTrue(kblib.active_at("", "", "2025-01-01"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
@@ -8,10 +8,13 @@ from pathlib import Path
|
||||
sys.path.insert(0, os.path.dirname(__file__))
|
||||
|
||||
from mailconv import ( # noqa: E402
|
||||
TESS_LANG,
|
||||
clean_email_address,
|
||||
convert_pdf,
|
||||
html_to_markdown,
|
||||
is_convertible,
|
||||
normalize_markdown,
|
||||
ocr_image,
|
||||
split_zip_members,
|
||||
subject_to_filename,
|
||||
zip_extract_safe,
|
||||
@@ -100,6 +103,92 @@ class TestMailConv(unittest.TestCase):
|
||||
self.assertFalse(is_convertible(".exe"))
|
||||
self.assertFalse(is_convertible(".unknown"))
|
||||
|
||||
def test_convert_pdf_prefers_pdftotext(self):
|
||||
import mailconv as mc
|
||||
|
||||
calls: list[list[str]] = []
|
||||
|
||||
def fake_run(cmd, **kwargs):
|
||||
calls.append(list(cmd))
|
||||
|
||||
class P:
|
||||
returncode = 0
|
||||
stdout = b"Invoice BM25 layout"
|
||||
stderr = b""
|
||||
|
||||
return P()
|
||||
|
||||
self._patch_run(mc, fake_run)
|
||||
out = convert_pdf(Path(self._tmp("born.pdf")))
|
||||
self.assertIn("BM25", out)
|
||||
self.assertEqual(calls[0][:2], ["pdftotext", "-layout"])
|
||||
self.assertFalse(any(c[0] == "tesseract" for c in calls))
|
||||
self.assertFalse(any(c[0] == "pdftoppm" for c in calls))
|
||||
|
||||
def test_convert_pdf_empty_layer_uses_pdftoppm_tesseract(self):
|
||||
import mailconv as mc
|
||||
|
||||
calls: list[list[str]] = []
|
||||
|
||||
def fake_run(cmd, **kwargs):
|
||||
calls.append(list(cmd))
|
||||
|
||||
class P:
|
||||
returncode = 0
|
||||
stdout = b""
|
||||
stderr = b""
|
||||
|
||||
if cmd[0] == "pdftotext":
|
||||
P.stdout = b" \n"
|
||||
return P()
|
||||
if cmd[0] == "pdftoppm":
|
||||
prefix = Path(cmd[-1])
|
||||
(prefix.parent / "page-1.png").write_bytes(b"fake")
|
||||
return P()
|
||||
if cmd[0] == "tesseract":
|
||||
P.stdout = b"scanned HELLO"
|
||||
return P()
|
||||
return P()
|
||||
|
||||
self._patch_run(mc, fake_run)
|
||||
out = convert_pdf(Path(self._tmp("scan.pdf")))
|
||||
self.assertIn("HELLO", out)
|
||||
bins = [c[0] for c in calls]
|
||||
self.assertIn("pdftotext", bins)
|
||||
self.assertIn("pdftoppm", bins)
|
||||
self.assertIn("tesseract", bins)
|
||||
tess = next(c for c in calls if c[0] == "tesseract")
|
||||
self.assertIn(TESS_LANG, tess)
|
||||
self.assertNotIn("docling", " ".join(bins))
|
||||
|
||||
def test_ocr_image_paddle_engine(self):
|
||||
import mailconv as mc
|
||||
|
||||
calls: list[list[str]] = []
|
||||
|
||||
def fake_run(cmd, **kwargs):
|
||||
calls.append(list(cmd))
|
||||
|
||||
class P:
|
||||
returncode = 0
|
||||
stdout = b"paddle text"
|
||||
stderr = b""
|
||||
|
||||
return P()
|
||||
|
||||
self._patch_run(mc, fake_run)
|
||||
os.environ["OCR_ENGINE"] = "paddle"
|
||||
try:
|
||||
out = ocr_image(Path(self._tmp("x.png")))
|
||||
finally:
|
||||
os.environ.pop("OCR_ENGINE", None)
|
||||
self.assertEqual(out, "paddle text")
|
||||
self.assertEqual(calls[0][:2], ["paddleocr", "ocr"])
|
||||
|
||||
def _patch_run(self, mod, fn) -> None:
|
||||
self.addCleanup(setattr, mod.subprocess, "run", mod.subprocess.run)
|
||||
mod.subprocess.run = fn
|
||||
|
||||
def _mk_zip(self, members):
|
||||
zpath = Path(self._tmp("arc.zip"))
|
||||
with zipfile.ZipFile(zpath, "w") as zf:
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
"""Published docs must match live commands (Gitea SoT, brain/search, no fake --hop)."""
|
||||
"""Published docs must match live commands (Gitea SoT, brain/search)."""
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
@@ -39,19 +38,169 @@ class PublishedDocsTest(unittest.TestCase):
|
||||
"mail index is a brain write; README must name bin/brain/index.go",
|
||||
)
|
||||
|
||||
def test_docs_do_not_claim_hop_walks(self) -> None:
|
||||
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('"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_say_hop_walks_from_file(self) -> None:
|
||||
paths = [
|
||||
ROOT / "README.md",
|
||||
ROOT / "docs" / "design.md",
|
||||
ROOT / "skills" / "kb-search" / "SKILL.md",
|
||||
ROOT / "skills" / "diataxis-docs" / "SKILL.md",
|
||||
ROOT / "skills" / "brain" / "SKILL.md",
|
||||
ROOT / "docs" / "runbook.md",
|
||||
ROOT / "docs" / "README.md",
|
||||
]
|
||||
# Command-style `--hop 1` / `--hop N` plus follow/walk = the old lie.
|
||||
# Honest "not implemented" notes must not match.
|
||||
lie = re.compile(r"--hop (?:N|1).*(?:follow|walk)", re.I | re.S)
|
||||
for path in paths:
|
||||
text = path.read_text()
|
||||
self.assertIsNone(
|
||||
lie.search(text),
|
||||
f"{path.relative_to(ROOT)} still claims --hop walks the graph",
|
||||
self.assertIn("--hop", text, f"{path.relative_to(ROOT)} must document --hop")
|
||||
self.assertNotIn(
|
||||
"not implemented",
|
||||
text.lower(),
|
||||
f"{path.relative_to(ROOT)} still says hop is not implemented",
|
||||
)
|
||||
|
||||
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)
|
||||
|
||||
def test_v1_epic_is_named_in_docs(self) -> None:
|
||||
plan = (ROOT / "PLAN.md").read_text()
|
||||
self.assertIn("Gap to v1", plan)
|
||||
self.assertIn("eSlider/2dph/issues/16", plan)
|
||||
self.assertIn("eSlider/2dph/issues/17", plan)
|
||||
self.assertIn("eSlider/2dph/milestone/12", plan)
|
||||
road = (ROOT / "docs" / "roadmap.md").read_text()
|
||||
self.assertIn("type: explanation", road)
|
||||
self.assertIn("issues/16", road)
|
||||
self.assertIn("issues/14", road)
|
||||
index = (ROOT / "docs" / "README.md").read_text()
|
||||
self.assertIn("roadmap.md", index)
|
||||
self.assertIn("epic #16", index)
|
||||
agents = (ROOT / "AGENTS.md").read_text()
|
||||
self.assertIn("roadmap.md", agents)
|
||||
|
||||
def test_oq5_intervals_are_not_d16_stale(self) -> None:
|
||||
plan = (ROOT / "PLAN.md").read_text()
|
||||
design = (ROOT / "docs" / "design.md").read_text()
|
||||
road = (ROOT / "docs" / "roadmap.md").read_text()
|
||||
contradict = (ROOT / "internal" / "facts" / "contradict.go").read_text()
|
||||
interval = (ROOT / "internal" / "facts" / "interval.go").read_text()
|
||||
self.assertIn("OQ5", plan)
|
||||
self.assertIn("D24", plan)
|
||||
self.assertIn("issues/36", plan)
|
||||
self.assertIn("valid_from", plan)
|
||||
self.assertIn("--as-of", design)
|
||||
self.assertIn("issues/36", road)
|
||||
self.assertIn("**in**", road[road.index("OQ5"):road.index("OQ5") + 80])
|
||||
self.assertIn("temporal_freshness", contradict)
|
||||
self.assertNotIn("valid_from", contradict)
|
||||
self.assertIn("ActiveAt", interval)
|
||||
self.assertIn("NormalizeDay", interval)
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
"""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)
|
||||
|
||||
def test_yq_is_mikefarah_for_structured_data(self) -> None:
|
||||
skill = (ROOT / "skills" / "yq" / "SKILL.md").read_text()
|
||||
self.assertIn("https://github.com/mikefarah/yq", skill)
|
||||
for fmt in ("YAML", "JSON", "XML", "CSV", "TOML", "HCL"):
|
||||
self.assertIn(fmt, skill)
|
||||
self.assertIn("not kislyuk", skill.lower())
|
||||
plan = (ROOT / "PLAN.md").read_text()
|
||||
self.assertIn("mikefarah/yq", plan)
|
||||
agents = (ROOT / "AGENTS.md").read_text()
|
||||
self.assertIn("mikefarah/yq", agents)
|
||||
web = (ROOT / "skills" / "web-search" / "SKILL.md").read_text()
|
||||
self.assertIn("| yq ", web)
|
||||
self.assertNotIn("| jq ", web)
|
||||
@@ -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")
|
||||
@@ -0,0 +1,228 @@
|
||||
"""bin/stack/{start,start-assistant,stop,status} — offline contract + fake PATH."""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import stat
|
||||
import subprocess
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
METHODS = ("start", "start-assistant", "start-mail-sync", "stop", "status")
|
||||
|
||||
|
||||
class StackLayoutTest(unittest.TestCase):
|
||||
def test_methods_are_bash_with_usage_comment(self) -> None:
|
||||
lib = ROOT / "bin" / "stack" / "lib.sh"
|
||||
self.assertTrue(lib.is_file(), "missing bin/stack/lib.sh")
|
||||
for name in METHODS:
|
||||
p = ROOT / "bin" / "stack" / name
|
||||
self.assertTrue(p.is_file(), f"missing bin/stack/{name}")
|
||||
self.assertTrue(os.access(p, os.X_OK), f"bin/stack/{name} must be executable")
|
||||
lines = p.read_text().splitlines()
|
||||
self.assertEqual(lines[0], "#!/usr/bin/env bash", name)
|
||||
self.assertTrue(lines[1].startswith("# bin/stack/"), name)
|
||||
text = "\n".join(lines)
|
||||
self.assertIn("lib.sh", text, name)
|
||||
self.assertNotIn("/mnt/", text, name)
|
||||
self.assertNotIn("/home/", text, name)
|
||||
|
||||
def test_lib_has_no_host_paths_or_secrets(self) -> None:
|
||||
lib = (ROOT / "bin" / "stack" / "lib.sh").read_text()
|
||||
self.assertIn("stack_start", lib)
|
||||
self.assertIn("stack_start_assistant", lib)
|
||||
self.assertIn("stack_start_mail_sync", lib)
|
||||
self.assertIn("stack_stop", lib)
|
||||
self.assertIn("stack_status", lib)
|
||||
self.assertIn("mail-sync", lib)
|
||||
self.assertIn("qwen3.5:9b", lib)
|
||||
self.assertIn("picoclaw agent", lib)
|
||||
self.assertIn("--no-deps", lib)
|
||||
self.assertIn("tools/list", lib)
|
||||
self.assertNotIn("/mnt/", lib)
|
||||
self.assertNotIn("/home/", lib)
|
||||
self.assertNotIn("password", lib.lower())
|
||||
self.assertNotIn("GITEA_TOKEN", lib)
|
||||
|
||||
def test_start_does_not_launch_picoclaw(self) -> None:
|
||||
start = (ROOT / "bin" / "stack" / "start").read_text()
|
||||
self.assertIn("stack_start", start)
|
||||
self.assertNotIn("stack_start_assistant", start)
|
||||
self.assertNotIn("picoclaw agent", start)
|
||||
|
||||
def test_start_mail_sync_is_etl_only(self) -> None:
|
||||
src = (ROOT / "bin" / "stack" / "start-mail-sync").read_text()
|
||||
self.assertIn("stack_start_mail_sync", src)
|
||||
self.assertNotIn("stack_start_assistant", src)
|
||||
ep = (ROOT / "bin" / "docker-entrypoint").read_text()
|
||||
self.assertIn('MAIL_SYNC_SRC:=onlyoffice,gmail', ep)
|
||||
self.assertIn('MAIL_SYNC_INDEX:=0', ep)
|
||||
self.assertIn('interval="${1:-300}"', ep)
|
||||
self.assertIn('MAIL_SYNC_INDEX" = "1"', ep)
|
||||
|
||||
def test_start_assistant_attaches_agent(self) -> None:
|
||||
src = (ROOT / "bin" / "stack" / "start-assistant").read_text()
|
||||
self.assertIn("stack_start_assistant", src)
|
||||
self.assertIn("--no-attach", src)
|
||||
|
||||
def test_stop_does_not_down_volumes(self) -> None:
|
||||
lib = (ROOT / "bin" / "stack" / "lib.sh").read_text()
|
||||
self.assertIn(" compose ", lib)
|
||||
self.assertRegex(lib, r"\bstop\b")
|
||||
self.assertNotIn(" compose down", lib)
|
||||
self.assertNotIn("compose down", lib)
|
||||
|
||||
def test_docs_name_stack_commands(self) -> None:
|
||||
runbook = (ROOT / "docs" / "runbook.md").read_text()
|
||||
pico = (ROOT / "docs" / "picoclaw.md").read_text()
|
||||
agents = (ROOT / "AGENTS.md").read_text()
|
||||
for text in (runbook, pico, agents):
|
||||
self.assertIn("bin/stack/start", text)
|
||||
self.assertIn("bin/stack/start-assistant", text)
|
||||
self.assertIn("bin/stack/status", text)
|
||||
self.assertIn("bin/stack/stop", text)
|
||||
|
||||
|
||||
def test_help_prints_comments_not_source(self) -> None:
|
||||
r = subprocess.run(
|
||||
[str(ROOT / "bin" / "stack" / "start"), "--help"],
|
||||
cwd=str(ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
self.assertEqual(r.returncode, 0, r.stderr)
|
||||
self.assertIn("bin/stack/start", r.stdout)
|
||||
self.assertNotIn("set -euo pipefail", r.stdout)
|
||||
self.assertNotIn("source ", r.stdout)
|
||||
|
||||
|
||||
class StackFakePathTest(unittest.TestCase):
|
||||
def _fake_bin(self, tmp: Path, *, health_ok: bool) -> Path:
|
||||
bindir = tmp / "bin"
|
||||
bindir.mkdir()
|
||||
curl = bindir / "curl"
|
||||
docker = bindir / "docker"
|
||||
log = tmp / "docker.log"
|
||||
curl.write_text(
|
||||
f"""#!/usr/bin/env bash
|
||||
url=""
|
||||
for a in "$@"; do
|
||||
case "$a" in http*) url=$a ;;
|
||||
esac
|
||||
done
|
||||
if [ "{int(health_ok)}" = "0" ] && [[ "$url" == */health ]]; then
|
||||
echo '{{"status":"down"}}'
|
||||
exit 7
|
||||
fi
|
||||
case "$url" in
|
||||
*/mcp)
|
||||
echo '{{"jsonrpc":"2.0","id":1,"result":{{"tools":[{{"name":"search"}},{{"name":"get"}},{{"name":"audit"}}]}}}}'
|
||||
;;
|
||||
*/api/tags)
|
||||
echo '{{"models":[{{"name":"qwen3.5:9b"}}]}}'
|
||||
;;
|
||||
*/api/pull)
|
||||
echo '{{"status":"success"}}'
|
||||
;;
|
||||
*)
|
||||
echo '{{"status":"ok"}}'
|
||||
;;
|
||||
esac
|
||||
"""
|
||||
)
|
||||
docker.write_text(
|
||||
f"""#!/usr/bin/env bash
|
||||
echo "$*" >> "{log}"
|
||||
exit 0
|
||||
"""
|
||||
)
|
||||
curl.chmod(curl.stat().st_mode | stat.S_IEXEC)
|
||||
docker.chmod(docker.stat().st_mode | stat.S_IEXEC)
|
||||
return bindir
|
||||
|
||||
def _env(self, bindir: Path) -> dict[str, str]:
|
||||
env = os.environ.copy()
|
||||
env["PATH"] = f"{bindir}:{env.get('PATH', '')}"
|
||||
env["STACK_WAIT_SECS"] = "1"
|
||||
env["STACK_WAIT_INTERVAL"] = "0"
|
||||
return env
|
||||
|
||||
def test_start_skips_compose_when_brain_healthy(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as raw:
|
||||
tmp = Path(raw)
|
||||
bindir = self._fake_bin(tmp, health_ok=True)
|
||||
log = tmp / "docker.log"
|
||||
r = subprocess.run(
|
||||
[str(ROOT / "bin" / "stack" / "start")],
|
||||
cwd=str(ROOT),
|
||||
env=self._env(bindir),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
self.assertEqual(r.returncode, 0, r.stderr)
|
||||
if log.exists():
|
||||
logged = log.read_text()
|
||||
self.assertNotIn("up -d", logged, "healthy brain must not docker compose up")
|
||||
self.assertIn("ps", logged) # status probes mail-sync via compose ps
|
||||
|
||||
def test_start_ups_brain_when_unhealthy(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as raw:
|
||||
tmp = Path(raw)
|
||||
bindir = self._fake_bin(tmp, health_ok=False)
|
||||
log = tmp / "docker.log"
|
||||
r = subprocess.run(
|
||||
[str(ROOT / "bin" / "stack" / "start")],
|
||||
cwd=str(ROOT),
|
||||
env=self._env(bindir),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
self.assertNotEqual(r.returncode, 0, "unhealthy brain without recovering compose must fail")
|
||||
self.assertTrue(log.exists(), r.stderr)
|
||||
logged = log.read_text()
|
||||
self.assertIn("up -d", logged)
|
||||
self.assertIn("brain", logged)
|
||||
self.assertNotIn("picoclaw", logged)
|
||||
|
||||
def test_stop_stops_named_services(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as raw:
|
||||
tmp = Path(raw)
|
||||
bindir = self._fake_bin(tmp, health_ok=True)
|
||||
log = tmp / "docker.log"
|
||||
r = subprocess.run(
|
||||
[str(ROOT / "bin" / "stack" / "stop")],
|
||||
cwd=str(ROOT),
|
||||
env=self._env(bindir),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
self.assertEqual(r.returncode, 0, r.stderr)
|
||||
logged = log.read_text()
|
||||
self.assertIn("stop", logged)
|
||||
self.assertNotIn(" down", logged)
|
||||
for svc in ("brain", "brain-mcp", "reasoner", "picoclaw", "mail-sync"):
|
||||
self.assertIn(svc, logged)
|
||||
|
||||
def test_start_assistant_no_attach_starts_picoclaw(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as raw:
|
||||
tmp = Path(raw)
|
||||
bindir = self._fake_bin(tmp, health_ok=True)
|
||||
log = tmp / "docker.log"
|
||||
r = subprocess.run(
|
||||
[str(ROOT / "bin" / "stack" / "start-assistant"), "--no-attach"],
|
||||
cwd=str(ROOT),
|
||||
env=self._env(bindir),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
self.assertEqual(r.returncode, 0, r.stderr + r.stdout)
|
||||
logged = log.read_text() if log.exists() else ""
|
||||
self.assertIn("picoclaw", logged)
|
||||
self.assertIn("--no-deps", logged)
|
||||
self.assertNotIn("picoclaw agent", logged)
|
||||
@@ -0,0 +1,36 @@
|
||||
"""qa/system_perf.py is an offline-gated system test (no live brain in CI)."""
|
||||
from __future__ import annotations
|
||||
|
||||
import ast
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
|
||||
|
||||
class SystemPerfScriptTest(unittest.TestCase):
|
||||
def test_script_compiles_and_is_read_only(self) -> None:
|
||||
path = ROOT / "qa" / "system_perf.py"
|
||||
src = path.read_text()
|
||||
compile(src, str(path), "exec")
|
||||
self.assertIn("--json", src)
|
||||
self.assertIn("qwen3.5:9b", src)
|
||||
self.assertIn("--picoclaw", src)
|
||||
self.assertIn("BRAIN_URL", src)
|
||||
self.assertIn("tools/list", src)
|
||||
self.assertIn("tools/call", src)
|
||||
self.assertIn("GATE_HEALTH_MS", src)
|
||||
self.assertIn("GATE_GET_P50_MS", src)
|
||||
self.assertNotIn("kb.lbug", src)
|
||||
self.assertNotIn("password", src.lower())
|
||||
self.assertNotIn("token", src.lower())
|
||||
|
||||
def test_script_does_not_write_ladybug(self) -> None:
|
||||
tree = ast.parse((ROOT / "qa" / "system_perf.py").read_text())
|
||||
writes = [
|
||||
n.func.attr
|
||||
for n in ast.walk(tree)
|
||||
if isinstance(n, ast.Call) and isinstance(n.func, ast.Attribute)
|
||||
and n.func.attr in {"write_text", "write_bytes", "dump"}
|
||||
]
|
||||
self.assertEqual(writes, [], f"system_perf must not write files: {writes}")
|
||||
+12
-136
@@ -1,150 +1,26 @@
|
||||
#!/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 "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).
|
||||
bin/web/search.go QUERY [--json] [-n N] [--site HOST]
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import fcntl
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
import urllib.parse
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
TOOLS = Path(__file__).resolve().parents[1] / "tools"
|
||||
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")
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
|
||||
|
||||
def load_config() -> dict:
|
||||
if not CONFIG.exists():
|
||||
sys.exit(f"no credentials at {CONFIG} (mode 600, BRAIN_SEARCH_URL/USER/PASS)")
|
||||
conf = {}
|
||||
for line in CONFIG.read_text().splitlines():
|
||||
line = line.strip()
|
||||
if not line or line.startswith("#") or "=" not in line:
|
||||
continue
|
||||
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
|
||||
def main(argv: list[str]) -> int:
|
||||
print(
|
||||
"bin/web/search is deprecated; use bin/web/search.go",
|
||||
file=sys.stderr,
|
||||
)
|
||||
target = ROOT / "bin" / "web" / "search.go"
|
||||
os.execvp("go", ["go", "run", str(target), *argv])
|
||||
return 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
sys.exit(main(sys.argv[1:]))
|
||||
|
||||
Executable
+170
@@ -0,0 +1,170 @@
|
||||
//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"
|
||||
"time"
|
||||
|
||||
"github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/eSlider/2dph/internal/websearch"
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
func main() {
|
||||
os.Exit(run(os.Args[1:]))
|
||||
}
|
||||
|
||||
func run(args []string) int {
|
||||
c, err := websearch.ParseArgs(args)
|
||||
if err != nil {
|
||||
return cli.Fail(err)
|
||||
}
|
||||
query, site, lang, fresh, category, engines := c.Query, c.Site, c.Lang, c.Fresh, c.Category, c.Engines
|
||||
limit := c.Limit
|
||||
jsonOut, refresh, force := c.JSONOut, c.Refresh, c.Force
|
||||
ttl := c.TTL
|
||||
timeout := c.Timeout
|
||||
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
|
||||
}
|
||||
+160
-17
@@ -1,66 +1,209 @@
|
||||
# 2dph — docker composition
|
||||
#
|
||||
# docker compose run --rm brain index # rebuild graph
|
||||
# docker compose run --rm brain search "Matrix fed" # one-shot query
|
||||
# docker compose run --rm brain serve # async Go server
|
||||
# docker compose up brain-watch # auto re-index
|
||||
# bin/stack/start / start-assistant / status / stop
|
||||
# docker compose up -d brain # API (Zig CGO serve)
|
||||
# docker compose --profile index run --rm index # Python rebuild
|
||||
# docker compose --profile picoclaw up -d # brain-mcp + CPU reasoner + PicoClaw gateway
|
||||
# docker compose --profile reasoner up -d reasoner # CPU Ollama :11435
|
||||
# docker compose --profile searxng up -d
|
||||
# OCR_ENGINE=paddle docker compose --profile ocr-paddle run --rm ocr-paddle
|
||||
#
|
||||
# Caching: the 128M model (HF_HOME) and kb.lbug (VAR_DIR) live in named
|
||||
# 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.
|
||||
# Secrets never baked in: search.env + db-profiles.yml from ~/.config/brain.
|
||||
|
||||
name: 2dph
|
||||
|
||||
networks:
|
||||
default:
|
||||
name: 2dph_sys
|
||||
driver: bridge
|
||||
ipam:
|
||||
config:
|
||||
- subnet: 10.23.42.0/24
|
||||
|
||||
services:
|
||||
brain:
|
||||
image: ghcr.io/eslider/2dph:latest
|
||||
image: ghcr.io/eslider/2dph:api
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
target: api
|
||||
cache_from:
|
||||
- ghcr.io/eslider/2dph:cache
|
||||
command: ["brain", "search", "help"]
|
||||
command: ["serve"]
|
||||
environment: &env
|
||||
HF_HOME: /data/hf
|
||||
BRAIN_SEARCH_CACHE: /data/cache/web-search.sqlite
|
||||
BRAIN_DB_PROFILES: /secret/db-profiles.yml
|
||||
BRAIN_SEARCH_ENV: /secret/search.env
|
||||
KB_SEARCH_CMD: /app/bin/kb/search
|
||||
KB_ROOT: /data
|
||||
KB_WORKERS: "4"
|
||||
KB_PORT: "8630"
|
||||
volumes:
|
||||
- kb-model:/data/hf
|
||||
- kb-var:/data
|
||||
# corpus is read-only on the host, never written from the container
|
||||
- ..:/corpus:ro
|
||||
- ~/.config/brain:/secret:ro
|
||||
ports:
|
||||
- "127.0.0.1:8630:8630"
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /tmp
|
||||
healthcheck:
|
||||
test: ["CMD", "python3", "-c", "import ladybug, model2vec, mistune; print('ok')"]
|
||||
test: ["CMD", "wget", "-qO-", "http://127.0.0.1:8630/health"]
|
||||
interval: 30s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
restart: unless-stopped
|
||||
stop_grace_period: 20s
|
||||
|
||||
# watcher: re-index on corpus file change (watchdog script)
|
||||
brain-watch:
|
||||
image: ghcr.io/eslider/2dph:latest
|
||||
image: ghcr.io/eslider/2dph:api
|
||||
environment: *env
|
||||
volumes:
|
||||
- kb-model:/data/hf
|
||||
- kb-var:/data
|
||||
- ..:/corpus:ro
|
||||
- ~/.config/brain:/secret:ro
|
||||
command: ["brain", "watch", "/corpus"]
|
||||
command: ["watch", "/corpus"]
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /tmp
|
||||
restart: unless-stopped
|
||||
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
|
||||
|
||||
# mail-sync ETL: sync → import every 300s into shared var. Full brain rebuild
|
||||
# only when MAIL_SYNC_INDEX=1 (expensive on large mail corpora). Default
|
||||
# sources: onlyoffice,gmail. For M365 set MAIL_SYNC_SRC=m365 and put
|
||||
# M365_TENANT/CLIENT_ID/CLIENT_SECRET/USERS in ~/.config/brain/mail.env
|
||||
# (or m365.env + MAIL_SYNC_ENV). Gmail OAuth: mount ~/.gmail-mcp.
|
||||
# docker compose up -d mail-sync
|
||||
# bin/stack/start-mail-sync
|
||||
mail-sync:
|
||||
image: ghcr.io/eslider/2dph:index
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
target: index
|
||||
environment:
|
||||
HF_HOME: /data/hf
|
||||
KB_PY: python3
|
||||
MAIL_SYNC_SRC: onlyoffice,gmail
|
||||
MAIL_SYNC_ENV: /secret/mail.env
|
||||
MAIL_SYNC_INDEX: "0"
|
||||
HOME: /home/2dph
|
||||
volumes:
|
||||
- kb-model:/data/hf
|
||||
- kb-var:/app/var
|
||||
- ~/.config/brain:/secret:ro
|
||||
- ~/.gmail-mcp:/home/2dph/.gmail-mcp:ro
|
||||
command: ["mail-sync", "300"]
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /tmp
|
||||
restart: unless-stopped
|
||||
stop_grace_period: 20s
|
||||
|
||||
# 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 PicoClaw (and any MCP client).
|
||||
# docker compose --profile picoclaw up -d
|
||||
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", "picoclaw"]
|
||||
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
|
||||
|
||||
# Official PicoClaw gateway. Config has no secrets (Ollama + HTTP MCP).
|
||||
# Host network: brain/reasoner bind 127.0.0.1 only, so host.docker.internal
|
||||
# (docker0) cannot reach them. Gateway 127.0.0.1:18790 (not the 18800 launcher).
|
||||
# If :8630/:11435 are already bound, do not start brain-mcp/reasoner:
|
||||
# docker compose --profile picoclaw up -d --no-deps picoclaw
|
||||
picoclaw:
|
||||
profiles: ["picoclaw"]
|
||||
image: docker.io/sipeed/picoclaw:v0.3.1
|
||||
network_mode: host
|
||||
depends_on:
|
||||
- brain-mcp
|
||||
- reasoner
|
||||
environment:
|
||||
PICOCLAW_GATEWAY_HOST: "127.0.0.1"
|
||||
entrypoint: ["picoclaw", "gateway"]
|
||||
volumes:
|
||||
- picoclaw-home:/root/.picoclaw
|
||||
- ./deploy/picoclaw/config.json:/root/.picoclaw/config.json:ro
|
||||
restart: unless-stopped
|
||||
|
||||
# Optional PP-OCRv5 (not default). Default OCR is tesseract eng+deu.
|
||||
# OCR_ENGINE=paddle docker compose --profile ocr-paddle run --rm ocr-paddle
|
||||
ocr-paddle:
|
||||
profiles: ["ocr-paddle"]
|
||||
image: python:3.12-slim
|
||||
environment:
|
||||
OCR_ENGINE: paddle
|
||||
command: ["python", "-c", "print('OCR_ENGINE=paddle; install paddleocr on PATH')"]
|
||||
|
||||
volumes:
|
||||
kb-model:
|
||||
kb-var:
|
||||
reasoner-ollama:
|
||||
picoclaw-home:
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"agents": {
|
||||
"defaults": {
|
||||
"model_name": "qwen3.5-9b",
|
||||
"max_tool_iterations": 8,
|
||||
"max_tokens": 512,
|
||||
"context_window": 8192
|
||||
}
|
||||
},
|
||||
"model_list": [
|
||||
{
|
||||
"model_name": "qwen3.5-9b",
|
||||
"model": "ollama/qwen3.5:9b",
|
||||
"api_base": "http://127.0.0.1:11435/v1",
|
||||
"request_timeout": 600
|
||||
}
|
||||
],
|
||||
"tools": {
|
||||
"web": {
|
||||
"enabled": false
|
||||
},
|
||||
"mcp": {
|
||||
"enabled": true,
|
||||
"servers": {
|
||||
"2dph": {
|
||||
"enabled": true,
|
||||
"type": "http",
|
||||
"url": "http://127.0.0.1:8630/mcp"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
+33
-9
@@ -1,14 +1,38 @@
|
||||
# 2dph (deductionphile)
|
||||
---
|
||||
type: reference
|
||||
status: current
|
||||
related:
|
||||
- docs/runbook.md
|
||||
- docs/design.md
|
||||
- PLAN.md
|
||||
- docs/roadmap.md
|
||||
---
|
||||
|
||||
Evidence-first knowledge graph + hybrid RAG over the operational
|
||||
Brain/ops/eSlider stack. Facts need proof or they are
|
||||
# 2dph docs (Diataxis)
|
||||
|
||||
Evidence-first knowledge graph. Facts need proof or they are
|
||||
`(not confirmed)`.
|
||||
|
||||
- [PLAN.md](../PLAN.md) — decisions, execution order, open questions (v2)
|
||||
- [design](design.md) — schema, deduction model, sources
|
||||
- [Gitea issues](https://git.produktor.io/eSlider/2dph/issues) — work board (origin)
|
||||
| Type | Doc |
|
||||
|------|-----|
|
||||
| tutorial / howto | [runbook](runbook.md) — run anywhere (uv, Go, Docker) |
|
||||
| explanation | [design](design.md) — two roots, deduction, D17/D20/D18 |
|
||||
| explanation | [roadmap](roadmap.md) — gap to v1 (epic #16) |
|
||||
| howto | [picoclaw](picoclaw.md) — MCP agent (`bin/stack/start-assistant`) |
|
||||
| howto | [reasoner](reasoner.md) — CPU bake-off (D18) |
|
||||
| reference | [PLAN.md](../PLAN.md) — decisions D1–D24 |
|
||||
|
||||
Search: `bin/brain/search.go "query"` (HTTP: `bin/brain/serve.go`). `--hop` is
|
||||
not a walk; the flag errors until File/FROM_FILE edges exist.
|
||||
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.
|
||||
|
||||
Published docs live here and mirror the project state.
|
||||
Search: `bin/brain/search.go "query"` (HTTP: `bin/brain/serve.go` —
|
||||
`/health` `/search` `/get` `/stats` `/audit` `/ingest`). `--hop N` walks
|
||||
`FROM_FILE` → Commit → Person from each hit (max 3). Rebuild writes
|
||||
File edges ([#17](https://git.produktor.io/eSlider/2dph/issues/17)).
|
||||
|
||||
Work board: [Gitea issues](https://git.produktor.io/eSlider/2dph/issues)
|
||||
([epic #16](https://git.produktor.io/eSlider/2dph/issues/16)).
|
||||
PRs and CI: GitHub [`eSlider/2dph`](https://github.com/eSlider/2dph).
|
||||
|
||||
Published docs live here and match live commands.
|
||||
|
||||
@@ -21,4 +21,5 @@ OO_CLI (default: $HOME/go/bin/oo)
|
||||
./bin/chats/apply.go --dry-run
|
||||
```
|
||||
|
||||
JSONL → markdown only. Brain ingest is `bin/brain/index.go` (not a `chats index`).
|
||||
JSONL → markdown only. Brain ingest is `bin/brain/index.go --with-chats`
|
||||
(default `var/chats/md`). WhatsApp sync is out of v1.
|
||||
|
||||
@@ -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
|
||||
+62
-4
@@ -1,3 +1,12 @@
|
||||
---
|
||||
type: explanation
|
||||
status: current
|
||||
related:
|
||||
- docs/README.md
|
||||
- docs/runbook.md
|
||||
- docs/roadmap.md
|
||||
---
|
||||
|
||||
# Design — facts, info, deduction
|
||||
|
||||
## Two roots, one transaction
|
||||
@@ -21,10 +30,17 @@ bin/brain/search.go "question"
|
||||
1. facts root — confirmed answers only → return with evidence links
|
||||
2. info root — supporting narrative → snippets, marked (not 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
|
||||
error; it is not a graph walk.
|
||||
`--hop N` walks `Leaf-[:FROM_FILE]->File-[:HAS_VERSION]->Commit-[:AUTHORED]->Person`
|
||||
from each hit (1=File, 2=Commit, 3=Person). Rebuild writes FROM_FILE;
|
||||
git import writes HAS_VERSION/AUTHORED ([#17](https://git.produktor.io/eSlider/2dph/issues/17)).
|
||||
|
||||
Go CLIs parse with **flaggy** via `internal/cli` (D23). Flags may appear
|
||||
after positionals (`search q --hop 1`). Completions:
|
||||
`source <(./bin/cli/complete.go bash)`.
|
||||
|
||||
## Who / What / How / Where / When + evidence
|
||||
|
||||
@@ -46,11 +62,21 @@ Every assertion edge carries:
|
||||
Content leafs: `sha256`, `observed_at`, `source_rev`, `confidence`. Stale = a
|
||||
file changed on disk (git HEAD/mtime) after its last observed `source_rev`.
|
||||
`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
|
||||
corpus HEAD.
|
||||
|
||||
Fact **interval of truth** (D24 / OQ5): leaf props `valid_from` /
|
||||
`valid_to` (YYYY-MM-DD, inclusive; empty end = open; both empty = legacy
|
||||
always-active). `bin/brain/search.go --as-of YYYY-MM-DD` and MCP/HTTP
|
||||
`as_of` keep hits whose interval covers that day. This is not D16
|
||||
`temporal_freshness` (source freshness vs HEAD). [#36](https://git.produktor.io/eSlider/2dph/issues/36).
|
||||
Existing `kb.lbug` without the columns: open/search/add runs an idempotent
|
||||
`ALTER TABLE Leaf ADD …` (no full rebuild required). Fresh `--rebuild` still
|
||||
creates them in `CREATE NODE TABLE`.
|
||||
|
||||
## Sources (auto-pairing)
|
||||
|
||||
- A: runtime state — `docker ps` (container running), ports actually bound
|
||||
@@ -58,4 +84,36 @@ corpus HEAD.
|
||||
- C: narrative — READMEs, AGENTS.md, docs
|
||||
|
||||
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) stay hypothesis until
|
||||
`temporal_freshness` or `authority_pairing` fires (`bin/facts/audit contradict`,
|
||||
[#29](https://git.produktor.io/eSlider/2dph/issues/29)).
|
||||
|
||||
## 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`). Incremental write is `bin/kb/add`
|
||||
(`bin/brain/add.go`). Bulk 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`,
|
||||
`ingest` (add a leaf; omit body for the CLI hint).
|
||||
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).
|
||||
|
||||
Gap to v1 (hops, corpus, CI eval): [roadmap](roadmap.md),
|
||||
[epic #16](https://git.produktor.io/eSlider/2dph/issues/16).
|
||||
@@ -0,0 +1,46 @@
|
||||
# PicoClaw profile (reference agent)
|
||||
|
||||
2dph is the memory/fact gate. Compose profile `picoclaw` runs the official
|
||||
PicoClaw gateway (`docker.io/sipeed/picoclaw:v0.3.1`) plus `brain-mcp` and the
|
||||
CPU reasoner. Default agent model is `qwen3.5:9b` (RAM path, D18). Weights stay
|
||||
in the reasoner volume, not in the 2dph image.
|
||||
No secrets in git: Ollama needs no key; MCP is local HTTP.
|
||||
|
||||
```bash
|
||||
bin/stack/start-assistant
|
||||
bin/stack/start-assistant --no-attach
|
||||
bin/stack/start-assistant -- -m "search the 2dph brain for LadybugDB"
|
||||
bin/stack/status
|
||||
bin/stack/stop
|
||||
```
|
||||
|
||||
`start-assistant` reuses a healthy brain on `:8630`, starts the CPU reasoner,
|
||||
pulls `qwen3.5:9b` if missing, brings up the gateway with `--no-deps picoclaw`,
|
||||
then `picoclaw agent` (MCP `search` → `get` → `audit`). Gateway-only Compose:
|
||||
|
||||
```bash
|
||||
docker compose --profile picoclaw up -d
|
||||
# already serving :8630 / :11435:
|
||||
docker compose --profile picoclaw up -d --no-deps picoclaw
|
||||
```
|
||||
|
||||
Gateway: `127.0.0.1:18790`. Brain MCP: `http://127.0.0.1:8630/mcp`.
|
||||
Cursor-style clients can use [deploy/picoclaw/mcp.json.example](../deploy/picoclaw/mcp.json.example).
|
||||
PicoClaw itself uses [deploy/picoclaw/config.json](../deploy/picoclaw/config.json)
|
||||
(`127.0.0.1` + host network — loopback publishes are not reachable via docker0).
|
||||
|
||||
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`.
|
||||
|
||||
System performance (MCP gates + qwen3.5:9b tool_call + PicoClaw gateway):
|
||||
|
||||
```bash
|
||||
./qa/system_perf.py --json | yq '.gates'
|
||||
REASONER_MODEL=qwen3.5:9b ./qa/system_perf.py --reasoner --picoclaw --json | yq '.reasoner'
|
||||
```
|
||||
|
||||
The default agent model is `qwen3.5:9b`. PicoClaw `context_window` is 8192
|
||||
(heuristic `max_tokens*4` at 512 is 2048, too small for MCP tool schemas).
|
||||
`request_timeout` is 600s for a CPU turn (tool_call + MCP search + answer).
|
||||
@@ -0,0 +1,71 @@
|
||||
# Reasoner bake-off (D18)
|
||||
|
||||
Pluggable OpenAI-compatible URL. 2dph does not ship weights. PicoClaw is
|
||||
compose profile `picoclaw` (`sipeed/picoclaw`); the bake-off hits the same
|
||||
tool names (`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
|
||||
```
|
||||
|
||||
JSON includes `latency_p50_ms` / `latency_p95_ms` from DuckDB (`internal/duckstats`, D22).
|
||||
|
||||
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,71 @@
|
||||
---
|
||||
type: explanation
|
||||
status: current
|
||||
related:
|
||||
- PLAN.md
|
||||
- docs/design.md
|
||||
- docs/runbook.md
|
||||
---
|
||||
|
||||
# Gap to v1 — detective brain
|
||||
|
||||
Goal: a brain that does not assert without proof. Search is deduction
|
||||
(`facts` ≥2 sources → `info` → `web`). `confirmed` only from the facts root.
|
||||
|
||||
**v1 is a living graph the agent can write and walk**, not “more RAG”.
|
||||
|
||||
Epic: [Gitea #16](https://git.produktor.io/eSlider/2dph/issues/16).
|
||||
Milestone: [v1 detective brain](https://git.produktor.io/eSlider/2dph/milestone/12).
|
||||
Decisions: [PLAN.md](../PLAN.md).
|
||||
|
||||
## In (do not reopen)
|
||||
|
||||
Read path Go + Zig CGO (D21). HTTP + OpenAPI + MCP (D20). PicoClaw compose
|
||||
profile + CPU reasoner (D18). Mail sync → import → rebuild. D14 shebangs.
|
||||
Compose `api` (no CPython) / `index` (Python write). Issues #1–#5, #7–#13.
|
||||
[#15](https://git.produktor.io/eSlider/2dph/issues/15) lever/loop.
|
||||
[#14](https://git.produktor.io/eSlider/2dph/issues/14) `bin/brain/add.go` /
|
||||
`POST /ingest` (Python `kblib.add_leafs`; no Go upsert port).
|
||||
[#17](https://git.produktor.io/eSlider/2dph/issues/17) `--hop N` walks
|
||||
FROM_FILE / HAS_VERSION / AUTHORED.
|
||||
[#18](https://git.produktor.io/eSlider/2dph/issues/18) `--with-facts` /
|
||||
`--with-chats` on rebuild (WhatsApp out of v1).
|
||||
[#19](https://git.produktor.io/eSlider/2dph/issues/19) CI recall SoT =
|
||||
`bin/brain/eval.go` via Zig.
|
||||
Epic [#16](https://git.produktor.io/eSlider/2dph/issues/16) closed.
|
||||
|
||||
## v2
|
||||
|
||||
[#6](https://git.produktor.io/eSlider/2dph/issues/6) OCR — **in**.
|
||||
[#30](https://git.produktor.io/eSlider/2dph/issues/30) OQ3 duckdb-go — **in**.
|
||||
[#29](https://git.produktor.io/eSlider/2dph/issues/29) OQ1 contradiction
|
||||
resolution — **in** (`temporal_freshness`, `authority_pairing`).
|
||||
[#34](https://git.produktor.io/eSlider/2dph/issues/34) D23 flaggy CLI — **in**.
|
||||
[#36](https://git.produktor.io/eSlider/2dph/issues/36) OQ5/D24 fact intervals /
|
||||
as-of — **in** (not D16 `temporal_freshness`).
|
||||
|
||||
## Blockers
|
||||
|
||||
None for epic #16 (closed). Remaining v2: OQ4 (deferred).
|
||||
|
||||
```
|
||||
question
|
||||
│
|
||||
├─ FTS + HNSW ← in
|
||||
├─ facts / info roots ← in
|
||||
├─ web (D17) ← in
|
||||
├─ brain/add ACID ← in
|
||||
├─ Cypher hop ← in
|
||||
└─ facts+chats corpus ← in
|
||||
```
|
||||
|
||||
## Not v1
|
||||
|
||||
OQ4 YAML-first leafs.
|
||||
OQ5/D24 fact intervals + as-of — **in**
|
||||
([#36](https://git.produktor.io/eSlider/2dph/issues/36)).
|
||||
OCR (OQ2), duckdb-go (OQ3/D22), and D16 adjudication (OQ1) are in.
|
||||
|
||||
## Close epic #16 when
|
||||
|
||||
Children #14, #15, #17, #18, #19 are closed. MCP tool order stays gated by tests.
|
||||
+102
@@ -0,0 +1,102 @@
|
||||
---
|
||||
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)
|
||||
- Optional: poppler (`pdftotext`/`pdftoppm`) + tesseract `eng+deu` for mail OCR
|
||||
|
||||
```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 `bin/brain/add.go` for a leaf (or `POST /ingest`). Bulk
|
||||
corpus rebuild remains `bin/brain/index.go --rebuild` (Compose profile
|
||||
`index`). Do not DROP INDEX on Ladybug 0.19.
|
||||
|
||||
```bash
|
||||
bin/brain/add.go --text "arc-1 runs Matrix" --root facts --source "compose.yml x docker ps"
|
||||
bin/brain/index.go --rebuild --with-facts --with-chats
|
||||
bin/brain/search.go "LadybugDB vector index" # facts → info → web (D17)
|
||||
bin/brain/search.go "upstream flag" --no-web
|
||||
bin/brain/search.go "who works where" --as-of 2025-01-01 # D24 intervals
|
||||
source <(./bin/cli/complete.go bash) # D23 flaggy complete
|
||||
bin/brain/get.go <id> --body
|
||||
bin/brain/stats.go
|
||||
```
|
||||
|
||||
`--hop N` walks File → Commit → Person from each hit. `--as-of YYYY-MM-DD`
|
||||
keeps leafs whose `valid_from`/`valid_to` cover that day (empty interval =
|
||||
legacy always-on). Empty web results are `throttled`, not absence.
|
||||
Gap to v1: [roadmap](roadmap.md) / [epic #16](https://git.produktor.io/eSlider/2dph/issues/16).
|
||||
|
||||
Ladybug 0.19: never `DROP INDEX` FTS/VECTOR (ghost catalog). Fresh indexes =
|
||||
delete `var/kb.lbug` then `--rebuild`.
|
||||
|
||||
## HTTP / MCP
|
||||
|
||||
```bash
|
||||
bin/stack/start # brain :8630, wait until MCP search/get/audit
|
||||
bin/stack/status # YAML: brain / reasoner / picoclaw / mail_sync
|
||||
bin/stack/start-mail-sync # compose ETL: OO+Gmail sync→import (300s; no auto-rebuild)
|
||||
bin/stack/start-assistant # + qwen3.5:9b + PicoClaw agent (ask the brain)
|
||||
bin/stack/start-assistant --no-attach
|
||||
bin/stack/stop # compose stop; volumes kept
|
||||
```
|
||||
|
||||
Same Compose services by hand:
|
||||
|
||||
```bash
|
||||
docker compose up -d brain # :8630 Zig CGO serve
|
||||
docker compose up -d mail-sync # ETL loop into kb-var
|
||||
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`.
|
||||
See [picoclaw.md](picoclaw.md).
|
||||
|
||||
## 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,55 @@ require (
|
||||
github.com/arran4/golang-ical v0.3.5
|
||||
github.com/chewxy/math32 v1.11.2
|
||||
github.com/daulet/tokenizers v1.27.0
|
||||
github.com/duckdb/duckdb-go/v2 v2.10505.0
|
||||
github.com/go-git/go-git/v5 v5.19.2
|
||||
github.com/integrii/flaggy v1.8.0
|
||||
golang.org/x/sys v0.47.0
|
||||
golang.org/x/text v0.40.0
|
||||
modernc.org/sqlite v1.56.0
|
||||
)
|
||||
|
||||
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/cloudflare/circl v1.6.3 // indirect
|
||||
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
|
||||
github.com/duckdb/duckdb-go-bindings v0.10505.0 // indirect
|
||||
github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10505.0 // indirect
|
||||
github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10505.0 // indirect
|
||||
github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10505.0 // indirect
|
||||
github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10505.0 // indirect
|
||||
github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10505.0 // 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/go-viper/mapstructure/v2 v2.5.0 // 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/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/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/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/skeema/knownhosts v1.3.1 // indirect
|
||||
github.com/xanzy/ssh-agent v0.3.3 // indirect
|
||||
github.com/zeebo/xxh3 v1.1.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
|
||||
golang.org/x/sys v0.43.0 // indirect
|
||||
golang.org/x/crypto v0.53.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,202 @@
|
||||
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/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/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/go.mod h1:gm3MiPpY82fLYK5VKPB3WoJbsiLVDfT7flD5/vHReKw=
|
||||
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/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/go.mod h1:OnguFgjN0Hmx8jzpmWcC+AkHio94ujmLHKoaef7xQh8=
|
||||
github.com/chewxy/math32 v1.11.2 h1:IufN08Zwr1NKuWfY+4Tz55BcwKmyKKNdOP7KtumehnM=
|
||||
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/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/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/duckdb/duckdb-go-bindings v0.10505.0 h1:/0pPsTLrcCsTGxT0VrHgJWnOcPe1tQL1vrki1v3jbAI=
|
||||
github.com/duckdb/duckdb-go-bindings v0.10505.0/go.mod h1:HoD5xePkDj3VZbBnVVfxVVYIljZ9khCprWA7FgwIiC4=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10505.0 h1:FrMqquFBQlMsi34h2KZgCku54rqA8xEbXZ0NLVDKwYs=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10505.0/go.mod h1:EnAvZh1kNJHp5yF+M1ZHNEvapnmt6anq1xXHVrAGqMo=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10505.0 h1:lbRbpQwT1MmUhh/VTwukV9K8bxKByV3UghAP3MvsbBo=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10505.0/go.mod h1:IGLSeEcFhNeZF16aVjQCULD7TsFZKG5G7SyKJAXKp5c=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10505.0 h1:nrsaVYj3XYCRbS2FpdOMD/KHE7egRMr+/NR1IHmjT84=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10505.0/go.mod h1:KAIynZ0GHCS7X5fRyuFnQMg/SZBPK/bS9OCOVojClxw=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10505.0 h1:qM6oGDgwXBILJGbTY4fCy6QOczLpucUA6yn6g3ORjh4=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10505.0/go.mod h1:81SGOYoEUs8qaAfSk1wRfM5oobrIJ5KI7AzYhK6/bvQ=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10505.0 h1:DjqZl9rYreHkSOqnqLmkrqH5T8UdQNcxZLJVZzGmXXA=
|
||||
github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10505.0/go.mod h1:K25pJL26ARblGDeuAkrdblFvUen92+CwksLtPEHRqqQ=
|
||||
github.com/duckdb/duckdb-go/v2 v2.10505.0 h1:SWwvLn2Qx/RQSnQNupwgIF8VbnJ5A6OQU9lYb/mDETI=
|
||||
github.com/duckdb/duckdb-go/v2 v2.10505.0/go.mod h1:m0PW4J4FG9hlFlVdXi6Ds9owpyIDaBdE2jyce00fGcE=
|
||||
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/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
|
||||
github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
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/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/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||
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/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/integrii/flaggy v1.8.0 h1:tC1qWwg4fhF2Qdaj+MpPK04cxlOSq0+HoMZqAW6Arao=
|
||||
github.com/integrii/flaggy v1.8.0/go.mod h1:QS4c80m87SXG0pmVUT/Lx2RY5EbkLvLp7IKBD2jwcFA=
|
||||
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/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
|
||||
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/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/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/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/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/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/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
|
||||
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=
|
||||
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU=
|
||||
golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU=
|
||||
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
|
||||
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||
golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
|
||||
golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
|
||||
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/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/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/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=
|
||||
|
||||
@@ -85,9 +85,18 @@ func openWithSandbox(epsv string) error {
|
||||
closeBrain()
|
||||
return fmt.Errorf("LOAD EXTENSION VECTOR: %w", err)
|
||||
}
|
||||
migrateIntervalColumns()
|
||||
return nil
|
||||
}
|
||||
|
||||
// migrateIntervalColumns adds D24 valid_from/valid_to on existing Leaf tables.
|
||||
// Fresh CREATE already has them; ALTER is a no-op when the column exists.
|
||||
func migrateIntervalColumns() {
|
||||
for _, col := range []string{"valid_from", "valid_to"} {
|
||||
_, _ = conn.Query("ALTER TABLE Leaf ADD " + col + " STRING")
|
||||
}
|
||||
}
|
||||
|
||||
func closeBrain() {
|
||||
if conn != nil {
|
||||
conn.Close()
|
||||
|
||||
@@ -0,0 +1,171 @@
|
||||
//go:build cgo && system_ladybug
|
||||
|
||||
package brain
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
|
||||
"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, asOf string) ([]byte, error) {
|
||||
hits, err := searchHits(query, "", "", limit, asOf)
|
||||
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, "", asOf, 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(ctx context.Context, body []byte) ([]byte, error) {
|
||||
if len(bytes.TrimSpace(body)) == 0 {
|
||||
return json.Marshal(map[string]any{
|
||||
"mode": "add",
|
||||
"command": "bin/brain/add.go",
|
||||
"rebuild": "bin/brain/index.go --rebuild",
|
||||
})
|
||||
}
|
||||
cmd := exec.CommandContext(ctx, filepath.Join(repoRoot(), "bin", "kb", "add"), "--json")
|
||||
cmd.Stdin = bytes.NewReader(body)
|
||||
cmd.Dir = repoRoot()
|
||||
out, err := cmd.Output()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("add: %w", err)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
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"
|
||||
+56
-38
@@ -3,70 +3,88 @@ package rank
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/eSlider/2dph/internal/facts"
|
||||
"github.com/integrii/flaggy"
|
||||
)
|
||||
|
||||
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] [--hop N] [--as-of YYYY-MM-DD] [--json] [--no-web]
|
||||
bin/brain/search.go serve [port]
|
||||
bin/brain/search.go --list-model`
|
||||
bin/brain/search.go --list-model
|
||||
source <(./bin/cli/complete.go bash)`
|
||||
|
||||
type Options struct {
|
||||
Query string
|
||||
Root string
|
||||
Repo string
|
||||
Limit int
|
||||
Hop int
|
||||
AsOf string
|
||||
JSONOut bool
|
||||
ListModel bool
|
||||
NoWeb bool
|
||||
}
|
||||
|
||||
// NewParser is the flaggy schema for search (also used by bin/cli/complete.go).
|
||||
func NewParser(opt *Options) *flaggy.Parser {
|
||||
if opt.Limit == 0 {
|
||||
opt.Limit = 20
|
||||
}
|
||||
p := cli.New("brain-search")
|
||||
p.Description = "deduction search: facts → info → web"
|
||||
p.String(&opt.Root, "", "root", "facts or info")
|
||||
p.String(&opt.Repo, "", "repo", "filter by repo")
|
||||
p.Int(&opt.Limit, "n", "n", "max hits")
|
||||
p.Int(&opt.Hop, "", "hop", "walk FROM_FILE depth 1-3")
|
||||
p.String(&opt.AsOf, "", "as-of", "keep facts active on YYYY-MM-DD (D24)")
|
||||
p.Bool(&opt.JSONOut, "", "json", "JSON output")
|
||||
p.Bool(&opt.NoWeb, "", "no-web", "stay local")
|
||||
p.Bool(&opt.ListModel, "", "list-model", "print embedding model")
|
||||
return p
|
||||
}
|
||||
|
||||
// ParseArgs reads flags. Unknown flags are an error: silently dropping them
|
||||
// meant `--hop 1` vanished and its argument `1` was appended to the query.
|
||||
// --hop is recognised so it cannot be swallowed; it is not implemented until
|
||||
// File/FROM_FILE edges exist.
|
||||
func ParseArgs(args []string) (Options, error) {
|
||||
opt := Options{Limit: 20}
|
||||
var queryArgs []string
|
||||
|
||||
for i := 0; i < len(args); i++ {
|
||||
arg := args[i]
|
||||
wantsValue := arg == "--root" || arg == "--repo" || arg == "-n" || arg == "--hop"
|
||||
if wantsValue && i+1 >= len(args) {
|
||||
return opt, fmt.Errorf("%s needs a value", arg)
|
||||
p := NewParser(&opt)
|
||||
var q string
|
||||
p.AddPositionalValue(&q, "query", 1, false, "search query")
|
||||
if err := cli.Parse(p, args); err != nil {
|
||||
return opt, err
|
||||
}
|
||||
switch arg {
|
||||
case "--root":
|
||||
i++
|
||||
opt.Root = args[i]
|
||||
if opt.Root != "facts" && opt.Root != "info" {
|
||||
opt.Query = cli.Query(q, p.TrailingArguments)
|
||||
if opt.Root != "" && opt.Root != "facts" && opt.Root != "info" {
|
||||
return opt, fmt.Errorf("--root must be facts or info, got %q", opt.Root)
|
||||
}
|
||||
case "--repo":
|
||||
i++
|
||||
opt.Repo = args[i]
|
||||
case "-n":
|
||||
i++
|
||||
n, err := strconv.Atoi(args[i])
|
||||
if err != nil || n < 1 {
|
||||
return opt, fmt.Errorf("-n must be a positive integer, got %q", args[i])
|
||||
if opt.Limit < 1 {
|
||||
return opt, fmt.Errorf("-n must be a positive integer, got %q", strconv.Itoa(opt.Limit))
|
||||
}
|
||||
opt.Limit = n
|
||||
case "--hop":
|
||||
return opt, fmt.Errorf("--hop is not implemented yet (needs File/FROM_FILE edges)")
|
||||
case "--json":
|
||||
opt.JSONOut = true
|
||||
case "--list-model":
|
||||
opt.ListModel = true
|
||||
default:
|
||||
if strings.HasPrefix(arg, "-") {
|
||||
return opt, fmt.Errorf("unknown flag %q", arg)
|
||||
if opt.Hop < 0 {
|
||||
return opt, fmt.Errorf("--hop must be a positive integer, got %q", strconv.Itoa(opt.Hop))
|
||||
}
|
||||
queryArgs = append(queryArgs, arg)
|
||||
if opt.Hop > 3 {
|
||||
return opt, fmt.Errorf("--hop max is 3 (File → Commit → Person)")
|
||||
}
|
||||
if opt.AsOf != "" {
|
||||
day := facts.NormalizeDay(opt.AsOf)
|
||||
if len(day) != 10 || day[4] != '-' || day[7] != '-' {
|
||||
return opt, fmt.Errorf("--as-of must be YYYY-MM-DD, got %q", opt.AsOf)
|
||||
}
|
||||
opt.AsOf = day
|
||||
}
|
||||
|
||||
opt.Query = strings.TrimSpace(strings.Join(queryArgs, " "))
|
||||
if opt.Query == "" && !opt.ListModel {
|
||||
return opt, fmt.Errorf("no query given")
|
||||
}
|
||||
return opt, nil
|
||||
}
|
||||
|
||||
// Parser is the search schema for bin/cli/complete.go.
|
||||
func Parser() *flaggy.Parser {
|
||||
opt := Options{Limit: 20}
|
||||
p := NewParser(&opt)
|
||||
var q string
|
||||
p.AddPositionalValue(&q, "query", 1, false, "search query")
|
||||
return p
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package rank
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestFilterAsOfKeepsXDropsY(t *testing.T) {
|
||||
hits := []Hit{
|
||||
{ID: "x", Text: "Andrey works at X", ValidFrom: "2024-03-01", ValidTo: "2025-07-15"},
|
||||
{ID: "y", Text: "Andrey works at Y", ValidFrom: "2025-07-16", ValidTo: ""},
|
||||
{ID: "legacy", Text: "always true claim", ValidFrom: "", ValidTo: ""},
|
||||
}
|
||||
out := FilterAsOf(hits, "2025-01-01")
|
||||
if len(out) != 2 {
|
||||
t.Fatalf("len=%d want 2: %+v", len(out), out)
|
||||
}
|
||||
if out[0].ID != "x" || out[1].ID != "legacy" {
|
||||
t.Fatalf("got %+v", out)
|
||||
}
|
||||
if FilterAsOf(hits, "") == nil || len(FilterAsOf(hits, "")) != 3 {
|
||||
t.Fatal("empty as-of must keep all")
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseArgsAsOf(t *testing.T) {
|
||||
opt, err := ParseArgs([]string{"who works where", "--as-of", "2025-01-01", "--json"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if opt.AsOf != "2025-01-01" {
|
||||
t.Fatalf("AsOf=%q", opt.AsOf)
|
||||
}
|
||||
if _, err := ParseArgs([]string{"q", "--as-of", "not-a-date"}); err == nil {
|
||||
t.Fatal("expected bad as-of error")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
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 confirmed
|
||||
// facts hit. Hypothesis/partial facts are `(not confirmed)` (D16).
|
||||
// `--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 ConfirmedFact(h) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// ConfirmedFact is a facts-root hit that is not hypothesis/partial.
|
||||
// Empty confidence is treated as confirmed (legacy leafs).
|
||||
func ConfirmedFact(h Hit) bool {
|
||||
if h.Root != "facts" {
|
||||
return false
|
||||
}
|
||||
switch h.Confidence {
|
||||
case "hypothesis", "partial":
|
||||
return false
|
||||
default:
|
||||
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,88 @@
|
||||
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 TestShouldEscalateWhenHypothesisFacts(t *testing.T) {
|
||||
hyp := Hit{ID: "c", Root: "facts", Confidence: "hypothesis", Source: "a x b vs c x d"}
|
||||
if !ShouldEscalate([]Hit{hyp}, "") {
|
||||
t.Fatal("hypothesis facts are (not confirmed); escalate")
|
||||
}
|
||||
if ConfirmedFact(hyp) {
|
||||
t.Fatal("hypothesis is 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,36 @@ package rank
|
||||
// BM25 ranks best-first, so the top hits are the *highest* scores; cosine
|
||||
// distance ranks best-first ascending. Both mirror kblib.py.
|
||||
const FTSStmt = "CALL QUERY_FTS_INDEX('Leaf', 'id', $q) " +
|
||||
"RETURN node.id, node.text, node.root, node.source, score ORDER BY score DESC LIMIT $n"
|
||||
"RETURN node.id, node.text, node.root, node.source, score, node.confidence, " +
|
||||
"node.valid_from, node.valid_to ORDER BY score DESC LIMIT $n"
|
||||
|
||||
const VecStmt = "CALL QUERY_VECTOR_INDEX('Leaf', 'Leaf_vec', $q, $n) " +
|
||||
"RETURN node.id, node.text, node.root, node.source, distance ORDER BY distance LIMIT $n"
|
||||
"RETURN node.id, node.text, node.root, node.source, distance, node.confidence, " +
|
||||
"node.valid_from, node.valid_to ORDER BY distance LIMIT $n"
|
||||
|
||||
// HopStmt is the Cypher walk from a search hit. Depth 1 = File, 2 = Commit, 3 = Person.
|
||||
func HopStmt(depth int) string {
|
||||
switch depth {
|
||||
case 1:
|
||||
return "MATCH (l:Leaf {id:$id})-[:FROM_FILE]->(f:File) RETURN f.id, f.path, 1"
|
||||
case 2:
|
||||
return "MATCH (l:Leaf {id:$id})-[:FROM_FILE]->(f:File)-[:HAS_VERSION]->(c:Commit) RETURN c.id, c.subject, 2"
|
||||
case 3:
|
||||
return "MATCH (l:Leaf {id:$id})-[:FROM_FILE]->(f:File)-[:HAS_VERSION]->(c:Commit)-[:AUTHORED]->(p:Person) RETURN p.id, p.name, 3"
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
func HopLabel(depth int) string {
|
||||
switch depth {
|
||||
case 1:
|
||||
return "File"
|
||||
case 2:
|
||||
return "Commit"
|
||||
case 3:
|
||||
return "Person"
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,26 +5,44 @@ package rank
|
||||
import (
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"github.com/eSlider/2dph/internal/facts"
|
||||
)
|
||||
|
||||
type HopNode struct {
|
||||
ID string `json:"id"`
|
||||
Label string `json:"label"`
|
||||
Name string `json:"name"`
|
||||
Depth int `json:"depth"`
|
||||
}
|
||||
|
||||
// Hit is one search result, mirroring the python script's dict shape.
|
||||
type Hit struct {
|
||||
ID string `json:"id"`
|
||||
Text string `json:"text"`
|
||||
Root string `json:"root"`
|
||||
Confidence string `json:"confidence,omitempty"`
|
||||
Source string `json:"-"`
|
||||
Score float64 `json:"score"`
|
||||
Snippet string `json:"snippet,omitempty"`
|
||||
ValidFrom string `json:"valid_from,omitempty"`
|
||||
ValidTo string `json:"valid_to,omitempty"`
|
||||
Hops []HopNode `json:"hops,omitempty"`
|
||||
}
|
||||
|
||||
// rrfK dampens the contribution of low ranks; same constant as kblib.py.
|
||||
const rrfK = 60
|
||||
|
||||
// RankAndFilter fuses the two hit lists, applies --root/--repo, then cuts to
|
||||
// limit. Cutting first dropped every matching leaf ranked below the cut, so
|
||||
// `--root facts` came back empty whenever info leafs filled the top N.
|
||||
// limit <= 0 keeps everything.
|
||||
// RankAndFilter fuses the two hit lists, applies --root/--repo/--as-of, then
|
||||
// cuts to limit. Cutting first dropped every matching leaf ranked below the
|
||||
// cut, so `--root facts` came back empty whenever info leafs filled the top N.
|
||||
// limit <= 0 keeps everything. asOf empty skips interval filter (D24).
|
||||
func RankAndFilter(fts, vec []Hit, root, repo string, limit int) []Hit {
|
||||
return RankAndFilterAsOf(fts, vec, root, repo, "", limit)
|
||||
}
|
||||
|
||||
// RankAndFilterAsOf is RankAndFilter with D24 fact-interval filter.
|
||||
func RankAndFilterAsOf(fts, vec []Hit, root, repo, asOf string, limit int) []Hit {
|
||||
out := Hybrid(fts, vec, 0)
|
||||
if root != "" {
|
||||
out = FilterRoot(out, root)
|
||||
@@ -32,12 +50,30 @@ func RankAndFilter(fts, vec []Hit, root, repo string, limit int) []Hit {
|
||||
if repo != "" {
|
||||
out = FilterRepo(out, repo)
|
||||
}
|
||||
if asOf != "" {
|
||||
out = FilterAsOf(out, asOf)
|
||||
}
|
||||
if limit > 0 && len(out) > limit {
|
||||
out = out[:limit]
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// FilterAsOf keeps hits whose [valid_from, valid_to] covers asOf (D24).
|
||||
// Empty intervals stay (legacy leafs). Empty asOf keeps all.
|
||||
func FilterAsOf(hits []Hit, asOf string) []Hit {
|
||||
if asOf == "" {
|
||||
return hits
|
||||
}
|
||||
var out []Hit
|
||||
for _, h := range hits {
|
||||
if facts.ActiveAt(h.ValidFrom, h.ValidTo, asOf) {
|
||||
out = append(out, h)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Hybrid merges FTS and vector hits by reciprocal rank fusion.
|
||||
// limit <= 0 returns the full fused list.
|
||||
func Hybrid(fts, vec []Hit, limit int) []Hit {
|
||||
|
||||
@@ -91,15 +91,41 @@ func TestHybridKeepsVectorScoreForSharedHit(t *testing.T) {
|
||||
}
|
||||
|
||||
// The old parser dropped unknown flags and appended their arguments to the
|
||||
// query, so `search "q" --hop 1` searched for "q 1". --hop is not implemented
|
||||
// here (needs File edges); it must still fail closed instead of changing q.
|
||||
// query, so `search "q" --hop 1` searched for "q 1". --hop must stay a flag.
|
||||
func TestParseHopIsNotSwallowedIntoTheQuery(t *testing.T) {
|
||||
_, err := ParseArgs([]string{"what runs on arc-2", "--hop", "1"})
|
||||
if err == nil {
|
||||
t.Fatal("expected --hop to error (not implemented), not be swallowed")
|
||||
opt, err := ParseArgs([]string{"what runs on arc-2", "--hop", "1"})
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if !strings.Contains(err.Error(), "--hop") {
|
||||
t.Fatalf("error should name --hop, got %v", err)
|
||||
if opt.Query != "what runs on arc-2" {
|
||||
t.Fatalf("query swallowed hop arg: %q", opt.Query)
|
||||
}
|
||||
if opt.Hop != 1 {
|
||||
t.Fatalf("hop = %d, want 1", opt.Hop)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseHopMaxIsThree(t *testing.T) {
|
||||
if _, err := ParseArgs([]string{"q", "--hop", "4"}); err == nil {
|
||||
t.Fatal("expected --hop 4 to error")
|
||||
}
|
||||
opt, err := ParseArgs([]string{"q", "--hop", "3"})
|
||||
if err != nil || opt.Hop != 3 {
|
||||
t.Fatalf("hop 3: %+v err=%v", opt, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHopStmtWalksFromFile(t *testing.T) {
|
||||
s := HopStmt(1)
|
||||
if !strings.Contains(s, "FROM_FILE") || !strings.Contains(s, "File") {
|
||||
t.Fatalf("hop 1 must walk FROM_FILE, got %q", s)
|
||||
}
|
||||
s3 := HopStmt(3)
|
||||
if !strings.Contains(s3, "HAS_VERSION") || !strings.Contains(s3, "AUTHORED") || !strings.Contains(s3, "Person") {
|
||||
t.Fatalf("hop 3 must reach Person, got %q", s3)
|
||||
}
|
||||
if HopLabel(1) != "File" || HopLabel(3) != "Person" {
|
||||
t.Fatal("hop labels")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -146,4 +172,7 @@ func TestFTSQueryOrdersByScoreDescending(t *testing.T) {
|
||||
if !strings.Contains(FTSStmt, "ORDER BY score DESC") {
|
||||
t.Fatalf("FTS query must order by score DESC, got:\n%s", FTSStmt)
|
||||
}
|
||||
if !strings.Contains(FTSStmt, "node.confidence") {
|
||||
t.Fatal("FTS must return confidence for D16")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
package rank
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/integrii/flaggy"
|
||||
)
|
||||
|
||||
type GetOptions struct {
|
||||
ID string
|
||||
Body bool
|
||||
JSONOut bool
|
||||
}
|
||||
|
||||
func GetParser(opt *GetOptions) *flaggy.Parser {
|
||||
p := cli.New("brain-get")
|
||||
p.Description = "read one leaf"
|
||||
p.Bool(&opt.Body, "", "body", "full text instead of snippet")
|
||||
p.Bool(&opt.JSONOut, "", "json", "JSON output")
|
||||
p.AddPositionalValue(&opt.ID, "id", 1, false, "leaf id")
|
||||
return p
|
||||
}
|
||||
|
||||
func ParseGet(args []string) (GetOptions, error) {
|
||||
var opt GetOptions
|
||||
if err := cli.Parse(GetParser(&opt), args); err != nil {
|
||||
return opt, err
|
||||
}
|
||||
if opt.ID == "" {
|
||||
return opt, fmt.Errorf("id required")
|
||||
}
|
||||
return opt, nil
|
||||
}
|
||||
|
||||
type JSONFlag struct {
|
||||
JSONOut bool
|
||||
}
|
||||
|
||||
func bindJSON(name string, opt *JSONFlag) *flaggy.Parser {
|
||||
p := cli.New(name)
|
||||
p.Bool(&opt.JSONOut, "", "json", "JSON output")
|
||||
return p
|
||||
}
|
||||
|
||||
func StatsParser() *flaggy.Parser {
|
||||
opt := JSONFlag{}
|
||||
return bindJSON("brain-stats", &opt)
|
||||
}
|
||||
|
||||
func EvalParser() *flaggy.Parser {
|
||||
opt := JSONFlag{}
|
||||
return bindJSON("brain-eval", &opt)
|
||||
}
|
||||
|
||||
func ParseJSONFlag(name string, args []string) (JSONFlag, error) {
|
||||
var opt JSONFlag
|
||||
return opt, cli.Parse(bindJSON(name, &opt), args)
|
||||
}
|
||||
@@ -0,0 +1,246 @@
|
||||
//go:build cgo && system_ladybug
|
||||
|
||||
package brain
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"sort"
|
||||
"strings"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/eSlider/2dph/internal/brain/rank"
|
||||
"github.com/eSlider/2dph/internal/cli"
|
||||
)
|
||||
|
||||
func MainGet(args []string) int {
|
||||
opt, err := rank.ParseGet(args)
|
||||
if err != nil {
|
||||
return cli.Fail(err)
|
||||
}
|
||||
id, body, jsonOut := opt.ID, opt.Body, opt.JSONOut
|
||||
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 {
|
||||
opt, err := rank.ParseJSONFlag("brain-stats", args)
|
||||
if err != nil {
|
||||
return cli.Fail(err)
|
||||
}
|
||||
jsonOut := opt.JSONOut
|
||||
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 {
|
||||
opt, err := rank.ParseJSONFlag("brain-eval", args)
|
||||
if err != nil {
|
||||
return cli.Fail(err)
|
||||
}
|
||||
jsonOut := opt.JSONOut
|
||||
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
|
||||
}
|
||||
+131
-15
@@ -20,6 +20,7 @@ import (
|
||||
|
||||
lbug "github.com/LadybugDB/go-ladybug"
|
||||
"github.com/eSlider/2dph/internal/brain/rank"
|
||||
"github.com/eSlider/2dph/internal/cli"
|
||||
)
|
||||
|
||||
const defaultPort = 17830
|
||||
@@ -29,6 +30,9 @@ const healthPath = "/health"
|
||||
func runSearch(args []string) int {
|
||||
opt, err := rank.ParseArgs(args)
|
||||
if err != nil {
|
||||
if errors.Is(err, cli.ErrHelp) {
|
||||
return 0
|
||||
}
|
||||
fmt.Fprintf(os.Stderr, "brain/search: %v\n%s\n", err, rank.Usage)
|
||||
return 2
|
||||
}
|
||||
@@ -51,25 +55,19 @@ func runSearch(args []string) int {
|
||||
}
|
||||
defer closeBrain()
|
||||
|
||||
emb, err := embedQuery(query)
|
||||
hits, err := searchHits(query, root, repo, limit, opt.AsOf)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "embed: %v\n", err)
|
||||
fmt.Fprintf(os.Stderr, "search: %v\n", err)
|
||||
return 1
|
||||
}
|
||||
|
||||
fts, err := queryFTS(query, limit*3)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "fts: %v\n", err)
|
||||
if opt.Hop > 0 {
|
||||
if err := attachHops(hits, opt.Hop); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "hop: %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)
|
||||
|
||||
results := hits
|
||||
for i := range results {
|
||||
if results[i].Text != "" {
|
||||
runes := []rune(results[i].Text)
|
||||
@@ -80,23 +78,85 @@ 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{
|
||||
{"query", query},
|
||||
{"root_filter", root},
|
||||
{"as_of", opt.AsOf},
|
||||
{"count", len(results)},
|
||||
{"results", resultsToDicts(results)},
|
||||
}
|
||||
if webOut != nil {
|
||||
out = append(out, KV{"web", secondToDict(*webOut)})
|
||||
}
|
||||
|
||||
if jsonOut {
|
||||
enc := json.NewEncoder(os.Stdout)
|
||||
enc.SetIndent("", " ")
|
||||
enc.SetEscapeHTML(false)
|
||||
return b2i(enc.Encode(toJSONOut(results, query, root)))
|
||||
return b2i(enc.Encode(toJSONOut(results, query, root, opt.AsOf, webOut)))
|
||||
}
|
||||
fmt.Print(toYAML(out, 0))
|
||||
return 0
|
||||
}
|
||||
|
||||
func searchHits(query, root, repo string, limit int, asOf string) ([]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.RankAndFilterAsOf(fts, vec, root, repo, asOf, limit), nil
|
||||
}
|
||||
|
||||
func attachHops(hits []Hit, n int) error {
|
||||
if conn == nil {
|
||||
return fmt.Errorf("brain not open")
|
||||
}
|
||||
for i := range hits {
|
||||
var hops []rank.HopNode
|
||||
for d := 1; d <= n; d++ {
|
||||
stmt, err := conn.Prepare(rank.HopStmt(d))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
res, err := conn.Execute(stmt, map[string]any{"id": hits[i].ID})
|
||||
stmt.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for res.HasNext() {
|
||||
row, err := res.Next()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
vals, err := row.GetAsSlice()
|
||||
if err != nil || len(vals) < 3 {
|
||||
continue
|
||||
}
|
||||
hops = append(hops, rank.HopNode{
|
||||
ID: fmt.Sprint(vals[0]),
|
||||
Label: rank.HopLabel(d),
|
||||
Name: fmt.Sprint(vals[1]),
|
||||
Depth: int(asInt(vals[2])),
|
||||
})
|
||||
}
|
||||
}
|
||||
hits[i].Hops = hops
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func b2i(err error) int {
|
||||
if err != nil {
|
||||
return 1
|
||||
@@ -157,43 +217,78 @@ func rowsToHits(res *lbug.QueryResult) ([]Hit, error) {
|
||||
root := fmt.Sprint(vals[2])
|
||||
source := fmt.Sprint(vals[3])
|
||||
score := float64(vals[4].(float64))
|
||||
hits = append(hits, Hit{ID: id, Text: text, Root: root, Source: source, Score: score})
|
||||
conf := ""
|
||||
if len(vals) >= 6 {
|
||||
conf = fmt.Sprint(vals[5])
|
||||
}
|
||||
vf, vt := "", ""
|
||||
if len(vals) >= 8 {
|
||||
vf = nullStr(vals[6])
|
||||
vt = nullStr(vals[7])
|
||||
}
|
||||
hits = append(hits, Hit{
|
||||
ID: id, Text: text, Root: root, Source: source, Score: score,
|
||||
Confidence: conf, ValidFrom: vf, ValidTo: vt,
|
||||
})
|
||||
}
|
||||
return hits, nil
|
||||
}
|
||||
|
||||
func nullStr(v any) string {
|
||||
if v == nil {
|
||||
return ""
|
||||
}
|
||||
s := fmt.Sprint(v)
|
||||
if s == "<nil>" {
|
||||
return ""
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
// JSON output types
|
||||
type jsonOut struct {
|
||||
Query string `json:"query"`
|
||||
RootFilter string `json:"root_filter"`
|
||||
AsOf string `json:"as_of,omitempty"`
|
||||
Count int `json:"count"`
|
||||
Results []jsonHit `json:"results"`
|
||||
Web *rank.SecondSource `json:"web,omitempty"`
|
||||
}
|
||||
|
||||
type jsonHit struct {
|
||||
ID string `json:"id"`
|
||||
Text string `json:"text"`
|
||||
Root string `json:"root"`
|
||||
Confidence string `json:"confidence,omitempty"`
|
||||
Score float64 `json:"score"`
|
||||
Snippet string `json:"snippet,omitempty"`
|
||||
ValidFrom string `json:"valid_from,omitempty"`
|
||||
ValidTo string `json:"valid_to,omitempty"`
|
||||
Hops []rank.HopNode `json:"hops,omitempty"`
|
||||
}
|
||||
|
||||
func toJSONOut(hits []Hit, query, rootFilter string) *jsonOut {
|
||||
func toJSONOut(hits []Hit, query, rootFilter, asOf string, web *rank.SecondSource) *jsonOut {
|
||||
out := make([]jsonHit, len(hits))
|
||||
for i, h := range hits {
|
||||
out[i] = jsonHit{
|
||||
ID: h.ID,
|
||||
Text: h.Text,
|
||||
Root: h.Root,
|
||||
Confidence: h.Confidence,
|
||||
Score: h.Score,
|
||||
Snippet: h.Snippet,
|
||||
ValidFrom: h.ValidFrom,
|
||||
ValidTo: h.ValidTo,
|
||||
Hops: h.Hops,
|
||||
}
|
||||
}
|
||||
return &jsonOut{
|
||||
Query: query,
|
||||
RootFilter: rootFilter,
|
||||
AsOf: asOf,
|
||||
Count: len(hits),
|
||||
Results: out,
|
||||
Web: web,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -206,9 +301,30 @@ func resultsToDicts(hits []Hit) []any {
|
||||
{"root", h.Root},
|
||||
{"score", h.Score},
|
||||
}
|
||||
if h.Confidence != "" {
|
||||
d = append(d, KV{"confidence", h.Confidence})
|
||||
}
|
||||
if h.ValidFrom != "" {
|
||||
d = append(d, KV{"valid_from", h.ValidFrom})
|
||||
}
|
||||
if h.ValidTo != "" {
|
||||
d = append(d, KV{"valid_to", h.ValidTo})
|
||||
}
|
||||
if h.Snippet != "" {
|
||||
d = append(d, KV{"snippet", h.Snippet})
|
||||
}
|
||||
if len(h.Hops) > 0 {
|
||||
nodes := make([]any, len(h.Hops))
|
||||
for j, n := range h.Hops {
|
||||
nodes[j] = Dict{
|
||||
{"id", n.ID},
|
||||
{"label", n.Label},
|
||||
{"name", n.Name},
|
||||
{"depth", n.Depth},
|
||||
}
|
||||
}
|
||||
d = append(d, KV{"hops", nodes})
|
||||
}
|
||||
out[i] = d
|
||||
}
|
||||
return out
|
||||
|
||||
@@ -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
|
||||
}
|
||||
+6
-12
@@ -3,12 +3,13 @@ package chats
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
cliparse "github.com/eSlider/2dph/internal/cli"
|
||||
)
|
||||
|
||||
type ooContact struct {
|
||||
@@ -25,16 +26,9 @@ type ooContact struct {
|
||||
}
|
||||
|
||||
func RunApply(args []string) int {
|
||||
fs := flag.NewFlagSet("chats apply", flag.ContinueOnError)
|
||||
dryRun := fs.Bool("dry-run", false, "show what would be done without writing")
|
||||
help := fs.Bool("help", false, "")
|
||||
fs.SetOutput(os.Stderr)
|
||||
if err := fs.Parse(args); err != nil {
|
||||
return 2
|
||||
}
|
||||
if *help {
|
||||
fmt.Fprintln(os.Stderr, "usage: chats apply [--dry-run]")
|
||||
return 0
|
||||
dryRun, err := parseApplyFlags(args)
|
||||
if err != nil {
|
||||
return cliparse.Fail(err)
|
||||
}
|
||||
|
||||
ooCLI := findOO()
|
||||
@@ -128,7 +122,7 @@ func RunApply(args []string) int {
|
||||
|
||||
fmt.Printf("\nchats apply: %d actions to apply\n", len(resolved))
|
||||
|
||||
if *dryRun {
|
||||
if dryRun {
|
||||
for _, r := range resolved {
|
||||
switch r.Action {
|
||||
case "info-add":
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
package chats
|
||||
|
||||
import (
|
||||
cliparse "github.com/eSlider/2dph/internal/cli"
|
||||
"github.com/integrii/flaggy"
|
||||
)
|
||||
|
||||
type syncTelegramFlags struct {
|
||||
Limit int
|
||||
Phone string
|
||||
}
|
||||
|
||||
type syncLinkedInFlags struct {
|
||||
Limit int
|
||||
Refresh bool
|
||||
}
|
||||
|
||||
func SyncParser() *flaggy.Parser {
|
||||
p := cliparse.New("chats-sync")
|
||||
p.Description = "download chats to var/chats"
|
||||
tg := flaggy.NewSubcommand("telegram")
|
||||
li := flaggy.NewSubcommand("linkedin")
|
||||
var limit int
|
||||
var phone string
|
||||
var refresh bool
|
||||
tg.Int(&limit, "", "limit", "max messages per chat")
|
||||
tg.String(&phone, "", "phone", "phone (default TELEGRAM_PHONE)")
|
||||
li.Int(&limit, "", "limit", "max messages per conversation")
|
||||
li.Bool(&refresh, "", "refresh", "refresh webtop session")
|
||||
p.AttachSubcommand(tg, 1)
|
||||
p.AttachSubcommand(li, 1)
|
||||
return p
|
||||
}
|
||||
|
||||
func ImportParser() *flaggy.Parser {
|
||||
return cliparse.New("chats-import")
|
||||
}
|
||||
|
||||
func FactsParser() *flaggy.Parser {
|
||||
return cliparse.New("chats-facts")
|
||||
}
|
||||
|
||||
func ApplyParser() *flaggy.Parser {
|
||||
p := cliparse.New("chats-apply")
|
||||
dry := false
|
||||
p.Bool(&dry, "", "dry-run", "show without writing")
|
||||
return p
|
||||
}
|
||||
|
||||
func parseTelegramFlags(args []string) (syncTelegramFlags, error) {
|
||||
var f syncTelegramFlags
|
||||
p := cliparse.New("chats-sync-telegram")
|
||||
p.Int(&f.Limit, "", "limit", "max messages per chat")
|
||||
p.String(&f.Phone, "", "phone", "phone (default TELEGRAM_PHONE)")
|
||||
return f, cliparse.Parse(p, args)
|
||||
}
|
||||
|
||||
func parseLinkedInFlags(args []string) (syncLinkedInFlags, error) {
|
||||
var f syncLinkedInFlags
|
||||
p := cliparse.New("chats-sync-linkedin")
|
||||
p.Int(&f.Limit, "", "limit", "max messages per conversation")
|
||||
p.Bool(&f.Refresh, "", "refresh", "refresh webtop session")
|
||||
return f, cliparse.Parse(p, args)
|
||||
}
|
||||
|
||||
func parseApplyFlags(args []string) (dryRun bool, err error) {
|
||||
p := cliparse.New("chats-apply")
|
||||
p.Bool(&dryRun, "", "dry-run", "show without writing")
|
||||
return dryRun, cliparse.Parse(p, args)
|
||||
}
|
||||
|
||||
func parseNoFlags(name string, args []string) error {
|
||||
return cliparse.Parse(cliparse.New(name), args)
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user