mr-668: CLI omnigraph graphs list/create (PR 8/10)

PR 8 of the MR-668 multi-graph server work. CLI parity for the
v0.7.0 management surface: operators can now manage graphs from
the command line against a running multi-graph server.

  omnigraph graphs list --target dev --json
  omnigraph graphs create \
    --target dev \
    --graph-id beta \
    --graph-uri /data/beta.omni \
    --schema schema.pg

DELETE is intentionally absent — server-side DELETE was deferred from
v0.7.0 scope, and shipping a client subcommand for a server endpoint
that doesn't exist would be dead vocabulary. The help output, the
subcommand enum, and the test that pins it (`graphs_subcommand_help_
lists_list_and_create`) all agree.

CLI architecture (modeled on `BranchCommand`):
  - New `Command::Graphs { command: GraphsCommand }` top-level variant.
  - `GraphsCommand { List, Create }` enum.
  - List: GET `<base>/graphs`. Stdout is `<graph_id>\t<uri>` per line,
    or JSON via `--json`.
  - Create: reads `--schema <path>` from local disk, inlines as
    `schema: { source: <file> }` in the POST body (nested per
    MR-668 decision 7). Optional `--policy-file <path>` becomes
    `policy: { file: <path> }`. Returns 201 → "created graph X at Y"
    or JSON via `--json`.
  - Both subcommands reject local URI targets with a clear
    "remote multi-graph server URL" error.

New API type imports in the CLI: `GraphCreateRequest`,
`GraphCreateResponse`, `GraphListResponse`, `GraphSchemaSpec`,
`GraphPolicySpec` — all from `omnigraph-server::api`.

Tests:
  - cli.rs (4 new, non-network):
      * `graphs_subcommand_help_lists_list_and_create` — pins the
        deferral of `delete` (catches scope creep).
      * `graphs_list_against_local_uri_errors_with_remote_only_message`
      * `graphs_create_against_local_uri_errors_with_remote_only_message`
      * `graphs_create_with_missing_schema_file_errors` — pins the
        IO context in the schema-read error path.
  - system_remote.rs (1 new, `#[ignore]` like its peers):
      * `graphs_list_and_create_against_multi_graph_server` — spawns a
        multi-mode server, calls `graphs list` (sees `alpha`),
        `graphs create` (adds `beta`), `graphs list` again (sees both),
        and confirms the new graph is reachable via its cluster route.

CLI suite: 62 tests green (58 existing + 4 new). The new ignored
end-to-end test runs locally with `cargo test --ignored`.

LOC: +159 main.rs (enum + handlers), +88 cli.rs (unit tests),
+131 system_remote.rs (integration test).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ragnor Comerford 2026-05-25 20:54:21 +02:00
parent a4e6cb689a
commit 75514b6cfd
No known key found for this signature in database
3 changed files with 375 additions and 3 deletions

View file

