Files
rob thijssen e42e8ee81f
All checks were successful
CI / Format, lint, build, test (push) Successful in 2m46s
CI / Build SRPM (push) Has been skipped
CI / Publish to COPR (push) Has been skipped
refactor: cortex talks to neurons instead of mistral.rs directly
Replace NodeConfig (static vram_mb, pinned) with NeuronEndpoint.
Hardware discovery and model pinning now come from neuron API and
models.toml catalogue respectively.

- config.rs: nodes -> neurons, add models_config path
- catalogue.rs: ModelProfile with pinned_on, ModelCatalogue
- poller.rs: poll neuron GET /models (ModelInfo format)
- router.rs: resolve inference endpoint via neuron GET /models/{id}/endpoint
- evictor.rs: call neuron POST /models/unload
- node.rs: remove vram_mb, pinned fields (come from discovery/catalogue)
- All 22 gateway tests updated to mock neuron API
- Remove MistralModelsResponse, ModelLifecycleRequest (no longer needed)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-15 14:42:52 +03:00

217 lines
6.4 KiB
Rust

mod common;
use chrono::Utc;
use cortex_core::config::{
EvictionSettings, EvictionStrategy, GatewayConfig, GatewaySettings, NeuronEndpoint,
};
use cortex_core::node::{ModelEntry, ModelStatus};
use cortex_gateway::state::CortexState;
use serde_json::json;
use std::sync::Arc;
/// Spawn a mock neuron that accepts `/models/unload` and records unload calls.
async fn spawn_eviction_mock() -> (String, Arc<tokio::sync::Mutex<Vec<String>>>) {
use axum::extract::Path;
use axum::routing::{get, post};
use axum::{Json, Router};
use serde_json::Value;
let unloaded: Arc<tokio::sync::Mutex<Vec<String>>> = Arc::new(tokio::sync::Mutex::new(vec![]));
let unloaded_clone = Arc::clone(&unloaded);
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let addr = listener.local_addr().unwrap();
let base_url = format!("http://{addr}");
let inference_url = base_url.clone();
let app = Router::new()
.route(
"/models/unload",
post(move |Json(body): Json<Value>| {
let unloaded = Arc::clone(&unloaded_clone);
async move {
let model_id = body
.get("model_id")
.and_then(|v| v.as_str())
.unwrap_or("")
.to_string();
unloaded.lock().await.push(model_id);
Json(json!({"status": "unloaded"}))
}
}),
)
.route("/models", get(|| async { Json(json!([])) }))
.route(
"/models/{model_id}/endpoint",
get(move |Path(_model_id): Path<String>| {
let url = inference_url.clone();
async move { Json(json!({"url": url})) }
}),
);
tokio::spawn(async move {
axum::serve(listener, app).await.unwrap();
});
(base_url, unloaded)
}
fn make_fleet(endpoint: &str, defrag_after: u32) -> Arc<CortexState> {
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: defrag_after,
},
neurons: vec![NeuronEndpoint {
name: "gpu-node".into(),
endpoint: endpoint.to_string(),
}],
models_config: "/dev/null".into(),
};
Arc::new(CortexState::from_config(&config))
}
#[tokio::test]
async fn test_evict_lru_model() {
let (mock_url, unloaded) = spawn_eviction_mock().await;
let fleet = make_fleet(&mock_url, 0);
{
let mut nodes = fleet.nodes.write().await;
let node = nodes.get_mut("gpu-node").unwrap();
node.healthy = true;
node.models.insert(
"old-model".into(),
ModelEntry {
id: "old-model".into(),
status: ModelStatus::Loaded,
last_accessed: Some(Utc::now() - chrono::Duration::hours(2)),
vram_estimate_mb: Some(8000),
},
);
node.models.insert(
"new-model".into(),
ModelEntry {
id: "new-model".into(),
status: ModelStatus::Loaded,
last_accessed: Some(Utc::now()),
vram_estimate_mb: Some(8000),
},
);
}
let evicted = cortex_gateway::evictor::evict_lru_on_node(&fleet, "gpu-node")
.await
.expect("eviction should succeed");
assert_eq!(evicted, Some("old-model".to_string()));
let calls = unloaded.lock().await;
assert_eq!(calls.len(), 1);
assert_eq!(calls[0], "old-model");
let nodes = fleet.nodes.read().await;
let node = nodes.get("gpu-node").unwrap();
assert_eq!(
node.models.get("old-model").unwrap().status,
ModelStatus::Unloaded
);
assert_eq!(
node.models.get("new-model").unwrap().status,
ModelStatus::Loaded
);
}
#[tokio::test]
async fn test_eviction_nothing_to_evict() {
let (mock_url, unloaded) = spawn_eviction_mock().await;
let fleet = make_fleet(&mock_url, 0);
// No models at all.
{
let mut nodes = fleet.nodes.write().await;
nodes.get_mut("gpu-node").unwrap().healthy = true;
}
let evicted = cortex_gateway::evictor::evict_lru_on_node(&fleet, "gpu-node")
.await
.expect("eviction should succeed");
assert_eq!(evicted, None);
let calls = unloaded.lock().await;
assert!(calls.is_empty());
}
#[tokio::test]
async fn test_eviction_increments_lifecycle_cycles() {
let (mock_url, _) = spawn_eviction_mock().await;
let fleet = make_fleet(&mock_url, 0);
{
let mut nodes = fleet.nodes.write().await;
let node = nodes.get_mut("gpu-node").unwrap();
node.healthy = true;
node.lifecycle_cycles = 0;
node.models.insert(
"model-a".into(),
ModelEntry {
id: "model-a".into(),
status: ModelStatus::Loaded,
last_accessed: None,
vram_estimate_mb: None,
},
);
}
cortex_gateway::evictor::evict_lru_on_node(&fleet, "gpu-node")
.await
.expect("eviction should succeed");
let nodes = fleet.nodes.read().await;
assert_eq!(nodes.get("gpu-node").unwrap().lifecycle_cycles, 1);
}
#[tokio::test]
async fn test_last_accessed_updated_on_request() {
let mock_url = common::spawn_mock_neuron().await;
let (fleet, gw_url) = common::spawn_gateway_with_state(&mock_url).await;
{
let nodes = fleet.nodes.read().await;
let node = nodes.get("mock-node").unwrap();
assert!(
node.models
.get("test-model")
.unwrap()
.last_accessed
.is_none()
);
}
let client = reqwest::Client::new();
client
.post(format!("{gw_url}/v1/chat/completions"))
.header("content-type", "application/json")
.json(&json!({
"model": "test-model",
"messages": [{"role": "user", "content": "Hi"}]
}))
.send()
.await
.expect("request should succeed");
let nodes = fleet.nodes.read().await;
let node = nodes.get("mock-node").unwrap();
assert!(
node.models
.get("test-model")
.unwrap()
.last_accessed
.is_some()
);
}