Apply automatic changes

* chore(main): release 1.308.2

* Apply automatic changes

---------

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

.github/change-versions-mac.sh

@@ -16,7 +16,6 @@ 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,12 +12,10 @@ 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,cloud
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee:dev
             ${{ steps.meta-ee-public.outputs.tags }}
@@ -199,75 +199,13 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud
+            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect
             PYTHON_IMAGE=python:3.12.2-slim-bookworm
           tags: |
             ${{ steps.meta-ee-public-py312.outputs.tags }}
           labels: |
             ${{ steps.meta-ee-public-py312.outputs.labels }}
             org.opencontainers.image.licenses=Windmill-Enterprise-License
-
-  build_ee_jemalloc:
-    runs-on: ubicloud
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Read EE repo commit hash
-        run: |
-          echo "ee_repo_ref=$(cat ./backend/ee-repo-ref.txt)" >> "$GITHUB_ENV"
-
-      - uses: actions/checkout@v3
-        with:
-          repository: windmill-labs/windmill-ee-private
-          path: ./windmill-ee-private
-          ref: ${{ env.ee_repo_ref }}
-          token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
-          fetch-depth: 0
-
-      # - name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v2
-      - uses: depot/setup-action@v1
-
-      - name: Docker meta
-        id: meta-ee-public-jemalloc
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee-jemalloc
-          flavor: |
-            latest=false
-          tags: |
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: Login to registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Substitute EE code
-        run: |
-          ./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private
-
-      - name: Build and push publicly ee
-        uses: depot/build-push-action@v1
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          build-args: |
-            features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud,jemalloc
-          tags: |
-            ${{ steps.meta-ee-public-jemalloc.outputs.tags }}
-          labels: |
-            ${{ steps.meta-ee-public-jemalloc.outputs.labels }}
-            org.opencontainers.image.licenses=Windmill-Enterprise-License
   # disabled until we make it 100% reliable and add more meaningful tests
   # playwright:
   #   runs-on: [self-hosted, new]

.github/workflows/gallery_on_release.yml

@@ -1,16 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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,14 +12,12 @@ RUN apt-get -y update \
 
 RUN rustup component add rustfmt
 
-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
+RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install cargo-chef 
 
 WORKDIR /windmill
 
 ENV SQLX_OFFLINE=true
-# ENV CARGO_INCREMENTAL=1
+ENV CARGO_INCREMENTAL=1
 
 FROM node:20-alpine as frontend
 
@@ -48,9 +46,7 @@ FROM rust_base AS planner
 COPY ./openflow.openapi.yaml /openflow.openapi.yaml
 COPY ./backend ./
 
-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
+RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo chef prepare --recipe-path recipe.json
 
 FROM rust_base AS builder
 ARG features=""
@@ -59,9 +55,7 @@ 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 --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
+RUN 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 ./
@@ -70,9 +64,7 @@ COPY --from=frontend /frontend /frontend
 COPY --from=frontend /backend/windmill-api/openapi-deref.yaml ./windmill-api/openapi-deref.yaml
 COPY .git/ .git/
 
-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"
+RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo build --release --features "$features"
 
 
 FROM ${DEBIAN_IMAGE} as downloader
@@ -171,10 +163,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.7 /usr/local/bin/bun /usr/bin/bun
-
-COPY --from=php:8.3.7-cli /usr/local/bin/php /usr/bin/php
-COPY --from=composer:2.7.6 /usr/bin/composer /usr/bin/composer
+COPY --from=oven/bun:1.1.0 /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/ powershell-client/ are
+snippets upon demand. The files under python-client/ deno-client/ go-client/ are
 Apache 2.0 Licensed.
 
 The openapi files, including the OpenFlow spec is Apache 2.0 Licensed.

README.md

@@ -352,7 +352,6 @@ 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-020d33ed5d47350b456783fd548422ea8dcf2d786d0e9fa849754db82c9fa378.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, 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)",
+  "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)",
   "describe": {
     "columns": [],
     "parameters": {
@@ -34,8 +34,7 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }
@@ -67,12 +66,10 @@
         "Bool",
         "Int4",
         "Varchar",
-        "Bool",
-        "Bool",
-        "Varchar"
+        "Bool"
       ]
     },
     "nullable": []
   },
-  "hash": "8e7ff45c5378c3a3406ba94dc0653afa5d28c072203617c598caefaaf1bafcfb"
+  "hash": "020d33ed5d47350b456783fd548422ea8dcf2d786d0e9fa849754db82c9fa378"
 }

backend/.sqlx/query-021be0f26ea87e587e656b24a9a94538efbf54a1447a3898e19773789cfc9063.json

@@ -1,20 +0,0 @@
-{
-  "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-0a1c95c4376b944661bab13271091cf3ea0afe68fb8e08e7aea239dc735c625c.json

@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO concurrency_key(key, job_id) VALUES ($1, $2)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Uuid"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "0a1c95c4376b944661bab13271091cf3ea0afe68fb8e08e7aea239dc735c625c"
-}

backend/.sqlx/query-0a686ca61444d7ad7484071727aa039a6ea6697e5a49a633b767c052aa3e0a18.json

@@ -54,8 +54,7 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }

backend/.sqlx/query-0b74ab3a237b2b7f54c05c7ea74294317fcd039870268eaa930f1ba8b8250559.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT COUNT(*) as count, COALESCE(MAX(ended_at), now() - INTERVAL '1 second' * $2)  as max_ended_at FROM concurrency_key WHERE key = $1 AND ended_at >=  (now() - INTERVAL '1 second' * $2)",
+  "query": "SELECT COUNT(*) as count, COALESCE(MAX(ended_at), now() - INTERVAL '1 second' * $2)  as max_ended_at FROM custom_concurrency_key_ended  WHERE key = $1 AND ended_at >=  (now() - INTERVAL '1 second' * $2)",
   "describe": {
     "columns": [
       {
@@ -25,5 +25,5 @@
       null
     ]
   },
-  "hash": "fab5a746a179eea356f0bb9005590e3bb89c4deff181827bd2fa5630c21e42a7"
+  "hash": "0b74ab3a237b2b7f54c05c7ea74294317fcd039870268eaa930f1ba8b8250559"
 }

backend/.sqlx/query-0d7ba88a9810e434aa00fd63bbf416cbe222f2c67ccc8aa92e651c2bea4c2d7b.json

@@ -1,15 +0,0 @@
-{
-  "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-2352e293e172304a10ab3500b17848e8199b690b1834c382fa9d5c6ae163ec2c.json

@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE concurrency_key SET ended_at = now() WHERE job_id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "2352e293e172304a10ab3500b17848e8199b690b1834c382fa9d5c6ae163ec2c"
-}

backend/.sqlx/query-2946aa519633291de986978d245dc615a0ee10ce6e6a98bd4906e86225b387b3.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "DELETE FROM concurrency_key WHERE key = $1",
+  "query": "DELETE FROM custom_concurrency_key_ended  WHERE key = $1",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "2bbcc383ed79afa3392af417b0cabb32d14a0a26dc36085fb2eaa62e769aca8e"
+  "hash": "2946aa519633291de986978d245dc615a0ee10ce6e6a98bd4906e86225b387b3"
 }

