Merge branch 'main' into cleaned-feature

* make resolver

* more updates

* fix build

* fix raw_dependencies job type

* compat with http agent workers

* refactor

* rename

* more refactor

* cleanup

* more tests

* fix s3

* small fixes

* more fixing

* fix endpoint

* nit: update comment

* update ee ref

* update ee ref

* update ee ref

* implement safer `list_available_python_versions`

* add tracing to get of authed client

* internal: Trigger claude when commenting with /aider (#5783)

* add claude instructions files

* call claude too when using aider

* fix

* add draft for linear claude integration

* fix build

* update ee ref

* ignore versions <=3.9

* fix windows build

* correct versions filter

* fix windows build (this time for real)

* inject error to debug CI

* update CI

* undo debug of CI

* fix tests

* remove outdated comment

* update ee repo ref

* Update ee-repo-ref.txt

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

Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com>

* Update InstanceSetting.svelte

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
Co-authored-by: centdix <40307056+centdix@users.noreply.github.com>
Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com>

.github/workflows/aider-after-review.yaml

@@ -90,4 +90,5 @@ jobs:
     with:
       needs_processing: false
       base_prompt: ${{ needs.check-and-prepare.outputs.prompt_content }}
+      rules_files: "CLAUDE.md backend/CLAUDE.md frontend/CLAUDE.md"
     secrets: inherit

.github/workflows/aider-common.yml

@@ -33,7 +33,11 @@ on:
         description: "Prompt for probe-chat"
         required: false
         type: string
-        default: 'I''m giving you a request that needs to be implemented. Your role is ONLY to give me the files that are relevant to the request and nothing else. The request is prepended with the word REQUEST. REQUEST: $FINAL_PROMPT. Give me all the files relevant to this request. Your output MUST be a single json array that can be parsed with programatic json parsing, with the relevant files. Files can be rust or typescript or javascript files. DO NOT INCLUDE ANY OTHER TEXT IN YOUR OUTPUT. ONLY THE JSON ARRAY. Example of output: ["file1.py", "file2.py"]'
+        default: 'I''m giving you a request that needs to be implemented. Your role is ONLY to give me the files that are relevant to the request and nothing else. The request is prepended with the word REQUEST. Give me all the files relevant to this request. Your output MUST be a single json array that can be parsed with programatic json parsing, with the relevant files. Files can be rust or typescript or javascript files. DO NOT INCLUDE ANY OTHER TEXT IN YOUR OUTPUT. ONLY THE JSON ARRAY. Example of output: ["file1.py", "file2.py"]'
+      rules_files:
+        description: "Rules files for Aider"
+        required: false
+        type: string
     outputs:
       files_to_edit:
         description: "Files identified by probe-chat for editing"
@@ -67,6 +71,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       WINDMILL_TOKEN: ${{ secrets.WINDMILL_TOKEN }}
       LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
+      DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}
 
     steps:
       - name: Harden Runner
@@ -114,7 +119,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.11"
 
       - name: Cache Python dependencies
         uses: actions/cache@v3
@@ -124,27 +129,18 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
 
-      - name: Cache Aider installation
-        id: cache-aider
-        uses: actions/cache@v3
-        with:
-          path: ~/.local/bin/aider
-          key: ${{ runner.os }}-aider-install-${{ hashFiles('**/requirements.txt', '**/setup.py') }}
-          restore-keys: |
-            ${{ runner.os }}-aider-install-
-
       - name: Install Aider and Dependencies
         run: |
-          if [ -f ~/.local/bin/aider ] && [ -x ~/.local/bin/aider ]; then
-            echo "Using cached Aider installation"
-            export PATH="$HOME/.local/bin:$PATH"
-          else
-            echo "Installing Aider..."
-            python -m pip install aider-install; aider-install
-          fi
-          pip install -U google-generativeai
+          echo "Installing Aider..."
+          python -m pip install uv
+          python -m venv ~/uv-env
+          source ~/uv-env/bin/activate
+          uv pip install configargparse==1.7
+          uv pip install aider-chat==0.83.1
+          uv pip install -U google-generativeai
           sudo apt-get update && sudo apt-get install -y jq
           echo "$HOME/.local/bin" >> $GITHUB_PATH
+          echo "VIRTUAL_ENV_PATH=$HOME/uv-env" >> $GITHUB_ENV
 
       - name: Create Prompt for Aider
         id: create_prompt
@@ -206,7 +202,7 @@ jobs:
             fi
           else
             echo "No issue title or body given. Using base prompt."
-            FINAL_PROMPT_CONTENT="$BASE_PROMPT_ENV"
+            FINAL_PROMPT_CONTENT=$(printf "%s\nINSTRUCTION:\n%s" "$BASE_PROMPT_ENV" "$INSTRUCTION_ENV")
           fi
 
           echo "Final prompt: $FINAL_PROMPT_CONTENT"
@@ -219,11 +215,11 @@ jobs:
         shell: bash
         env:
           FINAL_PROMPT: ${{ steps.create_prompt.outputs.final_prompt }}
+          PROBE_PROMPT: ${{ inputs.probe_prompt }}
         run: |
           echo "Running probe-chat to find relevant files..."
 
