Merge branch 'main' into feat/postgres-trigger-captures

.gitignore

@@ -7,4 +7,4 @@ CaddyfileRemoteMalo
 *.swp
 **/.idea/
 .direnv
-.vscode
+.vscode

backend/windmill-api/src/users.rs

@@ -10,6 +10,7 @@
 
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
+use std::time::Duration;
 
 use crate::db::ApiAuthed;
 
@@ -464,9 +465,11 @@ async fn list_user_usage(
         require_admin(authed.is_admin, &authed.username)?;
     }
     let mut tx = user_db.begin(&authed).await?;
-    let rows = sqlx::query_as!(
-        UserWithUsage,
-        "
+    let rows = tokio::time::timeout(
+        Duration::from_secs(300),
+        sqlx::query_as!(
+            UserWithUsage,
+            "
     SELECT usr.email, usage.executions
         FROM usr
             , LATERAL (
@@ -479,10 +482,12 @@ async fn list_user_usage(
             ) usage
         WHERE workspace_id = $1
         ",
-        w_id
+            w_id
+        )
+        .fetch_all(&mut *tx),
     )
-    .fetch_all(&mut *tx)
-    .await?;
+    .await
+    .map_err(|e| Error::InternalErr(format!("Timed out while fetching user usage: {e:#}")))??;
     tx.commit().await?;
     Ok(Json(rows))
 }

backend/windmill-worker/src/global_cache.rs

@@ -13,6 +13,9 @@ use windmill_common::error;
 #[cfg(all(feature = "enterprise", feature = "parquet", unix))]
 use std::sync::Arc;
 
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+pub const TARGET: &str = const_format::concatcp!(std::env::consts::OS, "_", std::env::consts::ARCH);
+
 #[cfg(all(feature = "enterprise", feature = "parquet", unix))]
 pub async fn build_tar_and_push(
     s3_client: Arc<dyn ObjectStore>,
@@ -57,7 +60,7 @@ pub async fn build_tar_and_push(
     if let Err(e) = s3_client
         .put(
             &Path::from(format!(
-                "/tar/{}/{folder_name}.tar",
+                "/tar/{TARGET}/{}/{folder_name}.tar",
                 if no_uv { "pip" } else { &python_xyz }
             )),
             std::fs::read(&tar_path)?.into(),
@@ -100,7 +103,7 @@ pub async fn pull_from_tar(
     let start = Instant::now();
 
     let tar_path = format!(
-        "tar/{}/{folder_name}.tar",
+        "tar/{TARGET}/{}/{folder_name}.tar",
         if no_uv { "pip".to_owned() } else { python_xyz }
     );
     let bytes = attempt_fetch_bytes(client, &tar_path).await?;

backend/windmill-worker/src/python_executor.rs

@@ -632,7 +632,7 @@ pub async fn uv_pip_compile(
         if *NATIVE_CERT {
             args.extend(["--native-tls"]);
         }
-        tracing::error!("uv args: {:?}", args);
+        tracing::debug!("uv args: {:?}", args);
 
         #[cfg(windows)]
         let uv_cmd = "uv";