All checks were successful
CI / Format (push) Successful in 40s
CI / CUDA type-check (push) Successful in 1m39s
CI / Clippy (push) Successful in 2m56s
CI / Test (push) Successful in 6m36s
CI / Build cortex SRPM (push) Has been skipped
CI / Publish cortex to COPR (push) Has been skipped
CI / Build neuron SRPM (push) Has been skipped
CI / Publish neuron to COPR (push) Has been skipped
CI / Bump version in source (push) Has been skipped
cortex can now validate locally-unrecognised bearer keys against the
helexa-upstream authority and reserve/settle their budget there — mesh
accounts work for real inference. The EntitlementProvider trait is the
seam, so cortex's enforcement (auth.rs, metering.rs) is otherwise
unchanged.
- entitlements_upstream.rs: UpstreamEntitlementProvider over reqwest →
B2's /authz/v1 (resolve/reserve/settle/release/snapshot), presenting the
operator client bearer. Maps the wire contract back to the trait: granted
→ Reservation, rejected → BudgetError, 401 → InvalidKey. Fail-closed —
unreachable resolve → AuthError::Unavailable (503, never 401);
unreachable reserve → retryable BudgetError::RateLimited (refuse, never
serve un-authorized). settle/release are best-effort (the upstream
sweeper reaps a lost one).
- entitlements_chain.rs: ChainedEntitlementProvider tries local first
(operator + infra keys, no network), falls through to upstream for
unknown keys, and dispatches reserve/settle/release/snapshot to whichever
backend resolved each account (local treats unknown principals as
uncapped, so it can't be the blind default).
- cortex-core: AuthError::Unavailable{retry_after_secs}; [upstream] config
(enabled/url/bearer/timeout). auth.rs maps Unavailable → 503 +
Retry-After distinctly from InvalidKey → 401, regardless of require_auth.
- state.rs wires the chain when [upstream].enabled, else stays purely local.
Tests (upstream_chain.rs, 4): local key resolves without touching upstream;
unknown key falls through to a mock upstream; unknown-everywhere → 401
InvalidKey; upstream-unreachable → Unavailable (503-mapped), with local keys
still resolving. Existing gateway suites updated for the new config field.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01F6o3ddqmYNh9kzdwq6eowh
134 lines
4.8 KiB
Rust
134 lines
4.8 KiB
Rust
//! Issue #62 / #67: `GET /v1/models` advertises a per-model serving budget so
|
|
//! an OpenAI-compatible client (opencode's helexa provider) can size and
|
|
//! compact its context without hand-configuration.
|
|
//!
|
|
//! Asserts the composition sources land on the response:
|
|
//! - `limit` from the neuron's self-derived value (#67) — NOT the catalogue;
|
|
//! an operator-declared catalogue `limit` is deliberately ignored.
|
|
//! - `cost` from the catalogue profile (operator-set pricing).
|
|
//! - `tool_call` / `reasoning` from the neuron's runtime detection (OR-ed in)
|
|
//!
|
|
//! Also a regression guard for the removal of `max_model_len` — the misnamed,
|
|
//! unconsumed vLLM-ism that this contract replaces.
|
|
|
|
use cortex_core::config::{
|
|
EvictionSettings, EvictionStrategy, GatewayConfig, GatewaySettings, NeuronEndpoint,
|
|
};
|
|
use cortex_core::harness::ModelLimit;
|
|
use cortex_core::node::{ModelEntry, ModelStatus};
|
|
use cortex_gateway::state::CortexState;
|
|
use std::sync::Arc;
|
|
use tokio::net::TcpListener;
|
|
|
|
#[tokio::test]
|
|
async fn v1_models_surfaces_limit_cost_and_capability_flags() {
|
|
// Catalogue declares pricing + an operator `limit` that must be IGNORED
|
|
// (#67): the neuron's self-derived limit is authoritative.
|
|
let models_toml = r#"
|
|
[[models]]
|
|
id = "test-model"
|
|
harness = "candle"
|
|
limit.context = 999999
|
|
limit.input = 999999
|
|
limit.output = 999999
|
|
cost.input = 0.0
|
|
cost.output = 0.0
|
|
capabilities = ["text"]
|
|
"#;
|
|
let cat_path = std::env::temp_dir().join("cortex_test_issue62_models.toml");
|
|
std::fs::write(&cat_path, models_toml).unwrap();
|
|
|
|
let config = GatewayConfig {
|
|
gateway: GatewaySettings {
|
|
listen: "127.0.0.1:0".into(),
|
|
metrics_listen: "127.0.0.1:0".into(),
|
|
},
|
|
eviction: EvictionSettings {
|
|
strategy: EvictionStrategy::Lru,
|
|
defrag_after_cycles: 0,
|
|
},
|
|
neurons: vec![NeuronEndpoint {
|
|
name: "mock-node".into(),
|
|
// Never contacted: build_app does not spawn the poller, so the
|
|
// seeded state below is authoritative for /v1/models.
|
|
endpoint: "http://127.0.0.1:1".into(),
|
|
}],
|
|
models_config: cat_path.to_string_lossy().into_owned(),
|
|
entitlements: Default::default(),
|
|
upstream: Default::default(),
|
|
};
|
|
|
|
let fleet = Arc::new(CortexState::from_config(&config));
|
|
|
|
// Seed the model as loaded on the node with runtime-detected flags set —
|
|
// these must OR into the catalogue entry, not be lost.
|
|
{
|
|
let mut nodes = fleet.nodes.write().await;
|
|
let node = nodes.get_mut("mock-node").expect("node exists");
|
|
node.healthy = true;
|
|
node.models.insert(
|
|
"test-model".into(),
|
|
ModelEntry {
|
|
id: "test-model".into(),
|
|
status: ModelStatus::Loaded,
|
|
last_accessed: None,
|
|
vram_estimate_mb: Some(8000),
|
|
capabilities: vec!["text".into()],
|
|
tool_call: true,
|
|
reasoning: true,
|
|
// Neuron's self-derived limit (#67) — the authoritative
|
|
// source. Distinct from the catalogue's (ignored) values.
|
|
limit: Some(ModelLimit {
|
|
context: 49152,
|
|
input: Some(40960),
|
|
output: 8192,
|
|
}),
|
|
},
|
|
);
|
|
}
|
|
|
|
let app = cortex_gateway::build_app(Arc::clone(&fleet));
|
|
let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
|
|
let addr = listener.local_addr().unwrap();
|
|
tokio::spawn(async move {
|
|
axum::serve(listener, app).await.unwrap();
|
|
});
|
|
|
|
let body: serde_json::Value = reqwest::Client::new()
|
|
.get(format!("http://{addr}/v1/models"))
|
|
.send()
|
|
.await
|
|
.unwrap()
|
|
.json()
|
|
.await
|
|
.unwrap();
|
|
|
|
let entry = body["data"]
|
|
.as_array()
|
|
.expect("data is an array")
|
|
.iter()
|
|
.find(|m| m["id"] == "test-model")
|
|
.expect("test-model present in /v1/models");
|
|
|
|
// `limit` is the neuron's self-derived value (#67), NOT the catalogue's
|
|
// (which declared 999999 and must be ignored). `cost` still flows from
|
|
// the catalogue.
|
|
assert_eq!(entry["limit"]["context"], 49152);
|
|
assert_eq!(entry["limit"]["input"], 40960);
|
|
assert_eq!(entry["limit"]["output"], 8192);
|
|
assert_eq!(entry["cost"]["input"], 0.0);
|
|
assert_eq!(entry["cost"]["output"], 0.0);
|
|
|
|
// Runtime-detected capability flags OR-ed in from the neuron's ModelEntry.
|
|
assert_eq!(entry["tool_call"], true);
|
|
assert_eq!(entry["reasoning"], true);
|
|
|
|
// Regression guard: the removed, unconsumed vLLM-ism must not reappear.
|
|
assert!(
|
|
entry.get("max_model_len").is_none(),
|
|
"max_model_len was removed; /v1/models must not advertise it"
|
|
);
|
|
|
|
let _ = std::fs::remove_file(&cat_path);
|
|
}
|