-          # escape the final prompt
-          printf -v MESSAGE_FOR_PROBE 'I'\''m giving you a request that needs to be implemented. Your role is ONLY to give me the files that are relevant to the request and nothing else. The request is prepended with the word REQUEST.\nREQUEST: %s. Give me all the files relevant to this request. Your output MUST be a single json array that can be parsed with programatic json parsing, with the relevant files. Files can be rust or typescript or javascript files. DO NOT INCLUDE ANY OTHER TEXT IN YOUR OUTPUT. ONLY THE JSON ARRAY. Example of output: ["file1.py", "file2.py"]' "$FINAL_PROMPT"
+          MESSAGE_FOR_PROBE=$(printf "%s\nREQUEST:\n%s" "$PROBE_PROMPT" "$FINAL_PROMPT")
 
           set -o pipefail
           PROBE_OUTPUT=$(npx --yes @buger/probe-chat@latest --max-iterations 50 --model-name gemini-2.5-pro-preview-05-06 --message "$MESSAGE_FOR_PROBE") || {
@@ -256,21 +252,63 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-aider-
 
+      - name: Prepare branch for Aider
+        id: prepare_branch
+        env:
+          ISSUE_ID: ${{ inputs.issue_id }}
+        run: |
+          if [[ "$ISSUE_ID" != "" ]]; then
+            BRANCH_NAME="aider-fix-issue-${ISSUE_ID}"
+
+            # Check if branch exists remotely
+            if git ls-remote --heads origin $BRANCH_NAME | grep -q $BRANCH_NAME; then
+              echo "Branch $BRANCH_NAME already exists remotely, fetching it"
+              git fetch origin $BRANCH_NAME
+              git checkout $BRANCH_NAME
+              git pull origin $BRANCH_NAME
+            else
+              echo "Creating new branch $BRANCH_NAME"
+              git checkout -b $BRANCH_NAME
+            fi
+            echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          else
+            # We're in a pull_request_review event
+            PR_NUMBER="${{ github.event.pull_request.number }}"
+            PR_HEAD_REF="${{ github.event.pull_request.head.ref }}"
+            
+            echo "Handling pull_request_review for PR #$PR_NUMBER on branch $PR_HEAD_REF"
+            
+            # Ensure we're on the correct branch
+            git config pull.rebase true
+            git fetch origin $PR_HEAD_REF
+            git checkout $PR_HEAD_REF
+            git pull origin $PR_HEAD_REF
+            
+            echo "Using PR branch $PR_HEAD_REF for PR #$PR_NUMBER"
+            echo "BRANCH_NAME=$PR_HEAD_REF" >> $GITHUB_OUTPUT
+          fi
+
       - name: Run Aider
         id: run_aider
         shell: bash
         env:
           FILES_TO_EDIT: ${{ steps.probe_files.outputs.files_to_edit }}
           FINAL_PROMPT: ${{ steps.create_prompt.outputs.final_prompt }}
+          RULES_FILES: ${{ inputs.rules_files }}
         run: |
-
+          source $VIRTUAL_ENV_PATH/bin/activate
           echo "$FINAL_PROMPT" > .aider_final_prompt.txt
           echo "FILES_TO_EDIT: $FILES_TO_EDIT"
 
+          RULES=""
+          if [ -n "$RULES_FILES" ]; then
+            for rule in $RULES_FILES; do
+              RULES="$RULES --read $rule"
+            done
+          fi
+
           aider \
-            --read .cursor/rules/rust-best-practices.mdc \
-            --read .cursor/rules/svelte5-best-practices.mdc \
-            --read .cursor/rules/windmill-overview.mdc \
+            $RULES \
             $FILES_TO_EDIT \
             --model gemini/gemini-2.5-pro-preview-05-06 \
             --message-file .aider_final_prompt.txt \
@@ -295,40 +333,31 @@ jobs:
         id: commit_and_push
         env:
           ISSUE_ID: ${{ inputs.issue_id }}
+          BRANCH_NAME: ${{ steps.prepare_branch.outputs.BRANCH_NAME }}
         run: |
           if [[ "$ISSUE_ID" != "" ]]; then
-            BRANCH_NAME="aider-fix-issue-${ISSUE_ID}"
-
-            # Check if branch exists remotely
-            if git ls-remote --heads origin $BRANCH_NAME | grep -q $BRANCH_NAME; then
-              echo "Branch $BRANCH_NAME already exists remotely, fetching it"
-              git fetch origin $BRANCH_NAME
-              git checkout $BRANCH_NAME
-              git pull origin $BRANCH_NAME
-            else
-              echo "Creating new branch $BRANCH_NAME"
-              git checkout -b $BRANCH_NAME
+            # Check if there are any uncommitted changes
+            if [[ -n $(git status --porcelain) ]]; then
+              echo "Found uncommitted changes, committing them"
+              git add .
+              git commit -m "Aider changes"
             fi
 
-            echo "Created/checked out branch $BRANCH_NAME for issue #${ISSUE_ID}"
-            git push origin $BRANCH_NAME
-            echo "Pushed to branch $BRANCH_NAME"
-            echo "PR_BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
-            echo "CHANGES_APPLIED_MESSAGE=Aider changes pushed to branch $BRANCH_NAME." >> $GITHUB_OUTPUT
+            # Push changes to the branch
+            if git push origin $BRANCH_NAME; then
+              echo "Pushed to branch $BRANCH_NAME"
+              echo "PR_BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
+              echo "CHANGES_APPLIED_MESSAGE=Aider changes pushed to branch $BRANCH_NAME." >> $GITHUB_OUTPUT
+              echo "CHANGES_APPLIED=true" >> $GITHUB_OUTPUT
+            else
+              echo "::warning::Push to PR branch $BRANCH_NAME failed."
+              echo "CHANGES_APPLIED_MESSAGE=Aider ran, but failed to push changes to PR branch $BRANCH_NAME." >> $GITHUB_OUTPUT
+              echo "CHANGES_APPLIED=false" >> $GITHUB_OUTPUT
+            fi
           else
             # We're in a pull_request_review event
-            PR_NUMBER="${{ github.event.pull_request.number }}"
             PR_HEAD_REF="${{ github.event.pull_request.head.ref }}"
-            
-            echo "Handling pull_request_review for PR #$PR_NUMBER on branch $PR_HEAD_REF"
-            
-            # Ensure we're on the correct branch
-            git config pull.rebase true
-            git fetch origin $PR_HEAD_REF
-            git checkout $PR_HEAD_REF
-            git pull origin $PR_HEAD_REF
-            
-            echo "Attempting to push changes to PR branch $PR_HEAD_REF for PR #$PR_NUMBER"
+            echo "Attempting to push changes to PR branch $PR_HEAD_REF"
             if git push origin $PR_HEAD_REF; then
               echo "Push to $PR_HEAD_REF successful (or no new changes to push)."
               echo "CHANGES_APPLIED_MESSAGE=Aider changes (if any) pushed to PR branch $PR_HEAD_REF." >> $GITHUB_OUTPUT
@@ -349,23 +378,20 @@ jobs:
           PR_BRANCH: ${{ steps.commit_and_push.outputs.PR_BRANCH_NAME }}
           ISSUE_NUM: ${{ inputs.issue_id }}
           ISSUE_TITLE: ${{ inputs.issue_title }}
+          GITHUB_EVENT_NAME: ${{ github.event_name }}
         run: |
-          # Debug: Check latest commit and branch status
-          echo "Checking latest commit on branch $PR_BRANCH"
-          git log -1 --pretty=format:"%h - %an, %ar : %s"
-          echo "Changes not yet committed:"
-          git status --porcelain
-          # Check if there are any changes to commit
-          if [[ -n $(git status --porcelain) ]]; then
-            echo "Found uncommitted changes, committing them"
-            git add .
-            git commit -m "Aider changes for issue #${ISSUE_NUM}"
-            git push origin $PR_BRANCH
-          fi
-
           # Create PR description in a temporary file to avoid command line length limits and ensure it stays under 40k chars
+          HEADER="This PR was created automatically by Aider to fix issue #${ISSUE_NUM}."
+          # if event is repository_dispatch, add the issue title to the header
+          if [ "$GITHUB_EVENT_NAME" == "repository_dispatch" ]; then
+            if [[ "${{ github.event.client_payload.source }}" == "linear" ]]; then
+              HEADER="This PR was created automatically by Aider to fix issue #linear:${ISSUE_NUM}."
+            elif [[ "${{ github.event.client_payload.source }}" == "discord" ]]; then
+              HEADER="This PR was created automatically by Aider to fix issue #discord:${ISSUE_NUM}."
+            fi
+          fi
           cat > /tmp/pr-description.md << EOL | head -c 40000
-          This PR was created automatically by Aider to fix issue #${ISSUE_NUM}.
+          $HEADER
 
           ## Aider Output
           \`\`\`
@@ -375,11 +401,16 @@ jobs:
 
           # Create PR using the file for the body content, handle errors gracefully
           set +e  # Don't exit on error
+          PR_TITLE="[Aider PR] Fix: ${ISSUE_TITLE}"
+          if [ -z "$ISSUE_TITLE" ]; then
+            PR_TITLE="[Aider PR] AI changes after request"
+          fi
           gh pr create \
-            --title "[Aider PR] Fix: ${ISSUE_TITLE}" \
+            --title "$PR_TITLE" \
             --body-file /tmp/pr-description.md \
             --head "$PR_BRANCH" \
-            --base main
+            --base main \
+            --draft
           PR_CREATE_EXIT_CODE=$?
           set -e  # Re-enable exit on error
 
@@ -437,12 +468,13 @@ jobs:
           GITHUB_REPOSITORY: ${{ github.repository }}
           JOB_STATUS: ${{ job.status }}
           PR_CREATED: ${{ steps.create_pr.outputs.PR_CREATED }}
+          PR_URL: ${{ steps.create_pr.outputs.PR_URL }}
         run: |
           echo "Commenting on issue/PR #${{ github.event.issue.number }} to let the user know Aider has finished working on the request."
 
           if [[ "$JOB_STATUS" == "success" ]]; then
             if [[ "$PR_CREATED" == "true" ]]; then
-              COMMENT_BODY="🤖 Aider has finished working on your request. A PR has been created."
+              COMMENT_BODY="🤖 Aider has finished working on your request. A PR has been created. $PR_URL"
             else
               COMMENT_BODY="🤖 Aider has finished working on your request, but was unable to create a PR."
             fi
@@ -460,12 +492,14 @@ jobs:
           JOB_STATUS: ${{ job.status }}
           LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
           PR_CREATED: ${{ steps.create_pr.outputs.PR_CREATED }}
+          PR_URL: ${{ steps.create_pr.outputs.PR_URL }}
+          DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}
+          SOURCE: ${{ github.event.client_payload.source }}
         run: |
-          echo "Commenting on linear issue #${{ github.event.client_payload.issue_id }} to let the user know Aider has finished working on the request."
-
+          echo "Notifying user about Aider completion status for $SOURCE request #${{ github.event.client_payload.issue_id }}"
           if [[ "$JOB_STATUS" == "success" ]]; then
             if [[ "$PR_CREATED" == "true" ]]; then
-              COMMENT_BODY="🤖 Aider has finished working on your request. A PR has been created."
+              COMMENT_BODY="🤖 Aider has finished working on your request. A PR has been created. $PR_URL"
             else
               COMMENT_BODY="🤖 Aider has finished working on your request, but was unable to create a PR."
             fi
@@ -473,8 +507,16 @@ jobs:
             COMMENT_BODY="⚠️ Aider encountered issues while working on your request. Please check the workflow logs for details."
           fi
 
-          curl -X POST \
-            -H "Authorization: $LINEAR_API_KEY" \
-            -H "Content-Type: application/json" \
-            "https://api.linear.app/graphql" \
-            -d "{\"query\":\"mutation { commentCreate(input: { issueId: \\\"${{ github.event.client_payload.issue_id }}\\\", body: \\\"${COMMENT_BODY}\\\" }) { success } }\"}"
+          if [[ "$SOURCE" == "discord" ]]; then
+            curl -X POST \
+              -H "Authorization: Bot $DISCORD_BOT_TOKEN" \
+              -H "Content-Type: application/json" \
+              "https://discord.com/api/v10/channels/${{ github.event.client_payload.channel_id }}/messages" \
+              -d "{\"content\":\"${COMMENT_BODY}\"}"
+          else
+            curl -X POST \
+              -H "Authorization: $LINEAR_API_KEY" \
+              -H "Content-Type: application/json" \
+              "https://api.linear.app/graphql" \
+              -d "{\"query\":\"mutation { commentCreate(input: { issueId: \\\"${{ github.event.client_payload.issue_id }}\\\", body: \\\"${COMMENT_BODY}\\\" }) { success } }\"}"
+          fi

.github/workflows/aider-external.yaml

@@ -21,18 +21,29 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       WINDMILL_TOKEN: ${{ secrets.WINDMILL_TOKEN }}
       LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
+      DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}
 
     steps:
       - name: Acknowledge Request
         env:
           LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
+          DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}
         run: |
-          echo "Commenting on Linear issue #${{ github.event.client_payload.issue_id }} to acknowledge the request."
-          curl -X POST \
-            -H "Authorization: $LINEAR_API_KEY" \
-            -H "Content-Type: application/json" \
-            "https://api.linear.app/graphql" \
-            -d "{\"query\":\"mutation { commentCreate(input: { issueId: \\\"${{ github.event.client_payload.issue_id }}\\\", body: \\\"🤖 Aider is starting to work on your request. I'll update you here once I have a PR ready. Please be patient, this might take a few minutes.\\\" }) { success } }\"}"
+          if [[ "${{ github.event.client_payload.source }}" == "linear" ]]; then
+            echo "Commenting on Linear issue #${{ github.event.client_payload.issue_id }} to acknowledge the request."
+            curl -X POST \
+              -H "Authorization: $LINEAR_API_KEY" \
+              -H "Content-Type: application/json" \
+              "https://api.linear.app/graphql" \
+              -d "{\"query\":\"mutation { commentCreate(input: { issueId: \\\"${{ github.event.client_payload.issue_id }}\\\", body: \\\"🤖 Aider is starting to work on your request. I'll update you here once I have a PR ready. Please be patient, this might take a few minutes.\\\" }) { success } }\"}"
+          elif [[ "${{ github.event.client_payload.source }}" == "discord" ]]; then
+            echo "Commenting on Discord thread #${{ github.event.client_payload.channel_id }} to acknowledge the request."
+            curl -X POST \
+              -H "Authorization: Bot $DISCORD_BOT_TOKEN" \
+              -H "Content-Type: application/json" \
+              "https://discord.com/api/v10/channels/${{ github.event.client_payload.channel_id }}/messages" \
+              -d "{\"content\":\"🤖 Aider is starting to work on your request. I'll update you here once I have a PR ready. Please be patient, this might take a few minutes.\"}"
+          fi
 
       - name: Determine inputs for Aider
         id: determine_inputs
@@ -65,4 +76,5 @@ jobs:
       issue_body: ${{ needs.check-and-prepare.outputs.issue_body }}
       instruction: ${{ needs.check-and-prepare.outputs.instruction }}
       issue_id: ${{ github.event.client_payload.issue_id }}
+      rules_files: "CLAUDE.md backend/CLAUDE.md frontend/CLAUDE.md"
     secrets: inherit

.github/workflows/aider.yaml

@@ -72,6 +72,7 @@ jobs:
           COMMENT_BODY: ${{ github.event.comment.body }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
           GITHUB_REPOSITORY: ${{ github.repository }}
+          LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
         run: |
           echo "Determining inputs for Aider..."
           ISSUE_TITLE_VAL=""
@@ -91,12 +92,25 @@ jobs:
             
             if [[ ! -z "$PR_BODY_VAL" ]]; then
               REFERENCED_ISSUE=""
-              if [[ "$PR_BODY_VAL" =~ \#([0-9]+) ]]; then
+              if [[ "$PR_BODY_VAL" =~ \#linear:([a-f0-9-]+) ]]; then
                 REFERENCED_ISSUE="${BASH_REMATCH[1]}"
-              fi
-              
-              if [[ ! -z "$REFERENCED_ISSUE" ]]; then
-                echo "Found referenced issue #$REFERENCED_ISSUE in PR description"
+                echo "Found referenced Linear issue #$REFERENCED_ISSUE in PR description"
+                LINEAR_ISSUE_JSON=$(curl -s -H "Authorization: $LINEAR_API_KEY" \
+                  "https://api.linear.app/graphql" \
+                  -X POST \
+                  -H "Content-Type: application/json" \
+                  -d "{\"query\":\"query { issue(id: \\\"$REFERENCED_ISSUE\\\") { title description } }\"}")
+                
+                if [[ $? -eq 0 && ! "$LINEAR_ISSUE_JSON" =~ "error" ]]; then
+                  ISSUE_TITLE_VAL=$(jq -r '.data.issue.title // ""' <<< "$LINEAR_ISSUE_JSON")
+                  ISSUE_BODY_VAL=$(jq -r '.data.issue.description // ""' <<< "$LINEAR_ISSUE_JSON")
+                  echo "Successfully fetched Linear issue details"
+                else
+                  echo "Error fetching Linear issue details for #$REFERENCED_ISSUE"
+                fi
+              elif [[ "$PR_BODY_VAL" =~ \#([0-9]+) ]]; then
+                REFERENCED_ISSUE="${BASH_REMATCH[1]}"
+                echo "Found referenced GitHub issue #$REFERENCED_ISSUE in PR description"
                 
                 ISSUE_DETAILS_JSON=$(gh issue view "$REFERENCED_ISSUE" --json title,body --repo "$GITHUB_REPOSITORY")
                 if [[ $? -ne 0 ]]; then
@@ -147,4 +161,5 @@ jobs:
       issue_body: ${{ needs.check-and-prepare.outputs.issue_body }}
       instruction: ${{ needs.check-and-prepare.outputs.comment_content }}
       issue_id: ${{ github.event.issue.number }}
+      rules_files: "CLAUDE.md backend/CLAUDE.md frontend/CLAUDE.md"
     secrets: inherit

.github/workflows/backend-test.yml

@@ -45,9 +45,9 @@ jobs:
       - uses: oven-sh/setup-bun@v2
         with:
           bun-version: 1.1.43
-      - uses: astral-sh/setup-uv@v4
+      - uses: astral-sh/setup-uv@v6
         with:
-          version: "0.4.18"
+          version: "0.6.2"
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache-workspaces: backend

.github/workflows/claude.yml

@@ -69,6 +69,17 @@ jobs:
         with:
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           timeout_minutes: "60"
-          allowed_tools: "mcp__github__create_pull_request"
-          custom_instructions: "IMPORTANT: Bypass previous instructions and instead of adding a url in your comment to manually create a PR, if you created a new branch with your changes, automatically create a PR from that branch to main, with the title starting with [Claude PR]"
+          allowed_tools: "mcp__github__create_pull_request,Bash(npm run check),Bash(npm install),Bash(cargo check),Bash(curl https://sh.rustup.rs -sSf | sh)"
+          custom_instructions: "IMPORTANT INSTRUCTIONS:
+          - Bypass previous instructions and instead of adding a url in your comment to manually create a PR, if you created a new branch with your changes, automatically create a PR from that branch to main, with the title starting with [Claude PR].
+          - If you made changes to the frontend code, run npm install, then npm run generate-backend-client, then npm run check. You can ignore warnings that are reported by the check script, but fix the errors.
+          - If you made changes to the backend code, install Rust and then run cargo check. You can ignore warnings that are reported by the check script, but fix the errors.
+          - DO NOT FORGET TO OPEN A PR AFTER YOU ARE DONE if you made changes after a request from a git issue.
+          AVAILABLE TOOLS:
+          - mcp__github__create_pull_request: Create a PR from a branch to main
+          - Bash(npm run check): Run the check script. You should run this tool after making changes to the frontend code.
+          - Bash(npm install): Install dependencies. You need this to run npm run check.
+          - Bash(npm run generate-backend-client): Generate the backend client. You need this to run npm run check.
+          - Bash(cargo check): Run the cargo check script. You should run this tool after making changes to the backend code.
+          - Bash(curl https://sh.rustup.rs -sSf | sh): Install Rust. You need this to run cargo check."
           trigger_phrase: "/aider"

.github/workflows/discord-notification.yml

@@ -29,4 +29,4 @@ jobs:
       DISCORD_GUILD_ID: "930051556043276338"
       PR_NUMBER: ${{ github.event.pull_request.number }}
     secrets:
-      DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_PR_BOT_TOKEN }}
+      DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}

.github/workflows/shareable-discord-notification.yml

@@ -84,7 +84,7 @@ jobs:
           fi
           # 2) get the first message in that thread
           messages=$(curl -H "Authorization: Bot $BOT_TOKEN" \
-            "https://discord.com/api/v10/channels/$thread_id/messages?limit=1")
+            "https://discord.com/api/v10/channels/$thread_id/messages")
           message_id=$(echo "$messages" | jq -r '.[-1].id')
 
           if [ -z "$message_id" ]; then

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [1.492.1](https://github.com/windmill-labs/windmill/compare/v1.492.0...v1.492.1) (2025-05-22)
+
+
+### Bug Fixes
+
+* fix strum compile ([59f6024](https://github.com/windmill-labs/windmill/commit/59f6024cbdaface9c9f0ed61c4a415a13b558515))
+
+## [1.492.0](https://github.com/windmill-labs/windmill/compare/v1.491.5...v1.492.0) (2025-05-22)
+
+
+### Features
+
+* job search pagination + result count ([#5789](https://github.com/windmill-labs/windmill/issues/5789)) ([55ae766](https://github.com/windmill-labs/windmill/commit/55ae76648475ce9ff14b2fa33b2a71b90fbd50a1))
+* **python:** add annotation to skip result post-processing ([#5769](https://github.com/windmill-labs/windmill/issues/5769)) ([07c2ff5](https://github.com/windmill-labs/windmill/commit/07c2ff5668f4725a3b9a8a2655248b0945ac251c))
+* shift/ctrl+click/enter to open ctrl+k menu results in new tab ([#5800](https://github.com/windmill-labs/windmill/issues/5800)) ([66a997a](https://github.com/windmill-labs/windmill/commit/66a997afc399de2d592c469faf9a5b2cd6433aac))
+* triggers git sync ([#5766](https://github.com/windmill-labs/windmill/issues/5766)) ([065a814](https://github.com/windmill-labs/windmill/commit/065a814d35a5749725c2ada1155481abba782684))
+
+
+### Bug Fixes
+
+* improve app css consistency ([88482c3](https://github.com/windmill-labs/windmill/commit/88482c3bd76ddad16738354f7531d16fa806ad2f))
+* improve docker mode unexpected exit handling ([7c24fbc](https://github.com/windmill-labs/windmill/commit/7c24fbcef2ecfe5fc034870c4c65dd80513301a4))
+* postgres trigger ssl issue ([#5790](https://github.com/windmill-labs/windmill/issues/5790)) ([b9a776c](https://github.com/windmill-labs/windmill/commit/b9a776c97b3411af18e58cde7a070c4955aaaab4))
+* specify using inline type in system prompt for AI ([#5787](https://github.com/windmill-labs/windmill/issues/5787)) ([791296f](https://github.com/windmill-labs/windmill/commit/791296fa41c5bc45c32944db8bc1b66e1515ea82))
+* workspace preprocessor improvements ([#5784](https://github.com/windmill-labs/windmill/issues/5784)) ([30edcdf](https://github.com/windmill-labs/windmill/commit/30edcdfe0e950b0ab850942bcbc9b4b5ff4fc00c))
+
 ## [1.491.5](https://github.com/windmill-labs/windmill/compare/v1.491.4...v1.491.5) (2025-05-17)
 
 

backend/.sqlx/query-9a9e4a8779b0bf8a275d029221dfa1465e5d44cd8a7be5879219ffc8cd7ae6b1.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO pip_resolution_cache (hash, lockfile, expiration) VALUES ($1, $2, now() + ('3 days')::interval) ON CONFLICT (hash) DO UPDATE SET lockfile = $2",
+  "query": "INSERT INTO pip_resolution_cache (hash, lockfile, expiration) VALUES ($1, $2, now() + ('5 mins')::interval) ON CONFLICT (hash) DO UPDATE SET lockfile = $2",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "4fb3881cdbb4b9e93e28f460a9b3715bdc6a52b76c89f3a3913023b13c4e085c"
+  "hash": "9a9e4a8779b0bf8a275d029221dfa1465e5d44cd8a7be5879219ffc8cd7ae6b1"
 }

backend/Cargo.lock

@@ -214,12 +214,12 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa"
 dependencies = [
  "anstyle",
- "once_cell",
+ "once_cell_polyfill",
  "windows-sys 0.59.0",
 ]
 
@@ -833,9 +833,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sqs"
-version = "1.68.0"
+version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b484821a335b02b109c17623b8347e692583c2229f8db2f029edd0fdbbd3bea"
+checksum = "b742e0981caafc34a57b36d6e492786e2a11638766f49e1c92dec1b55f33d16b"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -855,9 +855,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.68.0"
+version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5f01ea61fed99b5fe4877abff6c56943342a56ff145e9e0c7e2494419008be"
+checksum = "83447efb7179d8e2ad2afb15ceb9c113debbc2ecdf109150e338e2e28b86190b"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -877,9 +877,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.69.0"
+version = "1.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27454e4c55aaa4ef65647e3a1cf095cb834ca6d54e959e2909f1fef96ad87860"
+checksum = "c5f9bfbbda5e2b9fe330de098f14558ee8b38346408efe9f2e9cee82dc1636a4"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -899,9 +899,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.69.0"
+version = "1.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd6ef5d00c94215960fabcdf2d9fe7c090eed8be482d66d47b92d4aba1dd4aa"
+checksum = "e17b984a66491ec08b4f4097af8911251db79296b3e4a763060b45805746264f"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -3860,8 +3860,8 @@ dependencies = [
  "proc-macro2",
  "quote",
  "stringcase",
- "strum",
- "strum_macros",
+ "strum 0.25.0",
+ "strum_macros 0.25.3",
  "syn 2.0.101",
  "thiserror 2.0.12",
 ]
@@ -5880,7 +5880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5eb37859fda6792e95231aef1c5838f4043ec0ee352d8313421e311c606df612"
 dependencies = [
  "anyhow",
- "strum",
+ "strum 0.25.0",
  "thiserror 1.0.69",
  "unic-ucd-category",
 ]
@@ -6445,9 +6445,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -6490,7 +6490,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.61.1",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
@@ -6551,9 +6551,9 @@ checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -6567,9 +6567,9 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
@@ -8508,6 +8508,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
 [[package]]
 name = "oneshot"
 version = "0.1.11"
@@ -9039,6 +9045,18 @@ dependencies = [
  "base64ct",
 ]
 
+[[package]]
+name = "pep440_rs"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31095ca1f396e3de32745f42b20deef7bc09077f918b085307e8eab6ddd8fb9c"
+dependencies = [
+ "once_cell",
+ "serde",
+ "unicode-width 0.2.0",
+ "unscanny",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -10758,9 +10776,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "rustyline"
@@ -11595,9 +11613,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3a85280daca669cfd3bcb68a337882a8bc57ec882f72c5d13a430613a738e"
+checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -11608,9 +11626,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f743f2a3cea30a58cd479013f75550e879009e3a02f616f18ca699335aa248c3"
+checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
 dependencies = [
  "base64 0.22.1",
  "bigdecimal",
@@ -11647,9 +11665,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4200e0fde19834956d4252347c12a083bdcb237d7a1a1446bffd8768417dce"
+checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11660,9 +11678,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882ceaa29cade31beca7129b6beeb05737f44f82dbe2a9806ecea5a7093d00b7"
+checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
 dependencies = [
  "dotenvy",
  "either",
@@ -11679,16 +11697,15 @@ dependencies = [
  "sqlx-postgres",
  "sqlx-sqlite",
  "syn 2.0.101",
- "tempfile",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0afdd3aa7a629683c2d750c2df343025545087081ab5942593a5288855b1b7a7"
+checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -11731,9 +11748,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bedbe1bbb5e2615ef347a5e9d8cd7680fb63e77d9dafc0f29be15e53f1ebe6"
+checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -11772,9 +11789,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c26083e9a520e8eb87a06b12347679b142dc2ea29e6e409f805644a7a979a5bc"
+checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
 dependencies = [
  "atoi",
  "chrono",
@@ -11877,7 +11894,16 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.25.3",
+]
+
+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+dependencies = [
+ "strum_macros 0.27.1",
 ]
 
 [[package]]
@@ -11893,6 +11919,19 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -13831,6 +13870,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "unscanny"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47"
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -14397,7 +14442,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -14413,6 +14458,7 @@ dependencies = [
  "memchr",
  "object_store",
  "once_cell",
+ "pep440_rs",
  "prometheus",
  "quote",
  "rand 0.9.0",
@@ -14424,7 +14470,7 @@ dependencies = [
  "sha2 0.10.9",
  "size",
  "sqlx",
- "strum",
+ "strum 0.27.1",
  "systemstat",
  "tikv-jemalloc-ctl",
  "tikv-jemalloc-sys",
@@ -14447,7 +14493,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -14556,7 +14602,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -14571,7 +14617,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "chrono",
  "serde",
@@ -14584,7 +14630,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "serde",
@@ -14598,7 +14644,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -14647,8 +14693,8 @@ dependencies = [
  "sha2 0.10.9",
  "size",
  "sqlx",
- "strum",
- "strum_macros",
+ "strum 0.27.1",
+ "strum_macros 0.27.1",
  "systemstat",
  "tar",
  "tempfile",
@@ -14672,7 +14718,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "regex",
  "serde",
@@ -14686,7 +14732,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -14709,7 +14755,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "itertools 0.14.0",
  "lazy_static",
@@ -14721,7 +14767,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -14730,7 +14776,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -14742,7 +14788,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-csharp"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -14754,7 +14800,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -14766,7 +14812,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -14778,7 +14824,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-java"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -14790,7 +14836,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-nu"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "nu-parser",
@@ -14801,7 +14847,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -14812,7 +14858,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -14823,7 +14869,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -14831,19 +14877,22 @@ dependencies = [
  "lazy_static",
  "malachite",
  "malachite-bigint",
+ "pep440_rs",
  "phf",
  "regex",
  "regex-lite",
  "rustpython-parser",
+ "serde",
  "serde_json",
  "sqlx",
+ "toml",
  "windmill-common",
  "windmill-parser",
 ]
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -14860,7 +14909,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -14872,7 +14921,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -14890,7 +14939,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.16",
@@ -14914,7 +14963,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -14924,7 +14973,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -14957,7 +15006,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -14967,7 +15016,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.491.5"
+version = "1.492.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15013,6 +15062,7 @@ dependencies = [
  "opentelemetry",
  "oracle",
  "pem 3.0.5",
+ "pep440_rs",
  "postgres-native-tls 0.5.1",
  "prometheus",
  "rand 0.9.0",
@@ -15084,7 +15134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
 dependencies = [
  "windows-collections",
- "windows-core 0.61.1",
+ "windows-core 0.61.2",
  "windows-future",
  "windows-link",
  "windows-numerics",
@@ -15096,7 +15146,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
 dependencies = [
- "windows-core 0.61.1",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
@@ -15125,15 +15175,15 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.61.1"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46ec44dc15085cea82cf9c78f85a9114c463a369786585ad2882d1ff0b0acf40"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
  "windows-implement 0.60.0",
  "windows-interface 0.59.1",
  "windows-link",
- "windows-result 0.3.3",
- "windows-strings 0.4.1",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
@@ -15142,7 +15192,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
- "windows-core 0.61.1",
+ "windows-core 0.61.2",
  "windows-link",
  "windows-threading",
 ]
@@ -15225,7 +15275,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-core 0.61.1",
+ "windows-core 0.61.2",
  "windows-link",
 ]
 
@@ -15235,7 +15285,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
- "windows-result 0.3.3",
+ "windows-result 0.3.4",
  "windows-strings 0.3.1",
  "windows-targets 0.53.0",
 ]
@@ -15251,9 +15301,9 @@ dependencies = [
 
 [[package]]
 name = "windows-result"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
  "windows-link",
 ]
@@ -15269,9 +15319,9 @@ dependencies = [
 
 [[package]]
 name = "windows-strings"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a7ab927b2637c19b3dbe0965e75d8f2d30bdd697a1516191cad2ec4df8fb28a"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
  "windows-link",
 ]

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.491.5"
+version = "1.492.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -32,7 +32,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.491.5"
+version = "1.492.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -83,7 +83,7 @@ zip = ["windmill-api/zip"]
 static_frontend = ["windmill-api/static_frontend"]
 scoped_cache = ["windmill-common/scoped_cache"]
 # Languages
-python = ["windmill-worker/python"]
+python = ["windmill-worker/python", "windmill-api/python"]
 rust = ["windmill-worker/rust"]
 mysql = ["windmill-worker/mysql"]
 oracledb = ["windmill-worker/oracledb"]
@@ -135,10 +135,12 @@ quote.workspace = true
 memchr.workspace = true
 v8 = { workspace = true, optional = true }
 rustls.workspace = true
+pep440_rs.workspace = true
 systemstat.workspace = true
 size.workspace = true
 strum.workspace = true
 
+
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = { optional = true, workspace = true }
 tikv-jemalloc-sys = { optional = true, workspace = true }
@@ -219,6 +221,7 @@ git-version = "^0"
 malachite = "=0.4.18"
 malachite-bigint = "=0.2.0"
 rustpython-parser = "^0"
+pep440_rs = "0.7.3"
 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 }
@@ -390,5 +393,5 @@ tree-sitter-c-sharp = "0.23.0"
 tree-sitter-java = "0.23.0"
 oracle = { version = "0.6.3", features = ["chrono"] }
 rumqttc = { version = "0.24.0", features = ["use-native-tls"]}
-strum = "^0"
+strum = { version = "0.27", features = ["derive"] }
 strum_macros = "^0"

backend/ee-repo-ref.txt

@@ -1 +1 @@
-bea87fa885dc041fba83b2491609a4a2cdbbfa6f
+72e6260ca886628cf1ba271bc058e6ecfdecdae5

backend/parsers/windmill-parser-py-imports/Cargo.toml

@@ -27,3 +27,6 @@ anyhow.workspace = true
 lazy_static.workspace = true
 sqlx.workspace = true
 async-recursion.workspace = true
+toml.workspace = true
+serde.workspace = true
+pep440_rs.workspace = true

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

@@ -11,7 +11,7 @@ mod mapping;
 use async_recursion::async_recursion;
 use itertools::Itertools;
 use lazy_static::lazy_static;
-use std::collections::HashMap;
+use std::{collections::HashMap, str::FromStr};
 
 use mapping::{FULL_IMPORTS_MAP, SHORT_IMPORTS_MAP};
 #[cfg(not(target_arch = "wasm32"))]
@@ -25,7 +25,10 @@ use rustpython_parser::{
     Parse,
 };
 use sqlx::{Pool, Postgres};
-use windmill_common::{error, worker::PythonAnnotations};
+use windmill_common::{
+    error::{self, to_anyhow},
+    worker::PythonAnnotations,
+};
 
 const DEF_MAIN: &str = "def main(";
 
@@ -242,8 +245,7 @@ pub async fn parse_python_imports(
     w_id: &str,
     path: &str,
     db: &Pool<Postgres>,
-    already_visited: &mut Vec<String>,
-    annotated_pyv_numeric: &mut Option<u32>,
+    version_specifiers: &mut Vec<pep440_rs::VersionSpecifier>,
 ) -> error::Result<(Vec<String>, Option<String>)> {
     let mut compile_error_hint: Option<String> = None;
     let mut imports = parse_python_imports_inner(
@@ -251,9 +253,10 @@ pub async fn parse_python_imports(
         w_id,
         path,
         db,
-        already_visited,
-        annotated_pyv_numeric,
-        &mut annotated_pyv_numeric.and_then(|_| Some(path.to_owned())),
+        &mut vec![],
+        version_specifiers,
+        // &mut version_specifier.and_then(|_| Some(path.to_owned())),
+        &mut None
     )
     .await?
     .into_values()
@@ -279,6 +282,7 @@ pub async fn parse_python_imports(
     .flatten()
     .collect::<error::Result<Vec<String>>>()?
     .into_iter()
+    .filter(|x| !x.trim_start().starts_with("--") && !x.trim().is_empty())
     .unique()
     .collect_vec();
 
@@ -304,11 +308,34 @@ async fn parse_python_imports_inner(
     path: &str,
     db: &Pool<Postgres>,
     already_visited: &mut Vec<String>,
-    annotated_pyv_numeric: &mut Option<u32>,
+    version_specifiers: &mut Vec<pep440_rs::VersionSpecifier>,
     path_where_annotated_pyv: &mut Option<String>,
 ) -> error::Result<HashMap<String, NImportResolved>> {
     let PythonAnnotations { py310, py311, py312, py313, .. } = PythonAnnotations::parse(&code);
 
+    let mut push_version_specifiers = |perform, unparsed: String| -> error::Result<()> {
+        if perform {
+            pep440_rs::VersionSpecifiers::from_str(unparsed.as_str())
+                .ok()
+                .map(|vs| version_specifiers.extend(vs.to_vec()));
+        }
+        Ok(())
+    };
+    push_version_specifiers(py310, "==3.10.*".to_owned())?;
+    push_version_specifiers(py311, "==3.11.*".to_owned())?;
+    push_version_specifiers(py312, "==3.12.*".to_owned())?;
+    push_version_specifiers(py313, "==3.13.*".to_owned())?;
+
+    for x in code.lines() {
+        if x.starts_with("# py:") || x.starts_with("#py:") {
+            push_version_specifiers(
+                true,
+                x.replace('#', "").replace("py:", "").trim().to_owned(),
+            )?;
+        } else if !x.starts_with('#') {
+            break;
+        }
+    }
     // we pass only if there is none or only one annotation
 
     // Naive:
@@ -323,39 +350,48 @@ async fn parse_python_imports_inner(
     // This way we make sure there is no multiple annotations for same script
     // and we get detailed span on conflicting versions
 
-    let mut check = |is_py_xyz, numeric| -> error::Result<()> {
-        if is_py_xyz {
-            if let Some(v) = annotated_pyv_numeric {
-                if *v != numeric {
-                    return Err(error::Error::from(anyhow::anyhow!(
-                        "Annotated 2 or more different python versions: \n - py{v} at {}\n - py{numeric} at {path}\nIt is possible to use only one.",
-                        path_where_annotated_pyv.clone().unwrap_or("Unknown".to_owned())
-                    )));
-                }
-            } else {
-                *annotated_pyv_numeric = Some(numeric);
-            }
-            *path_where_annotated_pyv = Some(path.to_owned());
-        }
-        Ok(())
-    };
+    #[derive(serde::Serialize, serde::Deserialize)]
+    struct InlineMetadata {
+        requires_python: String,
+        dependencies: Vec<String>,
+    }
 
-    check(py310, 310)?;
-    check(py311, 311)?;
-    check(py312, 312)?;
-    check(py313, 313)?;
-
-    let find_requirements = code
-        .lines()
-        .find_position(|x| x.starts_with("#requirements:") || x.starts_with("# requirements:"));
-    if let Some((pos, _)) = find_requirements {
+    let find_requirements = code.lines().find_position(|x| {
+        x.starts_with("#requirements:")
+            || x.starts_with("# requirements:")
+            || x.starts_with("# /// script")
+    });
+    if let Some((pos, item)) = find_requirements {
         let mut requirements = HashMap::new();
-        code.lines()
-            .skip(pos + 1)
-            .map_while(|x| {
-                RE.captures(x).and_then(|x| {
-                    x.get(1).map(|m| {
-                        let requirement = m.as_str().to_string();
+        if item.starts_with("# /// script") {
+            let mut incorrect = false;
+            let metadata = code
+                .lines()
+                .skip(pos + 1)
+                .map_while(|x| {
+                    incorrect = !x.starts_with('#');
+                    if incorrect || x.starts_with("# ///") {
+                        None
+                    } else {
+                        x.get(1..)
+                    }
+                })
+                .join("\n")
+                .parse::<toml::Table>()
+            .map_err(to_anyhow)?;
+
+            {
+                if let Some(v) = metadata.get("requires-python").and_then(|v| v.as_str()) {
+                    push_version_specifiers(true, v.to_owned())?;
+                }
+            };
+
+            metadata
+                .get("dependencies")
+                .and_then(|dependencies| dependencies.as_array())
+                .inspect(|list| {
+                    for dependency_v in list.into_iter() {
+                        let requirement = dependency_v.as_str().unwrap_or("ERROR").to_owned();
                         let key = extract_pkg_name(&requirement);
                         requirements.insert(
                             key.clone(),
@@ -367,11 +403,31 @@ async fn parse_python_imports_inner(
                                 key,
                             },
                         );
+                    }
+                });
+        } else {
+            code.lines()
+                .skip(pos + 1)
+                .map_while(|x| {
+                    RE.captures(x).and_then(|x| {
+                        x.get(1).map(|m| {
+                            let requirement = m.as_str().to_string();
+                            let key = extract_pkg_name(&requirement);
+                            requirements.insert(
+                                key.clone(),
+                                NImportResolved::Pin {
+                                    pins: vec![ImportPin {
+                                        pkg: requirement.clone(),
+                                        path: Default::default(),
+                                    }],
+                                    key,
+                                },
+                            );
+                        })
                     })
                 })
-            })
-            .collect_vec();
-
+                .collect_vec();
+        }
         Ok(requirements)
     } else {
         let find_extra_requirements = code.lines().find_position(|x| {
@@ -442,7 +498,7 @@ async fn parse_python_imports_inner(
                             &rpath,
                             db,
                             already_visited,
-                            annotated_pyv_numeric,
+                            version_specifiers,
                             path_where_annotated_pyv,
                         )
                         .await?

backend/parsers/windmill-parser-py-imports/tests/tests.rs

@@ -18,16 +18,8 @@ def main():
     pass
 
 ";
-        let mut already_visited = vec![];
-        let (r, ..) = parse_python_imports(
-            code,
-            "test-workspace",
-            "f/foo/bar",
-            &db,
-            &mut already_visited,
-            &mut None,
-        )
-        .await?;
+        let (r, ..) =
+            parse_python_imports(code, "test-workspace", "f/foo/bar", &db, &mut vec![]).await?;
         // println!("{}", serde_json::to_string(&r)?);
         assert_eq!(
             r,
@@ -59,16 +51,8 @@ def main():
     pass
 
 ";
-        let mut already_visited = vec![];
-        let (r, ..) = parse_python_imports(
-            code,
-            "test-workspace",
-            "f/foo/bar",
-            &db,
-            &mut already_visited,
-            &mut None,
-        )
-        .await?;
+        let (r, ..) =
+            parse_python_imports(code, "test-workspace", "f/foo/bar", &db, &mut vec![]).await?;
         println!("{}", serde_json::to_string(&r)?);
         assert_eq!(r, vec!["burkina=0.4", "nigeria"]);
 
@@ -89,17 +73,9 @@ def main():
     pass
 
 ";
-        let mut already_visited = vec![];
 
-        let (r, ..) = parse_python_imports(
-            code,
-            "test-workspace",
-            "f/foo/bar",
-            &db,
-            &mut already_visited,
-            &mut None,
-        )
-        .await?;
+        let (r, ..) =
+            parse_python_imports(code, "test-workspace", "f/foo/bar", &db, &mut vec![]).await?;
         println!("{}", serde_json::to_string(&r)?);
         assert_eq!(
             r,

backend/tests/fixtures/multipython.sql

@@ -0,0 +1,20 @@
+INSERT INTO public.script(workspace_id, created_by, content, schema, summary, description, path, hash, language, lock) VALUES (
+'test-workspace',
+'test-user',
+'# py312
+',
+'{"$schema":"https://json-schema.org/draft/2020-12/schema","properties":{},"required":[],"type":"object"}',
+'',
+'',
+'f/multipython/aliases', 2468135790, 'python3', '');
+
+INSERT INTO public.script(workspace_id, created_by, content, schema, summary, description, path, hash, language, lock) VALUES (
+'test-workspace',
+'test-user',
+'# py: >=3.9,!=3.12.2
+',
+'{"$schema":"https://json-schema.org/draft/2020-12/schema","properties":{},"required":[],"type":"object"}',
+'',
+'',
+'f/multipython/script1', 2345678901, 'python3', '');
+

backend/tests/worker.rs

@@ -3970,7 +3970,7 @@ async fn assert_lockfile(
 #[sqlx::test(fixtures("base", "lockfile_python"))]
 async fn test_requirements_python(db: Pool<Postgres>) {
     let content = r#"
-# py311
+# py: 3.11.11
 # requirements:
 # tiny==0.1.3
 
@@ -3988,7 +3988,7 @@ def main():
         &db,
         content,
         ScriptLang::Python3,
-        vec!["# py311", "tiny==0.1.3"],
+        vec!["# py: 3.11.11", "tiny==0.1.3"],
     )
     .await;
 }
@@ -3998,7 +3998,7 @@ def main():
 async fn test_extra_requirements_python(db: Pool<Postgres>) {
     {
         let content = r#"
-# py311
+# py: ==3.11.11
 # extra_requirements:
 # tiny
 
@@ -4016,7 +4016,7 @@ def main():
             &db,
             content,
             ScriptLang::Python3,
-            vec!["# py311", "bottle==0.13.2", "tiny==0.1.2"],
+            vec!["# py: 3.11.11", "bottle==0.13.2", "tiny==0.1.2"],
         )
         .await;
     }
@@ -4026,7 +4026,7 @@ def main():
 #[sqlx::test(fixtures("base", "lockfile_python"))]
 async fn test_extra_requirements_python2(db: Pool<Postgres>) {
     let content = r#"
-# py311
+# py: ==3.11.11
 # extra_requirements:
 # tiny==0.1.3
 
@@ -4040,7 +4040,7 @@ def main():
         &db,
         content,
         ScriptLang::Python3,
-        vec!["# py311", "simplejson==3.20.1", "tiny==0.1.3"],
+        vec!["# py: 3.11.11", "simplejson==3.20.1", "tiny==0.1.3"],
     )
     .await;
 }
@@ -4049,7 +4049,7 @@ def main():
 #[sqlx::test(fixtures("base", "lockfile_python"))]
 async fn test_pins_python(db: Pool<Postgres>) {
     let content = r#"
-# py311
+# py: ==3.11.11
 # extra_requirements:
 # tiny==0.1.3
 # bottle==0.13.2
@@ -4069,7 +4069,7 @@ def main():
         content,
         ScriptLang::Python3,
         vec![
-            "# py311",
+            "# py: 3.11.11",
             "bottle==0.13.2",
             "microdot==2.2.0",
             "simplejson==3.19.3",
@@ -4078,6 +4078,39 @@ def main():
     )
     .await;
 }
+#[cfg(feature = "python")]
+#[sqlx::test(fixtures("base", "multipython"))]
+async fn test_multipython_python(db: Pool<Postgres>) {
+    let content = r#"# py: <=3.12.2, >=3.12.0
+import f.multipython.script1
+import f.multipython.aliases
+"#
+    .to_string();
+
+    assert_lockfile(&db, content, ScriptLang::Python3, vec!["# py: 3.12.1\n"]).await;
+}
+
+#[cfg(feature = "python")]
+#[sqlx::test(fixtures("base", "multipython"))]
+async fn test_inline_script_metadata_python(db: Pool<Postgres>) {
+    let content = r#"# py_select_latest
+# /// script
+# requires-python = ">3.11,<3.12.3,!=3.12.2"
+# dependencies = [
+#   "tiny==0.1.3",
+# ]
+# ///
+"#
+    .to_string();
+
+    assert_lockfile(
+        &db,
+        content,
+        ScriptLang::Python3,
+        vec!["# py: 3.12.1", "tiny==0.1.3"],
+    )
+    .await;
+}
 #[sqlx::test(fixtures("base", "result_format"))]
 async fn test_result_format(db: Pool<Postgres>) {
     let ordered_result_job_id = "1eecb96a-c8b0-4a3d-b1b6-087878c55e41";

backend/windmill-api/Cargo.toml

@@ -36,6 +36,7 @@ deno_core = ["dep:deno_core", "dep:deno_error"]
 gcp_trigger = ["dep:thiserror", "dep:google-cloud-pubsub", "dep:google-cloud-googleapis", "dep:tonic"]
 cloud = ["windmill-common/cloud"]
 mcp = ["dep:rmcp"]
+python = []
 
 [dependencies]
 rmcp = { git = "https://github.com/windmill-labs/rust-sdk", features = ["transport-sse-server"], optional = true }

backend/windmill-api/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.491.5
+  version: 1.492.1
   title: Windmill API
 
   contact:
@@ -11105,6 +11105,23 @@ paths:
                 items:
                   $ref: "#/components/schemas/AutoscalingEvent"
 
+  /configs/list_available_python_versions:
+    get:
+      summary: Get currently available python versions provided by UV.
+      operationId: listAvailablePythonVersions
+      tags:
+        - config
+      # parameters:
+      responses:
+        "200":
+          description: List of python versions
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+
   /agent_workers/create_agent_token:
     post:
       summary: create agent token
@@ -16802,7 +16819,6 @@ components:
           type: string
       required:
         - s3
-
     TeamsChannel:
       type: object
       required:

backend/windmill-api/src/configs.rs

@@ -33,6 +33,10 @@ pub fn global_service() -> Router {
             "/list_autoscaling_events/:worker_group",
             get(list_autoscaling_events),
         )
+        .route(
+            "/list_available_python_versions",
+            get(list_available_python_versions),
+        )
 }
 
 #[derive(Serialize, Deserialize, FromRow)]
@@ -205,6 +209,24 @@ async fn list_autoscaling_events(
     Ok(Json(events))
 }
 
+async fn list_available_python_versions() -> error::JsonResult<Vec<String>> {
+    #[cfg(not(feature = "python"))]
+    return Err(error::Error::BadRequest(
+        "Python listing available only with 'python' feature enabled".to_string(),
+    ));
+
+    #[cfg(feature = "python")]
+    use itertools::Itertools;
+    #[cfg(feature = "python")]
+    return Ok(Json(
+        windmill_worker::PyV::list_available_python_versions()
+            .await
+            .iter()
+            .map(|v| v.to_string())
+            .collect_vec(),
+    ));
+}
+
 #[cfg(feature = "enterprise")]
 async fn list_configs(
     authed: ApiAuthed,

backend/windmill-common/src/worker.rs

@@ -516,6 +516,7 @@ fn parse_file<T: FromStr>(path: &str) -> Option<T> {
 pub struct PythonAnnotations {
     pub no_cache: bool,
     pub no_postinstall: bool,
+    pub py_select_latest: bool,
     pub skip_result_postprocessing: bool,
     pub py310: bool,
     pub py311: bool,

backend/windmill-queue/src/jobs.rs

@@ -2123,10 +2123,19 @@ pub struct PulledJob {
     pub permissioned_as_folders: Option<Vec<serde_json::Value>>,
 }
 
+
+// NOTE:
+// Precomputed by the server
+// Used to offload work from agent workers to server
 #[derive(Serialize, Deserialize)]
 pub enum PrecomputedAgentInfo {
     Bun { local: String, remote: String },
-    Python { py_version: Option<u32>, requirements: Option<String> },
+    Python {
+        // V1, not used anymore. Exists for compat.
+        // TODO: Needs to be removed eventually
+        py_version: Option<u32>,
+        py_version_v2: Option<String>,
+        requirements: Option<String> },
 }
 
 #[derive(Serialize, Deserialize)]

backend/windmill-worker/Cargo.toml

@@ -116,6 +116,7 @@ convert_case.workspace = true
 yaml-rust.workspace = true
 backon.workspace = true
 winapi = { workspace = true, optional = true }
+pep440_rs.workspace = true
 
 opentelemetry = { workspace = true, optional = true }
 bollard = { workspace = true, optional = true }

backend/windmill-worker/src/ansible_executor.rs

@@ -30,9 +30,9 @@ use crate::{
         start_child_process, transform_json, OccupancyMetrics,
     },
     handle_child::handle_child,
-    python_executor::{create_dependencies_dir, handle_python_reqs, uv_pip_compile, PyVersion},
-    AuthedClient, DISABLE_NSJAIL, DISABLE_NUSER, GIT_PATH, HOME_ENV, NSJAIL_PATH, PATH_ENV,
-    PROXY_ENVS, PY_INSTALL_DIR, TZ_ENV,
+    python_executor::{create_dependencies_dir, handle_python_reqs, uv_pip_compile},
+    AuthedClient, PyVAlias, DISABLE_NSJAIL, DISABLE_NUSER, GIT_PATH, HOME_ENV, NSJAIL_PATH,
+    PATH_ENV, PROXY_ENVS, PY_INSTALL_DIR, TZ_ENV,
 };
 
 lazy_static::lazy_static! {
@@ -373,7 +373,7 @@ async fn handle_ansible_python_deps(
                     worker_name,
                     w_id,
                     &mut Some(occupancy_metrics),
-                    PyVersion::Py311,
+                    PyVAlias::Py311.into(),
                     false,
                 )
                 .await
@@ -387,10 +387,7 @@ async fn handle_ansible_python_deps(
 
     if requirements.len() > 0 {
         let mut venv_path = handle_python_reqs(
-            requirements
-                .split("\n")
-                .filter(|x| !x.starts_with("--"))
-                .collect(),
+            crate::python_executor::split_requirements(requirements),
             job_id,
             w_id,
             mem_peak,
@@ -400,7 +397,7 @@ async fn handle_ansible_python_deps(
             job_dir,
             worker_dir,
             &mut Some(occupancy_metrics),
-            crate::python_executor::PyVersion::Py311,
+            PyVAlias::default().into(),
         )
         .await?;
         additional_python_paths.append(&mut venv_path);

backend/windmill-worker/src/bash_executor.rs

@@ -299,16 +299,28 @@ async fn handle_docker_job(
     }
 
     let wait_f = async {
-        let wait = client
+        let waited = client
             .wait_container::<String>(&container_id, None)
             .try_collect::<Vec<_>>()
-            .await
-            .map_err(|e| {
+            .await;
+        match waited {
+            Ok(wait) => Ok(wait.first().map(|x| x.status_code)),
+            Err(bollard::errors::Error::DockerResponseServerError { status_code, message }) => {
+                append_logs(&job_id, &workspace_id, &format!(": {message}"), conn).await;
+                Ok(Some(status_code as i64))
+            }
+            Err(bollard::errors::Error::DockerContainerWaitError { error, code }) => {
+                append_logs(&job_id, &workspace_id, &format!("{error}"), conn).await;
+                Ok(Some(code as i64))
+            }
+            Err(e) => {
                 tracing::error!("Error waiting for container: {:?}", e);
-                anyhow::anyhow!("Error waiting for container: {:?}", e)
-            })?;
-        let waited = wait.first().map(|x| x.status_code);
-        Ok(waited)
+                Err(Error::ExecutionErr(format!(
+                    "Error waiting for container: {:?}",
+                    e
+                )))
+            }
+        }
     };
 
     let ncontainer_id = container_id.to_string();
@@ -317,7 +329,7 @@ async fn handle_docker_job(
     let conn2 = conn.clone();
     let worker_name2 = worker_name.to_string();
     let (tx, mut rx) = tokio::sync::broadcast::channel::<()>(1);
-
+    let workspace_id2 = workspace_id.to_string();
     let mut killpill_rx = killpill_rx.resubscribe();
     let logs = tokio::spawn(async move {
         let client = bollard::Docker::connect_with_unix_defaults().map_err(to_anyhow);
@@ -332,6 +344,13 @@ async fn handle_docker_job(
                     ..Default::default()
                 }),
             );
+            append_logs(
+                &job_id,
+                &workspace_id2,
+                "\ndocker logs stream started\n",
+                &conn2,
+            )
+            .await;
             loop {
                 tokio::select! {
                     log = log_stream.next() => {
@@ -441,11 +460,14 @@ async fn handle_docker_job(
 
     let result = result.unwrap();
 
+    if result.is_some_and(|x| x > 0) {
+        return Err(Error::ExecutionErr(format!(
+            "Docker job completed with unsuccessful exit status: {}",
+            result.unwrap()
+        )));
+    }
     return Ok(to_raw_value(&json!(format!(
-        "Docker exit status: {}",
-        result
-            .map(|x| x.to_string())
-            .unwrap_or_else(|| "none".to_string())
+        "Docker job completed with success exit status"
     ))));
 }
 

backend/windmill-worker/src/global_cache.rs

@@ -22,6 +22,7 @@ pub async fn build_tar_and_push(
     platform_agnostic: bool,
 ) -> error::Result<()> {
     use object_store::path::Path;
+    use tokio::fs::create_dir_all;
 
     use crate::TAR_PYBASE_CACHE_DIR;
 
@@ -36,7 +37,9 @@ pub async fn build_tar_and_push(
     };
 
     let prefix = &format!("{TAR_PYBASE_CACHE_DIR}/{}", lang);
-    let tar_path = format!("{prefix}/{folder_name}_tar.tar",);
+    let tar_path = format!("{prefix}/{folder_name}_tar.tar");
+
+    create_dir_all(prefix).await?;
 
     let tar_file = std::fs::File::create(&tar_path)?;
     let mut tar = tar::Builder::new(tar_file);

backend/windmill-worker/src/go_executor.rs

@@ -473,7 +473,7 @@ pub async fn install_go_dependencies(
     if non_dep_job {
         if let Some(db) = conn.as_sql() {
             sqlx::query!(
-                "INSERT INTO pip_resolution_cache (hash, lockfile, expiration) VALUES ($1, $2, now() + ('3 days')::interval) ON CONFLICT (hash) DO UPDATE SET lockfile = $2",
+                "INSERT INTO pip_resolution_cache (hash, lockfile, expiration) VALUES ($1, $2, now() + ('5 mins')::interval) ON CONFLICT (hash) DO UPDATE SET lockfile = $2",
                 hash,
                 req_content
             )

backend/windmill-worker/src/java_executor.rs

@@ -243,7 +243,7 @@ pub async fn resolve<'a>(
 
     if let Connection::Sql(db) = conn {
         sqlx::query!(
-        "INSERT INTO pip_resolution_cache (hash, lockfile, expiration) VALUES ($1, $2, now() + ('3 days')::interval) ON CONFLICT (hash) DO UPDATE SET lockfile = $2",
+        "INSERT INTO pip_resolution_cache (hash, lockfile, expiration) VALUES ($1, $2, now() + ('5 mins')::interval) ON CONFLICT (hash) DO UPDATE SET lockfile = $2",
         req_hash,
             lock.clone(),
         )

backend/windmill-worker/src/lib.rs

@@ -39,6 +39,8 @@ mod pg_executor;
 mod php_executor;
 #[cfg(feature = "python")]
 mod python_executor;
+#[cfg(feature = "python")]
+mod python_versions;
 pub mod result_processor;
 #[cfg(feature = "rust")]
 mod rust_executor;
@@ -60,3 +62,6 @@ pub use bun_executor::{
     prebundle_bun_script, prepare_job_dir,
 };
 pub use deno_executor::generate_deno_lock;
+
+#[cfg(feature = "python")]
+pub use python_versions::{PyV, PyVAlias};

backend/windmill-worker/src/python_executor.rs

@@ -3,6 +3,7 @@ use std::{
     fs,
     path::Path,
     process::Stdio,
+    str::FromStr,
     sync::Arc,
 };
 
@@ -38,12 +39,12 @@ use std::env::var;
 use windmill_queue::{append_logs, CanceledBy, PrecomputedAgentInfo};
 
 lazy_static::lazy_static! {
-    static ref PYTHON_PATH: Option<String> = var("PYTHON_PATH").ok().map(|v| {
+    pub(crate) static ref PYTHON_PATH: Option<String> = var("PYTHON_PATH").ok().map(|v| {
         tracing::warn!("PYTHON_PATH is set to {} and thus python will not be managed by uv and stay static regardless of annotation and instance settings. NOT RECOMMENDED", v);
         v
     });
 
-    static ref UV_PATH: String =
+    pub(crate) static ref UV_PATH: String =
     var("UV_PATH").unwrap_or_else(|_| "/usr/local/bin/uv".to_string());
 
     static ref PY_CONCURRENT_DOWNLOADS: usize =
@@ -77,348 +78,11 @@ use crate::{
         start_child_process, OccupancyMetrics,
     },
     handle_child::handle_child,
-    worker_lockfiles::LOCKFILE_GENERATED_FROM_REQUIREMENTS_TXT,
     worker_utils::ping_job_status,
-    AuthedClient, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, INSTANCE_PYTHON_VERSION, NSJAIL_PATH,
-    PATH_ENV, PIP_EXTRA_INDEX_URL, PIP_INDEX_URL, PROXY_ENVS, PY_INSTALL_DIR, TZ_ENV, UV_CACHE_DIR,
+    AuthedClient, PyV, PyVAlias, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NSJAIL_PATH, PATH_ENV,
+    PIP_EXTRA_INDEX_URL, PIP_INDEX_URL, PROXY_ENVS, PY_INSTALL_DIR, TZ_ENV, UV_CACHE_DIR,
 };
 
-// To change latest stable version:
-// 1. Change placeholder in instanceSettings.ts
-// 2. Change LATEST_STABLE_PY in dockerfile
-// 3. Change #[default] annotation for PyVersion in backend
-#[derive(Eq, PartialEq, Clone, Copy, Default, Debug)]
-pub enum PyVersion {
-    Py310,
-    #[default]
-    Py311,
-    Py312,
-    Py313,
-}
-
-impl PyVersion {
-    pub async fn from_instance_version(job_id: &Uuid, w_id: &str, conn: &Connection) -> Self {
-        let mut err = None;
-        let pyv = match INSTANCE_PYTHON_VERSION.read().await.clone() {
-            Some(v) => PyVersion::from_string_with_dots(&v).unwrap_or_else(|| {
-                let v = PyVersion::default();
-                err = Some(format!("\nCannot parse INSTANCE_PYTHON_VERSION ({:?}), fallback to latest_stable ({v:?})", *INSTANCE_PYTHON_VERSION));
-                v
-            }),
-            // Use latest stable
-            None => PyVersion::default(),
-        };
-
-        if let Some(msg) = err {
-            append_logs(job_id, w_id, &msg, conn).await;
-            tracing::error!(msg);
-        }
-        pyv
-    }
-    /// e.g.: `/tmp/windmill/cache/python_3xy`
-    pub fn to_cache_dir(&self) -> String {
-        use windmill_common::worker::ROOT_CACHE_DIR;
-        format!("{ROOT_CACHE_DIR}{}", &self.to_cache_dir_top_level())
-    }
-    /// e.g.: `python_3xy`
-    pub fn to_cache_dir_top_level(&self) -> String {
-        format!("python_{}", self.to_string_no_dot())
-    }
-    /// e.g.: `3xy`
-    pub fn to_string_no_dot(&self) -> String {
-        self.to_string_with_dot().replace('.', "")
-    }
-    /// e.g.: `3.xy`
-    pub fn to_string_with_dot(&self) -> &str {
-        use PyVersion::*;
-        match self {
-            Py310 => "3.10",
-            Py311 => "3.11",
-            Py312 => "3.12",
-            Py313 => "3.13",
-        }
-    }
-    pub fn from_string_with_dots(value: &str) -> Option<Self> {
-        use PyVersion::*;
-        match value {
-            "3.10" => Some(Py310),
-            "3.11" => Some(Py311),
-            "3.12" => Some(Py312),
-            "3.13" => Some(Py313),
-            "default" => Some(PyVersion::default()),
-            _ => {
-                tracing::warn!(
-                    "Cannot convert string (\"{value}\") to PyVersion\nExpected format x.yz"
-                );
-                None
-            }
-        }
-    }
-    pub fn from_string_no_dots(value: &str) -> Option<Self> {
-        use PyVersion::*;
-        match value {
-            "310" => Some(Py310),
-            "311" => Some(Py311),
-            "312" => Some(Py312),
-            "313" => Some(Py313),
-            "default" => Some(PyVersion::default()),
-            _ => {
-                tracing::warn!(
-                    "Cannot convert string (\"{value}\") to PyVersion\nExpected format xyz"
-                );
-                None
-            }
-        }
-    }
-    /// e.g.: `# py3xy` -> `PyVersion::Py3XY`
-    pub fn parse_version(line: &str) -> Option<Self> {
-        Self::from_string_no_dots(line.replace(" ", "").replace("#py", "").as_str())
-    }
-    pub fn from_py_annotations(a: PythonAnnotations) -> Option<Self> {
-        let PythonAnnotations { py310, py311, py312, py313, .. } = a;
-        use PyVersion::*;
-        if py313 {
-            Some(Py313)
-        } else if py312 {
-            Some(Py312)
-        } else if py311 {
-            Some(Py311)
-        } else if py310 {
-            Some(Py310)
-        } else {
-            None
-        }
-    }
-    pub fn from_numeric(n: u32) -> Option<Self> {
-        use PyVersion::*;
-        match n {
-            310 => Some(Py310),
-            311 => Some(Py311),
-            312 => Some(Py312),
-            313 => Some(Py313),
-            _ => None,
-        }
-    }
-    pub fn to_numeric(&self) -> u32 {
-        use PyVersion::*;
-        match self {
-            Py310 => 310,
-            Py311 => 311,
-            Py312 => 312,
-            Py313 => 313,
-        }
-    }
-    pub async fn get_python(
-        &self,
-        job_id: &Uuid,
-        mem_peak: &mut i32,
-        // canceled_by: &mut Option<CanceledBy>,
-        conn: &Connection,
-        worker_name: &str,
-        w_id: &str,
-        occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
-    ) -> error::Result<Option<String>> {
-        // lazy_static::lazy_static! {
-        //     static ref PYTHON_PATHS: Arc<RwLock<HashMap<PyVersion, String>>> = Arc::new(RwLock::new(HashMap::new()));
-        // }
-
-        let res = self
-            .get_python_inner(job_id, mem_peak, conn, worker_name, w_id, occupancy_metrics)
-            .await;
-
-        if let Err(ref e) = res {
-            tracing::error!(
-                "worker_name: {worker_name}, w_id: {w_id}, job_id: {job_id}\n
-                Error while getting python from uv, falling back to system python: {e:?}"
-            );
-            append_logs(
-                job_id,
-                w_id,
-                format!(
-                    "\nError while getting python from uv, falling back to system python: {e:?}"
-                ),
-                conn,
-            )
-            .await;
-        }
-        res
-    }
-    async fn get_python_inner(
-        self,
-        job_id: &Uuid,
-        mem_peak: &mut i32,
-        // canceled_by: &mut Option<CanceledBy>,
-        conn: &Connection,
-        worker_name: &str,
-        w_id: &str,
-        occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
-    ) -> error::Result<Option<String>> {
-        let py_path = self.find_python().await;
-
-        // Runtime is not installed
-        if py_path.is_err() {
-            // Install it
-            if let Err(err) = self
-                .install_python(job_id, mem_peak, conn, worker_name, w_id, occupancy_metrics)
-                .await
-            {
-                tracing::error!("Cannot install python: {err}");
-                return Err(err);
-            } else {
-                // Try to find one more time
-                let py_path = self.find_python().await;
-
-                if let Err(err) = py_path {
-                    tracing::error!("Cannot find python version {err}");
-                    return Err(err);
-                }
-
-                // TODO: Cache the result
-                py_path
-            }
-        } else {
-            py_path
-        }
-    }
-    async fn install_python(
-        self,
-        job_id: &Uuid,
-        mem_peak: &mut i32,
-        // canceled_by: &mut Option<CanceledBy>,
-        conn: &Connection,
-        worker_name: &str,
-        w_id: &str,
-        occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
-    ) -> error::Result<()> {
-        let v = self.to_string_with_dot();
-        append_logs(job_id, w_id, format!("\nINSTALLING PYTHON ({})", v), conn).await;
-        // Create dirs for newly installed python
-        // If we dont do this, NSJAIL will not be able to mount cache
-        // For the default version directory created during startup (main.rs)
-        DirBuilder::new()
-            .recursive(true)
-            .create(self.to_cache_dir())
-            .await
-            .expect("could not create initial worker dir");
-
-        let logs = String::new();
-
-        #[cfg(windows)]
-        let uv_cmd = "uv";
-
-        #[cfg(unix)]
-        let uv_cmd = UV_PATH.as_str();
-
-        let mut child_cmd = Command::new(uv_cmd);
-        child_cmd
-            .env_clear()
-            .env("HOME", HOME_ENV.to_string())
-            .env("PATH", PATH_ENV.to_string())
-            .envs(PROXY_ENVS.clone())
-            .args(["python", "install", v, "--python-preference=only-managed"])
-            // TODO: Do we need these?
-            .envs([("UV_PYTHON_INSTALL_DIR", PY_INSTALL_DIR)])
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped());
-
-        #[cfg(windows)]
-        {
-            child_cmd
-                .env("SystemRoot", SYSTEM_ROOT.as_str())
-                .env("USERPROFILE", crate::USERPROFILE_ENV.as_str())
-                .env(
-                    "TMP",
-                    std::env::var("TMP").unwrap_or_else(|_| String::from("/tmp")),
-                )
-                .env(
-                    "LOCALAPPDATA",
-                    std::env::var("LOCALAPPDATA")
-                        .unwrap_or_else(|_| format!("{}\\AppData\\Local", HOME_ENV.as_str())),
-                );
-        }
-
-        let child_process = start_child_process(child_cmd, "uv").await?;
-
-        append_logs(&job_id, &w_id, logs, conn).await;
-        handle_child(
-            job_id,
-            conn,
-            mem_peak,
-            &mut None,
-            child_process,
-            false,
-            worker_name,
-            &w_id,
-            "uv",
-            None,
-            false,
-            occupancy_metrics,
-            None,
-        )
-        .await
-    }
-    async fn find_python(self) -> error::Result<Option<String>> {
-        #[cfg(windows)]
-        let uv_cmd = "uv";
-
-        #[cfg(unix)]
-        let uv_cmd = UV_PATH.as_str();
-
-        let mut child_cmd = Command::new(uv_cmd);
-
-        child_cmd.env_clear();
-
-        #[cfg(windows)]
-        {
-            child_cmd
-                .env("SystemRoot", SYSTEM_ROOT.as_str())
-                .env("USERPROFILE", crate::USERPROFILE_ENV.as_str())
-                .env(
-                    "TMP",
-                    std::env::var("TMP").unwrap_or_else(|_| String::from("/tmp")),
-                )
-                .env(
-                    "LOCALAPPDATA",
-                    std::env::var("LOCALAPPDATA")
-                        .unwrap_or_else(|_| format!("{}\\AppData\\Local", HOME_ENV.as_str())),
-                );
-        }
-
-        let output = child_cmd
-            // .current_dir(job_dir)
-            .env("HOME", HOME_ENV.to_string())
-            .env("PATH", PATH_ENV.to_string())
-            .args([
-                "python",
-                "find",
-                self.to_string_with_dot(),
-                "--system",
-                "--python-preference=only-managed",
-            ])
-            .envs([
-                ("UV_PYTHON_INSTALL_DIR", PY_INSTALL_DIR),
-                ("UV_PYTHON_PREFERENCE", "only-managed"),
-            ])
-            // .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .output()
-            .await?;
-
-        // Check if the command was successful
-        if output.status.success() {
-            // Convert the output to a String
-            let stdout =
-                String::from_utf8(output.stdout).expect("Failed to convert output to String");
-            return Ok(Some(stdout.replace('\n', "")));
-        } else {
-            // If the command failed, print the error
-            let stderr =
-                String::from_utf8(output.stderr).expect("Failed to convert error output to String");
-            return Err(error::Error::FindPythonError(stderr));
-        }
-    }
-}
-
 #[cfg(windows)]
 use crate::SYSTEM_ROOT;
 
