Fix merging error and update to new design + change order of args

Synicix · Synicix · commit c25efdc1b04c · 2025-08-26T09:08:31.000Z
diff --git a/src/core/operator.rs b/src/core/operator.rs
@@ -40,7 +40,7 @@ impl Operator for JoinOperator {
                     .filter_map(|(parent_stream, parent_packets)| {
                         (parent_stream != &stream_name).then_some(parent_packets.clone())
                     })
-                    .chain(vec![vec![packet.clone()]].into_iter())
+                    .chain(vec![vec![packet.clone()]])
                     .collect::<Vec<_>>();
                 drop(received_packets);
 
diff --git a/src/core/orchestrator/docker.rs b/src/core/orchestrator/docker.rs
@@ -168,7 +168,6 @@ impl LocalDockerOrchestrator {
     #[expect(
         clippy::string_slice,
         clippy::indexing_slicing,
-        clippy::too_many_lines,
         reason = r#"
         - Timestamp and memory should always have a value > 0
         - Container will always have a name with more than 1 character
@@ -231,7 +230,7 @@ impl LocalDockerOrchestrator {
     fn extract_run_info(
         container_summary: &ContainerSummary,
         container_inspect_response: &ContainerInspectResponse,
-    ) -> Option<RunInfo> {
+    ) -> Option<PodRunInfo> {
         let terminated_timestamp = DateTime::parse_from_rfc3339(
             container_inspect_response
                 .state
@@ -241,7 +240,7 @@ impl LocalDockerOrchestrator {
         )
         .ok()?
         .timestamp() as u64;
-        Some(RunInfo {
+        Some(PodRunInfo {
             image: container_inspect_response
                 .config
                 .as_ref()?
@@ -261,47 +260,40 @@ impl LocalDockerOrchestrator {
                         .map(|(key, value)| (key.to_owned(), value.to_owned()))
                 })
                 .collect(),
-            command: format!(
-                "{} {}",
+            command: [
                 container_inspect_response
                     .config
                     .as_ref()?
                     .entrypoint
                     .as_ref()?
-                    .join(" "),
+                    .clone(),
                 container_inspect_response
                     .config
                     .as_ref()?
                     .cmd
                     .as_ref()?
-                    .join(" ")
-            ),
+                    .clone(),
+            ]
+            .concat(),
             status: match (
                 container_inspect_response.state.as_ref()?.status?,
                 container_inspect_response.state.as_ref()?.exit_code? as i16,
             ) {
-                (ContainerStateStatusEnum::RUNNING, _) => Status::Running,
-                (ContainerStateStatusEnum::EXITED, 0) => Status::Completed,
+                (ContainerStateStatusEnum::RUNNING | ContainerStateStatusEnum::RESTARTING, _) => {
+                    PodStatus::Running
+                }
+                (ContainerStateStatusEnum::EXITED, 0) => PodStatus::Completed,
                 (ContainerStateStatusEnum::EXITED | ContainerStateStatusEnum::DEAD, code) => {
-                    Status::Failed(code)
+                    PodStatus::Failed(code)
                 }
-                (
-                    ContainerStateStatusEnum::CREATED | ContainerStateStatusEnum::RESTARTING,
-                    code,
-                ) => {
-                    if container_inspect_response
-                        .state
-                        .as_ref()?
-                        .error
-                        .as_ref()?
-                        .is_empty()
-                    {
-                        Status::Starting
+                (ContainerStateStatusEnum::CREATED, code) => {
+                    if container_inspect_response.state.as_ref()?.error.is_some() {
+                        PodStatus::Failed(code)
                     } else {
-                        Status::Failed(code)
+                        PodStatus::Running
                     }
                 }
-                _ => Status::Undefined,
+                _ => PodStatus::Undefined,
             },
             mounts: container_inspect_response
                 .mounts
diff --git a/src/uniffi/error.rs b/src/uniffi/error.rs
@@ -116,8 +116,8 @@ impl OrcaError {
         matches!(&self.kind, Kind::MissingInfo { details, .. } if details.contains("annotation"))
     }
     /// Returns `true` if the error was caused by querying a purged pod run.
-    pub const fn is_purged_pod_run(&self) -> bool {
-        matches!(self.kind, Kind::NoMatchingPodRun { .. })
+    pub fn is_purged_pod_run(&self) -> bool {
+        matches!(&self.kind, Kind::MissingInfo { details, .. } if details.contains("pod run"))
     }
     /// Returns `true` if the error was caused by an invalid file or directory path.
     pub const fn is_failed_to_start_pod(&self) -> bool {
diff --git a/src/uniffi/orchestrator/agent.rs b/src/uniffi/orchestrator/agent.rs
@@ -170,11 +170,11 @@ impl Agent {
             async |agent, inner_namespace_lookup, _, pod_job| {
                 let pod_run = agent
                     .orchestrator
-                    .start(&inner_namespace_lookup, &pod_job)
+                    .start(&pod_job, &inner_namespace_lookup)
                     .await?;
                 let pod_result = agent
                     .orchestrator
-                    .get_result(&inner_namespace_lookup, &pod_run)
+                    .get_result(&pod_run, &inner_namespace_lookup)
                     .await?;
                 agent.orchestrator.delete(&pod_run).await?;
                 Ok(pod_result)
@@ -190,6 +190,7 @@ impl Agent {
                                     PodStatus::Completed => "success",
                                     PodStatus::Running
                                     | PodStatus::Failed(_)
+                                    | PodStatus::Undefined
                                     | PodStatus::Unset => "failure",
                                 }
                                 .to_owned(),
diff --git a/src/uniffi/orchestrator/docker.rs b/src/uniffi/orchestrator/docker.rs
@@ -6,7 +6,7 @@ use crate::{
     uniffi::{
         error::{Kind, OrcaError, Result, selector},
         model::pod::{PodJob, PodResult},
-        orchestrator::{ImageKind, Orchestrator, PodRun, PodRunInfo, PodStatus, Status},
+        orchestrator::{ImageKind, Orchestrator, PodRun, PodRunInfo, PodStatus},
     },
 };
 use async_trait;
@@ -19,14 +19,8 @@ use bollard::{
 use derive_more::Display;
 use futures_util::stream::{StreamExt as _, TryStreamExt as _};
 use snafu::{OptionExt as _, futures::TryFutureExt as _};
-use std::{
-    backtrace::Backtrace, collections::HashMap, path::PathBuf, sync::Arc, time::Duration,
-    time::Duration,
-};
-use tokio::{
-    time::sleep as async_sleep,
-    {fs::File, time::sleep},
-};
+use std::{backtrace::Backtrace, collections::HashMap, path::PathBuf, sync::Arc, time::Duration};
+use tokio::{fs::File, time::sleep as async_sleep};
 use tokio_util::{
     bytes::{Bytes, BytesMut},
     codec::{BytesCodec, FramedRead},
@@ -47,18 +41,18 @@ pub struct LocalDockerOrchestrator {
 impl Orchestrator for LocalDockerOrchestrator {
     fn start_with_altimage_blocking(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_job: &PodJob,
         image: &ImageKind,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodRun> {
-        ASYNC_RUNTIME.block_on(self.start_with_altimage(namespace_lookup, pod_job, image))
+        ASYNC_RUNTIME.block_on(self.start_with_altimage(pod_job, image, namespace_lookup))
     }
     fn start_blocking(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_job: &PodJob,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodRun> {
-        ASYNC_RUNTIME.block_on(self.start(namespace_lookup, pod_job))
+        ASYNC_RUNTIME.block_on(self.start(pod_job, namespace_lookup))
     }
     fn list_blocking(&self) -> Result<Vec<PodRun>> {
         ASYNC_RUNTIME.block_on(self.list())
@@ -71,10 +65,10 @@ impl Orchestrator for LocalDockerOrchestrator {
     }
     fn get_result_blocking(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_run: &PodRun,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodResult> {
-        ASYNC_RUNTIME.block_on(self.get_result(namespace_lookup, pod_run))
+        ASYNC_RUNTIME.block_on(self.get_result(pod_run, namespace_lookup))
     }
     #[expect(
         clippy::try_err,
@@ -86,9 +80,9 @@ impl Orchestrator for LocalDockerOrchestrator {
     )]
     async fn start_with_altimage(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_job: &PodJob,
         image: &ImageKind,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodRun> {
         let (assigned_name, container_options, container_config) = match image {
             ImageKind::Published(remote_image) => Self::prepare_container_start_inputs(
@@ -155,8 +149,8 @@ impl Orchestrator for LocalDockerOrchestrator {
     }
     async fn start(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_job: &PodJob,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodRun> {
         let image_options = Some(CreateImageOptions {
             from_image: pod_job.pod.image.clone(),
@@ -167,9 +161,9 @@ impl Orchestrator for LocalDockerOrchestrator {
             .try_collect::<Vec<_>>()
             .await?;
         self.start_with_altimage(
-            namespace_lookup,
             pod_job,
             &ImageKind::Published(pod_job.pod.image.clone()),
+            namespace_lookup,
         )
         .await
     }
@@ -232,8 +226,8 @@ impl Orchestrator for LocalDockerOrchestrator {
     )]
     async fn get_result(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_run: &PodRun,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodResult> {
         match self
             .api
diff --git a/src/uniffi/orchestrator/mod.rs b/src/uniffi/orchestrator/mod.rs
@@ -27,8 +27,6 @@ pub enum PodStatus {
     Completed,
     /// Run failed with the provided error code.
     Failed(i16),
-    /// For created or restarting container
-    Starting,
     /// For other container states that are not listed.
     Undefined,
     /// No status set.
@@ -81,9 +79,9 @@ pub trait Orchestrator: Send + Sync + fmt::Debug {
     /// Will return `Err` if there is an issue starting the container.
     fn start_with_altimage_blocking(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_job: &PodJob,
         image: &ImageKind,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodRun>;
     /// How to synchronously start containers. Assumes `PodJob` image is published.
     ///
@@ -92,8 +90,8 @@ pub trait Orchestrator: Send + Sync + fmt::Debug {
     /// Will return `Err` if there is an issue starting the container.
     fn start_blocking(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_job: &PodJob,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodRun>;
     /// How to synchronously query containers.
     ///
@@ -120,8 +118,8 @@ pub trait Orchestrator: Send + Sync + fmt::Debug {
     /// Will return `Err` if there is an issue creating a pod result.
     fn get_result_blocking(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_run: &PodRun,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodResult>;
     /// How to asynchronously start containers with an alternate image.
     ///
@@ -130,9 +128,9 @@ pub trait Orchestrator: Send + Sync + fmt::Debug {
     /// Will return `Err` if there is an issue starting the container.
     async fn start_with_altimage(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_job: &PodJob,
         image: &ImageKind,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodRun>;
     /// How to asynchronously start containers. Assumes `PodJob` image is published.
     ///
@@ -141,8 +139,8 @@ pub trait Orchestrator: Send + Sync + fmt::Debug {
     /// Will return `Err` if there is an issue starting the container.
     async fn start(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_job: &PodJob,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodRun>;
     /// How to asynchronously query containers.
     ///
@@ -169,8 +167,8 @@ pub trait Orchestrator: Send + Sync + fmt::Debug {
     /// Will return `Err` if there is an issue creating a pod result.
     async fn get_result(
         &self,
-        namespace_lookup: &HashMap<String, PathBuf>,
         pod_run: &PodRun,
+        namespace_lookup: &HashMap<String, PathBuf>,
     ) -> Result<PodResult>;
 }
 /// Orchestration execution agent daemon and client.
diff --git a/tests/error.rs b/tests/error.rs
@@ -39,7 +39,7 @@ fn external_bollard() -> Result<()> {
     pod.image = "nonexistent_image".to_owned();
     pod_job.pod = Arc::new(pod);
     assert!(
-        orch.start_blocking(&NAMESPACE_LOOKUP_READ_ONLY, &pod_job)
+        orch.start_blocking(&pod_job, &NAMESPACE_LOOKUP_READ_ONLY)
             .is_err_and(contains_debug),
         "Did not raise a bollard error."
     );
@@ -134,9 +134,9 @@ async fn internal_agent_communication_failure() -> Result<()> {
 fn internal_incomplete_packet() -> Result<()> {
     assert!(
         pod_job_custom(
-            &pod_custom(
+            pod_custom(
                 "alpine:3.14",
-                &["echo".into()],
+                vec!["echo".into()],
                 HashMap::from([(
                     "key_1".into(),
                     PathInfo {
@@ -174,7 +174,7 @@ fn internal_key_missing() {
 async fn internal_start_pod_jobs() -> Result<()> {
     let client = AgentClient::new("error_internal-start-pod-jobs".into(), "host".into())?;
     let mut pod_job = pod_job_custom(
-        &pod_custom("alpine:3.14", &str_to_vec("sleep 5"), HashMap::new())?,
+        pod_custom("alpine:3.14", str_to_vec("sleep 5"), HashMap::new())?,
         HashMap::new(),
         &NAMESPACE_LOOKUP_READ_ONLY,
     )?;
diff --git a/tests/fixture/mod.rs b/tests/fixture/mod.rs
@@ -158,13 +158,13 @@ pub fn pod_result_style(
 
 pub fn pod_custom(
     image_reference: &str,
-    command: &[String],
+    command: Vec<String>,
     input_spec: HashMap<String, PathInfo, RandomState>,
 ) -> Result<Pod> {
     Pod::new(
         None,
         image_reference.into(),
-        command.into(),
+        command,
         input_spec,
         PathBuf::from("/tmp/output"),
         HashMap::new(),
@@ -176,13 +176,13 @@ pub fn pod_custom(
 }
 
 pub fn pod_job_custom(
-    pod: &Pod,
+    pod: Pod,
     input_packet: Packet,
     namespace_lookup: &HashMap<String, PathBuf, RandomState>,
 ) -> Result<PodJob> {
     PodJob::new(
         None,
-        Arc::new(pod.clone()),
+        pod.into(),
         input_packet,
         URI {
             namespace: "default".to_owned(),
@@ -205,9 +205,9 @@ pub fn pod_jobs_stresser(
         .map(|i| {
             if i <= success_count {
                 return Ok(pod_job_custom(
-                    &pod_custom(
+                    pod_custom(
                         image_reference,
-                        &str_to_vec(&format!("stress-ng --cpu 1 --cpu-load 100 --timeout {run_duration_secs} --metrics-brief")),
+                        str_to_vec(&format!("stress-ng --cpu 1 --cpu-load 100 --timeout {run_duration_secs} --metrics-brief")),
                         HashMap::new()
                     )?,
                     HashMap::new(),
@@ -216,7 +216,7 @@ pub fn pod_jobs_stresser(
                 .into());
             }
             Ok(pod_job_custom(
-                &pod_custom(image_reference, &str_to_vec("sleep crash"), HashMap::new())?,
+                pod_custom(image_reference, str_to_vec("sleep crash"), HashMap::new())?,
                 HashMap::new(),
                 &NAMESPACE_LOOKUP_READ_ONLY,
             )?
diff --git a/tests/orchestrator.rs b/tests/orchestrator.rs
diff --git a/tests/pipeline.rs b/tests/pipeline.rs

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,8 @@ impl OrcaError {`
`116`	`116`	`matches!(&self.kind, Kind::MissingInfo { details, .. } if details.contains("annotation"))`
`117`	`117`	`}`
`118`	`118`	/// Returns `true` if the error was caused by querying a purged pod run.
`119`		`- pub const fn is_purged_pod_run(&self) -> bool {`
`120`		`- matches!(self.kind, Kind::NoMatchingPodRun { .. })`
	`119`	`+ pub fn is_purged_pod_run(&self) -> bool {`
	`120`	`+ matches!(&self.kind, Kind::MissingInfo { details, .. } if details.contains("pod run"))`
`121`	`121`	`}`
`122`	`122`	/// Returns `true` if the error was caused by an invalid file or directory path.
`123`	`123`	`pub const fn is_failed_to_start_pod(&self) -> bool {`