mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-22 08:02:19 +00:00
c57c769dea
* feat: add CI test scripts with auto-trigger on deploy Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: fix annotation parser early return and handle renames correctly Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: move CI test results to top of script/flow detail pages Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: improve CI test results spacing, icon, and remove pass label Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: support one-line annotation and use script/path format Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: move CI test trigger logic to EE Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: move CI badge next to New badge and add deduplicated CI summary Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: add CI test e2e tests and fix nullable column annotations Add integration tests for CI test annotation parsing (creates/removes ci_test_reference rows) and the CI test results API (single + batch endpoints). Add backend test for auto-trigger on deploy (private+python). Fix sqlx LEFT JOIN LATERAL nullable column annotations in get_ci_test_results and get_ci_test_results_batch queries — sqlx cannot infer nullability from LATERAL subqueries, causing runtime decode errors when no matching job exists. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix build/sqlx * fix * feat: CI test improvements and templates - Fix windmill-dep-map/private feature propagation in worker, api-scripts, and api-flows Cargo.toml so CI test triggers actually fire in EE mode - Clone ci_test_reference rows during workspace fork - Add polling to CiTestResults component (refetch every 3s while running) - Add running state and auto-refresh to ForkWorkspaceBanner CI summary - Add yellow "CI test" badge on script list rows and detail page - Fix Library badge border color (remove indigo border override) - Add CI Test TypeScript and CI Test Python templates in ScriptBuilder - Update sqlx offline cache - Add debug tracing for CI test trigger in worker_lockfiles Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add missing children prop to WorkspaceDeployLayout Fixes svelte-fast-check type error when passing named snippets as children content inside the component tag. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address PR review feedback - Remove empty wrapper divs around CiTestResults, move mb-4 into component - Add batch endpoint size cap (max 200 items) - Add ON DELETE CASCADE to ci_test_reference workspace FK (new migration) - Downgrade CI test trigger logs from info to debug - Fix false-positive polling: only treat status='running' as running, not null status (CiTestResults, CompareWorkspaces, ForkWorkspaceBanner) - Fix test numbering in integration tests Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref to latest EE commit Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: update ee-repo-ref to d9d68c2406df0b59f413ea0b2cb24780a9817d04 This commit updates the EE repository reference after PR #516 was merged in windmill-ee-private. Previous ee-repo-ref: d7ccd9b86da99ec056a0e8708e3637d64290387a New ee-repo-ref: d9d68c2406df0b59f413ea0b2cb24780a9817d04 Automated by sync-ee-ref workflow. * fix: treat queued jobs (job_id set, null status) as running Jobs that have been pushed but not yet picked up by a worker have a job_id but null status. Treat these as 'running' to avoid showing misleading 'pass' badges or '0 passing'. Tests that were never triggered (no job_id, null status) remain neutral/hidden. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: hugocasa <hugo@casademont.ch> Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
2910 lines
99 KiB
Rust
2910 lines
99 KiB
Rust
use std::borrow::Cow;
|
|
use std::collections::HashMap;
|
|
use std::fs::{create_dir_all, remove_dir_all};
|
|
|
|
#[cfg(feature = "python")]
|
|
use crate::ansible_executor::{get_git_repos_lock, AnsibleDependencyLocks};
|
|
use async_recursion::async_recursion;
|
|
use itertools::Itertools;
|
|
use serde::Serialize;
|
|
use serde_json::value::RawValue;
|
|
use serde_json::{from_value, json, Value};
|
|
use sha2::Digest;
|
|
use sqlx::types::Json;
|
|
use uuid::Uuid;
|
|
use windmill_common::assets::{
|
|
clear_static_asset_usage, insert_static_asset_usage, AssetUsageKind,
|
|
};
|
|
use windmill_common::error::Error;
|
|
use windmill_common::error::Result;
|
|
use windmill_common::flows::{FlowModule, FlowModuleValue, FlowNodeId};
|
|
use windmill_common::min_version::MIN_VERSION_SUPPORTS_DEBOUNCING_V2;
|
|
use windmill_common::scripts::ScriptHash;
|
|
#[cfg(feature = "python")]
|
|
use windmill_common::worker::PythonAnnotations;
|
|
use windmill_common::worker::{to_raw_value, to_raw_value_owned, write_file, Connection};
|
|
use windmill_common::workspace_dependencies::{
|
|
RawWorkspaceDependencies, WorkspaceDependenciesPrefetched,
|
|
};
|
|
use windmill_dep_map::scoped_dependency_map::ScopedDependencyMap;
|
|
#[cfg(feature = "python")]
|
|
use windmill_parser_yaml::AnsibleRequirements;
|
|
|
|
use windmill_common::{
|
|
apps::AppScriptId,
|
|
cache::{self, RawData},
|
|
error::{self, to_anyhow},
|
|
flows::{add_virtual_items_if_necessary, FlowValue},
|
|
scripts::ScriptLang,
|
|
DB,
|
|
};
|
|
pub use windmill_dep_map::{
|
|
extract_referenced_paths, extract_relative_imports, process_relative_imports,
|
|
};
|
|
use windmill_git_sync::{handle_deployment_metadata, DeployedObject};
|
|
use windmill_queue::{
|
|
append_logs, CanceledBy, MiniPulledJob, WMDEBUG_FORCE_NO_LEGACY_DEBOUNCING_COMPAT,
|
|
};
|
|
|
|
// TODO: To be removed in future versions
|
|
lazy_static::lazy_static! {
|
|
static ref WMDEBUG_NO_HASH_CHANGE_ON_DJ: bool = std::env::var("WMDEBUG_NO_HASH_CHANGE_ON_DJ").is_ok();
|
|
static ref WMDEBUG_NO_NEW_FLOW_VERSION_ON_DJ: bool = std::env::var("WMDEBUG_NO_NEW_FLOW_VERSION_ON_DJ").is_ok();
|
|
static ref WMDEBUG_NO_NEW_APP_VERSION_ON_DJ: bool = std::env::var("WMDEBUG_NO_NEW_APP_VERSION_ON_DJ").is_ok();
|
|
static ref WMDEBUG_NO_COMPONENTS_TO_RELOCK: bool = std::env::var("WMDEBUG_NO_COMPONENTS_TO_RELOCK").is_ok();
|
|
static ref WMDEBUG_NO_RELOCK_SKIP_OPTIMIZATION: bool = std::env::var("WMDEBUG_NO_RELOCK_SKIP_OPTIMIZATION").is_ok();
|
|
}
|
|
|
|
use crate::common::{MaybeLock, OccupancyMetrics};
|
|
use crate::csharp_executor::generate_nuget_lockfile;
|
|
|
|
#[cfg(feature = "java")]
|
|
use crate::java_executor;
|
|
|
|
#[cfg(feature = "rlang")]
|
|
use crate::r_executor;
|
|
#[cfg(feature = "ruby")]
|
|
use crate::ruby_executor;
|
|
|
|
#[cfg(feature = "php")]
|
|
use crate::php_executor::{composer_install, parse_php_imports};
|
|
#[cfg(feature = "python")]
|
|
use crate::python_executor::{create_dependencies_dir, handle_python_reqs, uv_pip_compile};
|
|
#[cfg(feature = "rust")]
|
|
use crate::rust_executor::generate_cargo_lockfile;
|
|
use crate::{
|
|
bun_executor::gen_bun_lockfile, deno_executor::generate_deno_lock,
|
|
go_executor::install_go_dependencies,
|
|
};
|
|
|
|
#[tracing::instrument(level = "trace", skip_all)]
|
|
pub async fn handle_dependency_job(
|
|
job: &MiniPulledJob,
|
|
preview_data: Option<&RawData>,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &DB,
|
|
worker_name: &str,
|
|
worker_dir: &str,
|
|
base_internal_url: &str,
|
|
token: &str,
|
|
occupancy_metrics: &mut OccupancyMetrics,
|
|
raw_workspace_dependencies_o: Option<RawWorkspaceDependencies>,
|
|
) -> error::Result<Box<RawValue>> {
|
|
// Processing a dependency job - these jobs handle lockfile generation and dependency updates
|
|
// for scripts, flows, and apps when their dependencies or imported scripts change
|
|
tracing::debug!(
|
|
"Processing dependency job for path: {:?}",
|
|
job.runnable_path()
|
|
);
|
|
let script_path = job.runnable_path();
|
|
|
|
// `JobKind::Dependencies` job store either:
|
|
// - A saved script `hash` in the `script_hash` column.
|
|
// - Preview raw lock and code in the `queue` or `job` table.
|
|
let script_data = &match job.runnable_id {
|
|
Some(hash) => match cache::script::fetch(&Connection::from(db.clone()), hash).await {
|
|
Ok(d) => Cow::Owned(d.0),
|
|
Err(e) => {
|
|
let logs2 = sqlx::query_scalar!(
|
|
"SELECT logs FROM job_logs WHERE job_id = $1 AND workspace_id = $2",
|
|
&job.id,
|
|
&job.workspace_id
|
|
)
|
|
.fetch_optional(db)
|
|
.await?
|
|
.flatten()
|
|
.unwrap_or_else(|| "no logs".to_string());
|
|
sqlx::query!(
|
|
"UPDATE script SET lock_error_logs = $1 WHERE hash = $2 AND workspace_id = $3",
|
|
&format!("{logs2}\n{e}"),
|
|
&job.runnable_id.unwrap_or(ScriptHash(0)).0,
|
|
&job.workspace_id
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
return Err(Error::ExecutionErr(format!(
|
|
"Error creating schema validator: {e}"
|
|
)));
|
|
}
|
|
},
|
|
_ => match preview_data {
|
|
Some(RawData::Script(data)) => Cow::Borrowed(data),
|
|
_ => return Err(Error::internal_err("expected script hash")),
|
|
},
|
|
};
|
|
|
|
let triggered_by_relative_import = job
|
|
.args
|
|
.as_ref()
|
|
.map(|x| x.get("triggered_by_relative_import").is_some())
|
|
.unwrap_or_default();
|
|
|
|
// Extract temp_script_refs from job args (path -> hash mapping for temp storage)
|
|
let temp_script_refs: Option<HashMap<String, String>> = job
|
|
.args
|
|
.as_ref()
|
|
.and_then(|x| x.get("temp_script_refs"))
|
|
.and_then(|v| serde_json::from_str(v.get()).ok());
|
|
|
|
let content = capture_dependency_job(
|
|
&job.id,
|
|
job.script_lang.as_ref().map(|v| Ok(v)).unwrap_or_else(|| {
|
|
Err(Error::internal_err(
|
|
"Job Language required for dependency jobs".to_owned(),
|
|
))
|
|
})?,
|
|
&script_data.code,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
&job.workspace_id,
|
|
worker_dir,
|
|
base_internal_url,
|
|
token,
|
|
script_path,
|
|
occupancy_metrics,
|
|
&raw_workspace_dependencies_o,
|
|
None,
|
|
triggered_by_relative_import,
|
|
script_path,
|
|
None,
|
|
"script",
|
|
&temp_script_refs,
|
|
)
|
|
.await;
|
|
|
|
match content {
|
|
Ok(content) => {
|
|
if job.runnable_id.is_none() {
|
|
// it a one-off raw script dependency job, no need to update the db
|
|
return Ok(to_raw_value_owned(
|
|
json!({ "status": "Successful lock file generation", "lock": content }),
|
|
));
|
|
}
|
|
|
|
let current_hash = job.runnable_id.unwrap_or(ScriptHash(0));
|
|
let w_id = &job.workspace_id;
|
|
|
|
let (deployment_message, parent_path) =
|
|
get_deployment_msg_and_parent_path_from_args(job.args.clone());
|
|
|
|
// Generate lockfiles for module files (if any)
|
|
let updated_modules = if let Some(modules) = &script_data.modules {
|
|
let mut updated = modules.clone();
|
|
for (module_path, module) in updated.iter_mut() {
|
|
if module.content.is_empty() {
|
|
continue;
|
|
}
|
|
match capture_dependency_job(
|
|
&job.id,
|
|
&module.language,
|
|
&module.content,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
&job.workspace_id,
|
|
worker_dir,
|
|
base_internal_url,
|
|
token,
|
|
script_path,
|
|
occupancy_metrics,
|
|
&raw_workspace_dependencies_o,
|
|
module.lock.as_deref(),
|
|
triggered_by_relative_import,
|
|
script_path,
|
|
None,
|
|
"script",
|
|
&None,
|
|
)
|
|
.await
|
|
{
|
|
Ok(lock) => {
|
|
module.lock = Some(lock);
|
|
}
|
|
Err(e) => {
|
|
tracing::warn!(
|
|
"Failed to generate lockfile for module {module_path}: {e}"
|
|
);
|
|
}
|
|
}
|
|
}
|
|
Some(updated)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
// We do not create new row for this update
|
|
// That means we can keep current hash and just update lock
|
|
// Also store lockfile hash for dependency change detection
|
|
let lockfile_hash = windmill_common::scripts::hash_script(&content);
|
|
let updated_modules_json = updated_modules
|
|
.as_ref()
|
|
.and_then(|m| serde_json::to_value(m).ok());
|
|
sqlx::query!(
|
|
"WITH update_lock AS (
|
|
UPDATE script SET lock = $1, modules = COALESCE($6, modules) WHERE hash = $2 AND workspace_id = $3
|
|
)
|
|
INSERT INTO lock_hash (workspace_id, path, lockfile_hash)
|
|
VALUES ($3, $4, $5)
|
|
ON CONFLICT (workspace_id, path) DO UPDATE SET lockfile_hash = $5",
|
|
&content,
|
|
¤t_hash.0,
|
|
w_id,
|
|
script_path,
|
|
&lockfile_hash,
|
|
updated_modules_json
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
|
|
// `lock` has been updated; invalidate the cache.
|
|
// Since only worker that ran this Dependency Job has the cache
|
|
// we do not need to think about invalidating cache for other workers.
|
|
cache::script::invalidate(current_hash);
|
|
|
|
if let Err(e) = handle_deployment_metadata(
|
|
&job.permissioned_as_email,
|
|
&job.created_by,
|
|
&db,
|
|
&w_id,
|
|
DeployedObject::Script {
|
|
hash: current_hash,
|
|
path: script_path.to_string(),
|
|
parent_path: parent_path.clone(),
|
|
},
|
|
deployment_message.clone(),
|
|
false,
|
|
None,
|
|
)
|
|
.await
|
|
{
|
|
tracing::error!(%e, "error handling deployment metadata");
|
|
}
|
|
|
|
process_relative_imports(
|
|
db,
|
|
Some(job.id),
|
|
job.args.as_ref(),
|
|
&job.workspace_id,
|
|
script_path,
|
|
parent_path,
|
|
deployment_message,
|
|
&script_data.code,
|
|
&job.script_lang,
|
|
&job.permissioned_as_email,
|
|
&job.created_by,
|
|
&job.permissioned_as,
|
|
)
|
|
.await?;
|
|
|
|
// Trigger CI tests for items that reference this script
|
|
tracing::debug!(
|
|
"CI test trigger: checking for tests referencing script {}",
|
|
script_path
|
|
);
|
|
{
|
|
let db2 = db.clone();
|
|
let w_id2 = w_id.to_string();
|
|
let script_path2 = script_path.to_string();
|
|
let email2 = job.permissioned_as_email.clone();
|
|
let username2 = job.created_by.clone();
|
|
tokio::spawn(async move {
|
|
if let Err(e) = windmill_dep_map::ci_tests::trigger_ci_tests_for_item(
|
|
&db2,
|
|
&w_id2,
|
|
&script_path2,
|
|
"script",
|
|
&email2,
|
|
&username2,
|
|
)
|
|
.await
|
|
{
|
|
tracing::error!(%e, "error triggering CI tests after script lock generation");
|
|
}
|
|
});
|
|
}
|
|
|
|
Ok(to_raw_value_owned(
|
|
json!({ "status": "Successful lock file generation", "lock": content }),
|
|
))
|
|
}
|
|
Err(error) => {
|
|
let logs2 = sqlx::query_scalar!(
|
|
"SELECT logs FROM job_logs WHERE job_id = $1 AND workspace_id = $2",
|
|
&job.id,
|
|
&job.workspace_id
|
|
)
|
|
.fetch_optional(db)
|
|
.await?
|
|
.flatten()
|
|
.unwrap_or_else(|| "no logs".to_string());
|
|
sqlx::query!(
|
|
"UPDATE script SET lock_error_logs = $1 WHERE hash = $2 AND workspace_id = $3",
|
|
&format!("{logs2}\n{error}"),
|
|
&job.runnable_id.unwrap_or(ScriptHash(0)).0,
|
|
&job.workspace_id
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
Err(Error::ExecutionErr(format!(
|
|
"Error locking file: {error}\n\nlogs:\n{}",
|
|
remove_ansi_codes(&logs2)
|
|
)))?
|
|
}
|
|
}
|
|
}
|
|
fn remove_ansi_codes(s: &str) -> String {
|
|
lazy_static::lazy_static! {
|
|
static ref ANSI_REGEX: regex::Regex = regex::Regex::new(r"\x1b\[[0-9;]*[a-zA-Z]").unwrap();
|
|
}
|
|
ANSI_REGEX.replace_all(s, "").to_string()
|
|
}
|
|
|
|
pub async fn handle_flow_dependency_job(
|
|
job: MiniPulledJob,
|
|
preview_data: Option<&RawData>,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
worker_name: &str,
|
|
worker_dir: &str,
|
|
base_internal_url: &str,
|
|
token: &str,
|
|
occupancy_metrics: &mut OccupancyMetrics,
|
|
raw_workspace_dependencies_o: Option<RawWorkspaceDependencies>,
|
|
) -> error::Result<Box<serde_json::value::RawValue>> {
|
|
tracing::debug!("Processing flow dependency job");
|
|
tracing::trace!("Job details: {:?}", &job);
|
|
tracing::trace!("Preview data: {:?}", &preview_data);
|
|
let job_path = job.runnable_path.clone().ok_or_else(|| {
|
|
error::Error::internal_err(
|
|
"Cannot resolve flow dependencies for flow without path".to_string(),
|
|
)
|
|
})?;
|
|
|
|
let skip_flow_update = job
|
|
.args
|
|
.as_ref()
|
|
.map(|x| {
|
|
x.get("skip_flow_update")
|
|
.map(|v| serde_json::from_str::<bool>(v.get()).ok())
|
|
.flatten()
|
|
})
|
|
.flatten()
|
|
.unwrap_or(false);
|
|
|
|
let triggered_by_relative_import = job
|
|
.args
|
|
.as_ref()
|
|
.map(|x| x.get("triggered_by_relative_import").is_some())
|
|
.unwrap_or_default();
|
|
|
|
// Extract temp_script_refs from job args (path -> hash mapping for temp storage)
|
|
let temp_script_refs: Option<HashMap<String, String>> = job
|
|
.args
|
|
.as_ref()
|
|
.and_then(|x| x.get("temp_script_refs"))
|
|
.and_then(|v| serde_json::from_str(v.get()).ok());
|
|
|
|
let version = if skip_flow_update {
|
|
None
|
|
} else {
|
|
Some(
|
|
job.runnable_id
|
|
.clone()
|
|
.ok_or_else(|| {
|
|
Error::internal_err(
|
|
"Flow Dependency requires script hash (flow version)".to_owned(),
|
|
)
|
|
})?
|
|
.0,
|
|
)
|
|
};
|
|
|
|
tracing::trace!("Job details: {:?}", &job);
|
|
let (deployment_message, parent_path) =
|
|
get_deployment_msg_and_parent_path_from_args(job.args.clone());
|
|
|
|
let nodes_to_relock = job
|
|
.args
|
|
.as_ref()
|
|
.map(|x| {
|
|
x.get("nodes_to_relock")
|
|
.map(|v| serde_json::from_str::<Vec<String>>(v.get()).ok())
|
|
.flatten()
|
|
})
|
|
.flatten();
|
|
|
|
tracing::debug!("Nodes to relock: {:?}", &nodes_to_relock);
|
|
let raw_deps = job
|
|
.args
|
|
.as_ref()
|
|
.map(|x| {
|
|
x.get("raw_deps")
|
|
.map(|v| serde_json::from_str::<HashMap<String, String>>(v.get()).ok())
|
|
.flatten()
|
|
})
|
|
.flatten();
|
|
|
|
// `JobKind::FlowDependencies` job store either:
|
|
// - A saved flow version `id` in the `script_hash` column.
|
|
// - Preview raw flow in the `queue` or `job` table.
|
|
let (mut flow, mut extras) = match job.runnable_id {
|
|
Some(ScriptHash(id)) => {
|
|
let flow = cache::flow::fetch_version(db, id).await?;
|
|
(flow.value().clone(), flow.extras())
|
|
}
|
|
_ => match preview_data {
|
|
Some(RawData::Flow(data)) => (data.value().clone(), data.extras()),
|
|
_ => return Err(Error::internal_err("expected script hash")),
|
|
},
|
|
};
|
|
|
|
// When triggered by a relative import (e.g. a dependent script was updated),
|
|
// the version captured at job creation time may be stale if the flow was
|
|
// updated between job creation and execution. Re-query the latest version
|
|
// and read the current flow value from the flow table to avoid overwriting
|
|
// a newer flow definition with a stale one.
|
|
let version = if triggered_by_relative_import && !skip_flow_update {
|
|
let latest_version = sqlx::query_scalar!(
|
|
"SELECT id FROM flow_version WHERE path = $1 AND workspace_id = $2 ORDER BY created_at DESC LIMIT 1",
|
|
job_path,
|
|
job.workspace_id
|
|
)
|
|
.fetch_optional(db)
|
|
.await?;
|
|
|
|
if let Some(latest_version) = latest_version {
|
|
if version != Some(latest_version) {
|
|
tracing::info!(
|
|
"Flow version changed since dependency job was queued ({:?} -> {}), using latest",
|
|
version,
|
|
latest_version
|
|
);
|
|
}
|
|
// Read the current flow value from the flow table (not version cache).
|
|
// This ensures we have the latest committed state, including any locks
|
|
// computed by a concurrent FlowDependencies job from a direct flow update.
|
|
let raw_flow_value = sqlx::query_scalar!(
|
|
"SELECT value AS \"value!: Json<Box<RawValue>>\" FROM flow WHERE path = $1 AND workspace_id = $2",
|
|
job_path,
|
|
job.workspace_id
|
|
)
|
|
.fetch_one(db)
|
|
.await?;
|
|
|
|
let flow_data = cache::FlowData::from_raw(raw_flow_value.0)?;
|
|
flow = flow_data.value().clone();
|
|
extras = flow_data.extras();
|
|
|
|
Some(latest_version)
|
|
} else {
|
|
version
|
|
}
|
|
} else {
|
|
version
|
|
};
|
|
|
|
let mut tx = db.begin().await?;
|
|
|
|
let mut dependency_map = ScopedDependencyMap::fetch_maybe_rearranged(
|
|
&job.workspace_id,
|
|
&job_path,
|
|
"flow",
|
|
&parent_path,
|
|
&mut *tx,
|
|
)
|
|
.await?;
|
|
|
|
if !skip_flow_update {
|
|
sqlx::query!(
|
|
"DELETE FROM workspace_runnable_dependencies WHERE flow_path = $1 AND workspace_id = $2",
|
|
job_path,
|
|
job.workspace_id
|
|
)
|
|
.execute(&mut *tx)
|
|
.await?;
|
|
}
|
|
|
|
clear_static_asset_usage(&mut *tx, &job.workspace_id, &job_path, AssetUsageKind::Flow).await?;
|
|
|
|
let modified_ids;
|
|
let errors;
|
|
(flow, tx, modified_ids, errors) = lock_flow_value(
|
|
flow,
|
|
&job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
&job_path,
|
|
base_internal_url,
|
|
token,
|
|
&nodes_to_relock,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
&mut dependency_map,
|
|
&raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
&temp_script_refs,
|
|
)
|
|
.await?;
|
|
|
|
if !errors.is_empty() {
|
|
let error_message = errors
|
|
.iter()
|
|
.map(|e| format!("{}: {}", e.id, e.error))
|
|
.collect::<Vec<String>>()
|
|
.join("\n");
|
|
let logs2 = sqlx::query_scalar!(
|
|
"SELECT logs FROM job_logs WHERE job_id = $1 AND workspace_id = $2",
|
|
&job.id,
|
|
&job.workspace_id
|
|
)
|
|
.fetch_optional(db)
|
|
.await?
|
|
.flatten()
|
|
.unwrap_or_else(|| "no logs".to_string());
|
|
|
|
sqlx::query!(
|
|
"UPDATE flow SET lock_error_logs = $1 WHERE path = $2 AND workspace_id = $3",
|
|
&format!("{logs2}\n{error_message}"),
|
|
&job.runnable_path(),
|
|
&job.workspace_id
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
|
|
return Err(Error::ExecutionErr(format!(
|
|
"Error locking flow modules:\n{}\n\nlogs:\n{}",
|
|
error_message,
|
|
remove_ansi_codes(&logs2)
|
|
)));
|
|
} else {
|
|
sqlx::query!(
|
|
"UPDATE flow SET lock_error_logs = NULL WHERE path = $1 AND workspace_id = $2",
|
|
&job.runnable_path(),
|
|
&job.workspace_id
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize)]
|
|
struct FlowValueWithExtras<'a> {
|
|
#[serde(flatten)]
|
|
value: &'a FlowValue,
|
|
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
notes: Option<Box<RawValue>>,
|
|
|
|
#[serde(skip_serializing_if = "Option::is_none")]
|
|
groups: Option<Box<RawValue>>,
|
|
}
|
|
|
|
let new_flow_value = Json(
|
|
serde_json::value::to_raw_value(&FlowValueWithExtras {
|
|
value: &flow,
|
|
notes: extras.as_ref().and_then(|e| e.notes.clone()),
|
|
groups: extras.as_ref().and_then(|e| e.groups.clone()),
|
|
})
|
|
.map_err(to_anyhow)?,
|
|
);
|
|
|
|
// Re-check cancellation to ensure we don't accidentally override a flow.
|
|
if sqlx::query_scalar!(
|
|
"SELECT canceled_by IS NOT NULL AS \"canceled!\" FROM v2_job_queue WHERE id = $1",
|
|
job.id
|
|
)
|
|
.fetch_optional(db)
|
|
.await
|
|
.map(|v| Some(true) == v)
|
|
.unwrap_or_else(|err| {
|
|
tracing::error!(%job.id, %err, "error checking cancellation for job {0}: {err}", job.id);
|
|
false
|
|
}) {
|
|
// Drop tx and thus cancel any changes
|
|
return Ok(to_raw_value_owned(json!({
|
|
"status": "Flow lock generation was canceled",
|
|
})));
|
|
}
|
|
|
|
if !skip_flow_update {
|
|
let version = version.ok_or_else(|| {
|
|
Error::internal_err("Flow Dependency requires script hash (flow version)".to_owned())
|
|
})?;
|
|
|
|
tx = dependency_map.dissolve(tx).await;
|
|
|
|
// When triggered by a relative import, re-check that our version is still
|
|
// the latest before writing. Between reading the flow value and now (module
|
|
// locking can take significant time), another job may have created a newer
|
|
// version. If so, skip the update — the newer version's dep job will handle it.
|
|
if triggered_by_relative_import {
|
|
let current_latest = sqlx::query_scalar!(
|
|
"SELECT id FROM flow_version WHERE path = $1 AND workspace_id = $2 ORDER BY created_at DESC LIMIT 1",
|
|
job_path,
|
|
job.workspace_id
|
|
)
|
|
.fetch_optional(&mut *tx)
|
|
.await?;
|
|
|
|
if current_latest != Some(version) {
|
|
tracing::info!(
|
|
"Flow version changed during dependency locking ({} -> {:?}), skipping update to avoid overwriting newer version",
|
|
version,
|
|
current_latest
|
|
);
|
|
tx.commit().await?;
|
|
return Ok(to_raw_value_owned(json!({
|
|
"status": "Skipped: newer flow version exists",
|
|
"modified_ids": modified_ids,
|
|
})));
|
|
}
|
|
}
|
|
|
|
sqlx::query!(
|
|
"UPDATE flow SET value = $1 WHERE path = $2 AND workspace_id = $3",
|
|
&new_flow_value as &Json<Box<RawValue>>,
|
|
job_path,
|
|
job.workspace_id
|
|
)
|
|
.execute(&mut *tx)
|
|
.await?;
|
|
sqlx::query!(
|
|
"UPDATE flow_version SET value = $1 WHERE id = $2",
|
|
&new_flow_value as &Json<Box<RawValue>>,
|
|
version
|
|
)
|
|
.execute(&mut *tx)
|
|
.await?;
|
|
|
|
// Compute a lite version of the flow value (`RawScript` => `FlowScript`).
|
|
let mut value_lite = flow.clone();
|
|
|
|
tx = reduce_flow(
|
|
tx,
|
|
&mut value_lite.modules,
|
|
&job_path,
|
|
&job.workspace_id,
|
|
flow.failure_module.as_ref(),
|
|
flow.same_worker,
|
|
)
|
|
.await?;
|
|
|
|
let value_lite_with_extras = Json(
|
|
serde_json::value::to_raw_value(&FlowValueWithExtras {
|
|
value: &value_lite,
|
|
notes: extras.as_ref().and_then(|e| e.notes.clone()),
|
|
groups: extras.as_ref().and_then(|e| e.groups.clone()),
|
|
})
|
|
.map_err(to_anyhow)?,
|
|
);
|
|
sqlx::query!(
|
|
"INSERT INTO flow_version_lite (id, value) VALUES ($1, $2)
|
|
ON CONFLICT (id) DO UPDATE SET value = EXCLUDED.value",
|
|
version,
|
|
&value_lite_with_extras as &Json<Box<RawValue>>,
|
|
)
|
|
.execute(&mut *tx)
|
|
.await?;
|
|
|
|
// NOTE: Temporary solution.
|
|
// Ideally we do this for every job regardless whether it was triggered by relative import or by creation/update of the flow.
|
|
if triggered_by_relative_import {
|
|
// Making new version viewable as the current one.
|
|
// This will also trigger `flow_versions_append_trigger` (check _flow_versions_update_notify.up.sql)
|
|
// which will invalidate cache for the latest flow versions for all workers.
|
|
// Only append if this version isn't already the last element in the array.
|
|
// This prevents duplicates when update_flow already appended this version.
|
|
sqlx::query!("UPDATE flow SET versions = array_append(versions, $1) WHERE path = $2 AND workspace_id = $3 AND (versions[array_upper(versions, 1)] IS DISTINCT FROM $1)",
|
|
version,
|
|
&job_path,
|
|
&job.workspace_id,
|
|
).execute(&mut *tx).await?;
|
|
tracing::debug!("Marked flow version as latest");
|
|
tracing::debug!("Flow version: {}", version);
|
|
}
|
|
|
|
tx.commit().await?;
|
|
|
|
if let Err(e) = handle_deployment_metadata(
|
|
&job.permissioned_as_email,
|
|
&job.created_by,
|
|
&db,
|
|
&job.workspace_id,
|
|
DeployedObject::Flow { path: job_path, parent_path: parent_path.clone(), version },
|
|
deployment_message,
|
|
false,
|
|
parent_path.as_deref(),
|
|
)
|
|
.await
|
|
{
|
|
tracing::error!(%e, "error handling deployment metadata");
|
|
}
|
|
}
|
|
|
|
Ok(to_raw_value_owned(json!({
|
|
"status": "Successful lock file generation",
|
|
"modified_ids": modified_ids,
|
|
"updated_flow_value": new_flow_value,
|
|
})))
|
|
}
|
|
|
|
fn get_deployment_msg_and_parent_path_from_args(
|
|
args: Option<Json<HashMap<String, Box<RawValue>>>>,
|
|
) -> (Option<String>, Option<String>) {
|
|
let args_map = args.map(|json_hashmap| json_hashmap.0);
|
|
let deployment_message = args_map
|
|
.clone()
|
|
.map(|hashmap| {
|
|
hashmap
|
|
.get("deployment_message")
|
|
.map(|map_value| serde_json::from_str::<String>(map_value.get()).ok())
|
|
.flatten()
|
|
})
|
|
.flatten();
|
|
let parent_path = args_map
|
|
.clone()
|
|
.map(|hashmap| {
|
|
hashmap
|
|
.get("parent_path")
|
|
.map(|map_value| serde_json::from_str::<String>(map_value.get()).ok())
|
|
.flatten()
|
|
})
|
|
.flatten();
|
|
(deployment_message, parent_path)
|
|
}
|
|
|
|
struct LockModuleError {
|
|
id: String,
|
|
error: Error,
|
|
}
|
|
|
|
// Process entire FlowValue including failure_module and preprocessor_module
|
|
async fn lock_flow_value<'c>(
|
|
mut flow: FlowValue,
|
|
job: &MiniPulledJob,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
mut tx: sqlx::Transaction<'c, sqlx::Postgres>,
|
|
worker_name: &str,
|
|
worker_dir: &str,
|
|
job_path: &str,
|
|
base_internal_url: &str,
|
|
token: &str,
|
|
locks_to_reload: &Option<Vec<String>>,
|
|
occupancy_metrics: &mut OccupancyMetrics,
|
|
skip_flow_update: bool,
|
|
raw_deps: &Option<HashMap<String, String>>,
|
|
dependency_map: &mut ScopedDependencyMap,
|
|
raw_workspace_dependencies_o: &Option<RawWorkspaceDependencies>,
|
|
triggered_by_relative_import: bool,
|
|
temp_script_refs: &Option<HashMap<String, String>>,
|
|
) -> Result<(
|
|
FlowValue,
|
|
sqlx::Transaction<'c, sqlx::Postgres>,
|
|
Vec<String>,
|
|
Vec<LockModuleError>,
|
|
)> {
|
|
let mut all_modified_ids = Vec::new();
|
|
let mut all_errors = Vec::new();
|
|
|
|
// Process main modules
|
|
let (updated_modules, updated_tx, modules_modified_ids, modules_errors) = lock_modules(
|
|
flow.modules,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
&raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
)
|
|
.await?;
|
|
|
|
tx = updated_tx;
|
|
flow.modules = updated_modules;
|
|
all_modified_ids.extend(modules_modified_ids);
|
|
all_errors.extend(modules_errors);
|
|
|
|
// Process failure_module if it exists
|
|
if let Some(failure_module) = flow.failure_module {
|
|
let (updated_failure_modules, updated_tx, failure_modified_ids, failure_errors) =
|
|
lock_modules(
|
|
vec![*failure_module],
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
&raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
)
|
|
.await?;
|
|
|
|
tx = updated_tx;
|
|
all_modified_ids.extend(failure_modified_ids);
|
|
all_errors.extend(failure_errors);
|
|
|
|
flow.failure_module = updated_failure_modules.into_iter().next().map(Box::new);
|
|
}
|
|
|
|
// Process preprocessor_module if it exists
|
|
if let Some(preprocessor_module) = flow.preprocessor_module {
|
|
let (
|
|
updated_preprocessor_modules,
|
|
updated_tx,
|
|
preprocessor_modified_ids,
|
|
preprocessor_errors,
|
|
) = lock_modules(
|
|
vec![*preprocessor_module],
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
)
|
|
.await?;
|
|
|
|
tx = updated_tx;
|
|
all_modified_ids.extend(preprocessor_modified_ids);
|
|
all_errors.extend(preprocessor_errors);
|
|
|
|
flow.preprocessor_module = updated_preprocessor_modules
|
|
.into_iter()
|
|
.next()
|
|
.map(Box::new);
|
|
}
|
|
|
|
Ok((flow, tx, all_modified_ids, all_errors))
|
|
}
|
|
|
|
// TODO: Maybe use [FlowValue::traverse_leafs]
|
|
// IMPORTANT: If updating this function, make sure you also update [FlowValue::traverse_leafs]
|
|
async fn lock_modules<'c>(
|
|
modules: Vec<FlowModule>,
|
|
job: &MiniPulledJob,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
mut tx: sqlx::Transaction<'c, sqlx::Postgres>,
|
|
worker_name: &str,
|
|
worker_dir: &str,
|
|
job_path: &str,
|
|
base_internal_url: &str,
|
|
token: &str,
|
|
locks_to_reload: &Option<Vec<String>>,
|
|
occupancy_metrics: &mut OccupancyMetrics,
|
|
skip_flow_update: bool,
|
|
raw_deps: &Option<HashMap<String, String>>,
|
|
dependency_map: &mut ScopedDependencyMap, // (modules to replace old seq (even unmmodified ones), new transaction, modified ids) )
|
|
raw_workspace_dependencies_o: &Option<RawWorkspaceDependencies>,
|
|
triggered_by_relative_import: bool,
|
|
temp_script_refs: &Option<HashMap<String, String>>,
|
|
) -> Result<(
|
|
Vec<FlowModule>,
|
|
sqlx::Transaction<'c, sqlx::Postgres>,
|
|
Vec<String>,
|
|
Vec<LockModuleError>,
|
|
)> {
|
|
let mut new_flow_modules = Vec::new();
|
|
let mut modified_ids = Vec::new();
|
|
let mut errors = Vec::new();
|
|
for mut e in modules.into_iter() {
|
|
let FlowModuleValue::RawScript {
|
|
lock,
|
|
path,
|
|
content,
|
|
mut language,
|
|
input_transforms,
|
|
tag,
|
|
is_trigger,
|
|
assets,
|
|
concurrency_settings,
|
|
} = e.get_value()?
|
|
else {
|
|
let mut nmodified_ids = Vec::new();
|
|
let mut nerrors = Vec::new();
|
|
match e.get_value()? {
|
|
FlowModuleValue::ForloopFlow {
|
|
iterator,
|
|
modules,
|
|
modules_node,
|
|
skip_failures,
|
|
parallel,
|
|
parallelism,
|
|
squash,
|
|
} => {
|
|
let nmodules;
|
|
(nmodules, tx, nmodified_ids, nerrors) = Box::pin(lock_modules(
|
|
modules,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
&raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
))
|
|
.await?;
|
|
e.value = FlowModuleValue::ForloopFlow {
|
|
iterator,
|
|
modules: nmodules,
|
|
modules_node,
|
|
skip_failures,
|
|
parallel,
|
|
parallelism,
|
|
squash,
|
|
}
|
|
.into()
|
|
}
|
|
FlowModuleValue::BranchAll { branches, parallel } => {
|
|
let mut nbranches = vec![];
|
|
for mut b in branches {
|
|
let nmodules;
|
|
let inner_modified_ids;
|
|
let inner_errors;
|
|
(nmodules, tx, inner_modified_ids, inner_errors) = Box::pin(lock_modules(
|
|
b.modules,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
))
|
|
.await?;
|
|
nmodified_ids.extend(inner_modified_ids);
|
|
errors.extend(inner_errors);
|
|
b.modules = nmodules;
|
|
nbranches.push(b)
|
|
}
|
|
e.value = FlowModuleValue::BranchAll { branches: nbranches, parallel }.into()
|
|
}
|
|
FlowModuleValue::WhileloopFlow { modules, modules_node, skip_failures, squash } => {
|
|
let nmodules;
|
|
(nmodules, tx, nmodified_ids, nerrors) = Box::pin(lock_modules(
|
|
modules,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
))
|
|
.await?;
|
|
e.value = FlowModuleValue::WhileloopFlow {
|
|
modules: nmodules,
|
|
modules_node,
|
|
skip_failures,
|
|
squash,
|
|
}
|
|
.into()
|
|
}
|
|
FlowModuleValue::BranchOne { branches, default, default_node } => {
|
|
let mut nbranches = vec![];
|
|
for mut b in branches {
|
|
let nmodules;
|
|
let inner_modified_ids;
|
|
let inner_errors;
|
|
(nmodules, tx, inner_modified_ids, inner_errors) = Box::pin(lock_modules(
|
|
b.modules,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
))
|
|
.await?;
|
|
nmodified_ids.extend(inner_modified_ids);
|
|
errors.extend(inner_errors);
|
|
b.modules = nmodules;
|
|
nbranches.push(b)
|
|
}
|
|
let ndefault;
|
|
let ninner_errors;
|
|
let ninner_modified_ids;
|
|
(ndefault, tx, ninner_modified_ids, ninner_errors) = Box::pin(lock_modules(
|
|
default,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
))
|
|
.await?;
|
|
errors.extend(ninner_errors);
|
|
nmodified_ids.extend(ninner_modified_ids);
|
|
e.value = FlowModuleValue::BranchOne {
|
|
branches: nbranches,
|
|
default: ndefault,
|
|
default_node,
|
|
}
|
|
.into();
|
|
}
|
|
FlowModuleValue::Script { path, hash, .. }
|
|
if !path.starts_with("hub/") && !skip_flow_update =>
|
|
{
|
|
sqlx::query!(
|
|
"INSERT INTO workspace_runnable_dependencies (flow_path, runnable_path, script_hash, runnable_is_flow, workspace_id) VALUES ($1, $2, $3, FALSE, $4) ON CONFLICT DO NOTHING",
|
|
job_path,
|
|
path,
|
|
hash.map(|h| h.0),
|
|
job.workspace_id
|
|
)
|
|
.execute(&mut *tx)
|
|
.await?;
|
|
}
|
|
FlowModuleValue::Flow { path, .. } if !skip_flow_update => {
|
|
sqlx::query!(
|
|
"INSERT INTO workspace_runnable_dependencies (flow_path, runnable_path, runnable_is_flow, workspace_id) VALUES ($1, $2, TRUE, $3) ON CONFLICT DO NOTHING",
|
|
job_path,
|
|
path,
|
|
job.workspace_id,
|
|
)
|
|
.execute(&mut *tx)
|
|
.await?;
|
|
}
|
|
FlowModuleValue::AIAgent { input_transforms, mut tools } => {
|
|
// Extract FlowModules from tools and track their original indices
|
|
// MCP tools don't need locking, so we filter them out
|
|
let mut flow_modules = Vec::new();
|
|
let mut flow_module_indices = Vec::new();
|
|
|
|
for (idx, tool) in tools.iter().enumerate() {
|
|
if let Some(flow_module) = Option::<FlowModule>::from(tool) {
|
|
// Convert AgentTool -> FlowModule for locking
|
|
flow_modules.push(flow_module);
|
|
flow_module_indices.push(idx);
|
|
}
|
|
}
|
|
|
|
// Lock only the FlowModule-type tools
|
|
let locked_flow_modules;
|
|
(locked_flow_modules, tx, nmodified_ids, nerrors) = Box::pin(lock_modules(
|
|
flow_modules,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
tx,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
locks_to_reload,
|
|
occupancy_metrics,
|
|
skip_flow_update,
|
|
&raw_deps,
|
|
dependency_map,
|
|
raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
))
|
|
.await?;
|
|
|
|
let mut locked_iter = locked_flow_modules.into_iter();
|
|
for idx in flow_module_indices {
|
|
let locked = locked_iter.next().ok_or_else(|| {
|
|
Error::internal_err("locked tool module should exist".to_string())
|
|
})?;
|
|
tools[idx] = locked.into();
|
|
}
|
|
|
|
e.value = FlowModuleValue::AIAgent { input_transforms, tools }.into();
|
|
}
|
|
_ => (),
|
|
};
|
|
modified_ids.extend(nmodified_ids);
|
|
errors.extend(nerrors);
|
|
new_flow_modules.push(e);
|
|
continue;
|
|
};
|
|
|
|
for asset in assets.iter().flatten() {
|
|
insert_static_asset_usage(
|
|
&mut *tx,
|
|
&job.workspace_id,
|
|
asset,
|
|
job_path,
|
|
AssetUsageKind::Flow,
|
|
)
|
|
.await?;
|
|
}
|
|
|
|
let get_references = || {
|
|
let dep_path = path.clone().unwrap_or_else(|| job_path.to_string());
|
|
extract_referenced_paths(&content, &format!("{dep_path}/flow"), Some(language))
|
|
};
|
|
|
|
if let Some(locks_to_reload) = locks_to_reload {
|
|
if !locks_to_reload.contains(&e.id) {
|
|
tx = dependency_map
|
|
.patch(get_references(), e.id.clone(), tx)
|
|
.await?;
|
|
new_flow_modules.push(e);
|
|
continue;
|
|
}
|
|
} else {
|
|
if lock.as_ref().is_some_and(|x| !x.trim().is_empty()) {
|
|
if skip_creating_new_lock(&language, &content)
|
|
&& (MIN_VERSION_SUPPORTS_DEBOUNCING_V2.met().await
|
|
|| *WMDEBUG_FORCE_NO_LEGACY_DEBOUNCING_COMPAT)
|
|
{
|
|
tx = dependency_map
|
|
.patch(get_references(), e.id.clone(), tx)
|
|
.await?;
|
|
|
|
new_flow_modules.push(e);
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
|
|
modified_ids.push(e.id.clone());
|
|
|
|
remove_dir_all(job_dir).map_err(|e| {
|
|
Error::ExecutionErr(format!("Error removing job dir for flow step lock: {e}"))
|
|
})?;
|
|
create_dir_all(job_dir).map_err(|e| {
|
|
Error::ExecutionErr(format!("Error creating job dir for flow step lock: {e}"))
|
|
})?;
|
|
|
|
// If we have local lockfiles (and they are enabled) we will replace script content with lockfile and tell hander that it is raw_deps job
|
|
let (content_for_capture, raw_deps) = raw_deps
|
|
.as_ref()
|
|
.and_then(|llfs| llfs.get(language.as_str()))
|
|
.map(|lock| (lock.to_owned(), true))
|
|
.unwrap_or((content.clone(), false));
|
|
|
|
let new_lock = capture_dependency_job(
|
|
&job.id,
|
|
&language,
|
|
&content_for_capture,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
&job.workspace_id,
|
|
worker_dir,
|
|
base_internal_url,
|
|
token,
|
|
&format!(
|
|
"{}/flow",
|
|
&path.clone().unwrap_or_else(|| job_path.to_string())
|
|
),
|
|
occupancy_metrics,
|
|
raw_workspace_dependencies_o,
|
|
lock.as_deref(),
|
|
triggered_by_relative_import,
|
|
job_path,
|
|
Some(&e.id),
|
|
"flow",
|
|
&temp_script_refs,
|
|
)
|
|
.await;
|
|
//
|
|
let lock = match new_lock {
|
|
Ok(new_lock) => {
|
|
if !raw_deps && !skip_flow_update {
|
|
let relative_imports = get_references();
|
|
tx = dependency_map
|
|
.patch(relative_imports.clone(), e.id.clone(), tx)
|
|
.await?;
|
|
}
|
|
if language == ScriptLang::Bun || language == ScriptLang::Bunnative {
|
|
let anns = windmill_common::worker::TypeScriptAnnotations::parse(&content);
|
|
if anns.native && language == ScriptLang::Bun {
|
|
language = ScriptLang::Bunnative;
|
|
} else if !anns.native && language == ScriptLang::Bunnative {
|
|
language = ScriptLang::Bun;
|
|
};
|
|
}
|
|
|
|
Some(new_lock)
|
|
}
|
|
Err(error) => {
|
|
// TODO: Record flow raw script error lock logs
|
|
errors.push(LockModuleError { id: e.id.clone(), error });
|
|
None
|
|
}
|
|
};
|
|
|
|
e.value = windmill_common::worker::to_raw_value(&FlowModuleValue::RawScript {
|
|
lock,
|
|
path,
|
|
input_transforms,
|
|
content,
|
|
language,
|
|
tag,
|
|
is_trigger,
|
|
assets,
|
|
concurrency_settings,
|
|
});
|
|
new_flow_modules.push(e);
|
|
|
|
continue;
|
|
}
|
|
|
|
Ok((new_flow_modules, tx, modified_ids, errors))
|
|
}
|
|
|
|
/// Parse relative imports in script and call db to get each scripts' hash.
|
|
async fn relative_imports_bytes<'a>(
|
|
e: impl sqlx::Executor<'a, Database = sqlx::Postgres>,
|
|
code: Option<&String>,
|
|
path: &str,
|
|
language: Option<ScriptLang>,
|
|
) -> Result<Vec<u8>> {
|
|
Ok(
|
|
if let Some(imports) = extract_relative_imports(
|
|
code.map(|s| s.as_str()).unwrap_or_default(),
|
|
path,
|
|
&language,
|
|
) {
|
|
sqlx::query_scalar::<_, i64>(
|
|
"SELECT hash FROM script WHERE path = ANY($1) AND archived = false",
|
|
)
|
|
.bind(imports)
|
|
.fetch_all(e)
|
|
.await?
|
|
.iter()
|
|
.flat_map(|h| h.to_le_bytes())
|
|
.collect_vec()
|
|
} else {
|
|
vec![]
|
|
},
|
|
)
|
|
}
|
|
|
|
async fn insert_flow_node<'c>(
|
|
mut tx: sqlx::Transaction<'c, sqlx::Postgres>,
|
|
path: &str,
|
|
workspace_id: &str,
|
|
code: Option<&String>,
|
|
lock: Option<&String>,
|
|
flow: Option<&Json<Box<RawValue>>>,
|
|
language: Option<ScriptLang>,
|
|
) -> Result<(sqlx::Transaction<'c, sqlx::Postgres>, FlowNodeId)> {
|
|
let hash = {
|
|
let mut hasher = sha2::Sha256::new();
|
|
hasher.update(code.unwrap_or(&Default::default()));
|
|
hasher.update(lock.unwrap_or(&Default::default()));
|
|
hasher.update(flow.unwrap_or(&Default::default()).get());
|
|
if !*WMDEBUG_NO_NEW_FLOW_VERSION_ON_DJ {
|
|
// We also want to take into account hashes of relative imports.
|
|
hasher.update(
|
|
relative_imports_bytes(&mut *tx, code, &format!("{path}/flow"), language).await?,
|
|
);
|
|
}
|
|
format!("{:x}", hasher.finalize())
|
|
};
|
|
|
|
// Insert the flow node if it doesn't exist.
|
|
let id = sqlx::query_scalar!(
|
|
r#"
|
|
INSERT INTO flow_node (path, workspace_id, hash_v2, lock, code, flow)
|
|
VALUES ($1, $2, $3, $4, $5, $6)
|
|
ON CONFLICT (path, workspace_id, hash_v2) DO UPDATE SET path = EXCLUDED.path -- trivial update to return the id
|
|
RETURNING id
|
|
"#,
|
|
path,
|
|
workspace_id,
|
|
hash,
|
|
lock,
|
|
code,
|
|
flow as Option<&Json<Box<RawValue>>>
|
|
)
|
|
.fetch_one(&mut *tx)
|
|
.await?;
|
|
Ok((tx, FlowNodeId(id)))
|
|
}
|
|
|
|
async fn insert_app_script(
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
path: &str,
|
|
app: i64,
|
|
code: String,
|
|
lock: Option<String>,
|
|
language: Option<ScriptLang>,
|
|
) -> Result<AppScriptId> {
|
|
let code_sha256 = format!("{:x}", sha2::Sha256::digest(&code));
|
|
let hash = {
|
|
let mut hasher = sha2::Sha256::new();
|
|
hasher.update(app.to_le_bytes());
|
|
hasher.update(&code_sha256);
|
|
hasher.update(lock.as_ref().unwrap_or(&Default::default()));
|
|
// We also want to take into account hashes of relative imports.
|
|
if !*WMDEBUG_NO_NEW_APP_VERSION_ON_DJ {
|
|
hasher.update(
|
|
relative_imports_bytes(db, Some(&code), &format!("{path}/app"), language).await?,
|
|
);
|
|
}
|
|
format!("{:x}", hasher.finalize())
|
|
};
|
|
|
|
// Insert the app script if it doesn't exist.
|
|
sqlx::query_scalar!(
|
|
r#"
|
|
INSERT INTO app_script (app, hash, lock, code, code_sha256)
|
|
VALUES ($1, $2, $3, $4, $5)
|
|
ON CONFLICT (hash) DO UPDATE SET app = EXCLUDED.app -- trivial update to return the id
|
|
RETURNING id
|
|
"#,
|
|
app,
|
|
hash,
|
|
lock,
|
|
code,
|
|
code_sha256
|
|
)
|
|
.fetch_one(db)
|
|
.await
|
|
.map(AppScriptId)
|
|
.map_err(Into::into)
|
|
}
|
|
|
|
async fn insert_flow_modules<'c>(
|
|
mut tx: sqlx::Transaction<'c, sqlx::Postgres>,
|
|
path: &str,
|
|
workspace_id: &str,
|
|
failure_module: Option<&Box<FlowModule>>,
|
|
same_worker: bool,
|
|
modules: &mut Vec<FlowModule>,
|
|
modules_node: &mut Option<FlowNodeId>,
|
|
) -> Result<sqlx::Transaction<'c, sqlx::Postgres>> {
|
|
tx = Box::pin(reduce_flow(
|
|
tx,
|
|
modules,
|
|
path,
|
|
workspace_id,
|
|
failure_module,
|
|
same_worker,
|
|
))
|
|
.await?;
|
|
if modules.is_empty() || crate::worker_flow::is_simple_modules(modules, failure_module) {
|
|
return Ok(tx);
|
|
}
|
|
let id;
|
|
(tx, id) = insert_flow_node(
|
|
tx,
|
|
path,
|
|
workspace_id,
|
|
None,
|
|
None,
|
|
Some(&Json(to_raw_value(&FlowValue {
|
|
modules: std::mem::take(modules),
|
|
failure_module: failure_module.cloned(),
|
|
same_worker,
|
|
..Default::default()
|
|
}))),
|
|
None,
|
|
)
|
|
.await?;
|
|
*modules_node = Some(id);
|
|
Ok(tx)
|
|
}
|
|
|
|
async fn reduce_flow<'c>(
|
|
mut tx: sqlx::Transaction<'c, sqlx::Postgres>,
|
|
modules: &mut Vec<FlowModule>,
|
|
path: &str,
|
|
workspace_id: &str,
|
|
failure_module: Option<&Box<FlowModule>>,
|
|
same_worker: bool,
|
|
) -> Result<sqlx::Transaction<'c, sqlx::Postgres>> {
|
|
use FlowModuleValue::*;
|
|
for module in &mut *modules {
|
|
let mut val =
|
|
serde_json::from_str::<FlowModuleValue>(module.value.get()).map_err(|err| {
|
|
Error::internal_err(format!(
|
|
"reduce_flow: Failed to parse flow module value: {}",
|
|
err
|
|
))
|
|
})?;
|
|
match &mut val {
|
|
RawScript { .. } => {
|
|
// In order to avoid an unnecessary `.clone()` of `val`, take ownership of it's content
|
|
// using `std::mem::replace`.
|
|
let RawScript {
|
|
lock,
|
|
content,
|
|
language,
|
|
input_transforms,
|
|
tag,
|
|
is_trigger,
|
|
assets,
|
|
concurrency_settings,
|
|
..
|
|
} = std::mem::replace(&mut val, Identity)
|
|
else {
|
|
unreachable!()
|
|
};
|
|
let id;
|
|
(tx, id) = insert_flow_node(
|
|
tx,
|
|
path,
|
|
workspace_id,
|
|
Some(&content),
|
|
lock.as_ref(),
|
|
None,
|
|
Some(language),
|
|
)
|
|
.await?;
|
|
|
|
val = FlowScript {
|
|
input_transforms,
|
|
id,
|
|
tag,
|
|
language,
|
|
is_trigger,
|
|
assets,
|
|
concurrency_settings,
|
|
};
|
|
}
|
|
ForloopFlow { modules, modules_node, .. }
|
|
| WhileloopFlow { modules, modules_node, .. } => {
|
|
tx = insert_flow_modules(
|
|
tx,
|
|
path,
|
|
workspace_id,
|
|
failure_module,
|
|
same_worker,
|
|
modules,
|
|
modules_node,
|
|
)
|
|
.await?;
|
|
}
|
|
BranchOne { branches, default, default_node, .. } => {
|
|
for branch in branches.iter_mut() {
|
|
tx = insert_flow_modules(
|
|
tx,
|
|
path,
|
|
workspace_id,
|
|
failure_module,
|
|
same_worker,
|
|
&mut branch.modules,
|
|
&mut branch.modules_node,
|
|
)
|
|
.await?;
|
|
}
|
|
tx = insert_flow_modules(
|
|
tx,
|
|
path,
|
|
workspace_id,
|
|
failure_module,
|
|
same_worker,
|
|
default,
|
|
default_node,
|
|
)
|
|
.await?;
|
|
}
|
|
BranchAll { branches, .. } => {
|
|
for branch in branches.iter_mut() {
|
|
tx = insert_flow_modules(
|
|
tx,
|
|
path,
|
|
workspace_id,
|
|
failure_module,
|
|
same_worker,
|
|
&mut branch.modules,
|
|
&mut branch.modules_node,
|
|
)
|
|
.await?;
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
module.value = to_raw_value(&val);
|
|
}
|
|
add_virtual_items_if_necessary(&mut *modules);
|
|
Ok(tx)
|
|
}
|
|
|
|
async fn reduce_app(
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
path: &str,
|
|
value: &mut Value,
|
|
app: i64,
|
|
) -> Result<()> {
|
|
match value {
|
|
Value::Object(object) => {
|
|
if let Some(Value::Object(script)) = object.get_mut("inlineScript") {
|
|
let language = script.get("language").cloned();
|
|
if language == Some(Value::String("frontend".to_owned())) {
|
|
return Ok(());
|
|
}
|
|
// replace `content` with an empty string:
|
|
let Some(Value::String(code)) = script.get_mut("content").map(std::mem::take)
|
|
else {
|
|
return Err(error::Error::internal_err(
|
|
"Missing `content` in inlineScript".to_string(),
|
|
));
|
|
};
|
|
// remove `lock`:
|
|
let lock = script.remove("lock").and_then(|x| match x {
|
|
Value::String(s) => Some(s),
|
|
_ => None,
|
|
});
|
|
let id = insert_app_script(
|
|
db,
|
|
path,
|
|
app,
|
|
code,
|
|
lock,
|
|
language.map(|v| from_value(v).ok()).flatten(),
|
|
)
|
|
.await?;
|
|
// insert the `id` into the `script` object:
|
|
script.insert("id".to_string(), json!(id.0));
|
|
} else {
|
|
for (_, value) in object {
|
|
Box::pin(reduce_app(db, path, value, app)).await?;
|
|
}
|
|
}
|
|
}
|
|
Value::Array(array) => {
|
|
for value in array {
|
|
Box::pin(reduce_app(db, path, value, app)).await?;
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn skip_creating_new_lock(language: &ScriptLang, content: &str) -> bool {
|
|
if language == &ScriptLang::Bun || language == &ScriptLang::Bunnative {
|
|
let anns = windmill_common::worker::TypeScriptAnnotations::parse(&content);
|
|
if anns.native && language == &ScriptLang::Bun {
|
|
return false;
|
|
} else if !anns.native && language == &ScriptLang::Bunnative {
|
|
return false;
|
|
};
|
|
}
|
|
true
|
|
}
|
|
|
|
// TODO: Use transaction?
|
|
// TODO: Use abstracted traverse function.
|
|
//
|
|
// IMPORTANT: If updating this function, make sure you also update [traverse_app_inline_scripts]
|
|
#[async_recursion]
|
|
async fn lock_modules_app(
|
|
value: Value,
|
|
job: &MiniPulledJob,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
worker_name: &str,
|
|
worker_dir: &str,
|
|
job_path: &str,
|
|
base_internal_url: &str,
|
|
token: &str,
|
|
occupancy_metrics: &mut OccupancyMetrics,
|
|
locks_to_reload: &Option<Vec<String>>,
|
|
// Represents the closest container id
|
|
container_id: Option<String>,
|
|
dependency_map: &mut ScopedDependencyMap,
|
|
raw_workspace_dependencies_o: &Option<RawWorkspaceDependencies>,
|
|
triggered_by_relative_import: bool,
|
|
temp_script_refs: &Option<HashMap<String, String>>,
|
|
) -> Result<Value> {
|
|
match value {
|
|
Value::Object(mut m) => {
|
|
if let (Some(Value::String(ref run_type)), Some(path), Some("runnableByPath")) = (
|
|
m.get("runType"),
|
|
m.get("path").and_then(|s| s.as_str()),
|
|
m.get("type").and_then(|s| s.as_str()),
|
|
) {
|
|
// No script_hash because apps don't supports script version locks yet
|
|
sqlx::query!(
|
|
"INSERT INTO workspace_runnable_dependencies (app_path, runnable_path, runnable_is_flow, workspace_id) VALUES ($1, $2, $3, $4) ON CONFLICT DO NOTHING",
|
|
job_path,
|
|
path,
|
|
run_type == "flow",
|
|
job.workspace_id
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
}
|
|
if m.contains_key("inlineScript") {
|
|
let v = m.get_mut("inlineScript").unwrap();
|
|
if let Some(v) = v.as_object_mut() {
|
|
if v.contains_key("content") && v.contains_key("language") {
|
|
if let Ok(language) =
|
|
serde_json::from_value::<ScriptLang>(v.get("language").unwrap().clone())
|
|
{
|
|
let content = v
|
|
.get("content")
|
|
.unwrap()
|
|
.as_str()
|
|
.unwrap_or_default()
|
|
.to_string();
|
|
let mut logs = "".to_string();
|
|
|
|
let referenced_paths = extract_referenced_paths(
|
|
&content,
|
|
&format!("{job_path}/app"),
|
|
Some(language),
|
|
);
|
|
|
|
if let Some((l, id)) = locks_to_reload
|
|
.as_ref()
|
|
.zip(container_id.as_ref())
|
|
// TODO: Remove fallback
|
|
.and_then(|e| {
|
|
if *WMDEBUG_NO_COMPONENTS_TO_RELOCK {
|
|
None
|
|
} else {
|
|
Some(e)
|
|
}
|
|
})
|
|
{
|
|
if !l.contains(id) {
|
|
dependency_map
|
|
.patch(
|
|
referenced_paths.clone(),
|
|
container_id.unwrap_or_default(),
|
|
db.begin().await?,
|
|
)
|
|
.await?
|
|
.commit()
|
|
.await?;
|
|
return Ok(Value::Object(m.clone()));
|
|
}
|
|
} else if v
|
|
.get("lock")
|
|
.is_some_and(|x| !x.as_str().unwrap().trim().is_empty())
|
|
{
|
|
if skip_creating_new_lock(&language, &content)
|
|
&& (MIN_VERSION_SUPPORTS_DEBOUNCING_V2.met().await
|
|
|| *WMDEBUG_FORCE_NO_LEGACY_DEBOUNCING_COMPAT)
|
|
{
|
|
dependency_map
|
|
.patch(
|
|
referenced_paths.clone(),
|
|
container_id.unwrap_or_default(),
|
|
db.begin().await?,
|
|
)
|
|
.await?
|
|
.commit()
|
|
.await?;
|
|
|
|
logs.push_str(
|
|
"Found already locked inline script. Skipping lock...\n",
|
|
);
|
|
return Ok(Value::Object(m.clone()));
|
|
}
|
|
}
|
|
let existing_lock = v.get("lock").and_then(|x| x.as_str());
|
|
let new_lock = capture_dependency_job(
|
|
&job.id,
|
|
&language,
|
|
&content,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
&job.workspace_id,
|
|
worker_dir,
|
|
base_internal_url,
|
|
token,
|
|
&format!("{}/app", job.runnable_path()),
|
|
occupancy_metrics,
|
|
&None,
|
|
existing_lock,
|
|
triggered_by_relative_import,
|
|
&job.runnable_path(),
|
|
container_id.as_deref(),
|
|
"app",
|
|
temp_script_refs,
|
|
)
|
|
.await;
|
|
match new_lock {
|
|
Ok(new_lock) => {
|
|
append_logs(&job.id, &job.workspace_id, logs, &db.into()).await;
|
|
|
|
dependency_map
|
|
.patch(
|
|
referenced_paths.clone(),
|
|
container_id.unwrap_or_default(),
|
|
db.begin().await?,
|
|
)
|
|
.await?
|
|
.commit()
|
|
.await?;
|
|
|
|
let anns =
|
|
windmill_common::worker::TypeScriptAnnotations::parse(
|
|
&content,
|
|
);
|
|
let nlang = if anns.native && language == ScriptLang::Bun {
|
|
Some(ScriptLang::Bunnative)
|
|
} else if !anns.native && language == ScriptLang::Bunnative {
|
|
Some(ScriptLang::Bun)
|
|
} else {
|
|
None
|
|
};
|
|
if let Some(nlang) = nlang {
|
|
v.insert(
|
|
"language".to_string(),
|
|
serde_json::Value::String(nlang.as_str().to_string()),
|
|
);
|
|
}
|
|
v.insert(
|
|
"lock".to_string(),
|
|
serde_json::Value::String(new_lock),
|
|
);
|
|
return Ok(Value::Object(m.clone()));
|
|
}
|
|
Err(e) => {
|
|
tracing::warn!(
|
|
language = ?language,
|
|
error = ?e,
|
|
logs = ?logs,
|
|
"Failed to generate flow lock for inline script"
|
|
);
|
|
()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
for (a, b) in m.clone().into_iter() {
|
|
m.insert(
|
|
a.clone(),
|
|
lock_modules_app(
|
|
b,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
occupancy_metrics,
|
|
locks_to_reload,
|
|
m.get("id")
|
|
.and_then(Value::as_str)
|
|
.map(str::to_owned)
|
|
.or(container_id.clone()),
|
|
dependency_map,
|
|
raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
)
|
|
.await?,
|
|
);
|
|
}
|
|
Ok(Value::Object(m))
|
|
}
|
|
Value::Array(a) => {
|
|
let mut nv = vec![];
|
|
for b in a.clone().into_iter() {
|
|
nv.push(
|
|
lock_modules_app(
|
|
b,
|
|
job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
worker_dir,
|
|
job_path,
|
|
base_internal_url,
|
|
token,
|
|
occupancy_metrics,
|
|
locks_to_reload,
|
|
container_id.clone(),
|
|
dependency_map,
|
|
raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
temp_script_refs,
|
|
)
|
|
.await?,
|
|
);
|
|
}
|
|
Ok(Value::Array(nv))
|
|
}
|
|
a @ _ => Ok(a),
|
|
}
|
|
}
|
|
|
|
pub async fn handle_app_dependency_job(
|
|
job: MiniPulledJob,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
worker_name: &str,
|
|
worker_dir: &str,
|
|
base_internal_url: &str,
|
|
token: &str,
|
|
occupancy_metrics: &mut OccupancyMetrics,
|
|
raw_workspace_dependencies_o: Option<RawWorkspaceDependencies>,
|
|
) -> error::Result<()> {
|
|
let job_path = job.runnable_path.clone().ok_or_else(|| {
|
|
error::Error::internal_err(
|
|
"Cannot resolve app dependencies for app without path".to_string(),
|
|
)
|
|
})?;
|
|
|
|
let id = job
|
|
.runnable_id
|
|
.clone()
|
|
.ok_or_else(|| Error::internal_err("App Dependency requires script hash".to_owned()))?
|
|
.0;
|
|
|
|
let components_to_relock = job
|
|
.args
|
|
.as_ref()
|
|
.map(|x| {
|
|
x.get("components_to_relock")
|
|
.map(|v| serde_json::from_str::<Vec<String>>(v.get()).ok())
|
|
.flatten()
|
|
})
|
|
.flatten();
|
|
|
|
let triggered_by_relative_import = job
|
|
.args
|
|
.as_ref()
|
|
.map(|x| x.get("triggered_by_relative_import").is_some())
|
|
.unwrap_or_default();
|
|
|
|
// Extract temp_script_refs from job args (path -> hash mapping for temp storage)
|
|
let temp_script_refs: Option<HashMap<String, String>> = job
|
|
.args
|
|
.as_ref()
|
|
.and_then(|x| x.get("temp_script_refs"))
|
|
.and_then(|v| serde_json::from_str(v.get()).ok());
|
|
|
|
sqlx::query!(
|
|
"DELETE FROM workspace_runnable_dependencies WHERE app_path = $1 AND workspace_id = $2",
|
|
job_path,
|
|
job.workspace_id
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
|
|
let record = sqlx::query!(
|
|
"SELECT app_id, value, raw_app FROM app_version WHERE id = $1",
|
|
id
|
|
)
|
|
.fetch_optional(db)
|
|
.await?
|
|
.map(|record| (record.app_id, record.value, record.raw_app));
|
|
|
|
let (_, parent_path) = get_deployment_msg_and_parent_path_from_args(job.args.clone());
|
|
|
|
let mut dependency_map = ScopedDependencyMap::fetch_maybe_rearranged(
|
|
&job.workspace_id,
|
|
&job_path,
|
|
"app",
|
|
&parent_path,
|
|
db,
|
|
)
|
|
.await?;
|
|
|
|
// TODO: Use transaction for entire segment?
|
|
if let Some((app_id, value, is_raw_app)) = record {
|
|
let value = lock_modules_app(
|
|
value,
|
|
&job,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
worker_dir,
|
|
&job_path,
|
|
base_internal_url,
|
|
token,
|
|
occupancy_metrics,
|
|
&components_to_relock,
|
|
None,
|
|
&mut dependency_map,
|
|
&raw_workspace_dependencies_o,
|
|
triggered_by_relative_import,
|
|
&temp_script_refs,
|
|
)
|
|
.await?;
|
|
|
|
// TODO: Dissolve in the end?
|
|
dependency_map
|
|
.dissolve(db.begin().await?)
|
|
.await
|
|
.commit()
|
|
.await?;
|
|
|
|
// Compute a lite version of the app value (w/ `inlineScript.{lock,code}`).
|
|
let mut value_lite = value.clone();
|
|
reduce_app(db, &job_path, &mut value_lite, app_id).await?;
|
|
if let Value::Object(object) = &mut value_lite {
|
|
object.insert("version".to_string(), json!(id));
|
|
object.remove("files");
|
|
}
|
|
sqlx::query!(
|
|
"INSERT INTO app_version_lite (id, value) VALUES ($1, $2)
|
|
ON CONFLICT (id) DO UPDATE SET value = EXCLUDED.value",
|
|
id,
|
|
sqlx::types::Json(to_raw_value(&value_lite)) as sqlx::types::Json<Box<RawValue>>,
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
|
|
// Re-check cancelation to ensure we don't accidentially override an app.
|
|
if sqlx::query_scalar!(
|
|
"SELECT canceled_by IS NOT NULL AS \"canceled!\" FROM v2_job_queue WHERE id = $1",
|
|
job.id
|
|
)
|
|
.fetch_optional(db)
|
|
.await
|
|
.map(|v| Some(true) == v)
|
|
.unwrap_or_else(|err| {
|
|
tracing::error!(%job.id, %err, "error checking cancelation for job {0}: {err}", job.id);
|
|
false
|
|
}) {
|
|
return Ok(());
|
|
}
|
|
|
|
sqlx::query!("UPDATE app_version SET value = $1 WHERE id = $2", value, id,)
|
|
.execute(db)
|
|
.await?;
|
|
|
|
// NOTE: Temporary solution.
|
|
// Ideally we do this for every job regardless whether it was triggered by relative import or by creation/update of the app.
|
|
// NOTE: For now is not solving any problem but at some point we will introduce latest version caching
|
|
// and when we do this will be last operation that will make new version appear as the latest and will trigger cache invalidation for all worker.
|
|
if triggered_by_relative_import {
|
|
sqlx::query!(
|
|
"UPDATE app SET versions = array_append(versions, $1::bigint) WHERE path = $2 AND workspace_id = $3",
|
|
id,
|
|
&job_path,
|
|
&job.workspace_id
|
|
)
|
|
.execute(db)
|
|
.await?;
|
|
}
|
|
let (deployment_message, parent_path) =
|
|
get_deployment_msg_and_parent_path_from_args(job.args.clone());
|
|
|
|
let deployed_object = if is_raw_app {
|
|
DeployedObject::RawApp { path: job_path, version: id, parent_path: parent_path.clone() }
|
|
} else {
|
|
DeployedObject::App { path: job_path, version: id, parent_path: parent_path.clone() }
|
|
};
|
|
|
|
if let Err(e) = handle_deployment_metadata(
|
|
&job.permissioned_as_email,
|
|
&job.created_by,
|
|
&db,
|
|
&job.workspace_id,
|
|
deployed_object,
|
|
deployment_message,
|
|
false,
|
|
parent_path.as_deref(),
|
|
)
|
|
.await
|
|
{
|
|
tracing::error!(%e, "error handling deployment metadata");
|
|
}
|
|
|
|
// tx = PushIsolationLevel::Transaction(new_tx);
|
|
// tx = handle_deployment_metadata(
|
|
// tx,
|
|
// &authed,
|
|
// &db,
|
|
// &w_id,
|
|
// DeployedObject::App { path: app.path.clone(), version: v_id },
|
|
// app.deployment_message,
|
|
// )
|
|
// .await?;
|
|
|
|
// match tx {
|
|
// PushIsolationLevel::Transaction(tx) => tx.commit().await?,
|
|
// _ => {
|
|
// return Err(Error::internal_err(
|
|
// "Expected a transaction here".to_string(),
|
|
// ));
|
|
// }
|
|
// }
|
|
|
|
Ok(())
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
// async fn upload_raw_app(
|
|
// app_value: &RawAppValue,
|
|
// job: &QueuedJob,
|
|
// mem_peak: &mut i32,
|
|
// canceled_by: &mut Option<CanceledBy>,
|
|
// job_dir: &str,
|
|
// db: &sqlx::Pool<sqlx::Postgres>,
|
|
// worker_name: &str,
|
|
// occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
|
|
// version: i64,
|
|
// ) -> Result<()> {
|
|
// let mut entrypoint = "index.ts";
|
|
// for file in app_value.files.iter() {
|
|
// if file.0 == "/index.tsx" {
|
|
// entrypoint = "index.tsx";
|
|
// } else if file.0 == "/index.js" {
|
|
// entrypoint = "index.js";
|
|
// }
|
|
// write_file(&job_dir, file.0, &file.1)?;
|
|
// }
|
|
// let common_bun_proc_envs: HashMap<String, String> = get_common_bun_proc_envs(None).await;
|
|
|
|
// install_bun_lockfile(
|
|
// mem_peak,
|
|
// canceled_by,
|
|
// &job.id,
|
|
// &job.workspace_id,
|
|
// Some(db),
|
|
// job_dir,
|
|
// worker_name,
|
|
// common_bun_proc_envs,
|
|
// false,
|
|
// occupancy_metrics,
|
|
// )
|
|
// .await?;
|
|
// let mut cmd = tokio::process::Command::new("esbuild");
|
|
// let mut args = "--bundle --minify --outdir=dist/"
|
|
// .split(' ')
|
|
// .collect::<Vec<_>>();
|
|
// args.push(entrypoint);
|
|
// cmd.current_dir(job_dir)
|
|
// .env_clear()
|
|
// .args(args)
|
|
// .stdout(Stdio::piped())
|
|
// .stderr(Stdio::piped());
|
|
// let child = start_child_process(cmd, "esbuild", false).await?;
|
|
|
|
// crate::handle_child::handle_child(
|
|
// &job.id,
|
|
// db,
|
|
// mem_peak,
|
|
// canceled_by,
|
|
// child,
|
|
// false,
|
|
// worker_name,
|
|
// &job.workspace_id,
|
|
// "esbuild",
|
|
// Some(30),
|
|
// false,
|
|
// occupancy_metrics,
|
|
// )
|
|
// .await?;
|
|
// let output_dir = format!("{}/dist", job_dir);
|
|
// let target_dir = format!("/home/rfiszel/wmill/{}/{}", job.workspace_id, version);
|
|
|
|
// tokio::fs::create_dir_all(&target_dir).await?;
|
|
|
|
// tracing::info!("Copying files from {} to {}", output_dir, target_dir);
|
|
|
|
// let index_ts = format!("{}/index.js", output_dir);
|
|
// let index_css = format!("{}/index.css", output_dir);
|
|
|
|
// if tokio::fs::metadata(&index_ts).await.is_ok() {
|
|
// tokio::fs::copy(&index_ts, format!("{}/index.js", target_dir)).await?;
|
|
// }
|
|
|
|
// if tokio::fs::metadata(&index_css).await.is_ok() {
|
|
// tokio::fs::copy(&index_css, format!("{}/index.css", target_dir)).await?;
|
|
// }
|
|
// // let file_path = format!("/home/rfiszel/wmill/{}/{}", job.workspace_id, version);
|
|
|
|
// Ok(())
|
|
// }
|
|
|
|
#[cfg(feature = "python")]
|
|
async fn python_dep(
|
|
reqs: String,
|
|
job_id: &Uuid,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
worker_name: &str,
|
|
w_id: &str,
|
|
worker_dir: &str,
|
|
occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
|
|
py_version: crate::PyV,
|
|
annotations: PythonAnnotations,
|
|
) -> std::result::Result<String, Error> {
|
|
use windmill_common::worker::{split_python_requirements, PyVAlias};
|
|
|
|
create_dependencies_dir(job_dir).await;
|
|
|
|
let req: std::result::Result<String, Error> = uv_pip_compile(
|
|
job_id,
|
|
&reqs,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
&db.into(),
|
|
worker_name,
|
|
w_id,
|
|
occupancy_metrics,
|
|
py_version,
|
|
annotations.no_cache,
|
|
)
|
|
.await;
|
|
// install the dependencies to pre-fill the cache
|
|
if let Ok(req) = req.as_ref() {
|
|
let r = handle_python_reqs(
|
|
split_python_requirements(req),
|
|
job_id,
|
|
w_id,
|
|
mem_peak,
|
|
canceled_by,
|
|
&Connection::Sql(db.clone()),
|
|
worker_name,
|
|
job_dir,
|
|
worker_dir,
|
|
occupancy_metrics,
|
|
// final_version,
|
|
PyVAlias::default().into(),
|
|
None,
|
|
)
|
|
.await;
|
|
|
|
if let Err(e) = r {
|
|
tracing::error!(
|
|
"Failed to install python dependencies to prefill the cache: {:?} \n",
|
|
e
|
|
);
|
|
}
|
|
}
|
|
req
|
|
}
|
|
|
|
#[cfg(feature = "python")]
|
|
async fn ansible_dep(
|
|
reqs: AnsibleRequirements,
|
|
job_id: &Uuid,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
worker_name: &str,
|
|
w_id: &str,
|
|
worker_dir: &str,
|
|
occupancy_metrics: &mut OccupancyMetrics,
|
|
token: &str,
|
|
base_internal_url: &str,
|
|
) -> std::result::Result<String, Error> {
|
|
use windmill_parser_yaml::add_versions_to_requirements_yaml;
|
|
|
|
use crate::ansible_executor::{
|
|
create_ansible_cfg, get_collection_locks, get_git_ssh_cmd, get_role_locks,
|
|
install_galaxy_collections,
|
|
};
|
|
use windmill_common::client::AuthedClient;
|
|
|
|
let python_lockfile = python_dep(
|
|
reqs.python_reqs.join("\n").to_string(),
|
|
job_id,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
w_id,
|
|
worker_dir,
|
|
&mut Some(occupancy_metrics),
|
|
crate::PyV::gravitational_version(job_id, w_id, Some(db.clone().into())).await,
|
|
PythonAnnotations::default(),
|
|
)
|
|
.await?;
|
|
|
|
let conn = &Connection::Sql(db.clone());
|
|
|
|
let authed_client = AuthedClient::new(
|
|
base_internal_url.to_string(),
|
|
w_id.to_string(),
|
|
token.to_string(),
|
|
None,
|
|
);
|
|
|
|
let git_ssh_cmd = get_git_ssh_cmd(&reqs, job_dir, &authed_client).await?;
|
|
|
|
let git_repos = get_git_repos_lock(
|
|
&reqs.git_repos,
|
|
job_dir,
|
|
job_id,
|
|
worker_name,
|
|
conn,
|
|
mem_peak,
|
|
canceled_by,
|
|
w_id,
|
|
occupancy_metrics,
|
|
&git_ssh_cmd,
|
|
)
|
|
.await?;
|
|
|
|
let ansible_lockfile;
|
|
|
|
create_ansible_cfg(Some(&reqs), job_dir, false)?;
|
|
|
|
if let Some(collections) = reqs.roles_and_collections.as_ref() {
|
|
install_galaxy_collections(
|
|
collections,
|
|
job_dir,
|
|
job_id,
|
|
worker_name,
|
|
w_id,
|
|
mem_peak,
|
|
canceled_by,
|
|
conn,
|
|
occupancy_metrics,
|
|
&git_ssh_cmd,
|
|
)
|
|
.await?;
|
|
|
|
let (collection_versions, logs1) = get_collection_locks(job_dir).await?;
|
|
|
|
let (role_versions, logs2) = if collections.contains("roles:") {
|
|
get_role_locks(job_dir).await?
|
|
} else {
|
|
(HashMap::new(), String::new())
|
|
};
|
|
|
|
let (reqs_yaml, logs3) =
|
|
add_versions_to_requirements_yaml(&collections, &role_versions, &collection_versions)?;
|
|
|
|
let logs = format!("\n{logs1}\n{logs2}\n{logs3}\n");
|
|
|
|
append_logs(job_id, w_id, &logs, conn).await;
|
|
|
|
ansible_lockfile = AnsibleDependencyLocks {
|
|
python_lockfile,
|
|
git_repos,
|
|
collections_and_roles: reqs_yaml,
|
|
collections_and_roles_logs: logs,
|
|
};
|
|
} else {
|
|
ansible_lockfile = AnsibleDependencyLocks {
|
|
python_lockfile,
|
|
git_repos,
|
|
collections_and_roles: String::new(),
|
|
collections_and_roles_logs: String::new(),
|
|
};
|
|
}
|
|
|
|
serde_json::to_string(&ansible_lockfile).map_err(|e| e.into())
|
|
}
|
|
|
|
/// Checks if we can skip relocking because imported lockfiles haven't changed.
|
|
/// Returns Ok(Some(lock)) if we can skip, Ok(None) if we should relock.
|
|
async fn try_skip_relock(
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
w_id: &str,
|
|
base_path: &str,
|
|
step_id: Option<&str>,
|
|
runnable_type: &str,
|
|
existing_lock: Option<&str>,
|
|
) -> error::Result<Option<String>> {
|
|
tracing::debug!(
|
|
workspace_id = %w_id,
|
|
base_path = %base_path,
|
|
step_id = ?step_id,
|
|
runnable_type = %runnable_type,
|
|
has_existing_lock = existing_lock.is_some(),
|
|
"try_skip_relock: checking if we can skip"
|
|
);
|
|
|
|
// Check that ALL imports have matching hashes and at least one import exists
|
|
// Returns true only if: count > 0 AND all hashes match
|
|
// Returns false if: no imports OR any hash mismatch
|
|
let all_imports_unchanged = sqlx::query_scalar!(
|
|
"SELECT
|
|
COUNT(*) > 0
|
|
AND BOOL_AND(
|
|
CASE
|
|
-- For dependencies/: use IS NOT DISTINCT FROM (NULL = NULL is true for legacy)
|
|
-- And the reason for this, is that for every script we also add dependency on default workspace dependencies by default
|
|
-- that default/unnamed workspace dependencies may not exist, but we still do this.
|
|
-- it is needed for windmill to know what to redeploy when default workspace dependencies are being added
|
|
|
|
-- naturally for non-existant entries we have no hash of it
|
|
-- so if we compared hash with '=' (instead of IS NOT DISTINCT FROM), it would give false on NULL = NULL,
|
|
-- which would mean that this entire query returns false, which means relock skip cannot happen
|
|
|
|
-- The solution is to say if both: referenced and current hash are NULLs we treat it as true, so it becomes no longer a blocker from skip.
|
|
--
|
|
-- It is backed up by the fact that server is responsible for deploying new workspace dependencies
|
|
-- so if one was to deploy a new wdeps, server would assign it new hash, and this expression would be invalid and would not approve skip
|
|
WHEN dm.imported_path LIKE 'dependencies/%'
|
|
THEN dm.imported_lockfile_hash IS NOT DISTINCT FROM lh.lockfile_hash
|
|
|
|
-- For scripts: use = with COALESCE (NULL = NULL becomes false)
|
|
-- unlike w deps, we can't do IS NOT DISTINCT FROM here
|
|
-- the reason is that scripts deployments are issued by other workers instead of the server
|
|
-- which would mean that there is no guarantee that new d job will also write it's lock's hash to the `lock_hash`
|
|
-- which could lead to false positives
|
|
ELSE COALESCE(dm.imported_lockfile_hash = lh.lockfile_hash, false)
|
|
END
|
|
)
|
|
FROM dependency_map dm
|
|
LEFT JOIN lock_hash lh
|
|
ON lh.workspace_id = dm.workspace_id
|
|
AND lh.path = dm.imported_path
|
|
WHERE dm.workspace_id = $1
|
|
AND dm.importer_path = $2
|
|
AND dm.importer_node_id = $3",
|
|
w_id,
|
|
base_path,
|
|
step_id.unwrap_or("")
|
|
)
|
|
.fetch_one(db)
|
|
.await?
|
|
.unwrap_or(false);
|
|
|
|
tracing::debug!(
|
|
workspace_id = %w_id,
|
|
base_path = %base_path,
|
|
all_imports_unchanged = all_imports_unchanged,
|
|
"try_skip_relock: query result"
|
|
);
|
|
|
|
if !all_imports_unchanged {
|
|
return Ok(None);
|
|
}
|
|
|
|
// Fetch existing lock based on runnable type
|
|
let lock = match runnable_type {
|
|
"script" => sqlx::query_scalar!(
|
|
"SELECT lock FROM script WHERE path = $1 AND workspace_id = $2 AND lock IS NOT NULL
|
|
AND deleted = false ORDER BY created_at DESC LIMIT 1",
|
|
base_path,
|
|
w_id
|
|
)
|
|
.fetch_optional(db)
|
|
.await?
|
|
.flatten(),
|
|
|
|
"flow" | "app" => existing_lock.map(|s| s.to_string()),
|
|
_ => None,
|
|
};
|
|
|
|
tracing::debug!(
|
|
workspace_id = %w_id,
|
|
base_path = %base_path,
|
|
lock_found = lock.is_some(),
|
|
"try_skip_relock: lock fetch result"
|
|
);
|
|
|
|
Ok(lock)
|
|
}
|
|
|
|
/// Captures dependencies for a script and generates a lockfile.
|
|
async fn capture_dependency_job(
|
|
job_id: &Uuid,
|
|
job_language: &ScriptLang,
|
|
job_raw_code: &str,
|
|
mem_peak: &mut i32,
|
|
canceled_by: &mut Option<CanceledBy>,
|
|
job_dir: &str,
|
|
db: &sqlx::Pool<sqlx::Postgres>,
|
|
worker_name: &str,
|
|
w_id: &str,
|
|
#[allow(unused_variables)] worker_dir: &str,
|
|
base_internal_url: &str,
|
|
token: &str,
|
|
script_path: &str,
|
|
occupancy_metrics: &mut OccupancyMetrics,
|
|
raw_workspace_dependencies_o: &Option<RawWorkspaceDependencies>,
|
|
existing_lock: Option<&str>,
|
|
triggered_by_relative_import: bool,
|
|
// The base path of the runnable (script/flow/app) without suffixes.
|
|
// Used for dependency_map lookups. For flows/apps, this is the flow/app path,
|
|
// not the `script_path` which may have `/flow` or `/app` appended.
|
|
base_path: &str,
|
|
step_id: Option<&str>,
|
|
runnable_type: &str, // "script", "flow", or "app"
|
|
// Map of script path -> content hash for resolving imports from temp storage (CLI).
|
|
temp_script_refs: &Option<HashMap<String, String>>,
|
|
) -> error::Result<String> {
|
|
// Check if we can skip relocking:
|
|
// - Must be triggered by relative import
|
|
// - Debug flag must not be set
|
|
if triggered_by_relative_import && !*WMDEBUG_NO_RELOCK_SKIP_OPTIMIZATION {
|
|
match try_skip_relock(db, w_id, base_path, step_id, runnable_type, existing_lock).await {
|
|
Ok(Some(lock)) => {
|
|
let log_msg = match step_id {
|
|
Some(id) => format!(
|
|
"\nSkipping relock for step '{}' - imported lockfiles unchanged",
|
|
id
|
|
),
|
|
None => "\nSkipping relock - imported lockfiles unchanged".to_string(),
|
|
};
|
|
|
|
tracing::info!(workspace_id = %w_id, job_id = %job_id, "{log_msg}");
|
|
append_logs(job_id, w_id, log_msg, &db.into()).await;
|
|
return Ok(lock);
|
|
}
|
|
Ok(None) => {} // Continue to relock
|
|
Err(e) => {
|
|
tracing::error!(workspace_id = %w_id, job_id = %job_id, "Failed to check skip relock: {e}");
|
|
}
|
|
}
|
|
}
|
|
|
|
let log_msg = match step_id {
|
|
Some(id) => format!("\nRelocking script for step '{}'", id),
|
|
None => "\nRelocking script".to_string(),
|
|
};
|
|
|
|
tracing::info!(workspace_id = %w_id, job_id = %job_id, "{log_msg}");
|
|
append_logs(job_id, w_id, log_msg, &db.into()).await;
|
|
|
|
let workspace_dependencies = WorkspaceDependenciesPrefetched::extract(
|
|
job_raw_code,
|
|
*job_language,
|
|
w_id,
|
|
raw_workspace_dependencies_o,
|
|
script_path,
|
|
db.into(),
|
|
)
|
|
.await?;
|
|
|
|
let lock = match job_language {
|
|
ScriptLang::Python3 => {
|
|
#[cfg(not(feature = "python"))]
|
|
return Err(Error::internal_err(
|
|
"Python requires the python feature to be enabled".to_string(),
|
|
));
|
|
#[cfg(feature = "python")]
|
|
{
|
|
let annotations = PythonAnnotations::parse(job_raw_code);
|
|
|
|
let (pyv, reqs) = {
|
|
let (mut version_specifiers, mut locked_v) = (vec![], None);
|
|
let reqs = windmill_parser_py_imports::parse_python_imports(
|
|
job_raw_code,
|
|
w_id,
|
|
script_path,
|
|
&db,
|
|
&mut version_specifiers,
|
|
&mut locked_v,
|
|
raw_workspace_dependencies_o,
|
|
temp_script_refs,
|
|
)
|
|
.await?
|
|
.0
|
|
.join("\n");
|
|
|
|
// Resolve python version
|
|
// It is based on version specifiers
|
|
let pyv = if let Some(v) = locked_v {
|
|
v.into()
|
|
} else {
|
|
crate::PyV::resolve(
|
|
version_specifiers,
|
|
job_id,
|
|
w_id,
|
|
annotations.py_select_latest,
|
|
Some(db.clone().into()),
|
|
None,
|
|
None,
|
|
)
|
|
.await?
|
|
};
|
|
|
|
(pyv, reqs)
|
|
};
|
|
|
|
python_dep(
|
|
reqs,
|
|
job_id,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
w_id,
|
|
worker_dir,
|
|
&mut Some(occupancy_metrics),
|
|
pyv,
|
|
annotations,
|
|
)
|
|
.await?
|
|
}
|
|
}
|
|
ScriptLang::Ansible => {
|
|
#[cfg(not(feature = "python"))]
|
|
return Err(Error::internal_err(
|
|
"Ansible requires the python feature to be enabled".to_string(),
|
|
));
|
|
|
|
#[cfg(feature = "python")]
|
|
{
|
|
let (_logs, reqs, _) = windmill_parser_yaml::parse_ansible_reqs(job_raw_code)?;
|
|
|
|
ansible_dep(
|
|
reqs.unwrap_or_default(),
|
|
job_id,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
db,
|
|
worker_name,
|
|
w_id,
|
|
worker_dir,
|
|
occupancy_metrics,
|
|
token,
|
|
base_internal_url,
|
|
)
|
|
.await?
|
|
}
|
|
}
|
|
ScriptLang::Go => {
|
|
install_go_dependencies(
|
|
job_id,
|
|
job_raw_code,
|
|
MaybeLock::Unresolved { workspace_dependencies: workspace_dependencies.clone() },
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
&db.into(),
|
|
false,
|
|
false,
|
|
false,
|
|
worker_name,
|
|
w_id,
|
|
occupancy_metrics,
|
|
)
|
|
.await?
|
|
}
|
|
ScriptLang::Deno => {
|
|
generate_deno_lock(
|
|
job_id,
|
|
job_raw_code,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
Some(&db.into()),
|
|
w_id,
|
|
worker_name,
|
|
base_internal_url,
|
|
&mut Some(occupancy_metrics),
|
|
)
|
|
.await?
|
|
}
|
|
ScriptLang::Bun | ScriptLang::Bunnative => {
|
|
let wd_exist = workspace_dependencies.get_bun()?.is_some();
|
|
// TODO: move inside gen_bun_lockfile
|
|
if !wd_exist {
|
|
write_file(job_dir, "main.ts", job_raw_code)?;
|
|
}
|
|
if let Some(lock) = gen_bun_lockfile(
|
|
mem_peak,
|
|
canceled_by,
|
|
job_id,
|
|
w_id,
|
|
Some(&db.into()),
|
|
token,
|
|
script_path,
|
|
job_dir,
|
|
base_internal_url,
|
|
worker_name,
|
|
true,
|
|
&workspace_dependencies,
|
|
windmill_common::worker::TypeScriptAnnotations::parse(job_raw_code).npm,
|
|
&mut Some(occupancy_metrics),
|
|
temp_script_refs,
|
|
false,
|
|
)
|
|
.await?
|
|
{
|
|
if !wd_exist {
|
|
crate::bun_executor::prebundle_bun_script(
|
|
job_raw_code,
|
|
&lock,
|
|
script_path,
|
|
job_id,
|
|
w_id,
|
|
Some(&db),
|
|
&job_dir,
|
|
base_internal_url,
|
|
worker_name,
|
|
&token,
|
|
&mut Some(occupancy_metrics),
|
|
temp_script_refs,
|
|
)
|
|
.await?;
|
|
}
|
|
|
|
lock
|
|
} else {
|
|
Default::default()
|
|
}
|
|
}
|
|
ScriptLang::Php => {
|
|
#[cfg(not(feature = "php"))]
|
|
return Err(Error::internal_err(
|
|
"PHP requires the php feature to be enabled".to_string(),
|
|
));
|
|
|
|
#[cfg(feature = "php")]
|
|
{
|
|
let composer_content = if let Some(c) = workspace_dependencies.get_php()? {
|
|
c
|
|
} else {
|
|
match parse_php_imports(job_raw_code)? {
|
|
Some(reqs) => reqs,
|
|
None => return Ok("".to_string()),
|
|
}
|
|
};
|
|
|
|
composer_install(
|
|
mem_peak,
|
|
canceled_by,
|
|
job_id,
|
|
w_id,
|
|
&Connection::Sql(db.clone()),
|
|
job_dir,
|
|
worker_name,
|
|
composer_content,
|
|
None,
|
|
occupancy_metrics,
|
|
)
|
|
.await?
|
|
}
|
|
}
|
|
ScriptLang::Rust => {
|
|
#[cfg(not(feature = "rust"))]
|
|
return Err(Error::internal_err(
|
|
"Rust requires the rust feature to be enabled".to_string(),
|
|
));
|
|
|
|
#[cfg(feature = "rust")]
|
|
let lockfile = generate_cargo_lockfile(
|
|
job_id,
|
|
job_raw_code,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
&Connection::Sql(db.clone()),
|
|
worker_name,
|
|
w_id,
|
|
occupancy_metrics,
|
|
)
|
|
.await?;
|
|
|
|
#[cfg(feature = "rust")]
|
|
lockfile
|
|
}
|
|
ScriptLang::CSharp => {
|
|
generate_nuget_lockfile(
|
|
job_id,
|
|
job_raw_code,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
&Connection::Sql(db.clone()),
|
|
worker_name,
|
|
w_id,
|
|
occupancy_metrics,
|
|
)
|
|
.await?
|
|
}
|
|
#[cfg(feature = "java")]
|
|
ScriptLang::Java => {
|
|
java_executor::resolve(
|
|
job_id,
|
|
job_raw_code,
|
|
job_dir,
|
|
&Connection::Sql(db.clone()),
|
|
w_id,
|
|
)
|
|
.await?
|
|
}
|
|
#[cfg(feature = "ruby")]
|
|
ScriptLang::Ruby => {
|
|
ruby_executor::resolve(
|
|
job_id,
|
|
job_raw_code,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
&Connection::Sql(db.clone()),
|
|
worker_name,
|
|
w_id,
|
|
)
|
|
.await?
|
|
}
|
|
#[cfg(feature = "rlang")]
|
|
ScriptLang::Rlang => {
|
|
r_executor::resolve(
|
|
job_id,
|
|
job_raw_code,
|
|
mem_peak,
|
|
canceled_by,
|
|
job_dir,
|
|
&Connection::Sql(db.clone()),
|
|
worker_name,
|
|
w_id,
|
|
false,
|
|
)
|
|
.await?
|
|
}
|
|
// for related places search: ADD_NEW_LANG
|
|
_ => "".to_owned(),
|
|
};
|
|
|
|
let mut lines = vec![];
|
|
add_lock_header(&mut lines, workspace_dependencies, *job_language, w_id, db).await?;
|
|
Ok(if lines.is_empty() {
|
|
lock
|
|
} else {
|
|
format!("{}\n{lock}", lines.join("\n"))
|
|
})
|
|
}
|
|
|
|
async fn add_lock_header(
|
|
lines: &mut Vec<String>,
|
|
wd: WorkspaceDependenciesPrefetched,
|
|
_language: ScriptLang,
|
|
_workspace_id: &str,
|
|
_db: &sqlx::Pool<sqlx::Postgres>,
|
|
) -> error::Result<()> {
|
|
if let Some(header) = wd.to_lock_header().await {
|
|
lines.push(header);
|
|
}
|
|
|
|
Ok(())
|
|
}
|