@ -18,9 +18,11 @@ use omnigraph_compiler::{
use omnigraph_server::api::{
BranchCreateOutput, BranchCreateRequest, BranchDeleteOutput, BranchListOutput,
BranchMergeOutput, BranchMergeRequest, ChangeOutput, ChangeRequest, CommitListOutput,
CommitOutput, ErrorOutput, ExportRequest, IngestOutput, IngestRequest, ReadOutput, ReadRequest,
SchemaApplyOutput, SchemaApplyRequest, SchemaOutput, SnapshotOutput, SnapshotTableOutput,
commit_output, ingest_output, read_output, schema_apply_output, snapshot_payload,
CommitOutput, ErrorOutput, ExportRequest, GraphCreateRequest, GraphCreateResponse,
GraphListResponse, GraphPolicySpec, GraphSchemaSpec, IngestOutput, IngestRequest, ReadOutput,
ReadRequest, SchemaApplyOutput, SchemaApplyRequest, SchemaOutput, SnapshotOutput,
SnapshotTableOutput, commit_output, ingest_output, read_output, schema_apply_output,
snapshot_payload,
};
use omnigraph_server::{
AliasCommand, OmnigraphConfig, PolicyAction, PolicyDecision, PolicyEngine, PolicyRequest,
@ -253,6 +255,69 @@ enum Command {
#[arg(long)]
json: bool,
},
/// Manage graphs on a multi-graph server (MR-668)
Graphs {
#[command(subcommand)]
command: GraphsCommand,
},
}
/// Operations on the graph registry of a multi-graph server (MR-668).
///
/// All operations target a remote multi-graph server URL (http:// or
/// https://). Local-URI invocations return a clear error; for local
/// graphs operators add/remove entries by editing `omnigraph.yaml`
/// directly and restarting.
///
/// `Delete` is intentionally omitted in v0.7.0 — server-side DELETE
/// was deferred to bound the release scope. Operators remove graphs
/// by stopping the server, editing `omnigraph.yaml`, then restarting.
#[derive(Debug, Subcommand)]
enum GraphsCommand {
/// List every graph registered with the multi-graph server.
List {
/// Remote server URL (e.g. `https://server.example.com`).
#[arg(long)]
uri: Option<String>,
#[arg(long)]
target: Option<String>,
#[arg(long)]
config: Option<PathBuf>,
#[arg(long)]
json: bool,
},
/// Create a new graph at runtime via `POST /graphs`.
///
/// The schema file is read locally and the bytes are inlined as
/// `schema.source` in the request body. The server runs
/// `Omnigraph::init` at the supplied `uri` and atomically rewrites
/// `omnigraph.yaml` to include the new entry.
Create {
/// Remote server URL (e.g. `https://server.example.com`).
#[arg(long)]
uri: Option<String>,
#[arg(long)]
target: Option<String>,
#[arg(long)]
config: Option<PathBuf>,
/// New graph identifier. Must satisfy `^[a-zA-Z0-9-]{1,64}$`.
#[arg(long)]
graph_id: String,
/// Storage URI for the new graph (local path or `s3://...`).
/// Operator-supplied; the server `Omnigraph::init`s here.
#[arg(long = "graph-uri")]
graph_uri: String,
/// Local path to the schema `.pg` file. CLI reads the file
/// and inlines its contents as `schema.source` in the body.
#[arg(long)]
schema: PathBuf,
/// Optional per-graph policy file path. Sent verbatim to the
/// server, where it must be readable at request time.
#[arg(long)]
policy_file: Option<String>,
#[arg(long)]
json: bool,
},
}
#[derive(Debug, Subcommand)]
@ -2556,6 +2621,94 @@ async fn main() -> Result<()> {
);
}
}
Command::Graphs { command } => match command {
GraphsCommand::List {
uri,
target,
config,
json,
} => {
let config = load_cli_config(config.as_ref())?;
let bearer_token =
resolve_remote_bearer_token(&config, uri.as_deref(), target.as_deref())?;
let uri = resolve_uri(&config, uri, target.as_deref())?;
if !is_remote_uri(&uri) {
bail!(
"`omnigraph graphs list` requires a remote multi-graph server URL \
(http:// or https://). To enumerate local graphs, read `omnigraph.yaml` \
directly."
);
}
let payload = remote_json::<GraphListResponse>(
&http_client,
Method::GET,
remote_url(&uri, "/graphs"),
None,
bearer_token.as_deref(),
)
.await?;
if json {
print_json(&payload)?;
} else {
for entry in payload.graphs {
println!("{}\t{}", entry.graph_id, entry.uri);
}
}
}
GraphsCommand::Create {
uri,
target,
config,
graph_id,
graph_uri,
schema,
policy_file,
json,
} => {
let config = load_cli_config(config.as_ref())?;
let bearer_token =
resolve_remote_bearer_token(&config, uri.as_deref(), target.as_deref())?;
let uri = resolve_uri(&config, uri, target.as_deref())?;
if !is_remote_uri(&uri) {
bail!(
"`omnigraph graphs create` requires a remote multi-graph server URL \
(http:// or https://). To add a graph to a local config, edit \
`omnigraph.yaml` and restart the server."
);
}
let schema_source = fs::read_to_string(&schema).map_err(|err| {
color_eyre::eyre::eyre!(
"reading schema file '{}': {err}",
schema.display()
)
})?;
let request_body = GraphCreateRequest {
graph_id: graph_id.clone(),
uri: graph_uri.clone(),
schema: GraphSchemaSpec {
source: schema_source,
},
policy: policy_file
.as_ref()
.map(|file| GraphPolicySpec {
file: Some(file.clone()),
}),
};
let payload = remote_json::<GraphCreateResponse>(
&http_client,
Method::POST,
remote_url(&uri, "/graphs"),
Some(serde_json::to_value(&request_body)?),
bearer_token.as_deref(),
)
.await?;
if json {
print_json(&payload)?;
} else {
println!("created graph {} at {}", payload.graph_id, payload.uri);
}
}
},
}
Ok(())
}