backend/.sqlx/query-2f42460fdd8aa125c8fd46b3cd02e47f57de0f073d3ce3bc7d21a7e404a83b5c.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "select hash, tag, concurrency_key, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, delete_after_use, timeout from script where path = $1 AND workspace_id = $2 AND\n    created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2 AND\n    deleted = false AND lock IS not NULL AND lock_error_logs IS NULL)",
+  "query": "select hash, tag, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, timeout FROM script where path = $1 AND workspace_id = $2 AND\n    created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2 AND\n    deleted = false AND archived = false)",
   "describe": {
     "columns": [
       {
@@ -15,26 +15,21 @@
       },
       {
         "ordinal": 2,
-        "name": "concurrency_key",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
         "name": "concurrent_limit",
         "type_info": "Int4"
       },
       {
-        "ordinal": 4,
+        "ordinal": 3,
         "name": "concurrency_time_window_s",
         "type_info": "Int4"
       },
       {
-        "ordinal": 5,
+        "ordinal": 4,
         "name": "cache_ttl",
         "type_info": "Int4"
       },
       {
-        "ordinal": 6,
+        "ordinal": 5,
         "name": "language: ScriptLang",
         "type_info": {
           "Custom": {
@@ -53,30 +48,24 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }
         }
       },
       {
-        "ordinal": 7,
+        "ordinal": 6,
         "name": "dedicated_worker",
         "type_info": "Bool"
       },
       {
-        "ordinal": 8,
+        "ordinal": 7,
         "name": "priority",
         "type_info": "Int2"
       },
       {
-        "ordinal": 9,
-        "name": "delete_after_use",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 10,
+        "ordinal": 8,
         "name": "timeout",
         "type_info": "Int4"
       }
@@ -93,13 +82,11 @@
       true,
       true,
       true,
-      true,
       false,
       true,
       true,
-      true,
       true
     ]
   },
-  "hash": "e1c715020f1efb00123171edfb6173bfeaaa95d4f870240e42b76e5df304ce99"
+  "hash": "2f42460fdd8aa125c8fd46b3cd02e47f57de0f073d3ce3bc7d21a7e404a83b5c"
 }

backend/.sqlx/query-3667d72d23e8c35ab96d5e5d1fbfd94a8a9f74b6398e21f13c206c3f9427c6a9.json

@@ -1,12 +0,0 @@
-{
-  "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-3e0e5e0076ae0f7771abd64f8c5bb7e003e3f85351c946a012037e0c874acf1a.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": "02b516dac764662194db1bc33e365c01f40bae70af3683f1f09748f6020f0d49"
+  "hash": "3e0e5e0076ae0f7771abd64f8c5bb7e003e3f85351c946a012037e0c874acf1a"
 }

backend/.sqlx/query-47beea5cd6324b53bfb349665fb215280f32b70a617fde87f70ea53ca9ade39f.json

@@ -1,17 +1,16 @@
 {
   "db_name": "PostgreSQL",
-  "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",
+  "query": "UPDATE worker_ping SET ping_at = now(), jobs_executed = $1, custom_tags = $2 WHERE worker = $3",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
         "Int4",
         "TextArray",
-        "Float4",
         "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "54fef88cc6b9e8db7c07fccbaa845edfefa339153a32e468faad9f063008863d"
+  "hash": "47beea5cd6324b53bfb349665fb215280f32b70a617fde87f70ea53ca9ade39f"
 }

backend/.sqlx/query-4887db074e9058bc0c1887428d6b2a897fe4b30c83f2aa5e9464c156f08f1c3a.json

@@ -1,38 +0,0 @@
-{
-  "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-5ce9a9e0669b299b998bc9080d24f8d6f56eb049bec2e0745d27ca3a4fc0c296.json

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

backend/.sqlx/query-5eff32a37ad4e8b499a82c1874061f6456ded4aca6b33964e138b935cb016eff.json

@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT key FROM concurrency_key WHERE job_id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "key",
-        "type_info": "Varchar"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "5eff32a37ad4e8b499a82c1874061f6456ded4aca6b33964e138b935cb016eff"
-}

backend/.sqlx/query-620ddf29c5e867079df4c2aa6e80bccb19beeb9ddfa308ca97f254cd5ba8157e.json

@@ -68,8 +68,7 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }

backend/.sqlx/query-636db0b9d5963ed540f18ab732a8b29a3308f973cc04fd10979c44ae19169abf.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM custom_concurrency_key_ended WHERE  ended_at <= now() - ($1::bigint::text || ' s')::interval ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "636db0b9d5963ed540f18ab732a8b29a3308f973cc04fd10979c44ae19169abf"
+}

backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json

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

backend/.sqlx/query-6afc5c7cbb3abe11ade0cedf1f7328005ce4de3165cdd998e5a0d27e044c7153.json

@@ -1,22 +0,0 @@
-{
-  "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-6b313cc9a57ae3c943bda4a3213f7f6231a44b6ef5a52754074d136007f4f72a.json

@@ -1,40 +1,30 @@
 {
   "db_name": "PostgreSQL",
-  "query": "select path, tag, concurrency_key, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, delete_after_use, timeout from script where hash = $1 AND workspace_id = $2",
+  "query": "select tag, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, delete_after_use, timeout from script where hash = $1 AND workspace_id = $2",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
         "name": "tag",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 2,
-        "name": "concurrency_key",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
+        "ordinal": 1,
         "name": "concurrent_limit",
         "type_info": "Int4"
       },
       {
-        "ordinal": 4,
+        "ordinal": 2,
         "name": "concurrency_time_window_s",
         "type_info": "Int4"
       },
       {
-        "ordinal": 5,
+        "ordinal": 3,
         "name": "cache_ttl",
         "type_info": "Int4"
       },
       {
-        "ordinal": 6,
+        "ordinal": 4,
         "name": "language: ScriptLang",
         "type_info": {
           "Custom": {
@@ -53,30 +43,29 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }
         }
       },
       {
-        "ordinal": 7,
+        "ordinal": 5,
         "name": "dedicated_worker",
         "type_info": "Bool"
       },
       {
-        "ordinal": 8,
+        "ordinal": 6,
         "name": "priority",
         "type_info": "Int2"
       },
       {
-        "ordinal": 9,
+        "ordinal": 7,
         "name": "delete_after_use",
         "type_info": "Bool"
       },
       {
-        "ordinal": 10,
+        "ordinal": 8,
         "name": "timeout",
         "type_info": "Int4"
       }
@@ -88,8 +77,6 @@
       ]
     },
     "nullable": [
-      false,
-      true,
       true,
       true,
       true,
@@ -101,5 +88,5 @@
       true
     ]
   },
-  "hash": "8b10c9ade85c0307e300224e87962ceba8e7ccbe53b56c4670a1634bb9d0e89c"
+  "hash": "6b313cc9a57ae3c943bda4a3213f7f6231a44b6ef5a52754074d136007f4f72a"
 }

backend/.sqlx/query-6f12be65a4fe3eb39292164363f557de9cef7017dcfbcd40370b849a288c52e3.json

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