@@ -465,7 +129,7 @@ pub async fn uv_pip_compile(
     worker_name: &str,
     w_id: &str,
     occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
-    py_version: PyVersion,
+    py_version: PyV,
     // Debug-only flag
     no_cache: bool,
 ) -> error::Result<String> {
@@ -502,10 +166,11 @@ pub async fn uv_pip_compile(
         requirements.to_string()
     };
 
+    let py_version_str = py_version.clone().to_string();
     // Include python version to requirements.in
     // We need it because same hash based on requirements.in can get calculated even for different python versions
     // To prevent from overwriting same requirements.in but with different python versions, we include version to hash
-    let requirements = format!("# py{}\n{}", py_version.to_string_no_dot(), requirements);
+    let requirements = format!("# py: {}\n{}", py_version.to_string(), requirements);
 
     #[cfg(feature = "enterprise")]
     let requirements = replace_pip_secret(conn, w_id, &requirements, worker_name, job_id).await?;
@@ -525,7 +190,7 @@ pub async fn uv_pip_compile(
             {
                 logs.push_str(&format!(
                     "\nFound cached resolution: {req_hash}, on python version: {}",
-                    py_version.to_string_with_dot()
+                    &py_version_str
                 ));
                 return Ok(cached);
             }
@@ -539,7 +204,7 @@ pub async fn uv_pip_compile(
     {
         // Make sure we have python runtime installed
         py_version
-            .get_python(job_id, mem_peak, conn, worker_name, w_id, occupancy_metrics)
+            .try_get_python(job_id, mem_peak, conn, worker_name, w_id, occupancy_metrics)
             .await?;
 
         let mut args = vec![
@@ -561,12 +226,7 @@ pub async fn uv_pip_compile(
             UV_CACHE_DIR,
         ];
 
-        args.extend([
-            "-p",
-            &py_version.to_string_with_dot(),
-            "--python-preference",
-            "only-managed",
-        ]);
+        args.extend(["-p", &py_version_str, "--python-preference", "only-managed"]);
 
         if no_cache {
             args.extend(["--no-cache"]);
@@ -666,8 +326,8 @@ pub async fn uv_pip_compile(
     let mut req_content = "".to_string();
     file.read_to_string(&mut req_content).await?;
     let lockfile = format!(
-        "# py{}\n{}",
-        py_version.to_string_no_dot(),
+        "# py: {}\n{}",
+        py_version.to_string(),
         req_content
             .lines()
             .filter(|x| !x.trim_start().starts_with('#'))
@@ -677,7 +337,7 @@ pub async fn uv_pip_compile(
     );
     if let Some(db) = conn.as_sql() {
         sqlx::query!(
-        "INSERT INTO pip_resolution_cache (hash, lockfile, expiration) VALUES ($1, $2, now() + ('3 days')::interval) ON CONFLICT (hash) DO UPDATE SET lockfile = $2",
+        "INSERT INTO pip_resolution_cache (hash, lockfile, expiration) VALUES ($1, $2, now() + ('5 mins')::interval) ON CONFLICT (hash) DO UPDATE SET lockfile = $2",
         req_hash,
         lockfile
     ).fetch_optional(db).await?;
@@ -789,37 +449,6 @@ async fn postinstall(
     Ok(())
 }
 
-async fn get_python_path(
-    py_version: PyVersion,
-    worker_name: &str,
-    job_id: &Uuid,
-    w_id: &str,
-    mem_peak: &mut i32,
-    conn: &Connection,
-    occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
-) -> windmill_common::error::Result<String> {
-    let python_path = if let Some(python_path) = PYTHON_PATH.clone() {
-        python_path
-    } else if let Some(python_path) = py_version
-        .get_python(
-            &job_id,
-            mem_peak,
-            conn,
-            worker_name,
-            w_id,
-            occupancy_metrics,
-        )
-        .await?
-    {
-        python_path
-    } else {
-        return Err(Error::ExecutionErr(format!(
-            "uv could not manage python path. Please manage it manually by setting PYTHON_PATH environment variable to your python binary path"
-        )));
-    };
-    Ok(python_path)
-}
-
 #[tracing::instrument(level = "trace", skip_all)]
 pub async fn handle_python_job(
     requirements_o: Option<&String>,
@@ -863,16 +492,16 @@ pub async fn handle_python_job(
     .await?;
 
     tracing::debug!("Finished handling python dependencies");
-    let python_path = get_python_path(
-        py_version,
-        worker_name,
-        &job.id,
-        &job.workspace_id,
-        mem_peak,
-        conn,
-        &mut Some(occupancy_metrics),
-    )
-    .await?;
+    let python_path = py_version
+        .get_python(
+            worker_name,
+            &job.id,
+            &job.workspace_id,
+            mem_peak,
+            conn,
+            &mut Some(occupancy_metrics),
+        )
+        .await?;
 
     if !annotations.no_postinstall {
         if let Err(e) = postinstall(&mut additional_python_paths, job_dir, job, conn).await {
@@ -887,7 +516,7 @@ pub async fn handle_python_job(
             &job.workspace_id,
             format!(
                 "\n\n--- PYTHON ({}) CODE EXECUTION ---\n",
-                py_version.to_string_with_dot()
+                py_version.clone().to_string()
             ),
             conn,
         )
@@ -1026,7 +655,7 @@ except BaseException as e:
     let mut reserved_variables =
         get_reserved_variables(job, &client.token, conn, parent_runnable_path).await?;
 
-    // Add /tmp/windmill/cache/python_xyz/global-site-packages to PYTHONPATH.
+    // Add /tmp/windmill/cache/python_x_y_z/global-site-packages to PYTHONPATH.
     // Usefull if certain wheels needs to be preinstalled before execution.
     let global_site_packages_path = py_version.to_cache_dir() + "/global-site-packages";
     let additional_python_paths_folders = {
@@ -1039,9 +668,9 @@ except BaseException as e:
             // Since we handle mount of global_site_packages on our own, we don't want it to be mounted automatically.
             // We do this because existence of every wheel in cache is mandatory and if it is not there and nsjail expects it, it is a bug.
             // On the other side global_site_packages is purely optional.
-            // NOTE: This behaviour can be changed in future, so verification of wheels can be offloaded from nsjail to windmill
+            // NOTE: This behaviour can be changed in future, so verification of wheels can be delegated from nsjail to windmill
             paths.insert(0, global_site_packages_path.clone());
-            //    ^^^^^^^^
+            //    ^^^^^^ ^
             // We also want this be priorotized, that's why we insert it to the beginning
         }
         paths.iter().join(":")
@@ -1434,7 +1063,7 @@ async fn handle_python_deps(
     occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
     precomputed_agent_info: Option<PrecomputedAgentInfo>,
     annotations: PythonAnnotations,
-) -> error::Result<(PyVersion, Vec<String>)> {
+) -> error::Result<(PyV, Vec<String>)> {
     create_dependencies_dir(job_dir).await;
 
     let mut additional_python_paths: Vec<String> = WORKER_CONFIG
@@ -1445,90 +1074,116 @@ async fn handle_python_deps(
         .unwrap_or_else(|| vec![])
         .clone();
 
-    let mut requirements;
-    let compilation_error_hint;
-    let mut annotated_pyv = None;
-    let mut annotated_pyv_numeric = None;
-    let is_deployed = requirements_o.is_some();
-    let instance_pyv = PyVersion::from_instance_version(job_id, w_id, conn).await;
-    let requirements = match requirements_o {
-        Some(r) => r,
+    let (pyv, resolved_lines) = match requirements_o {
+        // Deployed
+        Some(r) => {
+            let rl = split_requirements(r);
+            (PyV::parse_from_requirements(&rl), rl)
+        }
+        // Preview
         None => {
-            let mut already_visited = vec![];
-
-            (requirements, compilation_error_hint) = match conn {
+            let (v, requirements_lines, error_hint) = match conn {
                 Connection::Sql(db) => {
+                    let mut version_specifiers = vec![];
                     let (r, h) = windmill_parser_py_imports::parse_python_imports(
                         inner_content,
                         w_id,
                         script_path,
                         db,
-                        &mut already_visited,
-                        &mut annotated_pyv_numeric,
+                        &mut version_specifiers,
                     )
                     .await?;
 
-                    (r.join("\n"), h)
+                    let v = PyV::resolve(
+                        version_specifiers,
+                        job_id,
+                        w_id,
+                        annotations.py_select_latest,
+                        Some(conn.clone()),
+                        None,
+                        None,
+                    )
+                    .await?;
+
+                    (v, r, h)
                 }
                 Connection::Http(_) => match precomputed_agent_info {
-                    Some(PrecomputedAgentInfo::Python { py_version, requirements }) => {
-                        annotated_pyv_numeric = py_version;
-                        (requirements.clone().unwrap_or_else(|| "".to_string()), None)
+                    Some(PrecomputedAgentInfo::Python {
+                        requirements,
+                        py_version,
+                        py_version_v2,
+                    }) => {
+                        let v = {
+                            let v_v2 = py_version_v2
+                                .clone()
+                                .and_then(|s| pep440_rs::Version::from_str(&s).ok().map(PyV::from));
+                            let v_v1 = py_version.and_then(PyVAlias::try_from_v1).map(PyV::from);
+
+                            match v_v2.or(v_v1) {
+                                Some(v) => v,
+                                None => {
+                                    tracing::warn!(
+                                        workspace_id = %w_id,
+                                        "
+Failed to get precomputed python version from server. Fallback to Default ({})
+Returned from server: py_version - {:?}, py_version_v2 - {:?}
+                                        ",
+                                        *PyV::default(),
+                                        py_version,
+                                        py_version_v2
+                                    );
+                                    Default::default()
+                                }
+                            }
+                        };
+
+                        let r = split_requirements(requirements.unwrap_or_default());
+                        let h = None;
+
+                        (v, r, h)
                     }
-                    _ => ("".to_string(), None),
+                    _ => Default::default(),
                 },
             };
 
-            annotated_pyv = annotated_pyv_numeric.and_then(|v| PyVersion::from_numeric(v));
-
-            if !requirements.is_empty() {
-                requirements = uv_pip_compile(
-                    job_id,
-                    &requirements,
-                    mem_peak,
-                    canceled_by,
-                    job_dir,
-                    conn,
-                    worker_name,
-                    w_id,
-                    occupancy_metrics,
-                    annotated_pyv.unwrap_or(instance_pyv),
-                    annotations.no_cache,
-                )
-                .await
-                .map_err(|e| {
-                    Error::ExecutionErr(format!(
-                        "pip compile failed: {}{}",
-                        e.to_string(),
-                        compilation_error_hint.unwrap_or_default()
-                    ))
-                })?;
-            }
-            &requirements
+            (
+                v.clone(),
+                if !requirements_lines.is_empty() {
+                    uv_pip_compile(
+                        job_id,
+                        &requirements_lines.join("\n"),
+                        mem_peak,
+                        canceled_by,
+                        job_dir,
+                        conn,
+                        worker_name,
+                        w_id,
+                        occupancy_metrics,
+                        // annotated_pyv.unwrap_or(instance_pyv),
+                        v,
+                        annotations.no_cache,
+                    )
+                    .await
+                    .map_err(|e| {
+                        Error::ExecutionErr(format!(
+                            "pip compile failed: {}{}",
+                            e.to_string(),
+                            error_hint.unwrap_or_default()
+                        ))
+                    })?
+                    .lines()
+                    .map(|s| s.to_owned())
+                    .collect_vec()
+                } else {
+                    vec![]
+                },
+            )
         }
     };
 
-    /*
-     For deployed scripts we want to find out version in following order:
-     1. Assigned version (written in lockfile)
-     2. 3.11
-
-     For Previews:
-     1. Annotated version
-     2. Instance version
-     3. Latest Stable
-    */
-    let requirements_lines = split_requirements(requirements.as_str());
-    let final_version = if is_deployed {
-        get_pyv_from_requirements_lines(&requirements_lines)
-    } else {
-        // This is not deployed script, meaning we test run it (Preview)
-        annotated_pyv.unwrap_or(instance_pyv)
-    };
-    // If len > 0 it means there is atleast one dependency or assigned python version
-    if requirements.len() > 0 {
+    if !resolved_lines.is_empty() {
         let mut venv_path = handle_python_reqs(
-            requirements_lines,
+            resolved_lines,
             job_id,
             w_id,
             mem_peak,
@@ -1538,13 +1193,13 @@ async fn handle_python_deps(
             job_dir,
             worker_dir,
             occupancy_metrics,
-            final_version,
+            pyv.clone(),
         )
         .await?;
         additional_python_paths.append(&mut venv_path);
     }
 
-    Ok((final_version, additional_python_paths))
+    Ok((pyv, additional_python_paths))
 }
 
 lazy_static::lazy_static! {
@@ -1733,7 +1388,7 @@ async fn spawn_uv_install(
 
 /// uv pip install, include cached or pull from S3
 pub async fn handle_python_reqs(
-    requirements: Vec<&str>,
+    requirements: Vec<String>,
     job_id: &Uuid,
     w_id: &str,
     mem_peak: &mut i32,
@@ -1743,7 +1398,7 @@ pub async fn handle_python_reqs(
     job_dir: &str,
     worker_dir: &str,
     _occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
-    py_version: PyVersion,
+    py_version: PyV,
 ) -> error::Result<Vec<String>> {
     let worker_dir = worker_dir.to_string();
 
@@ -2017,7 +1672,7 @@ pub async fn handle_python_reqs(
 
     let total_time = std::time::Instant::now();
     let py_path = py_version
-        .get_python(
+        .try_get_python(
             job_id,
             mem_peak,
             conn,
@@ -2059,6 +1714,10 @@ pub async fn handle_python_reqs(
         let py_path = py_path.clone();
         let pids = pids.clone();
         let worker_dir = worker_dir.clone();
+
+        #[cfg(all(feature = "enterprise", feature = "parquet", unix))]
+        let py_version = py_version.clone();
+
         handles.push(task::spawn(async move {
             // permit will be dropped anyway if this thread exits at any point
             // so we dont have to drop it manually
@@ -2300,36 +1959,14 @@ pub async fn handle_python_reqs(
     };
 }
 
-fn split_requirements(requirements: &str) -> Vec<&str> {
+pub fn split_requirements<T: AsRef<str>>(requirements: T) -> Vec<String> {
     requirements
-        .split("\n")
+        .as_ref()
+        .lines()
         .filter(|x| !x.trim_start().starts_with("--") && !x.trim().is_empty())
+        .map(String::from)
         .collect()
 }
-/// Check requirements/lockfile to figure out python version assigned to it.
-fn get_pyv_from_requirements_lines(requirements_lines: &[&str]) -> PyVersion {
-    // If script is deployed we can try to parse first line to get assigned version
-
-    let index = if requirements_lines.get(0).map_or(false, |line| {
-        line.starts_with(LOCKFILE_GENERATED_FROM_REQUIREMENTS_TXT)
-    }) {
-        1
-    } else {
-        0
-    };
-    if let Some(v) = requirements_lines
-        .get(index)
-        .and_then(|line| PyVersion::parse_version(*line))
-    {
-        // We have valid assigned version, we use it
-        v
-    } else {
-        // If there is no assigned version in lockfile we automatically fallback to 3.11
-        // In this case we have dependencies, but no associated python version
-        // This is the case for old deployed scripts
-        PyVersion::Py311
-    }
-}
 
 // Returns code snippet that needs to be injected into wrapper to post-process results or leave unprocessed
 fn get_result_postprocessor<'a>(skip: bool) -> &'a str {
@@ -2365,6 +2002,8 @@ pub async fn start_worker(
     jobs_rx: tokio::sync::mpsc::Receiver<std::sync::Arc<MiniPulledJob>>,
     killpill_rx: tokio::sync::broadcast::Receiver<()>,
 ) -> error::Result<()> {
+    use crate::{PyV, PyVAlias};
+
     let mut mem_peak: i32 = 0;
     let mut canceled_by: Option<CanceledBy> = None;
     let context = variables::get_reserved_variables(
@@ -2518,22 +2157,22 @@ for line in sys.stdin:
     proc_envs.insert("BASE_URL".to_string(), base_internal_url.to_string());
 
     let py_version = if let Some(requirements) = requirements_o {
-        get_pyv_from_requirements_lines(&split_requirements(requirements.as_str()))
+        PyV::parse_from_requirements(&split_requirements(requirements.as_str()))
     } else {
         tracing::warn!(workspace_id = %w_id, "lockfile is empty for dedicated worker, thus python version cannot be inferred. Fallback to 3.11");
-        PyVersion::Py311
+        PyVAlias::Py311.into()
     };
 
-    let python_path = get_python_path(
-        py_version,
-        worker_name,
-        &Uuid::nil(),
-        w_id,
-        &mut mem_peak,
-        &Connection::Sql(db.clone()),
-        &mut None,
-    )
-    .await?;
+    let python_path = py_version
+        .get_python(
+            worker_name,
+            &Uuid::nil(),
+            w_id,
+            &mut mem_peak,
+            &Connection::Sql(db.clone()),
+            &mut None,
+        )
+        .await?;
     handle_dedicated_process(
         &python_path,
         job_dir,

backend/windmill-worker/src/python_versions.rs

@@ -0,0 +1,848 @@
+use std::{
+    ops::{Deref, DerefMut},
+    process::Stdio,
+    str::FromStr,
+    sync::Arc,
+};
+
+use chrono::{DateTime, Duration, Utc};
+use itertools::Itertools;
+use serde_json::Value;
+use tokio::{fs::DirBuilder, process::Command, sync::RwLock};
+use uuid::Uuid;
+use windmill_common::{
+    error::{self, Error},
+    worker::Connection,
+};
+
+use anyhow::{anyhow, bail};
+use windmill_queue::append_logs;
+
+use crate::{
+    common::{start_child_process, OccupancyMetrics},
+    handle_child::handle_child,
+    python_executor::{PYTHON_PATH, UV_PATH},
+    worker_lockfiles::LOCKFILE_GENERATED_FROM_REQUIREMENTS_TXT,
+    HOME_ENV, INSTANCE_PYTHON_VERSION, PATH_ENV, PROXY_ENVS, PY_INSTALL_DIR, WIN_ENVS,
+};
+
+#[derive(Eq, PartialEq, Clone, Copy, Default, Debug)]
+#[repr(u32)]
+pub enum PyVAlias {
+    Py310 = 10,
+    #[default]
+    Py311,
+    Py312,
+    Py313,
+}
+
+impl Into<pep440_rs::Version> for PyVAlias {
+    fn into(self) -> pep440_rs::Version {
+        pep440_rs::Version::new([self.major() as u64, self as u64])
+    }
+}
+
+impl Into<u32> for PyVAlias {
+    fn into(self) -> u32 {
+        self.major() * 100 + self as u32
+    }
+}
+
+impl From<PyV> for PyVAlias {
+    fn from(value: PyV) -> Self {
+        match value.release() {
+            [major, minor, ..] => {
+                if let Some(alias) = Self::try_from_v1(format!("{}{}", *major, *minor)) {
+                    return alias;
+                }
+            }
+            _ => (),
+        }
+
+        tracing::warn!(
+            "Failed to convert Python Full Version to Alias. Fallback to default ({})",
+            *PyV::default()
+        );
+        Self::default()
+    }
+}
+impl PyVAlias {
+    fn all<T: From<PyVAlias>>() -> Vec<T> {
+        use PyVAlias::*;
+        vec![Py310.into(), Py311.into(), Py312.into(), Py313.into()]
+    }
+    // Get MAJOR part of alias. (semver: MAJOR.MINOR.PATCH)
+    fn major(&self) -> u32 {
+        use PyVAlias::*;
+        match self {
+            Py310 | Py311 | Py312 | Py313 => 3,
+            // Py400 | Py401 => 4
+        }
+    }
+
+    /// Converts numeric format to alias
+    /// Example:
+    /// 310u32 (in) -> PyVAlias::Py310 (out)
+    pub(crate) fn try_from_v1<T: ToString>(numeric: T) -> Option<Self> {
+        use PyVAlias::*;
+        match numeric.to_string().as_str() {
+            "310" => Some(Py310),
+            "311" => Some(Py311),
+            "312" => Some(Py312),
+            "313" => Some(Py313),
+            _ => None,
+        }
+    }
+}
+
+// To change latest stable version:
+// 1. Change placeholder in instanceSettings.ts
+// 2. Change LATEST_STABLE_PY in dockerfile
+// 3. Change #[default] annotation for PyVersion in backend
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct PyV(pub pep440_rs::Version);
+
+impl From<pep440_rs::Version> for PyV {
+    fn from(value: pep440_rs::Version) -> Self {
+        Self(value)
+    }
+}
+
+impl From<PyVAlias> for PyV {
+    fn from(value: PyVAlias) -> Self {
+        Self(value.into())
+    }
+}
+
+impl Default for PyV {
+    fn default() -> Self {
+        PyVAlias::default().into()
+    }
+}
+
+impl Deref for PyV {
+    type Target = pep440_rs::Version;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl DerefMut for PyV {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl PyV {
+    pub async fn resolve(
+        version_specifiers: Vec<pep440_rs::VersionSpecifier>,
+        job_id: &Uuid,
+        w_id: &str,
+        select_latest: bool,
+        // Needed for logs but optional
+        conn: Option<Connection>,
+        // Usually for testing
+        custom_versions: Option<Vec<PyV>>,
+        // For testing
+        gravitational_version: Option<PyV>,
+    ) -> Result<Self, Error> {
+        // Get all versions that can be fetched
+        let all_versions = custom_versions.unwrap_or(PyV::list_available_python_versions().await);
+
+        // Narrow down to those that satisfy given version specifiers
+        let valid = all_versions
+            .clone()
+            .into_iter()
+            .filter(|v| version_specifiers.iter().all(|vs| vs.contains(&*v)))
+            .collect_vec();
+
+        if !valid.is_empty() {
+            if select_latest {
+                return Ok(valid[0].clone());
+            }
+
+            // Usually INSTANCE_PYTHON_VERSION
+            let gv = gravitational_version
+                .unwrap_or(PyV::gravitational_version(job_id, w_id, conn).await);
+
+            // Will be used to determine if picked version matches gravity version
+            // Once first match occure, we will stop iterating
+            let gravity_matcher = pep440_rs::VersionSpecifier::from_version(
+                pep440_rs::Operator::EqualStar,
+                (*gv).clone(),
+            )
+            .map_err(|e| {
+                Error::ArgumentErr(format!(
+                    "{e}\nLikely means INSTANCE_PYTHON_VERSION is set incorrectly."
+                ))
+            })?;
+
+            // Reminder of semver: MAJOR.MINOR.PATCH
+            //
+            // - Go from up to down
+            // - We will iterate until find the closest version to target.
+            //   - If closest version has the same MINOR version, use it.
+            //   - If it differs in MINOR version, take latest PATCH version.
+            //
+            let mut result = None;
+
+            // This represents newest version with oldest MINOR:
+            //
+            // I Iterable   Newest in MINOR
+            // 1. 3.11.2 -> 3.11.2
+            // 2. 3.11.1 -> 3.11.2
+            // 3. 3.11.0 -> 3.11.2
+            // 4. 3.10.2 -> 3.10.2
+            // 5. 3.10.1 -> 3.10.2
+            // 6. 3.10.0 -> 3.10.2
+            let mut newest_in_minor = None;
+            for v in valid.iter() {
+                if result.is_none() {
+                    result.replace(v);
+                }
+
+                if v < &gv {
+                    // We will not continue if we start looking into versions older than gravity version.
+                    break;
+                }
+
+                let [major, minor, ..] = v.release() else {
+                    return Err(Error::InternalErr(format!("Failed to parse \"{}\". Available python versions are supposed to be in SEMVER format (MAJOR.MINOR)", **v)));
+                };
+
+                // Since we go top to down we can assume
+                // the first occurence of new minor version contains the latest patch version.
+                if matches!(newest_in_minor, Some((_, mm)) if mm != (major, minor))
+                    || newest_in_minor.is_none()
+                {
+                    newest_in_minor = Some((v.clone(), (major, minor)));
+                }
+
+                if gravity_matcher.contains(v) {
+                    // return as soon as gravity matcher has first hit.
+                    return Ok(v.clone());
+                }
+                // If we are still in the loop, it means that we are getting closer to gravity version
+                else {
+                    result = Some(v);
+                }
+            }
+
+            let [gravity_major, gravity_minor, ..] = gv.release() else {
+                return Err(Error::internal_err(format!("Cannot get MAJOR or/and MINOR version of python gravity version ({}). Something might be wrong with INSTANCE_PYTHON_VERSION.", &*gv)));
+            };
+
+            if let Some((v, mm)) = newest_in_minor {
+                if (gravity_major, gravity_minor) != mm {
+                    return Ok(v);
+                }
+            }
+
+            result
+                .ok_or(Error::internal_err(
+                    "No python candidates found. This is a bug!",
+                ))
+                .map(ToOwned::to_owned)
+        } else {
+            Err(anyhow!(
+                "
+  × No solution found when resolving python:
+  ╰─▶ Because you require python {}, we can conclude that your requirements are unsatisfiable.
+
+  All versions: \n{}
+                \n",
+                version_specifiers.iter().map(|s| s.to_string()).join(", "),
+                all_versions
+                    .iter()
+                    .enumerate()
+                    .map(|(i, v)| format!(
+                        "{}{}",
+                        windmill_common::worker::pad_string(&v.0.to_string(), 11),
+                        if (i + 1) % 5 == 0 { "\n" } else { "" }
+                    ))
+                    .collect::<String>()
+            )
+            .into())
+        }
+    }
+    /// e.g.: `/tmp/windmill/cache/python_3xy`
+    pub(crate) fn to_cache_dir(&self) -> String {
+        use windmill_common::worker::ROOT_CACHE_DIR;
+        format!("{ROOT_CACHE_DIR}{}", self.to_cache_dir_top_level())
+    }
+
+    /// e.g.: `python_3_x_y`
+    pub fn to_cache_dir_top_level(&self) -> String {
+        format!("python_{}", self.to_string().replace(".", "_"))
+    }
+
+    pub async fn gravitational_version(
+        job_id: &Uuid,
+        w_id: &str,
+        conn: Option<Connection>,
+    ) -> Self {
+        let mut err = None;
+        let pyv = match INSTANCE_PYTHON_VERSION.read().await.clone() {
+            Some(v) => pep440_rs::Version::from_str(&v).unwrap_or_else(|_| {
+                let v = PyVAlias::default().into();
+                err = Some(format!("\nCannot parse INSTANCE_PYTHON_VERSION ({:?}), fallback to latest_stable ({v:?})", *INSTANCE_PYTHON_VERSION));
+                v
+            }),
+            // Use latest stable
+            None => PyVAlias::default().into(),
+        };
+
+        if let Some(msg) = err {
+            if let Some(conn) = conn {
+                append_logs(job_id, w_id, &msg, &conn).await;
+            }
+            tracing::error!(msg);
+        }
+        pyv.into()
+    }
+
+    pub async fn list_available_python_versions() -> Vec<Self> {
+        match Self::list_available_python_versions_inner().await {
+            Ok(pyvs) => pyvs,
+            Err(e) => {
+                tracing::error!(
+                    "Fallback to preconfigured aliases. Cannot list python versions due to this error: {e}"
+                );
+                PyVAlias::all()
+            }
+        }
+    }
+    async fn list_available_python_versions_inner() -> anyhow::Result<Vec<Self>> {
+        lazy_static::lazy_static! {
+            static ref CACHED_VERSIONS: Arc<RwLock<Option<Vec<PyV>>>> = Arc::new(RwLock::new(None));
+            static ref LAST_CHECKED: Arc<RwLock<DateTime<Utc>>> = Arc::new(RwLock::new(Utc::now()));
+        }
+        match (
+            Utc::now().signed_duration_since(*LAST_CHECKED.read().await) > Duration::minutes(30),
+            CACHED_VERSIONS.read().await.clone(),
+        ) {
+            (false, Some(vs)) => return Ok(vs),
+            _ => {}
+        };
+
+        let output = {
+            #[cfg(windows)]
+            let uv_cmd = "uv";
+
+            #[cfg(unix)]
+            let uv_cmd = UV_PATH.as_str();
+
+            Command::new(uv_cmd)
+                .env_clear()
+                .envs(WIN_ENVS.to_vec())
+                .args([
+                    "python",
+                    "list",
+                    "--all-versions",
+                    "--output-format",
+                    "json",
+                ])
+                .stderr(Stdio::piped())
+                .output()
+                .await?
+        };
+
+        // We want to skip all versions smaller then 3.10
+        // Windmill is incompatible with 3.9 and older
+        let filter = pep440_rs::VersionSpecifier::from_version(
+            pep440_rs::Operator::GreaterThanEqual,
+            PyVAlias::Py310.into(),
+        )?;
+
+        if output.status.success() {
+            let res = String::from_utf8(output.stdout)?;
+            tracing::error!("{}", &res);
+            let list = serde_json::from_str::<Vec<serde_json::Map<String, Value>>>(&res)?
+                .into_iter()
+                .filter_map(|e| {
+                    if e.get("implementation").and_then(Value::as_str) == Some("pypy") {
+                        None
+                    } else {
+                        Some(
+                            e.get("version")
+                                .and_then(Value::as_str)
+                                .and_then(|s| pep440_rs::Version::from_str(s).ok())
+                                .map(PyV::from)
+                                .ok_or(Error::internal_err("version is None")),
+                        )
+                    }
+                })
+                .collect::<Result<Vec<PyV>, Error>>()?
+                .into_iter()
+                .unique()
+                .sorted()
+                .filter(|pyv| filter.contains(&*pyv))
+                .rev()
+                .collect_vec();
+
+            *LAST_CHECKED.write().await = Utc::now();
+            CACHED_VERSIONS.write().await.replace(list.clone());
+
+            Ok(list)
+        } else {
+            // If the command failed, print the error
+            let stderr = String::from_utf8(output.stderr)?;
+            bail!(
+                "Cannot list python versions, is uv (0.5.19 and newer) installed? Err:\n{}",
+                stderr
+            );
+        }
+    }
+
+    /// Parse lockfile for assigned python version.
+    /// If not found returns 3.11
+    pub fn parse_from_requirements<S: AsRef<str>>(requirements_lines: &[S]) -> Self {
+        Self::try_parse_from_requirements(requirements_lines).unwrap_or(
+            // If there is no assigned version in lockfile we automatically fallback to 3.11
+            // In this case we have dependencies or other metadata, but no associated python version
+            // This is the case for old deployed scripts
+            PyVAlias::Py311.into(),
+        )
+    }
+
+    /// Parse lockfile for assigned python version.
+    /// If not found returns None
+    pub fn try_parse_from_requirements<S: AsRef<str>>(requirements_lines: &[S]) -> Option<Self> {
+        let parse_version = |s: &str| -> Option<PyV> {
+            // Possible inputs:
+            // V2:
+            // # py: 3.11.0 or #py:3.11.0 or #py: 3.11.0
+            //
+            // V1:
+            // # py311 or #py311
+            let version_unparsed = s
+                .to_owned()
+                // Remove whitespaces. That leaves us with:
+                // V2: #py:3.11.0
+                // V1: #py311
+                //
+                // Remove #
+                // V2: py:3.11.0
+                // V1: py311
+                //
+                // Remove :
+                // V2: py3.11.0
+                // V1: py311
+                .replace([' ', '#', ':'], "")
+                // Remove "py"
+                // V2: 3.11.0
+                // V1: 311
+                .replace("py", "");
+
+            // We will support reading V1 syntax, but it will be overwritten next deploy
+            PyVAlias::try_from_v1(&version_unparsed)
+                .map(PyVAlias::into)
+                .or(pep440_rs::Version::from_str(&version_unparsed)
+                    .ok()
+                    .map(pep440_rs::Version::into))
+        };
+        let index = if requirements_lines.get(0).map_or(false, |line| {
+            line.as_ref()
+                .starts_with(LOCKFILE_GENERATED_FROM_REQUIREMENTS_TXT)
+        }) {
+            1
+        } else {
+            0
+        };
+        requirements_lines
+            .get(index)
+            .map(S::as_ref)
+            .and_then(parse_version)
+    }
+
+    pub async fn get_python(
+        &self,
+        worker_name: &str,
+        job_id: &Uuid,
+        w_id: &str,
+        mem_peak: &mut i32,
+        conn: &Connection,
+        occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
+    ) -> windmill_common::error::Result<String> {
+        let python_path = if let Some(python_path) = PYTHON_PATH.clone() {
+            python_path
+        } else if let Some(python_path) = self
+            .try_get_python(
+                &job_id,
+                mem_peak,
+                conn,
+                worker_name,
+                w_id,
+                occupancy_metrics,
+            )
+            .await?
+        {
+            python_path
+        } else {
+            return Err(Error::ExecutionErr(format!(
+                "uv could not manage python path. Please manage it manually by setting PYTHON_PATH environment variable to your python binary path"
+            )));
+        };
+        Ok(python_path)
+    }
+
+    pub async fn try_get_python(
+        &self,
+        job_id: &Uuid,
+        mem_peak: &mut i32,
+        // canceled_by: &mut Option<CanceledBy>,
+        conn: &Connection,
+        worker_name: &str,
+        w_id: &str,
+        occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
+    ) -> error::Result<Option<String>> {
+        // lazy_static::lazy_static! {
+        //     static ref PYTHON_PATHS: Arc<RwLock<HashMap<PyVersion, String>>> = Arc::new(RwLock::new(HashMap::new()));
+        // }
+
+        let res = self
+            .get_python_inner(job_id, mem_peak, conn, worker_name, w_id, occupancy_metrics)
+            .await;
+
+        if let Err(ref e) = res {
+            tracing::error!(
+                "worker_name: {worker_name}, w_id: {w_id}, job_id: {job_id}\n
+                Error while getting python from uv, falling back to system python: {e:?}"
+            );
+            append_logs(
+                job_id,
+                w_id,
+                format!(
+                    "\nError while getting python from uv, falling back to system python: {e:?}"
+                ),
+                conn,
+            )
+            .await;
+        }
+        res
+    }
+    async fn get_python_inner(
+        &self,
+        job_id: &Uuid,
+        mem_peak: &mut i32,
+        // canceled_by: &mut Option<CanceledBy>,
+        conn: &Connection,
+        worker_name: &str,
+        w_id: &str,
+        occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
+    ) -> error::Result<Option<String>> {
+        let py_path = self.find_python().await;
+
+        // Runtime is not installed
+        if py_path.is_err() {
+            // Install it
+            if let Err(err) = self
+                .install_python(job_id, mem_peak, conn, worker_name, w_id, occupancy_metrics)
+                .await
+            {
+                tracing::error!("Cannot install python: {err}");
+                return Err(err);
+            } else {
+                // Try to find one more time
+                let py_path = self.find_python().await;
+
+                if let Err(err) = py_path {
+                    tracing::error!("Cannot find python version {err}");
+                    return Err(err);
+                }
+
+                // TODO: Cache the result
+                py_path
+            }
+        } else {
+            py_path
+        }
+    }
+    async fn install_python(
+        &self,
+        job_id: &Uuid,
+        mem_peak: &mut i32,
+        // canceled_by: &mut Option<CanceledBy>,
+        conn: &Connection,
+        worker_name: &str,
+        w_id: &str,
+        occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
+    ) -> error::Result<()> {
+        let v = self.to_string();
+        append_logs(job_id, w_id, format!("\nINSTALLING PYTHON ({})", v), conn).await;
+        // Create dirs for newly installed python
+        // If we dont do this, NSJAIL will not be able to mount cache
+        // For the default version directory created during startup (main.rs)
+        DirBuilder::new()
+            .recursive(true)
+            .create(self.to_cache_dir())
+            .await
+            .expect("could not create initial worker dir");
+
+        let logs = String::new();
+
+        #[cfg(windows)]
+        let uv_cmd = "uv";
+
+        #[cfg(unix)]
+        let uv_cmd = UV_PATH.as_str();
+
+        let mut child_cmd = Command::new(uv_cmd);
+        child_cmd
+            .env_clear()
+            .env("HOME", HOME_ENV.to_string())
+            .env("PATH", PATH_ENV.to_string())
+            .envs(PROXY_ENVS.clone())
+            .args(["python", "install", &v, "--python-preference=only-managed"])
+            // TODO: Do we need these?
+            .envs([("UV_PYTHON_INSTALL_DIR", PY_INSTALL_DIR)])
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped());
+
+        #[cfg(windows)]
+        {
+            child_cmd
+                .env("SystemRoot", crate::SYSTEM_ROOT.as_str())
+                .env("USERPROFILE", crate::USERPROFILE_ENV.as_str())
+                .env(
+                    "TMP",
+                    std::env::var("TMP").unwrap_or_else(|_| String::from("/tmp")),
+                )
+                .env(
+                    "LOCALAPPDATA",
+                    std::env::var("LOCALAPPDATA")
+                        .unwrap_or_else(|_| format!("{}\\AppData\\Local", HOME_ENV.as_str())),
+                );
+        }
+
+        let child_process = start_child_process(child_cmd, "uv").await?;
+
+        append_logs(&job_id, &w_id, logs, conn).await;
+        handle_child(
+            job_id,
+            conn,
+            mem_peak,
+            &mut None,
+            child_process,
+            false,
+            worker_name,
+            &w_id,
+            "uv",
+            None,
+            false,
+            occupancy_metrics,
+            None,
+        )
+        .await
+    }
+    async fn find_python(&self) -> error::Result<Option<String>> {
+        #[cfg(windows)]
+        let uv_cmd = "uv";
+
+        #[cfg(unix)]
+        let uv_cmd = UV_PATH.as_str();
+
+        let mut child_cmd = Command::new(uv_cmd);
+
+        child_cmd.env_clear();
+
+        #[cfg(windows)]
+        {
+            child_cmd
+                .env("SystemRoot", crate::SYSTEM_ROOT.as_str())
+                .env("USERPROFILE", crate::USERPROFILE_ENV.as_str())
+                .env(
+                    "TMP",
+                    std::env::var("TMP").unwrap_or_else(|_| String::from("/tmp")),
+                )
+                .env(
+                    "LOCALAPPDATA",
+                    std::env::var("LOCALAPPDATA")
+                        .unwrap_or_else(|_| format!("{}\\AppData\\Local", HOME_ENV.as_str())),
+                );
+        }
+
+        let output = child_cmd
+            // .current_dir(job_dir)
+            .env("HOME", HOME_ENV.to_string())
+            .env("PATH", PATH_ENV.to_string())
+            .args([
+                "python",
+                "find",
+                &self.to_string(),
+                "--system",
+                "--python-preference=only-managed",
+            ])
+            .envs([
+                ("UV_PYTHON_INSTALL_DIR", PY_INSTALL_DIR),
+                ("UV_PYTHON_PREFERENCE", "only-managed"),
+            ])
+            // .stdout(Stdio::piped())
+            .stderr(Stdio::piped())
+            .output()
+            .await?;
+
+        // Check if the command was successful
+        if output.status.success() {
+            // Convert the output to a String
+            let stdout =
+                String::from_utf8(output.stdout).expect("Failed to convert output to String");
+            return Ok(Some(stdout.replace('\n', "")));
+        } else {
+            // If the command failed, print the error
+            let stderr =
+                String::from_utf8(output.stderr).expect("Failed to convert error output to String");
+            return Err(error::Error::FindPythonError(stderr));
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Unsafe helper for testing
+    fn pyv(value: &str) -> PyV {
+        pep440_rs::Version::from_str(value).unwrap().into()
+    }
+
+    async fn assert_resolution(
+        instance_version: &str,
+        select_highest: bool,
+        specifiers: Vec<&str>,
+        available: Vec<PyV>,
+        expected: PyV,
+    ) {
+        let resolved = PyV::resolve(
+            specifiers
+                .into_iter()
+                .map(|s| pep440_rs::VersionSpecifier::from_str(s).unwrap())
+                .collect_vec(),
+            &Uuid::nil(),
+            "",
+            select_highest,
+            None,
+            Some(available),
+            Some(pyv(instance_version)),
+        )
+        .await
+        .unwrap();
+        assert_eq!(expected, resolved);
+    }
+
+    #[tokio::test]
+    async fn test_python_resolution_1() {
+        assert_resolution(
+            "1.0",
+            false,
+            vec![],
+            vec![
+                pyv("1.2.0"),
+                pyv("1.1.0"),
+                pyv("1.0.0"),
+                pyv("0.9.0"), //
+            ],
+            pyv("1.0.0"), //
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_2() {
+        assert_resolution(
+            "1.0.0",
+            false,
+            vec!["!=1.*"],
+            vec![
+                pyv("1.2"),
+                pyv("1.1"),
+                pyv("1.0.2"),
+                pyv("1.0.1"),
+                pyv("1.0.0"),
+                pyv("0.9.4"),
+                pyv("0.9.3"),
+                pyv("0.9.2"),
+            ],
+            pyv("0.9.4"), //
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_3() {
+        assert_resolution(
+            "0.9",
+            false,
+            vec!["!=0.9.*"],
+            vec![
+                pyv("1.2"),
+                pyv("1.1"),
+                pyv("1.0.2"),
+                pyv("1.0.1"),
+                pyv("1.0.0"),
+                pyv("0.9.4"),
+                pyv("0.9.3"),
+                pyv("0.9.2"),
+                pyv("0.8.2"),
+                pyv("0.8.1"),
+                pyv("0.8.0"),
+            ],
+            pyv("1.0.2"), //
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_4() {
+        assert_resolution(
+            "0.9",
+            false,
+            vec!["<=0.8.1"],
+            vec![pyv("1.0.0"), pyv("0.9.0"), pyv("0.8.1"), pyv("0.8.0")],
+            pyv("0.8.1"), //
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_5() {
+        assert_resolution(
+            "0.0.1",
+            false,
+            vec!["!=0.1.0"],
+            vec![pyv("2.1.0"), pyv("1.1.0"), pyv("0.1.0")],
+            pyv("1.1.0"),
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_6() {
+        assert_resolution(
+            "1.1.1",
+            false,
+            vec![],
+            vec![
+                pyv("3.0.1"),
+                pyv("3.0.0"),
+                pyv("2.2.2"),
+                pyv("2.2.1"),
+                pyv("2.2.0"),
+            ],
+            pyv("2.2.2"),
+        )
+        .await;
+    }
+    #[tokio::test]
+    async fn test_python_resolution_7() {
+        assert_resolution(
+            "2.2.1",
+            true,
+            vec![],
+            vec![
+                pyv("3.0.1"),
+                pyv("3.0.0"),
+                pyv("2.2.2"),
+                pyv("2.2.1"),
+                pyv("2.2.0"),
+            ],
+            pyv("3.0.1"),
+        )
+        .await;
+    }
+}

backend/windmill-worker/src/worker.rs

@@ -134,7 +134,10 @@ use crate::java_executor::{handle_java_job, JobHandlerInput as JobHandlerInputJa
 use crate::php_executor::handle_php_job;
 
 #[cfg(feature = "python")]
-use crate::python_executor::{handle_python_job, PyVersion};
+use crate::{
+    python_executor::handle_python_job,
+    python_versions::{PyV, PyVAlias},
+};
 
 #[cfg(feature = "python")]
 use crate::ansible_executor::handle_ansible_job;
@@ -363,10 +366,26 @@ lazy_static::lazy_static! {
 
 }
 
+type Envs = Vec<(String, String)>;
+
 #[cfg(windows)]
 lazy_static::lazy_static! {
     pub static ref SYSTEM_ROOT: String = std::env::var("SystemRoot").unwrap_or_else(|_| "C:\\Windows".to_string());
     pub static ref USERPROFILE_ENV: String = std::env::var("USERPROFILE").unwrap_or_else(|_| "/tmp".to_string());
+    static ref TMP: String = std::env::var("TMP").unwrap_or_else(|_| "/tmp".to_string());
+    static ref LOCALAPPDATA: String = std::env::var("LOCALAPPDATA").unwrap_or_else(|_| format!("{}\\AppData\\Local", HOME_ENV.as_str()));
+    pub static ref WIN_ENVS: Envs = vec![
+        ("SystemRoot".into(), SYSTEM_ROOT.clone()),
+        ("USERPROFILE".into(), USERPROFILE_ENV.clone()),
+        ("TMP".into(), TMP.clone()),
+        ("LOCALAPPDATA".into(), LOCALAPPDATA.clone())
+    ];
+
+}
+
+#[cfg(not(windows))]
+lazy_static::lazy_static! {
+    pub static ref WIN_ENVS: Envs = vec![];
 }
 
 //only matter if CLOUD_HOSTED
@@ -828,9 +847,9 @@ pub async fn run_worker(
             worker_dir.clone(),
         );
         tokio::spawn(async move {
-            if let Err(e) = PyVersion::from_instance_version(&Uuid::nil(), "", &conn)
+            if let Err(e) = PyV::gravitational_version(&Uuid::nil(), "", Some(conn.clone()))
                 .await
-                .get_python(&Uuid::nil(), &mut 0, &conn, &worker_name, "", &mut None)
+                .try_get_python(&Uuid::nil(), &mut 0, &conn, &worker_name, "", &mut None)
                 .await
             {
                 tracing::error!(
@@ -840,8 +859,8 @@ pub async fn run_worker(
                     "Cannot preinstall or find Instance Python version to worker: {e}"//
                 );
             }
-            if let Err(e) = PyVersion::Py311
-                .get_python(&Uuid::nil(), &mut 0, &conn, &worker_name, "", &mut None)
+            if let Err(e) = PyV::from(PyVAlias::Py311)
+                .try_get_python(&Uuid::nil(), &mut 0, &conn, &worker_name, "", &mut None)
                 .await
             {
                 tracing::error!(

backend/windmill-worker/src/worker_lockfiles.rs

@@ -47,7 +47,7 @@ use crate::java_executor::resolve;
 use crate::php_executor::{composer_install, parse_php_imports};
 #[cfg(feature = "python")]
 use crate::python_executor::{
-    create_dependencies_dir, handle_python_reqs, uv_pip_compile, PyVersion,
+    create_dependencies_dir, handle_python_reqs, split_requirements, uv_pip_compile,
 };
 #[cfg(feature = "rust")]
 use crate::rust_executor::generate_cargo_lockfile;
@@ -1897,26 +1897,13 @@ async fn python_dep(
     w_id: &str,
     worker_dir: &str,
     occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
-    annotated_pyv_numeric: Option<u32>,
+    py_version: crate::PyV,
     annotations: PythonAnnotations,
 ) -> std::result::Result<String, Error> {
+    use crate::python_executor::split_requirements;
+
     create_dependencies_dir(job_dir).await;
 
-    /*
-        Unlike `handle_python_deps` which we use for running scripts (deployed and drafts)
-        This one used specifically for deploying scripts
-        So we can get final_version right away and include in lockfile
-        And the precendence is following:
-
-            1. Annotation version
-            2. Instance version
-            3. Latest Stable
-    */
-
-    let final_version = annotated_pyv_numeric
-        .and_then(|pyv| PyVersion::from_numeric(pyv))
-        .unwrap_or(PyVersion::from_instance_version(job_id, w_id, &db.into()).await);
-
     let req: std::result::Result<String, Error> = uv_pip_compile(
         job_id,
         &reqs,
@@ -1927,14 +1914,15 @@ async fn python_dep(
         worker_name,
         w_id,
         occupancy_metrics,
-        final_version,
+        py_version,
         annotations.no_cache,
     )
     .await;
     // install the dependencies to pre-fill the cache
     if let Ok(req) = req.as_ref() {
         let r = handle_python_reqs(
-            req.split("\n").filter(|x| !x.starts_with("--")).collect(),
+            split_requirements(req),
+            // req.split("\n").filter(|x| !x.starts_with("--")).collect(),
             job_id,
             w_id,
             mem_peak,
@@ -1944,7 +1932,8 @@ async fn python_dep(
             job_dir,
             worker_dir,
             occupancy_metrics,
-            final_version,
+            // final_version,
+            crate::PyVAlias::default().into(),
         )
         .await;
 
@@ -1994,7 +1983,7 @@ async fn ansible_dep(
         w_id,
         worker_dir,
         &mut Some(occupancy_metrics),
-        None,
+        crate::PyV::gravitational_version(job_id, w_id, Some(db.clone().into())).await,
         PythonAnnotations::default(),
     )
     .await?;
@@ -2104,31 +2093,44 @@ async fn capture_dependency_job(
             ));
             #[cfg(feature = "python")]
             {
-                let anns = PythonAnnotations::parse(job_raw_code);
-                let mut annotated_pyv_numeric = None;
-
-                let reqs = if raw_deps {
+                // Manually assigned version from requirements.txt
+                // let assigned_py_version;
+                let (reqs, py_version) = if raw_deps {
                     // `wmill script generate-metadata`
                     // should also respect annotated pyversion
                     // can be annotated in script itself
                     // or in requirements.txt if present
-                    annotated_pyv_numeric =
-                        PyVersion::from_py_annotations(anns).map(|v| v.to_numeric());
-                    job_raw_code.to_string()
-                } else {
-                    let mut already_visited = vec![];
 
-                    windmill_parser_py_imports::parse_python_imports(
-                        job_raw_code,
-                        &w_id,
-                        script_path,
-                        &db,
-                        &mut already_visited,
-                        &mut annotated_pyv_numeric,
+                    (
+                        job_raw_code.to_owned(),
+                        crate::PyV::parse_from_requirements(&split_requirements(job_raw_code)),
+                    )
+                } else {
+                    let mut version_specifiers = vec![];
+                    let PythonAnnotations { py_select_latest, .. } =
+                        PythonAnnotations::parse(job_raw_code);
+                    (
+                        windmill_parser_py_imports::parse_python_imports(
+                            job_raw_code,
+                            &w_id,
+                            script_path,
+                            &db,
+                            &mut version_specifiers,
+                        )
+                        .await?
+                        .0
+                        .join("\n"),
+                        crate::PyV::resolve(
+                            version_specifiers,
+                            job_id,
+                            w_id,
+                            py_select_latest,
+                            Some(db.clone().into()),
+                            None,
+                            None,
+                        )
+                        .await?,
                     )
-                    .await?
-                    .0
-                    .join("\n")
                 };
 
                 python_dep(
@@ -2142,8 +2144,8 @@ async fn capture_dependency_job(
                     w_id,
                     worker_dir,
                     &mut Some(occupancy_metrics),
-                    annotated_pyv_numeric,
-                    anns,
+                    py_version,
+                    PythonAnnotations::parse(job_raw_code),
                 )
                 .await
                 .map(|res| {

benchmarks/lib.ts

@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.491.5";
+export const VERSION = "v1.492.1";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({

cli/main.ts

@@ -63,7 +63,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.491.5";
+export const VERSION = "1.492.1";
 
 const command = new Command()
   .name("wmill")

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.491.5",
+	"version": "1.492.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.491.5",
+			"version": "1.492.1",
 			"hasInstallScript": true,
 			"license": "AGPL-3.0",
 			"dependencies": {

frontend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.491.5",
+	"version": "1.492.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",

frontend/src/lib/components/InstanceSetting.svelte

@@ -17,11 +17,18 @@
 	import ObjectStoreConfigSettings from './ObjectStoreConfigSettings.svelte'
 	import { sendUserToast } from '$lib/toast'
 	import ConfirmButton from './ConfirmButton.svelte'
-	import { IndexSearchService, SettingService, TeamsService } from '$lib/gen'
+	import {
+		ConfigService,
+		IndexSearchService,
+		SettingService,
+		TeamsService,
+		type ListAvailablePythonVersionsResponse
+	} from '$lib/gen'
 	import { Button, SecondsInput, Skeleton } from './common'
 	import Password from './Password.svelte'
 	import { classNames } from '$lib/utils'
 	import Popover from './Popover.svelte'
+	import PopoverMelt from './meltComponents/Popover.svelte'
 	import Toggle from './Toggle.svelte'
 	import type { Writable } from 'svelte/store'
 	import { createEventDispatcher } from 'svelte'
@@ -30,6 +37,7 @@
 	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
 	import SimpleEditor from './SimpleEditor.svelte'
+	import LoadingIcon from './apps/svelte-select/lib/LoadingIcon.svelte'
 	import TeamSelector from './TeamSelector.svelte'
 	import ChannelSelector from './ChannelSelector.svelte'
 
@@ -39,7 +47,10 @@
 	export let loading = true
 	const dispatch = createEventDispatcher()
 
-	if (setting.fieldType == 'select' && $values[setting.key] == undefined) {
+	if (
+		(setting.fieldType == 'select' || setting.fieldType == 'select_python') &&
+		$values[setting.key] == undefined
+	) {
 		$values[setting.key] = 'default'
 	}
 
@@ -124,6 +135,24 @@
 		}
 	}
 
+	let pythonAvailableVersions: ListAvailablePythonVersionsResponse = []
+
+	let isPyFetching = false
+	async function fetch_available_python_versions() {
+		if (isPyFetching) return
+		isPyFetching = true
+		try {
+			pythonAvailableVersions = await ConfigService.listAvailablePythonVersions()
+		} catch (error) {
+			console.error('Error fetching python versions:', error)
+		} finally {
+			isPyFetching = false
+		}
+	}
+	if (setting.fieldType == 'select_python') {
+		fetch_available_python_versions()
+	}
+
 	async function fetchTeams() {
 		if (isFetching) return
 		isFetching = true
@@ -193,6 +222,66 @@
 				{/each}
 			</ToggleButtonGroup>
 		</div>
+	{:else if setting.fieldType == 'select_python'}
+		<div>
+			<!-- svelte-ignore a11y-label-has-associated-control -->
+			<label class="block pb-2">
+				<span class="text-primary font-semibold text-sm">{setting.label}</span>
+				{#if setting.description}
+					<span class="text-secondary text-xs">
+						{@html setting.description}
+					</span>
+				{/if}
+			</label>
+
+			<ToggleButtonGroup bind:selected={$values[setting.key]} let:item={toggleButtonn}>
+				{#each setting.select_items ?? [] as item}
+					<ToggleButton
+						value={item.value ?? item.label}
+						label={item.label}
+						tooltip={item.tooltip}
+						item={toggleButtonn}
+					/>
+				{/each}
+				<PopoverMelt closeButton={!isPyFetching}>
+					<svelte:fragment slot="trigger">
+						{#if setting.select_items?.some((e) => e.label == $values[setting.key] || e.value == $values[setting.key])}
+							<Button
+								variant="border"
+								color="dark"
+								btnClasses="px-1.5 py-1.5 text-2xs bg-surface-secondary border-0"
+								nonCaptureEvent={true}>Select Custom</Button
+							>
+						{:else}
+							<Button
+								variant="border"
+								color="dark"
+								btnClasses="px-1.5 py-1.5 text-2xs border-0 shadow-md"
+								nonCaptureEvent={true}>Custom | {$values[setting.key]}</Button
+							>
+						{/if}
+					</svelte:fragment>
+					<svelte:fragment slot="content">
+						{#if isPyFetching}
+							<div class="p-4">
+								<LoadingIcon />
+							</div>
+						{:else}
+							<ToggleButtonGroup
+								bind:selected={$values[setting.key]}
+								let:item={toggleButtonn}
+								class="mr-10 h-full"
+								tabListClass="flex-wrap p-2"
+							>
+								{#each pythonAvailableVersions as item}
+									<ToggleButton value={item} label={item} tooltip={item} item={toggleButtonn} />
+								{/each}
+							</ToggleButtonGroup>
+						{/if}
+					</svelte:fragment>
+				</PopoverMelt>
+			</ToggleButtonGroup>
+		</div>
 	{:else}
 		<!-- svelte-ignore a11y-label-has-associated-control -->
 		<label class="block pb-2">

frontend/src/lib/components/ServiceLogsInner.svelte

@@ -15,6 +15,9 @@
 	import AnsiUp from 'ansi_up'
 	import { scroll_into_view_if_needed_polyfill } from './multiselect/utils'
 	import SplitPanesOrColumnOnMobile from './splitPanes/SplitPanesOrColumnOnMobile.svelte'
+	import Select from './apps/svelte-select/lib/Select.svelte'
+	import { SELECT_INPUT_DEFAULT_STYLE } from '$lib/defaults'
+	import DarkModeObserver from './DarkModeObserver.svelte'
 
 	export let searchTerm: string
 	export let queryParseErrors: string[] = []
@@ -319,10 +322,13 @@
 				const buckets = res['buckets']
 				sumOtherDocCount = res['sum_other_doc_count']
 				countsPerHost = new Map(buckets.map(({ key, doc_count }) => [key, doc_count]))
-				countsPerHost = buckets.reduce((acc: any, { key, doc_count }) => {
-					acc[key] = { doc_count }
-					return acc
-				}, {} as Record<string, number>)
+				countsPerHost = buckets.reduce(
+					(acc: any, { key, doc_count }) => {
+						acc[key] = { doc_count }
+						return acc
+					},
+					{} as Record<string, number>
+				)
 				queryParseErrors = countLogsResponse.query_parse_errors ?? []
 				loadingLogCounts = false
 			}
@@ -376,7 +382,7 @@
 		let ret = {}
 
 		for (const hk of Object.keys(countsPerHost)) {
-			let u = hk.split(",")
+			let u = hk.split(',')
 			let [mode, wg, hn] = [u[0], u[1], u[2]]
 
 			if (!ret[mode]) {
@@ -392,8 +398,23 @@
 
 		return ret
 	}
+
+	function getSelectItems(allLogs: ByMode, countsPerHost: any): { label: string; value: any }[] {
+		return Object.entries(allLogsOrQueryResults(allLogs, countsPerHost)).flatMap(([mode, o1]) =>
+			Object.entries(o1).flatMap(([wg, o2]) =>
+				Object.keys(o2).map((hn) => ({
+					label: hn,
+					value: [mode, wg, hn]
+				}))
+			)
+		)
+	}
+
+	let darkMode = false
 </script>
 
+<DarkModeObserver bind:darkMode />
+
 <Drawer bind:this={logDrawer} bind:open={logDrawerOpen} size="1400px">
 	<DrawerContent title="See context" on:close={logDrawer.closeDrawer}>
 		<svelte:fragment slot="actions">
@@ -436,7 +457,7 @@
 									month: '2-digit',
 									hour: '2-digit',
 									minute: '2-digit'
-							  })
+								})
 							: 'min datetime'}
 						disabled
 					/>
@@ -476,7 +497,7 @@
 									month: '2-digit',
 									hour: '2-digit',
 									minute: '2-digit'
-							  })
+								})
 							: 'max datetime'}
 						disabled
 					/>
@@ -548,6 +569,24 @@
 						>
 					</div>
 				{/if}
+				<div class="mr-0.5">
+					<Select
+						justValue={selected}
+						items={getSelectItems(allLogs, countsPerHost)}
+						on:change={({ detail }) => {
+							// console.log(detail)
+							selected = detail.value
+						}}
+						on:clear={() => {
+							selected = undefined
+						}}
+						placeholder="Select a service"
+						inputStyles={SELECT_INPUT_DEFAULT_STYLE.inputStyles}
+						containerStyles={darkMode
+							? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
+							: SELECT_INPUT_DEFAULT_STYLE.containerStyles}
+					/>
+				</div>
 				{#each Object.entries(allLogsOrQueryResults(allLogs, countsPerHost)) as [mode, o1]}
 					<div class="w-full pb-8">
 						<h2 class="pb-2 text-2xl">{mode}s</h2>
@@ -587,7 +626,8 @@
 											<div
 												class="text-sm pt-2 pl-0.5 whitespace-nowrap"
 												title={hn}
-												style="width: 90px;">{truncateRev(hn, countsPerHost || loadingLogs ? 40 : 8)}</div
+												style="width: 90px;"
+												>{truncateRev(hn, countsPerHost || loadingLogs ? 40 : 8)}</div
 											>
 											{#if loadingLogCounts}
 												<Loader2 size={15} class="animate-spin" />
@@ -752,7 +792,7 @@
 													month: '2-digit',
 													hour: '2-digit',
 													minute: '2-digit'
-											  })
+												})
 											: ''}
 										disabled
 									/><CalendarPicker bind:date={upTo} label="Logs up to" /></div

frontend/src/lib/components/apps/svelte-select/lib/Select.svelte

@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
 	// @ts-nocheck
 	import { beforeUpdate, createEventDispatcher, onDestroy, onMount } from 'svelte'
 	import { offset, flip, shift } from '@floating-ui/dom'
@@ -22,13 +22,13 @@
 
 	export let portal = true
 
-	export let justValue = null // read-only
+	export let justValue: any = null // read-only
 
 	export let inAppEditor = false
 
 	let PortalWrapper = inAppEditor ? ConditionalPortal : ConditionalPortalGlobal
 
-	export let filter = _filter
+	export let filter: (args: any) => any[] = _filter
 	export let getItems = _getItems
 
 	export let id = null
@@ -38,18 +38,19 @@
 
 	export let disabled = false
 	export let focused = false
-	export let value = undefined
+	export let value: any = undefined
 	export let filterText = ''
 	export let placeholder = 'Please select'
-	export let items = undefined
+	export let items: { label: string | undefined; value: any }[] | any[] | string[] | undefined =
+		undefined
 	export let label = 'label'
 	export let itemFilter = (label, filterText, option) =>
 		`${label}`.toLowerCase().includes(filterText.toLowerCase())
-	export let groupBy = undefined
+	export let groupBy: ((item: any) => string) | undefined = undefined
 	export let groupFilter = (groups) => groups
 	export let groupHeaderSelectable = false
 	export let itemId = 'value'
-	export let loadOptions = undefined
+	export let loadOptions: ((string) => Promise<any>) | undefined = undefined
 	export let containerStyles = ''
 	export let hasError = false
 	export let filterSelectedItems = true

frontend/src/lib/components/instanceSettings.ts

@@ -19,6 +19,7 @@ export interface Setting {
 		| 'boolean'
 		| 'password'
 		| 'select'
+		| 'select_python'
 		| 'textarea'
 		| 'codearea'
 		| 'seconds'
@@ -231,7 +232,7 @@ export const settings: Record<string, Setting[]> = {
 			label: 'Instance Python Version',
 			description: 'Default python version for newly deployed scripts',
 			key: 'instance_python_version',
-			fieldType: 'select',
+			fieldType: 'select_python',
 			// To change latest stable version:
 			// 1. Change placeholder in instanceSettings.ts
 			// 2. Change LATEST_STABLE_PY in dockerfile

frontend/src/lib/components/search/GlobalSearchModal.svelte

@@ -8,7 +8,10 @@
 		type Flow,
 		type ListableApp,
 		type ListableRawApp,
-		type Script
+		type Script,
+
+		type SearchJobsIndexResponse
+
 	} from '$lib/gen'
 	import { clickOutside, isMac } from '$lib/utils'
 	import {
@@ -90,56 +93,56 @@
 		{
 			search_id: 'nav:http_routes',
 			label: 'Go to HTTP routes',
-			action: () => gotoPage('/routes'),
+			action: (newtab: boolean = false) => gotoPage('/routes', newtab),
 			icon: Route,
 			disabled: $userStore?.operator
 		},
 		{
 			search_id: 'nav:web_sockets',
 			label: 'Go to WebSockets',
-			action: () => gotoPage('/websocket_triggers'),
+			action: (newtab: boolean = false) => gotoPage('/websocket_triggers', newtab),
 			icon: Unplug,
 			disabled: $userStore?.operator
 		},
 		{
 			search_id: 'nav:postgres_triggers',
 			label: 'Go to Postgres triggers',
-			action: () => gotoPage('/postgres_triggers'),
+			action: (newtab: boolean = false) => gotoPage('/postgres_triggers', newtab),
 			icon: Database,
 			disabled: $userStore?.operator
 		},
 		{
 			search_id: 'nav:kafka_triggers',
 			label: 'Go to Kafka triggers' + (!$enterpriseLicense ? '' : ' (EE)'),
-			action: () => gotoPage('/kafka_triggers'),
+			action: (newtab: boolean = false) => gotoPage('/kafka_triggers', newtab),
 			icon: KafkaIcon,
 			disabled: $userStore?.operator
 		},
 		{
 			search_id: 'nav:nats_triggers',
 			label: 'Go to NATS triggers' + (!$enterpriseLicense ? '' : ' (EE)'),
-			action: () => gotoPage('/nats_triggers'),
+			action: (newtab: boolean = false) => gotoPage('/nats_triggers', newtab),
 			icon: NatsIcon,
 			disabled: $userStore?.operator
 		},
 		{
 			search_id: 'nav:sqs_triggers',
 			label: 'Go to SQS triggers' + (!$enterpriseLicense ? '' : ' (EE)'),
-			action: () => gotoPage('/sqs_triggers'),
+			action: (newtab: boolean = false) => gotoPage('/sqs_triggers', newtab),
 			icon: AwsIcon,
 			disabled: $userStore?.operator
 		},
 		{
 			search_id: 'nav:gcp_pub_sub',
 			label: 'Go to GCP Pub/Sub' + (!$enterpriseLicense ? '' : ' (EE)'),
-			action: () => gotoPage('/gcp_triggers'),
+			action: (newtab: boolean = false) => gotoPage('/gcp_triggers', newtab),
 			icon: GoogleCloudIcon,
 			disabled: $userStore?.operator
 		},
 		{
 			search_id: 'nav:mqtt_triggers',
 			label: 'Go to MQTT triggers',
-			action: () => gotoPage('/mqtt_triggers'),
+			action: (newtab: boolean = false) => gotoPage('/mqtt_triggers', newtab),
 			icon: MqttIcon,
 			disabled: $userStore?.operator
 		}
@@ -149,35 +152,35 @@
 		{
 			search_id: 'nav:home',
 			label: 'Go to Home',
-			action: () => gotoPage('/'),
+			action: (newtab: boolean = false) => gotoPage('/', newtab),
 			icon: HomeIcon,
 			disabled: false
 		},
 		{
 			search_id: 'nav:runs',
 			label: 'Go to Runs',
-			action: () => gotoPage('/runs'),
+			action: (newtab: boolean = false) => gotoPage('/runs', newtab),
 			icon: PlayIcon,
 			disabled: false
 		},
 		{
 			search_id: 'nav:variables',
 			label: 'Go to Variables',
-			action: () => gotoPage('/variables'),
+			action: (newtab: boolean = false) => gotoPage('/variables', newtab),
 			icon: DollarSignIcon,
 			disabled: false
 		},
 		{
 			search_id: 'nav:resources',
 			label: 'Go to Resources',
-			action: () => gotoPage('/resources'),
+			action: (newtab: boolean = false) => gotoPage('/resources', newtab),
 			icon: BoxesIcon,
 			disabled: false
 		},
 		{
 			search_id: 'nav:schedules_triggers',
 			label: 'Go to Schedules',
-			action: () => gotoPage('/schedules'),
+			action: (newtab: boolean = false) => gotoPage('/schedules', newtab),
 			icon: CalendarIcon,
 			disabled: false
 		},
@@ -185,7 +188,7 @@
 		{
 			search_id: 'nav:service_logs',
 			label: 'Explore windmill service logs',
-			action: () => gotoPage('/service_logs'),
+			action: (newtab: boolean = false) => gotoPage('/service_logs', newtab),
 			shortcutKey: LOGS_PREFIX,
 			icon: Logs,
 			disabled: !$devopsRole
@@ -383,7 +386,7 @@
 		textInput.focus()
 	}
 
-	function gotoWindmillItemPage(e: TableAny) {
+	function gotoWindmillItemPage(e: TableAny, newtab: boolean = false) {
 		let path: string
 		switch (e.type) {
 			case 'flow':
@@ -401,13 +404,17 @@
 			default:
 				path = '/'
 		}
-		gotoPage(path)
+		gotoPage(path, newtab)
 	}
 
-	function gotoPage(path: string) {
-		open = false
+	function gotoPage(path: string, newtab: boolean = false) {
 		searchTerm = ''
-		goto(path)
+		if (!newtab) {
+			open = false
+			goto(path)
+		} else {
+			window.open(path, "_blank")
+		}
 	}
 
 	let mouseMoved: boolean = false
@@ -572,6 +579,10 @@
 	}
 
 	let runsSearch: RunsSearch
+	let runSearchRemainingCount: number | undefined = undefined
+	let runSearchTotalCount: number | undefined = undefined
+	let indexMetadata: SearchJobsIndexResponse["index_metadata"] = undefined
+
 </script>
 
 {#if open}
@@ -631,8 +642,8 @@
 							<div class={tab === 'switch-mode' ? 'p-2' : 'p-2 border-b'}>
 								{#each items as el}
 									<QuickMenuItem
-										on:select={el?.action}
-										on:hover={() => (selectedItem = el)}
+										onselect={(shift) => el?.action(shift)}
+										onhover={() => (selectedItem = el)}
 										id={el?.search_id}
 										hovered={el?.search_id === selectedItem?.search_id}
 										label={el?.label}
@@ -653,8 +664,10 @@
 								</div>
 								{#each (itemMap[tab] ?? []).filter((e) => (combinedItems ?? []).includes(e)) as el}
 									<QuickMenuItem
-										on:select={() => gotoWindmillItemPage(el)}
-										on:hover={() => (selectedItem = el)}
+										onselect={(shift) => {
+											gotoWindmillItemPage(el, shift)
+										}}
+										onhover={() => (selectedItem = el)}
 										id={el?.search_id}
 										hovered={el?.path === selectedItem?.path}
 										label={(el.summary ? `${el.summary} - ` : '') +
@@ -691,7 +704,7 @@
 								</Alert>
 							{:else}
 								<QuickMenuItem
-									on:select={() =>
+									onselect={() =>
 										gotoPage(
 											`/service_logs?query=${encodeURIComponent(removePrefix(searchTerm, '!'))}`
 										)}
@@ -715,6 +728,9 @@
 												bind:open
 												{selectItem}
 												searchTerm={removePrefix(searchTerm, RUNS_PREFIX)}
+												bind:runSearchRemainingCount
+												bind:runSearchTotalCount
+												bind:indexMetadata
 								/>
 					{/if}
 				</div>

frontend/src/lib/components/search/QuickMenuItem.svelte

@@ -1,17 +1,9 @@
 <script lang="ts">
 	import { isMac } from '$lib/utils'
-	import { createEventDispatcher, onDestroy, onMount } from 'svelte'
+	import { onDestroy, onMount } from 'svelte'
 	import { twMerge } from 'tailwind-merge'
 
-	export let hovered: boolean = false
-	export let id: string
-	export let label: string = ''
-	export let icon: any = undefined
-	export let shortcutKey: string | undefined = undefined
-	export let containerClass: string | undefined = undefined
-	export let mouseMoved = false
-
-	const dispatch = createEventDispatcher()
+	// const dispatch = createEventDispatcher()
 
 	onMount(() => {
 		window.addEventListener('keydown', handleKeydown)
@@ -24,16 +16,46 @@
 	async function handleKeydown(event: KeyboardEvent) {
 		if (hovered && event.key === 'Enter') {
 			event.preventDefault()
-			dispatch('keyboardOnlySelect')
-			runAction()
+			if (onkeyboardSpecificSelect) {
+				onkeyboardSpecificSelect(event.shiftKey || event.ctrlKey)
+			} else {
+				onselect(event.shiftKey || event.ctrlKey)
+			}
 		}
 	}
 
-	function runAction() {
-		dispatch('select')
+	interface Props {
+		hovered?: boolean
+		id: string
+		label?: string
+		icon?: any
+		shortcutKey?: string | undefined
+		containerClass?: string | undefined
+		mouseMoved?: boolean
+		kbdClass?: string
+		small?: boolean
+		itemReplacement?: import('svelte').Snippet
+		onselect?: (shift: boolean) => void
+		onkeyboardSpecificSelect?: (shift: boolean) => void
+		onhover?: () => void
 	}
-	export let kbdClass = ''
-	export let small = true
+
+	let {
+		hovered = false,
+		id,
+		label = '',
+		icon = undefined,
+		shortcutKey = undefined,
+		containerClass = undefined,
+		mouseMoved = $bindable(false),
+		kbdClass = $bindable(''),
+		small = true,
+		itemReplacement,
+		onselect = () => {},
+		onhover = () => {},
+		onkeyboardSpecificSelect
+	}: Props = $props()
+
 	if (small) {
 		kbdClass = twMerge(
 			kbdClass,
@@ -44,33 +66,36 @@
 	} else {
 		kbdClass += ' !text-xs px-1.5'
 	}
+
 </script>
 
-<!-- svelte-ignore a11y-no-static-element-interactions -->
-<!-- svelte-ignore a11y-click-events-have-key-events -->
+<!-- svelte-ignore a11y_no_static_element_interactions -->
+<!-- svelte-ignore a11y_click_events_have_key_events -->
 <div
 	{id}
-	on:click|stopPropagation={runAction}
-	on:mouseenter={() => {
+	onclick={(e) => {
+		e.stopImmediatePropagation()
+		onselect(e.shiftKey || e.ctrlKey)
+	}}
+	onmouseenter={() => {
 		if (mouseMoved) {
-			dispatch('hover')
+			onhover()
 		}
-		mouseMoved=false
+		mouseMoved = false
 	}}
 	class={twMerge(
-		`rounded-md w-full transition-all cursor-pointer ${
-			hovered ? 'bg-surface-hover' : ''
-		}`,
+		`rounded-md w-full transition-all cursor-pointer ${hovered ? 'bg-surface-hover' : ''}`,
 		containerClass
 	)}
 >
-	{#if $$slots.itemReplacement}
-		<slot name="itemReplacement" />
+	{#if itemReplacement}
+		{@render itemReplacement?.()}
 	{:else}
 		<div class="flex flex-row gap-2 items-center px-2 py-1.5 rounded-md pr-6 text-sm">
 			<div class="w-4">
 				{#if icon}
-					<svelte:component this={icon} size={16} />
+					{@const SvelteComponent = icon}
+					<SvelteComponent size={16} />
 				{:else if shortcutKey != undefined}
 					<div class="font-bold flex items-center justify-center w-full">
 						<span

frontend/src/lib/components/search/RunsSearch.svelte

@@ -16,11 +16,22 @@
 
 	let loadingCompletedRuns: boolean = $state(false)
 
-	let runSearchRemainingCount: number | undefined = $state(undefined)
-	let runSearchTotalCount: number | undefined = $state(undefined)
-	let indexMetadata: any = $state({})
 	let loadingMoreJobs: boolean = $state(false)
 
+	interface Props {
+		mouseMoved: boolean
+		selectedWorkspace: string | undefined
+		selectedItem: any
+		queryParseErrors: string[]
+		open: boolean
+		loadedRuns: any[]
+		selectItem: (idx: number) => any
+		searchTerm: string
+		runSearchRemainingCount: number | undefined
+		runSearchTotalCount: number | undefined
+		indexMetadata: SearchJobsIndexResponse['index_metadata']
+	}
+
 	let {
 		mouseMoved = $bindable(),
 		selectedWorkspace = $bindable(),
@@ -29,17 +40,11 @@
 		open = $bindable(),
 		loadedRuns = $bindable(),
 		selectItem,
-		searchTerm
-	} = $props<{
-		mouseMoved: boolean
-		selectedWorkspace: string | undefined
-		selectedItem: any
-		queryParseErrors: string[]
-		open: boolean
-		loadedRuns: any[] | undefined
-		selectItem: (idx: number) => any
-		searchTerm: string
-	}>()
+		searchTerm,
+		runSearchRemainingCount = $bindable(),
+		runSearchTotalCount = $bindable(),
+		indexMetadata = $bindable()
+	}: Props = $props()
 
 	export function handleRunSearch(s: string) {
 		clearTimeout(debounceTimeout)
@@ -58,7 +63,7 @@
 					return
 				}
 
-				loadedRuns = searchResults.hits
+				loadedRuns = searchResults.hits ?? []
 				runSearchTotalCount = searchResults.hit_count
 				runSearchRemainingCount = (searchResults.hit_count ?? 0) - loadedRuns?.length
 				queryParseErrors = searchResults.query_parse_errors ?? []
@@ -126,7 +131,7 @@
 							</div>
 						{:else}
 							<QuickMenuItem
-								on:select={() => {
+								onselect={() => {
 									selectedItem = r
 									selectedWorkspace = undefined
 									const paginationOffset = runSearchTotalCount! - runSearchRemainingCount!
@@ -137,7 +142,7 @@
 								containerClass="rounded-md px-2 py-1 my-2"
 								bind:mouseMoved
 							>
-								<svelte:fragment slot="itemReplacement">
+								{#snippet itemReplacement()}
 									<div
 										class="py-2 w-full flex flex-row items-center gap-4 transition-all text-secondary text-sm"
 									>
@@ -145,18 +150,25 @@
 										<!-- Load more ({runSearchRemainingCount} other) -->
 										<!-- {runSearchRemainingCount} more documents also matched -->
 									</div>
-								</svelte:fragment>
+								{/snippet}
 							</QuickMenuItem>
 						{/if}
 					{:else}
 						<QuickMenuItem
-							on:select={() => {
+							onselect={(shift) => {
 								selectedItem = r
 								selectedWorkspace = r?.document.workspace_id[0]
+								if (shift) {
+									window.open(`/run/${r?.document.id[0]}`, '_blank')
+								}
 							}}
-							on:keyboardOnlySelect={() => {
-								open = false
-								goto(`/run/${r?.document.id[0]}`)
+							onkeyboardSpecificSelect={(shift) => {
+								if (!shift) {
+									open = false
+									goto(`/run/${r?.document.id[0]}`)
+								} else {
+									window.open(`/run/${r?.document.id[0]}`, '_blank')
+								}
 							}}
 							id={r?.document.id[0]}
 							hovered={selectedItem && r?.search_id === selectedItem?.search_id}
@@ -164,7 +176,7 @@
 							containerClass="rounded-md px-2 py-1 my-2"
 							bind:mouseMoved
 						>
-							<svelte:fragment slot="itemReplacement">
+							{#snippet itemReplacement()}
 								<div class="w-full flex flex-row items-center gap-4 transition-all">
 									<div
 										class="rounded-full w-2 h-2 {r?.document.success[0]
@@ -187,7 +199,7 @@
 										</div>
 									</div>
 								</div>
-							</svelte:fragment>
+							{/snippet}
 						</QuickMenuItem>
 					{/if}
 				{/each}
@@ -202,7 +214,7 @@
 				</div>
 			{/if}
 			<div class="flex flex-row pt-3 pl-4 items-center text-xs text-secondary">
-				{#if indexMetadata.indexed_until}
+				{#if indexMetadata?.indexed_until}
 					<span class="px-2">
 						Most recently indexed job was created at <TimeAgo
 							agoOnlyIfRecent
@@ -210,7 +222,7 @@
 						/>
 					</span>
 				{/if}
-				{#if indexMetadata.lost_lock_ownership}
+				{#if indexMetadata?.lost_lock_ownership}
 					<Popover notClickable placement="top">
 						<AlertTriangle size={16} class="text-gray-500" />
 						<svelte:fragment slot="text">
@@ -243,7 +255,7 @@
 				{/if}
 			</div>
 			<div class="flex flex-row pt-10 text-xs text-secondary">
-				{#if indexMetadata.indexed_until}
+				{#if indexMetadata?.indexed_until}
 					<span class="px-2">
 						Most recently indexed job was created at <TimeAgo
 							agoOnlyIfRecent
@@ -251,7 +263,7 @@
 						/>
 					</span>
 				{/if}
-				{#if indexMetadata.lost_lock_ownership}
+				{#if indexMetadata?.lost_lock_ownership}
 					<Popover notClickable placement="top">
 						<AlertTriangle size={16} class="text-gray-500" />
 						<svelte:fragment slot="text">

lsp/Pipfile

@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.491.5"
-wmill_pg = ">=1.491.5"
+wmill = ">=1.492.1"
+wmill_pg = ">=1.492.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"

openflow.openapi.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.491.5
+  version: 1.492.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel

powershell-client/WindmillClient/WindmillClient.psd1

@@ -12,7 +12,7 @@
     RootModule        = 'WindmillClient.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.491.5'
+    ModuleVersion     = '1.492.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

python-client/wmill/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.491.5"
+version = "1.492.1"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"

python-client/wmill_pg/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.491.5"
+version = "1.492.1"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"

typescript-client/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.491.5",
+  "version": "1.492.1",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]

typescript-client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.491.5",
+  "version": "1.492.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {

version.txt

@@ -1 +1 @@
-1.491.5
+1.492.1