Merge branch 'main' into patch-1

Author: deanq

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 title: ''
 labels: bug
-assignees: justinmerrell
+assignees: ''
 
 ---
 

.github/tape_collection/cli_config.tape

@@ -10,4 +10,4 @@ Enter
 
 Sleep 4s
 
-Type "<Paste your RunPod API Key here>"
+Type "<Paste your Runpod API Key here>"

.github/workflows/CD-publish_to_pypi.yml

@@ -1,54 +1,83 @@
 name: CD | Publish Python 🐍 distributions 📦 to PyPI
 
 on:
-  release:
-    types: [published]
-
+  push:
+    branches: [main]
   workflow_dispatch:
+    inputs:
+      force_publish:
+        description: 'Force publish without release-please'
+        required: true
+        default: 'false'
+        type: choice
+        options:
+          - 'true'
+          - 'false'
+
+permissions:
+  contents: write
+  pull-requests: write
+  actions: write
+  issues: write
+  id-token: write
 
 jobs:
-  build-n-publish:
-    name: Build and publish Python 🐍 distributions 📦 to PyPI
+  release-please:
+    runs-on: ubuntu-latest
+    outputs:
+      release_created: ${{ steps.release.outputs.release_created }}
+      tag_name: ${{ steps.release.outputs.tag_name }}
+    steps:
+      - uses: google-github-actions/release-please-action@v3
+        id: release
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          release-type: python
+          package-name: runpod
+
+  # PyPI publishing
+  pypi-publish:
+    name: PyPI Publish
+    needs: release-please
+    if: ${{ needs.release-please.outputs.release_created || (github.event_name == 'workflow_dispatch' && inputs.force_publish == 'true') }}
     runs-on: ubuntu-latest
 
+    environment:
+      name: pypi-production
+      url: https://pypi.org/project/runpod/
+
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python 3.11.10
-        uses: actions/setup-python@v5
+      - name: Checkout code
+        uses: actions/checkout@v5
         with:
