kaggle-environments 1.22.1__tar.gz → 1.22.3__tar.gz

{kaggle_environments-1.22.1 → kaggle_environments-1.22.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaggle-environments
-Version: 1.22.1
+Version: 1.22.3
 Summary: Kaggle Environments
 Author-email: Kaggle <support@kaggle.com>
 Requires-Python: >=3.10

{kaggle_environments-1.22.1 → kaggle_environments-1.22.3}/docker/cicd-publish-to-pypi.sh

@@ -11,6 +11,8 @@ pip install requests --quiet
 # Read version directly from pyproject.toml
 VERSION_FROM_PYPROJECT=$(grep -E "^version\s*=\s*\"[0-9]+\.[0-9]+\.[0-9]+\"$" pyproject.toml | cut -d '"' -f 2)
 
+CLOUD_RUN_REQS_PATH="docker/cloud-run-source/requirements.txt"
+
 if [ -z "$VERSION_FROM_PYPROJECT" ]; then
   echo "Could not find version in pyproject.toml. Exiting."
   exit 1
@@ -18,6 +20,7 @@ fi
 
 echo "Found version $VERSION_FROM_PYPROJECT in pyproject.toml. Checking against PyPI."
 
+# Write the Python script to a temporary file
 cat > /tmp/check_pypi.py << EOL
 import sys
 import requests
@@ -40,6 +43,7 @@ else:
     sys.exit(1)
 EOL
 
+# Execute the script and capture the output
 VERSION_EXISTS=$(python3 /tmp/check_pypi.py "$VERSION_FROM_PYPROJECT")
 
 if [ "$VERSION_EXISTS" = "true" ]; then
@@ -48,7 +52,17 @@ else
   echo "Version $VERSION_FROM_PYPROJECT not found on PyPI. Publishing..."
   pip install flit --quiet
   export FLIT_USERNAME=__token__
-  # PYPI_TOKEN is passed as an environment variable from cloudbuild
   export FLIT_PASSWORD=$PYPI_TOKEN
+
   flit publish
+  
+  echo "Successfully published. Updating Cloud Run requirements at $CLOUD_RUN_REQS_PATH..."
+  
+  # Use sed to replace the placeholder with the actual version
+  sed -i "s/VERSION_FROM_CICD_DEPLOY/${VERSION_FROM_PYPROJECT}/" "$CLOUD_RUN_REQS_PATH"
+  
+  echo "Cloud Run requirements.txt updated."
+
+  # Create a flag file to signal success
+  echo "true" > /workspace/published_new_version.flag
 fi

kaggle_environments-1.22.3/docker/cloud-run-source/README.md

@@ -0,0 +1,9 @@
+# Cloud Run Source
+
+This directory contains files for the legacy Cloud Run function. This cloudrun function is used to serve visualizers that haven't been migrated
+to use the static/vite builds that are hosted on GCS.
+
+The cloud run function is called kaggle-simulations-v2 on the kaggle-comps-prod-eval GCP project.
+
+The `requirements.txt` file is the source of truth for the Python dependencies of this function.
+The `main.py` file is the source of truth for the Python code of this function.

kaggle_environments-1.22.3/docker/cloud-run-source/main.py

@@ -0,0 +1,4 @@
+from kaggle_environments import http_request
+
+def main(request):
+    return http_request(request)

kaggle_environments-1.22.3/docker/cloud-run-source/requirements.txt

@@ -0,0 +1,11 @@
+# Function dependencies, for example:
+# package>=version
+kaggle-environments==VERSION_FROM_CICD_DEPLOY
+flask
+gym
+jsonschema
+numpy
+requests
+PettingZoo
+scipy
+functions-framework==3.4.0

{kaggle_environments-1.22.1 → kaggle_environments-1.22.3}/docker/cloudbuild.yaml

@@ -52,13 +52,30 @@ steps:
     waitFor: ["test-cpu-image"]
     secretEnv: ["PYPI_TOKEN"]
 
+  - id: "deploy-to-cloud-run"
+    name: "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    waitFor: ["publish-to-pypi"]
+    entrypoint: "bash"
+    args:
+      - "-c"
+      - |
+        if [ -f /workspace/published_new_version.flag ]; then
+          echo "✅ New version was published. Deploying update to Cloud Run."
+          gcloud run deploy kaggle-simulations-v2\
+            --source ./docker/cloud-run-source \
+            --region us-central1 \
+            --project kaggle-comps-prod-eval
+        else
+          echo "⏩ No new version was published. Skipping Cloud Run deployment."
+        fi
+
 images:
   - "gcr.io/kaggle-images/python-simulations"
   - "gcr.io/kaggle-gpu-images/python-simulations"
 
 availableSecrets:
   secretManager:
-    - versionName: projects/464139560241/secrets/pypi-token/versions/latest
+    - versionName: projects/kaggle-cicd/secrets/pypi-token/versions/latest
       env: "PYPI_TOKEN"
 
 options:

{kaggle_environments-1.22.1 → kaggle_environments-1.22.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kaggle-environments"
-version = "1.22.1"
+version = "1.22.3"
 description = "Kaggle Environments"
 authors = [
     {name = "Kaggle", email = "support@kaggle.com"},