* wip * sketch a bit more; going to pull this out of tests next * wip * lock start things * this was a bad idea * Revert "this was a bad idea" This reverts commita2092e7ed6
. * prepare prelude before spawning * error * poop * yike * :( * ok * Reapply "this was a bad idea" This reverts commitfafdf41093
. * chip away more * man this is bad * fix rebase add feature flag Signed-off-by: Jess Frazelle <github@jessfraz.com> * get rid of execution kind Signed-off-by: Jess Frazelle <github@jessfraz.com> * clippy Signed-off-by: Jess Frazelle <github@jessfraz.com> * logs Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * no extra executes Signed-off-by: Jess Frazelle <github@jessfraz.com> * race w batch Signed-off-by: Jess Frazelle <github@jessfraz.com> * cluppy Signed-off-by: Jess Frazelle <github@jessfraz.com> * no printlns Signed-off-by: Jess Frazelle <github@jessfraz.com> * no printlns Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix source ranges Signed-off-by: Jess Frazelle <github@jessfraz.com> * batch shit Signed-off-by: Jess Frazelle <github@jessfraz.com> * fixes Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix some bugs Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix error Signed-off-by: Jess Frazelle <github@jessfraz.com> * cut 1 * preserve mem * re-ad deep_clone the helper we were calling was pushing a new call, which was hanging out. we can skip the middleman since we already have something properly prepared, just without a stdlib in some cases. * skip non-kcl * clean up source range bug * error message changed the uuids also changed because the error is hit before execute even starts. * typo * rensnapshot a few * order things * MAYBE REVERT LATER: attempt at an ordering * snapsnap * Revert "snapsnap" This reverts commit7350b32c7d
. * Revert "MAYBE REVERT LATER:" This reverts commitab49f3e85f
. * ugh * poop * poop2 * lint * tranche 1 * more * more snaps * snap * more * update * MAYBE REVERT THIS * cache multi-file Signed-off-by: Jess Frazelle <github@jessfraz.com> * addd tests Signed-off-by: Jess Frazelle <github@jessfraz.com> * set to false Signed-off-by: Jess Frazelle <github@jessfraz.com> * add test outputs Signed-off-by: Jess Frazelle <github@jessfraz.com> * clippy Signed-off-by: Jess Frazelle <github@jessfraz.com> * kcl-py-bindings uses carwheel Signed-off-by: Jess Frazelle <github@jessfraz.com> * update snapshots Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Paul R. Tagliamonte <paul@zoo.dev> Co-authored-by: Paul Tagliamonte <paultag@gmail.com>
186 lines
6.3 KiB
Rust
186 lines
6.3 KiB
Rust
//! Types used to send data to the test server.
|
|
|
|
use std::path::PathBuf;
|
|
|
|
use crate::{
|
|
engine::new_zoo_client,
|
|
errors::ExecErrorWithState,
|
|
execution::{EnvironmentRef, ExecState, ExecutorContext, ExecutorSettings},
|
|
ConnectionError, ExecError, KclError, KclErrorWithOutputs, Program,
|
|
};
|
|
|
|
#[derive(serde::Deserialize, serde::Serialize)]
|
|
pub struct RequestBody {
|
|
pub kcl_program: String,
|
|
#[serde(default)]
|
|
pub test_name: String,
|
|
}
|
|
|
|
/// Executes a kcl program and takes a snapshot of the result.
|
|
/// This returns the bytes of the snapshot.
|
|
pub async fn execute_and_snapshot(code: &str, current_file: Option<PathBuf>) -> Result<image::DynamicImage, ExecError> {
|
|
let ctx = new_context(true, current_file).await?;
|
|
let program = Program::parse_no_errs(code).map_err(KclErrorWithOutputs::no_outputs)?;
|
|
let res = do_execute_and_snapshot(&ctx, program)
|
|
.await
|
|
.map(|(_, _, snap)| snap)
|
|
.map_err(|err| err.error);
|
|
ctx.close().await;
|
|
res
|
|
}
|
|
|
|
/// Executes a kcl program and takes a snapshot of the result.
|
|
/// This returns the bytes of the snapshot.
|
|
pub async fn execute_and_snapshot_ast(
|
|
ast: Program,
|
|
current_file: Option<PathBuf>,
|
|
with_export_step: bool,
|
|
) -> Result<(ExecState, EnvironmentRef, image::DynamicImage, Option<Vec<u8>>), ExecErrorWithState> {
|
|
let ctx = new_context(true, current_file).await?;
|
|
let (exec_state, env, img) = match do_execute_and_snapshot(&ctx, ast).await {
|
|
Ok((exec_state, env_ref, img)) => (exec_state, env_ref, img),
|
|
Err(err) => {
|
|
// If there was an error executing the program, return it.
|
|
// Close the context to avoid any resource leaks.
|
|
ctx.close().await;
|
|
return Err(err);
|
|
}
|
|
};
|
|
let mut step = None;
|
|
if with_export_step {
|
|
let files = match ctx.export_step(true).await {
|
|
Ok(f) => f,
|
|
Err(err) => {
|
|
// Close the context to avoid any resource leaks.
|
|
ctx.close().await;
|
|
return Err(ExecErrorWithState::new(
|
|
ExecError::BadExport(format!("Export failed: {:?}", err)),
|
|
exec_state.clone(),
|
|
));
|
|
}
|
|
};
|
|
|
|
step = files.into_iter().next().map(|f| f.contents);
|
|
}
|
|
ctx.close().await;
|
|
Ok((exec_state, env, img, step))
|
|
}
|
|
|
|
pub async fn execute_and_snapshot_no_auth(
|
|
code: &str,
|
|
current_file: Option<PathBuf>,
|
|
) -> Result<(image::DynamicImage, EnvironmentRef), ExecError> {
|
|
let ctx = new_context(false, current_file).await?;
|
|
let program = Program::parse_no_errs(code).map_err(KclErrorWithOutputs::no_outputs)?;
|
|
let res = do_execute_and_snapshot(&ctx, program)
|
|
.await
|
|
.map(|(_, env_ref, snap)| (snap, env_ref))
|
|
.map_err(|err| err.error);
|
|
ctx.close().await;
|
|
res
|
|
}
|
|
|
|
async fn do_execute_and_snapshot(
|
|
ctx: &ExecutorContext,
|
|
program: Program,
|
|
) -> Result<(ExecState, EnvironmentRef, image::DynamicImage), ExecErrorWithState> {
|
|
let mut exec_state = ExecState::new(ctx);
|
|
let result = ctx
|
|
.run_single_threaded(&program, &mut exec_state)
|
|
.await
|
|
.map_err(|err| ExecErrorWithState::new(err.into(), exec_state.clone()))?;
|
|
for e in exec_state.errors() {
|
|
if e.severity.is_err() {
|
|
return Err(ExecErrorWithState::new(
|
|
KclErrorWithOutputs::no_outputs(KclError::Semantic(e.clone().into())).into(),
|
|
exec_state.clone(),
|
|
));
|
|
}
|
|
}
|
|
let snapshot_png_bytes = ctx
|
|
.prepare_snapshot()
|
|
.await
|
|
.map_err(|err| ExecErrorWithState::new(err, exec_state.clone()))?
|
|
.contents
|
|
.0;
|
|
|
|
// Decode the snapshot, return it.
|
|
let img = image::ImageReader::new(std::io::Cursor::new(snapshot_png_bytes))
|
|
.with_guessed_format()
|
|
.map_err(|e| ExecError::BadPng(e.to_string()))
|
|
.and_then(|x| x.decode().map_err(|e| ExecError::BadPng(e.to_string())))
|
|
.map_err(|err| ExecErrorWithState::new(err, exec_state.clone()))?;
|
|
|
|
Ok((exec_state, result.0, img))
|
|
}
|
|
|
|
pub async fn new_context(with_auth: bool, current_file: Option<PathBuf>) -> Result<ExecutorContext, ConnectionError> {
|
|
let mut client = new_zoo_client(if with_auth { None } else { Some("bad_token".to_string()) }, None)
|
|
.map_err(ConnectionError::CouldNotMakeClient)?;
|
|
if !with_auth {
|
|
// Use prod, don't override based on env vars.
|
|
// We do this so even in the engine repo, tests that need to run with
|
|
// no auth can fail in the same way as they would in prod.
|
|
client.set_base_url("https://api.zoo.dev".to_string());
|
|
}
|
|
|
|
let mut settings = ExecutorSettings {
|
|
highlight_edges: true,
|
|
enable_ssao: false,
|
|
show_grid: false,
|
|
replay: None,
|
|
project_directory: None,
|
|
current_file: None,
|
|
};
|
|
if let Some(current_file) = current_file {
|
|
settings.with_current_file(current_file);
|
|
}
|
|
let ctx = ExecutorContext::new(&client, settings)
|
|
.await
|
|
.map_err(ConnectionError::Establishing)?;
|
|
Ok(ctx)
|
|
}
|
|
|
|
pub async fn execute_and_export_step(
|
|
code: &str,
|
|
current_file: Option<PathBuf>,
|
|
) -> Result<
|
|
(
|
|
ExecState,
|
|
EnvironmentRef,
|
|
Vec<kittycad_modeling_cmds::websocket::RawFile>,
|
|
),
|
|
ExecErrorWithState,
|
|
> {
|
|
let ctx = new_context(true, current_file).await?;
|
|
let mut exec_state = ExecState::new(&ctx);
|
|
let program = Program::parse_no_errs(code)
|
|
.map_err(|err| ExecErrorWithState::new(KclErrorWithOutputs::no_outputs(err).into(), exec_state.clone()))?;
|
|
let result = ctx
|
|
.run(&program, &mut exec_state)
|
|
.await
|
|
.map_err(|err| ExecErrorWithState::new(err.into(), exec_state.clone()))?;
|
|
for e in exec_state.errors() {
|
|
if e.severity.is_err() {
|
|
return Err(ExecErrorWithState::new(
|
|
KclErrorWithOutputs::no_outputs(KclError::Semantic(e.clone().into())).into(),
|
|
exec_state.clone(),
|
|
));
|
|
}
|
|
}
|
|
|
|
let files = match ctx.export_step(true).await {
|
|
Ok(f) => f,
|
|
Err(err) => {
|
|
return Err(ExecErrorWithState::new(
|
|
ExecError::BadExport(format!("Export failed: {:?}", err)),
|
|
exec_state.clone(),
|
|
));
|
|
}
|
|
};
|
|
|
|
ctx.close().await;
|
|
|
|
Ok((exec_state, result.0, files))
|
|
}
|