feat(frontend): update sonner dark theme

* chore(main): release 1.327.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>

.github/change-versions-mac.sh

@@ -16,6 +16,7 @@ sed -i '' -e "/\"version\": /s/: .*,/: \"$VERSION\",/" ${root_dirpath}/frontend/
 sed -i '' -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/python-client/wmill/pyproject.toml
 sed -i '' -e "/^windmill-api =/s/= .*/= \"\\^$VERSION\"/" ${root_dirpath}/python-client/wmill/pyproject.toml
 sed -i '' -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/python-client/wmill_pg/pyproject.toml
+sed -i '' -e "/^ModuleVersion =/s/= .*/= '$VERSION'/" ${root_dirpath}/powershell-client/WindmillClient/WindmillClient.psd1
 # sed -i '' -e "/^wmill =/s/= .*/= \"\\^$VERSION\"/" python-client/wmill_pg/pyproject.toml
 sed -i '' -e "/^wmill =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile
 sed -i '' -e "/^wmill_pg =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile

.github/change-versions.sh

@@ -12,10 +12,12 @@ sed -i -e "/^export const VERSION =/s/= .*/= \"v$VERSION\";/" ${root_dirpath}/be
 sed -i -e "/version: /s/: .*/: $VERSION/" ${root_dirpath}/backend/windmill-api/openapi.yaml
 sed -i -e "/version: /s/: .*/: $VERSION/" ${root_dirpath}/openflow.openapi.yaml
 sed -i -e "/\"version\": /s/: .*,/: \"$VERSION\",/" ${root_dirpath}/typescript-client/package.json
+sed -i -e "/\"version\": /s/: .*,/: \"$VERSION\",/" ${root_dirpath}/typescript-client/jsr.json
 sed -i -e "/\"version\": /s/: .*,/: \"$VERSION\",/" ${root_dirpath}/frontend/package.json
 sed -i -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/python-client/wmill/pyproject.toml
 sed -i -e "/^windmill-api =/s/= .*/= \"\\^$VERSION\"/" ${root_dirpath}/python-client/wmill/pyproject.toml
 sed -i -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/python-client/wmill_pg/pyproject.toml
+sed -i -e "/^ModuleVersion =/s/= .*/= '$VERSION'/" ${root_dirpath}/powershell-client/WindmillClient/WindmillClient.psd1
 # sed -i -e "/^wmill =/s/= .*/= \"\\^$VERSION\"/" ${root_dirpath}/python-client/wmill_pg/pyproject.toml
 sed -i -e "/^wmill =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile
 sed -i -e "/^wmill_pg =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile

.github/workflows/docker-image.yml

@@ -136,7 +136,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee:dev
             ${{ steps.meta-ee-public.outputs.tags }}
@@ -199,7 +199,7 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud
             PYTHON_IMAGE=python:3.12.2-slim-bookworm
           tags: |
             ${{ steps.meta-ee-public-py312.outputs.tags }}

.github/workflows/gallery_on_release.yml

@@ -0,0 +1,16 @@
+name: Publish powershell-client
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+
+jobs:
+  publish_gallery:
+    runs-on: ubicloud-standard-8
+    steps:
+      - uses: actions/checkout@v4
+      - run: . ./powershell-client/publish.ps1
+        shell: pwsh
+        env:
+          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

.github/workflows/jsr_on_release.yml

@@ -0,0 +1,16 @@
+name: Publish typescript-client on JSR
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - run: cd typescript-client && ./publish.jsr.sh

Dockerfile

@@ -12,12 +12,14 @@ RUN apt-get -y update \
 
 RUN rustup component add rustfmt
 
-RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install cargo-chef 
+RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install cargo-chef --version ^0.1
+RUN cargo install sccache --version ^0.8
+ENV RUSTC_WRAPPER=sccache SCCACHE_DIR=/backend/sccache
 
 WORKDIR /windmill
 
 ENV SQLX_OFFLINE=true
-ENV CARGO_INCREMENTAL=1
+# ENV CARGO_INCREMENTAL=1
 
 FROM node:20-alpine as frontend
 
@@ -46,7 +48,9 @@ FROM rust_base AS planner
 COPY ./openflow.openapi.yaml /openflow.openapi.yaml
 COPY ./backend ./
 
-RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo chef prepare --recipe-path recipe.json
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=$SCCACHE_DIR,sharing=locked \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true cargo chef prepare --recipe-path recipe.json
 
 FROM rust_base AS builder
 ARG features=""
@@ -55,7 +59,9 @@ COPY --from=planner /windmill/recipe.json recipe.json
 
 RUN apt-get update && apt-get install -y libxml2-dev libxmlsec1-dev clang libclang-dev cmake
 
-RUN CARGO_NET_GIT_FETCH_WITH_CLI=true RUST_BACKTRACE=1 cargo chef cook --release --features "$features" --recipe-path recipe.json
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=$SCCACHE_DIR,sharing=locked \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true RUST_BACKTRACE=1 cargo chef cook --release --features "$features" --recipe-path recipe.json
 
 COPY ./openflow.openapi.yaml /openflow.openapi.yaml
 COPY ./backend ./
@@ -64,7 +70,9 @@ COPY --from=frontend /frontend /frontend
 COPY --from=frontend /backend/windmill-api/openapi-deref.yaml ./windmill-api/openapi-deref.yaml
 COPY .git/ .git/
 
-RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo build --release --features "$features"
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=$SCCACHE_DIR,sharing=locked \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true cargo build --release --features "$features"
 
 
 FROM ${DEBIAN_IMAGE} as downloader
@@ -163,7 +171,7 @@ COPY --from=builder /windmill/target/release/windmill ${APP}/windmill
 
 COPY --from=downloader --chmod=755 /deno /usr/bin/deno
 
-COPY --from=oven/bun:1.1.0 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:1.1.7 /usr/local/bin/bun /usr/bin/bun
 
 # add the docker client to call docker from a worker if enabled
 COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/

LICENSE

@@ -13,7 +13,7 @@ any snippets of code that require a positive license check to be activated.
 Those snippets and files are under a proprietary and commercial license. Private
 and public forks MUST not include any of the above proprietary and commercial
 code. Windmill Labs, Inc. provide tools to clean the codebase from those
-snippets upon demand. The files under python-client/ deno-client/ go-client/ are
+snippets upon demand. The files under python-client/ deno-client/ go-client/ powershell-client/ are
 Apache 2.0 Licensed.
 
 The openapi files, including the OpenFlow spec is Apache 2.0 Licensed.

README.md

@@ -352,6 +352,7 @@ you to have it being synced automatically everyday.
 | TIMEOUT_WAIT_RESULT       | 20                     | The number of seconds to wait before timeout on the 'run_wait_result' endpoint                                                                                                                     | Worker                |
 | QUEUE_LIMIT_WAIT_RESULT   | None                   | The number of max jobs in the queue before rejecting immediately the request in 'run_wait_result' endpoint. Takes precedence on the query arg. If none is specified, there are no limit.           | Worker                |
 | DENO_AUTH_TOKENS          | None                   | Custom DENO_AUTH_TOKENS to pass to worker to allow the use of private modules                                                                                                                      | Worker                |
+| DISABLE_RESPONSE_LOGS          | false                   | Disable response logs                                                   | Server                |
 
 ## Run a local dev setup
 ### only Frontend

backend/.sqlx/query-021be0f26ea87e587e656b24a9a94538efbf54a1447a3898e19773789cfc9063.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT created_at FROM metrics WHERE id = 'author_count' ORDER BY created_at DESC LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "created_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "021be0f26ea87e587e656b24a9a94538efbf54a1447a3898e19773789cfc9063"
+}

backend/.sqlx/query-02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT tag, count(*) as count FROM queue WHERE\n        scheduled_for <= now() - ('3 seconds')::interval AND running = false\n        GROUP BY tag",
+  "query": "SELECT tag, count(*) as count FROM queue WHERE\n                scheduled_for <= now() - ('3 seconds')::interval AND running = false\n                GROUP BY tag",
   "describe": {
     "columns": [
       {
@@ -22,5 +22,5 @@
       null
     ]
   },
-  "hash": "3e0e5e0076ae0f7771abd64f8c5bb7e003e3f85351c946a012037e0c874acf1a"
+  "hash": "02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49"
 }

backend/.sqlx/query-0d7ba88a9810e434aa00fd63bbf416cbe222f2c67ccc8aa92e651c2bea4c2d7b.json

@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM workspace_invite WHERE workspace_id = $1 AND email = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "0d7ba88a9810e434aa00fd63bbf416cbe222f2c67ccc8aa92e651c2bea4c2d7b"
+}

backend/.sqlx/query-3667d72d23e8c35ab96d5e5d1fbfd94a8a9f74b6398e21f13c206c3f9427c6a9.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM metrics \n                WHERE (id = 'author_count' OR id = 'operator_count' OR id = 'worker_usage') AND created_at < NOW() - INTERVAL '6 month'",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "3667d72d23e8c35ab96d5e5d1fbfd94a8a9f74b6398e21f13c206c3f9427c6a9"
+}

backend/.sqlx/query-3901cce744c9b246b661c817e068bdb3b1ab504ff8070fcccf6c909ad75f1f6d.json

@@ -1,11 +1,16 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT COALESCE((SELECT MIN(started_at) as min_started_at\n            FROM queue\n            WHERE script_path = $1 AND job_kind != 'dependencies'  AND running = true AND workspace_id = $2 AND canceled = false\n            GROUP BY script_path), $3)",
+  "query": "SELECT COALESCE((SELECT MIN(started_at) as min_started_at\n            FROM queue\n            WHERE script_path = $1 AND job_kind != 'dependencies'  AND running = true AND workspace_id = $2 AND canceled = false\n            GROUP BY script_path), $3) as min_started_at, now() AS now",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "coalesce",
+        "name": "min_started_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 1,
+        "name": "now",
         "type_info": "Timestamptz"
       }
     ],
@@ -17,8 +22,9 @@
       ]
     },
     "nullable": [
+      null,
       null
     ]
   },
-  "hash": "abc7c72dfe9b01cde6f5b206300ed33e3d15b16bce2510160166a66fb7598e61"
+  "hash": "3901cce744c9b246b661c817e068bdb3b1ab504ff8070fcccf6c909ad75f1f6d"
 }

backend/.sqlx/query-4887db074e9058bc0c1887428d6b2a897fe4b30c83f2aa5e9464c156f08f1c3a.json

@@ -0,0 +1,38 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT worker, worker_instance, vcpus, memory FROM worker_ping WHERE ping_at > NOW() - INTERVAL '2 minutes'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "worker",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "worker_instance",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "vcpus",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "memory",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "4887db074e9058bc0c1887428d6b2a897fe4b30c83f2aa5e9464c156f08f1c3a"
+}

backend/.sqlx/query-54fef88cc6b9e8db7c07fccbaa845edfefa339153a32e468faad9f063008863d.json

@@ -1,16 +1,17 @@
 {
   "db_name": "PostgreSQL",
-  "query": "UPDATE worker_ping SET ping_at = now(), jobs_executed = $1, custom_tags = $2 WHERE worker = $3",
+  "query": "UPDATE worker_ping SET ping_at = now(), jobs_executed = $1, custom_tags = $2, occupancy_rate = $3, current_job_id = NULL, current_job_workspace_id = NULL WHERE worker = $4",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
         "Int4",
         "TextArray",
+        "Float4",
         "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "47beea5cd6324b53bfb349665fb215280f32b70a617fde87f70ea53ca9ade39f"
+  "hash": "54fef88cc6b9e8db7c07fccbaa845edfefa339153a32e468faad9f063008863d"
 }

backend/.sqlx/query-5ce9a9e0669b299b998bc9080d24f8d6f56eb049bec2e0745d27ca3a4fc0c296.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO metrics (id, value) VALUES ('worker_usage', $1)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5ce9a9e0669b299b998bc9080d24f8d6f56eb049bec2e0745d27ca3a4fc0c296"
+}

backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json

@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "?column?",
+        "name": "bool",
         "type_info": "Bool"
       }
     ],

backend/.sqlx/query-6afc5c7cbb3abe11ade0cedf1f7328005ce4de3165cdd998e5a0d27e044c7153.json

@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO worker_ping (worker_instance, worker, ip, custom_tags, worker_group, dedicated_worker, wm_version, vcpus, memory) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) ON CONFLICT (worker) DO UPDATE set ip = $3, custom_tags = $4, worker_group = $5",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "TextArray",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "6afc5c7cbb3abe11ade0cedf1f7328005ce4de3165cdd998e5a0d27e044c7153"
+}

backend/.sqlx/query-6f12be65a4fe3eb39292164363f557de9cef7017dcfbcd40370b849a288c52e3.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DROP INDEX CONCURRENTLY IF EXISTS labeled_jobs_on_jobs",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "6f12be65a4fe3eb39292164363f557de9cef7017dcfbcd40370b849a288c52e3"
+}

backend/.sqlx/query-7142222bee1f60bc56752e377b96ac6e4e981ea219c173146088faf1ad9f3822.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS (SELECT 1 FROM usr WHERE workspace_id = $1 AND email = $2)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "7142222bee1f60bc56752e377b96ac6e4e981ea219c173146088faf1ad9f3822"
+}

backend/.sqlx/query-7b609ed87f974dfe887778746230b40b485658a75a1186c6ebb4c2de1b52a2fa.json

@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO worker_ping (worker_instance, worker, ip, custom_tags, worker_group, dedicated_worker, wm_version) VALUES ($1, $2, $3, $4, $5, $6, $7) ON CONFLICT (worker) DO UPDATE set ip = $3, custom_tags = $4, worker_group = $5",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "TextArray",
-        "Varchar",
-        "Varchar",
-        "Varchar"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "7b609ed87f974dfe887778746230b40b485658a75a1186c6ebb4c2de1b52a2fa"
-}

backend/.sqlx/query-7c95f3652de4561b18c1a340db3e0113a4777d38de4468fc41b22ce5b6fd1db7.json

@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH queue_metrics as (\n            SELECT id, value, created_at\n            FROM metrics\n            WHERE id LIKE 'queue_%'\n                AND created_at > now() - interval '14 day'\n            ORDER BY created_at ASC\n        )\n        SELECT id, array_agg(json_build_object('value', value, 'created_at', created_at)) as \"values!\"\n        FROM queue_metrics\n        GROUP BY id\n        ORDER BY id ASC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "values!",
+        "type_info": "JsonArray"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "7c95f3652de4561b18c1a340db3e0113a4777d38de4468fc41b22ce5b6fd1db7"
+}

backend/.sqlx/query-7c9a464ac807051b99fe37f2078f1b17f824e6d9b1124db618855a15a98e31f6.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM metrics WHERE id LIKE 'queue_%' AND created_at < NOW() - INTERVAL '14 day'",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "7c9a464ac807051b99fe37f2078f1b17f824e6d9b1124db618855a15a98e31f6"
+}

backend/.sqlx/query-82f6674f19e8ad51a992505a46f46fc4a48172f104e9e849f755ac041c3eef92.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT created_at FROM metrics WHERE id LIKE 'queue_count_%' ORDER BY created_at DESC LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "created_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "82f6674f19e8ad51a992505a46f46fc4a48172f104e9e849f755ac041c3eef92"
+}

backend/.sqlx/query-8824b382c4e98dfa17b4aa656af3a6c1ff99973e778d71bd598a50d022da8f15.json

@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO metrics (id, value) VALUES ($1, $2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "8824b382c4e98dfa17b4aa656af3a6c1ff99973e778d71bd598a50d022da8f15"
+}

backend/.sqlx/query-89e72f997e27b9298bd923e7f2b546c5ff061bd9ed63798024306456ca148aec.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "CREATE INDEX CONCURRENTLY labeled_jobs_on_jobs ON completed_job USING GIN ((result -> 'wm_labels')) WHERE result ? 'wm_label';",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "89e72f997e27b9298bd923e7f2b546c5ff061bd9ed63798024306456ca148aec"
+}

backend/.sqlx/query-8c62e3bb264c7336b3b3a68677993ba3b729c7358cc3da14513d8b447ce65aaf.json

@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE worker_ping SET ping_at = now(), current_job_id = $1, current_job_workspace_id = $2 WHERE worker = $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "8c62e3bb264c7336b3b3a68677993ba3b729c7358cc3da14513d8b447ce65aaf"
+}

backend/.sqlx/query-8e7ff45c5378c3a3406ba94dc0653afa5d28c072203617c598caefaaf1bafcfb.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO script (workspace_id, hash, path, parent_hashes, summary, description, content, created_by, schema, is_template, extra_perms, lock, language, kind, tag, draft_only, envs, concurrent_limit, concurrency_time_window_s, cache_ttl, dedicated_worker, ws_error_handler_muted, priority, restart_unless_cancelled, delete_after_use, timeout, concurrency_key, visible_to_runner_only) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::text::json, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28)",
+  "query": "INSERT INTO script (workspace_id, hash, path, parent_hashes, summary, description, content, created_by, schema, is_template, extra_perms, lock, language, kind, tag, draft_only, envs, concurrent_limit, concurrency_time_window_s, cache_ttl, dedicated_worker, ws_error_handler_muted, priority, restart_unless_cancelled, delete_after_use, timeout, concurrency_key, visible_to_runner_only, no_main_func, codebase) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::text::json, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30)",
   "describe": {
     "columns": [],
     "parameters": {
@@ -66,10 +66,12 @@
         "Bool",
         "Int4",
         "Varchar",
-        "Bool"
+        "Bool",
+        "Bool",
+        "Varchar"
       ]
     },
     "nullable": []
   },
-  "hash": "020d33ed5d47350b456783fd548422ea8dcf2d786d0e9fa849754db82c9fa378"
+  "hash": "8e7ff45c5378c3a3406ba94dc0653afa5d28c072203617c598caefaaf1bafcfb"
 }

backend/.sqlx/query-9bf41c3161a02b7d0731c4e1d79519cef5255f5df1b759af3aa4985bb64313e5.json

@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO metrics (id, value)\n                            VALUES ($1, to_jsonb((SELECT EXTRACT(EPOCH FROM now() - scheduled_for)\n                            FROM queue WHERE tag = $2 AND running = false AND scheduled_for <= now() - ('3 seconds')::interval\n                            ORDER BY priority DESC NULLS LAST, scheduled_for, created_at LIMIT 1)))",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9bf41c3161a02b7d0731c4e1d79519cef5255f5df1b759af3aa4985bb64313e5"
+}

backend/.sqlx/query-bbd5f968d7b62a55a7ebf7b98cfd411678ce544fdb9472d8d223235fb2818aaf.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT args FROM completed_job WHERE id = $1 AND workspace_id = $2 UNION ALL SELECT args FROM input WHERE id = $1 AND workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "args",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "bbd5f968d7b62a55a7ebf7b98cfd411678ce544fdb9472d8d223235fb2818aaf"
+}

backend/.sqlx/query-c584aeec21716f7405c355d5684ff3ac1be3f70849d67b8c2d4787e809b7ea2b.json

@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH all_users as (SELECT count(*)::INT as count FROM usr WHERE disabled IS false),\n                authors as (SELECT count(distinct email)::INT as count FROM usr WHERE usr.operator IS false AND disabled IS false)\n                SELECT authors.count as author_count, all_users.count - authors.count as operator_count FROM all_users, authors",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "author_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "operator_count",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "c584aeec21716f7405c355d5684ff3ac1be3f70849d67b8c2d4787e809b7ea2b"
+}

backend/.sqlx/query-c6b2791dd109c7bf40a40b557d9d5a140e70c49718fcb3a776b77f8f2ab901d4.json

@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO metrics (id, value) VALUES ('author_count', $1), ('operator_count', $2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Jsonb",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c6b2791dd109c7bf40a40b557d9d5a140e70c49718fcb3a776b77f8f2ab901d4"
+}

backend/.sqlx/query-c9d97800eb0ec87df8e8959b283dacb2c6cce422365ed394375641488ceb6b65.json

@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE worker_ping SET ping_at = now() WHERE worker = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "c9d97800eb0ec87df8e8959b283dacb2c6cce422365ed394375641488ceb6b65"
-}

backend/.sqlx/query-e00171cc3fc8f32922562d4fc4d3db56955fbc6ee9872d4b2e99157ebed131e0.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT worker, worker_instance,  EXTRACT(EPOCH FROM (now() - ping_at))::integer as last_ping, started_at, ip, jobs_executed, custom_tags, worker_group, wm_version FROM worker_ping\n         WHERE ($1::integer IS NULL AND ping_at > now() - interval '5 minute') OR (ping_at > now() - ($1 || ' seconds')::interval)\n         ORDER BY ping_at desc LIMIT $2 OFFSET $3",
+  "query": "SELECT worker, worker_instance,  EXTRACT(EPOCH FROM (now() - ping_at))::integer as last_ping, started_at, ip, jobs_executed, CASE WHEN $4 IS TRUE THEN current_job_id ELSE NULL END as current_job_id, CASE WHEN $4 IS TRUE THEN current_job_workspace_id ELSE NULL END as current_job_workspace_id, custom_tags, worker_group, wm_version, occupancy_rate\n        FROM worker_ping\n        WHERE ($1::integer IS NULL AND ping_at > now() - interval '5 minute') OR (ping_at > now() - ($1 || ' seconds')::interval)\n        ORDER BY ping_at desc LIMIT $2 OFFSET $3",
   "describe": {
     "columns": [
       {
@@ -35,25 +35,41 @@
       },
       {
         "ordinal": 6,
-        "name": "custom_tags",
-        "type_info": "TextArray"
+        "name": "current_job_id",
+        "type_info": "Uuid"
       },
       {
         "ordinal": 7,
-        "name": "worker_group",
+        "name": "current_job_workspace_id",
         "type_info": "Varchar"
       },
       {
         "ordinal": 8,
+        "name": "custom_tags",
+        "type_info": "TextArray"
+      },
+      {
+        "ordinal": 9,
+        "name": "worker_group",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 10,
         "name": "wm_version",
         "type_info": "Varchar"
+      },
+      {
+        "ordinal": 11,
+        "name": "occupancy_rate",
+        "type_info": "Float4"
       }
     ],
     "parameters": {
       "Left": [
         "Int4",
         "Int8",
-        "Int8"
+        "Int8",
+        "Bool"
       ]
     },
     "nullable": [
@@ -63,10 +79,13 @@
       false,
       false,
       false,
+      null,
+      null,
       true,
       false,
-      false
+      false,
+      true
     ]
   },
-  "hash": "b38044d94e2ab03167c2f6fbb553ab3c19930ed11abf51763cd3ee378229443d"
+  "hash": "e00171cc3fc8f32922562d4fc4d3db56955fbc6ee9872d4b2e99157ebed131e0"
 }

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.309.1"
+version = "1.327.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -24,7 +24,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.309.1"
+version = "1.327.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -50,6 +50,7 @@ parquet = ["windmill-api/parquet", "windmill-common/parquet", "windmill-worker/p
 prometheus = ["windmill-common/prometheus", "windmill-api/prometheus", "windmill-worker/prometheus", "windmill-queue/prometheus"]
 flow_testing = ["windmill-worker/flow_testing"]
 openidconnect = ["windmill-api/openidconnect"]
+cloud = ["windmill-queue/cloud"]
 
 [dependencies]
 anyhow.workspace = true
@@ -108,7 +109,7 @@ windmill-parser-sql = { path = "./parsers/windmill-parser-sql" }
 windmill-parser-graphql = { path = "./parsers/windmill-parser-graphql" }
 windmill-api-client = { path = "./windmill-api-client" }
 
-axum = { version = "^0.7" } 
+axum = { version = "^0.7", features = ["multipart"] } 
 headers = "^0"
 hyper = { version = "^1", features = ["full"] }
 tokio = { version = "^1", features = ["full", "tracing"] }
@@ -224,7 +225,7 @@ tokenizers = "0.14.1"
 candle-core = "0.3.0"
 candle-transformers = "0.3.0"
 candle-nn = "0.3.0"