-          python-version: 3.11.10
-
-      - name: Install pypa/build
-        run: >-
-          python -m
-          pip install
-          build
-          --user
-
-      - name: Build a binary wheel and a source tarball
-        run: >-
-          python -m
-          build
-          --sdist
-          --wheel
-          --outdir dist/
-          .
-
-      - name: Publish distribution 📦 to Test PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+          fetch-depth: 0
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
         with:
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          repository_url: https://test.pypi.org/legacy/
+          enable-cache: true
+
+      - name: Set up Python 3.11.10
+        run: uv python install 3.11.10
+
+      - name: Install dependencies
+        run: uv sync --all-groups
+
+      - name: Build package
+        run: uv build
+
+      - name: Verify package
+        run: uv run twine check dist/*
 
-      - name: Publish distribution 📦 to PyPI
-        # if: startsWith(github.ref, 'refs/tags')
+      - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          verbose: true
 
   notify-runpod-workers:
     name: Notify workers
-    needs: build-n-publish
+    needs: [release-please, pypi-publish]
+    if: ${{ needs.release-please.outputs.release_created || (github.event_name == 'workflow_dispatch' && inputs.force_publish == 'true') }}
     strategy:
       matrix:
         repo:
@@ -75,12 +104,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Wait for propegation
+      - name: Wait for propagation
         run: sleep 300s
         shell: bash
 
       - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@v4
         with:
           token: ${{ secrets.RUNPOD_WORKERS_PAT }}
           repository: ${{ matrix.repo }}

.github/workflows/CD-test_publish_to_pypi.yml

@@ -11,32 +11,25 @@ jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to TestPyPI
     runs-on: ubuntu-latest
+    environment: test-release
+    permissions:
+      contents: read
+      id-token: write  # Required for OIDC
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python 3.11.10
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
         with:
-          python-version: 3.11.10
+          enable-cache: true
 
-      - name: Install pypa/build
-        run: >-
-          python -m
-          pip install
-          build
-          --user
+      - name: Set up Python 3.11.10
+        run: uv python install 3.11.10
 
-      - name: Build a binary wheel and a source tarball
-        run: >-
-          python -m
-          build
-          --sdist
-          --wheel
-          --outdir dist/
-          .
+      - name: Build package
+        run: uv build
 
       - name: Publish distribution 📦 to Test PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          repository_url: https://test.pypi.org/legacy/
+          repository-url: https://test.pypi.org/legacy/

.github/workflows/CI-codeql.yml

@@ -38,24 +38,19 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          # queries: security-extended,security-and-quality
+          queries: security-extended,security-and-quality
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -68,6 +63,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/CI-e2e.yml

@@ -1,91 +1,38 @@
-# Performs a full test of the package within production environment.
-
-name: CI | End-to-End RunPod Python Tests
-
+name: CI-e2e
 on:
   push:
-    branches:
-      - main
-
+    branches: [main]
   pull_request:
-    branches:
-      - main
-
+    branches: [main]
   workflow_dispatch:
 
 jobs:
-  e2e-build:
-    name: Build and push mock-worker Docker image
+  e2e:
+    if: github.repository == 'runpod/runpod-python'
     runs-on: ubuntu-latest
-    outputs:
-      docker_tag: ${{ steps.output_docker_tag.outputs.docker_tag }}
-
+    timeout-minutes: 15
     steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - name: Clone and patch mock-worker
-        run: |
-          git clone https://github.com/runpod-workers/mock-worker
-          GIT_SHA=${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-          echo "git+https://github.com/runpod/runpod-python.git@$GIT_SHA" > mock-worker/builder/requirements.txt
+      - uses: actions/checkout@v5
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+      - uses: astral-sh/setup-uv@v6
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
+      - uses: actions/setup-python@v5
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          python-version: "3.12"
 
-      - name: Define Docker Tag
-        id: docker_tag
+      - name: Install dependencies
         run: |
-          DOCKER_TAG=${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-          echo "DOCKER_TAG=$(echo $DOCKER_TAG | cut -c 1-7)" >> $GITHUB_ENV
-
-      - name: Set Docker Tag as Output
-        id: output_docker_tag
-        run: echo "::set-output name=docker_tag::${{ env.DOCKER_TAG }}"
-
-      - name: Build and push Docker image
-        env:
-          DOCKERHUB_REPO: ${{ vars.DOCKERHUB_REPO }}
-          DOCKERHUB_IMG: ${{ vars.DOCKERHUB_IMG }}
+          uv venv
+          source .venv/bin/activate
+          uv pip install -e ".[test]" --quiet || uv pip install -e .
+          uv pip install runpod-flash pytest pytest-asyncio pytest-timeout pytest-rerunfailures httpx
+          uv pip install -e . --reinstall --no-deps
+          python -c "import runpod; print(f'runpod: {runpod.__version__} from {runpod.__file__}')"
+
+      - name: Run e2e tests
         run: |
-          docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-          docker build -t $DOCKERHUB_REPO/$DOCKERHUB_IMG:${{ env.DOCKER_TAG }} -f mock-worker/Dockerfile mock-worker
-          docker push $DOCKERHUB_REPO/$DOCKERHUB_IMG:${{ env.DOCKER_TAG }}
-
-  test:
-    name: Run End-to-End Tests
-    runs-on: ubuntu-latest
-    needs: [e2e-build]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Run Tests
-        id: run-tests
-        uses: runpod/runpod-test-runner@v2.1.0
-        with:
-          image-tag: ${{ vars.DOCKERHUB_REPO }}/${{ vars.DOCKERHUB_IMG }}:${{ needs.e2e-build.outputs.docker_tag }}
-          runpod-api-key: ${{ secrets.RUNPOD_API_KEY }}
-          request-timeout: 1200
-
-      - name: Verify Tests
+          source .venv/bin/activate
+          pytest tests/e2e/ -v -p no:xdist --timeout=600 --reruns 1 --reruns-delay 5 --log-cli-level=INFO -o "addopts="
         env:
-          TOTAL_TESTS: ${{ steps.run-tests.outputs.total-tests }}
-          SUCCESSFUL_TESTS: ${{ steps.run-tests.outputs.succeeded }}
-        run: |
-          echo "Total tests: $TOTAL_TESTS"
-          echo "Successful tests: $SUCCESSFUL_TESTS"
-          if [ "$TOTAL_TESTS" != "$SUCCESSFUL_TESTS" ]; then
-              exit 1
-          fi
+          RUNPOD_API_KEY: ${{ secrets.RUNPOD_API_KEY }}
+          RUNPOD_SDK_GIT_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

.github/workflows/CI-pytests.yml

@@ -15,21 +15,22 @@ jobs:
   run_tests:
     strategy:
       matrix:
-        python-version: [3.8, 3.9, 3.10.15, 3.11.10]
+        python-version: ["3.10", "3.11", "3.12"]
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
         with:
-          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+
+      - name: Set up Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
 
       - name: Install Dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install '.[test]'
+        run: uv sync --group test
 
       - name: Run Tests
-        run: pytest
+        run: uv run pytest