Squashed from work: - asset-ai: FastH3 4-step fast video backend; clip keyframes on the wire - asset-ui: loop video chains — text→image→video that ends where it began - h3: safetensors -> pruned-Q4_K GGUF quantizer for the 24GB DiT tiers - h3_quant_gguf verify: row-error gates calibrated to the measured Q4_K floor - asset-ai realtime: the feedback loop — the source anchors, the drifted frame inits - asset-ai realtime: a feedback loop survives a resize and travels by default - asset-ai realtime: the feedback loop frees itself from the feed handshake and pauses for its listener - asset-ai realtime: the outbound encode leaves the loop's critical path - asset-ai ocr: the ocr domain — Chandra 2 at page resolution, and the tower goes planner-owned - llm slots: a lane can hold an image span — embedding prefill and a rope cursor of its own - vision tower on CUDA: the encode leg gets its two missing kernels - llm/ocr: one M-RoPE grid encoder for both image paths, and a livelock made an error - vision tower on CUDA: the f16 GEMM keeps the precision it was throwing away - live: a feed that moves box takes its trip with it — one seed image - vision tower on CUDA: the tiled attention becomes bit-exact, and tensor cores go - llm prefill on CUDA: the MMA attention kernel gets the tile a 4-to-1 model needs - asset-ai ocr: the CUDA encode lane joins the integration — vision-parity sits beside run's three arms, and the kernels - Merge branch 'ocr-perf-integration' into work - asset-ai: the live anchor can follow the trip, and text leaves the 5090 - asset-ai: the camera moves the world, and the world starts still - asset-import: the EA strategy classics, in the one 2D contract - rtsmap: one seeded generator for tiled strategy maps - asset-ui: one card for the strategy classics, with a pack dropdown - asset-ai: music3 reference-audio path, ocr/h3 backends, registry - asset: mp4 sample index for range-streaming, chat tools, import profiles - cnc: tiberium is twelve growth frames, not twelve empty variants - platform: native file and save dialogs, in-house on all three desktops - chat: the scan holds out for a lane home - chat: a full home queues you — take the free lane - chat: the preload has a percentage, and the boundless cap stops showing - llm cuda: the 32x2 attention tile — even GQA ratios stay on MMA - sa3 gets a bake path: the sfx model's tables precomputed by a diffusion-side bin - sqlite_query: anti-join regression test - td import: HARV's second frame block is its harvesting cycle, not a turret - asset-ui: sprite enhancement runs on the 32B dev DiT — distillation, not the prompt, was the ceiling - ai-hub: makepad-asset-ai becomes makepad-ai-hub at libs/ai/hub, the chat pane becomes makepad-chat-ui, the service bin - asset-ui: test health fixtures grow the realtime field they were born without - ai-hub: one home at ~/.makepad — weights/ run/ cache/ logs/, the service cache migrates from ai_content by a single re - ai-hub: subprocess workers die with the node — process groups everywhere, PDEATHSIG on linux, one KILL_ON_JOB_CLOSE Jo - ai-hub: the hub object — AiHub::in_process, pipes vocabulary, and the local LLM engine generalized out of mpfiles (aic - strict-json: the dependency-free JSON module gets its own crate; asset-client re-exports it so nothing downstream move - ai-hub: the machine layer — node entries, the 0600 machine token, and the residency election that IS the lock (aicore - ai-hub: MPHUB1 — the fabric beacon only dedicated nodes can send (aicore §4) - ai-hub: job leases — work lives only while it is renewed (aicore §8) - asset-creator: the pipeline library is born — specs, the deps gate, and the derived-state law (aicore §9) - ai-hub: RAM residency facts — the CPU-side twin of residency.rs (aicore §3) - ai-hub: ETA placement primitives — relative GPU throughput, the four-term estimate, and an observable breakdown (aicor - ai-hub: leases go live on the wire — origin fields on submit, /job/<id>/keepalive, /bye, and the reaper that cancels w - ai-hub: the chat providers move in — fleet qwen, openai, grok, claude/codex/grok CLIs, the responses driver, and the w - asset-creator: the engine — one pipeline run against the hub, deps-gated, spliced, cancellable, resumable-by-construct - ai-hub: the machine node mode — --machine binds loopback, registers in ~/.makepad/run, and exits on its own once idle - asset-creator: makepad-creator-run — the detached client for runs that must outlive a window (aicore §9) - ai-hub: a native Claude Messages-API provider — API-key or Claude Code OAuth, bounded SSE streaming, injected tools (a - route + converse: off makepad_ai — the Agent seam moves to converse, route's cloud dispatcher rides the hub's Claude p - asset-creator: the preset tables move in — fifteen chain-policy constants shared by every creator app (aicore §9 / P6) - makepad_ai is deleted — every backend is a hub pipe, the agent seam lives with its consumers (aicore §14, decided 2026 - ai-hub: loads hold the machine residency election — set_model_state claims on Loaded and publishes the service port (a - ai-hub: chats run the machine election — route to a serving holder, wait on a loading one, claim and publish when open - ai-hub: pick_for_domain_eta — ETA-ranked placement over the shared hard-filter core (aicore §6 / P4) - asset-creator: the engine picks a provider per stage at dispatch time — a chain's later stages see fresh fleet state ( - ai-hub: the fabric secret gates the service HTTP surface — bearer on everything but /health and the ticketed peer path - vj: DREAM runs execute in the app — pipelines.rs becomes the run it used to watch (aicore §9 / F1) - asset-creator: the runner — generate one thing and put it in the catalog, one implementation for every surface (aicore - chat-ui: the session runs in the app — no broker anywhere on the chat path (aicore P8 / F5) - asset-store: assets.query is a first-class query endpoint — the bounded SQL surface outlives the broker (aicore P8 / F - asset-creator: CreatorTools — the chat tool pack for a store that only stores (aicore §9 / P8) - asset-store: the shrink — the store stores (aicore P7) - importer + asset-server host: the coordination era ends (aicore P7) - store config purge + asset-ui goes fleet-direct; the derive protocol gets its route proof (aicore P7) - client + chat dispatcher: the dead wire comes out (aicore P7/P8) - ai-hub: 0.3.0 — the health version says which era a node runs - ai-hub: the default fleet is 'gen' — apps hear the LAN without env plumbing - ai-hub: the preload note percents the prefill, not the job bar - ai-hub: conversations keep their KV — the wire mirror, the lane identity, the in-turn dynamic context (aicore §7) - ai-hub: an open-think model is thinking from its first token - libs: the zero-warning sweep — stitch casts say what they mean, xatlas keeps upstream's surface quietly - zero-warning sweep, round two — the first full-workspace pass - zero-warning sweep, round three — the model lanes and the deep examples - zero-warning sweep, round four — the last stragglers - zero-warning sweep, round five — vj and chat-ui - zero-warning sweep, round six — three cascades Co-authored-by: Claude <info@makepad.nl>
159 lines
5.9 KiB
Rust
159 lines
5.9 KiB
Rust
//! The dispatcher's surviving surface against a REAL Asset Server over real
|
|
//! sockets (aicore §9): catalog reads work, the capability doc is honest,
|
|
//! and everything the store no longer executes — generation, transforms —
|
|
//! answers a typed refusal that names where that work lives now. The
|
|
//! generation/operations era of this suite left with the store's queue.
|
|
|
|
use makepad_asset_chat::dispatch::AssetServerTools;
|
|
use makepad_asset_chat::session::{CancelFlag, ExecCtx, Origin, SessionId, ToolExecutor};
|
|
use makepad_asset_chat::tools::{ContentGenerateKind, ContentToolCall, InspectTarget};
|
|
use makepad_asset_chat::wire::ToolOutcome;
|
|
use makepad_asset_client::json::Value;
|
|
use makepad_asset_client::{
|
|
ApiEndpoints, AssetClient, ClientConfig, PublishFile, PublishRequest, PublishRights,
|
|
PublishThumbnail,
|
|
};
|
|
use makepad_asset_data::{AssetAlias, AssetKind, FileRole, MediaType, ThumbnailMedia};
|
|
use std::collections::HashSet;
|
|
use makepad_asset_store::{AssetServer, ServerConfig};
|
|
use std::path::PathBuf;
|
|
use std::str::FromStr;
|
|
use std::sync::atomic::{AtomicU64, Ordering};
|
|
|
|
static DIR_COUNTER: AtomicU64 = AtomicU64::new(0);
|
|
|
|
fn test_root(name: &str) -> PathBuf {
|
|
let n = DIR_COUNTER.fetch_add(1, Ordering::Relaxed);
|
|
std::env::temp_dir().join(format!("mp_chat_e2e_{}_{}_{}", std::process::id(), n, name))
|
|
}
|
|
|
|
fn start_server(name: &str) -> (AssetServer, String) {
|
|
let root = test_root(name);
|
|
let mut cfg = ServerConfig::new(root.clone());
|
|
cfg.control_addr = "127.0.0.1:0".parse().unwrap();
|
|
cfg.data_addr = "127.0.0.1:0".parse().unwrap();
|
|
cfg.bootstrap_admin = true;
|
|
cfg.log = false;
|
|
let server = AssetServer::start(cfg).expect("server start");
|
|
let token = std::fs::read_to_string(root.join("admin-token"))
|
|
.expect("admin token")
|
|
.trim()
|
|
.to_string();
|
|
(server, token)
|
|
}
|
|
|
|
fn endpoints(server: &AssetServer) -> ApiEndpoints {
|
|
ApiEndpoints { control: server.control_addr(), data: server.data_addr() }
|
|
}
|
|
|
|
fn tools_for(server: &AssetServer, token: &str) -> AssetServerTools {
|
|
AssetServerTools::connect(endpoints(server), Some(token.to_string()), "gen")
|
|
.expect("dispatcher connect")
|
|
}
|
|
|
|
fn run(tools: &mut AssetServerTools, call: &ContentToolCall) -> ToolOutcome {
|
|
let origin = Origin {
|
|
principal: "prin_admin".to_string(),
|
|
session: SessionId::parse("chat_0123456789abcdef").expect("session"),
|
|
};
|
|
let known = HashSet::new();
|
|
let ctx = ExecCtx { origin: &origin, known: &known };
|
|
let cancel = CancelFlag::default();
|
|
tools.execute(call, &ctx, &mut |_, _| {}, &cancel)
|
|
}
|
|
|
|
fn publish_seed(server: &AssetServer, token: &str) {
|
|
let mut cfg = ClientConfig::new(test_root("seed_cache"));
|
|
cfg.token = Some(token.to_string());
|
|
let mut client =
|
|
AssetClient::connect(cfg, endpoints(server), Some(server.server_id())).expect("connect");
|
|
let mut request = PublishRequest::new(
|
|
"gen",
|
|
AssetKind::Texture,
|
|
"a weathered brick texture".to_string(),
|
|
PublishFile {
|
|
bytes: b"seed-bytes-brick".to_vec(),
|
|
media: MediaType::Png,
|
|
role: FileRole::Texture,
|
|
media_millis: 0,
|
|
dims: Some((64, 64)),
|
|
},
|
|
PublishThumbnail {
|
|
bytes: vec![0xCD; 1_500],
|
|
media: ThumbnailMedia::Png,
|
|
width: 512,
|
|
height: 512,
|
|
views: Vec::new(),
|
|
},
|
|
);
|
|
request.rights = PublishRights::generated_cc0();
|
|
request.alias = AssetAlias::from_str("gen/brick").ok();
|
|
client.publish_artifact(&request).expect("seed publish");
|
|
}
|
|
|
|
/// Catalog reads work over real sockets: search finds the published row and
|
|
/// inspect resolves its alias to a typed summary.
|
|
#[test]
|
|
fn catalog_reads_work_over_real_sockets() {
|
|
let (server, token) = start_server("reads");
|
|
publish_seed(&server, &token);
|
|
let mut tools = tools_for(&server, &token);
|
|
|
|
match run(
|
|
&mut tools,
|
|
&ContentToolCall::AssetSearch { query: "brick".to_string(), limit: 8 },
|
|
) {
|
|
ToolOutcome::Ok { value } => {
|
|
let hits = value.get("hits").and_then(Value::as_arr).expect("hits");
|
|
assert!(
|
|
hits.iter().any(|h| {
|
|
h.get("title").and_then(Value::as_str).is_some_and(|t| t.contains("brick"))
|
|
}),
|
|
"search finds the seed row"
|
|
);
|
|
}
|
|
other => panic!("search failed: {other:?}"),
|
|
}
|
|
|
|
let alias = AssetAlias::from_str("gen/brick").expect("alias");
|
|
match run(&mut tools, &ContentToolCall::AssetInspect { target: InspectTarget::Alias(alias) }) {
|
|
ToolOutcome::Ok { value } => {
|
|
assert_eq!(value.get("alias").and_then(Value::as_str), Some("gen/brick"));
|
|
assert!(value.get("revision").and_then(Value::as_str).is_some());
|
|
}
|
|
other => panic!("inspect failed: {other:?}"),
|
|
}
|
|
}
|
|
|
|
/// Everything the store no longer executes answers a typed refusal naming
|
|
/// where the work lives now — never an error string, never a 404 surprise.
|
|
#[test]
|
|
fn moved_work_is_refused_by_name() {
|
|
let (server, token) = start_server("refusals");
|
|
let mut tools = tools_for(&server, &token);
|
|
|
|
match run(
|
|
&mut tools,
|
|
&ContentToolCall::ContentGenerate {
|
|
kind: ContentGenerateKind::Prop,
|
|
prompt: "a wooden cart".to_string(),
|
|
dim_height: None,
|
|
},
|
|
) {
|
|
ToolOutcome::Unavailable { reason } => {
|
|
assert!(reason.contains("creator"), "{reason}");
|
|
}
|
|
other => panic!("expected Unavailable, got {other:?}"),
|
|
}
|
|
|
|
match run(&mut tools, &ContentToolCall::OperationCapabilities) {
|
|
ToolOutcome::Unavailable { reason } => {
|
|
assert!(reason.contains("creator apps"), "{reason}");
|
|
}
|
|
other => panic!("expected Unavailable, got {other:?}"),
|
|
}
|
|
|
|
let doc = tools.capability_doc();
|
|
assert!(doc.contains("asset.search"), "{doc}");
|
|
assert!(doc.contains("creator apps"), "{doc}");
|
|
}
|