diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 39587ee787..9cccde0b70 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -2c6f6c9d5415347d131cc5974d78d427446c10a7 +32784f3907f0a25fee4a9f96fa172420f17b3fea diff --git a/backend/tests/dedicated_workers.rs b/backend/tests/dedicated_workers.rs index d0ba3e5e63..fc4ff77bb3 100644 --- a/backend/tests/dedicated_workers.rs +++ b/backend/tests/dedicated_workers.rs @@ -843,7 +843,8 @@ mod dedicated_worker_tests { let job_a = completed_job(uuid_a, &db).await; let job_b = completed_job(uuid_b, &db).await; - assert_eq!(job_a.json_result().unwrap(), json!(105)); + // helper(5) = 50, + 100 + assert_eq!(job_a.json_result().unwrap(), json!(150)); assert_eq!(job_b.json_result().unwrap(), json!(205)); assert_ran_on_dedicated_worker(&db, uuid_a, "python3").await; assert_ran_on_dedicated_worker(&db, uuid_b, "python3").await; diff --git a/backend/tests/fixtures/dedicated_flows.sql b/backend/tests/fixtures/dedicated_flows.sql index b3b63685df..e81cd32556 100644 --- a/backend/tests/fixtures/dedicated_flows.sql +++ b/backend/tests/fixtures/dedicated_flows.sql @@ -321,12 +321,13 @@ E'{"modules":[{"id":"a","value":{"type":"forloopflow","iterator":{"type":"javasc -- ============================================================ -- Test: Python runner group --- Two Python scripts sharing a workspace dependency annotation. +-- Two Python scripts sharing a workspace dependency annotation. Script a has a +-- relative import (helper defined below), so the group's loader.py is written. -- ============================================================ INSERT INTO public.script(workspace_id, created_by, content, schema, summary, description, path, hash, language, lock, dedicated_worker) VALUES ( 'test-workspace', 'system', -E'# extra_requirements: f/system/dedicated_double\ndef main(x: int):\n return x + 100', +E'# extra_requirements: f/system/dedicated_double\nfrom .py_dedicated_helper import helper\n\ndef main(x: int):\n return helper(x) + 100', '{"$schema":"https://json-schema.org/draft/2020-12/schema","properties":{"x":{"type":"number","description":""}},"required":["x"],"type":"object"}', '', '', 'f/system/py_rg_script_a', 300050, 'python3', '', true); diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs index 430d6e82ef..1dab4efa15 100644 --- a/backend/windmill-worker/src/python_executor.rs +++ b/backend/windmill-worker/src/python_executor.rs @@ -117,7 +117,7 @@ async fn handle_piptar_uploads(mut rx: tokio::sync::mpsc::UnboundedReceiver temp-hash map so relative /// imports resolve from not-yet-deployed local content; deployed runs pass /// `None` which renders an empty dict (deployed resolution unchanged). -fn render_relative_python_loader(temp_script_refs: &Option>) -> String { +pub(crate) fn render_relative_python_loader( + temp_script_refs: &Option>, +) -> String { let temp_refs_py = temp_script_refs .as_ref() .and_then(|m| serde_json::to_string(m).ok())