From fc987c7147d34b6879d39ede072427cb7026f23d Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 4 Mar 2025 22:21:57 +0100 Subject: [PATCH] allow ce to run codebase bundles preview --- backend/windmill-api/src/jobs.rs | 4 ++-- backend/windmill-worker/src/worker.rs | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs index a2acda48ac..99d9be45c7 100644 --- a/backend/windmill-api/src/jobs.rs +++ b/backend/windmill-api/src/jobs.rs @@ -4453,8 +4453,8 @@ async fn run_bundle_preview_script( path: preview.path, language: preview.language.unwrap_or(ScriptLang::Deno), lock: preview.lock, - concurrent_limit: None, // TODO(gbouv): once I find out how to store limits in the content of a script, should be easy to plug limits here - concurrency_time_window_s: None, // TODO(gbouv): same as above + concurrent_limit: None, + concurrency_time_window_s: None, cache_ttl: None, dedicated_worker: preview.dedicated_worker, custom_concurrency_key: None, diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs index dfd48cd6de..db6ea56bb5 100644 --- a/backend/windmill-worker/src/worker.rs +++ b/backend/windmill-worker/src/worker.rs @@ -2028,10 +2028,16 @@ async fn handle_queued_job( | JobKind::FlowPreview | JobKind::Flow | JobKind::FlowDependencies, - None, - ) => Some(cache::job::fetch_preview(db, &job.id, raw_lock, raw_code, raw_flow).await?), + x, + ) => match x.map(|x| x.0) { + None | Some(PREVIEW_IS_CODEBASE_HASH) | Some(PREVIEW_IS_TAR_CODEBASE_HASH) => { + Some(cache::job::fetch_preview(db, &job.id, raw_lock, raw_code, raw_flow).await?) + } + _ => None, + }, _ => None, }; + let cached_res_path = if job.cache_ttl.is_some() { Some(cached_result_path(db, &client.get_authed().await, &job, preview_data.as_ref()).await) } else {