-tiberius = { version = "0.12.2", default-features = false, features = ["rustls", "tds73", "chrono", "sql-browser-tokio"] }
+tiberius = { git = "https://github.com/prisma/tiberius", rev = "8f66a699dfa041e7b5f736c7e94f92c945453c9e", default-features = false, features = ["rustls", "tds73", "chrono", "sql-browser-tokio"]}
 pin-project = "1"
 indexmap = { version = "2.2.5", features = ["serde"]}
 

backend/ee-repo-ref.txt

@@ -1 +1 @@
-66d9cbb158ab9a5869a45ba253bf57f2cbb5ecb6
+644b6f49f087790a728a7a0a82525997b1742738

backend/migrations/20240419170502_add_script_no_main_func.down.sql

@@ -0,0 +1 @@
+-- Add down migration script here

backend/migrations/20240419170502_add_script_no_main_func.up.sql

@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE script ADD COLUMN no_main_func BOOLEAN;

backend/migrations/20240422144808_add_labels.down.sql

@@ -0,0 +1,2 @@
+-- Add down migration script here
+DROP INDEX IF EXISTS labeled_jobs_on_completed_jobs;

backend/migrations/20240422144808_add_labels.up.sql

@@ -0,0 +1 @@
+-- Add up migration script here

backend/migrations/20240424083501_add_labels_2.down.sql

@@ -0,0 +1 @@
+-- Add down migration script here

backend/migrations/20240424083501_add_labels_2.up.sql

@@ -0,0 +1 @@
+-- Add up migration script here

backend/migrations/20240430005030_add_codebases.down.sql

@@ -0,0 +1,2 @@
+-- Add down migration script here
+ALTER TABLE script DROP COLUMN codebase;

backend/migrations/20240430005030_add_codebases.up.sql

@@ -0,0 +1,3 @@
+-- Add up migration script here
+
+ALTER TABLE script ADD COLUMN codebase VARCHAR(255);

backend/migrations/20240506085935_add_worker_ping_metrics.down.sql

@@ -0,0 +1 @@
+-- Add down migration script here

backend/migrations/20240506085935_add_worker_ping_metrics.up.sql

@@ -0,0 +1,7 @@
+-- Add up migration script here
+ALTER TABLE worker_ping 
+ADD COLUMN current_job_id UUID,
+ADD COLUMN current_job_workspace_id VARCHAR(50),
+ADD COLUMN vcpus BIGINT,
+ADD COLUMN memory BIGINT,
+ADD COLUMN occupancy_rate REAL;

backend/migrations/20240506114033_add_metrics_table.down.sql

@@ -0,0 +1 @@
+-- Add down migration script here

backend/migrations/20240506114033_add_metrics_table.up.sql

