kaggle-environments 1.22.0__tar.gz → 1.22.2__tar.gz

{kaggle_environments-1.22.0 → kaggle_environments-1.22.2}/PKG-INFO

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

kaggle_environments-1.22.2/docker/cicd-publish-to-pypi.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+set -e
+
+# The python:3.11-slim container doesn't have git, which flit needs to build the package.
+echo "Installing git..."
+apt-get update -y && apt-get install -y git --no-install-recommends
+
+# Ensure python dependencies are installed first
+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)
+
+if [ -z "$VERSION_FROM_PYPROJECT" ]; then
+  echo "Could not find version in pyproject.toml. Exiting."
+  exit 1
+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
+
+package_name = 'kaggle-environments'
+version_to_check = sys.argv[1]
+
+response = requests.get(f'https://pypi.org/pypi/{package_name}/json')
+
+if response.status_code == 200:
+    data = response.json()
+    if version_to_check in data.get('releases', {}):
+        print('true')
+    else:
+        print('false')
+elif response.status_code == 404:
+    print('false')
+else:
+    print(f'Error checking PyPI: {response.status_code}', file=sys.stderr)
+    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
+  echo "Version $VERSION_FROM_PYPROJECT already exists on PyPI. Skipping publish."
+else
+  echo "Version $VERSION_FROM_PYPROJECT not found on PyPI. Publishing..."
+  pip install flit --quiet
+  export FLIT_USERNAME=__token__
+  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.2/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.2/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.2/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.0 → kaggle_environments-1.22.2}/docker/cloudbuild.yaml

@@ -45,10 +45,39 @@ steps:
     entrypoint: "pytest"
     args: ["kaggle_environments"]
 
+  - id: "publish-to-pypi"
+    name: "python:3.11-slim"
+    entrypoint: "bash"
+    args: ["docker/cicd-publish-to-pypi.sh"]
+    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/kaggle-cicd/secrets/pypi-token/versions/latest
+      env: "PYPI_TOKEN"
+
 options:
   pool:
     name: "projects/kaggle-cicd/locations/us-east1/workerPools/kaggle-cloud-builders"

{kaggle_environments-1.22.0 → kaggle_environments-1.22.2}/kaggle_environments/__init__.py

@@ -14,15 +14,27 @@
 
 import os
 from importlib import import_module
+from importlib.metadata import PackageNotFoundError, version
 from os import listdir
+
 from .agent import Agent
-from .api import get_episode_replay, list_episodes, list_episodes_for_team, list_episodes_for_submission
+from .api import (
+    get_episode_replay,
+    list_episodes,
+    list_episodes_for_team,
+    list_episodes_for_submission,
+)
 from .core import evaluate, make, register
 from .main import http_request
 from . import errors
 from . import utils
 
-__version__ = "1.22.0"
+try:
+    __version__ = version("kaggle-environments")
+except PackageNotFoundError:
+    # Package is not installed. This is a fallback for development mode.
+    __version__ = "dev"
+
 
 __all__ = [
     "Agent",

{kaggle_environments-1.22.0 → kaggle_environments-1.22.2}/pyproject.toml

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