Promote the `mvp-system` workspace library crate to a standalone application at `apps/myelin`, rebranding the MVP system along with its binaries, node image, and spec. - workspace `Cargo.toml`: swap member `crates/mvp-system` -> `apps/myelin` and drop `apps` from `exclude` so the app joins the workspace - `apps/myelin/Cargo.toml`: declare package `myelin` with `autobins = false` and explicit `[[bin]]` targets `myelin-worker`, `myelin-orchestrator`, `myelin-chat` - `apps/myelin/src`: move the whole `mvp-system` source tree and rebrand module surfaces (`chat/mod.rs`, `prompt/mod.rs`); add `bin/chat.rs` (`myelin::run_chat_from_args`) and delete the old `mvp_chat.rs` - `apps/myelin/node-image`: relocate the worker image assets from `apps/mvp-node/` (Dockerfile, Dockerfile.base, tinygrad_worker.py, entrypoint, e2e script) and rename `MVP_SYSTEM_SPEC.md` -> `MYELIN_SPEC.md` - `xtask`: rewrite build/reference paths for the rename (~1000-line churn); add `crates/dashboard/ACTOR_PANEL_SPEC.md` Signed-off-by: Zachery Aaron Shores-Chmielewski <zacheryasc@gmail.com>
178 lines
5.3 KiB
Rust
178 lines
5.3 KiB
Rust
|
|
use std::io::{BufRead, BufReader, Read};
|
|
use std::thread::{self, JoinHandle};
|
|
|
|
use datastream::{ChannelContent, DatastreamProducer, Lifetime, NodeId, StreamId};
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_json::Value;
|
|
|
|
use crate::observability::telemetry::{
|
|
MYELIN_PROVISIONING_LOGS, MyelinProvisionLogRecord, myelin_provision_log_channel,
|
|
};
|
|
use crate::provisioning::{
|
|
NodeProvisionSpec, PluginObservation, PluginSink, ProvisionLogLine, ProvisionLogStream,
|
|
};
|
|
|
|
pub(crate) fn node_stream_id(run_id: u64, node_id: u64) -> StreamId {
|
|
StreamId::new(NodeId::new(&node_id.to_string()), Lifetime(run_id))
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct BootstrapDatastreamBridge {
|
|
spec: NodeProvisionSpec,
|
|
sink: PluginSink,
|
|
producer: Option<DatastreamProducer>,
|
|
}
|
|
|
|
impl BootstrapDatastreamBridge {
|
|
pub(crate) fn new(
|
|
spec: NodeProvisionSpec,
|
|
sink: PluginSink,
|
|
producer: Option<DatastreamProducer>,
|
|
) -> Self {
|
|
Self {
|
|
spec,
|
|
sink,
|
|
producer,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn spec(&self) -> &NodeProvisionSpec {
|
|
&self.spec
|
|
}
|
|
|
|
pub(crate) fn observe_stdout_line(&self, line: impl Into<String>) {
|
|
let line = line.into();
|
|
if let Some(frame) = parse_stdio_datastream_frame(&self.spec, &line) {
|
|
self.sink.observe(frame);
|
|
return;
|
|
}
|
|
self.submit_log(ProvisionLogStream::Stdout, &line);
|
|
self.sink.observe(PluginObservation::StdoutLine {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
line: line.clone(),
|
|
});
|
|
}
|
|
|
|
pub(crate) fn observe_stderr_line(&self, line: impl Into<String>) {
|
|
let line = line.into();
|
|
self.submit_log(ProvisionLogStream::Stderr, &line);
|
|
self.sink.observe(PluginObservation::StderrLine {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
line,
|
|
});
|
|
}
|
|
|
|
pub(crate) fn observe_provider_line(&self, line: impl Into<String>) {
|
|
let line = line.into();
|
|
self.submit_log(ProvisionLogStream::Provider, &line);
|
|
self.sink.observe(PluginObservation::ProviderLine {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
line,
|
|
});
|
|
}
|
|
|
|
pub(crate) fn spawn_stdout_reader<R>(&self, stdout: R) -> JoinHandle<()>
|
|
where
|
|
R: Read + Send + 'static,
|
|
{
|
|
let bridge = self.clone();
|
|
thread::spawn(move || bridge.read_stdout(stdout))
|
|
}
|
|
|
|
pub(crate) fn spawn_stderr_reader<R>(&self, stderr: R) -> JoinHandle<()>
|
|
where
|
|
R: Read + Send + 'static,
|
|
{
|
|
let bridge = self.clone();
|
|
thread::spawn(move || bridge.read_stderr(stderr))
|
|
}
|
|
|
|
fn read_stdout<R>(&self, stdout: R)
|
|
where
|
|
R: Read,
|
|
{
|
|
let reader = BufReader::new(stdout);
|
|
for next in reader.lines() {
|
|
match next {
|
|
Ok(line) => self.observe_stdout_line(line),
|
|
Err(error) => {
|
|
self.sink.observe(PluginObservation::Failed {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
reason: format!("read stdout: {error}"),
|
|
});
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn read_stderr<R>(&self, stderr: R)
|
|
where
|
|
R: Read,
|
|
{
|
|
let reader = BufReader::new(stderr);
|
|
for next in reader.lines() {
|
|
match next {
|
|
Ok(line) => self.observe_stderr_line(line),
|
|
Err(error) => {
|
|
self.sink.observe(PluginObservation::Failed {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
reason: format!("read stderr: {error}"),
|
|
});
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn submit_log(&self, stream: ProvisionLogStream, line: &str) {
|
|
let Some(producer) = &self.producer else {
|
|
return;
|
|
};
|
|
let record = MyelinProvisionLogRecord::new(ProvisionLogLine {
|
|
run_id: self.spec.run_id,
|
|
node_id: self.spec.node_id,
|
|
stream,
|
|
line: line.to_owned(),
|
|
});
|
|
let channel = producer.register_channel(
|
|
myelin_provision_log_channel(self.spec.node_id, stream),
|
|
ChannelContent::JsonRecord {
|
|
schema: Some(MYELIN_PROVISIONING_LOGS.to_owned()),
|
|
},
|
|
);
|
|
let payload = serde_json::to_vec(&record).expect("serialize bootstrap log record");
|
|
producer.submit_bytes(channel, payload);
|
|
}
|
|
}
|
|
|
|
#[derive(Deserialize, Serialize)]
|
|
struct StdioDatastreamFrame {
|
|
myelin_stdio_event: u32,
|
|
kind: String,
|
|
channel: String,
|
|
payload: Value,
|
|
}
|
|
|
|
pub(crate) fn parse_stdio_datastream_frame(
|
|
spec: &NodeProvisionSpec,
|
|
line: &str,
|
|
) -> Option<PluginObservation> {
|
|
let frame = serde_json::from_str::<StdioDatastreamFrame>(line).ok()?;
|
|
if frame.myelin_stdio_event != 1 || frame.kind != "datastream_frame" {
|
|
return None;
|
|
}
|
|
Some(PluginObservation::DatastreamFrame {
|
|
run_id: spec.run_id,
|
|
node_id: spec.node_id,
|
|
channel: frame.channel,
|
|
payload: frame.payload.to_string(),
|
|
})
|
|
}
|
|
|