mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-19 08:01:25 +00:00
c28314f424
* feat: add runner groups for shared-process multi-script dedicated workers Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: unify dedicated worker and runner group wrappers into single multi-script wrapper Replace per-language single-script wrappers with the unified load/exec/exec_preprocess/end protocol. Each start_worker() now writes scripts to scripts/<safe_name>/ and uses generate_multi_script_wrapper(). handle_dedicated_process() sends load: on start and exec: per job instead of raw JSON args. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: merge runner groups into dedicated workers with inline arg metadata Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref to match EE branch Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: gate EE-only functions behind cfg(feature = "private") to fix OSS dead_code errors Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: auto-detect runner groups from workspace dependency annotations - New endpoint GET /scripts/list_dedicated_with_deps: returns dedicated scripts with parsed workspace dependency names from content annotations - Frontend: show dep badges in DedicatedWorkersSelector with links to workspace settings, warn when referenced dep doesn't exist, group scripts sharing deps into "Shared runner" sections - Remove manual "Runner groups" tab and RunnerGroupSelector component - Remove runner_groups from WorkerConfigOpt/WorkerConfig (auto-detected) - Fix Node.js single dedicated workers: transpile main.ts -> main.js via Bun.build so the multi-script wrapper's dynamic import() works under Node - Add package.json with type:module in scripts dir to silence Node warning Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: unify dedicated worker wrappers with baked-in codegen and routing Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test: add e2e tests for multi-script dedicated worker routing (bun, deno, python) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: remove dead generate_dedicated_worker_wrapper function Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add dependency installation to runner groups + make dep functions pub(crate) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: prevent bun loader from intercepting absolute paths within cwd When a plugin's onResolve returns an absolute path, Bun re-invokes the resolver with that path. The loader was then routing it through the remote URL resolver, breaking runner group script imports. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use _wm_ prefix for runner group scripts to avoid bun loader interception Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: extract DENO_UNSTABLE_ARGS constant to avoid repeating flags Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: regenerate system prompts Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: gate private-only exports behind cfg(feature = "private") for OSS build Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: move format strings before handle_dedicated_process to fix lifetime Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: regenerate sqlx offline cache Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix sqlx * fix: skip empty lines in deno e2e tests (double newline from console.log + '\n') Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use dict() instead of {{}} in python wrapper to avoid set literal {{{{}}}} in format!() produces {{}} which Python interprets as an empty set, not a dict. Use dict() which is unambiguous. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: remove deno from runner groups and associated tests Deno resolves dependencies at runtime via URLs/import maps, so there's no shared node_modules/pip install to benefit from runner groups. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: revert deno wrapper to inline old-style with exec: protocol Since deno doesn't support runner groups, the unified multi-script wrapper is unnecessary. Reverted to the old inline wrapper from main but adapted to use the exec:<path>:<args> protocol. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: extract deno wrapper into reusable function and add e2e tests Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use codebase presence (not nodejs annotation) to determine wrapper import extension On main, codebase scripts import ./main.js (pre-bundled JS). The wrapper_ext was incorrectly based on annotation.nodejs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: improve dedicated workers UI - combine lists, better badges, tooltips - Merge shared runners section with selected tags into one unified list - Move language tag to right side of selector for alignment - Change dep badge color from dark-gray to indigo - Add tooltip on yellow warning badge explaining missing workspace dep Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: group shared runners visually in dedicated workers list - Runner groups shown with a header (Shared runner · language · dep badge) - Scripts in the same group nested under the header - Standalone scripts/flows shown after groups - Used Svelte snippet for reusable tag row rendering Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: improve visual separation between shared runner groups and standalone items Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: give standalone runners same header style as shared runners - Each standalone script/flow gets its own header row with bg-surface-secondary - Header shows "Dedicated runner" / "Flow runner" label, dep link, language badge - Shared runner header: swapped language and dep badge positions - Dep shown as inline link instead of badge in headers for cleaner look Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: inline standalone runner path in header, language badge on right edge, no max height - Standalone items: path shown directly in header row (no sub-row) - Language badge placed after flex-1 spacer (right-aligned) - Removed max-h-64 overflow constraint from the list Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: consistent badges across runner list - dep+language on right, depBadge snippet - Shared runner scripts: show (workspace) and language badge on right - Standalone items: dep badges and language badge on right (after flex-1) - Shared runner header: dep badge and language badge on right - Extract depBadge snippet to deduplicate dep badge rendering - Picker selector also uses depBadge snippet Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: show language badge on standalone items, hide from shared runner sub-items - Fetch script language from API when not available from workspace deps - Hide dep+language badges from tagRow when script is inside a runner group (already shown in the group header) - Standalone items now always show language badge Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: differentiate badge colors - gray for language, indigo for workspace deps Matches codebase convention: gray for metadata (like script hashes), indigo for linkable features/entities. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use transparent (bordered) badge for language - visible on all backgrounds Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use gray badge for language everywhere Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: revert skills.ts and AI files, add _wm_ exclusion to Windows loader - Revert cli/src/guidance/skills.ts to main (not our change) - Revert AI provider formatting changes (not our change) - Add _wm_ prefix exclusion to loader.bun.windows.js filterResolve Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: update ee-repo-ref and regenerate system prompts after merge Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * perf: use DISTINCT ON in list_dedicated_with_deps to dedup at DB level Avoids fetching all script versions and deduplicating in Rust. Addresses PR review feedback. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use sqlx query! macro for list_dedicated_with_deps and regenerate cache Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: dedicated worker review fixes and test coverage - Fix Python relative imports in dedicated workers (write loader.py, add import loader to wrapper when needed) - Move Python colon parsing inside try/except to prevent crashes on malformed stdin - Add indexOf guard in Bun/Deno wrappers for malformed protocol messages - Add stderr logging for unrecognized stdin commands in all wrappers - Remove asyncio handling from Python wrapper (consistent with normal path) - Add exec_preprocess protocol tests for Bun, Deno, and Python - Add argument transformation tests (dates, bytes, kwargs, sentinel) - Add relative import detection test for Python wrapper - Add PreprocessedArgs variant to DedicatedWorkerResult test helper Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove symlink from git and gate has_relative_imports behind private feature Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: update ee-repo-ref for dedicated_worker_ee.rs changes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add mixed exec+preprocess test to use ProtocolCmd::Exec variant Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove hanging deno missing-preprocessor test The Deno wrapper only generates the exec_preprocess handler when the script has a preprocessor function. Without one, the message is unrecognized and the test hangs reading stdout. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref to 182943e5ad9bf2a905ccdf07d4e346437fb329a9 This commit updates the EE repository reference after PR #466 was merged in windmill-ee-private. Previous ee-repo-ref: 995f701fe3754be6260fc6b679e5de8fc636e68a New ee-repo-ref: 182943e5ad9bf2a905ccdf07d4e346437fb329a9 Automated by sync-ee-ref workflow. --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
926 lines
28 KiB
Rust
926 lines
28 KiB
Rust
use serde_json::json;
|
|
#[cfg(feature = "python")]
|
|
use sqlx::postgres::Postgres;
|
|
#[cfg(feature = "python")]
|
|
use sqlx::Pool;
|
|
#[cfg(feature = "python")]
|
|
use windmill_common::scripts::ScriptLang;
|
|
use windmill_test_utils::*;
|
|
|
|
// ============================================================================
|
|
// Dedicated Worker Protocol Tests (Python)
|
|
// ============================================================================
|
|
|
|
#[cfg(feature = "python")]
|
|
mod dedicated_worker_protocol_python {
|
|
use std::io::{BufRead, BufReader, Write};
|
|
use std::process::{Command, Stdio};
|
|
use windmill_test_utils::{parse_dedicated_worker_line, DedicatedWorkerResult};
|
|
use windmill_worker::{compute_py_codegen, generate_py_multi_script_wrapper, PyScriptEntry};
|
|
|
|
struct MultiScriptJob {
|
|
script_path: String,
|
|
args: serde_json::Value,
|
|
}
|
|
|
|
/// Creates a multi-script Python wrapper, writes scripts to proper module paths
|
|
fn create_py_worker_files(
|
|
dir: &std::path::Path,
|
|
scripts: &[(&str, &str)], // (original_path, content)
|
|
) -> std::path::PathBuf {
|
|
let mut codegens = Vec::new();
|
|
for (path, content) in scripts {
|
|
let cg = compute_py_codegen(content, path);
|
|
let module_dir = dir.join(&cg.dirs);
|
|
std::fs::create_dir_all(&module_dir).unwrap();
|
|
std::fs::write(module_dir.join(format!("{}.py", cg.module_name)), content).unwrap();
|
|
codegens.push((path.to_string(), cg));
|
|
}
|
|
|
|
let entries: Vec<PyScriptEntry<'_>> = codegens
|
|
.iter()
|
|
.map(|(path, cg)| PyScriptEntry { original_path: path.as_str(), codegen: cg })
|
|
.collect();
|
|
|
|
let wrapper = generate_py_multi_script_wrapper(&entries, false, false);
|
|
let wrapper_path = dir.join("wrapper.py");
|
|
std::fs::write(&wrapper_path, &wrapper).unwrap();
|
|
wrapper_path
|
|
}
|
|
|
|
fn run_py_multi_script_test(
|
|
scripts: &[(&str, &str)],
|
|
jobs: Vec<MultiScriptJob>,
|
|
) -> Vec<Result<serde_json::Value, String>> {
|
|
let temp_dir = tempfile::tempdir().unwrap();
|
|
create_py_worker_files(temp_dir.path(), scripts);
|
|
|
|
let mut child = Command::new("python3")
|
|
.args(["-u", "-m", "wrapper"])
|
|
.stdin(Stdio::piped())
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.current_dir(temp_dir.path())
|
|
.spawn()
|
|
.expect("Failed to spawn python3 process");
|
|
|
|
let mut stdin = child.stdin.take().unwrap();
|
|
let stdout = child.stdout.take().unwrap();
|
|
let mut reader = BufReader::new(stdout);
|
|
|
|
let mut start_line = String::new();
|
|
reader.read_line(&mut start_line).unwrap();
|
|
assert_eq!(
|
|
parse_dedicated_worker_line(start_line.trim()),
|
|
DedicatedWorkerResult::Start,
|
|
"Expected 'start', got: {}",
|
|
start_line.trim()
|
|
);
|
|
|
|
let mut results = Vec::new();
|
|
for job in &jobs {
|
|
writeln!(stdin, "exec:{}:{}", job.script_path, job.args.to_string()).unwrap();
|
|
stdin.flush().unwrap();
|
|
|
|
let mut response = String::new();
|
|
reader.read_line(&mut response).unwrap();
|
|
|
|
match parse_dedicated_worker_line(response.trim()) {
|
|
DedicatedWorkerResult::Success(value) => results.push(Ok(value)),
|
|
DedicatedWorkerResult::Error(err) => {
|
|
let msg = err["message"]
|
|
.as_str()
|
|
.unwrap_or("Unknown error")
|
|
.to_string();
|
|
results.push(Err(msg));
|
|
}
|
|
other => panic!("Unexpected response: {:?}", other),
|
|
}
|
|
}
|
|
|
|
writeln!(stdin, "end").unwrap();
|
|
stdin.flush().unwrap();
|
|
let _ = child.wait().expect("Worker process failed to exit");
|
|
results
|
|
}
|
|
|
|
fn run_py_single_script_test(
|
|
script_path: &str,
|
|
content: &str,
|
|
jobs: Vec<serde_json::Value>,
|
|
) -> Vec<Result<serde_json::Value, String>> {
|
|
run_py_multi_script_test(
|
|
&[(script_path, content)],
|
|
jobs.into_iter()
|
|
.map(|args| MultiScriptJob { script_path: script_path.to_string(), args })
|
|
.collect(),
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_dedicated_worker_simple() {
|
|
let results = run_py_single_script_test(
|
|
"f/test/add",
|
|
"def main(a: int, b: int):\n return a + b\n",
|
|
vec![serde_json::json!({"a": 3, "b": 4})],
|
|
);
|
|
assert_eq!(results.len(), 1);
|
|
assert_eq!(results[0], Ok(serde_json::json!(7)));
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_dedicated_worker_multiple_jobs() {
|
|
let results = run_py_single_script_test(
|
|
"f/test/double",
|
|
"def main(n: int):\n return n * 2\n",
|
|
(1..=5).map(|i| serde_json::json!({"n": i})).collect(),
|
|
);
|
|
assert_eq!(results.len(), 5);
|
|
for (i, result) in results.iter().enumerate() {
|
|
assert_eq!(*result, Ok(serde_json::json!(((i + 1) * 2) as i64)));
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_multi_script_routing() {
|
|
let results = run_py_multi_script_test(
|
|
&[
|
|
(
|
|
"f/math/add",
|
|
"def main(a: int, b: int):\n return a + b\n",
|
|
),
|
|
(
|
|
"f/math/mul",
|
|
"def main(x: int, y: int):\n return x * y\n",
|
|
),
|
|
],
|
|
vec![
|
|
MultiScriptJob {
|
|
script_path: "f/math/add".to_string(),
|
|
args: serde_json::json!({"a": 3, "b": 4}),
|
|
},
|
|
MultiScriptJob {
|
|
script_path: "f/math/mul".to_string(),
|
|
args: serde_json::json!({"x": 5, "y": 6}),
|
|
},
|
|
MultiScriptJob {
|
|
script_path: "f/math/add".to_string(),
|
|
args: serde_json::json!({"a": 10, "b": 20}),
|
|
},
|
|
],
|
|
);
|
|
assert_eq!(results.len(), 3);
|
|
assert_eq!(results[0], Ok(serde_json::json!(7)));
|
|
assert_eq!(results[1], Ok(serde_json::json!(30)));
|
|
assert_eq!(results[2], Ok(serde_json::json!(30)));
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_multi_script_error_isolation() {
|
|
let results = run_py_multi_script_test(
|
|
&[
|
|
("f/ok", "def main(x: int):\n return x * 2\n"),
|
|
("f/err", "def main(msg: str):\n raise Exception(msg)\n"),
|
|
],
|
|
vec![
|
|
MultiScriptJob {
|
|
script_path: "f/ok".to_string(),
|
|
args: serde_json::json!({"x": 5}),
|
|
},
|
|
MultiScriptJob {
|
|
script_path: "f/err".to_string(),
|
|
args: serde_json::json!({"msg": "boom"}),
|
|
},
|
|
MultiScriptJob {
|
|
script_path: "f/ok".to_string(),
|
|
args: serde_json::json!({"x": 10}),
|
|
},
|
|
],
|
|
);
|
|
assert_eq!(results.len(), 3);
|
|
assert_eq!(results[0], Ok(serde_json::json!(10)));
|
|
assert!(results[1].is_err());
|
|
assert_eq!(results[1], Err("boom".to_string()));
|
|
assert_eq!(results[2], Ok(serde_json::json!(20)));
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_multi_script_unknown_path() {
|
|
let results = run_py_multi_script_test(
|
|
&[("f/known", "def main(x: int):\n return x\n")],
|
|
vec![MultiScriptJob {
|
|
script_path: "f/unknown".to_string(),
|
|
args: serde_json::json!({"x": 1}),
|
|
}],
|
|
);
|
|
assert_eq!(results.len(), 1);
|
|
assert!(results[0].is_err());
|
|
assert!(results[0]
|
|
.as_ref()
|
|
.unwrap_err()
|
|
.contains("Script not found"));
|
|
}
|
|
|
|
// ==================== exec_preprocess Tests ====================
|
|
|
|
/// Raw protocol command for Python
|
|
enum ProtocolCmd {
|
|
Exec { path: String, args: serde_json::Value },
|
|
ExecPreprocess { path: String, args: serde_json::Value },
|
|
}
|
|
|
|
/// Run a Python worker test with raw protocol commands
|
|
fn run_py_raw_protocol_test(
|
|
scripts: &[(&str, &str)],
|
|
commands: Vec<ProtocolCmd>,
|
|
) -> Vec<DedicatedWorkerResult> {
|
|
let temp_dir = tempfile::tempdir().unwrap();
|
|
create_py_worker_files(temp_dir.path(), scripts);
|
|
|
|
let mut child = Command::new("python3")
|
|
.args(["-u", "-m", "wrapper"])
|
|
.stdin(Stdio::piped())
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::piped())
|
|
.current_dir(temp_dir.path())
|
|
.spawn()
|
|
.expect("Failed to spawn python3 process");
|
|
|
|
let mut stdin = child.stdin.take().unwrap();
|
|
let stdout = child.stdout.take().unwrap();
|
|
let mut reader = BufReader::new(stdout);
|
|
|
|
let mut start_line = String::new();
|
|
reader.read_line(&mut start_line).unwrap();
|
|
assert_eq!(
|
|
parse_dedicated_worker_line(start_line.trim()),
|
|
DedicatedWorkerResult::Start,
|
|
);
|
|
|
|
let mut results = Vec::new();
|
|
|
|
for cmd in &commands {
|
|
let line = match cmd {
|
|
ProtocolCmd::Exec { path, args } => format!("exec:{}:{}", path, args),
|
|
ProtocolCmd::ExecPreprocess { path, args } => {
|
|
format!("exec_preprocess:{}:{}", path, args)
|
|
}
|
|
};
|
|
writeln!(stdin, "{}", line).unwrap();
|
|
stdin.flush().unwrap();
|
|
|
|
let expected_lines = match cmd {
|
|
ProtocolCmd::ExecPreprocess { .. } => 2,
|
|
ProtocolCmd::Exec { .. } => 1,
|
|
};
|
|
|
|
for _ in 0..expected_lines {
|
|
let mut response = String::new();
|
|
reader.read_line(&mut response).unwrap();
|
|
let parsed = parse_dedicated_worker_line(response.trim());
|
|
if matches!(parsed, DedicatedWorkerResult::Error(_)) {
|
|
results.push(parsed);
|
|
break;
|
|
}
|
|
results.push(parsed);
|
|
}
|
|
}
|
|
|
|
writeln!(stdin, "end").unwrap();
|
|
stdin.flush().unwrap();
|
|
let _ = child.wait().expect("Worker process failed to exit");
|
|
|
|
results
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_exec_preprocess() {
|
|
let script = r#"
|
|
def preprocessor(x: int):
|
|
return {"x": x * 10}
|
|
|
|
def main(x: int):
|
|
return x + 1
|
|
"#;
|
|
let results = run_py_raw_protocol_test(
|
|
&[("f/test/pre", script)],
|
|
vec![ProtocolCmd::ExecPreprocess {
|
|
path: "f/test/pre".to_string(),
|
|
args: serde_json::json!({"x": 5}),
|
|
}],
|
|
);
|
|
assert_eq!(results.len(), 2);
|
|
assert_eq!(
|
|
results[0],
|
|
DedicatedWorkerResult::PreprocessedArgs(serde_json::json!({"x": 50}))
|
|
);
|
|
// main(50) => 51
|
|
assert_eq!(
|
|
results[1],
|
|
DedicatedWorkerResult::Success(serde_json::json!(51))
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_exec_preprocess_missing_preprocessor() {
|
|
let script = "def main(x: int):\n return x\n";
|
|
let results = run_py_raw_protocol_test(
|
|
&[("f/test/nopre", script)],
|
|
vec![ProtocolCmd::ExecPreprocess {
|
|
path: "f/test/nopre".to_string(),
|
|
args: serde_json::json!({"x": 5}),
|
|
}],
|
|
);
|
|
assert_eq!(results.len(), 1);
|
|
assert!(matches!(results[0], DedicatedWorkerResult::Error(_)));
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_exec_preprocess_then_exec() {
|
|
let script = r#"
|
|
def preprocessor(x: int):
|
|
return {"x": x * 2}
|
|
|
|
def main(x: int):
|
|
return x + 100
|
|
"#;
|
|
let results = run_py_raw_protocol_test(
|
|
&[("f/test/mixed", script)],
|
|
vec![
|
|
ProtocolCmd::ExecPreprocess {
|
|
path: "f/test/mixed".to_string(),
|
|
args: serde_json::json!({"x": 5}),
|
|
},
|
|
ProtocolCmd::Exec {
|
|
path: "f/test/mixed".to_string(),
|
|
args: serde_json::json!({"x": 7}),
|
|
},
|
|
],
|
|
);
|
|
// preprocess: preprocessor(5) => {"x":10}, main(10) => 110
|
|
// exec: main(7) => 107
|
|
assert_eq!(results.len(), 3);
|
|
assert_eq!(
|
|
results[0],
|
|
DedicatedWorkerResult::PreprocessedArgs(serde_json::json!({"x": 10}))
|
|
);
|
|
assert_eq!(
|
|
results[1],
|
|
DedicatedWorkerResult::Success(serde_json::json!(110))
|
|
);
|
|
assert_eq!(
|
|
results[2],
|
|
DedicatedWorkerResult::Success(serde_json::json!(107))
|
|
);
|
|
}
|
|
|
|
// ==================== Argument Transformation Tests ====================
|
|
|
|
#[test]
|
|
fn test_python_datetime_arg_transformation() {
|
|
let script = r#"
|
|
from datetime import datetime
|
|
|
|
def main(d: datetime):
|
|
return d.isoformat()
|
|
"#;
|
|
let results = run_py_single_script_test(
|
|
"f/test/dt",
|
|
script,
|
|
vec![serde_json::json!({"d": "2024-01-15T10:30:00+00:00"})],
|
|
);
|
|
assert_eq!(results.len(), 1);
|
|
assert_eq!(
|
|
results[0],
|
|
Ok(serde_json::json!("2024-01-15T10:30:00+00:00"))
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_bytes_arg_transformation() {
|
|
let script = r#"
|
|
def main(data: bytes):
|
|
return len(data)
|
|
"#;
|
|
// base64 of "hello" is "aGVsbG8="
|
|
let results = run_py_single_script_test(
|
|
"f/test/bytes",
|
|
script,
|
|
vec![serde_json::json!({"data": "aGVsbG8="})],
|
|
);
|
|
assert_eq!(results.len(), 1);
|
|
assert_eq!(results[0], Ok(serde_json::json!(5)));
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_kwargs_filtering() {
|
|
// Test that extra kwargs are filtered out and only declared args are passed
|
|
let script = "def main(a: int, b: int):\n return a + b\n";
|
|
let results = run_py_single_script_test(
|
|
"f/test/kwargs",
|
|
script,
|
|
vec![serde_json::json!({"a": 1, "b": 2, "extra": 99})],
|
|
);
|
|
assert_eq!(results.len(), 1);
|
|
assert_eq!(results[0], Ok(serde_json::json!(3)));
|
|
}
|
|
|
|
#[test]
|
|
fn test_python_function_call_sentinel_removal() {
|
|
// Test that '<function call>' sentinel values are removed from args
|
|
let script = "def main(a: int, b: int = 10):\n return a + b\n";
|
|
let results = run_py_single_script_test(
|
|
"f/test/sentinel",
|
|
script,
|
|
vec![serde_json::json!({"a": 5, "b": "<function call>"})],
|
|
);
|
|
assert_eq!(results.len(), 1);
|
|
// b should be removed (sentinel), default 10 used
|
|
assert_eq!(results[0], Ok(serde_json::json!(15)));
|
|
}
|
|
|
|
// ==================== Relative Import Tests ====================
|
|
|
|
#[test]
|
|
fn test_python_dedicated_worker_with_relative_import_detection() {
|
|
// Test that the wrapper includes 'import loader' when scripts have relative imports
|
|
let script_with_relative = "from f.helper import util\ndef main(x: int):\n return x\n";
|
|
let cg = compute_py_codegen(script_with_relative, "f/test/rel");
|
|
let entries = [PyScriptEntry { original_path: "f/test/rel", codegen: &cg }];
|
|
let wrapper = generate_py_multi_script_wrapper(&entries, false, true);
|
|
assert!(
|
|
wrapper.contains("import loader"),
|
|
"wrapper should contain 'import loader' when any_relative_imports=true"
|
|
);
|
|
|
|
// Without relative imports
|
|
let script_no_relative = "def main(x: int):\n return x\n";
|
|
let cg2 = compute_py_codegen(script_no_relative, "f/test/norel");
|
|
let entries2 = [PyScriptEntry { original_path: "f/test/norel", codegen: &cg2 }];
|
|
let wrapper2 = generate_py_multi_script_wrapper(&entries2, false, false);
|
|
assert!(
|
|
!wrapper2.contains("import loader"),
|
|
"wrapper should NOT contain 'import loader' when any_relative_imports=false"
|
|
);
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "lockfile_python"))]
|
|
async fn test_requirements_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py: ==3.11.11
|
|
# requirements:
|
|
# tiny==0.1.3
|
|
|
|
import bar
|
|
import baz # pin: foo
|
|
import baz # repin: fee
|
|
import bug # repin: free
|
|
|
|
def main():
|
|
pass
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec![
|
|
"# workspace-dependencies-mode: manual\n# py: 3.11.11",
|
|
"tiny==0.1.3",
|
|
],
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "lockfile_python"))]
|
|
async fn test_extra_requirements_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
{
|
|
use windmill_common::scripts::ScriptLang;
|
|
|
|
let content = r#"# py: ==3.11.11
|
|
# extra_requirements:
|
|
# tiny
|
|
|
|
import f.system.extra_requirements
|
|
import tiny # pin: tiny==0.1.0
|
|
import tiny # pin: tiny==0.1.1
|
|
import tiny # repin: tiny==0.1.2
|
|
|
|
def main():
|
|
pass
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec![
|
|
"# workspace-dependencies-mode: extra\n# py: 3.11.11",
|
|
"bottle==0.13.2",
|
|
"tiny==0.1.2",
|
|
],
|
|
)
|
|
.await?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "lockfile_python"))]
|
|
async fn test_extra_requirements_python2(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py: ==3.11.11
|
|
# extra_requirements:
|
|
# tiny==0.1.3
|
|
|
|
import simplejson # pin: simplejson==3.20.1
|
|
def main():
|
|
pass
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec![
|
|
"# workspace-dependencies-mode: extra\n# py: 3.11.11",
|
|
"simplejson==3.20.1",
|
|
"tiny==0.1.3",
|
|
],
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "lockfile_python"))]
|
|
async fn test_pins_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py: ==3.11.11
|
|
# extra_requirements:
|
|
# tiny==0.1.3
|
|
# bottle==0.13.2
|
|
|
|
import f.system.requirements
|
|
import f.system.pins
|
|
import tiny # repin: tiny==0.1.3
|
|
import simplejson
|
|
|
|
def main():
|
|
pass
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec![
|
|
"# workspace-dependencies-mode: extra\n# py: 3.11.11",
|
|
"bottle==0.13.2",
|
|
"microdot==2.2.0",
|
|
"simplejson==3.19.3",
|
|
"tiny==0.1.3",
|
|
],
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "multipython"))]
|
|
async fn test_multipython_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py: <=3.12.2, >=3.12.0
|
|
import f.multipython.script1
|
|
import f.multipython.aliases
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(&db, content, ScriptLang::Python3, vec!["# py: 3.12.1\n"]).await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "multipython"))]
|
|
async fn test_inline_script_metadata_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"# py_select_latest
|
|
# /// script
|
|
# requires-python = ">3.11,<3.12.3,!=3.12.2"
|
|
# dependencies = [
|
|
# "tiny==0.1.3",
|
|
# ]
|
|
# ///
|
|
"#
|
|
.to_string();
|
|
|
|
assert_lockfile(
|
|
&db,
|
|
content,
|
|
ScriptLang::Python3,
|
|
vec!["# py: 3.12.1", "tiny==0.1.3"],
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
use windmill_common::jobs::JobPayload;
|
|
#[cfg(feature = "python")]
|
|
use windmill_common::jobs::RawCode;
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_job(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
let content = r#"
|
|
def main():
|
|
return "hello world"
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
modules: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!("hello world"));
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_global_site_packages(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
use windmill_common::worker::ROOT_CACHE_DIR;
|
|
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
// Shared for all 3.12.*
|
|
let path = format!("{}python_3_12/global-site-packages", *ROOT_CACHE_DIR);
|
|
std::fs::create_dir_all(&path).unwrap();
|
|
std::fs::write(path + "/my_global_site_package_3_12_any.py", "").unwrap();
|
|
|
|
// 3.12
|
|
{
|
|
let content = r#"# py: ==3.12
|
|
#requirements:
|
|
#
|
|
|
|
import my_global_site_package_3_12_any
|
|
|
|
def main():
|
|
return "hello world"
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default(
|
|
)
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
modules: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!("hello world"));
|
|
}
|
|
|
|
// 3.12.1
|
|
{
|
|
let content = r#"# py: ==3.12.1
|
|
#requirements:
|
|
#
|
|
|
|
import my_global_site_package_3_12_any
|
|
|
|
def main():
|
|
return "hello world"
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default(
|
|
)
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
modules: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!("hello world"));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_job_heavy_dep(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
let content = r#"
|
|
import numpy as np
|
|
|
|
def main():
|
|
a = np.arange(15).reshape(3, 5)
|
|
return len(a)
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
modules: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!(3));
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_job_with_imports(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
let content = r#"
|
|
import wmill
|
|
|
|
def main():
|
|
return wmill.get_workspace()
|
|
"#
|
|
.to_owned();
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content,
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
lock: None,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
modules: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port)
|
|
.await
|
|
.json_result()
|
|
.unwrap();
|
|
|
|
assert_eq!(result, serde_json::json!("test-workspace"));
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "relative_python"))]
|
|
async fn test_relative_imports_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"
|
|
from f.system.same_folder_script import main as test1
|
|
from .same_folder_script import main as test2
|
|
from f.system_relative.different_folder_script import main as test3
|
|
from ..system_relative.different_folder_script import main as test4
|
|
|
|
def main():
|
|
return [test1(), test2(), test3(), test4()]
|
|
"#
|
|
.to_string();
|
|
|
|
run_deployed_relative_imports(&db, content.clone(), ScriptLang::Python3).await?;
|
|
run_preview_relative_imports(&db, content, ScriptLang::Python3).await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base", "relative_python"))]
|
|
async fn test_nested_imports_python(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let content = r#"
|
|
|
|
from f.system_relative.nested_script import main as test
|
|
|
|
def main():
|
|
return test()
|
|
"#
|
|
.to_string();
|
|
|
|
run_deployed_relative_imports(&db, content.clone(), ScriptLang::Python3).await?;
|
|
run_preview_relative_imports(&db, content, ScriptLang::Python3).await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_python_wac_v2_with_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
let content = r#"
|
|
from wmill import task, workflow
|
|
|
|
@task()
|
|
def greet(label: str, count: int) -> str:
|
|
return f"hello {label} x{count}"
|
|
|
|
@workflow
|
|
async def main(item: str, qty: int, email: str):
|
|
greeting = await greet(item, qty)
|
|
return {"item": item, "qty": qty, "email": email, "greeting": greeting}
|
|
"#
|
|
.to_string();
|
|
|
|
// WAC requires at least 2 workers (parent + task sub-jobs)
|
|
let db = &db;
|
|
in_test_worker(
|
|
db,
|
|
async move {
|
|
let job = Box::pin(
|
|
RunJob::from(JobPayload::Code(RawCode {
|
|
language: ScriptLang::Python3,
|
|
content,
|
|
..RawCode::default()
|
|
}))
|
|
.arg("item", json!("widget"))
|
|
.arg("qty", json!(5))
|
|
.arg("email", json!("test@example.com"))
|
|
.run_until_complete(db, false, port),
|
|
)
|
|
.await;
|
|
|
|
let result = job.json_result().unwrap();
|
|
assert_eq!(result["item"], json!("widget"));
|
|
assert_eq!(result["qty"], json!(5));
|
|
assert_eq!(result["email"], json!("test@example.com"));
|
|
assert_eq!(result["greeting"], json!("hello widget x5"));
|
|
},
|
|
port,
|
|
)
|
|
.await;
|
|
Ok(())
|
|
}
|