ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ignore errors on the modeling cmds that are only for the artifact graph"

Browse Source 
This reverts commit db62c1962d.
This commit is contained in:
Jess Frazelle
2025-04-04 16:18:53 -07:00
parent db62c1962d
commit efe15580c7
10 changed files with 44 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rust/kcl-lib/src/engine/mod.rs
View File

@ -90,9 +90,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
/// Get the command responses from the engine.
fn responses(&self) -> Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>>;
/// Ignore failed responses of these command ids.
fn ignore_failed_responses(&self) -> Arc<RwLock<Vec<Uuid>>>;
/// Get the artifact commands that have accumulated so far.
fn artifact_commands(&self) -> Arc<RwLock<Vec<ArtifactCommand>>>;
@ -153,7 +150,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
async fn clear_queues(&self) {
self.batch().write().await.clear();
self.batch_end().write().await.clear();
self.ignore_failed_responses().write().await.clear();
}
/// Send a modeling command and wait for the response message.
@ -300,21 +296,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
Ok(())
}
// Add a modeling command to the batch but don't fire it right away.
// Ignore the failure of this command.
async fn batch_modeling_cmd_ignore_failure(
&self,
id: uuid::Uuid,
source_range: SourceRange,
cmd: &ModelingCmd,
) -> Result<(), crate::errors::KclError> {
self.ignore_failed_responses().write().await.push(id);
self.batch_modeling_cmd(id, source_range, cmd).await?;
Ok(())
}
// Add a vector of modeling commands to the batch but don't fire it right away.
// This allows you to force them all to be added together in the same order.
// When we are running things in parallel this prevents race conditions that might come
@ -486,7 +467,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
if let OkWebSocketResponseData::ModelingBatch { responses } = response {
let responses = responses.into_iter().map(|(k, v)| (Uuid::from(k), v)).collect();
self.parse_batch_responses(last_id.into(), id_to_source_range, responses)
.await
} else {
// We should never get here.
Err(KclError::Engine(KclErrorDetails {
@ -677,7 +657,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
}
}
async fn parse_batch_responses(
fn parse_batch_responses(
&self,
// The last response we are looking for.
id: uuid::Uuid,
@ -705,16 +685,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
}
}
BatchResponse::Failure { errors } => {
// If this was in our ignore list, we don't care about it.
if self
.ignore_failed_responses()
.read()
.await
.iter()
.any(|id| id == cmd_id)
{
continue;
}
// Get the source range for the command.
let source_range = id_to_source_range.get(cmd_id).cloned().ok_or_else(|| {
KclError::Engine(KclErrorDetails {