all

backend/src/monitor.rs

@@ -638,7 +638,9 @@ async fn send_log_file_to_object_store(
         let (ok_lines, err_lines) = read_log_counters(ts_str);
 
         if let Some(db) = conn.as_sql() {
-            if let Err(e) = sqlx::query!("INSERT INTO log_file (hostname, mode, worker_group, log_ts, file_path, ok_lines, err_lines, json_fmt) VALUES ($1, $2::text::LOG_MODE, $3, $4, $5, $6, $7, $8)",
+            if let Err(e) = sqlx::query!("INSERT INTO log_file (hostname, mode, worker_group, log_ts, file_path, ok_lines, err_lines, json_fmt)
+             VALUES ($1, $2::text::LOG_MODE, $3, $4, $5, $6, $7, $8)
+             ON CONFLICT (hostname, log_ts) DO UPDATE SET ok_lines = log_file.ok_lines + $6, err_lines = log_file.err_lines + $7",
                 hostname, mode.to_string(), worker_group.clone(), ts, highest_file, ok_lines as i64, err_lines as i64, *JSON_FMT)
                 .execute(db)
                 .await {

backend/windmill-api/src/scripts.rs

@@ -650,8 +650,13 @@ async fn create_script_internal<'c>(
     ) {
         Some(String::new())
     } else {
-        ns.lock
-            .and_then(|e| if e.is_empty() { None } else { Some(e) })
+        ns.lock.as_ref().and_then(|e| {
+            if e.is_empty() {
+                None
+            } else {
+                Some(e.to_string())
+            }
+        })
     };
 
     let needs_lock_gen = lock.is_none() && codebase.is_none();
@@ -901,6 +906,7 @@ async fn create_script_internal<'c>(
         let permissioned_as2 = permissioned_as.clone();
         let script_path2 = script_path.clone();
         let parent_path = p_path_opt.clone();
+        let lock = ns.lock.clone();
         let deployment_message = ns.deployment_message.clone();
         let content = ns.content.clone();
         let language = ns.language.clone();
@@ -920,6 +926,7 @@ async fn create_script_internal<'c>(
                 &authed2.email,
                 &authed2.username,
                 &permissioned_as2,
+                lock,
             )
             .await
             {

backend/windmill-api/src/tracing_init.rs

@@ -33,6 +33,8 @@ impl<B> OnResponse<B> for MyOnResponse {
             let status = response.status().as_u16();
             if response.status().is_success() || response.status().is_redirection() {
                 tracing::info!(latency = latency, status = status, "response")
+            } else if response.status().as_u16() == 404 {
+                tracing::warn!(latency = latency, status = status, "response")
             } else {
                 tracing::error!(latency = latency, status = status, "response")
             }

backend/windmill-worker/src/bun_executor.rs

@@ -42,7 +42,7 @@ use windmill_common::{
     error::{self, Result},
     get_latest_hash_for_path,
     scripts::ScriptLang,
-    worker::{exists_in_cache, save_cache, write_file, Connection, DISABLE_BUNDLING},
+    worker::{exists_in_cache, save_cache, to_raw_value, write_file, Connection, DISABLE_BUNDLING},
     DB,
 };
 
@@ -111,7 +111,7 @@ pub async fn gen_bun_lockfile(
 
     let mut empty_deps = false;
 
-    if let Some(raw_deps) = raw_deps {
+    if let Some(raw_deps) = raw_deps.as_ref() {
         gen_bunfig(job_dir).await?;
         write_file(job_dir, "package.json", raw_deps.as_str())?;
     } else {
@@ -201,10 +201,21 @@ pub async fn gen_bun_lockfile(
     }
 
     if export_pkg {
-        let mut content = "".to_string();
+        let mut content;
         {
             let mut file = File::open(format!("{job_dir}/package.json")).await?;
-            file.read_to_string(&mut content).await?;
+            let mut buf = String::default();
+            file.read_to_string(&mut buf).await?;
+            if raw_deps.is_some() {
+                let mut json_map: HashMap<String, Box<RawValue>> = serde_json::from_str(&buf)?;
+                json_map.insert(
+                    "generatedFromPackageJson".to_string(),
+                    to_raw_value(&"true".to_string()),
+                );
+                content = serde_json::to_string_pretty(&json_map)?;
+            } else {
+                content = buf;
+            }
         }
         if !npm_mode {
             #[cfg(any(target_os = "linux", target_os = "macos"))]

backend/windmill-worker/src/worker_lockfiles.rs

@@ -65,17 +65,17 @@ pub async fn update_script_dependency_map(
     relative_imports: Vec<String>,
 ) -> error::Result<()> {
     let importer_kind = "script";
+
+    let mut tx = db.begin().await?;
+    tx = clear_dependency_parent_path(parent_path, script_path, w_id, importer_kind, tx).await?;
+
+    tx = clear_dependency_map_for_item(script_path, w_id, importer_kind, tx, &None).await?;
+
     if !relative_imports.is_empty() {
         let mut logs = "".to_string();
         logs.push_str("\n--- RELATIVE IMPORTS ---\n\n");
         logs.push_str(&relative_imports.join("\n"));
 
-        let mut tx = db.begin().await?;
-        tx =
-            clear_dependency_parent_path(parent_path, script_path, w_id, importer_kind, tx).await?;
-
-        tx = clear_dependency_map_for_item(script_path, w_id, importer_kind, tx, &None).await?;
-
         tx = add_relative_imports_to_dependency_map(
             script_path,
             w_id,
@@ -86,9 +86,10 @@ pub async fn update_script_dependency_map(
             None,
         )
         .await?;
-        tx.commit().await?;
         append_logs(job_id, w_id, logs, &db.into()).await;
     }
+    tx.commit().await?;
+
     Ok(())
 }
 
@@ -381,6 +382,7 @@ pub async fn handle_dependency_job(
                 &job.permissioned_as_email,
                 &job.created_by,
                 &job.permissioned_as,
+                None,
             )
             .await?;
 
@@ -433,18 +435,42 @@ pub async fn process_relative_imports(
     permissioned_as_email: &str,
     created_by: &str,
     permissioned_as: &str,
+    lock: Option<String>,
 ) -> error::Result<()> {
     let relative_imports = extract_relative_imports(&code, script_path, script_lang);
     if let Some(relative_imports) = relative_imports {
-        update_script_dependency_map(
-            &job_id.unwrap_or_else(|| Uuid::nil()),
-            db,
-            w_id,
-            &parent_path,
-            script_path,
-            relative_imports,
-        )
-        .await?;
+        if (script_lang.is_some_and(|v| v == ScriptLang::Bun)
+            && lock
+                .as_ref()
+                .is_some_and(|v| v.contains("generatedFromPackageJson")))
+            || (script_lang.is_some_and(|v| v == ScriptLang::Python3)
+                && lock
+                    .as_ref()
+                    .is_some_and(|v| v.starts_with("# from requirements.txt")))
+        {
+            // if the lock file is generated from a package.json/requirements.txt, we need to clear the dependency map
+            // because we do not want to have dependencies be recomputed automatically. Empty relative imports passed
+            // to update_script_dependency_map will clear the dependency map.
+            update_script_dependency_map(
+                &job_id.unwrap_or_else(|| Uuid::nil()),
+                db,
+                w_id,
+                &parent_path,
+                script_path,
+                vec![],
+            )
+            .await?;
+        } else {
+            update_script_dependency_map(
+                &job_id.unwrap_or_else(|| Uuid::nil()),
+                db,
+                w_id,
+                &parent_path,
+                script_path,
+                relative_imports,
+            )
+            .await?;
+        }
         let already_visited = args
             .map(|x| {
                 x.get("already_visited")
@@ -2118,6 +2144,13 @@ async fn capture_dependency_job(
                     anns,
                 )
                 .await
+                .map(|res| {
+                    if raw_deps {
+                        format!("# from requirements.txt\n{}", res)
+                    } else {
+                        res
+                    }
+                })
             }
         }
         ScriptLang::Ansible => {

frontend/static/openapi.html

@@ -16,7 +16,7 @@
 			var configuration = {
 				theme: 'purple'
 			}
-
+z
 			var apiReference = document.getElementById('api-reference')
 			apiReference.dataset.configuration = JSON.stringify(configuration)
 		</script>