mirror of
https://github.com/ModernRelay/omnigraph.git
synced 2026-06-09 01:35:18 +02:00
* feat(MR-656): inline query strings in CLI and HTTP server
CLI:
- Add -e / --query-string <STRING> to omnigraph read and omnigraph change
- Exactly one of --query, --query-string, --alias is required (3-way XOR)
- Empty --query-string is rejected with a clear error
HTTP:
- New POST /query (read-only, clean field names: query/name/params/branch/snapshot)
- Mutations on /query are rejected with 400 -- use POST /change instead
- ChangeRequest fields polished: query (alias query_source), name (alias query_name)
- POST /read and POST /change remain byte-compatible for existing clients
Tests:
- cli.rs: -e happy-path on read/change, mutex error vs --query, empty -e rejected
- system_local.rs: inline -e read and -e change exercise the local flow
- system_remote.rs: inline -e read/change over HTTP plus direct /query 200/400
- server.rs: /query 200, /query 400 on mutation, /change legacy field alias
- openapi.rs: new /query path, QueryRequest schema, ChangeRequest field-name polish
Docs: cli.md (-e examples), cli-reference.md (read/change rows), server.md (/query)
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* feat(MR-656): rename read/change to query/mutate with deprecation signals
HTTP server:
- Add POST /mutate as canonical write endpoint (pairs with POST /query).
- Mark POST /read and POST /change as deprecated. Three-channel signal:
* OpenAPI: `deprecated: true` on the operation (every codegen flags
the generated SDK method).
* RFC 9745: response `Deprecation: true` header on every response.
* RFC 8288: response `Link: </successor>; rel="successor-version"`
pointing at /query and /mutate respectively.
- Share business logic across /mutate and /change via run_mutate(); the
/change wrapper is the only place that adds the deprecation headers.
- ChangeRequest field aliases (query_source/query_name) preserved.
- AliasCommand serde now accepts `query`/`mutate` alongside `read`/`change`.
CLI:
- Promote `omnigraph query` / `omnigraph mutate` to top-level canonical
subcommands (clap visible_alias keeps `omnigraph read` / `omnigraph
change` working forever).
- Promote `omnigraph lint` / `omnigraph check` to top-level (was nested
under `omnigraph query lint`, which is now a deprecated argv shim that
rewrites to the canonical form).
- Argv-level preprocessing prints a one-line deprecation warning to
stderr when any legacy spelling is used. Canonical names are silent.
Tests:
- Server: /mutate works, /change emits Deprecation+Link headers, /read
emits Deprecation+Link headers, /query carries no deprecation signal.
- OpenAPI: /read and /change flagged deprecated; /query and /mutate not.
- CLI: canonical `lint` matches deprecated `query lint` / `query check`
output; `read` / `change` print deprecation warnings.
Docs:
- cli.md: new canonical examples; "Deprecated names" migration table.
- cli-reference.md: top-level table updated; aliases.<name>.command
accepts both legacy and canonical spellings.
- server.md: endpoint inventory shows /query and /mutate as canonical
and /read and /change as deprecated; dedicated section explains the
three-channel deprecation signal.
- og-cheet-sheet.md: use new `omnigraph lint` / `omnigraph check`.
- openapi.json regenerated.
Migration is purely cosmetic — every deprecated form continues to work
indefinitely; only the spelling changes.
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* fix(MR-656): address Devin Review findings on /query and /change
Two issues raised by Devin Review on PR #110:
1. `POST /query` mutation-rejection error pointed at the deprecated
`/change` endpoint instead of the canonical `/mutate`. Fixed in
three places: the runtime error message in `server_query`, the
utoipa 400-response description, and the handler doc comment. The
`QueryRequest` schema docstrings in `api.rs` got the same update so
the openapi.json bodies match. Server and openapi tests updated.
2. `execute_change_remote` serialized `ChangeRequest` directly, which
emits the new canonical field names `query` / `name` on the wire.
`#[serde(alias = "query_source")]` only affects deserialization, so
a newer CLI talking to an older server would have its `/change`
POST body fail with "missing field: query_source". Fixed by
extracting a `legacy_change_request_body` helper that hand-rolls
the JSON with the legacy keys (`query_source` / `query_name`), the
same byte-stable contract `execute_read_remote` already uses
against `/read`. Added two unit tests on the helper to lock the
wire shape in.
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* docs(dev): RFC 001 — inline + stored queries, envelope, MCP
Tracked artifact consolidating the design across MR-656 (this branch),
MR-976 (Phase 1 envelope hardening parent, with MR-977/978/979/980
sub-issues), and MR-969 (stored queries + MCP).
Sections:
* Two paths, one engine — inline `/query` + `/mutate` (this PR) coexist
with stored `/queries/{name}` (MR-969). Same `run_query` / `run_mutate`
backend (the fold-in landed in the previous commit).
* Request envelope ("before") — Idempotency-Key, If-Match, X-Deadline,
X-Trace-Id, expect, dry_run, fields. Phase 1 ships the load-bearing
subset on `/mutate`.
* Response envelope ("after") — audit_id, snapshot_id, commit_id, stats,
warnings. Closes the provenance loop today's `ChangeOutput` leaves
open.
* `.gq` pragmas — `@description`, `@returns`, `@mcp`. Source-of-truth
for the stored-query agent contract; no separate YAML registry.
* Multi-graph MCP — per-graph `/graphs/{id}/mcp/tools` + `/mcp/invoke`.
Token binds to one graph by default; cross-graph agents loop.
* Cedar split — `read`/`change` for inline, `invoke_query` for stored.
Operators deny ad-hoc for agent groups while keeping curated tool
list open.
* Rejected alternatives — per-env override files, compiled bundles,
tool-name prefixing across graphs, body-field graph dispatch.
Index entry added under "Active Implementation Plans" so future agents
land on the RFC before touching queries / mutations / envelope code.
`scripts/check-agents-md.sh` clean (35 links, 34 docs).
* docs(server): clarify why run_query lacks AppState parameter
run_mutate takes state for workload admission; run_query doesn't because
reads aren't admission-gated today. Mark the asymmetry as intentional and
flag the two future events that would grow the signature: Phase 1's
`expect: { max_rows_scanned: N }` budget (MR-976) or per-actor admission
extending to stored-read invocations (MR-969). Prevents the natural
"make these symmetrical" follow-up.
* refactor(server): run_query / run_mutate take &ResolvedActor
Replace `Option<Extension<ResolvedActor>>` in the helpers with
`Option<&ResolvedActor>`. Saves MR-969's stored-query handler from
wrapping a bare actor in axum's `Extension(...)` before calling.
Handler signatures (`server_query`, `server_read`, `server_mutate`,
`server_change`) keep `Option<Extension<ResolvedActor>>` because that
is what axum injects, and unwrap at the call site with
`actor.as_ref().map(|Extension(actor)| actor)`.
Net: -13/+10 LOC, 89/0 server tests pass.
* docs(releases): v0.6.0 — describe inline + canonical-named queries (MR-656)
Extend the v0.6.0 release notes to cover the third piece of work landing
alongside the graph terminology rename and multi-graph server mode:
canonical-named `POST /query` and `POST /mutate` endpoints, the CLI's
new `-e/--query-string` flag, the top-level promotion of `lint` /
`check`, and the three-channel deprecation signal on `/read` and
`/change` (OpenAPI `deprecated: true` + RFC 9745 + RFC 8288).
Additions:
* Top blurb: "Two pieces" -> "Three pieces" with a bullet describing
the rename + inline flow.
* Breaking Changes: new "Query / mutation rename" subsection covering
the `ChangeRequest` field rename (with the back-compat serde aliases
and the CLI's `legacy_change_request_body` byte-stable wire helper)
and the `omnigraph query lint` -> `omnigraph lint` move.
* New: 5 bullets — the two endpoints, the CLI subcommands, the `-e`
flag, the deprecation signal channels, the widened `aliases.<name>.command`
vocabulary.
* User Impact: one bullet making explicit that the rename is cosmetic
on the client side and migration is voluntary.
* Documentation: pointers to the updated `server.md` / `cli.md` /
`cli-reference.md` and the new `docs/dev/rfc-001-queries-envelope-mcp.md`.
+15/-1 lines. `./scripts/check-agents-md.sh` clean.
* refactor(cli): demote `check` from visible_alias to deprecation shim
`omnigraph check` was a clap `visible_alias` on `lint`, advertised in
`--help` as an equivalent canonical name. Per MR-981 §6 (long-form
flags as canonical, short forms as visible aliases), visible aliases
on subcommand names hurt agent CX: agents emit either spelling
depending on training-data drift, and there's no length signal
pointing at the canonical name.
Changes:
* Remove `#[command(visible_alias = "check")]` from the `Lint` variant.
`omnigraph --help` now shows only `lint`.
* Add bare `check` to `rewrite_deprecated_argv` so `omnigraph check
<args>` still works — it rewrites to `omnigraph lint <args>` and
emits a one-line stderr deprecation warning, matching the existing
pattern for `read` / `change` / `query lint` / `query check`.
* Fix the nested `query check` shim to substitute `check` -> `lint` in
the rewritten argv (previously it relied on `check` being a
visible_alias to reach the `Lint` variant).
* New test `deprecated_check_top_level_rewrites_to_lint` covers: bare
`check` produces identical stdout to `lint`, emits the deprecation
warning, and `check` does NOT appear as an alias in `omnigraph
--help`.
* Release notes updated to reflect the deprecation-shim treatment and
cross-reference MR-981 §6 reasoning.
Cargo / Go users typing `check` still work indefinitely; one stderr
nudge per invocation teaches the canonical name. Agents see only
`lint` in `--help --json` so they emit one canonical form.
67/0 omnigraph-cli tests pass; 39 workspace test suites green.
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Ragnor Comerford <ragnor.comerford@gmail.com>
Co-authored-by: Ragnor Comerford <hello@ragnor.co>
536 lines
18 KiB
Rust
536 lines
18 KiB
Rust
use omnigraph::db::{GraphCommit, MergeOutcome, ReadTarget, SchemaApplyResult, Snapshot};
|
|
use omnigraph::error::{MergeConflict, MergeConflictKind};
|
|
use omnigraph::loader::{IngestResult, LoadMode};
|
|
use omnigraph_compiler::SchemaMigrationStep;
|
|
use omnigraph_compiler::result::QueryResult;
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_json::Value;
|
|
use utoipa::{IntoParams, ToSchema};
|
|
|
|
/// Shadow enum for documenting [`LoadMode`] in the OpenAPI schema.
|
|
#[derive(ToSchema)]
|
|
#[schema(as = LoadMode)]
|
|
#[allow(dead_code)]
|
|
enum LoadModeSchema {
|
|
/// Overwrite existing data.
|
|
#[schema(rename = "overwrite")]
|
|
Overwrite,
|
|
/// Append to existing data.
|
|
#[schema(rename = "append")]
|
|
Append,
|
|
/// Merge by id key (upsert).
|
|
#[schema(rename = "merge")]
|
|
Merge,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct SnapshotTableOutput {
|
|
pub table_key: String,
|
|
pub table_path: String,
|
|
pub table_version: u64,
|
|
pub table_branch: Option<String>,
|
|
pub row_count: u64,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct SnapshotOutput {
|
|
pub branch: String,
|
|
pub manifest_version: u64,
|
|
pub tables: Vec<SnapshotTableOutput>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct BranchCreateRequest {
|
|
/// Parent branch to fork from. Defaults to `main`.
|
|
pub from: Option<String>,
|
|
/// Name of the new branch. Must not already exist.
|
|
pub name: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct BranchCreateOutput {
|
|
pub uri: String,
|
|
pub from: String,
|
|
pub name: String,
|
|
pub actor_id: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct BranchListOutput {
|
|
pub branches: Vec<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct BranchDeleteOutput {
|
|
pub uri: String,
|
|
pub name: String,
|
|
pub actor_id: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct BranchMergeRequest {
|
|
/// Source branch whose commits will be merged.
|
|
pub source: String,
|
|
/// Target branch that will receive the merge. Defaults to `main`.
|
|
pub target: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, ToSchema)]
|
|
#[serde(rename_all = "snake_case")]
|
|
pub enum BranchMergeOutcome {
|
|
AlreadyUpToDate,
|
|
FastForward,
|
|
Merged,
|
|
}
|
|
|
|
impl From<MergeOutcome> for BranchMergeOutcome {
|
|
fn from(value: MergeOutcome) -> Self {
|
|
match value {
|
|
MergeOutcome::AlreadyUpToDate => Self::AlreadyUpToDate,
|
|
MergeOutcome::FastForward => Self::FastForward,
|
|
MergeOutcome::Merged => Self::Merged,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl BranchMergeOutcome {
|
|
pub fn as_str(self) -> &'static str {
|
|
match self {
|
|
Self::AlreadyUpToDate => "already_up_to_date",
|
|
Self::FastForward => "fast_forward",
|
|
Self::Merged => "merged",
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct BranchMergeOutput {
|
|
pub source: String,
|
|
pub target: String,
|
|
pub outcome: BranchMergeOutcome,
|
|
pub actor_id: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, ToSchema)]
|
|
#[serde(rename_all = "snake_case")]
|
|
pub enum MergeConflictKindOutput {
|
|
DivergentInsert,
|
|
DivergentUpdate,
|
|
DeleteVsUpdate,
|
|
OrphanEdge,
|
|
UniqueViolation,
|
|
CardinalityViolation,
|
|
ValueConstraintViolation,
|
|
}
|
|
|
|
impl MergeConflictKindOutput {
|
|
pub fn as_str(self) -> &'static str {
|
|
match self {
|
|
Self::DivergentInsert => "divergent_insert",
|
|
Self::DivergentUpdate => "divergent_update",
|
|
Self::DeleteVsUpdate => "delete_vs_update",
|
|
Self::OrphanEdge => "orphan_edge",
|
|
Self::UniqueViolation => "unique_violation",
|
|
Self::CardinalityViolation => "cardinality_violation",
|
|
Self::ValueConstraintViolation => "value_constraint_violation",
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<MergeConflictKind> for MergeConflictKindOutput {
|
|
fn from(value: MergeConflictKind) -> Self {
|
|
match value {
|
|
MergeConflictKind::DivergentInsert => Self::DivergentInsert,
|
|
MergeConflictKind::DivergentUpdate => Self::DivergentUpdate,
|
|
MergeConflictKind::DeleteVsUpdate => Self::DeleteVsUpdate,
|
|
MergeConflictKind::OrphanEdge => Self::OrphanEdge,
|
|
MergeConflictKind::UniqueViolation => Self::UniqueViolation,
|
|
MergeConflictKind::CardinalityViolation => Self::CardinalityViolation,
|
|
MergeConflictKind::ValueConstraintViolation => Self::ValueConstraintViolation,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct MergeConflictOutput {
|
|
pub table_key: String,
|
|
pub row_id: Option<String>,
|
|
pub kind: MergeConflictKindOutput,
|
|
pub message: String,
|
|
}
|
|
|
|
impl From<&MergeConflict> for MergeConflictOutput {
|
|
fn from(value: &MergeConflict) -> Self {
|
|
Self {
|
|
table_key: value.table_key.clone(),
|
|
row_id: value.row_id.clone(),
|
|
kind: value.kind.into(),
|
|
message: value.message.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct ReadTargetOutput {
|
|
pub branch: Option<String>,
|
|
pub snapshot: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct ReadOutput {
|
|
pub query_name: String,
|
|
pub target: ReadTargetOutput,
|
|
pub row_count: usize,
|
|
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
pub columns: Vec<String>,
|
|
pub rows: Value,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct ChangeOutput {
|
|
pub branch: String,
|
|
pub query_name: String,
|
|
pub affected_nodes: usize,
|
|
pub affected_edges: usize,
|
|
pub actor_id: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct IngestTableOutput {
|
|
pub table_key: String,
|
|
pub rows_loaded: usize,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct IngestOutput {
|
|
pub uri: String,
|
|
pub branch: String,
|
|
pub base_branch: String,
|
|
pub branch_created: bool,
|
|
#[schema(value_type = LoadModeSchema)]
|
|
pub mode: LoadMode,
|
|
pub tables: Vec<IngestTableOutput>,
|
|
pub actor_id: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct CommitOutput {
|
|
pub graph_commit_id: String,
|
|
pub manifest_branch: Option<String>,
|
|
pub manifest_version: u64,
|
|
pub parent_commit_id: Option<String>,
|
|
pub merged_parent_commit_id: Option<String>,
|
|
pub actor_id: Option<String>,
|
|
/// Commit creation time as Unix epoch microseconds.
|
|
#[schema(example = 1714000000000000i64)]
|
|
pub created_at: i64,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct CommitListOutput {
|
|
pub commits: Vec<CommitOutput>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct ReadRequest {
|
|
/// GQ query source. May declare one or more named queries; pick one with
|
|
/// `query_name` if there is more than one.
|
|
#[schema(
|
|
example = "query get_person($name: String) {\n match {\n $p: Person { name: $name }\n }\n return { $p.name, $p.age }\n}"
|
|
)]
|
|
pub query_source: String,
|
|
/// Name of the query to run when `query_source` declares multiple. Optional
|
|
/// when only one query is declared.
|
|
pub query_name: Option<String>,
|
|
/// JSON object whose keys match the query's declared parameters.
|
|
pub params: Option<Value>,
|
|
/// Branch to read from. Mutually exclusive with `snapshot`. Defaults to `main`.
|
|
pub branch: Option<String>,
|
|
/// Snapshot id to read from. Mutually exclusive with `branch`.
|
|
pub snapshot: Option<String>,
|
|
}
|
|
|
|
/// Inline read-query request for `POST /query`.
|
|
///
|
|
/// Friendlier-named alternative to [`ReadRequest`] for ad-hoc reads and
|
|
/// AI-agent integration. Mutations are rejected with 400 — use `POST
|
|
/// /mutate` (or its deprecated alias `POST /change`) for write queries.
|
|
/// Field names are deliberately short (`query`, `name`) to match the GQ
|
|
/// keyword and the CLI `-e` flag.
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct QueryRequest {
|
|
/// GQ read-query source. May declare one or more named queries; pick one
|
|
/// with `name` when more than one is declared. Mutations
|
|
/// (`insert`/`update`/`delete`) get 400 — use `POST /mutate` (or its
|
|
/// deprecated alias `POST /change`) instead.
|
|
#[schema(example = "query get_person($name: String) {\n match {\n $p: Person { name: $name }\n }\n return { $p.name, $p.age }\n}")]
|
|
pub query: String,
|
|
/// Name of the query to run when `query` declares multiple. Optional when
|
|
/// only one query is declared.
|
|
pub name: Option<String>,
|
|
/// JSON object whose keys match the query's declared parameters.
|
|
pub params: Option<Value>,
|
|
/// Branch to read from. Mutually exclusive with `snapshot`. Defaults to `main`.
|
|
pub branch: Option<String>,
|
|
/// Snapshot id to read from. Mutually exclusive with `branch`.
|
|
pub snapshot: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct ChangeRequest {
|
|
/// GQ mutation source containing `insert`, `update`, or `delete` statements.
|
|
/// May declare multiple named mutations; pick one with `name`.
|
|
///
|
|
/// Accepts the legacy field name `query_source` as a deserialization alias.
|
|
#[schema(
|
|
example = "query insert_person($name: String, $age: I32) {\n insert Person { name: $name, age: $age }\n}"
|
|
)]
|
|
#[serde(alias = "query_source")]
|
|
pub query: String,
|
|
/// Name of the mutation to run when `query` declares multiple.
|
|
///
|
|
/// Accepts the legacy field name `query_name` as a deserialization alias.
|
|
#[serde(default, alias = "query_name")]
|
|
pub name: Option<String>,
|
|
/// JSON object whose keys match the mutation's declared parameters.
|
|
#[serde(default)]
|
|
pub params: Option<Value>,
|
|
/// Target branch. Defaults to `main`.
|
|
#[serde(default)]
|
|
pub branch: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Default, Serialize, Deserialize, ToSchema)]
|
|
pub struct SchemaApplyRequest {
|
|
/// Project schema in `.pg` source form. The diff against the current
|
|
/// schema produces the migration steps that will be applied.
|
|
#[schema(
|
|
example = "node Person {\n name: String @key\n age: I32?\n}\n\nedge Knows: Person -> Person"
|
|
)]
|
|
pub schema_source: String,
|
|
/// When true, promote every `DropMode::Soft` step in the plan to
|
|
/// `DropMode::Hard`, making the prior column data unreachable
|
|
/// after the apply. Matches the CLI's `--allow-data-loss` flag.
|
|
/// Defaults to `false` (drops remain reversible via time travel).
|
|
#[serde(default)]
|
|
pub allow_data_loss: bool,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct SchemaApplyOutput {
|
|
pub uri: String,
|
|
pub supported: bool,
|
|
pub applied: bool,
|
|
pub step_count: usize,
|
|
pub manifest_version: u64,
|
|
#[schema(value_type = Vec<Value>)]
|
|
pub steps: Vec<SchemaMigrationStep>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct SchemaOutput {
|
|
pub schema_source: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct IngestRequest {
|
|
/// Target branch. Created from `from` if it does not yet exist. Defaults to `main`.
|
|
pub branch: Option<String>,
|
|
/// Parent branch used to create `branch` if it does not exist. Defaults to `main`.
|
|
pub from: Option<String>,
|
|
/// How existing rows are handled. Defaults to `merge`.
|
|
#[schema(value_type = Option<LoadModeSchema>)]
|
|
pub mode: Option<LoadMode>,
|
|
/// NDJSON payload: one record per line, each shaped
|
|
/// `{"type": "<TypeName>", "data": {...}}`.
|
|
#[schema(
|
|
example = "{\"type\": \"Person\", \"data\": {\"name\": \"Alice\", \"age\": 30}}\n{\"type\": \"Person\", \"data\": {\"name\": \"Bob\", \"age\": 25}}"
|
|
)]
|
|
pub data: String,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct ExportRequest {
|
|
/// Branch to export. Defaults to `main`.
|
|
pub branch: Option<String>,
|
|
/// Restrict the export to these node/edge type names. Empty exports all types.
|
|
#[serde(default)]
|
|
pub type_names: Vec<String>,
|
|
/// Restrict the export to these table keys. Empty exports all tables.
|
|
#[serde(default)]
|
|
pub table_keys: Vec<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize, IntoParams)]
|
|
pub struct SnapshotQuery {
|
|
pub branch: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize, IntoParams)]
|
|
pub struct CommitListQuery {
|
|
pub branch: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct HealthOutput {
|
|
pub status: String,
|
|
pub version: String,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub source_version: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, ToSchema)]
|
|
#[serde(rename_all = "snake_case")]
|
|
pub enum ErrorCode {
|
|
Unauthorized,
|
|
Forbidden,
|
|
BadRequest,
|
|
NotFound,
|
|
/// 405 Method Not Allowed — the route exists but the active server
|
|
/// mode doesn't serve this method (e.g. `GET /graphs` in single-graph
|
|
/// mode). Distinct from 404 so clients can tell "wrong context" from
|
|
/// "no such resource."
|
|
MethodNotAllowed,
|
|
Conflict,
|
|
/// 429 Too Many Requests — per-actor admission cap exceeded.
|
|
/// Clients should respect the `Retry-After` header.
|
|
TooManyRequests,
|
|
Internal,
|
|
}
|
|
|
|
/// Structured details for a publisher-level OCC failure. Surfaces alongside
|
|
/// HTTP 409 when a write was rejected because the caller's pre-write view of
|
|
/// one table's manifest version was stale relative to the current head. The
|
|
/// expected/actual fields tell the client which table to refresh.
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct ManifestConflictOutput {
|
|
pub table_key: String,
|
|
pub expected: u64,
|
|
pub actual: u64,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct ErrorOutput {
|
|
pub error: String,
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub code: Option<ErrorCode>,
|
|
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
pub merge_conflicts: Vec<MergeConflictOutput>,
|
|
/// Set when the conflict is a publisher CAS rejection
|
|
/// (`ManifestConflictDetails::ExpectedVersionMismatch`). The caller's
|
|
/// pre-write view of `table_key` was at version `expected` but the
|
|
/// manifest is now at `actual`. Refresh and retry.
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
pub manifest_conflict: Option<ManifestConflictOutput>,
|
|
}
|
|
|
|
pub fn snapshot_payload(branch: &str, snapshot: &Snapshot) -> SnapshotOutput {
|
|
let mut entries: Vec<_> = snapshot.entries().cloned().collect();
|
|
entries.sort_by(|a, b| a.table_key.cmp(&b.table_key));
|
|
let tables = entries
|
|
.iter()
|
|
.map(|entry| SnapshotTableOutput {
|
|
table_key: entry.table_key.clone(),
|
|
table_path: entry.table_path.clone(),
|
|
table_version: entry.table_version,
|
|
table_branch: entry.table_branch.clone(),
|
|
row_count: entry.row_count,
|
|
})
|
|
.collect::<Vec<_>>();
|
|
SnapshotOutput {
|
|
branch: branch.to_string(),
|
|
manifest_version: snapshot.version(),
|
|
tables,
|
|
}
|
|
}
|
|
|
|
pub fn schema_apply_output(uri: &str, result: SchemaApplyResult) -> SchemaApplyOutput {
|
|
SchemaApplyOutput {
|
|
uri: uri.to_string(),
|
|
supported: result.supported,
|
|
applied: result.applied,
|
|
step_count: result.steps.len(),
|
|
manifest_version: result.manifest_version,
|
|
steps: result.steps,
|
|
}
|
|
}
|
|
|
|
pub fn commit_output(commit: &GraphCommit) -> CommitOutput {
|
|
CommitOutput {
|
|
graph_commit_id: commit.graph_commit_id.clone(),
|
|
manifest_branch: commit.manifest_branch.clone(),
|
|
manifest_version: commit.manifest_version,
|
|
parent_commit_id: commit.parent_commit_id.clone(),
|
|
merged_parent_commit_id: commit.merged_parent_commit_id.clone(),
|
|
actor_id: commit.actor_id.clone(),
|
|
created_at: commit.created_at,
|
|
}
|
|
}
|
|
|
|
pub fn read_output(query_name: String, target: &ReadTarget, result: QueryResult) -> ReadOutput {
|
|
let columns = result
|
|
.schema()
|
|
.fields()
|
|
.iter()
|
|
.map(|field| field.name().clone())
|
|
.collect();
|
|
ReadOutput {
|
|
query_name,
|
|
target: read_target_output(target),
|
|
row_count: result.num_rows(),
|
|
columns,
|
|
rows: result.to_rust_json(),
|
|
}
|
|
}
|
|
|
|
pub fn ingest_output(uri: &str, result: &IngestResult, actor_id: Option<String>) -> IngestOutput {
|
|
IngestOutput {
|
|
uri: uri.to_string(),
|
|
branch: result.branch.clone(),
|
|
base_branch: result.base_branch.clone(),
|
|
branch_created: result.branch_created,
|
|
mode: result.mode,
|
|
tables: result
|
|
.tables
|
|
.iter()
|
|
.map(|table| IngestTableOutput {
|
|
table_key: table.table_key.clone(),
|
|
rows_loaded: table.rows_loaded,
|
|
})
|
|
.collect(),
|
|
actor_id,
|
|
}
|
|
}
|
|
|
|
pub fn read_target_output(target: &ReadTarget) -> ReadTargetOutput {
|
|
match target {
|
|
ReadTarget::Branch(branch) => ReadTargetOutput {
|
|
branch: Some(branch.clone()),
|
|
snapshot: None,
|
|
},
|
|
ReadTarget::Snapshot(snapshot) => ReadTargetOutput {
|
|
branch: None,
|
|
snapshot: Some(snapshot.as_str().to_string()),
|
|
},
|
|
}
|
|
}
|
|
|
|
// ─── MR-668 — management endpoint shapes ──────────────────────────────────
|
|
|
|
/// One entry in the response from `GET /graphs`. Cluster operators
|
|
/// consume this list to discover which graphs the server is currently
|
|
/// serving. The shape is intentionally minimal — `graph_id` and `uri`
|
|
/// are the only fields a routing client needs.
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct GraphInfo {
|
|
pub graph_id: String,
|
|
pub uri: String,
|
|
}
|
|
|
|
/// Response from `GET /graphs`. Lists every graph registered with the
|
|
/// server in alphabetical order by `graph_id` (sorted server-side so
|
|
/// clients get deterministic output across requests).
|
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
|
pub struct GraphListResponse {
|
|
pub graphs: Vec<GraphInfo>,
|
|
}
|