* feat: add script module mode with folder model for Bun and Python Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: add missing modules field to RawCode in bun_executor Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * sqlx * feat: enrich WAC templates with checkpoint and replay semantics Add prominent comments explaining that all computation must happen inside task/step/taskScript or it will be replayed on resume/retry. Clarify that waitForApproval does not hold a worker and that approve/reject URLs are available in the timeline step details. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(cli): script module sync idempotency, per-module hash tracking, and preview support - Fix pull→push idempotency: use `??` instead of `||` for module lock field so empty strings are preserved (matches API's `lock: ""`) - Add per-module hash tracking in wmill-lock.yaml following the flow inline script pattern (SCRIPT_TOP_HASH + per-module subpath hashes) - Selective module lock regeneration: only regenerate locks for modules whose content actually changed, not all modules - Use unfiltered rawWorkspaceDependencies for module hashes to match what updateModuleLocks passes to fetchScriptLock - Show changed module names in stale script output for clarity - Add module support to `script preview` command: read modules from __mod/ folder and pass them in the preview API request - Add preview tests for taskScript pattern (flat and folder layout) - Update test assertion for module stale detection output Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): WAC UI improvements — reorder templates, module tab rename, import consolidation - Reorder WAC template buttons: TypeScript before Python in ScriptBuilder, CreateActionsScript, and CreateActionsFlow - Remove dropdown items from +Script button (simplify to direct link) - Move "Import Workflow-as-Code" to +Flow dropdown with dedicated drawer - Add module tab rename: pencil icon on hover opens popover with validation, fixed-width icon container prevents layout shift Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: remaining module-mode changes from working branch - Backend parser updates for WAC detection - CLI sync/types updates for raw app path and module support - Frontend UI polish (Dev.svelte, ScriptRow, script hash page) - Test fixture updates Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test(cli): add test for module modification detection in generate-metadata Verifies that modifying a single module file re-triggers stale detection and only the changed module is listed, not all modules. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): critical fixes from PR review - Fix hardcoded dev path in bun_executor.rs WAC v2 wrapper — use "windmill-client" import instead of absolute filesystem path - Fix missed no_main_func → auto_kind rename in parser TS test - Add modules column to clone_script SQL (windmill-common and windmill-api-workspaces) so cloned scripts retain their modules - Add modules: None to RawCode structs in worker tests - Restore complete sqlx cache (merge main's cache + our new queries) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix clone warning treated as error in CI Change `.clone()` on double reference to `*k` dereference in scripts.rs hash implementation. Update sqlx cache with new query hashes from modified clone_script SQL. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use published parser wasm versions for CI build The local file:// paths for windmill-parser-wasm-py and windmill-parser-wasm-ts don't exist in the Cloudflare Pages build environment. Revert to published npm versions (1.655.0). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): update parser wasm packages to 1.657.2 Use newly published windmill-parser-wasm-ts and windmill-parser-wasm-py v1.657.2 which include auto_kind/WAC detection changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): regenerate package-lock.json for npm ci compatibility Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use main's lockfile as base, update only parser wasm packages Regenerating package-lock.json from scratch pulled different dependency versions causing svelte-check type errors. Instead, start from main's lockfile and only update the two changed packages. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): add modules column to fetch_script_for_update query The Script<SR> struct has a modules field (FromRow), but fetch_script_for_update didn't SELECT modules, causing a runtime error "no column found for name: modules" when the worker processed dependency jobs. This was the root cause of the relock_skip test timeout. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix script module execution for Python and Bun - Fix modules not passed through job queue: inject _MODULES into PushArgs.extra when pushing Code jobs so worker can extract them - Fix Python module imports: use relative imports (from .helper) and add sys.path.insert for module directory in wrapper - Fix Python tests: use relative imports and empty lock to prevent pip from resolving module names as packages - Add local file check in Bun loader for module resolution - Ignore Bun module test (bundle mode loader integration tracked separately) - Add missing modules column to fetch_script_for_update query Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): remove unnecessary empty lock in Python module tests Relative imports (from .helper) are not parsed as pip packages, so the empty lock workaround is not needed. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix module execution for Python and Bun — all tests pass Python modules: - Use relative imports (from .helper import greet) since scripts run as packages - Add sys.path.insert for module directory in wrapper to ensure local modules take precedence over pip packages with same name Bun modules: - Use bundled output (./out/main.js) as wrapper import when modules are present — the bundled output has module content inlined by Bun.build, avoiding runtime loader resolution issues - Add local file check in loader.bun.js onResolve to short-circuit API URL resolution for module files on disk Job queue: - Inject _MODULES into PushArgs.extra when pushing Code jobs so the worker can extract them at execution time Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: address PR review — simplify, fix correctness, remove dead code Critical fixes: - Replace all CLI `no_main_func` references with `auto_kind` (string) to match the backend migration and API changes - Remove duplicated `compute_python_module_dir` in worker.rs, use the canonical version from python_executor.rs High priority: - Auto-create `__init__.py` in intermediate directories for nested Python modules so imports like `from .utils.math import add` work without users manually creating __init__.py files - Remove redundant `sys_path_insert` — relative imports use Python's package system, not sys.path Medium: - Fix lock file base name extraction: use regex to strip only the final extension (`.replace(/\.[^.]+$/, '')`) instead of `indexOf(".")` which breaks for files like `helper.test.ts` Simplification: - Remove dead `{#if false}` Popover block in ScriptEditor.svelte - Guard loader.bun.js local file check to only run for relative paths (matching the Windows loader pattern) - Add clarifying comment on Bun dual mechanism (build + run phases) - Add maintenance comment on manual Hash impl for NewScript Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: final review fixes — stale cleanup, baseName, auto_kind export - Fix sync.ts baseName extraction using indexOf(".") → regex (same fix as script.ts/metadata.ts, missed this instance) - Add stale module file cleanup in writeModulesToDisk: removes files from __mod/ that are no longer in the modules map before writing, fixing the pull→push cycle that couldn't delete modules - Log warning when _MODULES serialization fails in job push instead of silently dropping modules - Use strict equality (===) for auto_kind comparison - Exclude auto_kind from workspace export — it is auto-detected by the parser at deploy time from script content Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(cli): remove auto_kind from push, comparison, and metadata auto_kind is auto-detected by the parser at deploy time, so the CLI should not send it, compare it, or write it to script.yaml. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove erroneously added backend/backend/.sqlx directory Duplicate .sqlx cache was committed at the wrong nested path. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address PR review feedback + fix CI dead_code warning Frontend (ScriptEditor.svelte): - Fix switchToMain() missing lastSyncedCode update — prevents stale code sync on external changes while editing a module tab - Fix formatAction saving module code to main script's localStorage draft — now saves main code when on a module tab - Fix non-null assertion on inferModuleLang in renameModule — fall back to original language instead of force unwrap - Remove redundant activeModuleTab truthy check in runTest CLI (script.ts): - Clean up empty directories after removing stale module files in writeModulesToDisk Backend: - Add path traversal guard in write_module_files — reject module paths containing ".." - Fix dead_code warning on auto_kind field in workspace export struct Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): improve auto_kind UX + address review findings - Rename "Include without main function" toggle to "Include library scripts" in script list (ItemsList.svelte) - Update NoMainFuncBadge: "No main" → "Library" with clearer tooltip - Filter module file extensions by main script language — Python scripts only allow .py modules, TypeScript only .ts, etc. - Split flushModuleState into flushModuleContent (no UI side-effect) and flushModuleState (flush + reset tab), reducing duplication - Dynamic placeholder and hint text in add module popover based on main script language Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
588 lines
18 KiB
Rust
588 lines
18 KiB
Rust
#![cfg(all(feature = "private", feature = "agent_worker_server"))]
|
|
|
|
use serde_json::json;
|
|
use sqlx::{Pool, Postgres};
|
|
use windmill_common::{
|
|
jobs::{JobPayload, RawCode},
|
|
scripts::ScriptLang,
|
|
};
|
|
use windmill_test_utils::*;
|
|
|
|
fn bun_code(code: &str) -> RawCode {
|
|
RawCode {
|
|
hash: None,
|
|
content: code.to_string(),
|
|
path: None,
|
|
language: ScriptLang::Bun,
|
|
lock: None,
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
modules: None,
|
|
}
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_simple_script(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (_client, port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
let result = RunJob::from(JobPayload::Code(bun_code(
|
|
"export function main() { return 42; }",
|
|
)))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
assert!(result.success, "job should succeed");
|
|
assert_eq!(result.json_result(), Some(json!(42)));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_script_with_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (_client, port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
let result = RunJob::from(JobPayload::Code(bun_code(
|
|
"export function main(x: number, y: number) { return x + y; }",
|
|
)))
|
|
.arg("x", json!(10))
|
|
.arg("y", json!(32))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
assert!(result.success, "job should succeed");
|
|
assert_eq!(result.json_result(), Some(json!(42)));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_script_with_logs(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (_client, port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
let result = RunJob::from(JobPayload::Code(bun_code(
|
|
r#"export function main() {
|
|
console.log("hello from agent worker");
|
|
console.log("processing step 1");
|
|
console.log("processing step 2");
|
|
return "done";
|
|
}"#,
|
|
)))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
assert!(result.success, "job should succeed");
|
|
assert_eq!(result.json_result(), Some(json!("done")));
|
|
|
|
let logs = sqlx::query_scalar::<_, String>(
|
|
"SELECT logs FROM job_logs WHERE job_id = $1 AND workspace_id = 'test-workspace'",
|
|
)
|
|
.bind(result.id)
|
|
.fetch_optional(&db)
|
|
.await?;
|
|
|
|
let logs = logs.expect("logs should exist");
|
|
assert!(
|
|
logs.contains("hello from agent worker"),
|
|
"logs should contain the printed output, got: {logs}"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_script_failure(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (_client, port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
let result = RunJob::from(JobPayload::Code(bun_code(
|
|
"export function main() { throw new Error('test error'); }",
|
|
)))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
assert!(!result.success, "job should fail");
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_complex_result(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (_client, port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
let result = RunJob::from(JobPayload::Code(bun_code(
|
|
r#"export function main() {
|
|
return {
|
|
items: [1, 2, 3],
|
|
metadata: { key: "value" },
|
|
count: 3,
|
|
};
|
|
}"#,
|
|
)))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
assert!(result.success, "job should succeed");
|
|
let json = result.json_result().unwrap();
|
|
assert_eq!(json["items"], json!([1, 2, 3]));
|
|
assert_eq!(json["metadata"]["key"], json!("value"));
|
|
assert_eq!(json["count"], json!(3));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_token_creation(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (client, _port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
// client.baseurl() already includes /api
|
|
let resp = client
|
|
.client()
|
|
.post(format!(
|
|
"{}/agent_workers/create_agent_token",
|
|
client.baseurl()
|
|
))
|
|
.json(&json!({
|
|
"worker_group": "lifecycle-test",
|
|
"tags": ["bun", "flow", "dependency"],
|
|
"exp": usize::MAX
|
|
}))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
resp.status().is_success(),
|
|
"create_agent_token should succeed, got: {}",
|
|
resp.status()
|
|
);
|
|
|
|
let token = resp.text().await?;
|
|
let token = token.trim_matches('"');
|
|
assert!(
|
|
token.starts_with("jwt_agent_"),
|
|
"token should start with jwt_agent_ prefix, got: {token}"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_token_and_ping(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (client, port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
let resp = client
|
|
.client()
|
|
.post(format!(
|
|
"{}/agent_workers/create_agent_token",
|
|
client.baseurl()
|
|
))
|
|
.json(&json!({
|
|
"worker_group": "lifecycle-test",
|
|
"tags": ["bun", "flow", "dependency"],
|
|
"exp": usize::MAX
|
|
}))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(resp.status().is_success());
|
|
let token = resp.text().await?;
|
|
let token = token.trim_matches('"');
|
|
|
|
let suffix = windmill_common::utils::create_default_worker_suffix("lifecycle-test");
|
|
let base_url = format!("http://localhost:{port}");
|
|
let http_client =
|
|
windmill_common::agent_workers::build_agent_http_client(&suffix, &token, &base_url);
|
|
|
|
// Initial ping inserts the worker record into the database
|
|
let resp = http_client
|
|
.client
|
|
.post(format!("{}/api/agent_workers/update_ping", base_url))
|
|
.json(&json!({
|
|
"worker_instance": "test-instance",
|
|
"ip": "127.0.0.1",
|
|
"tags": ["bun"],
|
|
"version": "test",
|
|
"vcpus": 4,
|
|
"memory": 8192,
|
|
"ping_type": "Initial"
|
|
}))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
resp.status().is_success(),
|
|
"initial ping should succeed, got: {}",
|
|
resp.status()
|
|
);
|
|
|
|
// Verify the ping was recorded in the database
|
|
let worker_count = sqlx::query_scalar::<_, i64>(
|
|
"SELECT COUNT(*) FROM worker_ping WHERE worker_instance = 'test-instance'",
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
|
|
assert!(
|
|
worker_count > 0,
|
|
"worker ping should be recorded in database"
|
|
);
|
|
|
|
// MainLoop ping updates the existing record
|
|
let resp = http_client
|
|
.client
|
|
.post(format!("{}/api/agent_workers/update_ping", base_url))
|
|
.json(&json!({
|
|
"tags": ["bun"],
|
|
"vcpus": 4,
|
|
"memory": 8192,
|
|
"jobs_executed": 0,
|
|
"ping_type": "MainLoop"
|
|
}))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
resp.status().is_success(),
|
|
"main loop ping should succeed, got: {}",
|
|
resp.status()
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_multiple_jobs_sequential(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (_client, port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
for i in 0..3 {
|
|
let result = RunJob::from(JobPayload::Code(bun_code(&format!(
|
|
"export function main() {{ return {i}; }}"
|
|
))))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
assert!(result.success, "job {i} should succeed");
|
|
assert_eq!(result.json_result(), Some(json!(i)));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test the volume HTTP proxy endpoints that agent workers use.
|
|
///
|
|
/// Exercises the full volume lifecycle via HTTP:
|
|
/// 1. Configure workspace S3 storage (FilesystemStorage)
|
|
/// 2. Pre-populate a volume with a file
|
|
/// 3. POST /begin — acquire lease, get manifest
|
|
/// 4. GET /file/* — download existing file
|
|
/// 5. PUT /file/* — upload a new file
|
|
/// 6. POST /commit — finalize with stats, release lease
|
|
/// 7. Verify DB state and storage
|
|
#[cfg(feature = "parquet")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_volume_e2e(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (client, _port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
// 1. Set up filesystem-based object storage in a temp dir
|
|
let storage_dir = tempfile::tempdir()?;
|
|
let storage_root = storage_dir.path().to_string_lossy().to_string();
|
|
|
|
let lfs_config = json!({
|
|
"type": "FilesystemStorage",
|
|
"root_path": storage_root,
|
|
"public_resource": null,
|
|
"advanced_permissions": null
|
|
});
|
|
|
|
sqlx::query!(
|
|
"UPDATE workspace_settings SET large_file_storage = $1 WHERE workspace_id = $2",
|
|
lfs_config,
|
|
"test-workspace"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
// 2. Pre-populate the volume with a file
|
|
let vol_dir = storage_dir.path().join("volumes").join("test-vol");
|
|
std::fs::create_dir_all(&vol_dir)?;
|
|
std::fs::write(vol_dir.join("hello.txt"), b"hello from volume")?;
|
|
|
|
let base = client.baseurl();
|
|
let http = client.client();
|
|
let vol_base = format!("{base}/w/test-workspace/volumes/test-vol");
|
|
|
|
// 3. POST /begin — acquire lease, get manifest + permissions
|
|
let resp = http
|
|
.post(format!("{vol_base}/begin"))
|
|
.json(&json!({
|
|
"worker_name": "test-worker-1",
|
|
"permissioned_as": "u/test-user"
|
|
}))
|
|
.send()
|
|
.await?;
|
|
assert!(
|
|
resp.status().is_success(),
|
|
"begin should succeed, got: {}",
|
|
resp.status()
|
|
);
|
|
|
|
let begin_body: serde_json::Value = resp.json().await?;
|
|
assert!(
|
|
begin_body["writable"].as_bool().unwrap(),
|
|
"should be writable"
|
|
);
|
|
let manifest = begin_body["manifest"].as_object().unwrap();
|
|
assert!(
|
|
manifest.contains_key("hello.txt"),
|
|
"manifest should contain hello.txt, got: {manifest:?}"
|
|
);
|
|
|
|
// 4. GET /file/* — download the existing file
|
|
let resp = http
|
|
.get(format!("{vol_base}/file/hello.txt"))
|
|
.send()
|
|
.await?;
|
|
assert!(
|
|
resp.status().is_success(),
|
|
"file download should succeed, got: {}",
|
|
resp.status()
|
|
);
|
|
let file_bytes = resp.bytes().await?;
|
|
assert_eq!(
|
|
file_bytes.as_ref(),
|
|
b"hello from volume",
|
|
"downloaded file content should match"
|
|
);
|
|
|
|
// 5. PUT /file/* — upload a new file
|
|
let resp = http
|
|
.put(format!("{vol_base}/file/output.txt"))
|
|
.body(b"written by agent worker".to_vec())
|
|
.send()
|
|
.await?;
|
|
assert!(
|
|
resp.status().is_success(),
|
|
"file upload should succeed, got: {}",
|
|
resp.status()
|
|
);
|
|
|
|
// 6. POST /commit — finalize: report stats, release lease
|
|
let resp = http
|
|
.post(format!("{vol_base}/commit"))
|
|
.json(&json!({
|
|
"worker_name": "test-worker-1",
|
|
"deleted_keys": [],
|
|
"symlinks": {},
|
|
"file_count": 2,
|
|
"size_bytes": 39
|
|
}))
|
|
.send()
|
|
.await?;
|
|
assert!(
|
|
resp.status().is_success(),
|
|
"commit should succeed, got: {}",
|
|
resp.status()
|
|
);
|
|
|
|
// 7. Verify volume DB row was updated
|
|
let vol_row = sqlx::query!(
|
|
"SELECT size_bytes, file_count, leased_by, lease_until
|
|
FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"test-vol"
|
|
)
|
|
.fetch_optional(&db)
|
|
.await?;
|
|
|
|
let vol_row = vol_row.expect("volume row should exist");
|
|
assert_eq!(vol_row.file_count, 2, "file_count should be 2");
|
|
assert_eq!(vol_row.size_bytes, 39, "size_bytes should match");
|
|
assert!(vol_row.leased_by.is_none(), "lease should be released");
|
|
assert!(
|
|
vol_row.lease_until.is_none() || vol_row.lease_until.unwrap() < chrono::Utc::now(),
|
|
"lease_until should be cleared or in the past"
|
|
);
|
|
|
|
// 8. Verify the uploaded file was persisted in storage
|
|
let output_path = vol_dir.join("output.txt");
|
|
assert!(output_path.exists(), "output.txt should be in storage");
|
|
let output_content = std::fs::read_to_string(&output_path)?;
|
|
assert_eq!(output_content, "written by agent worker");
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Full E2E test: agent worker in HTTP mode runs a Bun script with a volume mount.
|
|
///
|
|
/// The worker pulls the job via HTTP, downloads volume files via the server-side
|
|
/// volume proxy endpoints, executes the script, and syncs changes back.
|
|
#[cfg(all(feature = "parquet", feature = "enterprise"))]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_volume_http_worker_e2e(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (_client, port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
// 1. Set up filesystem-based object storage in a temp dir
|
|
let storage_dir = tempfile::tempdir()?;
|
|
let storage_root = storage_dir.path().to_string_lossy().to_string();
|
|
|
|
let lfs_config = json!({
|
|
"type": "FilesystemStorage",
|
|
"root_path": storage_root,
|
|
"public_resource": null,
|
|
"advanced_permissions": null
|
|
});
|
|
|
|
sqlx::query!(
|
|
"UPDATE workspace_settings SET large_file_storage = $1 WHERE workspace_id = $2",
|
|
lfs_config,
|
|
"test-workspace"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
// 2. Pre-populate the volume with a file
|
|
let vol_dir = storage_dir.path().join("volumes").join("test-vol");
|
|
std::fs::create_dir_all(&vol_dir)?;
|
|
std::fs::write(vol_dir.join("hello.txt"), b"hello from volume")?;
|
|
|
|
// 3. Push the job, then run worker with HTTP connection (bun tag)
|
|
let code = r#"// volume: test-vol /tmp/data
|
|
import { readFileSync, writeFileSync, existsSync } from "fs";
|
|
|
|
export function main() {
|
|
const content = readFileSync("/tmp/data/hello.txt", "utf-8");
|
|
writeFileSync("/tmp/data/output.txt", "written by agent worker");
|
|
return {
|
|
read_content: content,
|
|
output_exists: existsSync("/tmp/data/output.txt"),
|
|
};
|
|
}"#;
|
|
|
|
let uuid = RunJob::from(JobPayload::Code(bun_code(code)))
|
|
.push(&db)
|
|
.await;
|
|
let listener = listen_for_completed_jobs(&db).await;
|
|
|
|
let conn = testing_http_connection_with_tags(
|
|
port,
|
|
vec!["bun".into(), "flow".into(), "dependency".into()],
|
|
)
|
|
.await;
|
|
|
|
in_test_worker(conn, listener.find(&uuid), port).await;
|
|
|
|
let result = completed_job(uuid, &db).await;
|
|
|
|
assert!(result.success, "job should succeed: {:?}", result.result);
|
|
let json = result.json_result().expect("should have JSON result");
|
|
assert_eq!(json["read_content"], json!("hello from volume"));
|
|
assert_eq!(json["output_exists"], json!(true));
|
|
|
|
// 4. Verify volume DB row was updated
|
|
let vol_row = sqlx::query!(
|
|
"SELECT size_bytes, file_count, leased_by, lease_until
|
|
FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"test-vol"
|
|
)
|
|
.fetch_optional(&db)
|
|
.await?;
|
|
|
|
let vol_row = vol_row.expect("volume row should exist");
|
|
assert!(
|
|
vol_row.file_count >= 2,
|
|
"should have at least 2 files (hello.txt + output.txt), got: {}",
|
|
vol_row.file_count
|
|
);
|
|
assert!(vol_row.size_bytes > 0, "size_bytes should be > 0");
|
|
assert!(vol_row.leased_by.is_none(), "lease should be released");
|
|
assert!(
|
|
vol_row.lease_until.is_none() || vol_row.lease_until.unwrap() < chrono::Utc::now(),
|
|
"lease_until should be cleared or in the past"
|
|
);
|
|
|
|
// 5. Verify the new file was written back to the storage
|
|
let output_path = vol_dir.join("output.txt");
|
|
assert!(
|
|
output_path.exists(),
|
|
"output.txt should be synced back to storage"
|
|
);
|
|
let output_content = std::fs::read_to_string(&output_path)?;
|
|
assert_eq!(output_content, "written by agent worker");
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test the volume release endpoint (error/cancel path).
|
|
#[cfg(feature = "parquet")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_agent_worker_volume_release(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
let (client, _port, _server) = init_client_agent_mode(db.clone()).await;
|
|
|
|
// Set up filesystem storage
|
|
let storage_dir = tempfile::tempdir()?;
|
|
let storage_root = storage_dir.path().to_string_lossy().to_string();
|
|
let lfs_config = json!({
|
|
"type": "FilesystemStorage",
|
|
"root_path": storage_root,
|
|
"public_resource": null,
|
|
"advanced_permissions": null
|
|
});
|
|
sqlx::query!(
|
|
"UPDATE workspace_settings SET large_file_storage = $1 WHERE workspace_id = $2",
|
|
lfs_config,
|
|
"test-workspace"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let base = client.baseurl();
|
|
let http = client.client();
|
|
let vol_base = format!("{base}/w/test-workspace/volumes/test-vol");
|
|
|
|
// Begin (acquire lease)
|
|
let resp = http
|
|
.post(format!("{vol_base}/begin"))
|
|
.json(&json!({
|
|
"worker_name": "test-worker-2",
|
|
"permissioned_as": "u/test-user"
|
|
}))
|
|
.send()
|
|
.await?;
|
|
assert!(resp.status().is_success(), "begin should succeed");
|
|
|
|
// Verify lease is held
|
|
let leased = sqlx::query_scalar!(
|
|
"SELECT leased_by FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"test-vol"
|
|
)
|
|
.fetch_optional(&db)
|
|
.await?
|
|
.flatten();
|
|
assert_eq!(leased.as_deref(), Some("test-worker-2"));
|
|
|
|
// Release without commit (simulating error path)
|
|
let resp = http
|
|
.post(format!("{vol_base}/release"))
|
|
.json(&json!({ "worker_name": "test-worker-2" }))
|
|
.send()
|
|
.await?;
|
|
assert!(resp.status().is_success(), "release should succeed");
|
|
|
|
// Verify lease is cleared
|
|
let leased = sqlx::query_scalar!(
|
|
"SELECT leased_by FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"test-vol"
|
|
)
|
|
.fetch_optional(&db)
|
|
.await?
|
|
.flatten();
|
|
assert!(leased.is_none(), "lease should be released");
|
|
|
|
Ok(())
|
|
}
|