From 9e820bf7cbd406c4dbcf5675c237c66ba51a6761 Mon Sep 17 00:00:00 2001
From: l45k <leonhard@katulu.io>
Date: Sat, 20 Dec 2025 19:28:20 +0100
Subject: [PATCH] refactor: remove job_id

---
 crates/worker/src/executor/mod.rs              | 2 --
 crates/worker/src/executor/parameter_server.rs | 2 +-
 crates/worker/src/executor/process.rs          | 1 -
 crates/worker/src/job_manager.rs               | 4 ++--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/crates/worker/src/executor/mod.rs b/crates/worker/src/executor/mod.rs
index 29c3195d..8162c316 100644
--- a/crates/worker/src/executor/mod.rs
+++ b/crates/worker/src/executor/mod.rs
@@ -10,7 +10,6 @@ mod process;
 
 pub use parameter_server::ParameterServerExecutor;
 pub use process::ProcessExecutor;
-use uuid::Uuid;
 
 use crate::{connector::ConnectorError, executor::parameter_server::TensorOpError};
 
@@ -41,7 +40,6 @@ pub trait JobExecutor {
         &self,
         job: hypha_messages::JobSpec,
         cancel: CancellationToken,
-        job_id: Uuid,
         scheduler: PeerId,
     ) -> impl Future<Output = Result<impl Execution, Error>> + Send;
 }
diff --git a/crates/worker/src/executor/parameter_server.rs b/crates/worker/src/executor/parameter_server.rs
index ac231436..1b38ed65 100644
--- a/crates/worker/src/executor/parameter_server.rs
+++ b/crates/worker/src/executor/parameter_server.rs
@@ -85,10 +85,10 @@ impl JobExecutor for ParameterServerExecutor {
         &self,
         job: hypha_messages::JobSpec,
         cancel: CancellationToken,
-        job_id: Uuid,
         scheduler_id: PeerId,
     ) -> Result<ParameterServerExecution, Error> {
         tracing::info!(job_spec = ?job, "Executing parameter server job");
+        let job_id = job.job_id;
 
         let retry_strategy = ExponentialBackoff::from_millis(100)
             .map(jitter) // add jitter to delays
diff --git a/crates/worker/src/executor/process.rs b/crates/worker/src/executor/process.rs
index fafcec39..63c55cdd 100644
--- a/crates/worker/src/executor/process.rs
+++ b/crates/worker/src/executor/process.rs
@@ -84,7 +84,6 @@ impl JobExecutor for ProcessExecutor {
         &self,
         job: hypha_messages::JobSpec,
         cancel: CancellationToken,
-        _job_id: Uuid,
         scheduler: PeerId,
     ) -> Result<ProcessExecution, Error> {
         if !matches!(&job.executor, Executor::Train(_)) {
diff --git a/crates/worker/src/job_manager.rs b/crates/worker/src/job_manager.rs
index cb36f9d4..69f08c7b 100644
--- a/crates/worker/src/job_manager.rs
+++ b/crates/worker/src/job_manager.rs
@@ -113,7 +113,7 @@ impl JobManager {
                     self.config.clone(),
                 );
                 let execution = executor
-                    .execute(spec.clone(), cancel_token.clone(), spec.job_id, scheduler)
+                    .execute(spec.clone(), cancel_token.clone(), scheduler)
                     .await?;
                 let job = Job {
                     id,
@@ -143,7 +143,7 @@ impl JobManager {
                     self.work_dir_base.clone(),
                 );
                 let execution = executor
-                    .execute(spec.clone(), cancel_token.clone(), spec.job_id, scheduler)
+                    .execute(spec.clone(), cancel_token.clone(), scheduler)
                     .await?;
                 let job = Job {
                     id,