mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-07 00:01:49 +00:00
* 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>
473 lines
15 KiB
Rust
473 lines
15 KiB
Rust
/*
|
|
* Author: Ruben Fiszel
|
|
* Copyright: Windmill Labs, Inc 2022
|
|
* This file and its contents are licensed under the AGPLv3 License.
|
|
* Please see the included NOTICE for copyright information and
|
|
* LICENSE-AGPL for a copy of the license.
|
|
*/
|
|
|
|
pub use windmill_types::scripts::*;
|
|
|
|
use crate::{
|
|
error::{to_anyhow, Error},
|
|
runnable_settings::{self},
|
|
utils::http_get_from_hub,
|
|
workspace_dependencies::WorkspaceDependenciesAnnotatedRefs,
|
|
DB, DEFAULT_HUB_BASE_URL, HUB_BASE_URL, PRIVATE_HUB_MIN_VERSION,
|
|
};
|
|
|
|
use crate::worker::HUB_CACHE_DIR;
|
|
use anyhow::Context;
|
|
use backon::ConstantBuilder;
|
|
use backon::{BackoffBuilder, Retryable};
|
|
use regex::Regex;
|
|
|
|
use crate::utils::StripPath;
|
|
|
|
pub fn extract_workspace_dependencies_annotated_refs(
|
|
lang: &ScriptLang,
|
|
code: &str,
|
|
runnable_path: &str,
|
|
) -> Option<WorkspaceDependenciesAnnotatedRefs<String>> {
|
|
use ScriptLang::*;
|
|
lazy_static::lazy_static! {
|
|
static ref RE_PYTHON: Regex = Regex::new(r"^\#\s?(\S+)\s*$").unwrap();
|
|
}
|
|
match lang {
|
|
// TODO: Maybe use regex
|
|
Bun | Bunnative | Nativets => WorkspaceDependenciesAnnotatedRefs::parse(
|
|
"//",
|
|
"package_json",
|
|
code,
|
|
None,
|
|
runnable_path,
|
|
),
|
|
Python3 => WorkspaceDependenciesAnnotatedRefs::parse(
|
|
"#",
|
|
"requirements",
|
|
code,
|
|
Some(&RE_PYTHON),
|
|
runnable_path,
|
|
),
|
|
Go => WorkspaceDependenciesAnnotatedRefs::parse("//", "go_mod", code, None, runnable_path),
|
|
Php => WorkspaceDependenciesAnnotatedRefs::parse(
|
|
"//",
|
|
"composer_json",
|
|
code,
|
|
None,
|
|
runnable_path,
|
|
),
|
|
Powershell => WorkspaceDependenciesAnnotatedRefs::parse(
|
|
"#",
|
|
"modules_json",
|
|
code,
|
|
None,
|
|
runnable_path,
|
|
),
|
|
_ => return None,
|
|
}
|
|
}
|
|
|
|
pub async fn prefetch_cached_script(
|
|
script: Script<ScriptRunnableSettingsHandle>,
|
|
db: &DB,
|
|
) -> crate::error::Result<Script<ScriptRunnableSettingsInline>> {
|
|
let rs = runnable_settings::from_handle(script.runnable_settings.runnable_settings_handle, db)
|
|
.await?;
|
|
let (debouncing_settings, concurrency_settings) =
|
|
runnable_settings::prefetch_cached(&rs, db).await?;
|
|
|
|
Ok(Script {
|
|
workspace_id: script.workspace_id,
|
|
hash: script.hash,
|
|
path: script.path,
|
|
parent_hashes: script.parent_hashes,
|
|
summary: script.summary,
|
|
description: script.description,
|
|
content: script.content,
|
|
created_by: script.created_by,
|
|
created_at: script.created_at,
|
|
archived: script.archived,
|
|
schema: script.schema,
|
|
deleted: script.deleted,
|
|
is_template: script.is_template,
|
|
extra_perms: script.extra_perms,
|
|
lock: script.lock,
|
|
lock_error_logs: script.lock_error_logs,
|
|
language: script.language,
|
|
kind: script.kind,
|
|
tag: script.tag,
|
|
draft_only: script.draft_only,
|
|
envs: script.envs,
|
|
dedicated_worker: script.dedicated_worker,
|
|
ws_error_handler_muted: script.ws_error_handler_muted,
|
|
priority: script.priority,
|
|
cache_ttl: script.cache_ttl,
|
|
cache_ignore_s3_path: script.cache_ignore_s3_path,
|
|
timeout: script.timeout,
|
|
delete_after_use: script.delete_after_use,
|
|
restart_unless_cancelled: script.restart_unless_cancelled,
|
|
visible_to_runner_only: script.visible_to_runner_only,
|
|
auto_kind: script.auto_kind,
|
|
codebase: script.codebase,
|
|
has_preprocessor: script.has_preprocessor,
|
|
on_behalf_of_email: script.on_behalf_of_email,
|
|
assets: script.assets,
|
|
modules: script.modules,
|
|
runnable_settings: ScriptRunnableSettingsInline {
|
|
concurrency_settings: concurrency_settings.maybe_fallback(
|
|
script.runnable_settings.concurrency_key,
|
|
script.runnable_settings.concurrent_limit,
|
|
script.runnable_settings.concurrency_time_window_s,
|
|
),
|
|
debouncing_settings: debouncing_settings.maybe_fallback(
|
|
script.runnable_settings.debounce_key,
|
|
script.runnable_settings.debounce_delay_s,
|
|
),
|
|
},
|
|
})
|
|
}
|
|
|
|
pub async fn prefetch_cached_script_with_starred(
|
|
sws: ScriptWithStarred<ScriptRunnableSettingsHandle>,
|
|
db: &DB,
|
|
) -> crate::error::Result<ScriptWithStarred<ScriptRunnableSettingsInline>> {
|
|
Ok(ScriptWithStarred {
|
|
script: prefetch_cached_script(sws.script, db).await?,
|
|
starred: sws.starred,
|
|
})
|
|
}
|
|
|
|
pub async fn get_hub_script_by_path(
|
|
path: StripPath,
|
|
http_client: &reqwest::Client,
|
|
db: &DB,
|
|
) -> crate::error::Result<String> {
|
|
let path = path
|
|
.to_path()
|
|
.strip_prefix("hub/")
|
|
.ok_or_else(|| Error::BadRequest("Impossible to remove prefix hex".to_string()))?;
|
|
|
|
let hub_base_url = HUB_BASE_URL.read().await.clone();
|
|
|
|
//
|
|
let result = http_get_from_hub(
|
|
http_client,
|
|
&format!("{}/raw/{}.ts", hub_base_url, path),
|
|
true,
|
|
None,
|
|
Some(db),
|
|
)
|
|
.await?
|
|
.error_for_status()
|
|
.map_err(to_anyhow)?
|
|
.text()
|
|
.await
|
|
.map_err(to_anyhow);
|
|
|
|
match result {
|
|
Ok(result) => Ok(result),
|
|
Err(e) => {
|
|
if hub_base_url != DEFAULT_HUB_BASE_URL
|
|
&& path
|
|
.split("/")
|
|
.next()
|
|
.is_some_and(|x| x.parse::<i32>().is_ok_and(|x| x < PRIVATE_HUB_MIN_VERSION))
|
|
{
|
|
tracing::info!(
|
|
"Not found on private hub, fallback to default hub for {}",
|
|
path
|
|
);
|
|
let content = http_get_from_hub(
|
|
http_client,
|
|
&format!("{}/raw/{}.ts", DEFAULT_HUB_BASE_URL, path),
|
|
true,
|
|
None,
|
|
Some(db),
|
|
)
|
|
.await?
|
|
.error_for_status()
|
|
.map_err(to_anyhow)?
|
|
.text()
|
|
.await
|
|
.map_err(to_anyhow)?;
|
|
|
|
Ok(content)
|
|
} else {
|
|
Err(e)?
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
pub async fn get_full_hub_script_by_path(
|
|
path: StripPath,
|
|
http_client: &reqwest::Client,
|
|
db: Option<&DB>,
|
|
) -> crate::error::Result<HubScript> {
|
|
let path = path
|
|
.to_path()
|
|
.strip_prefix("hub/")
|
|
.ok_or_else(|| Error::BadRequest("Impossible to remove prefix hex".to_string()))?;
|
|
|
|
let mut path_iterator = path.split("/");
|
|
let version = path_iterator
|
|
.next()
|
|
.ok_or_else(|| Error::internal_err(format!("expected hub path to have version number")))?;
|
|
let cache_path = format!("{}/{version}", *HUB_CACHE_DIR);
|
|
let script;
|
|
if tokio::fs::metadata(&cache_path).await.is_err() {
|
|
script = get_full_hub_script_by_path_inner(path, http_client, db).await?;
|
|
if let Err(e) = crate::worker::write_file(
|
|
&HUB_CACHE_DIR,
|
|
&version,
|
|
&serde_json::to_string(&script).map_err(to_anyhow)?,
|
|
) {
|
|
tracing::error!("failed to write hub script {path} to cache: {e}");
|
|
} else {
|
|
tracing::info!("wrote hub script {path} to cache");
|
|
}
|
|
} else {
|
|
let cache_content = tokio::fs::read_to_string(cache_path).await?;
|
|
script = serde_json::from_str(&cache_content).unwrap();
|
|
tracing::info!("read hub script {path} from cache");
|
|
}
|
|
Ok(script)
|
|
}
|
|
|
|
async fn get_full_hub_script_by_path_inner(
|
|
path: &str,
|
|
http_client: &reqwest::Client,
|
|
db: Option<&DB>,
|
|
) -> crate::error::Result<HubScript> {
|
|
let hub_base_url = HUB_BASE_URL.read().await.clone();
|
|
|
|
let response = (|| async {
|
|
let response = http_get_from_hub(
|
|
http_client,
|
|
&format!("{}/raw2/{}", hub_base_url, path),
|
|
true,
|
|
None,
|
|
db,
|
|
)
|
|
.await
|
|
.and_then(|r| r.error_for_status().map_err(|e| to_anyhow(e).into()));
|
|
|
|
match response {
|
|
Ok(response) => Ok(response),
|
|
Err(e) => {
|
|
if hub_base_url != DEFAULT_HUB_BASE_URL
|
|
&& path.split("/").next().is_some_and(|x| {
|
|
x.parse::<i32>().is_ok_and(|x| x < PRIVATE_HUB_MIN_VERSION)
|
|
})
|
|
{
|
|
// TODO: should only fallback to default hub if status is 404 (hub returns 500 currently)
|
|
tracing::info!(
|
|
"Not found on private hub, fallback to default hub for {}",
|
|
path
|
|
);
|
|
http_get_from_hub(
|
|
http_client,
|
|
&format!("{}/raw2/{}", DEFAULT_HUB_BASE_URL, path),
|
|
true,
|
|
None,
|
|
db,
|
|
)
|
|
.await?
|
|
.error_for_status()
|
|
.map_err(|e| to_anyhow(e).into())
|
|
} else {
|
|
Err(e)
|
|
}
|
|
}
|
|
}
|
|
})
|
|
.retry(
|
|
ConstantBuilder::default()
|
|
.with_delay(std::time::Duration::from_secs(5))
|
|
.with_max_times(2)
|
|
.build(),
|
|
)
|
|
.notify(|err, dur| {
|
|
tracing::warn!(
|
|
"Could not get hub script at path {path}, retrying in {dur:#?}, err: {err:#?}"
|
|
);
|
|
})
|
|
.sleep(tokio::time::sleep)
|
|
.await?;
|
|
|
|
let script = response
|
|
.json::<HubScript>()
|
|
.await
|
|
.context(format!("Decoding hub response for script at path {path}"))?;
|
|
|
|
Ok(script)
|
|
}
|
|
|
|
pub async fn fetch_script_for_update<'a>(
|
|
path: &str,
|
|
w_id: &str,
|
|
e: impl sqlx::Executor<'a, Database = sqlx::Postgres>,
|
|
) -> crate::error::Result<Option<Script<ScriptRunnableSettingsHandle>>> {
|
|
sqlx::query_as::<_, Script<ScriptRunnableSettingsHandle>>(
|
|
"SELECT
|
|
workspace_id,
|
|
hash,
|
|
path,
|
|
parent_hashes,
|
|
summary,
|
|
description,
|
|
content,
|
|
created_by,
|
|
created_at,
|
|
archived,
|
|
schema,
|
|
deleted,
|
|
is_template,
|
|
extra_perms,
|
|
lock,
|
|
lock_error_logs,
|
|
language,
|
|
kind,
|
|
tag,
|
|
draft_only,
|
|
envs,
|
|
concurrency_key,
|
|
concurrent_limit,
|
|
concurrency_time_window_s,
|
|
debounce_key,
|
|
debounce_delay_s,
|
|
dedicated_worker,
|
|
runnable_settings_handle,
|
|
ws_error_handler_muted,
|
|
priority,
|
|
cache_ttl,
|
|
cache_ignore_s3_path,
|
|
timeout,
|
|
delete_after_use,
|
|
restart_unless_cancelled,
|
|
visible_to_runner_only,
|
|
auto_kind,
|
|
codebase,
|
|
has_preprocessor,
|
|
on_behalf_of_email,
|
|
assets,
|
|
modules
|
|
FROM script WHERE path = $1 AND workspace_id = $2 AND archived = false ORDER BY created_at DESC LIMIT 1 FOR UPDATE",
|
|
)
|
|
.bind(path)
|
|
.bind(w_id)
|
|
.fetch_optional(e)
|
|
.await
|
|
.map_err(crate::error::Error::from)
|
|
}
|
|
|
|
pub struct ClonedScript {
|
|
pub old_script: NewScript,
|
|
pub new_hash: i64,
|
|
}
|
|
// TODO: What if dependency job fails, there is script with NULL in the lock
|
|
pub async fn clone_script<'c>(
|
|
path: &str,
|
|
w_id: &str,
|
|
deployment_message: Option<String>,
|
|
db: &DB,
|
|
) -> crate::error::Result<ClonedScript> {
|
|
let mut tx = db.begin().await?;
|
|
let s = if let Some(s) = fetch_script_for_update(path, w_id, &mut *tx).await? {
|
|
s
|
|
} else {
|
|
return Err(crate::error::Error::NotFound(format!(
|
|
"Non-archived script with path '{}' not found",
|
|
path
|
|
)));
|
|
};
|
|
|
|
let rs =
|
|
runnable_settings::from_handle(s.runnable_settings.runnable_settings_handle, db).await?;
|
|
let (debouncing_settings, concurrency_settings) =
|
|
runnable_settings::prefetch_cached(&rs, db).await?;
|
|
|
|
let ns = NewScript {
|
|
path: s.path.clone(),
|
|
parent_hash: Some(s.hash),
|
|
summary: s.summary,
|
|
description: s.description,
|
|
content: s.content,
|
|
schema: s.schema,
|
|
is_template: s.is_template,
|
|
lock: None,
|
|
language: s.language,
|
|
kind: Some(s.kind),
|
|
tag: s.tag,
|
|
draft_only: s.draft_only,
|
|
envs: s.envs,
|
|
concurrency_settings: concurrency_settings.maybe_fallback(
|
|
s.runnable_settings.concurrency_key,
|
|
s.runnable_settings.concurrent_limit,
|
|
s.runnable_settings.concurrency_time_window_s,
|
|
),
|
|
debouncing_settings: debouncing_settings.maybe_fallback(
|
|
s.runnable_settings.debounce_key,
|
|
s.runnable_settings.debounce_delay_s,
|
|
),
|
|
cache_ttl: s.cache_ttl,
|
|
cache_ignore_s3_path: s.cache_ignore_s3_path,
|
|
dedicated_worker: s.dedicated_worker,
|
|
ws_error_handler_muted: s.ws_error_handler_muted,
|
|
priority: s.priority,
|
|
timeout: s.timeout,
|
|
delete_after_use: s.delete_after_use,
|
|
restart_unless_cancelled: s.restart_unless_cancelled,
|
|
deployment_message,
|
|
visible_to_runner_only: s.visible_to_runner_only,
|
|
auto_kind: s.auto_kind,
|
|
codebase: s.codebase,
|
|
has_preprocessor: s.has_preprocessor,
|
|
on_behalf_of_email: s.on_behalf_of_email,
|
|
preserve_on_behalf_of: None,
|
|
assets: s.assets,
|
|
modules: s.modules,
|
|
};
|
|
|
|
let new_hash = hash_script(&ns);
|
|
|
|
tracing::debug!(
|
|
"cloning script at path {} from '{}' to '{}'",
|
|
s.path,
|
|
*s.hash,
|
|
new_hash
|
|
);
|
|
|
|
sqlx::query!("
|
|
INSERT INTO script
|
|
(workspace_id, hash, path, parent_hashes, summary, description, content, \
|
|
created_by, schema, is_template, extra_perms, lock, language, kind, tag, \
|
|
draft_only, envs, concurrent_limit, concurrency_time_window_s, cache_ttl, cache_ignore_s3_path, \
|
|
dedicated_worker, ws_error_handler_muted, priority, restart_unless_cancelled, \
|
|
delete_after_use, timeout, concurrency_key, visible_to_runner_only, auto_kind, \
|
|
codebase, has_preprocessor, on_behalf_of_email, schema_validation, assets, debounce_key, debounce_delay_s, runnable_settings_handle, modules)
|
|
|
|
SELECT workspace_id, $1, path, array_prepend($2::bigint, COALESCE(parent_hashes, '{}'::bigint[])), summary, description, \
|
|
content, created_by, schema, is_template, extra_perms, NULL, language, kind, tag, \
|
|
draft_only, envs, concurrent_limit, concurrency_time_window_s, cache_ttl, cache_ignore_s3_path, \
|
|
dedicated_worker, ws_error_handler_muted, priority, restart_unless_cancelled, \
|
|
delete_after_use, timeout, concurrency_key, visible_to_runner_only, auto_kind, \
|
|
codebase, has_preprocessor, on_behalf_of_email, schema_validation, assets, debounce_key, debounce_delay_s, runnable_settings_handle, modules
|
|
|
|
FROM script WHERE hash = $2 AND workspace_id = $3;
|
|
", new_hash, s.hash.0, w_id).execute(&mut *tx).await?;
|
|
|
|
// Archive base.
|
|
sqlx::query!(
|
|
"UPDATE script SET archived = true WHERE hash = $1 AND workspace_id = $2",
|
|
*s.hash,
|
|
w_id
|
|
)
|
|
.execute(&mut *tx)
|
|
.await?;
|
|
|
|
tx.commit().await?;
|
|
Ok(ClonedScript { old_script: ns, new_hash })
|
|
}
|