backend/.sqlx/query-7b609ed87f974dfe887778746230b40b485658a75a1186c6ebb4c2de1b52a2fa.json

@@ -0,0 +1,20 @@
+{
+  "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

@@ -1,26 +0,0 @@
-{
-  "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

@@ -1,12 +0,0 @@
-{
-  "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

@@ -1,20 +0,0 @@
-{
-  "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

@@ -1,15 +0,0 @@
-{
-  "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

@@ -1,12 +0,0 @@
-{
-  "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

@@ -1,16 +0,0 @@
-{
-  "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-973933b021d2167edff3a48ec4d4abc53ada670155921a4a4c2f05f229ae560a.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO custom_concurrency_key_ended VALUES ($1)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "973933b021d2167edff3a48ec4d4abc53ada670155921a4a4c2f05f229ae560a"
+}

backend/.sqlx/query-9a5c7e8b60a260085b438bd300972ebf948ea26f313ee5a73b85574becdd7dc7.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT char_length(logs) FROM job_logs WHERE job_id = $1 AND workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "char_length",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "9a5c7e8b60a260085b438bd300972ebf948ea26f313ee5a73b85574becdd7dc7"
+}

backend/.sqlx/query-9bf41c3161a02b7d0731c4e1d79519cef5255f5df1b759af3aa4985bb64313e5.json

@@ -1,15 +0,0 @@
-{
-  "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-9d3556319411a27a875bf6cf0e5eda837cc63e4d8be912c0b5bfeea4a0c8db2e.json

@@ -48,8 +48,7 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }

backend/.sqlx/query-9da0cea2a5d0464ca78cfeccf6cedf2b1c0e6e6cb3c9183a937a68465debdb06.json

@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM concurrency_key WHERE  ended_at <= now() - ($1::bigint::text || ' s')::interval ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "9da0cea2a5d0464ca78cfeccf6cedf2b1c0e6e6cb3c9183a937a68465debdb06"
-}

backend/.sqlx/query-a3ccf362b4f6df400b3c7a084795dbf541eb14c5c374656ffb96da7283a2a6f1.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT concurrency_key FROM script WHERE hash = $1 AND workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "concurrency_key",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "a3ccf362b4f6df400b3c7a084795dbf541eb14c5c374656ffb96da7283a2a6f1"
+}

backend/.sqlx/query-a875cb56485b812e9d4739afd0915067f7e5abe0ca0adf264b792fccf21e005b.json

@@ -1,12 +1,12 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT EXISTS (SELECT 1 FROM usr WHERE workspace_id = $1 AND email = $2)",
+  "query": "SELECT value->>'concurrency_key' FROM flow WHERE path = $1 AND workspace_id = $2",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "exists",
-        "type_info": "Bool"
+        "name": "?column?",
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -19,5 +19,5 @@
       null
     ]
   },
-  "hash": "7142222bee1f60bc56752e377b96ac6e4e981ea219c173146088faf1ad9f3822"
+  "hash": "a875cb56485b812e9d4739afd0915067f7e5abe0ca0adf264b792fccf21e005b"
 }

backend/.sqlx/query-abc7c72dfe9b01cde6f5b206300ed33e3d15b16bce2510160166a66fb7598e61.json

@@ -1,16 +1,11 @@
 {
   "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) as min_started_at, now() AS now",
+  "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)",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "min_started_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 1,
-        "name": "now",
+        "name": "coalesce",
         "type_info": "Timestamptz"
       }
     ],
@@ -22,9 +17,8 @@
       ]
     },
     "nullable": [
-      null,
       null
     ]
   },
-  "hash": "3901cce744c9b246b661c817e068bdb3b1ab504ff8070fcccf6c909ad75f1f6d"
+  "hash": "abc7c72dfe9b01cde6f5b206300ed33e3d15b16bce2510160166a66fb7598e61"
 }

backend/.sqlx/query-b38044d94e2ab03167c2f6fbb553ab3c19930ed11abf51763cd3ee378229443d.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, 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",
+  "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",
   "describe": {
     "columns": [
       {
@@ -35,41 +35,25 @@
       },
       {
         "ordinal": 6,
-        "name": "current_job_id",
-        "type_info": "Uuid"
-      },
-      {
-        "ordinal": 7,
-        "name": "current_job_workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
         "name": "custom_tags",
         "type_info": "TextArray"
       },
       {
-        "ordinal": 9,
+        "ordinal": 7,
         "name": "worker_group",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 10,
+        "ordinal": 8,
         "name": "wm_version",
         "type_info": "Varchar"
-      },
-      {
-        "ordinal": 11,
-        "name": "occupancy_rate",
-        "type_info": "Float4"
       }
     ],
     "parameters": {
       "Left": [
         "Int4",
         "Int8",
-        "Int8",
-        "Bool"
+        "Int8"
       ]
     },
     "nullable": [
@@ -79,13 +63,10 @@
       false,
       false,
       false,
-      null,
-      null,
       true,
       false,
-      false,
-      true
+      false
     ]
   },
-  "hash": "e00171cc3fc8f32922562d4fc4d3db56955fbc6ee9872d4b2e99157ebed131e0"
+  "hash": "b38044d94e2ab03167c2f6fbb553ab3c19930ed11abf51763cd3ee378229443d"
 }

backend/.sqlx/query-b3dbdfb50ee8118bdaed3164b210cb549a34b96554ae1872355b90304f5dcb76.json

@@ -18,8 +18,8 @@
       "Left": []
     },
     "nullable": [
-      false,
-      true
+      true,
+      false
     ]
   },
   "hash": "b3dbdfb50ee8118bdaed3164b210cb549a34b96554ae1872355b90304f5dcb76"

backend/.sqlx/query-b69891c25dd029b1a54e97ace292433e1485324ff7dc802fe75d21c8c6db1d42.json

@@ -1,16 +1,16 @@
 {
   "db_name": "PostgreSQL",
-  "query": "select tag, concurrency_key, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, delete_after_use, timeout from script where hash = $1 AND workspace_id = $2",
+  "query": "select path, tag, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, delete_after_use, timeout from script where hash = $1 AND workspace_id = $2",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "tag",
+        "name": "path",
         "type_info": "Varchar"
       },
       {
         "ordinal": 1,
-        "name": "concurrency_key",
+        "name": "tag",
         "type_info": "Varchar"
       },
       {
@@ -48,8 +48,7 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }
@@ -83,7 +82,7 @@
       ]
     },
     "nullable": [
-      true,
+      false,
       true,
       true,
       true,
@@ -95,5 +94,5 @@
       true
     ]
   },
-  "hash": "1a612eb0b64eddd2c5657ef73598c47886545796424f8612135b711e2b9ddb6c"
+  "hash": "b69891c25dd029b1a54e97ace292433e1485324ff7dc802fe75d21c8c6db1d42"
 }

backend/.sqlx/query-bbd5f968d7b62a55a7ebf7b98cfd411678ce544fdb9472d8d223235fb2818aaf.json