@@ -0,0 +1,8 @@
+-- Add up migration script here
+CREATE TABLE metrics (
+  id VARCHAR(255) NOT NULL,
+  value JSONB NOT NULL,
+  created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+CREATE INDEX metrics_key_idx ON metrics(id);
+CREATE INDEX metrics_sort_idx ON metrics(created_at DESC);

backend/parsers/windmill-parser-py-imports/src/lib.rs

@@ -51,6 +51,8 @@ static PYTHON_IMPORTS_REPLACEMENT: phf::Map<&'static str, &'static str> = phf_ma
     "tenable" => "pytenable",
     "ns1" => "ns1-python",
     "pymsql" => "PyMySQL",
+    "haystack" => "haystack-ai",
+    "github" => "PyGithub",
 };
 
 fn replace_import(x: String) -> String {
@@ -62,7 +64,7 @@ fn replace_import(x: String) -> String {
 }
 
 lazy_static! {
-    static ref RE: Regex = Regex::new(r"^\#\s?(\S+)$").unwrap();
+    static ref RE: Regex = Regex::new(r"^\#\s?(\S+)\s*$").unwrap();
 }
 
 fn process_import(module: Option<String>, path: &str, level: usize) -> Vec<String> {

backend/parsers/windmill-parser-sql/src/lib.rs

@@ -292,22 +292,30 @@ pub fn parse_pg_typ(typ: &str) -> Typ {
         Typ::List(Box::new(base_typ))
     } else {
         match typ {
-            "varchar" => Typ::Str(None),
+            "varchar" | "character varying" => Typ::Str(None),
             "text" => Typ::Str(None),
-            "int" => Typ::Int,
+            "int" | "integer" | "int4" => Typ::Int,
             "bigint" => Typ::Int,
-            "bool" => Typ::Bool,
-            "char" => Typ::Str(None),
-            "smallint" => Typ::Int,
-            "smallserial" => Typ::Int,
-            "serial" => Typ::Int,
-            "bigserial" => Typ::Int,
-            "real" => Typ::Float,
-            "double precision" => Typ::Float,
-            "numeric" => Typ::Float,
-            "decimal" => Typ::Float,
+            "bool" | "boolean" => Typ::Bool,
+            "char" | "character" => Typ::Str(None),
+            "json" | "jsonb" => Typ::Object(vec![]),
+            "smallint" | "int2" => Typ::Int,
+            "smallserial" | "serial2" => Typ::Int,
+            "serial" | "serial4" => Typ::Int,
+            "bigserial" | "serial8" => Typ::Int,
+            "real" | "float4" => Typ::Float,
+            "double" | "double precision" | "float8" => Typ::Float,
+            "numeric" | "decimal" => Typ::Float,
             "oid" => Typ::Int,
-            "date" | "time" | "timestamp" | "timestamptz" => Typ::Datetime,
+            "date"
+            | "time"
+            | "timetz"
+            | "time with time zone"
+            | "time without time zone"
+            | "timestamp"
+            | "timestamptz"
+            | "timestamp with time zone"
+            | "timestamp without time zone" => Typ::Datetime,
             _ => Typ::Str(None),
         }
     }

backend/parsers/windmill-parser-wasm/pkg/package.json

@@ -3,7 +3,7 @@
   "collaborators": [
     "Ruben Fiszel <ruben@windmill.dev>"
   ],
-  "version": "1.286.2",
+  "version": "1.318.0",
   "files": [
     "windmill_parser_wasm_bg.wasm",
     "windmill_parser_wasm.js",

backend/parsers/windmill-parser-wasm/pkg/windmill_parser_wasm.js

@@ -561,10 +561,6 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbg_eval_89aaea39f7e976e8 = function(arg0, arg1) {
-        const ret = eval(getStringFromWasm0(arg0, arg1));
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };
@@ -616,6 +612,10 @@ function __wbg_get_imports() {
         const ret = getObject(arg0) in getObject(arg1);
         return ret;
     };
+    imports.wbg.__wbg_eval_33c4985197d1feaf = function(arg0, arg1) {
+        const ret = eval(getStringFromWasm0(arg0, arg1));
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_jsval_loose_eq = function(arg0, arg1) {
         const ret = getObject(arg0) == getObject(arg1);
         return ret;

backend/src/main.rs

@@ -18,11 +18,11 @@ use tokio::fs::DirBuilder;
 use windmill_api::HTTP_CLIENT;
 use windmill_common::{
     global_settings::{
-        BASE_URL_SETTING, BUNFIG_INSTALL_SCOPES_SETTING, CUSTOM_TAGS_SETTING,
-        DEFAULT_TAGS_PER_WORKSPACE_SETTING, ENV_SETTINGS, EXPOSE_DEBUG_METRICS_SETTING,
-        EXPOSE_METRICS_SETTING, EXTRA_PIP_INDEX_URL_SETTING, HUB_BASE_URL_SETTING,
-        JOB_DEFAULT_TIMEOUT_SECS_SETTING, KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING,
-        NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING, PIP_INDEX_URL_SETTING,
+        BASE_URL_SETTING, BUNFIG_INSTALL_SCOPES_SETTING, CRITICAL_ERROR_CHANNELS_SETTING,
+        CUSTOM_TAGS_SETTING, DEFAULT_TAGS_PER_WORKSPACE_SETTING, ENV_SETTINGS,
+        EXPOSE_DEBUG_METRICS_SETTING, EXPOSE_METRICS_SETTING, EXTRA_PIP_INDEX_URL_SETTING,
+        HUB_BASE_URL_SETTING, JOB_DEFAULT_TIMEOUT_SECS_SETTING, KEEP_JOB_DIR_SETTING,
+        LICENSE_KEY_SETTING, NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING, PIP_INDEX_URL_SETTING,
         REQUEST_SIZE_LIMIT_SETTING, REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING,
         RETENTION_PERIOD_SECS_SETTING, SAML_METADATA_SETTING, SCIM_TOKEN_SETTING,
     },
@@ -47,10 +47,11 @@ use windmill_worker::{
 use crate::monitor::{
     initial_load, load_keep_job_dir, load_require_preexisting_user, load_tag_per_workspace_enabled,
     monitor_db, monitor_pool, reload_base_url_setting, reload_bunfig_install_scopes_setting,
-    reload_extra_pip_index_url_setting, reload_hub_base_url_setting,
-    reload_job_default_timeout_setting, reload_license_key, reload_npm_config_registry_setting,
-    reload_pip_index_url_setting, reload_retention_period_setting, reload_scim_token_setting,
-    reload_server_config, reload_worker_config,
+    reload_critical_error_channels_setting, reload_extra_pip_index_url_setting,
+    reload_hub_base_url_setting, reload_job_default_timeout_setting, reload_license_key,
+    reload_npm_config_registry_setting, reload_pip_index_url_setting,
+    reload_retention_period_setting, reload_scim_token_setting, reload_server_config,
+    reload_worker_config,
 };
 
 #[cfg(feature = "parquet")]
@@ -503,6 +504,11 @@ Windmill Community Edition {GIT_VERSION}
                                                         tracing::error!(error = %e, "Could not reload hub base url setting");
                                                     }
                                                 },
+                                                CRITICAL_ERROR_CHANNELS_SETTING => {
+                                                    if let Err(e) = reload_critical_error_channels_setting(&db).await {
+                                                        tracing::error!(error = %e, "Could not reload critical error emails setting");
+                                                    }
+                                                },
                                                 a @_ => {
                                                     tracing::info!("Unrecognized Global Setting Change Payload: {:?}", a);
                                                 }

backend/src/monitor.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use rsmq_async::MultiplexedRsmq;
-use serde::de::DeserializeOwned;
+use serde::{de::DeserializeOwned, Serialize};
 use sqlx::{Pool, Postgres};
 use tokio::{
     join,
@@ -22,15 +22,17 @@ use windmill_api::{
     DEFAULT_BODY_LIMIT, IS_SECURE, OAUTH_CLIENTS, REQUEST_SIZE_LIMIT, SAML_METADATA, SCIM_TOKEN,
 };
 use windmill_common::{
+    ee::CriticalErrorChannel,
     error,
     flow_status::FlowStatusModule,
     global_settings::{
-        BASE_URL_SETTING, BUNFIG_INSTALL_SCOPES_SETTING, DEFAULT_TAGS_PER_WORKSPACE_SETTING,
-        EXPOSE_DEBUG_METRICS_SETTING, EXPOSE_METRICS_SETTING, EXTRA_PIP_INDEX_URL_SETTING,
-        HUB_BASE_URL_SETTING, JOB_DEFAULT_TIMEOUT_SECS_SETTING, KEEP_JOB_DIR_SETTING,
-        LICENSE_KEY_SETTING, NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING, PIP_INDEX_URL_SETTING,
-        REQUEST_SIZE_LIMIT_SETTING, REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING,
-        RETENTION_PERIOD_SECS_SETTING, SAML_METADATA_SETTING, SCIM_TOKEN_SETTING,
+        BASE_URL_SETTING, BUNFIG_INSTALL_SCOPES_SETTING, CRITICAL_ERROR_CHANNELS_SETTING,
+        DEFAULT_TAGS_PER_WORKSPACE_SETTING, EXPOSE_DEBUG_METRICS_SETTING, EXPOSE_METRICS_SETTING,
+        EXTRA_PIP_INDEX_URL_SETTING, HUB_BASE_URL_SETTING, JOB_DEFAULT_TIMEOUT_SECS_SETTING,
+        KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING, NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING,
+        PIP_INDEX_URL_SETTING, REQUEST_SIZE_LIMIT_SETTING,
+        REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING, RETENTION_PERIOD_SECS_SETTING,
+        SAML_METADATA_SETTING, SCIM_TOKEN_SETTING,
     },
     jobs::QueuedJob,
     oauth2::REQUIRE_PREEXISTING_USER_FOR_OAUTH,
@@ -40,7 +42,8 @@ use windmill_common::{
         load_worker_config, reload_custom_tags_setting, DEFAULT_TAGS_PER_WORKSPACE, SERVER_CONFIG,
         WORKER_CONFIG,
     },
-    BASE_URL, DB, DEFAULT_HUB_BASE_URL, HUB_BASE_URL, METRICS_DEBUG_ENABLED, METRICS_ENABLED,
+    BASE_URL, CRITICAL_ERROR_CHANNELS, DB, DEFAULT_HUB_BASE_URL, HUB_BASE_URL,
+    METRICS_DEBUG_ENABLED, METRICS_ENABLED,
 };
 use windmill_queue::cancel_job;
 use windmill_worker::{
@@ -143,6 +146,10 @@ pub async fn initial_load(
         tracing::error!("Error reloading hub base url: {:?}", e)
     }
 
+    if let Err(e) = reload_critical_error_channels_setting(&db).await {
+        tracing::error!("Could not reload critical error emails setting: {:?}", e);
+    }
+
     #[cfg(feature = "parquet")]
     if !_is_agent {
         reload_s3_cache_setting(&db).await;
@@ -671,39 +678,182 @@ pub async fn monitor_db(
     };
 
     let expose_queue_metrics_f = async {
-        if !initial_load
-            && METRICS_ENABLED.load(std::sync::atomic::Ordering::Relaxed)
-            && server_mode
-        {
+        if !initial_load && server_mode {
             expose_queue_metrics(&db).await;
         }
     };
+
+    let save_usage_metrics_f = async {
+        if !initial_load && server_mode {
+            save_usage_metrics(&db).await;
+        }
+    };
+
     join!(
         expired_items_f,
         zombie_jobs_f,
         expose_queue_metrics_f,
+        save_usage_metrics_f,
         verify_license_key_f
     );
 }
 
 pub async fn expose_queue_metrics(db: &Pool<Postgres>) {
-    let queue_counts = sqlx::query!(
-        "SELECT tag, count(*) as count FROM queue WHERE
-        scheduled_for <= now() - ('3 seconds')::interval AND running = false
-        GROUP BY tag"
-    )
-    .fetch_all(db)
-    .await
-    .ok()
-    .unwrap_or_else(|| vec![]);
-    for q in queue_counts {
-        let count = q.count.unwrap_or(0);
-        let tag = q.tag;
-        let metric = (*QUEUE_COUNT).with_label_values(&[&tag]);
-        metric.set(count as i64);
+    let tx = db.begin().await;
+    if let Ok(mut tx) = tx {
+        let last_check = sqlx::query_scalar!(
+            "SELECT created_at FROM metrics WHERE id LIKE 'queue_count_%' ORDER BY created_at DESC LIMIT 1"
+        )
+        .fetch_optional(db)
+        .await
+        .unwrap_or(Some(chrono::Utc::now()));
+
+        let metrics_enabled = METRICS_ENABLED.load(std::sync::atomic::Ordering::Relaxed);
+        let save_metrics = last_check
+            .map(|last_check| chrono::Utc::now() - last_check > chrono::Duration::seconds(25))
+            .unwrap_or(true);
+
+        if metrics_enabled || save_metrics {
+
+            let queue_counts = sqlx::query!(
+                "SELECT tag, count(*) as count FROM queue WHERE
+                scheduled_for <= now() - ('3 seconds')::interval AND running = false
+                GROUP BY tag"
+            )
+            .fetch_all(&mut *tx)
+            .await
+            .ok()
+            .unwrap_or_else(|| vec![]);
+
+            for q in queue_counts {
+                let count = q.count.unwrap_or(0);
+                let tag = q.tag;
+                if metrics_enabled {
+                    let metric = (*QUEUE_COUNT).with_label_values(&[&tag]);
+                    metric.set(count as i64);
+                }
+
+                // save queue_count and delay metrics per tag
+                if save_metrics {
+                    sqlx::query!(
+                        "INSERT INTO metrics (id, value) VALUES ($1, $2)",
+                        format!("queue_count_{}", tag),
+                        serde_json::json!(count)
+                    )
+                    .execute(&mut *tx)
+                    .await
+                    .ok();
+                    if count > 0 {
+                        sqlx::query!(
+                            "INSERT INTO metrics (id, value)
+                            VALUES ($1, to_jsonb((SELECT EXTRACT(EPOCH FROM now() - scheduled_for)
+                            FROM queue WHERE tag = $2 AND running = false AND scheduled_for <= now() - ('3 seconds')::interval
+                            ORDER BY priority DESC NULLS LAST, scheduled_for, created_at LIMIT 1)))",
+                            format!("queue_delay_{}", tag),
+                            tag
+                        ).execute(&mut *tx).await.ok();
+                    }
+                }
+            }
+        }
+
+        // clean queue metrics older than 14 days
+        sqlx::query!(
+            "DELETE FROM metrics WHERE id LIKE 'queue_%' AND created_at < NOW() - INTERVAL '14 day'"
+        ).execute(&mut *tx).await.ok();
+
+        tx.commit().await.ok();
     }
 }
 
+
+#[derive(Serialize)]
+struct WorkerUsage {
+    worker: String,
+    worker_instance: String,
+    vcpus: Option<i64>,
+    memory: Option<i64>,
+
+}
+
+pub async fn save_usage_metrics(db: &Pool<Postgres>) {
+    let tx = db.begin().await;
+
+    if let Ok(mut tx) = tx {
+        let last_check = sqlx::query_scalar!(
+            "SELECT created_at FROM metrics WHERE id = 'author_count' ORDER BY created_at DESC LIMIT 1"
+        )
+        .fetch_optional(db)
+        .await
+        .unwrap_or(Some(chrono::Utc::now()));
+
+        let random_nb = rand::random::<i64>();
+
+        // save author and operator count every ~24 hours
+        if last_check
+            .map(|last_check| chrono::Utc::now() - last_check > chrono::Duration::hours(24) - chrono::Duration::minutes(random_nb % 60))
+            .unwrap_or(true)
+        {
+            let counts = sqlx::query!(
+                "WITH all_users as (SELECT count(*)::INT as count FROM usr WHERE disabled IS false),
+                authors as (SELECT count(distinct email)::INT as count FROM usr WHERE usr.operator IS false AND disabled IS false)
+                SELECT authors.count as author_count, all_users.count - authors.count as operator_count FROM all_users, authors"
+            )
+            .fetch_one(&mut *tx)
+            .await
+            .ok();
+
+            if let Some(counts) = counts {
+                sqlx::query!(
+                    "INSERT INTO metrics (id, value) VALUES ('author_count', $1), ('operator_count', $2)",
+                    serde_json::json!(counts.author_count), 
+                    serde_json::json!(counts.operator_count)
+                )
+                .execute(&mut *tx)
+                .await
+                .ok();
+            }
+
+
+            // clean metrics older than 6 months (including worker usage)
+            sqlx::query!(
+                "DELETE FROM metrics 
+                WHERE (id = 'author_count' OR id = 'operator_count' OR id = 'worker_usage') AND created_at < NOW() - INTERVAL '6 month'"
+            )
+            .execute(&mut *tx)
+            .await
+            .ok();
+        }
+
+        // save worker usage every ~60 minutes
+        if last_check
+            .map(|last_check| chrono::Utc::now() - last_check > chrono::Duration::minutes(60) - chrono::Duration::seconds(random_nb % 300))
+            .unwrap_or(true)
+        {
+            let worker_usage = sqlx::query_as!(
+                WorkerUsage,
+                "SELECT worker, worker_instance, vcpus, memory FROM worker_ping WHERE ping_at > NOW() - INTERVAL '2 minutes'"
+            )
+            .fetch_all(&mut *tx)
+            .await
+            .ok();
+
+            if let Some(worker_usage) = worker_usage {
+                sqlx::query!(
+                    "INSERT INTO metrics (id, value) VALUES ('worker_usage', $1)",
+                    serde_json::json!(worker_usage)
+                )
+                .execute(&mut *tx)
+                .await
+                .ok();
+            }
+        }
+
+        tx.commit().await.ok();
+    }
+
+}
+
 pub async fn reload_server_config(db: &Pool<Postgres>) {
     let config = load_server_config(&db).await;
     if let Err(e) = config {
@@ -1074,3 +1224,27 @@ pub async fn reload_hub_base_url_setting(db: &DB, server_mode: bool) -> error::R
 
     Ok(())
 }
+
+pub async fn reload_critical_error_channels_setting(db: &DB) -> error::Result<()> {
+    let critical_error_channels =
+        load_value_from_global_settings(db, CRITICAL_ERROR_CHANNELS_SETTING).await?;
+
+    let critical_error_channels = if let Some(q) = critical_error_channels {
+        if let Ok(v) = serde_json::from_value::<Vec<CriticalErrorChannel>>(q.clone()) {
+            v
+        } else {
+            tracing::error!(
+                "Could not parse critical_error_emails setting as an array of channels, found: {:#?}",
+                &q
+            );
+            vec![]
+        }
+    } else {
+        vec![]
+    };
+
+    let mut l = CRITICAL_ERROR_CHANNELS.write().await;
+    *l = critical_error_channels;
+
+    Ok(())
+}

backend/tests/worker.rs

@@ -1026,7 +1026,7 @@ async fn listen_for_uuid_on(
 
 async fn completed_job(uuid: Uuid, db: &Pool<Postgres>) -> CompletedJob {
 
-    sqlx::query_as::<_, CompletedJob>("SELECT * FROM completed_job  WHERE id = $1").bind(uuid)
+    sqlx::query_as::<_, CompletedJob>("SELECT *, result->'wm_labels' as labels FROM completed_job  WHERE id = $1").bind(uuid)
         .fetch_one(db)
         .await
         .unwrap()
@@ -1663,6 +1663,7 @@ func main(derp string) (string, error) {
     .to_owned();
 
     let result = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
         content,
         path: None,
         lock: None,
@@ -1694,6 +1695,7 @@ echo "hello $msg"
     .to_owned();
 
     let job = RunJob::from(JobPayload::Code(RawCode {
+        hash: None,
         content,
         path: None,
         lock: None,
@@ -1722,6 +1724,7 @@ def main():
     .to_owned();
 
     let job = JobPayload::Code(RawCode {
+        hash: None,
         content,
         path: None,
         language: ScriptLang::Python3,
@@ -1756,6 +1759,7 @@ def main():
     .to_owned();
 
     let job = JobPayload::Code(RawCode {
+        hash: None,
         content,
         path: None,
         language: ScriptLang::Python3,
@@ -1789,6 +1793,7 @@ def main():
     .to_owned();
 
     let job = JobPayload::Code(RawCode {
+        hash: None,
         content,
         path: None,
         language: ScriptLang::Python3,
@@ -3164,6 +3169,8 @@ async fn run_deployed_relative_imports(db: &Pool<Postgres>, script_content: Stri
             deployment_message: None,
             concurrency_key: None,
             visible_to_runner_only: None,
+            no_main_func: None,
+            codebase: None
         },
     ).await.unwrap();
 
@@ -3211,6 +3218,7 @@ async fn run_preview_relative_imports(db: &Pool<Postgres>, script_content: Strin
     let db2 = db.clone();
     in_test_worker(&db, async move {
         let job = RunJob::from(JobPayload::Code(RawCode {
+            hash: None,
             content: script_content,
             path: Some("f/system/test_import".to_string()),
             language,

backend/windmill-api/Cargo.toml

@@ -72,7 +72,6 @@ async_zip.workspace = true
 rsmq_async.workspace = true
 regex.workspace = true
 bytes.workspace = true
-mail-send.workspace = true
 samael = { workspace = true, optional = true }
 async-recursion.workspace = true
 rsa.workspace = true

backend/windmill-api/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.309.1
+  version: 1.327.0
   title: Windmill API
 
   contact:
@@ -3401,6 +3401,13 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: hide_without_main
+          description: |
+            (default false)
+            hide the scripts without an exported main function
+          in: query
+          schema:
+            type: boolean
         - name: is_template
           description: |
             (default regardless)
@@ -4900,6 +4907,8 @@ paths:
                     - language
                 force_viewer_static_fields:
                   type: object
+                force_viewer_one_of_fields:
+                  type: object
               required:
                 - args
                 - component
@@ -5241,6 +5250,11 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: is_not_schedule
+          description: is not a scheduled job
+          in: query
+          schema:
+            type: boolean
       responses:
         "200":
           description: All queued jobs
@@ -5326,6 +5340,7 @@ paths:
         - $ref: "#/components/parameters/WorkspaceId"
         - $ref: "#/components/parameters/OrderDesc"
         - $ref: "#/components/parameters/CreatedBy"
+        - $ref: "#/components/parameters/Label"
         - $ref: "#/components/parameters/ParentJob"
         - $ref: "#/components/parameters/ScriptExactPath"
         - $ref: "#/components/parameters/ScriptStartPath"
@@ -5355,6 +5370,11 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: is_not_schedule
+          description: is not a scheduled job
+          in: query
+          schema:
+            type: boolean
       responses:
         "200":
           description: All completed jobs
@@ -5374,6 +5394,7 @@ paths:
       parameters:
         - $ref: "#/components/parameters/WorkspaceId"
         - $ref: "#/components/parameters/CreatedBy"
+        - $ref: "#/components/parameters/Label"
         - $ref: "#/components/parameters/ParentJob"
         - $ref: "#/components/parameters/ScriptExactPath"
         - $ref: "#/components/parameters/ScriptStartPath"
@@ -5416,6 +5437,11 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: is_not_schedule
+          description: is not a scheduled job
+          in: query
+          schema:
+            type: boolean
       responses:
         "200":
           description: All jobs
@@ -5554,7 +5580,6 @@ paths:
             text/plain:
               type: string
 
-
   /w/{workspace}/jobs_u/get_flow_debug_info/{id}:
     get:
       summary: get flow debug info
@@ -6934,6 +6959,40 @@ paths:
               schema:
                 type: boolean
 
+  /workers/queue_metrics:
+    get:
+      summary: get queue metrics
+      operationId: getQueueMetrics
+      tags:
+        - worker
+      responses:
+        "200":
+          description: metrics
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    id:
+                      type: string
+                    values: 
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          created_at:
+                            type: string
+                          value:
+                            type: number
+                        required:
+                          - created_at
+                          - value
+                  required:
+                    - id
+                    - values
+
   /configs/list_worker_groups:
     get:
       summary: list worker groups
@@ -7246,6 +7305,26 @@ paths:
                 items:
                   $ref: "#/components/schemas/Input"
 
+  /w/{workspace}/inputs/{jobOrInputId}/args:
+    get:
+      summary: Get args from history or saved input
+      operationId: getArgsFromHistoryOrSavedInput
+      tags:
+        - input
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: jobOrInputId
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: args
+          content:
+            application/json:
+              schema: {}
+
   /w/{workspace}/inputs/list:
     get:
       summary: List saved Inputs for a Runnable
@@ -8026,6 +8105,12 @@ components:
       in: query
       schema:
         type: string
+    Label:
+      name: label
+      description: mask to filter exact matching job's label (job labels are completed jobs with as a result an object containing a string in the array at key 'wm_labels')
+      in: query
+      schema:
+        type: string
     ParentJob:
       name: parent_job
       description:
@@ -8357,6 +8442,11 @@ components:
           type: boolean
         visible_to_runner_only:
           type: boolean
+        no_main_func:
+          type: boolean
+        codebase:
+          type: string
+
       required:
         - hash
         - path
@@ -8372,6 +8462,8 @@ components:
         - language
         - kind
         - starred
+        - no_main_func
+
 
     NewScript:
       type: object
@@ -8445,6 +8537,10 @@ components:
           type: string
         visible_to_runner_only:
           type: boolean
+        no_main_func:
+          type: boolean
+        codebase:
+          type: string
       required:
         - path
         - summary
@@ -8746,6 +8842,10 @@ components:
           type: string
         priority:
           type: integer
+        labels:
+          type: array
+          items:
+            type: string
       required:
         - id
         - created_by
@@ -8764,14 +8864,14 @@ components:
 
     Job:
       oneOf:
-          - allOf:
+        - allOf:
             - $ref: "#/components/schemas/CompletedJob"
             - type: object
               properties:
                 type:
                   type: string
                   enum: [CompletedJob]
-          - allOf: 
+        - allOf:
             - $ref: "#/components/schemas/QueuedJob"
             - type: object
               properties:
@@ -9638,6 +9738,12 @@ components:
           type: string
         wm_version:
           type: string
+        current_job_id:
+          type: string
+        current_job_workspace_id:
+          type: string
+        occupancy_rate:
+          type: number
       required:
         - worker
         - worker_instance
@@ -9747,6 +9853,11 @@ components:
         - $ref: "../../openflow.openapi.yaml#/components/schemas/OpenFlow"
         - $ref: "#/components/schemas/FlowMetadata"
 
+    ExtraPerms:
+      type: object
+      additionalProperties:
+        type: boolean
+
     FlowMetadata:
       type: object
       properties:
@@ -9762,9 +9873,7 @@ components:
         archived:
           type: boolean
         extra_perms:
-          type: object
-          additionalProperties:
-            type: boolean
+          $ref: "#/components/schemas/ExtraPerms"
         starred:
           type: boolean
         draft_only:
@@ -9847,6 +9956,10 @@ components:
           type: object
           additionalProperties:
             type: object
+        triggerables_v2:
+          type: object
+          additionalProperties:
+            type: object
         execution_mode:
           type: string
           enum: [viewer, publisher, anonymous]
@@ -9938,7 +10051,7 @@ components:
         created_at:
           type: string
           format: date-time
-        value: 
+        value:
           type: object
         policy:
           $ref: "#/components/schemas/Policy"

backend/windmill-api/src/apps.rs

@@ -143,6 +143,7 @@ pub struct AppHistoryUpdate {
 }
 
 pub type StaticFields = HashMap<String, Box<RawValue>>;
+pub type OneOfFields = HashMap<String, Vec<Box<RawValue>>>;
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 #[serde(rename_all = "lowercase")]
@@ -152,6 +153,12 @@ pub enum ExecutionMode {
     Viewer,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct PolicyTriggerableInputs {
+    static_inputs: StaticFields,
+    one_of_inputs: OneOfFields,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Policy {
     pub on_behalf_of: Option<String>,
@@ -160,7 +167,10 @@ pub struct Policy {
     // - script/<path>
     // - flow/<path>
     // - rawscript/<sha256>
-    pub triggerables: HashMap<String, StaticFields>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub triggerables: Option<HashMap<String, StaticFields>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub triggerables_v2: Option<HashMap<String, PolicyTriggerableInputs>>,
     pub execution_mode: ExecutionMode,
 }
 
@@ -934,6 +944,7 @@ pub struct ExecuteApp {
     pub raw_code: Option<RawCode>,
     // if set, the app is executed as viewer with the given static fields
     pub force_viewer_static_fields: Option<StaticFields>,
+    pub force_viewer_one_of_fields: Option<OneOfFields>,
 }
 
 fn digest(code: &str) -> String {
@@ -966,39 +977,56 @@ async fn execute_component(
 
     let path = path.to_path();
 
-    let policy = if let Some(static_fields) = payload.clone().force_viewer_static_fields {
-        let mut hm = HashMap::new();
+    let policy = match payload.clone() {
+        ExecuteApp {
+            force_viewer_static_fields: Some(static_fields),
+            force_viewer_one_of_fields: Some(one_of_fields),
+            ..
+        } => {
+            let mut hm = HashMap::new();
 
-        if let Some(path) = payload.path.clone() {
-            hm.insert(format!("{}:{path}", payload.component), static_fields);
-        } else {
-            hm.insert(
-                format!(
-                    "{}:{}",
-                    payload.component,
-                    digest(payload.raw_code.clone().unwrap().content.as_str())
-                ),
-                static_fields,
-            );
+            if let Some(path) = payload.path.clone() {
+                hm.insert(
+                    format!("{}:{path}", payload.component),
+                    PolicyTriggerableInputs {
+                        static_inputs: static_fields,
+                        one_of_inputs: one_of_fields,
+                    },
+                );
+            } else {
+                hm.insert(
+                    format!(
+                        "{}:{}",
+                        payload.component,
+                        digest(payload.raw_code.clone().unwrap().content.as_str())
+                    ),
+                    PolicyTriggerableInputs {
+                        static_inputs: static_fields,
+                        one_of_inputs: one_of_fields,
+                    },
+                );
+            }
+            Policy {
+                execution_mode: ExecutionMode::Viewer,
+                triggerables: None,
+                triggerables_v2: Some(hm),
+                on_behalf_of: None,
+                on_behalf_of_email: None,
+            }
         }
-        Policy {
-            execution_mode: ExecutionMode::Viewer,
-            triggerables: hm,
-            on_behalf_of: None,
-            on_behalf_of_email: None,
+        _ => {
+            let policy_o = sqlx::query_scalar!(
+                "SELECT policy from app WHERE path = $1 AND workspace_id = $2",
+                path,
+                &w_id
+            )
+            .fetch_optional(&db)
+            .await?;
+
+            let policy = not_found_if_none(policy_o, "App", path)?;
+
+            serde_json::from_value::<Policy>(policy).map_err(to_anyhow)?
         }
-    } else {
-        let policy_o = sqlx::query_scalar!(
-            "SELECT policy from app WHERE path = $1 AND workspace_id = $2",
-            path,
-            &w_id
-        )
-        .fetch_optional(&db)
-        .await?;
-
-        let policy = not_found_if_none(policy_o, "App", path)?;
-
-        serde_json::from_value::<Policy>(policy).map_err(to_anyhow)?
     };
 
     let (username, permissioned_as, email) = match policy.execution_mode {
@@ -1133,22 +1161,106 @@ fn build_args(
     path: String,
     args: HashMap<String, Box<RawValue>>,
 ) -> Result<PushArgs<HashMap<String, Box<RawValue>>>> {
-    // disallow var and res access in args coming from the user for security reasons
-    let mut safe_args: HashMap<String, Box<RawValue>> = args.clone();
+
+    let key = format!("{}:{}", component, &path);
+    let (static_inputs, one_of_inputs) = match policy {
+        Policy { triggerables_v2: Some(t), .. } => {
+            let PolicyTriggerableInputs { static_inputs, one_of_inputs } = t
+                .get(&key)
+                .or_else(|| t.get(&path))
+                .map(|x| x.clone())
+                .or_else(|| {
+                    if matches!(policy.execution_mode, ExecutionMode::Viewer) {
+                        Some(PolicyTriggerableInputs {
+                            static_inputs: HashMap::new(),
+                            one_of_inputs: HashMap::new(),
+                        })
+                    } else {
+                        None
+                    }
+                })
+                .ok_or_else(|| {
+                    Error::BadRequest(format!("path {} is not allowed in the app policy", path))
+                })?;
+
+            (static_inputs, one_of_inputs)
+        }
+        Policy { triggerables: Some(t), .. } => {
+            let static_inputs = t
+                .get(&key)
+                .or_else(|| t.get(&path))
+                .map(|x| x.clone())
+                .or_else(|| {
+                    if matches!(policy.execution_mode, ExecutionMode::Viewer) {
+                        Some(HashMap::new())
+                    } else {
+                        None
+                    }
+                })
+                .ok_or_else(|| {
+                    Error::BadRequest(format!("path {} is not allowed in the app policy", path))
+                })?;
+
+            (static_inputs, HashMap::new())
+        }
+        _ => Err(Error::BadRequest(format!(
+            "Policy is missing triggerables for {}",
+            key
+        )))?,
+    };
+
+    let mut args = args.clone();
+    let mut safe_args = HashMap::<String, Box<RawValue>>::new();
+
+    for (k, v) in one_of_inputs {
+        if let Some(arg_val) = args.get(&k) {
+            let arg_str = arg_val.get();
+
+            let options_str_vec = v.iter().map(|x| x.get()).collect::<Vec<&str>>();
+            if options_str_vec.contains(&arg_str) {
+                safe_args.insert(k.to_string(), arg_val.clone());
+                args.remove(&k);
+                continue;
+            }
+
+            // check if multiselect
+            if let Ok(args_str_vec) = serde_json::from_str::<Vec<Box<RawValue>>>(arg_val.get()) {
+                if args_str_vec
+                    .iter()
+                    .all(|x| options_str_vec.contains(&x.get()))
+                {
+                    safe_args.insert(k.to_string(), arg_val.clone());
+                    args.remove(&k);
+                    continue;
+                }
+            }
+
+            return Err(Error::BadRequest(format!(
+                "argument {} with value {} must be one of [{}]",
+                k,
+                arg_str,
+                options_str_vec.join(",")
+            )));
+        }
+    }
+
     for (k, v) in args {
-        let args_str = serde_json::to_string(&v).unwrap_or_else(|_| "".to_string());
-        if args_str.contains("$var:") || args_str.contains("$res:") {
+        let arg_str = serde_json::to_string(&v).unwrap_or_else(|_| "".to_string());
+
+        if !arg_str.contains("$var:") && !arg_str.contains("$res:") {
+            safe_args.insert(k.to_string(), v);
+        } else {
             safe_args.insert(
                 k.to_string(),
                 RawValue::from_string(
-                    args_str
+                    arg_str
                         .replace(
                             "$var:",
-                            "The following variable has been ommited for security reasons: ",
+                            "The following variable has been omitted for security reasons: ",
                         )
                         .replace(
                             "$res:",
-                            "The following resource has been ommited for security reasons: ",
+                            "The following resource has been omitted for security reasons: ",
                         ),
                 )
                 .map_err(|e| {
@@ -1160,24 +1272,8 @@ fn build_args(
             );
         }
     }
-    let key = format!("{}:{}", component, &path);
-    let static_args = policy
-        .triggerables
-        .get(&key)
-        .or_else(|| policy.triggerables.get(&path))
-        .map(|x| x.clone())
-        .or_else(|| {
-            if matches!(policy.execution_mode, ExecutionMode::Viewer) {
-                Some(HashMap::new())
-            } else {
-                None
-            }
-        })
-        .ok_or_else(|| {
-            Error::BadRequest(format!("path {} is not allowed in the app policy", path))
-        })?;
     let mut extra = HashMap::new();
-    for (k, v) in static_args {
+    for (k, v) in static_inputs {
         extra.insert(k.to_string(), v.to_owned());
     }
     Ok(PushArgs { extra, args: sqlx::types::Json(safe_args) })

backend/windmill-api/src/db.rs

@@ -136,6 +136,15 @@ impl Migrate for CustomMigrator {
                 migration.version,
                 migration.description
             );
+            if migration.version == 20240424083501 {
+                tracing::info!("Special migration to add index concurrently on job labels 2");
+                sqlx::query!(
+                    "DROP INDEX CONCURRENTLY IF EXISTS labeled_jobs_on_jobs"
+                ).execute(&mut *self.inner).await?;
+                sqlx::query!(
+                    "CREATE INDEX CONCURRENTLY labeled_jobs_on_jobs ON completed_job USING GIN ((result -> 'wm_labels')) WHERE result ? 'wm_label';"
+                ).execute(&mut *self.inner).await?;
+            }
             let r = self.inner.apply(migration).await;
             tracing::info!("Finished applying migration {}", migration.version);
             r

backend/windmill-api/src/flows.rs

@@ -543,7 +543,7 @@ async fn update_flow(
         clear_schedule(tx.transaction_mut(), &schedule.path, &w_id).await?;
 
         if schedule.enabled {
-            tx = push_scheduled_job(&db, tx, schedule).await?;
+            tx = push_scheduled_job(&db, tx, &schedule).await?;
         }
     }
 
@@ -955,7 +955,7 @@ mod tests {
                     continue_on_error: None,
                 },
             ],
-            failure_module: Some(FlowModule {
+            failure_module: Some(Box::new(FlowModule {
                 id: "d".to_string(),
                 value: FlowModuleValue::Script {
                     path: "test".to_string(),
@@ -977,7 +977,7 @@ mod tests {
                 priority: None,
                 delete_after_use: None,
                 continue_on_error: None,
-            }),
+            })),
             same_worker: false,
             concurrent_limit: None,
             concurrency_time_window_s: None,

backend/windmill-api/src/folders.rs

@@ -271,7 +271,7 @@ async fn update_folder(
     Extension(user_db): Extension<UserDB>,
     Extension(webhook): Extension<WebhookShared>,
     Path((w_id, name)): Path<(String, String)>,
-    Json(ng): Json<UpdateFolder>,
+    Json(mut ng): Json<UpdateFolder>,
 ) -> Result<String> {
     use sql_builder::prelude::*;
 
@@ -282,6 +282,25 @@ async fn update_folder(
     if let Some(display_name) = ng.display_name {
         sqlb.set("display_name", "?".bind(&display_name));
     }
+
+    if !authed.is_admin {
+        let prefixed_username = format!("u/{}", authed.username);
+        if ng.owners.as_ref().is_some_and(|x| {
+            !x.contains(&prefixed_username)
+                && !authed.groups.iter().any(|g| x.contains(&format!("g/{g}")))
+        }) {
+            ng.owners.as_mut().unwrap().push(prefixed_username.clone());
+            if ng.extra_perms.is_none() {
+                ng.extra_perms = Some(serde_json::Value::Object(serde_json::Map::new()));
+            }
+            ng.extra_perms
+                .as_mut()
+                .unwrap()
+                .as_object_mut()
+                .unwrap()
+                .insert(prefixed_username, serde_json::json!(true));
+        }
+    }
     if let Some(owners) = ng.owners {
         sqlb.set(
             "owners",
@@ -310,9 +329,16 @@ async fn update_folder(
         .sql()
         .map_err(|e| error::Error::InternalErr(e.to_string()))?;
     let nfolder = sqlx::query_as::<_, Folder>(&sql)
-        .fetch_one(&mut *tx)
+        .fetch_optional(&mut *tx)
         .await?;
 
+    let nfolder = nfolder.ok_or_else(|| {
+        windmill_common::error::Error::NotAuthorized(format!(
+            "You are not an owner of {} and hence cannot modify it",
+            name
+        ))
+    })?;
+
     if let Some(extra_perms) = nfolder.extra_perms.as_object() {
         for o in nfolder.owners {
             if !extra_perms

backend/windmill-api/src/inputs.rs

@@ -25,7 +25,7 @@ use windmill_common::{
     error::JsonResult,
     jobs::JobKind,
     scripts::to_i64,
-    utils::{paginate, Pagination},
+    utils::{not_found_if_none, paginate, Pagination},
 };
 pub fn workspaced_service() -> Router {
     Router::new()
@@ -34,6 +34,10 @@ pub fn workspaced_service() -> Router {
         .route("/create", post(create_input))
         .route("/update", post(update_input))
         .route("/delete/:id", post(delete_input))
+        .route(
+            "/:job_or_input_id/args",
+            get(get_args_from_history_or_saved_input),
+        )
 }
 
 #[derive(Debug, sqlx::FromRow, Serialize, Deserialize)]
@@ -123,7 +127,7 @@ async fn get_input_history(
     let mut tx = user_db.begin(&authed).await?;
 
     let sql = &format!(
-        "select id, created_at, created_by, args, success from completed_job \
+        "select id, created_at, created_by, CASE WHEN args is null or pg_column_size(args) < 40000 THEN args ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as args, success from completed_job \
         where {} = $1 and job_kind = $2 and workspace_id = $3 \
         order by created_at desc limit $4 offset $5",
         r.runnable_type.column_name()
@@ -167,6 +171,27 @@ async fn get_input_history(
     Ok(Json(inputs))
 }
 
+async fn get_args_from_history_or_saved_input(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, job_or_input_id)): Path<(String, Uuid)>,
+) -> JsonResult<Option<Value>> {
+    let mut tx = user_db.begin(&authed).await?;
+    let result_o = sqlx::query_scalar!(
+        "SELECT args FROM completed_job WHERE id = $1 AND workspace_id = $2 UNION ALL SELECT args FROM input WHERE id = $1 AND workspace_id = $2",
+        job_or_input_id,
+        w_id
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+
+    tx.commit().await?;
+
+    let result = not_found_if_none(result_o, "Input args", job_or_input_id.to_string())?;
+
+    Ok(Json(result))
+}
+
 async fn list_saved_inputs(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -179,7 +204,7 @@ async fn list_saved_inputs(
     let mut tx = user_db.begin(&authed).await?;
 
     let rows = sqlx::query_as::<_, InputRow>(
-        "select * from input \
+        "select id, workspace_id, runnable_id, runnable_type, name, CASE WHEN pg_column_size(args) < 40000 THEN args ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as args, created_at, created_by, is_public from input \
          where runnable_id = $1 and runnable_type = $2 and workspace_id = $3 \
          and (is_public IS true OR created_by = $4) \
          order by created_at desc limit $5 offset $6",

backend/windmill-api/src/jobs.rs

@@ -12,6 +12,7 @@ use serde_json::value::RawValue;
 use std::collections::HashMap;
 #[cfg(feature = "prometheus")]
 use std::sync::atomic::Ordering;
+use tokio::io::AsyncReadExt;
 #[cfg(feature = "prometheus")]
 use tokio::time::Instant;
 use windmill_common::flow_status::{JobResult, RestartedFrom};
@@ -19,6 +20,10 @@ use windmill_common::jobs::{
     format_completed_job_result, format_result, CompletedJobWithFormattedResult, FormattedResult,
     ENTRYPOINT_OVERRIDE,
 };
+use windmill_common::worker::TMP_DIR;
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+use windmill_common::scripts::PREVIEW_IS_CODEBASE_HASH;
 use windmill_common::variables::get_workspace_key;
 
 use crate::db::ApiAuthed;
@@ -163,6 +168,7 @@ pub fn workspaced_service() -> Router {
                 .layer(cors.clone()),
         )
         .route("/run/preview", post(run_preview_script))
+        .route("/run/preview_bundle", post(run_bundle_preview_script))
         .route("/add_batch_jobs/:n", post(add_batch_jobs))
         .route("/run/preview_flow", post(run_preview_flow_job))
         .route(
@@ -585,6 +591,7 @@ fn generate_get_job_query(no_logs: bool, table: &str) -> String {
         result,    
         deleted,    
         is_skipped,
+        result->'wm_labels' as labels,
         CASE WHEN result is null or pg_column_size(result) < 2000000 THEN result ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as result"
     } else {
         "scheduled_for,  
@@ -659,17 +666,17 @@ async fn get_job_internal(
 async fn get_logs_from_store(
     log_offset: i32,
     logs: &str,
-    log_file_index: Option<Vec<String>>,
+    log_file_index: &Option<Vec<String>>,
 ) -> Option<error::Result<Body>> {
     if log_offset > 0 {
-        if let Some(file_index) = log_file_index {
+        if let Some(file_index) = log_file_index.clone() {
             tracing::debug!("Getting logs from store: {file_index:?}");
             if let Some(os) = OBJECT_STORE_CACHE_SETTINGS.read().await.clone() {
                 tracing::debug!("object store client present, streaming from there");
 
                 let logs = logs.to_string();
                 let stream = async_stream::stream! {
-                    for file_p in file_index {
+                    for file_p in file_index.clone() {
                         let file_p_2 = file_p.clone();
                         let file = os.get(&object_store::path::Path::from(file_p)).await;
                         if let Ok(file) = file {
@@ -691,6 +698,40 @@ async fn get_logs_from_store(
     }
     return None;
 }
+
+async fn get_logs_from_disk(
+    log_offset: i32,
+    logs: &str,
+    log_file_index: &Option<Vec<String>>,
+) -> Option<error::Result<Body>> {
+    if log_offset > 0 {
+        if let Some(file_index) = log_file_index.clone() {
+            for file_p in &file_index {
+                if !tokio::fs::metadata(format!("{TMP_DIR}/{file_p}"))
+                    .await
+                    .is_ok()
+                {
+                    return None;
+                }
+            }
+
+            let logs = logs.to_string();
+            let stream = async_stream::stream! {
+                for file_p in file_index.clone() {
+                    let mut file = tokio::fs::File::open(format!("{TMP_DIR}/{file_p}")).await.map_err(to_anyhow)?;
+                    let mut buffer = Vec::new();
+                    file.read_to_end(&mut buffer).await.map_err(to_anyhow)?;
+                    yield Ok(bytes::Bytes::from(buffer)) as anyhow::Result<bytes::Bytes>;
+                }
+
+                yield Ok(bytes::Bytes::from(logs))
+            };
+            return Some(Ok(Body::from_stream(stream)));
+        }
+    }
+    return None;
+}
+
 async fn get_job_logs(
     Extension(db): Extension<DB>,
     Path((w_id, id)): Path<(String, Uuid)>,
@@ -709,7 +750,11 @@ async fn get_job_logs(
     if let Some(record) = record {
         let logs = record.logs.unwrap_or_default();
         #[cfg(all(feature = "enterprise", feature = "parquet"))]
-        if let Some(r) = get_logs_from_store(record.log_offset, &logs, record.log_file_index).await
+        if let Some(r) = get_logs_from_store(record.log_offset, &logs, &record.log_file_index).await
+        {
+            return r;
+        }
+        if let Some(r) = get_logs_from_disk(record.log_offset, &logs, &record.log_file_index).await
         {
             return r;
         }
@@ -729,7 +774,10 @@ async fn get_job_logs(
 
         let logs = text.logs.unwrap_or_default();
         #[cfg(all(feature = "enterprise", feature = "parquet"))]
-        if let Some(r) = get_logs_from_store(text.log_offset, &logs, text.log_file_index).await {
+        if let Some(r) = get_logs_from_store(text.log_offset, &logs, &text.log_file_index).await {
+            return r;
+        }
+        if let Some(r) = get_logs_from_disk(text.log_offset, &logs, &text.log_file_index).await {
             return r;
         }
         Ok(Body::from(logs))
@@ -779,6 +827,8 @@ pub struct ListableCompletedJob {
     pub tag: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub priority: Option<i16>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub labels: Option<serde_json::Value>,
 }
 
 #[derive(Deserialize, Clone)]
@@ -839,6 +889,7 @@ pub struct ListQueueQuery {
     pub all_workspaces: Option<bool>,
     pub is_flow_step: Option<bool>,
     pub has_null_parent: Option<bool>,
+    pub is_not_schedule: Option<bool>,
 }
 
 fn list_queue_jobs_query(w_id: &str, lq: &ListQueueQuery, fields: &[&str]) -> SqlBuilder {
@@ -943,6 +994,10 @@ fn list_queue_jobs_query(w_id: &str, lq: &ListQueueQuery, fields: &[&str]) -> Sq
         sqlb.and_where_le("scheduled_for", "now()");
     }
 
+    if lq.is_not_schedule.unwrap_or(false) {
+        sqlb.and_where("schedule_path IS null");
+    }
+
     sqlb
 }
 
@@ -1171,13 +1226,14 @@ async fn list_jobs(
                 "null as concurrent_limit",
                 "null as concurrency_time_window_s",
                 "priority",
+                "result->'wm_labels' as labels",
             ],
         ))
     } else {
         None
     };
 
-    let sql = if lq.success.is_none() {
+    let sql = if lq.success.is_none() && lq.label.is_none() {
         let sqlq = list_queue_jobs_query(
             &w_id,
             &ListQueueQuery {
@@ -1203,6 +1259,7 @@ async fn list_jobs(
                 all_workspaces: lq.all_workspaces,
                 is_flow_step: lq.is_flow_step,
                 has_null_parent: lq.has_null_parent,
+                is_not_schedule: lq.is_not_schedule,
             },
             &[
                 "'QueuedJob' as typ",
@@ -1236,6 +1293,7 @@ async fn list_jobs(
                 "concurrent_limit",
                 "concurrency_time_window_s",
                 "priority",
+                "null as labels",
             ],
         );
 
@@ -1968,6 +2026,7 @@ struct UnifiedJob {
     concurrent_limit: Option<i32>,
     concurrency_time_window_s: Option<i32>,
     priority: Option<i16>,
+    labels: Option<serde_json::Value>,
 }
 
 impl<'a> From<UnifiedJob> for Job {
@@ -2005,6 +2064,7 @@ impl<'a> From<UnifiedJob> for Job {
                 mem_peak: uj.mem_peak,
                 tag: uj.tag,
                 priority: uj.priority,
+                labels: uj.labels,
             }),
             "QueuedJob" => Job::QueuedJob(QueuedJob {
                 workspace_id: uj.workspace_id,
@@ -2064,7 +2124,9 @@ enum PreviewKind {
     Identity,
     Http,
     Noop,
+    Bundle,
 }
+
 #[derive(Deserialize)]
 struct Preview {
     content: Option<String>,
@@ -2285,7 +2347,7 @@ pub async fn restart_flow(
     check_license_key_valid().await?;
 
     let completed_job = sqlx::query_as::<_, CompletedJob>(
-        "SELECT * from completed_job WHERE id = $1 and workspace_id = $2",
+        "SELECT *, result->'wm_labels' as labels from completed_job WHERE id = $1 and workspace_id = $2",
     )
     .bind(job_id)
     .bind(&w_id)
@@ -2407,6 +2469,7 @@ pub async fn run_workflow_as_code(
     let (job_payload, tag, _delete_after_use, timeout) = match job.job_kind {
         JobKind::Preview => (
             JobPayload::Code(RawCode {
+                hash: None,
                 content: job.raw_code.unwrap_or_default(),
                 path: job.script_path,
                 language: job.language.unwrap_or_else(|| ScriptLang::Deno),
@@ -2508,7 +2571,7 @@ async fn run_wait_result(
     w_id: String,
     node_id_for_empty_return: Option<String>,
 ) -> error::Result<Response> {
-    let mut result;
+    let mut result = None;
     let timeout = SERVER_CONFIG.read().await.timeout_wait_result.clone();
     let timeout_ms = if timeout <= 0 {
         2000
@@ -2532,7 +2595,9 @@ async fn run_wait_result(
             )
             .await
             .ok();
-        } else {
+        }
+
+        if result.is_none() {
             let row = sqlx::query(
                 "SELECT result, language, flow_status FROM completed_job WHERE id = $1 AND workspace_id = $2",
             )
@@ -2550,8 +2615,6 @@ async fn run_wait_result(
                     FormattedResult::RawValue(rv) => rv,
                     FormattedResult::Vec(v) => Some(to_raw_value(&v)),
                 };
-            } else {
-                result = None;
             }
         }
 
@@ -3070,6 +3133,7 @@ async fn run_preview_script(
             Some(PreviewKind::Identity) => JobPayload::Identity,
             Some(PreviewKind::Noop) => JobPayload::Noop,
             _ => JobPayload::Code(RawCode {
+                hash: None,
                 content: preview.content.unwrap_or_default(),
                 path: preview.path,
                 language: preview.language.unwrap_or(ScriptLang::Deno),
@@ -3104,6 +3168,136 @@ async fn run_preview_script(
     Ok((StatusCode::CREATED, uuid.to_string()))
 }
 
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+async fn run_bundle_preview_script(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
+    Path(w_id): Path<String>,
+    Query(run_query): Query<RunJobQuery>,
+    mut multipart: axum::extract::Multipart,
+) -> error::Result<(StatusCode, String)> {
+    check_license_key_valid().await?;
+
+    check_scopes(&authed, || format!("runscript"))?;
+    if authed.is_operator {
+        return Err(error::Error::NotAuthorized(
+            "Operators cannot run preview jobs for security reasons".to_string(),
+        ));
+    }
+
+    let mut job_id = None;
+    let mut tx = None;
+    let mut uploaded = false;
+    while let Some(field) = multipart.next_field().await.unwrap() {
+        let name = field.name().unwrap().to_string();
+        let data = field.bytes().await.unwrap();
+        if name == "preview" {
+            let preview: Preview = serde_json::from_slice(&data).map_err(to_anyhow)?;
+
+            let scheduled_for = run_query.get_scheduled_for(&db).await?;
+            let tag = run_query.tag.clone().or(preview.tag.clone());
+            check_tag_available_for_workspace(&w_id, &tag).await?;
+            let ltx =
+                PushIsolationLevel::Isolated(user_db.clone(), authed.clone().into(), rsmq.clone());
+
+            let args = preview.args.unwrap_or_default();
+
+            // hmap.insert("")
+            let (uuid, ntx) = push(
+                &db,
+                ltx,
+                &w_id,
+                match preview.kind {
+                    Some(PreviewKind::Identity) => JobPayload::Identity,
+                    Some(PreviewKind::Noop) => JobPayload::Noop,
+                    _ => JobPayload::Code(RawCode {
+                        hash: Some(PREVIEW_IS_CODEBASE_HASH),
+                        content: preview.content.unwrap_or_default(),
+                        path: preview.path,
+                        language: preview.language.unwrap_or(ScriptLang::Deno),
+                        lock: preview.lock,
+                        concurrent_limit: None, // TODO(gbouv): once I find out how to store limits in the content of a script, should be easy to plug limits here
+                        concurrency_time_window_s: None, // TODO(gbouv): same as above
+                        cache_ttl: None,
+                        dedicated_worker: preview.dedicated_worker,
+                    }),
+                },
+                args,
+                authed.display_username(),
+                &authed.email,
+                username_to_permissioned_as(&authed.username),
+                scheduled_for,
+                None,
+                None,
+                None,
+                run_query.job_id,
+                false,
+                false,
+                None,
+                true,
+                tag,
+                run_query.timeout,
+                None,
+                None,
+            )
+            .await?;
+            job_id = Some(uuid);
+            tx = Some(ntx);
+        }
+        if name == "file" {
+            let id = job_id
+                .as_ref()
+                .ok_or_else(|| {
+                    Error::BadRequest(
+                        "script need to be passed first in the multipart upload".to_string(),
+                    )
+                })?
+                .to_string();
+
+            uploaded = true;
+
+            if let Some(os) = windmill_common::s3_helpers::OBJECT_STORE_CACHE_SETTINGS
+                .read()
+                .await
+                .clone()
+            {
+                let path = windmill_common::s3_helpers::bundle(&w_id, &id);
+                if let Err(e) = os
+                    .put(&object_store::path::Path::from(path.clone()), data)
+                    .await
+                {
+                    tracing::info!("Failed to put snapshot to s3 at {path}: {:?}", e);
+                    return Err(Error::ExecutionErr(format!("Failed to put {path} to s3")));
+                }
+            } else {
+                return Err(Error::BadConfig("Object store is required for snapshot script and is not configured for servers".to_string()));
+            }
+        }
+        // println!("Length of `{}` is {} bytes", name, data.len());
+    }
+    if !uploaded {
+        return Err(Error::BadRequest("No file uploaded".to_string()));
+    }
+    if job_id.is_none() {
+        return Err(Error::BadRequest(
+            "No script found in the uploaded file".to_string(),
+        ));
+    }
+
+    tx.unwrap().commit().await?;
+
+    Ok((StatusCode::CREATED, job_id.unwrap().to_string()))
+}
+
+#[cfg(not(all(feature = "enterprise", feature = "parquet")))]
+async fn run_bundle_preview_script() -> error::Result<(StatusCode, String)> {
+    return Err(Error::BadRequest(
+        "bundle preview is an ee feature".to_string(),
+    ));
+}
+
 #[derive(Deserialize)]
 pub struct RunDependenciesRequest {
     pub raw_scripts: Vec<RawScriptForDependencies>,
@@ -3498,45 +3692,20 @@ pub struct JobUpdate {
     pub flow_status: Option<serde_json::Value>,
 }
 
-// #[cfg(all(feature = "enterprise", feature = "parquet"))]
-// async fn get_logs_from_store(
-//     log_offset: i32,
-//     logs: &str,
-//     log_file_index: Option<Vec<String>>,
-// ) -> Option<error::Result<Body>> {
-//     if log_offset > 0 {
-//         if let Some(file_index) = log_file_index {
-//             tracing::debug!("Getting logs from store: {file_index:?}");
-//             if let Some(os) = OBJECT_STORE_CACHE_SETTINGS.read().await.clone() {
-//                 tracing::debug!("object store client present, streaming from there");
-
-//                 let logs = logs.to_string();
-//                 let stream = async_stream::stream! {
-//                     for file_p in file_index {
-//                         let file_p_2 = file_p.clone();
-//                         let file = os.get(&object_store::path::Path::from(file_p)).await;
-//                         if let Ok(file) = file {
-//                             if let Ok(bytes) = file.bytes().await {
-//                                 yield Ok(bytes::Bytes::from(bytes)) as object_store::Result<bytes::Bytes>;
-//                             }
-//                         } else {
-//                             tracing::debug!("error getting file from store: {file_p_2}: {}", file.err().unwrap());
-//                         }
-//                     }
-
-//                     yield Ok(bytes::Bytes::from(logs))
-//                 };
-//                 return Some(Ok(Body::from_stream(stream)));
-//             } else {
-//                 tracing::debug!("object store client not present, cannot stream logs from store");
-//             }
-//         }
-//     }
-//     return None;
-// }
-
-#[cfg(all(feature = "enterprise", feature = "parquet"))]
 async fn get_log_file(Path((_w_id, file_p)): Path<(String, String)>) -> error::Result<Response> {
+    let local_file = format!("{TMP_DIR}/logs/{file_p}");
+    if tokio::fs::metadata(&local_file).await.is_ok() {
+        let mut file = tokio::fs::File::open(local_file).await.map_err(to_anyhow)?;
+        let mut buffer = Vec::new();
+        file.read_to_end(&mut buffer).await.map_err(to_anyhow)?;
+        let res = Response::builder()
+            .header(http::header::CONTENT_TYPE, "text/plain")
+            .body(Body::from(bytes::Bytes::from(buffer)))
+            .unwrap();
+        return Ok(res);
+    }
+
+    #[cfg(all(feature = "enterprise", feature = "parquet"))]
     if let Some(os) = OBJECT_STORE_CACHE_SETTINGS.read().await.clone() {
         let file = os
             .get(&object_store::path::Path::from(format!("logs/{file_p}")))
@@ -3566,12 +3735,9 @@ async fn get_log_file(Path((_w_id, file_p)): Path<(String, String)>) -> error::R
             "Object store client not present, cannot stream logs from store".to_string(),
         ));
     }
-}
 
-#[cfg(not(all(feature = "enterprise", feature = "parquet")))]
-async fn get_log_file(Path((_w_id, file_p)): Path<(String, String)>) -> error::Result<Response> {
     return Err(error::Error::NotFound(format!(
-        "Get log file is an EE feature: {}",
+        "File not found on server logs volume /tmp/windmill/logs and no distributed logs s3 storage for {}",
         file_p
     )));
 }
@@ -3732,6 +3898,17 @@ fn list_completed_jobs_query(
         sqlb.and_where("result @> ?".bind(&result.replace("'", "''")));
     }
 
+    if let Some(label) = &lq.label {
+        let mut wh = format!("result->'wm_labels' ? ");
+        wh.push_str(&format!("'{}'", &label.replace("'", "''")));
+        sqlb.and_where(&wh);
+        sqlb.and_where("result ? 'wm_labels'");
+    }
+
+    if lq.is_not_schedule.unwrap_or(false) {
+        sqlb.and_where("schedule_path IS null");
+    }
+
     sqlb
 }
 #[derive(Deserialize, Clone)]
@@ -3763,6 +3940,8 @@ pub struct ListCompletedQuery {
     pub scheduled_for_before_now: Option<bool>,
     pub all_workspaces: Option<bool>,
     pub has_null_parent: Option<bool>,
+    pub label: Option<String>,
+    pub is_not_schedule: Option<bool>,
 }
 
 async fn list_completed_jobs(
@@ -3810,6 +3989,7 @@ async fn list_completed_jobs(
             "mem_peak",
             "tag",
             "priority",
+            "result->'wm_labels' as labels",
             "'CompletedJob' as type",
         ],
     )
@@ -3827,7 +4007,7 @@ async fn get_completed_job<'a>(
     let job_o = sqlx::query("SELECT id, workspace_id, parent_job, created_by, created_at, duration_ms, success, script_hash, script_path, 
     CASE WHEN args is null or pg_column_size(args) < 2000000 THEN args ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as args, CASE WHEN result is null or pg_column_size(result) < 2000000 THEN result ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as result, logs, deleted, raw_code, canceled, canceled_by, canceled_reason, job_kind, env_id,
     schedule_path, permissioned_as, flow_status, raw_flow, is_flow_step, language, started_at, is_skipped,
-    raw_lock, email, visible_to_owner, mem_peak, tag, priority FROM completed_job WHERE id = $1 AND workspace_id = $2")
+    raw_lock, email, visible_to_owner, mem_peak, tag, priority, result->'wm_labels' as labels FROM completed_job WHERE id = $1 AND workspace_id = $2")
         .bind(id)
         .bind(w_id)
         .fetch_optional(&db)

backend/windmill-api/src/lib.rs

@@ -25,6 +25,7 @@ use db::DB;
 use git_version::git_version;
 use reqwest::Client;
 use std::collections::HashMap;
+use std::time::Duration;
 use std::{net::SocketAddr, sync::Arc};
 use tokio::sync::RwLock;
 use tower::ServiceBuilder;
@@ -104,6 +105,8 @@ lazy_static::lazy_static! {
 
     pub static ref HTTP_CLIENT: Client = reqwest::ClientBuilder::new()
         .user_agent("windmill/beta")
+        .connect_timeout(Duration::from_secs(10))
+        .timeout(Duration::from_secs(30))
         .danger_accept_invalid_certs(std::env::var("ACCEPT_INVALID_CERTS").is_ok())
         .build().unwrap();
 
@@ -141,14 +144,12 @@ pub async fn run_server(
     ));
     let argon2 = Arc::new(Argon2::default());
 
+    let disable_response_logs = std::env::var("DISABLE_RESPONSE_LOGS")
+        .ok()
+        .map(|x| x == "true")
+        .unwrap_or(false);
+
     let middleware_stack = ServiceBuilder::new()
-        .layer(
-            TraceLayer::new_for_http()
-                .on_response(MyOnResponse {})
-                .make_span_with(MyMakeSpan {})
-                .on_request(())
-                .on_failure(MyOnFailure {}),
-        )
         .layer(Extension(db.clone()))
         .layer(Extension(rsmq))
         .layer(Extension(user_db))
@@ -285,6 +286,18 @@ pub async fn run_server(
         .fallback(static_assets::static_handler)
         .layer(middleware_stack);
 
+    let app = if disable_response_logs {
+        app
+    } else {
+        app.layer(
+            TraceLayer::new_for_http()
+                .on_response(MyOnResponse {})
+                .make_span_with(MyMakeSpan {})
+                .on_request(())
+                .on_failure(MyOnFailure {}),
+        )
+    };
+
     let instance_name = rd_string(5);
 
     let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
@@ -320,6 +333,7 @@ async fn is_up_to_date() -> Result<String, AppError> {
     let error_reading_version = || anyhow::anyhow!("Error reading latest released version");
     let version = HTTP_CLIENT
         .get("https://api.github.com/repos/windmill-labs/windmill/releases/latest")
+        .timeout(Duration::from_secs(10))
         .send()
         .await
         .context("Impossible to reach api.github")?

backend/windmill-api/src/schedule.rs

@@ -221,7 +221,7 @@ async fn create_schedule(
     .await?;
 
     if ns.enabled.unwrap_or(true) {
-        tx = push_scheduled_job(&db, tx, schedule).await?
+        tx = push_scheduled_job(&db, tx, &schedule).await?
     }
     tx.commit().await?;
 
@@ -303,7 +303,7 @@ async fn edit_schedule(
     .await?;
 
     if schedule.enabled {
-        tx = push_scheduled_job(&db, tx, schedule).await?;
+        tx = push_scheduled_job(&db, tx, &schedule).await?;
     }
     tx.commit().await?;
 
@@ -512,7 +512,7 @@ pub async fn set_enabled(
     .await?;
 
     if payload.enabled {
-        tx = push_scheduled_job(&db, tx, schedule).await?;
+        tx = push_scheduled_job(&db, tx, &schedule).await?;
     }
     tx.commit().await?;
 
@@ -560,7 +560,7 @@ pub async fn set_enabled(
 //     .await?;
 
 //     if payload.enabled {
-//         tx = push_scheduled_job(&db, tx, schedule).await?;
+//         tx = push_scheduled_job(&db, tx, &schedule).await?;
 //     }
 //     tx.commit().await?;
 

backend/windmill-api/src/scripts.rs

@@ -13,6 +13,9 @@ use crate::{
     webhook_util::{WebhookMessage, WebhookShared},
     HTTP_CLIENT,
 };
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+use axum::extract::Multipart;
+
 use axum::{
     extract::{Extension, Path, Query},
     response::IntoResponse,
@@ -31,6 +34,10 @@ use std::{
 };
 use windmill_audit::audit_ee::audit_log;
 use windmill_audit::ActionKind;
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+use windmill_common::error::to_anyhow;
+
 use windmill_common::{
     db::UserDB,
     error::{Error, JsonResult, Result},
@@ -91,6 +98,8 @@ pub struct ScriptWDraft {
     pub concurrency_key: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub visible_to_runner_only: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub no_main_func: Option<bool>,
 }
 
 pub fn global_service() -> Router {
@@ -114,6 +123,7 @@ pub fn workspaced_service() -> Router {
         .route("/list", get(list_scripts))
         .route("/list_search", get(list_search_scripts))
         .route("/create", post(create_script))
+        .route("/create_snapshot", post(create_snapshot_script))
         .route("/archive/p/*path", post(archive_script_by_path))
         .route("/get/draft/*path", get(get_script_by_path_w_draft))
         .route("/get/p/*path", get(get_script_by_path))
@@ -192,7 +202,9 @@ async fn list_scripts(
             "tag",
             "draft.path IS NOT NULL as has_draft",
             "draft_only",
-            "ws_error_handler_muted"
+            "ws_error_handler_muted",
+            "no_main_func",
+            "codebase IS NOT NULL as use_codebase"
         ])
         .left()
         .join("favorite")
@@ -212,6 +224,10 @@ async fn list_scripts(
         .limit(per_page)
         .clone();
 
+    if authed.is_operator || lq.hide_without_main.unwrap_or(false) {
+        sqlb.and_where("o.no_main_func IS NOT TRUE");
+    }
+
     if lq.show_archived.unwrap_or(false) {
         sqlb.and_where_eq(
             "o.created_at",
@@ -305,6 +321,82 @@ fn hash_script(ns: &NewScript) -> i64 {
     dh.finish() as i64
 }
 
+#[cfg(not(all(feature = "enterprise", feature = "parquet")))]
+async fn create_snapshot_script() -> Result<(StatusCode, String)> {
+    Err(Error::BadRequest("Upgrade to EE to use bundle".to_string()))
+}
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+async fn create_snapshot_script(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Extension(rsmq): Extension<Option<rsmq_async::MultiplexedRsmq>>,
+    Extension(webhook): Extension<WebhookShared>,
+    Extension(db): Extension<DB>,
+    Path(w_id): Path<String>,
+    mut multipart: Multipart,
+) -> Result<(StatusCode, String)> {
+    let mut script_hash = None;
+    let mut tx = None;
+    let mut uploaded = false;
+    while let Some(field) = multipart.next_field().await.unwrap() {
+        let name = field.name().unwrap().to_string();
+        let data = field.bytes().await.unwrap();
+        if name == "script" {
+            let ns = Some(serde_json::from_slice(&data).map_err(to_anyhow)?);
+            let (new_hash, ntx) = create_script_internal(
+                ns.unwrap(),
+                w_id.clone(),
+                authed.clone(),
+                db.clone(),
+                rsmq.clone(),
+                user_db.clone(),
+                webhook.clone(),
+            )
+            .await?;
+            script_hash = Some(new_hash.to_string());
+            tx = Some(ntx);
+        }
+        if name == "file" {
+            let hash = script_hash.as_ref().ok_or_else(|| {
+                Error::BadRequest(
+                    "script need to be passed first in the multipart upload".to_string(),
+                )
+            })?;
+
+            uploaded = true;
+            if let Some(os) = windmill_common::s3_helpers::OBJECT_STORE_CACHE_SETTINGS
+                .read()
+                .await
+                .clone()
+            {
+                let path = windmill_common::s3_helpers::bundle(&w_id, &hash);
+                if let Err(e) = os
+                    .put(&object_store::path::Path::from(path.clone()), data)
+                    .await
+                {
+                    tracing::info!("Failed to put snapshot to s3 at {path}: {:?}", e);
+                    return Err(Error::ExecutionErr(format!("Failed to put {path} to s3")));
+                }
+            } else {
+                return Err(Error::BadConfig("Object store is required for snapshot script and is not configured for servers".to_string()));
+            }
+        }
+        // println!("Length of `{}` is {} bytes", name, data.len());
+    }
+    if !uploaded {
+        return Err(Error::BadRequest("No file uploaded".to_string()));
+    }
+    if script_hash.is_none() {
+        return Err(Error::BadRequest(
+            "No script found in the uploaded file".to_string(),
+        ));
+    }
+
+    tx.unwrap().commit().await?;
+    return Ok((StatusCode::CREATED, format!("{}", script_hash.unwrap())));
+}
+
 async fn create_script(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -314,6 +406,24 @@ async fn create_script(
     Path(w_id): Path<String>,
     Json(ns): Json<NewScript>,
 ) -> Result<(StatusCode, String)> {
+    let (hash, tx) = create_script_internal(ns, w_id, authed, db, rsmq, user_db, webhook).await?;
+    tx.commit().await?;
+    Ok((StatusCode::CREATED, format!("{}", hash)))
+}
+
+async fn create_script_internal<'c>(
+    ns: NewScript,
+    w_id: String,
+    authed: ApiAuthed,
+    db: sqlx::Pool<Postgres>,
+    rsmq: Option<rsmq_async::MultiplexedRsmq>,
+    user_db: UserDB,
+    webhook: WebhookShared,
+) -> Result<(
+    ScriptHash,
+    QueueTransaction<'c, rsmq_async::MultiplexedRsmq>,
+)> {
+    let codebase = ns.codebase.as_ref();
     #[cfg(not(feature = "enterprise"))]
     if ns.ws_error_handler_muted.is_some_and(|val| val) {
         return Err(Error::BadRequest(
@@ -321,12 +431,10 @@ async fn create_script(
                 .to_string(),
         ));
     }
-
     let script_path = ns.path.clone();
     let hash = ScriptHash(hash_script(&ns));
     let authed = maybe_refresh_folders(&ns.path, &w_id, authed, &db).await;
     let mut tx: QueueTransaction<'_, _> = (rsmq.clone(), user_db.begin(&authed).await?).into();
-
     if sqlx::query_scalar!(
         "SELECT 1 FROM script WHERE hash = $1 AND workspace_id = $2",
         hash.0,
@@ -342,7 +450,6 @@ async fn create_script(
                 .to_owned(),
         ));
     };
-
     let clashing_script = sqlx::query_as::<_, Script>(
         "SELECT * FROM script WHERE path = $1 AND archived = false AND workspace_id = $2",
     )
@@ -350,7 +457,6 @@ async fn create_script(
     .bind(&w_id)
     .fetch_optional(&mut tx)
     .await?;
-
     struct ParentInfo {
         p_hashes: Vec<i64>,
         perms: serde_json::Value,
@@ -443,13 +549,11 @@ async fn create_script(
             r
         }
     }?;
-
     let p_hashes = parent_hashes_and_perms.as_ref().map(|v| &v.p_hashes[..]);
     let extra_perms = parent_hashes_and_perms
         .as_ref()
         .map(|v| v.perms.clone())
         .unwrap_or(json!({}));
-
     let lock = if !(ns.language == ScriptLang::Python3
         || ns.language == ScriptLang::Go
         || ns.language == ScriptLang::Bun
@@ -460,23 +564,20 @@ async fn create_script(
         ns.lock
             .and_then(|e| if e.is_empty() { None } else { Some(e) })
     };
-
     let needs_lock_gen = lock.is_none();
-
     let envs = ns.envs.as_ref().map(|x| x.as_slice());
     let envs = if ns.envs.is_none() || ns.envs.as_ref().unwrap().is_empty() {
         None
     } else {
         envs
     };
-    //::text::json is to ensure we use serde_json with preserve order
     sqlx::query!(
         "INSERT INTO script (workspace_id, hash, path, parent_hashes, summary, description, \
          content, created_by, schema, is_template, extra_perms, lock, language, kind, tag, \
          draft_only, envs, concurrent_limit, concurrency_time_window_s, cache_ttl, \
          dedicated_worker, ws_error_handler_muted, priority, restart_unless_cancelled, \
-         delete_after_use, timeout, concurrency_key, visible_to_runner_only) \
-         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::text::json, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28)",
+         delete_after_use, timeout, concurrency_key, visible_to_runner_only, no_main_func, codebase) \
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::text::json, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30)",
         &w_id,
         &hash.0,
         ns.path,
@@ -505,10 +606,11 @@ async fn create_script(
         ns.timeout,
         ns.concurrency_key,
         ns.visible_to_runner_only,
+        ns.no_main_func,
+        codebase
     )
     .execute(&mut tx)
     .await?;
-
     let p_path_opt = parent_hashes_and_perms.as_ref().map(|x| x.p_path.clone());
     if let Some(ref p_path) = p_path_opt {
         sqlx::query!(
@@ -546,7 +648,7 @@ async fn create_script(
             clear_schedule(tx.transaction_mut(), &schedule.path, &w_id).await?;
 
             if schedule.enabled {
-                tx = push_scheduled_job(&db, tx, schedule).await?;
+                tx = push_scheduled_job(&db, tx, &schedule).await?;
             }
         }
     } else {
@@ -558,7 +660,6 @@ async fn create_script(
         .execute(&mut tx)
         .await?;
     }
-
     if p_hashes.is_some() && !p_hashes.unwrap().is_empty() {
         audit_log(
             &mut tx,
@@ -604,7 +705,6 @@ async fn create_script(
             },
         );
     }
-
     let permissioned_as = username_to_permissioned_as(&authed.username);
     if needs_lock_gen {
         let tag = if ns.dedicated_worker.is_some_and(|x| x) {
@@ -653,7 +753,7 @@ async fn create_script(
             None,
         )
         .await?;
-        new_tx.commit().await?;
+        Ok((hash, new_tx))
     } else {
         handle_deployment_metadata(
             &authed.email,
@@ -670,10 +770,8 @@ async fn create_script(
             false,
         )
         .await?;
-        tx.commit().await?;
+        Ok((hash, tx))
     }
-
-    Ok((StatusCode::CREATED, format!("{}", hash)))
 }
 
 pub async fn get_hub_script_by_path(
@@ -724,7 +822,7 @@ async fn get_script_by_path_w_draft(
     let mut tx = user_db.begin(&authed).await?;
 
     let script_o = sqlx::query_as::<_, ScriptWDraft>(
-        "SELECT hash, script.path, summary, description, content, language, kind, tag, schema, draft_only, envs, concurrent_limit, concurrency_time_window_s, cache_ttl, ws_error_handler_muted, draft.value as draft, dedicated_worker, priority, restart_unless_cancelled, delete_after_use, timeout, concurrency_key, visible_to_runner_only FROM script LEFT JOIN draft ON 
+        "SELECT hash, script.path, summary, description, content, language, kind, tag, schema, draft_only, envs, concurrent_limit, concurrency_time_window_s, cache_ttl, ws_error_handler_muted, draft.value as draft, dedicated_worker, priority, restart_unless_cancelled, delete_after_use, timeout, concurrency_key, visible_to_runner_only, no_main_func FROM script LEFT JOIN draft ON 
          script.path = draft.path AND script.workspace_id = draft.workspace_id AND draft.typ = 'script'
          WHERE script.path = $1 AND script.workspace_id = $2 \
          AND script.created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND \

backend/windmill-api/src/settings.rs

@@ -21,15 +21,17 @@ use axum::{
     Json, Router,
 };
 
-use mail_send::{mail_builder::MessageBuilder, SmtpClientBuilder};
 use serde::Deserialize;
-use tokio::time::timeout;
 use windmill_common::{
-    error::{self, to_anyhow, JsonResult, Result},
+    error::{self, JsonResult, Result},
     global_settings::{AUTOMATE_USERNAME_CREATION_SETTING, ENV_SETTINGS, HUB_BASE_URL_SETTING},
     server::Smtp,
+    utils::send_email,
 };
 
+#[cfg(feature = "parquet")]
+use windmill_common::error::to_anyhow;
+
 pub fn global_service() -> Router {
     #[warn(unused_mut)]
     let r = Router::new()
@@ -67,34 +69,17 @@ pub async fn test_email(
     require_super_admin(&db, &authed.email).await?;
     let smtp = test_email.smtp;
     let to = test_email.to;
-    let mut client = SmtpClientBuilder::new(smtp.host, smtp.port)
-        .implicit_tls(smtp.tls_implicit.unwrap_or(false));
-    if std::env::var("ACCEPT_INVALID_CERTS").is_ok() {
-        client = client.allow_invalid_certs();
-    }
-    let client = if let (Some(username), Some(password)) = (smtp.username, smtp.password) {
-        if !username.is_empty() {
-            client.credentials((username, password))
-        } else {
-            client
-        }
-    } else {
-        client
-    };
-    let message = MessageBuilder::new()
-        .from(("Windmill", smtp.from.as_str()))
-        .to(to.clone())
-        .subject("Test email from Windmill")
-        .text_body("Test email content");
-    let dur = Duration::from_secs(3);
-    timeout(dur, client.connect())
-        .await
-        .map_err(to_anyhow)?
-        .map_err(to_anyhow)?
-        .send(message)
-        .await
-        .map_err(to_anyhow)?;
-    tracing::info!("Sent test email to {to}");
+
+    let client_timeout = Duration::from_secs(3);
+    send_email(
+        "Test email from Windmill",
+        "Test email content",
+        vec![to],
+        smtp,
+        Some(client_timeout),
+    )
+    .await?;
+
     Ok("Sent test email".to_string())
 }
 

backend/windmill-api/src/users.rs

@@ -32,8 +32,6 @@ use axum::{
 };
 use hyper::{header::LOCATION, StatusCode};
 use lazy_static::lazy_static;
-use mail_send::mail_builder::MessageBuilder;
-use mail_send::SmtpClientBuilder;
 use quick_cache::sync::Cache;
 use rand::rngs::OsRng;
 use regex::Regex;
@@ -46,10 +44,11 @@ use windmill_audit::audit_ee::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::global_settings::AUTOMATE_USERNAME_CREATION_SETTING;
 use windmill_common::users::truncate_token;
+use windmill_common::utils::send_email;
 use windmill_common::worker::{CLOUD_HOSTED, SERVER_CONFIG};
 use windmill_common::{
     db::UserDB,
-    error::{self, to_anyhow, Error, JsonResult, Result},
+    error::{self, Error, JsonResult, Result},
     users::SUPERADMIN_SECRET_EMAIL,
     utils::{not_found_if_none, rd_string, require_admin, Pagination, StripPath},
 };
@@ -1337,6 +1336,25 @@ async fn accept_invite(
     .await?;
 
     if let Some(r) = r {
+        let already_in_workspace = sqlx::query_scalar!(
+            "SELECT EXISTS(SELECT 1 FROM usr WHERE workspace_id = $1 AND email = $2)",
+            &nu.workspace_id,
+            &email,
+        )
+        .fetch_one(&mut *tx)
+        .await?
+        .unwrap_or(false);
+
+        if already_in_workspace {
+            tx.commit().await?;
+            return Ok((
+                StatusCode::CREATED,
+                format!(
+                    "user {} accepted invite to workspace {}",
+                    &email, nu.workspace_id
+                ),
+            ));
+        }
         let username;
         (tx, username) = add_user_to_workspace(
             &nu.workspace_id,
@@ -1805,41 +1823,15 @@ pub fn send_email_if_possible(subject: &str, content: &str, to: &str) {
     let content = content.to_string();
     let to = to.to_string();
     tokio::spawn(async move {
-        if let Err(e) = send_email_if_possible_intern(&subject, &content, &to).await {
-            tracing::error!("Failed to send email to {}: {}", &to, e);
+        if let Err(e) = send_email_if_possible_intern(&subject, &content, to.clone()).await {
+            tracing::error!("Failed to send email to {}: {}", to, e);
         }
     });
 }
 
-pub async fn send_email_if_possible_intern(subject: &str, content: &str, to: &str) -> Result<()> {
+pub async fn send_email_if_possible_intern(subject: &str, content: &str, to: String) -> Result<()> {
     if let Some(smtp) = SERVER_CONFIG.read().await.smtp.clone() {
-        let mut client = SmtpClientBuilder::new(smtp.host, smtp.port)
-            .implicit_tls(smtp.tls_implicit.unwrap_or(false));
-        if std::env::var("ACCEPT_INVALID_CERTS").is_ok() {
-            client = client.allow_invalid_certs();
-        }
-        let client = if let (Some(username), Some(password)) = (smtp.username, smtp.password) {
-            if !username.is_empty() {
-                client.credentials((username, password))
-            } else {
-                client
-            }
-        } else {
-            client
-        };
-        let message = MessageBuilder::new()
-            .from(("Windmill", smtp.from.as_str()))
-            .to(to)
-            .subject(subject)
-            .text_body(content);
-        client
-            .connect()
-            .await
-            .map_err(to_anyhow)?
-            .send(message)
-            .await
-            .map_err(to_anyhow)?;
-        tracing::info!("Sent email to {to}: {subject}");
+        send_email(subject, content, vec![to], smtp, None).await?;
     }
     return Ok(());
 }

backend/windmill-api/src/webhook_util.rs

@@ -71,6 +71,7 @@ impl WebhookShared {
         let (tx, mut rx) = mpsc::unbounded_channel::<WebhookPayload>();
         let _process = tokio::spawn(async move {
             let client = reqwest::Client::builder()
+                .connect_timeout(Duration::from_secs(5))
                 // TODO: investigate pool timeouts and such if TCP load is high
                 .timeout(Duration::from_secs(5))
                 .build()

backend/windmill-api/src/workers.rs

@@ -14,14 +14,16 @@ use axum::{
 
 use serde::{Deserialize, Serialize};
 use sqlx::FromRow;
+use uuid::Uuid;
 use windmill_common::{
     db::UserDB,
     error::JsonResult,
     utils::{paginate, Pagination},
     worker::{ALL_TAGS, DEFAULT_TAGS, DEFAULT_TAGS_PER_WORKSPACE},
+    DB,
 };
 
-use crate::db::ApiAuthed;
+use crate::{db::ApiAuthed, utils::require_super_admin};
 
 pub fn global_service() -> Router {
     Router::new()
@@ -33,6 +35,7 @@ pub fn global_service() -> Router {
             get(get_default_tags_per_workspace),
         )
         .route("/get_default_tags", get(get_default_tags))
+        .route("/queue_metrics", get(get_queue_metrics))
 }
 
 #[derive(FromRow, Serialize, Deserialize)]
@@ -43,9 +46,12 @@ struct WorkerPing {
     started_at: chrono::DateTime<chrono::Utc>,
     ip: String,
     jobs_executed: i32,
+    current_job_id: Option<Uuid>,
+    current_job_workspace_id: Option<String>,
     custom_tags: Option<Vec<String>>,
     worker_group: String,
     wm_version: String,
+    occupancy_rate: Option<f32>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -62,21 +68,25 @@ pub struct ListWorkerQuery {
 
 async fn list_worker_pings(
     authed: ApiAuthed,
+    Extension(db): Extension<DB>,
     Extension(user_db): Extension<UserDB>,
     Query(query): Query<ListWorkerQuery>,
 ) -> JsonResult<Vec<WorkerPing>> {
+    let is_super_admin = require_super_admin(&db, &authed.email).await.is_ok();
     let mut tx = user_db.begin(&authed).await?;
 
     let (per_page, offset) = paginate(Pagination { page: query.page, per_page: query.per_page });
 
     let rows = sqlx::query_as!(
         WorkerPing,
-        "SELECT worker, worker_instance,  EXTRACT(EPOCH FROM (now() - ping_at))::integer as last_ping, started_at, ip, jobs_executed, custom_tags, worker_group, wm_version FROM worker_ping
-         WHERE ($1::integer IS NULL AND ping_at > now() - interval '5 minute') OR (ping_at > now() - ($1 || ' seconds')::interval)
-         ORDER BY ping_at desc LIMIT $2 OFFSET $3",
+        "SELECT worker, worker_instance,  EXTRACT(EPOCH FROM (now() - ping_at))::integer as last_ping, started_at, ip, jobs_executed, CASE WHEN $4 IS TRUE THEN current_job_id ELSE NULL END as current_job_id, CASE WHEN $4 IS TRUE THEN current_job_workspace_id ELSE NULL END as current_job_workspace_id, custom_tags, worker_group, wm_version, occupancy_rate
+        FROM worker_ping
+        WHERE ($1::integer IS NULL AND ping_at > now() - interval '5 minute') OR (ping_at > now() - ($1 || ' seconds')::interval)
+        ORDER BY ping_at desc LIMIT $2 OFFSET $3",
         query.ping_since,
         per_page as i64,
-        offset as i64
+        offset as i64,
+        is_super_admin
     )
     .fetch_all(&mut *tx)
     .await?;
@@ -118,3 +128,35 @@ async fn get_default_tags_per_workspace() -> JsonResult<bool> {
 async fn get_default_tags() -> JsonResult<Vec<String>> {
     Ok(Json(DEFAULT_TAGS.clone()))
 }
+
+#[derive(Serialize)]
+struct QueueMetric {
+    id: String,
+    values: Vec<serde_json::Value>,
+}
+
+async fn get_queue_metrics(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+) -> JsonResult<Vec<QueueMetric>> {
+    require_super_admin(&db, &authed.email).await?;
+
+    let queue_metrics = sqlx::query_as!(
+        QueueMetric,
+        "WITH queue_metrics as (
+            SELECT id, value, created_at
+            FROM metrics
+            WHERE id LIKE 'queue_%'
+                AND created_at > now() - interval '14 day'
+            ORDER BY created_at ASC
+        )
+        SELECT id, array_agg(json_build_object('value', value, 'created_at', created_at)) as \"values!\"
+        FROM queue_metrics
+        GROUP BY id
+        ORDER BY id ASC"
+    )
+    .fetch_all(&db)
+    .await?;
+
+    Ok(Json(queue_metrics))
+}

backend/windmill-api/src/workspaces.rs

@@ -53,7 +53,6 @@ use windmill_common::{
     variables::ExportableListableVariable,
 };
 use windmill_git_sync::handle_deployment_metadata;
-use windmill_queue::QueueTransaction;
 
 use crate::oauth2_ee::InstanceEvent;
 use crate::variables::{decrypt, encrypt};
@@ -488,25 +487,25 @@ async fn run_slack_message_test_job(
         json!(format!("$res:{WORKSPACE_SLACK_BOT_TOKEN_PATH}")),
     );
 
-    let tx: QueueTransaction<'_, _> = (rsmq.clone(), db.begin().await?).into();
-    let (uuid, tx) = windmill_queue::handle_on_failure(
+    let uuid = windmill_queue::push_error_handler(
         &db,
-        tx,
+        rsmq,
         Uuid::parse_str("00000000-0000-0000-0000-000000000000")?,
-        "slack_message_test",
-        "slack_message_test",
+        None,
+        Some("slack_message_test".to_string()),
         false,
         w_id.as_str(),
         &format!("script/{}", req.hub_script_path.as_str()),
         sqlx::types::Json(&fake_result),
-        0,
-        Utc::now(),
+        None,
+        Some(Utc::now()),
         Some(json!(extra_args)),
         authed.email.as_str(),
+        false,
+        false,
         None, // Note: we could mark it as high priority to return result quickly to the user
     )
     .await?;
-    tx.commit().await?;
 
     Ok(Json(RunSlackMessageTestJobResponse {
         job_uuid: uuid.to_string(),
@@ -722,6 +721,16 @@ async fn edit_auto_invite(
 
             for user in users_to_auto_add.as_ref().unwrap() {
                 auto_add_user(&user.email, &w_id, &operator, &mut tx).await?;
+                send_email_if_possible(
+                    &format!("Added to Windmill's workspace: {w_id}"),
+                    &format!(
+                        "You have been granted access to Windmill's workspace {w_id} by {email}.
+                        
+                        Access the workspace at {}/?workspace={w_id}",
+                        BASE_URL.read().await.clone()
+                    ),
+                    &user.email,
+                );
             }
         } else {
             sqlx::query!(
@@ -1936,6 +1945,22 @@ async fn invite_user(
 
     let mut tx = db.begin().await?;
 
+    let already_in_workspace = sqlx::query_scalar!(
+        "SELECT EXISTS (SELECT 1 FROM usr WHERE workspace_id = $1 AND email = $2)",
+        &w_id,
+        nu.email
+    )
+    .fetch_one(&mut *tx)
+    .await?
+    .unwrap_or(false);
+
+    if already_in_workspace {
+        return Err(Error::BadRequest(format!(
+            "user with email {} already exists in workspace {}",
+            nu.email, w_id
+        )));
+    }
+
     sqlx::query!(
         "INSERT INTO workspace_invite
             (workspace_id, email, is_admin, operator)
@@ -2046,6 +2071,14 @@ async fn add_user(
     .execute(&mut *tx)
     .await?;
 
+    sqlx::query!(
+        "DELETE FROM workspace_invite WHERE workspace_id = $1 AND email = $2",
+        &w_id,
+        nu.email
+    )
+    .execute(&mut *tx)
+    .await?;
+
     sqlx::query_as!(
         Group,
         "INSERT INTO usr_to_group (workspace_id, usr, group_) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
@@ -2183,6 +2216,10 @@ struct ScriptMetadata {
     pub restart_unless_cancelled: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub visible_to_runner_only: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub no_main_func: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub codebase: Option<String>,
 }
 
 pub fn is_none_or_false(val: &Option<bool>) -> bool {
@@ -2459,6 +2496,8 @@ async fn tarball_workspace(
                 delete_after_use: script.delete_after_use,
                 restart_unless_cancelled: script.restart_unless_cancelled,
                 visible_to_runner_only: script.visible_to_runner_only,
+                no_main_func: script.no_main_func,
+                codebase: script.codebase,
             };
             let metadata_str = serde_json::to_string_pretty(&metadata).unwrap();
             archive

backend/windmill-common/Cargo.toml

@@ -10,7 +10,7 @@ enterprise = []
 prometheus = ["dep:prometheus"]
 flamegraph = ["dep:tracing-flame"]
 loki = ["dep:tracing-loki"]
-parquet = ["dep:object_store", "dep:aws-config", "dep:aws-sdk-sts"]
+parquet = ["dep:object_store", "dep:aws-config", "dep:aws-sdk-sts", "dep:bytes"]
 
 [lib]
 name = "windmill_common"
@@ -46,4 +46,6 @@ object_store = { workspace = true, optional = true }
 prometheus = { workspace = true, optional = true }
 aws-config = { workspace = true, optional = true }
 aws-sdk-sts = { workspace = true, optional = true }
-indexmap.workspace = true
+indexmap.workspace = true
+bytes = { workspace = true, optional = true }
+mail-send.workspace = true

backend/windmill-common/src/ee.rs

@@ -1,4 +1,5 @@
 use crate::ee::LicensePlan::Community;
+use serde::Deserialize;
 use std::sync::Arc;
 use tokio::sync::RwLock;
 
@@ -18,3 +19,9 @@ pub async fn get_license_plan() -> LicensePlan {
     // Implementation is not open source
     return Community;
 }
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+pub enum CriticalErrorChannel {}
+
+pub async fn trigger_critical_error_channels(_error_message: String) {}

backend/windmill-common/src/error.rs

@@ -8,10 +8,7 @@
 
 use axum::body::Body;
 use axum::response::Response;
-use axum::{
-    response::IntoResponse,
-    response::Json,
-};
+use axum::{response::IntoResponse, response::Json};
 
 use hyper::StatusCode;
 use sqlx::migrate::MigrateError;
@@ -45,6 +42,8 @@ pub enum Error {
     SqlErr(#[from] sqlx::Error),
     #[error("Bad request: {0}")]
     BadRequest(String),
+    #[error("Quota exceeded: {0}")]
+    QuotaExceeded(String),
     #[error("Internal: {0}")]
     InternalErr(String),
     #[error("Hexadecimal decoding error: {0}")]
@@ -59,6 +58,8 @@ pub enum Error {
     JsonErr(serde_json::Value),
     #[error("{0}")]
     OpenAIError(String),
+    #[error("{0}")]
+    AlreadyCompleted(String),
 }
 
 impl Error {
@@ -81,9 +82,10 @@ impl IntoResponse for Error {
             Self::NotFound(_) => axum::http::StatusCode::NOT_FOUND,
             Self::NotAuthorized(_) => axum::http::StatusCode::UNAUTHORIZED,
             Self::RequireAdmin(_) => axum::http::StatusCode::FORBIDDEN,
-            Self::SqlErr(_) | Self::BadRequest(_) | Self::OpenAIError(_) => {
-                axum::http::StatusCode::BAD_REQUEST
-            }
+            Self::SqlErr(_)
+            | Self::BadRequest(_)
+            | Self::OpenAIError(_)
+            | Self::QuotaExceeded(_) => axum::http::StatusCode::BAD_REQUEST,
             _ => axum::http::StatusCode::INTERNAL_SERVER_ERROR,
         };
 

backend/windmill-common/src/external_ip.rs

@@ -13,16 +13,19 @@
 
 use std::time::Duration;
 
-use reqwest::Result;
-
-pub async fn get_ip() -> Result<String> {
-    reqwest::ClientBuilder::new()
-        .timeout(Duration::from_secs(3))
+pub async fn get_ip() -> anyhow::Result<String> {
+    tokio::select! {
+        biased;
+        _ = tokio::time::sleep(Duration::from_secs(10)) => {
+            return Err(anyhow::anyhow!("Expected to get ip under 10s"))
+        },
+        ip = reqwest::ClientBuilder::new()
+        .connect_timeout(Duration::from_secs(5))
+        .timeout(Duration::from_secs(5))
         .build()?
         .get("https://hub.windmill.dev/getip")
-        .send()
-        .await?
-        .error_for_status()?
-        .text()
-        .await
+        .send() => Ok(ip?
+            .error_for_status()?
+            .text().await?),
+    }
 }

backend/windmill-common/src/flow_status.rs

@@ -29,7 +29,7 @@ pub fn is_retry_default(v: &RetryStatus) -> bool {
 pub struct FlowStatus {
     pub step: i32,
     pub modules: Vec<FlowStatusModule>,
-    pub failure_module: FlowStatusModuleWParent,
+    pub failure_module: Box<FlowStatusModuleWParent>,
 
     #[serde(skip_serializing_if = "HashMap::is_empty")]
     #[serde(default)]
@@ -227,7 +227,7 @@ impl FlowStatus {
                 .iter()
                 .map(|m| FlowStatusModule::WaitingForPriorSteps { id: m.id.clone() })
                 .collect(),
-            failure_module: FlowStatusModuleWParent {
+            failure_module: Box::new(FlowStatusModuleWParent {
                 parent_module: None,
                 module_status: FlowStatusModule::WaitingForPriorSteps {
                     id: f
@@ -236,7 +236,7 @@ impl FlowStatus {
                         .map(|x| x.id.clone())
                         .unwrap_or_else(|| "failure".to_string()),
                 },
-            },
+            }),
             cleanup_module: FlowCleanupModule { flow_jobs_to_clean: vec![] },
             retry: RetryStatus { fail_count: 0, failed_jobs: vec![] },
             restarted_from: None,

backend/windmill-common/src/flows.rs

@@ -87,7 +87,7 @@ pub struct FlowValue {
     pub modules: Vec<FlowModule>,
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]
-    pub failure_module: Option<FlowModule>,
+    pub failure_module: Option<Box<FlowModule>>,
     #[serde(default)]
     #[serde(skip_serializing_if = "is_default")]
     pub same_worker: bool,

backend/windmill-common/src/global_settings.rs

@@ -24,6 +24,7 @@ pub const OBJECT_STORE_CACHE_CONFIG_SETTING: &str = "object_store_cache_config";
 
 pub const AUTOMATE_USERNAME_CREATION_SETTING: &str = "automate_username_creation";
 pub const HUB_BASE_URL_SETTING: &str = "hub_base_url";
+pub const CRITICAL_ERROR_CHANNELS_SETTING: &str = "critical_error_channels";
 
 pub const ENV_SETTINGS: [&str; 50] = [
     "DISABLE_NSJAIL",

backend/windmill-common/src/jobs.rs

@@ -243,6 +243,8 @@ pub struct CompletedJob {
     pub tag: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub priority: Option<i16>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub labels: Option<serde_json::Value>,
 }
 
 impl CompletedJob {
@@ -343,6 +345,7 @@ pub enum JobPayload {
 pub struct RawCode {
     pub content: String,
     pub path: Option<String>,
+    pub hash: Option<i64>,
     pub language: ScriptLang,
     pub lock: Option<String>,
     pub concurrent_limit: Option<i32>,

backend/windmill-common/src/lib.rs

@@ -11,6 +11,7 @@ use std::{
     sync::{atomic::AtomicBool, Arc},
 };
 
+use ee::CriticalErrorChannel;
 use error::Error;
 use scripts::ScriptLang;
 use sqlx::{Pool, Postgres};
@@ -44,7 +45,7 @@ pub mod workspaces;
 pub mod tracing_init;
 
 pub const DEFAULT_MAX_CONNECTIONS_SERVER: u32 = 50;
-pub const DEFAULT_MAX_CONNECTIONS_WORKER: u32 = 4;
+pub const DEFAULT_MAX_CONNECTIONS_WORKER: u32 = 5;
 
 pub const DEFAULT_HUB_BASE_URL: &str = "https://hub.windmill.dev";
 
@@ -73,6 +74,9 @@ lazy_static::lazy_static! {
     pub static ref IS_READY: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
 
     pub static ref HUB_BASE_URL: Arc<RwLock<String>> = Arc::new(RwLock::new(DEFAULT_HUB_BASE_URL.to_string()));
+
+
+    pub static ref CRITICAL_ERROR_CHANNELS: Arc<RwLock<Vec<CriticalErrorChannel>>> = Arc::new(RwLock::new(vec![]));
 }
 
 pub async fn shutdown_signal(

backend/windmill-common/src/s3_helpers.rs

@@ -177,6 +177,48 @@ pub fn build_object_store_client(
     }
 }
 
+#[cfg(feature = "parquet")]
+pub async fn attempt_fetch_bytes(
+    client: Arc<dyn ObjectStore>,
+    path: &str,
+) -> error::Result<bytes::Bytes> {
+    use object_store::path::Path;
+
+    let object = client.get(&Path::from(path)).await;
+    if let Err(e) = object {
+        tracing::info!(
+            "Failed to pull bytes from object store at path {path}. Error: {:?}",
+            e
+        );
+        return Err(error::Error::ExecutionErr(format!(
+            "Failed to pull bytes from object store: {path}"
+        )));
+    }
+
+    let bytes = object.unwrap().bytes().await;
+    if bytes.is_err() {
+        tracing::info!(
+            "Failed to read bytes from object store: {path}. Error: {:?}",
+            bytes.err()
+        );
+        return Err(error::Error::ExecutionErr(format!(
+            "Failed to read bytes from object store: {path}"
+        )));
+    }
+    let bytes = bytes.unwrap();
+
+    tracing::info!("{path} len: {}", bytes.len());
+
+    if bytes.len() == 0 {
+        tracing::info!("object {path} not found in bucket, bytes empty",);
+        return Err(error::Error::ExecutionErr(format!(
+            "object {path} does not exist in bucket"
+        )));
+    }
+
+    return Ok(bytes);
+}
+
 #[cfg(feature = "parquet")]
 use aws_config::{default_provider::credentials::DefaultCredentialsChain, Region};
 #[cfg(feature = "parquet")]
@@ -408,3 +450,7 @@ impl CredentialProvider for AwsCredentialAdapter {
         }))
     }
 }
+
+pub fn bundle(w_id: &str, hash: &str) -> String {
+    format!("script_bundle/{}/{}", w_id, hash)
+}

backend/windmill-common/src/scripts.rs

@@ -128,6 +128,8 @@ impl Display for ScriptKind {
     }
 }
 
+pub const PREVIEW_IS_CODEBASE_HASH: i64 = -42;
+
 #[derive(Serialize, sqlx::FromRow)]
 pub struct Script {
     pub workspace_id: String,
@@ -175,6 +177,10 @@ pub struct Script {
     pub concurrency_key: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub visible_to_runner_only: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub no_main_func: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub codebase: Option<String>,
 }
 
 #[derive(Serialize, sqlx::FromRow)]
@@ -194,6 +200,14 @@ pub struct ListableScript {
     pub draft_only: Option<bool>,
     pub has_deploy_errors: bool,
     pub ws_error_handler_muted: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub no_main_func: Option<bool>,
+    #[serde(skip_serializing_if = "is_false")]
+    pub use_codebase: bool,
+}
+
+fn is_false(x: &bool) -> bool {
+    return !x;
 }
 
 #[derive(Serialize)]
@@ -251,6 +265,8 @@ pub struct NewScript {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub concurrency_key: Option<String>,
     pub visible_to_runner_only: Option<bool>,
+    pub no_main_func: Option<bool>,
+    pub codebase: Option<String>,
 }
 
 fn lock_deserialize<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
@@ -320,6 +336,7 @@ pub struct ListScriptQuery {
     pub is_template: Option<bool>,
     pub kinds: Option<String>,
     pub starred_only: Option<bool>,
+    pub hide_without_main: Option<bool>,
 }
 
 pub fn to_i64(s: &str) -> crate::error::Result<i64> {

backend/windmill-common/src/utils.rs

@@ -6,11 +6,16 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+#[cfg(feature = "enterprise")]
+use crate::ee::trigger_critical_error_channels;
 use crate::ee::LICENSE_KEY_ID;
 use crate::error::{to_anyhow, Error, Result};
 use crate::global_settings::UNIQUE_ID_SETTING;
+use crate::server::Smtp;
 use crate::DB;
 use git_version::git_version;
+use mail_send::mail_builder::MessageBuilder;
+use mail_send::SmtpClientBuilder;
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
@@ -85,12 +90,20 @@ pub async fn query_elems_from_hub(
     url: &str,
     query_params: Option<Vec<(&str, String)>>,
     db: &DB,
-) -> Result<(reqwest::StatusCode, reqwest::header::HeaderMap, axum::body::Body)> {
+) -> Result<(
+    reqwest::StatusCode,
+    reqwest::header::HeaderMap,
+    axum::body::Body,
+)> {
     let response = http_get_from_hub(http_client, url, false, query_params, db).await?;
 
     let status = response.status();
 
-    Ok((status, response.headers().clone(), axum::body::Body::from_stream(response.bytes_stream())))
+    Ok((
+        status,
+        response.headers().clone(),
+        axum::body::Body::from_stream(response.bytes_stream()),
+    ))
 }
 
 pub async fn http_get_from_hub(
@@ -167,3 +180,61 @@ pub enum Mode {
     Server,
     Standalone,
 }
+
+pub async fn send_email(
+    subject: &str,
+    content: &str,
+    to: Vec<String>,
+    smtp: Smtp,
+    client_timeout: Option<tokio::time::Duration>,
+) -> Result<()> {
+    let mut client = SmtpClientBuilder::new(smtp.host, smtp.port)
+        .implicit_tls(smtp.tls_implicit.unwrap_or(false));
+    if std::env::var("ACCEPT_INVALID_CERTS").is_ok() {
+        client = client.allow_invalid_certs();
+    }
+    let client = if let (Some(username), Some(password)) = (smtp.username, smtp.password) {
+        if !username.is_empty() {
+            client.credentials((username, password))
+        } else {
+            client
+        }
+    } else {
+        client
+    };
+    let message = MessageBuilder::new()
+        .from(("Windmill", smtp.from.as_str()))
+        .to(to.clone())
+        .subject(subject)
+        .text_body(content);
+
+    match client_timeout {
+        Some(timeout) => {
+            tokio::time::timeout(timeout, client.connect())
+                .await
+                .map_err(to_anyhow)?
+                .map_err(to_anyhow)?
+                .send(message)
+                .await
+                .map_err(to_anyhow)?;
+        }
+        None => {
+            client
+                .connect()
+                .await
+                .map_err(to_anyhow)?
+                .send(message)
+                .await
+                .map_err(to_anyhow)?;
+        }
+    }
+    tracing::info!("Sent email to {:#?}: {subject}", to);
+
+    return Ok(());
+}
+
+pub async fn report_critical_error(error_message: String) -> () {
+    tracing::error!("CRITICAL ERROR: {error_message}");
+    #[cfg(feature = "enterprise")]
+    trigger_critical_error_channels(error_message).await;
+}

backend/windmill-common/src/variables.rs

@@ -10,7 +10,7 @@ use magic_crypt::{MagicCrypt256, MagicCryptTrait};
 use serde::{Deserialize, Serialize};
 use sqlx::{Postgres, Transaction};
 
-use crate::{BASE_URL, DB};
+use crate::{worker::WORKER_GROUP, BASE_URL, DB};
 
 lazy_static::lazy_static! {
     pub static ref SECRET_SALT: Option<String> = std::env::var("SECRET_SALT").ok();
@@ -276,12 +276,6 @@ pub async fn get_reserved_variables(
             description: "State resource path unique to a script and its trigger".to_string(),
             is_custom: false,
         },
-        ContextualVariable {
-            name: "WM_STATE_PATH_NEW".to_string(),
-            value: state_path,
-            description: "State resource path unique to a script and its trigger (legacy)".to_string(),
-            is_custom: false,
-        },
         ContextualVariable {
             name: "WM_FLOW_STEP_ID".to_string(),
             value: step_id.unwrap_or_else(|| "".to_string()),
@@ -300,6 +294,12 @@ pub async fn get_reserved_variables(
             description: "OIDC JWT token (EE only)".to_string(),
             is_custom: false,
         },
+        ContextualVariable {
+            name: "WM_WORKER_GROUP".to_string(),
+            value: WORKER_GROUP.clone(),
+            description: "name of the worker group the job is running on".to_string(),
+            is_custom: false,
+        },
     ].into_iter().chain( sqlx::query_as::<_, (String, String)>(
         "SELECT name, value FROM workspace_env WHERE workspace_id = $1",
     )

backend/windmill-common/src/worker.rs

@@ -70,6 +70,8 @@ lazy_static::lazy_static! {
 
 }
 
+pub const TMP_DIR: &str = "/tmp/windmill";
+
 pub async fn reload_custom_tags_setting(db: &DB) -> error::Result<()> {
     let q = sqlx::query!(
         "SELECT value FROM global_settings WHERE name = $1",
@@ -140,15 +142,54 @@ pub async fn update_ping(worker_instance: &str, worker_name: &str, ip: &str, db:
                 .map(|x| format!("{}:{}", x.workspace_id, x.path)),
         )
     };
+    let mut vcpus = std::process::Command::new("cat")
+        .args(["/sys/fs/cgroup/cpu.max"])
+        .output()
+        .ok()
+        .map(|o| {
+            String::from_utf8_lossy(&o.stdout)
+                .to_string()
+                .split(" ")
+                .map(|s| s.to_string())
+                .collect::<Vec<String>>()
+                .get(0)
+                .map(|s| s.to_string())
+        })
+        .flatten();
+
+    if vcpus.is_none() {
+        vcpus = std::process::Command::new("cat")
+            .args(["/sys/fs/cgroup/cpu/cpu.cfs_quota_us"])
+            .output()
+            .ok()
+            .map(|o| String::from_utf8_lossy(&o.stdout).to_string())
+    }
+
+    let mut memory = std::process::Command::new("cat")
+        .args(["/sys/fs/cgroup/memory.max"])
+        .output()
+        .ok()
+        .map(|o| String::from_utf8_lossy(&o.stdout).to_string());
+
+    if memory.is_none() {
+        memory = std::process::Command::new("cat")
+            .args(["/sys/fs/cgroup/memory/memory.limit_in_bytes"])
+            .output()
+            .ok()
+            .map(|o| String::from_utf8_lossy(&o.stdout).to_string())
+    }
+
     sqlx::query!(
-        "INSERT INTO worker_ping (worker_instance, worker, ip, custom_tags, worker_group, dedicated_worker, wm_version) VALUES ($1, $2, $3, $4, $5, $6, $7) ON CONFLICT (worker) DO UPDATE set ip = $3, custom_tags = $4, worker_group = $5",
+        "INSERT INTO worker_ping (worker_instance, worker, ip, custom_tags, worker_group, dedicated_worker, wm_version, vcpus, memory) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) ON CONFLICT (worker) DO UPDATE set ip = $3, custom_tags = $4, worker_group = $5",
         worker_instance,
         worker_name,
         ip,
         tags.as_slice(),
         *WORKER_GROUP,
         dw,
-        crate::utils::GIT_VERSION
+        crate::utils::GIT_VERSION,
+        vcpus.map(|x| x.parse::<i64>().ok()).flatten(),
+        memory.map(|x| x.parse::<i64>().ok()).flatten()
     )
     .execute(db)
     .await

backend/windmill-queue/Cargo.toml

@@ -11,6 +11,7 @@ path = "src/lib.rs"
 [features]
 default = []
 enterprise = ["windmill-common/enterprise"]
+cloud = []
 benchmark = []
 prometheus = ["dep:prometheus"]
 

backend/windmill-queue/src/schedule.rs

@@ -26,9 +26,9 @@ use windmill_common::{
 pub async fn push_scheduled_job<'c, R: rsmq_async::RsmqConnection + Send + 'c>(
     db: &DB,
     mut tx: QueueTransaction<'c, R>,
-    schedule: Schedule,
+    schedule: &Schedule,
 ) -> Result<QueueTransaction<'c, R>> {
-    let sched = cron::Schedule::from_str(&schedule.schedule)
+    let sched = cron::Schedule::from_str(schedule.schedule.as_ref())
         .map_err(|e| error::Error::BadRequest(e.to_string()))?;
 
     let tz = chrono_tz::Tz::from_str(&schedule.timezone)
@@ -68,9 +68,9 @@ pub async fn push_scheduled_job<'c, R: rsmq_async::RsmqConnection + Send + 'c>(
 
     let mut args: serde_json::Map<String, serde_json::Value> = serde_json::Map::new();
 
-    if let Some(args_v) = schedule.args {
+    if let Some(args_v) = &schedule.args {
         if let serde_json::Value::Object(args_m) = args_v {
-            args = args_m
+            args = args_m.clone()
         } else {
             return Err(error::Error::ExecutionErr(
                 "args of scripts needs to be dict".to_string(),
@@ -90,7 +90,7 @@ pub async fn push_scheduled_job<'c, R: rsmq_async::RsmqConnection + Send + 'c>(
             .map(|x| (x.tag, x.dedicated_worker))
             .unwrap_or_else(|| (None, None));
         (
-            JobPayload::Flow { path: schedule.script_path, dedicated_worker },
+            JobPayload::Flow { path: schedule.script_path.clone(), dedicated_worker },
             tag,
             None,
         )
@@ -113,8 +113,8 @@ pub async fn push_scheduled_job<'c, R: rsmq_async::RsmqConnection + Send + 'c>(
         .await?;
 
         if schedule.retry.is_some() {
-            let parsed_retry =
-                serde_json::from_value::<Retry>(schedule.retry.unwrap()).map_err(|err| {
+            let parsed_retry = serde_json::from_value::<Retry>(schedule.retry.clone().unwrap())
+                .map_err(|err| {
                     error::Error::InternalErr(format!(
                         "Unable to parse retry information from schedule: {}",
                         err.to_string(),
@@ -127,7 +127,7 @@ pub async fn push_scheduled_job<'c, R: rsmq_async::RsmqConnection + Send + 'c>(
             // if retry is set, we wrap the script into a one step flow with a retry on the module
             (
                 JobPayload::SingleScriptFlow {
-                    path: schedule.script_path,
+                    path: schedule.script_path.clone(),
                     hash: hash,
                     retry: parsed_retry,
                     args: static_args,
@@ -144,7 +144,7 @@ pub async fn push_scheduled_job<'c, R: rsmq_async::RsmqConnection + Send + 'c>(
             (
                 JobPayload::ScriptHash {
                     hash,
-                    path: schedule.script_path,
+                    path: schedule.script_path.clone(),
                     concurrent_limit: concurrent_limit,
                     concurrency_time_window_s: concurrency_time_window_s,
                     cache_ttl: cache_ttl,
@@ -153,7 +153,7 @@ pub async fn push_scheduled_job<'c, R: rsmq_async::RsmqConnection + Send + 'c>(
                     priority,
                 },
                 if schedule.tag.as_ref().is_some_and(|x| x != "") {
-                    schedule.tag
+                    schedule.tag.clone()
                 } else {
                     tag
                 },

backend/windmill-worker/loader.bun.js

@@ -27,7 +27,7 @@ const p = {
     const cdir = resolve("./");
     const cdirNoPrivate = cdir.replace(/^\/private/, ""); // for macos
     const filter = new RegExp(
-      `^(?!\\.\/main\\.ts)(?!${cdir}\/main\\.ts)(?!(?:/private)?${cdirNoPrivate}\/wrapper\\.ts).*\\.ts$`
+      `^(?!\\.\/main\\.ts)(?!${cdir}\/main\\.ts)(?!(?:/private)?${cdirNoPrivate}\/wrapper\\.mjs).*\\.ts$`
     );
     build.onResolve({ filter }, (args) => {
       const file_path =

backend/windmill-worker/loader_builder.bun.js

@@ -21,7 +21,7 @@ if (!bo.success) {
     content.replaceAll("__require", "require")
   );
 
-  const dependencies: Record<string, string[]> = {};
+  const dependencies = {};
   for (const i of imports) {
     let [_, name, version] = i.path.match(captureVersion) ?? [];
     if (name == undefined) {
@@ -46,7 +46,7 @@ if (!bo.success) {
       }
     }
   }
-  const resolvedDeps: Record<string, string> = {};
+  const resolvedDeps = {};
   for (const i in dependencies) {
     const versions = dependencies[i];
     resolvedDeps[i] =
@@ -61,7 +61,7 @@ if (!bo.success) {
     JSON.stringify({ dependencies: resolvedDeps }, null, 2)
   );
 
-  function reduceIntersect(versions: string[], name: string): string {
+  function reduceIntersect(versions, name) {
     console.log(
       `multiple versions detected for ${name}: ${versions.join(", ")}`
     );

backend/windmill-worker/nsjail/run.bun.config.proto

@@ -66,7 +66,7 @@ mount {
     src: "{JOB_DIR}/package.json"
     dst: "/tmp/{LANG}/package.json"
     is_bind: true
-    mandatory: true
+    mandatory: false
 }
 
 mount {
@@ -77,13 +77,6 @@ mount {
 }
 
 
-mount {
-    src: "{JOB_DIR}/wrapper.ts"
-    dst: "/tmp/{LANG}/wrapper.ts"
-    is_bind: true
-    mandatory: false
-}
-
 mount {
     src: "{JOB_DIR}/wrapper.mjs"
     dst: "/tmp/{LANG}/wrapper.mjs"
@@ -114,6 +107,13 @@ mount {
     mandatory: false
 }
 
+mount {
+    src: "{JOB_DIR}/main.js"
+    dst: "/tmp/{LANG}/main.js"
+    is_bind: true
+    mandatory: false
+}
+
 
 mount {
     src: "{JOB_DIR}/args.json"

backend/windmill-worker/src/bun_executor.rs

@@ -35,11 +35,15 @@ use windmill_common::{
     error::{self, to_anyhow, Result},
     jobs::QueuedJob,
 };
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+use windmill_common::s3_helpers::attempt_fetch_bytes;
+
 use windmill_parser::Typ;
 
-const RELATIVE_BUN_LOADER: &str = include_str!("../loader.bun.ts");
+const RELATIVE_BUN_LOADER: &str = include_str!("../loader.bun.js");
 
-const RELATIVE_BUN_BUILDER: &str = include_str!("../loader_builder.bun.ts");
+const RELATIVE_BUN_BUILDER: &str = include_str!("../loader_builder.bun.js");
 
 const NSJAIL_CONFIG_RUN_BUN_CONTENT: &str = include_str!("../nsjail/run.bun.config.proto");
 
@@ -76,7 +80,7 @@ pub async fn gen_lockfile(
     } else {
         let _ = write_file(
             &job_dir,
-            "build.ts",
+            "build.js",
             &format!(
                 r#"
 {}
@@ -100,7 +104,7 @@ pub async fn gen_lockfile(
             .current_dir(job_dir)
             .env_clear()
             .envs(common_bun_proc_envs.clone())
-            .args(vec!["run", "build.ts"])
+            .args(vec!["run", "build.js"])
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
         let child_process = start_child_process(child_cmd, &*BUN_PATH).await?;
@@ -338,9 +342,158 @@ fn get_annotation(inner_content: &str) -> Annotations {
     Annotations { npm_mode, nodejs_mode }
 }
 
+pub async fn build_loader(
+    job_dir: &str,
+    base_internal_url: &str,
+    token: &str,
+    w_id: &str,
+    current_path: &str,
+    nodejs_mode: bool,
+) -> Result<()> {
+    let loader = RELATIVE_BUN_LOADER
+        .replace("W_ID", w_id)
+        .replace("BASE_INTERNAL_URL", base_internal_url)
+        .replace("TOKEN", token)
+        .replace("CURRENT_PATH", current_path)
+        .replace("RAW_GET_ENDPOINT", "raw_unpinned");
+    if nodejs_mode {
+        write_file(
+            &job_dir,
+            "node_builder.ts",
+            &format!(
+                r#"
+{}
+
+import {{ readdir }} from "node:fs/promises";
+
+let fileNames = []
+try {{
+    fileNames = await readdir("{job_dir}/node_modules")
+}} catch (e) {{
+
+}}
+
+const bo = await Bun.build({{
+    entrypoints: ["{job_dir}/wrapper.mjs"],
+    outdir: "./",
+    target: "node",
+    plugins: [p],
+    external: fileNames,
+  }});
+
+if (!bo.success) {{
+    bo.logs.forEach((l) => console.log(l));
+    process.exit(1);
+}}
+"#,
+                loader
+            ),
+        )
+        .await?;
+    } else {
+        write_file(
+            &job_dir,
+            "loader.bun.js",
+            &format!(
+                r#"
+import {{ plugin }} from "bun";
+
+{}
+
+plugin(p)
+"#,
+                loader
+            ),
+        )
+        .await?;
+    };
+    Ok(())
+}
+
+pub async fn generate_wrapper_mjs(
+    job_dir: &str,
+    w_id: &str,
+    job_id: &Uuid,
+    worker_name: &str,
+    db: &sqlx::Pool<sqlx::Postgres>,
+    timeout: Option<i32>,
+    mem_peak: &mut i32,
+    canceled_by: &mut Option<CanceledBy>,
+    common_bun_proc_envs: &HashMap<String, String>,
+) -> Result<()> {
+    let mut child = Command::new(&*BUN_PATH);
+    child
+        .current_dir(job_dir)
+        .env_clear()
+        .envs(common_bun_proc_envs.clone())
+        .env("PATH", PATH_ENV.as_str())
+        .args(vec!["run", "node_builder.ts"])
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped());
+    let child_process = start_child_process(child, &*BUN_PATH).await?;
+    handle_child(
+        job_id,
+        db,
+        mem_peak,
+        canceled_by,
+        child_process,
+        false,
+        worker_name,
+        w_id,
+        "bun build",
+        timeout,
+        false,
+    )
+    .await?;
+    tokio::fs::rename(
+        format!("{job_dir}/wrapper.js"),
+        format!("{job_dir}/wrapper.mjs"),
+    )
+    .await
+    .map_err(|e| error::Error::InternalErr(format!("Could not move wrapper to mjs: {e}")))?;
+    Ok(())
+}
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+pub async fn pull_codebase(w_id: &str, id: &str, job_dir: &str) -> Result<()> {
+    let path = windmill_common::s3_helpers::bundle(&w_id, &id);
+    let bun_cache_path = format!("{}/{}", BUN_CACHE_DIR, path);
+    let dst = format!("{job_dir}/main.js");
+    let dirs_splitted = bun_cache_path.split("/").collect_vec();
+    tokio::fs::create_dir_all(dirs_splitted[..dirs_splitted.len() - 1].join("/")).await?;
+    if tokio::fs::metadata(&bun_cache_path).await.is_ok() {
+        tracing::info!("loading {bun_cache_path} from cache");
+        tokio::fs::symlink(&bun_cache_path, dst).await?;
+    } else if let Some(os) = windmill_common::s3_helpers::OBJECT_STORE_CACHE_SETTINGS
+        .read()
+        .await
+        .clone()
+    {
+        let bytes = attempt_fetch_bytes(os, &path).await?;
+        if *windmill_common::worker::CLOUD_HOSTED {
+            tokio::fs::write(dst, &bytes).await?;
+        } else {
+            tokio::fs::write(&bun_cache_path, &bytes).await?;
+            tokio::fs::symlink(bun_cache_path, dst).await?;
+        }
+
+        // extract_tar(bytes, job_dir).await?;
+    }
+
+    return Ok(());
+}
+
+#[cfg(not(all(feature = "enterprise", feature = "parquet")))]
+pub async fn pull_codebase(_w_id: &str, _id: &str, _job_dir: &str) -> Result<()> {
+    return Err(error::Error::ExecutionErr(
+        "codebase is an EE feature".to_string(),
+    ));
+}
+
 #[tracing::instrument(level = "trace", skip_all)]
 pub async fn handle_bun_job(
     requirements_o: Option<String>,
+    codebase: Option<String>,
     mem_peak: &mut i32,
     canceled_by: &mut Option<CanceledBy>,
     job: &QueuedJob,
@@ -353,13 +506,20 @@ pub async fn handle_bun_job(
     envs: HashMap<String, String>,
     shared_mount: &str,
 ) -> error::Result<Box<RawValue>> {
-    let _ = write_file(job_dir, "main.ts", inner_content).await?;
+    if !codebase.is_some() {
+        let _ = write_file(job_dir, "main.ts", inner_content).await?;
+    } else {
+        let _ = write_file(job_dir, "package.json", r#"{ "type": "module" }"#).await?;
+    }
 
     let common_bun_proc_envs: HashMap<String, String> =
         get_common_bun_proc_envs(&base_internal_url).await;
 
-    let annotation = get_annotation(inner_content);
+    let mut annotation = get_annotation(inner_content);
 
+    if codebase.is_some() {
+        annotation.nodejs_mode = true
+    }
     let main_override = get_main_override(job.args.as_ref());
 
     #[cfg(not(feature = "enterprise"))]
@@ -369,7 +529,9 @@ pub async fn handle_bun_job(
         ));
     }
 
-    if let Some(reqs) = requirements_o {
+    if let Some(codebase) = codebase.as_ref() {
+        pull_codebase(&job.workspace_id, codebase, job_dir).await?;
+    } else if let Some(reqs) = requirements_o {
         let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
         if splitted.len() != 2 {
             return Err(error::Error::ExecutionErr(
@@ -435,10 +597,11 @@ pub async fn handle_bun_job(
         // }
     }
 
-    let main_code = remove_pinned_imports(inner_content)?;
-    let _ = write_file(job_dir, "main.ts", &main_code).await?;
+    let _ = write_file(job_dir, "main.ts", &remove_pinned_imports(inner_content)?).await?;
 
-    let init_logs = if annotation.nodejs_mode {
+    let init_logs = if codebase.is_some() {
+        "\n\n--- NODE SNAPSHOT EXECUTION ---\n".to_string()
+    } else if annotation.nodejs_mode {
         "\n\n--- NODE CODE EXECUTION ---\n".to_string()
     } else {
         "\n\n--- BUN CODE EXECUTION ---\n".to_string()
@@ -469,11 +632,17 @@ pub async fn handle_bun_job(
         // we cannot use Bun.read and Bun.write because it results in an EBADF error on cloud
         let main_name = main_override.unwrap_or("main".to_string());
 
+        let main_import = if codebase.is_some() {
+            "./main.js"
+        } else {
+            "./main.ts"
+        };
+
         let wrapper_content: String = format!(
             r#"
-import {{ {main_name} }} from "./main.ts";
+import * as Main from "{main_import}";
 
-const fs = require('fs/promises');
+import * as fs from "fs/promises";
 
 const args = await fs.readFile('args.json', {{ encoding: 'utf8' }}).then(JSON.parse)
     .then(({{ {spread} }}) => [ {spread} ])
@@ -484,7 +653,7 @@ BigInt.prototype.toJSON = function () {{
 
 {dates}
 async function run() {{
-    let res: any = await {main_name}(...args);
+    let res = await Main.{main_name}(...args);
     const res_json = JSON.stringify(res ?? null, (key, value) => typeof value === 'undefined' ? null : value);
     await fs.writeFile("result.json", res_json);
     process.exit(0);
@@ -502,7 +671,7 @@ try {{
 }}
     "#,
         );
-        write_file(job_dir, "wrapper.ts", &wrapper_content).await?;
+        write_file(job_dir, "wrapper.mjs", &wrapper_content).await?;
         Ok(()) as error::Result<()>
     };
 
@@ -520,65 +689,19 @@ try {{
         Ok(reserved_variables) as error::Result<HashMap<String, String>>
     };
 
-    let loader = RELATIVE_BUN_LOADER
-        .replace("W_ID", &job.workspace_id)
-        .replace("BASE_INTERNAL_URL", base_internal_url)
-        .replace("TOKEN", &client.get_token().await)
-        .replace("CURRENT_PATH", job.script_path())
-        .replace("RAW_GET_ENDPOINT", "raw_unpinned");
-    let write_loader_f = async move {
-        if annotation.nodejs_mode {
-            write_file(
-                &job_dir,
-                "node_builder.ts",
-                &format!(
-                    r#"
-{}
-
-import {{ readdir }} from "node:fs/promises";
-
-let fileNames = []
-try {{
-    fileNames = await readdir("{job_dir}/node_modules")
-}} catch (e) {{
-
-}}
-
-const bo = await Bun.build({{
-    entrypoints: ["{job_dir}/wrapper.ts"],
-    outdir: "./",
-    target: "node",
-    plugins: [p],
-    external: fileNames,
-  }});
-
-if (!bo.success) {{
-    bo.logs.forEach((l) => console.log(l));
-    process.exit(1);
-}}
-"#,
-                    loader
-                ),
+    let write_loader_f = async {
+        if !codebase.is_some() {
+            build_loader(
+                job_dir,
+                base_internal_url,
+                &client.get_token().await,
+                &job.workspace_id,
+                &job.script_path(),
+                annotation.nodejs_mode,
             )
-            .await?;
-            Ok(()) as error::Result<()>
+            .await
         } else {
-            write_file(
-                &job_dir,
-                "loader.bun.ts",
-                &format!(
-                    r#"
-import {{ plugin }} from "bun";
-
-{}
-
-plugin(p)
-"#,
-                    loader
-                ),
-            )
-            .await?;
-            Ok(()) as error::Result<()>
+            Ok(())
         }
     };
 
@@ -588,37 +711,19 @@ plugin(p)
         write_loader_f
     )?;
 
-    if annotation.nodejs_mode {
-        let mut child = Command::new(&*BUN_PATH);
-        child
-            .current_dir(job_dir)
-            .env_clear()
-            .envs(common_bun_proc_envs.clone())
-            .env("PATH", PATH_ENV.as_str())
-            .args(vec!["run", "node_builder.ts"])
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped());
-        let child_process = start_child_process(child, &*BUN_PATH).await?;
-        handle_child(
+    if annotation.nodejs_mode && !codebase.is_some() {
+        generate_wrapper_mjs(
+            job_dir,
+            &job.workspace_id,
             &job.id,
+            worker_name,
             db,
+            job.timeout,
             mem_peak,
             canceled_by,
-            child_process,
-            false,
-            worker_name,
-            &job.workspace_id,
-            "bun build",
-            job.timeout,
-            false,
+            &common_bun_proc_envs,
         )
         .await?;
-        tokio::fs::rename(
-            format!("{job_dir}/wrapper.js"),
-            format!("{job_dir}/wrapper.mjs"),
-        )
-        .await
-        .map_err(|e| error::Error::InternalErr(format!("Could not move wrapper to mjs: {e}")))?;
     }
 
     //do not cache local dependencies
@@ -661,6 +766,15 @@ plugin(p)
                 &NODE_PATH,
                 "/tmp/nodejs/wrapper.mjs",
             ]
+        } else if codebase.is_some() {
+            vec![
+                "--config",
+                "run.config.proto",
+                "--",
+                &BUN_PATH,
+                "run",
+                "/tmp/bun/wrapper.mjs",
+            ]
         } else {
             vec![
                 "--config",
@@ -671,8 +785,8 @@ plugin(p)
                 "-i",
                 "--prefer-offline",
                 "-r",
-                "/tmp/bun/loader.bun.ts",
-                "/tmp/bun/wrapper.ts",
+                "/tmp/bun/loader.bun.js",
+                "/tmp/bun/wrapper.mjs",
             ]
         };
         nsjail_cmd
@@ -702,23 +816,28 @@ plugin(p)
                 .stderr(Stdio::piped());
             bun_cmd
         } else {
-            let script_path = format!("{job_dir}/wrapper.ts");
+            let script_path = format!("{job_dir}/wrapper.mjs");
 
             let mut bun_cmd = Command::new(&*BUN_PATH);
+            let args = if codebase.is_some() {
+                vec!["run", &script_path]
+            } else {
+                vec![
+                    "run",
+                    "-i",
+                    "--prefer-offline",
+                    "-r",
+                    "./loader.bun.js",
+                    &script_path,
+                ]
+            };
             bun_cmd
                 .current_dir(job_dir)
                 .env_clear()
                 .envs(envs)
                 .envs(reserved_variables)
                 .envs(common_bun_proc_envs)
-                .args(vec![
-                    "run",
-                    "-i",
-                    "--prefer-offline",
-                    "-r",
-                    "./loader.bun.ts",
-                    &script_path,
-                ])
+                .args(args)
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped());
             bun_cmd
@@ -780,6 +899,7 @@ use std::sync::Arc;
 #[cfg(feature = "enterprise")]
 pub async fn start_worker(
     requirements_o: Option<String>,
+    codebase: Option<String>,
     db: &sqlx::Pool<sqlx::Postgres>,
     inner_content: &str,
     base_internal_url: &str,
@@ -796,10 +916,21 @@ pub async fn start_worker(
     let mut logs = "".to_string();
     let mut mem_peak: i32 = 0;
     let mut canceled_by: Option<CanceledBy> = None;
-    let _ = write_file(job_dir, "main.ts", inner_content).await?;
+    tracing::info!("Starting worker {w_id};{script_path} (codebase: {codebase:?}");
+    if !codebase.is_some() {
+        let _ = write_file(job_dir, "main.ts", inner_content).await?;
+    } else {
+        let _ = write_file(job_dir, "package.json", r#"{ "type": "module" }"#).await?;
+    }
+
     let common_bun_proc_envs: HashMap<String, String> =
         get_common_bun_proc_envs(&base_internal_url).await;
 
+    let mut annotation = get_annotation(inner_content);
+
+    //TODO: remove this when bun dedicated workers work without issues
+    annotation.nodejs_mode = true;
+
     let context = variables::get_reserved_variables(
         db,
         w_id,
@@ -818,8 +949,10 @@ pub async fn start_worker(
     )
     .await;
     let context_envs = build_envs_map(context.to_vec()).await;
-    let annotation = get_annotation(inner_content);
-    if let Some(reqs) = requirements_o {
+
+    if let Some(codebase) = codebase.as_ref() {
+        pull_codebase(w_id, codebase, job_dir).await?;
+    } else if let Some(reqs) = requirements_o {
         let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
         if splitted.len() != 2 {
             return Err(error::Error::ExecutionErr(
@@ -902,9 +1035,23 @@ pub async fn start_worker(
         let spread = args.into_iter().map(|x| x.name).join(",");
         // logs.push_str(format!("infer args: {:?}\n", start.elapsed().as_micros()).as_str());
         // we cannot use Bun.read and Bun.write because it results in an EBADF error on cloud
+
+        let is_debug = std::env::var("RUST_LOG").is_ok_and(|x| x == "windmill=debug");
+        let print_lines = if is_debug {
+            r#"console.log(line);"#
+        } else {
+            ""
+        };
+
+        let main_import = if codebase.is_some() {
+            "./main.js"
+        } else {
+            "./main.ts"
+        };
         let wrapper_content: String = format!(
             r#"
-import {{ main }} from "./main.ts";
+import * as Main from "{main_import}";
+import * as Readline from "node:readline"
 
 BigInt.prototype.toJSON = function () {{
     return this.toString();
@@ -912,77 +1059,100 @@ BigInt.prototype.toJSON = function () {{
 
 {dates}
 
-let stdout = Bun.stdout.writer();
-stdout.write('start\n'); 
+console.log('start'); 
 
-for await (const chunk of Bun.stdin.stream()) {{
-    const lines = Buffer.from(chunk).toString();
-    let exit = false;
-    for (const line of lines.trim().split("\n")) {{
-        if (line === "end") {{
-            exit = true;
-            break;
-        }}
-        try {{
-            let {{ {spread} }} = JSON.parse(line) 
-            let res: any = await main(...[ {spread} ]);
-            stdout.write("wm_res[success]:" + JSON.stringify(res ?? null, (key, value) => typeof value === 'undefined' ? null : value) + '\n');
-        }} catch (e) {{
-            stdout.write("wm_res[error]:" + JSON.stringify({{ message: e.message, name: e.name, stack: e.stack, line: line }}) + '\n');
-        }}
-        stdout.flush();
+for await (const line of Readline.createInterface({{ input: process.stdin }})) {{
+    {print_lines}
+
+    if (line === "end") {{
+        process.exit(0);
     }}
-    if (exit) {{
-        break;
+    try {{
+        let {{ {spread} }} = JSON.parse(line) 
+        let res = await Main.main(...[ {spread} ]);
+        console.log("wm_res[success]:" + JSON.stringify(res ?? null, (key, value) => typeof value === 'undefined' ? null : value));
+    }} catch (e) {{
+        console.log("wm_res[error]:" + JSON.stringify({{ message: e.message, name: e.name, stack: e.stack, line: line }}));
     }}
 }}
 "#,
         );
-        write_file(job_dir, "wrapper.ts", &wrapper_content).await?;
+        write_file(job_dir, "wrapper.mjs", &wrapper_content).await?;
     }
 
-    let _ = write_file(
-        &job_dir,
-        "loader.bun.ts",
-        &format!(
-            r#"
-import {{ plugin }} from "bun";
+    if !codebase.is_some() {
+        build_loader(
+            job_dir,
+            base_internal_url,
+            token,
+            w_id,
+            script_path,
+            annotation.nodejs_mode,
+        )
+        .await?;
+    }
 
-{}
+    if annotation.nodejs_mode && !codebase.is_some() {
+        generate_wrapper_mjs(
+            job_dir,
+            w_id,
+            &Uuid::nil(),
+            worker_name,
+            db,
+            None,
+            &mut mem_peak,
+            &mut canceled_by,
+            &common_bun_proc_envs,
+        )
+        .await?;
+    }
 
-plugin(p)
-"#,
-            RELATIVE_BUN_LOADER
-                .replace("W_ID", &w_id)
-                .replace("BASE_INTERNAL_URL", base_internal_url)
-                .replace("TOKEN", token)
-                .replace("CURRENT_PATH", script_path)
-                .replace("RAW_GET_ENDPOINT", "raw_unpinned")
-        ),
-    )
-    .await?;
+    if annotation.nodejs_mode {
+        let script_path = format!("{job_dir}/wrapper.mjs");
 
-    handle_dedicated_process(
-        &*BUN_PATH,
-        job_dir,
-        context_envs,
-        envs,
-        context,
-        common_bun_proc_envs,
-        vec![
-            "run",
-            "-i",
-            "--prefer-offline",
-            "-r",
-            "./loader.bun.ts",
-            &format!("{job_dir}/wrapper.ts"),
-        ],
-        killpill_rx,
-        job_completed_tx,
-        token,
-        jobs_rx,
-        worker_name,
-        db,
-    )
-    .await
+        handle_dedicated_process(
+            &*NODE_PATH,
+            job_dir,
+            context_envs,
+            envs,
+            context,
+            common_bun_proc_envs,
+            vec![&script_path],
+            killpill_rx,
+            job_completed_tx,
+            token,
+            jobs_rx,
+            worker_name,
+            db,
+            &script_path,
+            "nodejs",
+        )
+        .await
+    } else {
+        handle_dedicated_process(
+            &*BUN_PATH,
+            job_dir,
+            context_envs,
+            envs,
+            context,
+            common_bun_proc_envs,
+            vec![
+                "run",
+                "-i",
+                "--prefer-offline",
+                "-r",
+                "./loader.bun.js",
+                &format!("{job_dir}/wrapper.mjs"),
+            ],
+            killpill_rx,
+            job_completed_tx,
+            token,
+            jobs_rx,
+            worker_name,
+            db,
+            script_path,
+            "bun",
+        )
+        .await
+    }
 }

backend/windmill-worker/src/common.rs

@@ -26,7 +26,7 @@ use windmill_common::s3_helpers::OBJECT_STORE_CACHE_SETTINGS;
 use windmill_common::s3_helpers::{
     get_etag_or_empty, LargeFileStorage, ObjectStoreResource, S3Object,
 };
-use windmill_common::worker::{CLOUD_HOSTED, WORKER_CONFIG};
+use windmill_common::worker::{CLOUD_HOSTED, TMP_DIR, WORKER_CONFIG};
 use windmill_common::{
     error::{self, Error},
     jobs::QueuedJob,
@@ -39,6 +39,7 @@ use windmill_queue::{append_logs, CanceledBy};
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 use std::os::unix::process::ExitStatusExt;
 
+use std::process::ExitStatus;
 use std::sync::atomic::AtomicU32;
 use std::sync::Arc;
 use std::{
@@ -69,7 +70,7 @@ use futures::{
 
 use crate::{
     AuthedClient, AuthedClientBackgroundTask, JOB_DEFAULT_TIMEOUT, MAX_RESULT_SIZE,
-    MAX_TIMEOUT_DURATION, MAX_WAIT_FOR_SIGINT, MAX_WAIT_FOR_SIGTERM, ROOT_CACHE_DIR, TMP_DIR,
+    MAX_TIMEOUT_DURATION, MAX_WAIT_FOR_SIGINT, MAX_WAIT_FOR_SIGTERM, ROOT_CACHE_DIR,
 };
 
 pub async fn build_args_map<'a>(
@@ -482,7 +483,7 @@ pub async fn run_future_with_polling_update_job_poller<Fut, T>(
     result_f: Fut,
     worker_name: &str,
     w_id: &str,
-) -> anyhow::Result<T>
+) -> error::Result<T>
 where
     Fut: Future<Output = anyhow::Result<T>>,
 {
@@ -514,12 +515,22 @@ where
             tracing::error!("Query timeout: {}", e);
             Error::ExecutionErr(format!("Query timeout after (>{}s)", timeout_ms/1000))
         })?,
-        _ = update_job, if job_id != Uuid::nil() => Err(Error::ExecutionErr("Job cancelled".to_string())).map_err(to_anyhow)?,
+        ex = update_job, if job_id != Uuid::nil() => {
+            match ex {
+                UpdateJobPollingExit::Done => Err(Error::ExecutionErr("Job cancelled".to_string())).map_err(to_anyhow)?,
+                UpdateJobPollingExit::AlreadyCompleted => Err(Error::AlreadyCompleted("Job already completed".to_string())).map_err(to_anyhow)?,
+            }
+        }
     }?;
     drop(tx);
     Ok(rows)
 }
 
+pub enum UpdateJobPollingExit {
+    Done,
+    AlreadyCompleted,
+}
+
 pub async fn update_job_poller<F, Fut>(
     job_id: Uuid,
     db: &DB,
@@ -529,13 +540,14 @@ pub async fn update_job_poller<F, Fut>(
     worker_name: &str,
     w_id: &str,
     mut rx: broadcast::Receiver<()>,
-) where
+) -> UpdateJobPollingExit
+where
     F: Fn() -> Fut,
     Fut: Future<Output = i32>,
 {
     let update_job_interval = Duration::from_millis(500);
     if job_id == Uuid::nil() {
-        return;
+        return UpdateJobPollingExit::Done;
     }
     let db = db.clone();
 
@@ -556,7 +568,9 @@ pub async fn update_job_poller<F, Fut>(
                 i+=1;
                 if i % 10 == 0 {
                     sqlx::query!(
-                        "UPDATE worker_ping SET ping_at = now() WHERE worker = $1",
+                        "UPDATE worker_ping SET ping_at = now(), current_job_id = $1, current_job_workspace_id = $2 WHERE worker = $3",
+                        &job_id,
+                        &w_id,
                         &worker_name
                     )
                     .execute(&db)
@@ -593,28 +607,36 @@ pub async fn update_job_poller<F, Fut>(
                     }
                 }
 
-                let (canceled, canceled_by, canceled_reason) = sqlx::query_as::<_, (bool, Option<String>, Option<String>)>("UPDATE queue SET mem_peak = $1, last_ping = now() WHERE id = $2 RETURNING canceled, canceled_by, canceled_reason")
+                let (canceled, canceled_by, canceled_reason, already_completed) = sqlx::query_as::<_, (bool, Option<String>, Option<String>, bool)>("UPDATE queue SET mem_peak = $1, last_ping = now() WHERE id = $2 RETURNING canceled, canceled_by, canceled_reason, false")
                     .bind(*mem_peak)
                     .bind(job_id)
                     .fetch_optional(&db)
                     .await
                     .unwrap_or_else(|e| {
                         tracing::error!(%e, "error updating job {job_id}: {e}");
-                        Some((false, None, None))
+                        Some((false, None, None, false))
                     })
-                    .unwrap_or((false, None, None));
+                    .unwrap_or_else(|| {
+                        // if the job is not in queue, it can only be in the completed_job so it is already complete
+                        (false, None, None, true)
+                    });
+                if already_completed {
+                    return UpdateJobPollingExit::AlreadyCompleted
+                }
                 if canceled {
                     canceled_by_ref.replace(CanceledBy {
                         username: canceled_by.clone(),
                         reason: canceled_reason.clone(),
                     });
-                    break;
+                    break
                 }
             }
             },
         );
     }
     tracing::info!("job {job_id} finished");
+
+    UpdateJobPollingExit::Done
 }
 
 pub enum CompactLogs {
@@ -630,7 +652,7 @@ async fn compact_logs(
     nlogs: String,
     total_size: Arc<AtomicU32>,
     compact_kind: CompactLogs,
-    worker_name: &str,
+    _worker_name: &str,
 ) -> error::Result<(String, String)> {
     let size = sqlx::query_scalar!(
         "SELECT char_length(logs) FROM job_logs WHERE job_id = $1 AND workspace_id = $2",
@@ -695,9 +717,9 @@ async fn compact_logs(
     );
 
     let mut new_current_logs = match compact_kind {
-        CompactLogs::NoS3 => format!("[windmill] worker {worker_name}: Logs length has exceeded a threshold\n[windmill] Previous logs have been saved to disk at {path}, add object storage in the instance settings to save it on distributed storage and allow direct download from Windmill\n"),
+        CompactLogs::NoS3 => format!("[windmill] No object storage set in instance settings. Previous logs have been saved to disk at {path}\n"),
         CompactLogs::S3 => format!("[windmill] Previous logs have been saved to object storage at {path}\n"),
-        CompactLogs::NotEE => format!("[windmill] worker {worker_name}: Logs length has exceeded a threshold\n[windmill] Previous logs have been saved to disk at {path}\n[windmill] Upgrade to EE and add object storage to save it persistentely on distributed storage and allow direct download from Windmill\n"),
+        CompactLogs::NotEE => format!("[windmill] Previous logs have been saved to disk at {path}\n"),
     };
     new_current_logs.push_str(&current_logs);
 
@@ -897,6 +919,7 @@ pub async fn handle_child(
         TooManyLogs,
         Timeout,
         Cancelled,
+        AlreadyCompleted,
     }
 
     let (timeout_duration, timeout_warn_msg) =
@@ -914,7 +937,10 @@ pub async fn handle_child(
             result = child.wait() => return result.map(Ok),
             Ok(()) = too_many_logs.changed() => KillReason::TooManyLogs,
             _ = sleep(timeout_duration) => KillReason::Timeout,
-            _ = update_job, if job_id != Uuid::nil() => KillReason::Cancelled,
+            ex = update_job, if job_id != Uuid::nil() => match ex {
+                UpdateJobPollingExit::Done => KillReason::Cancelled,
+                UpdateJobPollingExit::AlreadyCompleted => KillReason::AlreadyCompleted,
+            },
         };
         tx.send(()).expect("rx should never be dropped");
         drop(tx);
@@ -1120,26 +1146,7 @@ pub async fn handle_child(
         _ if *too_many_logs.borrow() => Err(Error::ExecutionErr(format!(
             "logs or result reached limit. (current max size: {MAX_RESULT_SIZE} characters)"
         ))),
-        Ok(Ok(status)) => {
-            if status.success() {
-                Ok(())
-            } else if let Some(code) = status.code() {
-                Err(error::Error::ExitStatus(code))
-            } else {
-                #[cfg(any(target_os = "linux", target_os = "macos"))]
-                return Err(error::Error::ExecutionErr(format!(
-                    "process terminated by signal: {:#?}, stopped_signal: {:#?}, core_dumped: {}",
-                    status.signal(),
-                    status.stopped_signal(),
-                    status.core_dumped()
-                )));
-
-                #[cfg(not(any(target_os = "linux", target_os = "macos")))]
-                return Err(error::Error::ExecutionErr(String::from(
-                    "process terminated by signal",
-                )));
-            }
-        }
+        Ok(Ok(status)) => process_status(status),
         Ok(Err(kill_reason)) => Err(Error::ExecutionErr(format!(
             "job process killed because {kill_reason:#?}"
         ))),
@@ -1147,6 +1154,26 @@ pub async fn handle_child(
     }
 }
 
+pub fn process_status(status: ExitStatus) -> error::Result<()> {
+    if status.success() {
+        Ok(())
+    } else if let Some(code) = status.code() {
+        Err(error::Error::ExitStatus(code))
+    } else {
+        #[cfg(any(target_os = "linux", target_os = "macos"))]
+        return Err(error::Error::ExecutionErr(format!(
+            "process terminated by signal: {:#?}, stopped_signal: {:#?}, core_dumped: {}",
+            status.signal(),
+            status.stopped_signal(),
+            status.core_dumped()
+        )));
+
+        #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+        return Err(error::Error::ExecutionErr(String::from(
+            "process terminated by signal",
+        )));
+    }
+}
 pub async fn start_child_process(mut cmd: Command, executable: &str) -> Result<Child, Error> {
     return cmd
         .spawn()
@@ -1160,7 +1187,7 @@ pub async fn resolve_job_timeout(
     custom_timeout_secs: Option<i32>,
 ) -> (Duration, Option<String>) {
     let mut warn_msg: Option<String> = None;
-    #[cfg(feature = "enterprise")]
+    #[cfg(feature = "cloud")]
     let cloud_premium_workspace = *CLOUD_HOSTED
         && sqlx::query_scalar!("SELECT premium FROM workspace WHERE id = $1", _w_id)
             .fetch_one(_db)
@@ -1169,7 +1196,7 @@ pub async fn resolve_job_timeout(
                 tracing::error!(%e, "error getting premium workspace for job {_job_id}: {e}");
             })
             .unwrap_or(false);
-    #[cfg(not(feature = "enterprise"))]
+    #[cfg(not(feature = "cloud"))]
     let cloud_premium_workspace = false;
 
     // compute global max timeout

backend/windmill-worker/src/dedicated_worker.rs

@@ -16,7 +16,8 @@ use std::{collections::VecDeque, process::Stdio, sync::Arc};
 use anyhow::Context;
 
 use crate::{
-    common::start_child_process, JobCompleted, JobCompletedSender, MAX_BUFFERED_DEDICATED_JOBS,
+    common::{process_status, start_child_process},
+    JobCompleted, JobCompletedSender, MAX_BUFFERED_DEDICATED_JOBS,
 };
 
 use futures::{future, Future};
@@ -58,6 +59,8 @@ pub async fn handle_dedicated_process(
     mut jobs_rx: Receiver<Arc<QueuedJob>>,
     worker_name: &str,
     db: &DB,
+    script_path: &str,
+    mode: &str,
 ) -> std::result::Result<(), error::Error> {
     //do not cache local dependencies
     let mut child = {
@@ -106,7 +109,11 @@ pub async fn handle_dedicated_process(
             .wait()
             .await
             .expect("child process encountered an error");
-        tracing::info!("child status was: {}", status);
+        if let Err(e) = process_status(status) {
+            tracing::error!("child exit status was not success: {e}");
+        } else {
+            tracing::info!("child exist status was success");
+        }
     });
 
     let mut jobs = VecDeque::with_capacity(MAX_BUFFERED_DEDICATED_JOBS);
@@ -114,7 +121,7 @@ pub async fn handle_dedicated_process(
     // let mut j = 0;
     let mut alive = true;
 
-    let init_log = format!("dedicated worker: {worker_name}\n\n");
+    let init_log = format!("dedicated worker {mode}: {worker_name}\n\n");
     let mut logs = init_log.clone();
     loop {
         tokio::select! {
@@ -125,9 +132,11 @@ pub async fn handle_dedicated_process(
                 if let Err(e) = write_stdin(&mut stdin, "end").await {
                     tracing::info!("Could not write end message to stdin: {e:?}")
                 }
+                stdin.flush().await.context("stdin flush")?;
             },
             line = err_reader.next_line() => {
                 if let Some(line) = line.expect("line is ok") {
+                    tracing::debug!("stderr dedicated worker: {line}");
                     logs.push_str("[stderr] ");
                     logs.push_str(&line);
                     logs.push_str("\n");
@@ -144,9 +153,10 @@ pub async fn handle_dedicated_process(
                         tracing::info!("dedicated worker process started");
                         continue;
                     }
-                    tracing::debug!("processed job: {line}");
+                    tracing::debug!("processed job: |{line}|");
                     if line.starts_with("wm_res[") {
                         let job: Arc<QueuedJob> = jobs.pop_front().expect("pop");
+                        tracing::info!("job completed on dedicated worker {script_path}: {}", job.id);
                         match serde_json::from_str::<Box<serde_json::value::RawValue>>(&line.replace("wm_res[success]:", "").replace("wm_res[error]:", "")) {
                             Ok(result) => {
                                 append_logs(job.id, job.workspace_id.clone(),  logs.clone(), db).await;
@@ -174,8 +184,9 @@ pub async fn handle_dedicated_process(
             job = conditional_polling(jobs_rx.recv(), alive && jobs.len() < MAX_BUFFERED_DEDICATED_JOBS) => {
                 // i += 1;
                 if let Some(job) = job {
-                    tracing::debug!("received job");
                     jobs.push_back(job.clone());
+                    tracing::info!("received job and adding to queue on dedicated worker for {script_path}: {} (queue_size: {})", job.id, jobs.len());
+
                     // write_stdin(&mut stdin, &serde_json::to_string(&job.args.unwrap_or_else(|| serde_json::json!({"x": job.id}))).expect("serialize")).await?;
                     write_stdin(&mut stdin, &serde_json::to_string(&job.args).expect("serialize")).await?;
                     stdin.flush().await.context("stdin flush")?;

backend/windmill-worker/src/deno_executor.rs

@@ -527,6 +527,8 @@ for await (const chunk of Deno.stdin.readable) {{
         jobs_rx,
         worker_name,
         db,
+        script_path,
+        "deno",
     )
     .await
 }

backend/windmill-worker/src/global_cache.rs

@@ -73,47 +73,19 @@ pub async fn build_tar_and_push(
 
 #[cfg(all(feature = "enterprise", feature = "parquet"))]
 pub async fn pull_from_tar(client: Arc<dyn ObjectStore>, folder: String) -> error::Result<()> {
-    use object_store::path::Path;
+    use windmill_common::s3_helpers::attempt_fetch_bytes;
+
     let folder_name = folder.split("/").last().unwrap();
 
     tracing::info!("Attempting to pull piptar {folder_name} from bucket");
 
     let start = Instant::now();
     let tar_path = format!("tar/pip/{folder_name}.tar");
+    let bytes = attempt_fetch_bytes(client, &tar_path).await?;
 
-    let object = client.get(&Path::from(tar_path.clone())).await;
-    if let Err(e) = object {
-        tracing::info!("Failed to pull tar from s3: {tar_path}. Error: {:?}", e);
-        return Err(error::Error::ExecutionErr(format!(
-            "Failed to pull tar from s3: {tar_path}"
-        )));
-    }
-
-    let bytes = object.unwrap().bytes().await;
-    if bytes.is_err() {
-        tracing::info!(
-            "Failed to read tar from s3: {tar_path}. Error: {:?}",
-            bytes.err()
-        );
-        return Err(error::Error::ExecutionErr(format!(
-            "Failed to read tar from s3: {tar_path}"
-        )));
-    }
-    let bytes = bytes.unwrap();
-    tracing::info!("{tar_path} len: {}", bytes.len());
-
-    if bytes.len() == 0 {
-        tracing::info!(
-            "piptar {folder_name} not found in bucket. Took {:?}ms",
-            start.elapsed().as_millis()
-        );
-        return Err(error::Error::ExecutionErr(format!(
-            "tar {folder_name} does not exist in bucket"
-        )));
-    }
     // tracing::info!("B: {target} {folder}");
 
-    extract_pip_tar(bytes, &folder).await.map_err(|e| {
+    extract_tar(bytes, &folder).await.map_err(|e| {
         tracing::error!("Failed to extract piptar {folder_name}. Error: {:?}", e);
         e
     })?;
@@ -127,7 +99,7 @@ pub async fn pull_from_tar(client: Arc<dyn ObjectStore>, folder: String) -> erro
 }
 
 #[cfg(all(feature = "enterprise", feature = "parquet"))]
-pub async fn extract_pip_tar(tar: bytes::Bytes, folder: &str) -> error::Result<()> {
+pub async fn extract_tar(tar: bytes::Bytes, folder: &str) -> error::Result<()> {
     use bytes::Buf;
     use tokio::fs::{self};
 
@@ -137,14 +109,14 @@ pub async fn extract_pip_tar(tar: bytes::Bytes, folder: &str) -> error::Result<(
     let mut ar = tar::Archive::new(tar.reader());
 
     if let Err(e) = ar.unpack(folder) {
-        tracing::info!("Failed to untar piptar. Error: {:?}", e);
+        tracing::info!("Failed to untar to {folder}. Error: {:?}", e);
         fs::remove_dir_all(&folder).await?;
         return Err(error::Error::ExecutionErr(format!(
             "Failed to untar piptar {folder}"
         )));
     }
     tracing::info!(
-        "Finished extracting pip tar {folder}. Took {}ms",
+        "Finished extracting tar to {folder}. Took {}ms",
         start.elapsed().as_millis(),
     );
     Ok(())

backend/windmill-worker/src/go_executor.rs

@@ -33,6 +33,111 @@ lazy_static::lazy_static! {
     static ref GO_PATH: String = std::env::var("GO_PATH").unwrap_or_else(|_| "/usr/bin/go".to_string());
 }
 
+pub async fn save_cache(
+    bin_path: &str,
+    job_dir: &str,
+    _hash: &str,
+    job: &QueuedJob,
+    db: &sqlx::Pool<sqlx::Postgres>,
+) -> windmill_common::error::Result<()> {
+    let job_main_path = format!("{job_dir}/main");
+    let mut _cached_to_s3 = false;
+    #[cfg(all(feature = "enterprise", feature = "parquet"))]
+    if let Some(os) = windmill_common::s3_helpers::OBJECT_STORE_CACHE_SETTINGS
+        .read()
+        .await
+        .clone()
+    {
+        use object_store::path::Path;
+
+        let hash_path = hash_to_os_path(_hash);
+        if let Err(e) = os
+            .put(
+                &Path::from(hash_path.clone()),
+                bytes::Bytes::from(std::fs::read(&job_main_path)?),
+            )
+            .await
+        {
+            tracing::error!(
+                "Failed to put go bin to object store: {hash_path}. Error: {:?}",
+                e
+            );
+        } else {
+            _cached_to_s3 = true;
+        }
+    }
+
+    if !*CLOUD_HOSTED {
+        tokio::fs::copy(&job_main_path, bin_path).await?;
+        append_logs(
+            job.id.clone(),
+            job.workspace_id.to_string(),
+            format!(
+                "\nwrite cached binary: {} (backed by object store: {_cached_to_s3})\n",
+                bin_path
+            ),
+            db,
+        )
+        .await;
+    } else if _cached_to_s3 {
+        append_logs(
+            job.id.clone(),
+            job.workspace_id.to_string(),
+            format!("write cached binary to object store {}\n", bin_path),
+            db,
+        )
+        .await;
+    }
+
+    Ok(())
+}
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+async fn write_binary_file(main_path: &str, byts: &mut bytes::Bytes) -> error::Result<()> {
+    use std::fs::Permissions;
+    use std::os::unix::fs::PermissionsExt;
+    use tokio::io::AsyncWriteExt;
+
+    let mut file = File::create(main_path).await?;
+    file.write_buf(byts).await?;
+    file.set_permissions(Permissions::from_mode(0o755)).await?;
+    file.flush().await?;
+    Ok(())
+}
+
+#[cfg(all(feature = "enterprise", feature = "parquet"))]
+fn hash_to_os_path(hash: &str) -> String {
+    format!("gobin/{hash}")
+}
+
+async fn load_cache(bin_path: &str, _hash: &str) -> (bool, String) {
+    if tokio::fs::metadata(&bin_path).await.is_ok() {
+        (true, format!("loaded bin from local cache: {}\n", bin_path))
+    } else {
+        #[cfg(all(feature = "enterprise", feature = "parquet"))]
+        if let Some(os) = windmill_common::s3_helpers::OBJECT_STORE_CACHE_SETTINGS
+            .read()
+            .await
+            .clone()
+        {
+            use windmill_common::s3_helpers::attempt_fetch_bytes;
+
+            if let Ok(mut x) = attempt_fetch_bytes(os, &hash_to_os_path(_hash)).await {
+                if let Err(e) = write_binary_file(bin_path, &mut x).await {
+                    tracing::error!("could not write binary file: {e:?}");
+                    return (
+                        false,
+                        "error writing binary file from object store".to_string(),
+                    );
+                }
+                tracing::info!("loaded bin from object store {}", bin_path);
+                return (true, format!("loaded bin from object store {}", bin_path));
+            }
+        }
+        (false, "".to_string())
+    }
+}
+
 #[tracing::instrument(level = "trace", skip_all)]
 pub async fn handle_go_job(
     mem_peak: &mut i32,
@@ -50,21 +155,19 @@ pub async fn handle_go_job(
 ) -> Result<Box<RawValue>, Error> {
     //go does not like executing modules at temp root
     let job_dir = &format!("{job_dir}/go");
-    let bin_path = format!(
-        "{}/{}",
-        GO_BIN_CACHE_DIR,
-        calculate_hash(&format!(
-            "{}{}",
-            inner_content,
-            requirements_o
-                .as_ref()
-                .map(|x| x.to_string())
-                .unwrap_or_default()
-        ))
-    );
-    let bin_exists = !*CLOUD_HOSTED && tokio::fs::metadata(&bin_path).await.is_ok();
+    let hash = calculate_hash(&format!(
+        "{}{}v2",
+        inner_content,
+        requirements_o
+            .as_ref()
+            .map(|x| x.to_string())
+            .unwrap_or_default()
+    ));
+    let bin_path = format!("{}/{hash}", GO_BIN_CACHE_DIR,);
 
-    let (skip_go_mod, skip_tidy) = if bin_exists {
+    let (cache, cache_logs) = load_cache(&bin_path, &hash).await;
+
+    let (skip_go_mod, skip_tidy) = if cache {
         create_dir(job_dir).await?;
         (true, true)
     } else if let Some(requirements) = requirements_o {
@@ -73,8 +176,8 @@ pub async fn handle_go_job(
         (false, false)
     };
 
-    if !bin_exists {
-        let logs1 = "\n\n--- GO DEPENDENCIES SETUP ---\n".to_string();
+    let cache_logs = if !cache {
+        let logs1 = format!("{cache_logs}\n\n--- GO DEPENDENCIES SETUP ---\n");
         append_logs(job.id.clone(), job.workspace_id.to_string(), logs1, db).await;
 
         install_go_dependencies(
@@ -92,9 +195,6 @@ pub async fn handle_go_job(
         )
         .await?;
 
-        let logs2 = "\n\n--- GO CODE EXECUTION ---\n".to_string();
-        append_logs(job.id.clone(), job.workspace_id.to_string(), logs2, db).await;
-
         create_args_and_out_file(client, job, job_dir, db).await?;
         {
             let sig = windmill_parser_go::parse_go_sig(&inner_content)?;
@@ -209,33 +309,24 @@ func Run(req Req) (interface{{}}, error){{
         )
         .await?;
 
-        if !*CLOUD_HOSTED {
-            create_dir(&bin_path).await?;
-            let target = format!("{bin_path}/main");
-            tokio::fs::copy(format!("{job_dir}/main"), &target).await?;
-            append_logs(
-                job.id.clone(),
-                job.workspace_id.to_string(),
-                format!("write cached binary: {}\n", bin_path),
-                db,
-            )
-            .await;
+        if let Err(e) = save_cache(&bin_path, &job_dir, &hash, &job, db).await {
+            tracing::error!("could not save {bin_path} to go cache: {e:?}");
         }
+        "".to_string()
     } else {
-        let path = format!("{bin_path}/main");
-        let mut logs2 = "".to_string();
-        logs2.push_str(&format!("found cached binary: {path}\n"));
         let target = format!("{job_dir}/main");
-        tokio::fs::symlink(&path, &target).await.map_err(|e| {
+        tokio::fs::symlink(&bin_path, &target).await.map_err(|e| {
             Error::ExecutionErr(format!(
-                "could not copy cached binary from {path} to {job_dir}/main: {e:?}"
+                "could not copy cached binary from {bin_path} to {job_dir}/main: {e:?}"
             ))
         })?;
 
-        logs2.push_str("\n\n--- GO CODE EXECUTION ---\n");
-        append_logs(job.id.clone(), job.workspace_id.to_string(), logs2, db).await;
         create_args_and_out_file(client, job, job_dir, db).await?;
-    }
+        cache_logs
+    };
+
+    let logs2 = format!("{cache_logs}\n\n--- GO CODE EXECUTION ---\n");
+    append_logs(job.id.clone(), job.workspace_id.to_string(), logs2, db).await;
 
     let client = &client.get_authed().await;
 
@@ -303,6 +394,13 @@ func Run(req Req) (interface{{}}, error){{
         false,
     )
     .await?;
+
+    if cache && *CLOUD_HOSTED {
+        //do not keep the binary in the cache if it is cloud hosted to avoid filling up the disk
+        if let Err(e) = tokio::fs::remove_file(&bin_path).await {
+            tracing::error!("could not remove {bin_path} from go cache: {e:?}");
+        }
+    }
     read_result(job_dir).await
 }