mirror of
https://github.com/ModernRelay/omnigraph.git
synced 2026-06-12 01:45:14 +02:00
Resolves the 4 hard conflicts from PR #119 (multi-graph server mode, MR-668) landing on main: * `crates/omnigraph-cli/src/main.rs` imports: drop unused `ChangeRequest`, take main's `GraphListResponse`. * `crates/omnigraph-server/src/api.rs`: keep branch's `ChangeRequest` field rename (`query_source` -> `query` with serde alias, `query_name` -> `name`); accept main's rustfmt. * `crates/omnigraph-server/src/lib.rs`: take both import lists (branch's `QueryRequest` + main's `GraphInfo`/`GraphListResponse`); rewrite the `server_change` signature to combine the branch's `run_mutate` extraction with main's `Extension<Arc<GraphHandle>>` + `ResolvedActor` parameter shape. * `docs/user/server.md`: re-apply the branch's new `/query` and `/mutate` rows plus deprecation notes for `/read` and `/change` on top of main's two-column (single-mode | multi-mode) table layout. Auto-merged but stale callsites repaired alongside the conflict resolutions so the merge commit compiles: * `server_query` handler now takes `Extension(handle): Extension<Arc<GraphHandle>>` and `Option<Extension<ResolvedActor>>`, with policy read from `handle.policy.as_deref()` instead of the removed `state.policy_engine()`. Fold-in for MR-969 (next-step seam): * Extract `run_query` mirroring `run_mutate`: both helpers now take `(state, handle, actor, query: &str, name: Option<&str>, params_json: Option<&Value>, branch, ...)` instead of the `QueryRequest` / `ChangeRequest` body type. The future `/queries/{name}` handler can call these with registry-supplied fields without rebuilding the request shape. * `server_query` / `server_read` now route through `run_query`; `server_mutate` / `server_change` route through `run_mutate`. * D2 mutation rejection on `/query` is preserved via the `reject_mutations` flag; `/read` keeps the legacy permissive behavior for byte-stable back-compat. `cargo test -p omnigraph-server --test server`: 89 passed, 0 failed. `cargo build --workspace --tests --locked`: clean. Refs: MR-656, MR-668, MR-969.
192 lines
10 KiB
Markdown
192 lines
10 KiB
Markdown
# HTTP Server (`omnigraph-server`)
|
|
|
|
Axum 0.8 + tokio + utoipa-generated OpenAPI. **Two modes** (v0.6.0+): single-graph (legacy) and multi-graph (MR-668). Mode is inferred from CLI args + config shape.
|
|
|
|
## Modes
|
|
|
|
### Single-graph mode (legacy)
|
|
|
|
`omnigraph-server <URI>` or `omnigraph-server --target <name> --config omnigraph.yaml`. Routes are flat — `/snapshot`, `/read`, `/branches`, etc. Behavior unchanged from v0.6.0.
|
|
|
|
### Multi-graph mode (v0.6.0+)
|
|
|
|
`omnigraph-server --config omnigraph.yaml` with a non-empty `graphs:` map and **no** single-mode selector (no `server.graph`, no `<URI>`, no `--target`). The server opens every configured graph in parallel at startup (bounded concurrency = 4, fail-fast on the first open error). Routes are nested under `/graphs/{graph_id}/...`. Bare flat paths return 404 in multi mode.
|
|
|
|
Mode inference (four-rule matrix):
|
|
|
|
1. CLI positional `<URI>` → single
|
|
2. CLI `--target <name>` → single
|
|
3. `server.graph` in config → single
|
|
4. `--config` + non-empty `graphs:` + no single-mode selector → **multi**
|
|
5. otherwise → error with migration hint
|
|
|
|
## Endpoint inventory
|
|
|
|
Per-graph endpoints — same body shape across modes; URLs differ:
|
|
|
|
| Method | Single-mode path | Multi-mode path | Auth | Action | Handler |
|
|
|---|---|---|---|---|---|
|
|
| GET | `/healthz` | `/healthz` | none | — | `server_health` |
|
|
| GET | `/openapi.json` | `/openapi.json` | none | — | `server_openapi` (strips security if auth disabled; in multi mode emits cluster paths with `cluster_` operation-id prefix) |
|
|
| GET | `/snapshot?branch=` | `/graphs/{id}/snapshot?branch=` | bearer + `read` | snapshot of branch | `server_snapshot` |
|
|
| POST | `/query` | `/graphs/{id}/query` | bearer + `read` | inline read query (canonical; clean field names `query`/`name`; mutations → 400) | `server_query` |
|
|
| POST | `/read` | `/graphs/{id}/read` | bearer + `read` | **deprecated** alias of `/query` (legacy field names `query_source`/`query_name`, byte-stable response; carries `Deprecation: true` + `Link: </query>; rel="successor-version"`) | `server_read` |
|
|
| POST | `/export` | `/graphs/{id}/export` | bearer + `export` | NDJSON stream | `server_export` |
|
|
| POST | `/mutate` | `/graphs/{id}/mutate` | bearer + `change` | mutation (canonical; `query`/`name`; accepts legacy `query_source`/`query_name` as serde aliases) | `server_mutate` |
|
|
| POST | `/change` | `/graphs/{id}/change` | bearer + `change` | **deprecated** alias of `/mutate` (carries `Deprecation: true` + `Link: </mutate>; rel="successor-version"`) | `server_change` |
|
|
| GET | `/schema` | `/graphs/{id}/schema` | bearer + `read` | get current `.pg` source | `server_schema_get` |
|
|
| POST | `/schema/apply` | `/graphs/{id}/schema/apply` | bearer + `schema_apply` (target=`main`) | migrate | `server_schema_apply` |
|
|
| POST | `/ingest` | `/graphs/{id}/ingest` | bearer + `branch_create` (if new) + `change` | bulk load | `server_ingest` (32 MB body limit) |
|
|
| GET | `/branches` | `/graphs/{id}/branches` | bearer + `read` | list branches | `server_branch_list` |
|
|
| POST | `/branches` | `/graphs/{id}/branches` | bearer + `branch_create` | create | `server_branch_create` |
|
|
| DELETE | `/branches/{branch}` | `/graphs/{id}/branches/{branch}` | bearer + `branch_delete` | delete | `server_branch_delete` |
|
|
| POST | `/branches/merge` | `/graphs/{id}/branches/merge` | bearer + `branch_merge` | merge `source → target` | `server_branch_merge` |
|
|
| GET | `/commits?branch=` | `/graphs/{id}/commits?branch=` | bearer + `read` | list | `server_commit_list` |
|
|
| GET | `/commits/{commit_id}` | `/graphs/{id}/commits/{commit_id}` | bearer + `read` | show | `server_commit_show` |
|
|
|
|
Server-level management endpoints (v0.6.0+):
|
|
|
|
| Method | Path | Auth | Action | Handler |
|
|
|---|---|---|---|---|
|
|
| GET | `/graphs` | bearer + `graph_list` on `Server::"root"` | list registered graphs | `server_graphs_list` (405 in single mode) |
|
|
|
|
## Adding and removing graphs (multi mode)
|
|
|
|
Runtime add/remove via API is **not** exposed in v0.6.0 — neither
|
|
`POST /graphs` nor `DELETE /graphs/{id}` is implemented. Operators add
|
|
or remove graphs by stopping the server, editing the `graphs:` map in
|
|
`omnigraph.yaml`, then restarting. The server treats `omnigraph.yaml`
|
|
as operator-owned configuration and never writes it.
|
|
|
|
A future release may introduce a managed registry (Lance-backed,
|
|
catalog-style: reserve → init → publish with recovery sidecars) and
|
|
re-expose runtime mutation on top of it.
|
|
|
|
## Inline read queries (`POST /query`)
|
|
|
|
`POST /query` is the read-only, agent-friendly twin of `POST /read`. The
|
|
request body uses clean field names that match the CLI `-e` flag and the GQ
|
|
`query` keyword:
|
|
|
|
```json
|
|
{
|
|
"query": "query find($n: String) { match { $p: Person { name: $n } } return { $p.name } }",
|
|
"name": "find",
|
|
"params": { "n": "Alice" },
|
|
"branch": "main",
|
|
"snapshot": null
|
|
}
|
|
```
|
|
|
|
Response shape is identical to `/read` (`ReadOutput`). If the inline source
|
|
contains mutations (`insert` / `update` / `delete`), the request is rejected
|
|
with HTTP 400 and an error pointing the caller at `POST /mutate` — the
|
|
read-only contract is enforced at the URL.
|
|
|
|
`POST /mutate` is the canonical mutation endpoint. It accepts the same clean
|
|
field names (`query`, `name`); the legacy field names `query_source` and
|
|
`query_name` continue to deserialize as serde aliases so existing clients keep
|
|
working without changes.
|
|
|
|
## Deprecated names (`/read`, `/change`)
|
|
|
|
`POST /read` and `POST /change` are kept for back-compat indefinitely — they
|
|
are byte-stable on the request side and otherwise behave identically to
|
|
`/query` / `/mutate`. They are flagged as deprecated through three independent
|
|
channels:
|
|
|
|
- **OpenAPI**: the operations carry `deprecated: true` in `openapi.json`, so
|
|
every OpenAPI codegen (typescript-fetch, openapi-generator, oapi-codegen,
|
|
…) emits a `@deprecated` marker on the generated SDK method.
|
|
- **Response headers (RFC 9745)**: every response carries `Deprecation: true`.
|
|
- **Response headers (RFC 8288)**: every response carries a `Link` header
|
|
pointing at the canonical successor:
|
|
`Link: </query>; rel="successor-version"` for `/read`, and
|
|
`Link: </mutate>; rel="successor-version"` for `/change`. SDKs and HTTP
|
|
proxies can pick the successor up automatically.
|
|
|
|
Migration is purely cosmetic on the client side — swap the URL path, leave
|
|
the request body and response handling alone.
|
|
|
|
## Streaming
|
|
|
|
Only `/export` streams (`application/x-ndjson`, MPSC channel + `Body::from_stream`). Everything else is buffered JSON.
|
|
|
|
## Error model
|
|
|
|
Uniform `ErrorOutput { error, code?, merge_conflicts[], manifest_conflict? }` with `code ∈ unauthorized | forbidden | bad_request | not_found | conflict | too_many_requests | internal`. Merge conflicts attach structured `MergeConflictOutput { table_key, row_id?, kind, message }`.
|
|
|
|
`manifest_conflict` is set on **publisher CAS rejections** (HTTP 409): the
|
|
caller's pre-write view of one table's manifest version was stale.
|
|
`ManifestConflictOutput { table_key, expected, actual }` tells the client
|
|
which table to refresh and retry. This is the conflict shape produced by
|
|
concurrent `/mutate` (or its `/change` alias) or `/ingest` calls landing
|
|
the same `(table, branch)` race.
|
|
|
|
HTTP status codes used: 200, 400, 401, 403, 404, 409, 429, 500.
|
|
|
|
## Per-actor admission control
|
|
|
|
Disjoint
|
|
`(table, branch)` writes from different actors now run concurrently,
|
|
guarded only by the engine's per-(table, branch) write queue. To keep
|
|
one heavy actor from exhausting shared capacity (Lance I/O, manifest
|
|
churn, network), the server gates mutating handlers through a
|
|
`WorkloadController` configured per-process from environment variables:
|
|
|
|
| Env var | Default | Purpose |
|
|
|---|---|---|
|
|
| `OMNIGRAPH_PER_ACTOR_INFLIGHT_MAX` | 16 | Concurrent in-flight mutations per actor |
|
|
| `OMNIGRAPH_PER_ACTOR_BYTES_MAX` | 4 GiB | In-flight estimated bytes per actor |
|
|
|
|
When an actor exceeds its in-flight count or byte budget, the server
|
|
returns **HTTP 429 Too Many Requests** with `code: too_many_requests`
|
|
and a `Retry-After` header (seconds). The actor should back off; other
|
|
actors are unaffected.
|
|
|
|
Cedar policy authorization runs **before** admission accounting so
|
|
denied requests don't consume admission slots.
|
|
|
|
Today admission gates every mutating handler: `/mutate` (and its
|
|
deprecated alias `/change`), `/ingest`, `/branches/{create,delete,merge}`,
|
|
and `/schema/apply`. Read-only endpoints (`/snapshot`, `/query`, `/read`,
|
|
`/export`, `/branches` GET, `/commits`, `/schema` GET) are not
|
|
admission-gated.
|
|
|
|
## Body limits
|
|
|
|
- Default: 1 MB
|
|
- `/ingest`: 32 MB
|
|
|
|
## Auth model (`bearer + SHA-256`)
|
|
|
|
- Tokens are SHA-256 hashed on startup; plaintext is never persisted in memory.
|
|
- Constant-time comparison via `subtle::ConstantTimeEq`.
|
|
- Three sources, in precedence:
|
|
1. `OMNIGRAPH_SERVER_BEARER_TOKENS_AWS_SECRET` — AWS Secrets Manager (build with `--features aws`)
|
|
2. `OMNIGRAPH_SERVER_BEARER_TOKENS_FILE` or `OMNIGRAPH_SERVER_BEARER_TOKENS_JSON` — JSON `{actor_id: token, …}`
|
|
3. `OMNIGRAPH_SERVER_BEARER_TOKEN` — single legacy token, actor `default`
|
|
- If no tokens are configured, startup refuses unless `--unauthenticated` or
|
|
`OMNIGRAPH_UNAUTHENTICATED=1` explicitly opts into open local-dev mode. A
|
|
policy file without tokens is also rejected at startup. In open mode
|
|
`/openapi.json` strips the security scheme.
|
|
|
|
See [deployment.md](deployment.md) for token-source operational details.
|
|
|
|
## Tracing & observability
|
|
|
|
- `tower_http::TraceLayer::new_for_http()`
|
|
- Policy decisions logged at INFO level with actor, action, branch, decision, matched rule
|
|
- Startup logs: token source name, graph URI, bind address
|
|
- Graceful SIGINT shutdown
|
|
|
|
## Not implemented (by design or "TBD")
|
|
|
|
- CORS — not configured; add `tower_http::cors` if needed.
|
|
- Rate limiting — per-actor admission control gates `/mutate` (alias
|
|
`/change`), `/ingest`, `/branches/{create,delete,merge}`,
|
|
`/schema/apply` (see "Per-actor
|
|
admission control" above). No global rate limiter is configured;
|
|
add `tower_http::limit` if a graph-wide cap is needed.
|
|
- Pagination — none (commits/branches return everything; export streams).
|
|
- Runtime graph add/remove — edit `omnigraph.yaml` and restart.
|