@@ -1,23 +0,0 @@
-{
-  "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

@@ -1,26 +0,0 @@
-{
-  "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

@@ -1,15 +0,0 @@
-{
-  "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

@@ -0,0 +1,14 @@
+{
+  "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-d5a8614286c170e0d175903cd1b53ff66b37ed8110a0b67aedb9f25e6a7383e1.json

@@ -74,8 +74,7 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }

backend/.sqlx/query-ef132ac8d79579b08d7359789b6f22991f51e1c945efc2924df6253d62b83bba.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "select hash, tag, concurrency_key, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, timeout FROM script where path = $1 AND workspace_id = $2 AND\n    created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2 AND\n    deleted = false AND archived = false)",
+  "query": "select hash, tag, concurrent_limit, concurrency_time_window_s, cache_ttl, language as \"language: ScriptLang\", dedicated_worker, priority, delete_after_use, timeout from script where path = $1 AND workspace_id = $2 AND\n    created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2 AND\n    deleted = false AND lock IS not NULL AND lock_error_logs IS NULL)",
   "describe": {
     "columns": [
       {
@@ -15,26 +15,21 @@
       },
       {
         "ordinal": 2,
-        "name": "concurrency_key",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
         "name": "concurrent_limit",
         "type_info": "Int4"
       },
       {
-        "ordinal": 4,
+        "ordinal": 3,
         "name": "concurrency_time_window_s",
         "type_info": "Int4"
       },
       {
-        "ordinal": 5,
+        "ordinal": 4,
         "name": "cache_ttl",
         "type_info": "Int4"
       },
       {
-        "ordinal": 6,
+        "ordinal": 5,
         "name": "language: ScriptLang",
         "type_info": {
           "Custom": {
@@ -53,23 +48,27 @@
                 "snowflake",
                 "graphql",
                 "powershell",
-                "mssql",
-                "php"
+                "mssql"
               ]
             }
           }
         }
       },
       {
-        "ordinal": 7,
+        "ordinal": 6,
         "name": "dedicated_worker",
         "type_info": "Bool"
       },
       {
-        "ordinal": 8,
+        "ordinal": 7,
         "name": "priority",
         "type_info": "Int2"
       },
+      {
+        "ordinal": 8,
+        "name": "delete_after_use",
+        "type_info": "Bool"
+      },
       {
         "ordinal": 9,
         "name": "timeout",
@@ -88,12 +87,12 @@
       true,
       true,
       true,
-      true,
       false,
       true,
       true,
+      true,
       true
     ]
   },
-  "hash": "9d25fbd21a63e6e9ccfdbf0460c8b3ca6d7fa05600067f379659b59b6f2bf418"
+  "hash": "ef132ac8d79579b08d7359789b6f22991f51e1c945efc2924df6253d62b83bba"
 }

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.331.2"
+version = "1.308.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -24,7 +24,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.331.2"
+version = "1.308.2"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -50,8 +50,6 @@ 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"]
-jemalloc = ["dep:tikv-jemallocator"]
 
 [dependencies]
 anyhow.workspace = true
@@ -83,8 +81,6 @@ serde.workspace = true
 deno_core.workspace = true
 pg-embed = {git = "https://github.com/faokunega/pg-embed", optional = true, default-features = false, features = ['rt_tokio']} 
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-tikv-jemallocator = { optional = true, version = "0.5" }
 
 [dev-dependencies]
 serde_json.workspace = true
@@ -110,10 +106,9 @@ windmill-parser-go = { path = "./parsers/windmill-parser-go" }
 windmill-parser-bash = { path = "./parsers/windmill-parser-bash" }
 windmill-parser-sql = { path = "./parsers/windmill-parser-sql" }
 windmill-parser-graphql = { path = "./parsers/windmill-parser-graphql" }
-windmill-parser-php = { path = "./parsers/windmill-parser-php" }
 windmill-api-client = { path = "./windmill-api-client" }
 
-axum = { version = "^0.7", features = ["multipart"] } 
+axum = { version = "^0.7" } 
 headers = "^0"
 hyper = { version = "^1", features = ["full"] }
 tokio = { version = "^1", features = ["full", "tracing"] }
@@ -143,7 +138,6 @@ rand_core = { version = "^0", features = ["std"] }
 magic-crypt = "^3"
 git-version = "^0"
 rustpython-parser = { git = "https://github.com/RustPython/Parser", rev = "9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" }
-php-parser-rs = { git = "https://github.com/php-rust-tools/parser", rev = "ec4cb411dec09450946ef57920b7ffced7f6495d" }
 cron = "^0"
 mail-send = { version = "0.4.0", features = ["builder"], default-features=false }
 urlencoding = "^2"
@@ -230,7 +224,7 @@ tokenizers = "0.14.1"
 candle-core = "0.3.0"
 candle-transformers = "0.3.0"
 candle-nn = "0.3.0"
-tiberius = { git = "https://github.com/prisma/tiberius", rev = "8f66a699dfa041e7b5f736c7e94f92c945453c9e", default-features = false, features = ["rustls", "tds73", "chrono", "sql-browser-tokio"]}
+tiberius = { version = "0.12.2", default-features = false, features = ["rustls", "tds73", "chrono", "sql-browser-tokio"] }
 pin-project = "1"
 indexmap = { version = "2.2.5", features = ["serde"]}
 
@@ -245,4 +239,4 @@ aws-sdk-sts = "^1"
 crc = "^3"
 tar = "^0"
 http = "^1"
-async-stream = "^0"
+async-stream = "^0"

backend/ee-repo-ref.txt

@@ -1 +1 @@
-e0b0494c26b63efa4aa3f41a9fb42c7733dcca2e
+66d9cbb158ab9a5869a45ba253bf57f2cbb5ecb6

backend/migrations/20240419170502_add_script_no_main_func.down.sql

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

backend/migrations/20240419170502_add_script_no_main_func.up.sql

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

backend/migrations/20240422144808_add_labels.down.sql

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

backend/migrations/20240422144808_add_labels.up.sql

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

backend/migrations/20240424083501_add_labels_2.down.sql

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

backend/migrations/20240424083501_add_labels_2.up.sql

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

backend/migrations/20240430005030_add_codebases.down.sql

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

backend/migrations/20240430005030_add_codebases.up.sql

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

backend/migrations/20240506085935_add_worker_ping_metrics.down.sql

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

backend/migrations/20240506085935_add_worker_ping_metrics.up.sql

@@ -1,7 +0,0 @@
--- 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

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

backend/migrations/20240506114033_add_metrics_table.up.sql

@@ -1,8 +0,0 @@
--- 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/migrations/20240513125035_add_php_lang.down.sql

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

backend/migrations/20240513125035_add_php_lang.up.sql

@@ -1,2 +0,0 @@
--- Add up migration script here
-ALTER TYPE SCRIPT_LANG ADD VALUE IF NOT EXISTS 'php';

backend/migrations/20240514091000_fix_php_migration.down.sql

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

backend/migrations/20240514091000_fix_php_migration.up.sql

@@ -1,2 +0,0 @@
--- Add up migration script here
-UPDATE config SET name = 'worker__default_tmp' WHERE name = 'worker__default';

backend/migrations/20240514092225_add_php_tag_and_default_lang.down.sql

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

backend/migrations/20240514092225_add_php_tag_and_default_lang.up.sql

@@ -1,4 +0,0 @@
--- Add up migration script here
-UPDATE config set config = '{"worker_tags": ["deno", "python3", "go", "bash", "powershell", "dependency", "flow", "hub", "other", "bun", "php"]}'::jsonb where name = 'worker__default' and config @> '{"worker_tags": ["deno", "python3", "go", "bash", "powershell", "dependency", "flow", "hub", "other", "bun"]}'::jsonb;
-UPDATE workspace_settings SET default_scripts = jsonb_set(default_scripts, '{order}', default_scripts->'order' || '["php"]'::jsonb) WHERE default_scripts IS NOT NULL AND default_scripts->'order' IS NOT NULL AND NOT default_scripts->'order' @> '["php"]'::jsonb;
-

backend/migrations/20240515071725_fix_php_migration_2.down.sql

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

backend/migrations/20240515071725_fix_php_migration_2.up.sql

@@ -1,3 +0,0 @@
--- Add up migration script here
-UPDATE config SET name = 'worker__default' WHERE name = 'worker__default_tmp';
-UPDATE config set config = jsonb_set(config, '{worker_tags}', config->'worker_tags' || '["php"]'::jsonb) where name = 'worker__default' and config @> '{"worker_tags": ["deno", "python3", "go", "bash", "powershell", "dependency", "flow", "hub", "other", "bun"]}'::jsonb AND NOT config->'worker_tags' @> '"php"'::jsonb;

backend/migrations/20240515093517_concurrency_key_observability.down.sql

@@ -1,3 +0,0 @@
--- Add down migration script here
-DROP TABLE concurrency_key
-

backend/migrations/20240515093517_concurrency_key_observability.up.sql

@@ -1,10 +0,0 @@
--- Add up migration script here
-CREATE TABLE concurrency_key (
-    key VARCHAR(255) NOT NULL,
-    ended_at TIMESTAMP WITH TIME ZONE,
-    job_id uuid NOT NULL,
-    PRIMARY KEY (job_id)
-);
-
-
-CREATE INDEX concurrency_key_ended_at_idx ON concurrency_key (key, ended_at DESC);

backend/parsers/windmill-parser-php/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "windmill-parser-php"
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-
-[lib]
-name = "windmill_parser_php"
-path = "./src/lib.rs"
-
-[dependencies]
-windmill-parser.workspace = true
-itertools.workspace = true
-serde_json.workspace = true
-anyhow.workspace = true
-php-parser-rs.workspace = true
-convert_case.workspace = true
-lazy_static.workspace = true
-regex.workspace = true

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

@@ -1,166 +0,0 @@
-use convert_case::{Case, Casing};
-use regex::Regex;
-use serde_json::Value;
-use windmill_parser::{Arg, MainArgSignature, Typ};
-
-use php_parser_rs::parser::{
-    self,
-    ast::{
-        data_type::Type,
-        functions::{FunctionParameterList, FunctionStatement},
-        literals::Literal,
-        Expression, Statement,
-    },
-};
-
-lazy_static::lazy_static! {
-    static ref RE_SNK_CASE: Regex = Regex::new(r"_(\d)").unwrap();
-}
-
-fn to_snake_case(s: String) -> String {
-    let r = s.to_case(Case::Snake);
-
-    // s_3 => s3
-    RE_SNK_CASE.replace_all(&r, "$1").to_string()
-}
-
-fn parse_php_type(e: Type) -> Typ {
-    match e {
-        Type::Float(_) => Typ::Float,
-        Type::Boolean(_) => Typ::Bool,
-        Type::Integer(_) => Typ::Int,
-        Type::String(_) => Typ::Str(None),
-        Type::Array(_) => Typ::List(Box::new(Typ::Str(None))),
-        Type::Object(_) => Typ::Object(vec![]),
-        Type::Named(_, name) => Typ::Resource(to_snake_case(name.to_string())),
-        _ => Typ::Unknown,
-    }
-}
-
-fn parse_default_expr(e: Expression) -> Option<Value> {
-    match e {
-        Expression::Literal(l) => match l {
-            Literal::String(s) => Some(Value::String(s.value.to_string())),
-            Literal::Integer(i) => match i.value.to_string().parse() {
-                Ok(i) => Some(Value::Number(i)),
-                Err(_) => None,
-            },
-            Literal::Float(f) => match f.value.to_string().parse() {
-                Ok(i) => Some(Value::Number(i)),
-                Err(_) => None,
-            },
-        },
-        Expression::Bool(b) => Some(Value::Bool(b.value)),
-        _ => None,
-    }
-}
-
-pub fn parse_php_signature(
-    code: &str,
-    override_main: Option<String>,
-) -> anyhow::Result<MainArgSignature> {
-    let main_name = override_main.unwrap_or("main".to_string());
-
-    let ast = parser::parse(code)
-        .map_err(|e| anyhow::anyhow!("Error parsing code: {}", e.to_string()))?;
-
-    let params = ast.into_iter().find_map(|x| match x {
-        Statement::Function(FunctionStatement {
-            name,
-            parameters: FunctionParameterList { parameters, .. },
-            ..
-        }) if name.to_string() == main_name => Some(parameters),
-        _ => None,
-    });
-
-    if let Some(params) = params {
-        let args = params
-            .into_iter()
-            .map(|x| {
-                let typ = x.data_type.map_or(Typ::Unknown, |e| parse_php_type(e));
-                let default = x.default.map_or(None, |e| parse_default_expr(e));
-                Arg {
-                    otyp: None,
-                    name: x.name.to_string().trim_start_matches('$').to_string(),
-                    typ,
-                    has_default: default.is_some(),
-                    default,
-                }
-            })
-            .collect();
-
-        Ok(MainArgSignature { star_args: false, star_kwargs: false, args })
-    } else {
-        Err(anyhow::anyhow!(
-            "main function was not findable".to_string(),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use serde_json::Number;
-
-    use super::*;
-
-    #[test]
-    fn test_parse_php_sig() -> anyhow::Result<()> {
-        let code = "
-<?php
-
-class Stripe {}
-
-function main(string $input1 = \"hey\", bool $input2 = false, int $input3 = 3, float $input4 = 4.5, Stripe $resource) {
-    echo 'hello';
-}
-
-";
-        assert_eq!(
-            parse_php_signature(code, None)?,
-            MainArgSignature {
-                star_args: false,
-                star_kwargs: false,
-                args: vec![
-                    Arg {
-                        otyp: None,
-                        name: "input1".to_string(),
-                        typ: Typ::Str(None),
-                        has_default: true,
-                        default: Some(Value::String("hey".to_string()))
-                    },
-                    Arg {
-                        otyp: None,
-                        name: "input2".to_string(),
-                        typ: Typ::Bool,
-                        has_default: true,
-                        default: Some(Value::Bool(false))
-                    },
-                    Arg {
-                        otyp: None,
-                        name: "input3".to_string(),
-                        typ: Typ::Int,
-                        has_default: true,
-                        default: Some(Value::Number(Number::from(3)))
-                    },
-                    Arg {
-                        otyp: None,
-                        name: "input4".to_string(),
-                        typ: Typ::Float,
-                        has_default: true,
-                        default: Some(Value::Number(Number::from_f64(f64::from(4.5)).unwrap()))
-                    },
-                    Arg {
-                        otyp: None,
-                        name: "resource".to_string(),
-                        typ: Typ::Resource("stripe".to_string()),
-                        has_default: false,
-                        default: None
-                    }
-                ]
-            }
-        );
-
-        Ok(())
-    }
-}

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

@@ -51,8 +51,6 @@ 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 {
@@ -64,7 +62,7 @@ fn replace_import(x: String) -> String {
 }
 
 lazy_static! {
-    static ref RE: Regex = Regex::new(r"^\#\s?(\S+)\s*$").unwrap();
+    static ref RE: Regex = Regex::new(r"^\#\s?(\S+)$").unwrap();
 }
 
 fn process_import(module: Option<String>, path: &str, level: usize) -> Vec<String> {

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

@@ -292,30 +292,22 @@ pub fn parse_pg_typ(typ: &str) -> Typ {
         Typ::List(Box::new(base_typ))
     } else {
         match typ {
-            "varchar" | "character varying" => Typ::Str(None),
+            "varchar" => Typ::Str(None),
             "text" => Typ::Str(None),
-            "int" | "integer" | "int4" => Typ::Int,
+            "int" => Typ::Int,
             "bigint" => Typ::Int,
-            "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,
+            "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,
             "oid" => Typ::Int,
-            "date"
-            | "time"
-            | "timetz"
-            | "time with time zone"
-            | "time without time zone"
-            | "timestamp"
-            | "timestamptz"
-            | "timestamp with time zone"
-            | "timestamp without time zone" => Typ::Datetime,
+            "date" | "time" | "timestamp" | "timestamptz" => Typ::Datetime,
             _ => Typ::Str(None),
         }
     }

backend/parsers/windmill-parser-wasm/Cargo.toml

@@ -21,7 +21,6 @@ windmill-parser-bash.workspace = true
 windmill-parser-sql.workspace = true
 windmill-parser-py.workspace = true
 windmill-parser-ts.workspace = true
-windmill-parser-php.workspace = true
 windmill-parser-graphql.workspace = true
 wasm-bindgen.workspace = true
 serde_json.workspace = true

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

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

backend/parsers/windmill-parser-wasm/pkg/windmill_parser_wasm.d.ts

@@ -70,11 +70,6 @@ export function parse_db_resource(code: string): string | undefined;
 * @returns {string}
 */
 export function parse_graphql(code: string): string;
-/**
-* @param {string} code
-* @returns {string}
-*/
-export function parse_php(code: string): string;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
@@ -94,7 +89,6 @@ export interface InitOutput {
   readonly parse_mssql: (a: number, b: number, c: number) => void;
   readonly parse_db_resource: (a: number, b: number, c: number) => void;
   readonly parse_graphql: (a: number, b: number, c: number) => void;
-  readonly parse_php: (a: number, b: number, c: number) => void;
   readonly __wbindgen_malloc: (a: number, b: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;

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

@@ -97,15 +97,6 @@ function getInt32Memory0() {
     return cachedInt32Memory0;
 }
 
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
 const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
 
 if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
@@ -115,6 +106,15 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
 }
 
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
 let cachedFloat64Memory0 = null;
 
 function getFloat64Memory0() {
@@ -519,29 +519,6 @@ export function parse_graphql(code) {
     }
 }
 
-/**
-* @param {string} code
-* @returns {string}
-*/
-export function parse_php(code) {
-    let deferred2_0;
-    let deferred2_1;
-    try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(code, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.parse_php(retptr, ptr0, len0);
-        var r0 = getInt32Memory0()[retptr / 4 + 0];
-        var r1 = getInt32Memory0()[retptr / 4 + 1];
-        deferred2_0 = r0;
-        deferred2_1 = r1;
-        return getStringFromWasm0(r0, r1);
-    } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
-    }
-}
-
 function handleError(f, args) {
     try {
         return f.apply(this, args);
@@ -584,13 +561,13 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-        takeObject(arg0);
-    };
-    imports.wbg.__wbg_eval_f2b8ae7add53626d = function(arg0, arg1) {
+    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);
+    };
     imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
         const obj = getObject(arg1);
         const ret = typeof(obj) === 'string' ? obj : undefined;
@@ -599,6 +576,10 @@ function __wbg_get_imports() {
         getInt32Memory0()[arg0 / 4 + 1] = len1;
         getInt32Memory0()[arg0 / 4 + 0] = ptr1;
     };
+    imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
+        const ret = new Error(getStringFromWasm0(arg0, arg1));
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_boolean_get = function(arg0) {
         const v = getObject(arg0);
         const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2;
@@ -620,10 +601,6 @@ function __wbg_get_imports() {
         const ret = BigInt.asUintN(64, arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
-        const ret = new Error(getStringFromWasm0(arg0, arg1));
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_number_get = function(arg0, arg1) {
         const obj = getObject(arg1);
         const ret = typeof(obj) === 'number' ? obj : undefined;

backend/parsers/windmill-parser-wasm/pkg/windmill_parser_wasm_bg.wasm.d.ts

@@ -15,7 +15,6 @@ export function parse_snowflake(a: number, b: number, c: number): void;
 export function parse_mssql(a: number, b: number, c: number): void;
 export function parse_db_resource(a: number, b: number, c: number): void;
 export function parse_graphql(a: number, b: number, c: number): void;
-export function parse_php(a: number, b: number, c: number): void;
 export function __wbindgen_malloc(a: number, b: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;

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

@@ -92,8 +92,3 @@ pub fn parse_db_resource(code: &str) -> Option<String> {
 pub fn parse_graphql(code: &str) -> String {
     wrap_sig(windmill_parser_graphql::parse_graphql_sig(code))
 }
-
-#[wasm_bindgen]
-pub fn parse_php(code: &str) -> String {
-    wrap_sig(windmill_parser_php::parse_php_signature(code, None))
-}

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, 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,
+        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,
         REQUEST_SIZE_LIMIT_SETTING, REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING,
         RETENTION_PERIOD_SECS_SETTING, SAML_METADATA_SETTING, SCIM_TOKEN_SETTING,
     },
@@ -32,13 +32,6 @@ use windmill_common::{
     DB, METRICS_ENABLED,
 };
 
-#[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
-use tikv_jemallocator::Jemalloc;
-
-#[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
-#[global_allocator]
-static GLOBAL: Jemalloc = Jemalloc;
-
 #[cfg(feature = "enterprise")]
 use windmill_common::METRICS_ADDR;
 
@@ -54,11 +47,10 @@ 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_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,
+    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")]
@@ -112,9 +104,6 @@ async fn windmill_main() -> anyhow::Result<()> {
     #[cfg(not(feature = "flamegraph"))]
     windmill_common::tracing_init::initialize_tracing();
 
-    #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
-    tracing::info!("jemalloc enabled");
-
     #[cfg(feature = "flamegraph")]
     let _guard = windmill_common::tracing_init::setup_flamegraph();
 
@@ -514,11 +503,6 @@ 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, Serialize};
+use serde::de::DeserializeOwned;
 use sqlx::{Pool, Postgres};
 use tokio::{
     join,
@@ -22,17 +22,15 @@ 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, 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,
+        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,
     },
     jobs::QueuedJob,
     oauth2::REQUIRE_PREEXISTING_USER_FOR_OAUTH,
@@ -42,8 +40,7 @@ use windmill_common::{
         load_worker_config, reload_custom_tags_setting, DEFAULT_TAGS_PER_WORKSPACE, SERVER_CONFIG,
         WORKER_CONFIG,
     },
-    BASE_URL, CRITICAL_ERROR_CHANNELS, DB, DEFAULT_HUB_BASE_URL, HUB_BASE_URL,
-    METRICS_DEBUG_ENABLED, METRICS_ENABLED,
+    BASE_URL, DB, DEFAULT_HUB_BASE_URL, HUB_BASE_URL, METRICS_DEBUG_ENABLED, METRICS_ENABLED,
 };
 use windmill_queue::cancel_job;
 use windmill_worker::{
@@ -146,10 +143,6 @@ 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;
@@ -318,7 +311,7 @@ pub async fn delete_expired_items(db: &DB) -> () {
                                 tracing::error!("Error deleting job stats: {:?}", e);
                             }
                             if let Err(e) = sqlx::query!(
-                                "DELETE FROM concurrency_key WHERE  ended_at <= now() - ($1::bigint::text || ' s')::interval ",
+                                "DELETE FROM custom_concurrency_key_ended WHERE  ended_at <= now() - ($1::bigint::text || ' s')::interval ",
                                 job_retention_secs
                             )
                             .execute(&mut *tx)
@@ -678,182 +671,39 @@ pub async fn monitor_db(
     };
 
     let expose_queue_metrics_f = async {
-        if !initial_load && server_mode {
+        if !initial_load
+            && METRICS_ENABLED.load(std::sync::atomic::Ordering::Relaxed)
+            && 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 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();
+    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);
     }
 }
 
-
-#[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 {
@@ -1224,27 +1074,3 @@ 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 *, result->'wm_labels' as labels FROM completed_job  WHERE id = $1").bind(uuid)
+    sqlx::query_as::<_, CompletedJob>("SELECT * FROM completed_job  WHERE id = $1").bind(uuid)
         .fetch_one(db)
         .await
         .unwrap()
@@ -1067,7 +1067,6 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                         path: None,
                         lock: None,
                         tag: None,
-                        custom_concurrency_key: None,
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
                     },
@@ -1105,7 +1104,6 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                                 path: None,
                                 lock: None,
                                 tag: None,
-                                custom_concurrency_key: None,
                                 concurrent_limit: None,
                                 concurrency_time_window_s: None,
                             },
@@ -1221,7 +1219,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                         path: None,
                         lock: None,
                         tag: None,
-                        custom_concurrency_key: None,
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
                     },
@@ -1270,7 +1267,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                     path: None,
                                     lock: None,
                                     tag: None,
-                                    custom_concurrency_key: None,
                                     concurrent_limit: None,
                                     concurrency_time_window_s: None,
                                 },
@@ -1305,7 +1301,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                     path: None,
                                     lock: None,
                                     tag: None,
-                                    custom_concurrency_key: None,
                                     concurrent_limit: None,
                                     concurrency_time_window_s: None,
                                 },
@@ -1362,7 +1357,6 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                         path: None,
                         lock: None,
                         tag: None,
-                        custom_concurrency_key: None,
                         concurrent_limit: None,
                         concurrency_time_window_s: None,
                     },
@@ -1669,12 +1663,10 @@ func main(derp string) (string, error) {
     .to_owned();
 
     let result = RunJob::from(JobPayload::Code(RawCode {
-        hash: None,
         content,
         path: None,
         lock: None,
         language: ScriptLang::Go,
-        custom_concurrency_key: None,
         concurrent_limit: None,
         concurrency_time_window_s: None,
         cache_ttl: None,
@@ -1702,12 +1694,10 @@ echo "hello $msg"
     .to_owned();
 
     let job = RunJob::from(JobPayload::Code(RawCode {
-        hash: None,
         content,
         path: None,
         lock: None,
         language: ScriptLang::Bash,
-        custom_concurrency_key: None,
         concurrent_limit: None,
         concurrency_time_window_s: None,
         cache_ttl: None,
@@ -1732,12 +1722,10 @@ def main():
     .to_owned();
 
     let job = JobPayload::Code(RawCode {
-        hash: None,
         content,
         path: None,
         language: ScriptLang::Python3,
         lock: None,
-        custom_concurrency_key: None,
         concurrent_limit: None,
         concurrency_time_window_s: None,
         cache_ttl: None,
@@ -1768,12 +1756,10 @@ def main():
     .to_owned();
 
     let job = JobPayload::Code(RawCode {
-        hash: None,
         content,
         path: None,
         language: ScriptLang::Python3,
         lock: None,
-        custom_concurrency_key: None,
         concurrent_limit: None,
         concurrency_time_window_s: None,
         cache_ttl: None,
@@ -1803,12 +1789,10 @@ def main():
     .to_owned();
 
     let job = JobPayload::Code(RawCode {
-        hash: None,
         content,
         path: None,
         language: ScriptLang::Python3,
         lock: None,
-        custom_concurrency_key: None,
         concurrent_limit: None,
         concurrency_time_window_s: None,
         cache_ttl: None,
@@ -3180,8 +3164,6 @@ 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();
 
@@ -3199,7 +3181,6 @@ async fn run_deployed_relative_imports(db: &Pool<Postgres>, script_content: Stri
         let job = RunJob::from(JobPayload::ScriptHash {
             path: "f/system/test_import".to_string(),
             hash: ScriptHash(script.hash),
-            custom_concurrency_key: None,
             concurrent_limit: None,
             concurrency_time_window_s: None,
             cache_ttl: None,
@@ -3230,12 +3211,10 @@ 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,
             lock: None,
-            custom_concurrency_key: None,
             concurrent_limit: None,
             concurrency_time_window_s: None,
             cache_ttl: None,
@@ -3355,4 +3334,4 @@ def main():
 
     run_deployed_relative_imports(&db, content.clone(), ScriptLang::Python3).await;
     run_preview_relative_imports(&db, content, ScriptLang::Python3).await;
-}
+}

backend/windmill-api/Cargo.toml

@@ -72,6 +72,7 @@ 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.331.2
+  version: 1.308.2
   title: Windmill API
 
   contact:
@@ -3401,13 +3401,6 @@ 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)
@@ -4907,8 +4900,6 @@ paths:
                     - language
                 force_viewer_static_fields:
                   type: object
-                force_viewer_one_of_fields:
-                  type: object
               required:
                 - args
                 - component
@@ -5250,11 +5241,6 @@ 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
@@ -5340,7 +5326,6 @@ 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"
@@ -5370,11 +5355,6 @@ 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
@@ -5394,7 +5374,6 @@ 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"
@@ -5437,11 +5416,6 @@ 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
@@ -5580,6 +5554,7 @@ paths:
             text/plain:
               type: string
 
+
   /w/{workspace}/jobs_u/get_flow_debug_info/{id}:
     get:
       summary: get flow debug info
@@ -6959,40 +6934,6 @@ 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
@@ -7305,26 +7246,6 @@ 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
@@ -7974,7 +7895,7 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/ConcurrencyGroup"
-  /concurrency_groups/prune/{concurrency_id}:
+  /concurrency_groups/{concurrency_id}:
     delete:
       summary: Delete concurrency group
       operationId: deleteConcurrencyGroup
@@ -7990,95 +7911,6 @@ paths:
               schema:
                 type: object
                 properties: {}
-  /concurrency_groups/{id}/key:
-    get:
-      summary: Get the concurrency key for a job that has concurrency limits enabled
-      operationId: getConcurrencyKey
-      tags:
-        - concurrencyGroups
-      parameters:
-        - $ref: "#/components/parameters/JobId"
-      responses:
-        "200":
-          description: concurrency key for given job
-          content:
-            application/json:
-              schema:
-                type: string
-  /w/{workspace}/concurrency_groups/intervals:
-    get:
-      summary: Get intervals of job runtime concurrency
-      operationId: getConcurrencyIntervals
-      tags:
-        - concurrencyGroups
-      parameters:
-        - name: concurrency_key
-          in: query
-          required: false
-          schema:
-            type: string
-        - name: row_limit
-          in: query
-          required: false
-          schema:
-            type: number
-        - $ref: "#/components/parameters/WorkspaceId"
-        - $ref: "#/components/parameters/CreatedBy"
-        - $ref: "#/components/parameters/Label"
-        - $ref: "#/components/parameters/ParentJob"
-        - $ref: "#/components/parameters/ScriptExactPath"
-        - $ref: "#/components/parameters/ScriptStartPath"
-        - $ref: "#/components/parameters/SchedulePath"
-        - $ref: "#/components/parameters/ScriptExactHash"
-        - $ref: "#/components/parameters/StartedBefore"
-        - $ref: "#/components/parameters/StartedAfter"
-        - $ref: "#/components/parameters/CreatedOrStartedBefore"
-        - $ref: "#/components/parameters/Running"
-        - $ref: "#/components/parameters/ScheduledForBeforeNow"
-        - $ref: "#/components/parameters/CreatedOrStartedAfter"
-        - $ref: "#/components/parameters/JobKinds"
-        - $ref: "#/components/parameters/ArgsFilter"
-        - $ref: "#/components/parameters/Tag"
-        - $ref: "#/components/parameters/ResultFilter"
-        - $ref: "#/components/parameters/Page"
-        - $ref: "#/components/parameters/PerPage"
-        - name: is_skipped
-          description: is the job skipped
-          in: query
-          schema:
-            type: boolean
-        - name: is_flow_step
-          description: is the job a flow step
-          in: query
-          schema:
-            type: boolean
-        - name: has_null_parent
-          description: has null parent
-          in: query
-          schema:
-            type: boolean
-        - name: success
-          description: filter on successful jobs
-          in: query
-          schema:
-            type: boolean
-        - name: all_workspaces
-          description: get jobs from all workspaces (only valid if request come from the `admins` workspace)
-          in: query
-          schema:
-            type: boolean
-        - name: is_not_schedule
-          description: is not a scheduled job
-          in: query
-          schema:
-            type: boolean
-      responses:
-        "200":
-          description: time
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/ConcurrencyIntervals"
 
 components:
   securitySchemes:
@@ -8194,12 +8026,6 @@ 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:
@@ -8495,7 +8321,6 @@ components:
               graphql,
               nativets,
               bun,
-              php,
             ]
         kind:
           type: string
@@ -8532,11 +8357,6 @@ components:
           type: boolean
         visible_to_runner_only:
           type: boolean
-        no_main_func:
-          type: boolean
-        codebase:
-          type: string
-
       required:
         - hash
         - path
@@ -8552,8 +8372,6 @@ components:
         - language
         - kind
         - starred
-        - no_main_func
-
 
     NewScript:
       type: object
@@ -8591,7 +8409,6 @@ components:
               graphql,
               nativets,
               bun,
-              php,
             ]
         kind:
           type: string
@@ -8628,10 +8445,6 @@ components:
           type: string
         visible_to_runner_only:
           type: boolean
-        no_main_func:
-          type: boolean
-        codebase:
-          type: string
       required:
         - path
         - summary
@@ -8810,7 +8623,6 @@ components:
               graphql,
               nativets,
               bun,
-              php,
             ]
         email:
           type: string
@@ -8921,7 +8733,6 @@ components:
               graphql,
               nativets,
               bun,
-              php,
             ]
         is_skipped:
           type: boolean
@@ -8935,10 +8746,6 @@ components:
           type: string
         priority:
           type: integer
-        labels:
-          type: array
-          items:
-            type: string
       required:
         - id
         - created_by
@@ -8957,14 +8764,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:
@@ -9436,7 +9243,6 @@ components:
               graphql,
               nativets,
               bun,
-              php
             ]
         tag:
           type: string
@@ -9832,12 +9638,6 @@ 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
@@ -9947,11 +9747,6 @@ components:
         - $ref: "../../openflow.openapi.yaml#/components/schemas/OpenFlow"
         - $ref: "#/components/schemas/FlowMetadata"
 
-    ExtraPerms:
-      type: object
-      additionalProperties:
-        type: boolean
-
     FlowMetadata:
       type: object
       properties:
@@ -9967,7 +9762,9 @@ components:
         archived:
           type: boolean
         extra_perms:
-          $ref: "#/components/schemas/ExtraPerms"
+          type: object
+          additionalProperties:
+            type: boolean
         starred:
           type: boolean
         draft_only:
@@ -10050,10 +9847,6 @@ components:
           type: object
           additionalProperties:
             type: object
-        triggerables_v2:
-          type: object
-          additionalProperties:
-            type: object
         execution_mode:
           type: string
           enum: [viewer, publisher, anonymous]
@@ -10145,7 +9938,7 @@ components:
         created_at:
           type: string
           format: date-time
-        value:
+        value: 
           type: object
         policy:
           $ref: "#/components/schemas/Policy"
@@ -10474,7 +10267,6 @@ components:
               graphql,
               nativets,
               bun,
-              php
             ]
       required:
         - raw_code
@@ -10484,47 +10276,12 @@ components:
     ConcurrencyGroup:
       type: object
       properties:
-        concurrency_key:
+        concurrency_id:
           type: string
-        total_running:
-          type: number
-      required:
-        - concurrency_key
-        - total_running
-
-    ConcurrencyIntervals:
-      type: object
-      properties:
-        concurrency_key:
-          type: string
-        running_jobs:
+        job_uuids:
           type: array
           items:
-            type: object
-            properties:
-              job_id:
-                type: string
-              concurrency_key:
-                type: string
-              started_at:
-                type: string
-                format: date-time
-        completed_jobs:
-          type: array
-          items:
-            type: object
-            properties:
-              job_id:
-                type: string
-              concurrency_key:
-                type: string
-              started_at:
-                type: string
-                format: date-time
-              ended_at:
-                type: string
-                format: date-time
+            type: string
       required:
-        - concurrency_key
-        - running_jobs
-        - completed_jobs
+        - concurrency_id
+        - job_uuids