kaggle-environments 1.22.14__tar.gz → 1.23.0__tar.gz

{kaggle_environments-1.22.14 → kaggle_environments-1.23.0}/PKG-INFO

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

{kaggle_environments-1.22.14 → kaggle_environments-1.23.0}/docker/cicd-publish-to-pypi.sh

@@ -1,15 +1,12 @@
 #!/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
-PACKAGE_NAME="kaggle-environments" # Define package name for reuse
+PACKAGE_NAME="kaggle-environments"
 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"
 
@@ -20,7 +17,6 @@ fi
 
 echo "Found version $VERSION_FROM_PYPROJECT in pyproject.toml. Checking against PyPI."
 
-# (Your Python script to check for existing version remains the same)
 cat > /tmp/check_pypi.py << EOL
 import sys
 import requests
@@ -52,6 +48,7 @@ else
 
   flit publish
   
+  # It takes a bit for the package to show up on PyPI. Make sure it's visible through Pip before proceeding.
   # --- RETRY LOGIC START ---
   echo "Verifying that package '$PACKAGE_NAME==$VERSION_FROM_PYPROJECT' is available from PyPI..."
   MAX_RETRIES=10
@@ -60,7 +57,6 @@ else
 
   for i in $(seq 1 $MAX_RETRIES)
   do
-    # Use 'pip install' with --no-cache-dir as the check. This is the most reliable method.
     if python -m pip install --no-cache-dir "$PACKAGE_NAME==$VERSION_FROM_PYPROJECT" --quiet; then
       echo "✅ Successfully found and installed package from PyPI."
       SUCCESS=true
@@ -79,7 +75,6 @@ else
 
   echo "Successfully published and verified. 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."

{kaggle_environments-1.22.14 → kaggle_environments-1.23.0}/docker/cloudbuild.yaml

@@ -52,7 +52,7 @@ steps:
     waitFor: ["test-cpu-image"]
     secretEnv: ["PYPI_TOKEN"]
 
-  - id: "deploy-to-cloud-functions"
+  - id: "deploy-to-cloud-run"
     name: "gcr.io/google.com/cloudsdktool/cloud-sdk"
     waitFor: ["publish-to-pypi"]
     entrypoint: "bash"
@@ -60,18 +60,14 @@ steps:
       - "-c"
       - |
         if [ -f /workspace/published_new_version.flag ]; then
-          echo "✅ New version was published. Deploying update to Cloud Functions."
-          gcloud functions deploy kaggle-simulations-v2 \
-            --gen2 \
-            --runtime python311 \
-            --region us-central1 \
-            --source ./docker/cloud-run-source \
-            --entry-point main \
-            --trigger-http \
-            --project kaggle-comps-prod-eval
-          # This also implicitly routes 100% of traffic to the new version
+          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
+          # This command implicitly updates traffic to 100% on the new revision
         else
-          echo "⏩ No new version was published. Skipping Cloud Function deployment."
+          echo "⏩ No new version was published. Skipping Cloud Run deployment."
         fi
 
 images:

{kaggle_environments-1.22.14 → kaggle_environments-1.23.0}/kaggle_environments/envs/open_spiel_env/games/repeated_poker/repeated_poker.js

@@ -12,7 +12,6 @@ function renderer(options) {
     playerInfoAreas: [],
     dealerButton: null,
     diagnosticHeader: null,
-    gameMessageArea: null,
   };
 
   const css = `
@@ -43,7 +42,7 @@ function renderer(options) {
 
     .poker-renderer-host {
       width: 100%; height: 100%; display: flex; align-items: center; justify-content: center;
-      font-family: 'Zeitung Pro', sans-serif; background-color: #2d3748; color: #fff;
+      font-family: 'Zeitung Pro', sans-serif; background-color: #1C1D20; color: #fff;
       overflow: hidden; padding: 1rem; box-sizing: border-box; position: relative;
     }
     .poker-game-layout { width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; position: relative; max-width: 750px; max-height: 750px; }
@@ -135,10 +134,11 @@ function renderer(options) {
     .pot-display { font-size: 40px; font-weight: bold; color: #ffffff; margin-bottom: 30px; }
     .bet-display {
       display: inline-block; padding: 10px 20px; border-radius: 12px;
-      background-color: #1a202c; color: #ffff;
+      background-color: #3C4043; color: #ffff;
       font-family: 'Inter' sans-serif; font-size: 1.75rem; font-weigth: 600;
       text-align: center;
       height: 3rem; line-height: 3rem;
+      min-width: 200px;
     }
     .blind-indicator { font-size: 0.7rem; color: #a0aec0; margin-top: 3px; }
     .dealer-button {
@@ -148,10 +148,9 @@ function renderer(options) {
     }
     .dealer-button.dealer-player0 { bottom: 110px; }
     .dealer-button.dealer-player1 { top: 110px; }
-    #game-message-area { position: absolute; top: 10px; left: 50%; transform: translateX(-50%); background-color: rgba(0,0,0,0.6); padding: 5px 10px; border-radius: 5px; font-size: 0.9rem; z-index: 20;}
 
     @media (max-width: 768px) {
-      .bet-display { font-size: 1.5rem; height: 2.2rem; line-height: 2.2rem; }
+      .bet-display { font-size: 1.5rem; height: 2.2rem; line-height: 2.2rem; min-width: 0;}
       .card { width: 60px; height: 85px; } .card-rank { font-size: 35px; } .card-suit { width: 35px; height: 35px; }
       .community-cards-container { gap: 6px; }
       .player-card-area { min-height: 120px; }
@@ -268,10 +267,6 @@ function renderer(options) {
     elements.diagnosticHeader.style.cssText = "color: lime; background-color: black; padding: 5px; font-size: 12px; position: absolute; top: 0px; left: 0px; z-index: 10001; display: none;"; // Hidden by default
     parentElement.appendChild(elements.diagnosticHeader);
 
-    elements.gameMessageArea = document.createElement('div');
-    elements.gameMessageArea.id = 'game-message-area';
-    parentElement.appendChild(elements.gameMessageArea);
-
     elements.gameLayout = document.createElement('div');
     elements.gameLayout.className = 'poker-game-layout';
     parentElement.appendChild(elements.gameLayout);
@@ -355,17 +350,85 @@ function renderer(options) {
     return true;
   }
 
-  function _parseACPCState(acpcState) {
+  function _getLastMovesACPC(bettingString, currentPlayer) {
+    // We will store all human-readable moves here
+    const allMoves = [];
+
+    // Split the action string by street (e.g., ["r5c", "cr11f"])
+    const streets = bettingString.split('/');
+
+    // Process each street's actions
+    for (let streetIndex = 0; streetIndex < streets.length; streetIndex++) {
+      const streetAction = streets[streetIndex];
+      let i = 0;
+
+      // Preflop (streetIndex 0), action is "open" due to blinds.
+      // Postflop (streetIndex > 0), action is "not open" (first player checks or bets).
+      let isAggressiveActionOpen = (streetIndex === 0);
+
+      // 4. Parse the moves within the street
+      while (i < streetAction.length) {
+        const char = streetAction[i];
+        let move = null;
+
+        if (char === 'c') {
+          // 'c' (call/check)
+          if (isAggressiveActionOpen) {
+            move = 'call';
+          } else {
+            move = 'check';
+          }
+          isAggressiveActionOpen = false; // 'c' never leaves action open
+          i++;
+        } else if (char === 'f') {
+          // 'f' (fold)
+          move = 'fold';
+          isAggressiveActionOpen = false; // 'f' ends the hand
+          i++;
+        } else if (char === 'r') {
+          // 'r' (raise/bet)
+          let amount = '';
+          i++;
+          // Continue to parse all digits of the raise amount
+          while (i < streetAction.length && streetAction[i] >= '0' && streetAction[i] <= '9') {
+            amount += streetAction[i];
+            i++;
+          }
+          move = `raise ${amount}`;
+          isAggressiveActionOpen = true; // 'r' always leaves action open
+        } else {
+          // Should not happen with valid input, but good to prevent infinite loops
+          i++;
+          continue;
+        }
+
+        // 5. Store this move in the history
+        if (move) {
+          allMoves.push(move);
+        }
+      }
+    }
+
+    // 6. Get the last two moves from our complete list
+    const lastMove = allMoves.length > 0 ? allMoves[allMoves.length - 1] : null;
+    const secondLastMove = allMoves.length > 1 ? allMoves[allMoves.length - 2] : null;
+
+    const lastMoves = currentPlayer === 0 ? [secondLastMove, lastMove] : [lastMove, secondLastMove];
+
+    return lastMoves;
+  }
+
+  function _parseStepHistoryData(universalPokerJSON) {
     const result = {
-      p0cards: '',
-      p1cards: '',
+      cards: [],
       communityCards: '',
-      p0bet: 0,
-      p1bet: 0,
+      bets: [],
+      lastMoves: ['', ''],
+      winOdds: [0, 0],
     };
 
     // Split the string into its main lines
-    const lines = acpcState.trim().split('\n');
+    const lines = universalPokerJSON.acpc_state.trim().split('\n');
     if (lines.length < 2) {
       console.error("Invalid state string format.");
       return result;
@@ -374,10 +437,29 @@ function renderer(options) {
     const stateLine = lines[0]; // example: "STATE:0:r5c/cr11c/:6cKd|AsJc/7hQh6d/2c"
     const spentLine = lines[1]; // example: "Spent: [P0: 11  P1: 11  ]"
 
-    // --- 1. Parse the State Line ---
+    // --- Parse the Spent Line ---
+    if (spentLine) {
+      const p0BetMatch = spentLine.match(/P0:\s*(\d+)/);
+      const p1BetMatch = spentLine.match(/P1:\s*(\d+)/);
+
+      const bets = [0, 0];
+
+      if (p0BetMatch) {
+        bets[0] = parseInt(p0BetMatch[1], 10);
+      }
+
+      if (p1BetMatch) {
+        bets[1] = parseInt(p1BetMatch[1], 10);
+      }
+
+      result.bets = bets;
+    }
+
+    // --- Parse the State Line ---
     if (stateLine) {
       const stateParts = stateLine.split(':');
 
+      // --- Parse Cards ---
       // The card string is always the last part
       const cardString = stateParts[stateParts.length - 1]; // example: "6cKd|AsJc/7hQh6d/2c"
 
@@ -389,8 +471,7 @@ function renderer(options) {
         const playerHands = cardSegments[0].split('|');
         if (playerHands.length >= 2) {
           // example: "6cKd"
-          result.p0cards = playerHands[0];
-          result.p1cards = playerHands[1];
+          result.cards = [playerHands[0], playerHands[1]];
         }
       }
 
@@ -399,22 +480,22 @@ function renderer(options) {
         .slice(1) // gets all elements AFTER the player hands
         .filter(Boolean) // removes any empty strings (e.g., from a trailing "/")
         .join(''); // joins the remaining segments into a single string
-    }
-
-    // --- 2. Parse the Spent Line ---
-    if (spentLine) {
-      const p0BetMatch = spentLine.match(/P0:\s*(\d+)/);
-      const p1BetMatch = spentLine.match(/P1:\s*(\d+)/);
 
-      if (p0BetMatch) {
-        result.p0bet = parseInt(p0BetMatch[1], 10);
-      }
+      // --- Parse Betting String --
+      // The betting string is everything between the 2nd colon and the last colon.
+      // This handles edge cases like "STATE:0:r5c/cr11c/:cards"
+      const bettingString = stateParts.slice(2, stateParts.length - 1).join(':');
 
-      if (p1BetMatch) {
-        result.p1bet = parseInt(p1BetMatch[1], 10);
+      if (bettingString) {
+        result.lastMoves = _getLastMovesACPC(bettingString, universalPokerJSON.current_player);
       }
     }
 
+    // Parse win odds
+    p0WinOdds = Number(universalPokerJSON.odds[0]).toLocaleString(undefined, { style: 'percent', minimumFractionDigits: 2 })
+    p1WinOdds = Number(universalPokerJSON.odds[1]).toLocaleString(undefined, { style: 'percent', minimumFractionDigits: 2 })
+    result.winOdds = [p0WinOdds, p1WinOdds];
+
     return result;
   }
 
@@ -433,7 +514,7 @@ function renderer(options) {
     const numPlayers = 2;
 
     // --- Default State ---
-    const defaultUIData = {
+    const stateUIData = {
       players: Array(numPlayers).fill(null).map((_, i) => {
         const agentName = environment?.info?.TeamNames?.[i] ||
           `Player ${i}`;
@@ -443,23 +524,23 @@ function renderer(options) {
           stack: 0,
           cards: [], // Will be filled with nulls or cards
           currentBet: 0,
-          position: i === 0 ? "Small Blind" : "Big Blind",
           isDealer: i === 0,
           isTurn: false,
-          status: "Waiting...",
           reward: null
         };
       }),
       communityCards: [],
       pot: 0,
       isTerminal: false,
-      gameMessage: "Initializing...",
+      blinds: [1, 2],
+      lastMoves: [],
       rawObservation: null, // For debugging
     };
 
     // --- Step Validation ---
     if (!environment || !environment.steps || !environment.steps[step] || !environment.info) {
-      return defaultUIData;
+      // return default state
+      return stateUIData;
     }
 
     currentStateHistory = JSON.parse(environment.info.stateHistory[step]);
@@ -468,45 +549,44 @@ function renderer(options) {
     // TODO: Handle the flop phase steps (chance steps)
 
     currentUniversalPokerJSON = _getCurrentStepUniversalPokerJSON(options);
-    currentStepFromStateHistory = _parseACPCState(currentUniversalPokerJSON.acpc_state);
+    currentStepFromStateHistory = _parseStepHistoryData(currentUniversalPokerJSON);
 
     const currentStepAgents = environment.steps[step];
     if (!currentStepAgents || currentStepAgents.length < numPlayers) {
-      defaultUIData.gameMessage = "Waiting for agent data...";
-      return defaultUIData;
+      return stateUIData;
     }
 
-
-    const pot_size = currentStepFromStateHistory.p0bet + currentStepFromStateHistory.p1bet;
-    const player_contributions = [currentStepFromStateHistory.p0bet, currentStepFromStateHistory.p1bet];
+    const pot_size = currentStepFromStateHistory.bets.reduce((a, b) => a + b, 0);
+    const player_contributions = currentStepFromStateHistory.bets;
     const starting_stacks = currentUniversalPokerJSON.starting_stacks;
     const player_hands = [
-      currentStepFromStateHistory.p0cards ? currentStepFromStateHistory.p0cards.match(/.{1,2}/g) : [],
-      currentStepFromStateHistory.p1cards ? currentStepFromStateHistory.p1cards.match(/.{1,2}/g) : [],
+      currentStepFromStateHistory.cards[0]?.match(/.{1,2}/g) || [],
+      currentStepFromStateHistory.cards[1]?.match(/.{1,2}/g) || []
     ];
     const board_cards = currentStepFromStateHistory.communityCards ? currentStepFromStateHistory.communityCards.match(/.{1,2}/g).reverse() : [];
-    const current_player = currentStepFromStateHistory.current_player;
-    const betting_history = currentStepFromStateHistory.betting_history;
 
     // TODO: Add odds, best_five_card_hands best_hand_rank_types
 
-    const isTerminal = false // TODO: read isTerminal from observation
-    defaultUIData.isTerminal = isTerminal;
-    defaultUIData.pot = pot_size || 0;
-    defaultUIData.communityCards = board_cards || [];
+    // TODO: Add current player
 
+    const isTerminal = false // TODO: read isTerminal from observation
+    stateUIData.isTerminal = isTerminal;
+    stateUIData.pot = pot_size || 0;
+    stateUIData.communityCards = board_cards || [];
+    stateUIData.lastMoves = currentStepFromStateHistory.lastMoves;
+    stateUIData.blinds = currentUniversalPokerState.blinds;
 
-    // --- Update Player Pods ---
+    // --- Update Players ---
     for (let i = 0; i < numPlayers; i++) {
-      const pData = defaultUIData.players[i];
+      const pData = stateUIData.players[i];
       const contribution = player_contributions ? player_contributions[i] : 0;
       const startStack = starting_stacks ? starting_stacks[i] : 0;
 
       pData.currentBet = contribution;
       pData.stack = startStack - contribution;
       pData.cards = (player_hands[i] || []).map(c => c === "??" ? null : c);
-      pData.isTurn = String(i) === String(current_player);
-      pData.status = pData.position; // Default status
+      pData.isTurn = currentUniversalPokerState.current_player === i;
+      pData.isDealer = currentUniversalPokerState.blinds[i] === 1; // infer dealer from small blind
 
       if (isTerminal) {
         const reward = environment.rewards ? environment.rewards[i] : null;
@@ -523,52 +603,19 @@ function renderer(options) {
       }
     }
 
-    // Handle folded player status
-    if (!isTerminal && betting_history && betting_history.includes('f')) {
-      // A simple fold check: the player who didn't make the last action and isn't the current player might have folded.
-      // This is a simplification. A more robust parser would track the betting sequence.
-      const lastAction = betting_history.slice(-1);
-      if (lastAction === 'f') {
-        // Find who is NOT the current player
-        const nonCurrentPlayerIndex = current_player === '0' ? 1 : 0;
-        // If they are not all-in, they folded.
-        if (defaultUIData.players[nonCurrentPlayerIndex].status !== 'All-in') {
-          defaultUIData.players[nonCurrentPlayerIndex].status = "Folded";
-        }
-      }
-    }
-
-
-    // --- Set Game Message ---
-    if (isTerminal) {
-      const winnerIndex = environment.rewards ? environment.rewards.findIndex(r => r > 0) : -1;
-      if (winnerIndex !== -1) {
-        defaultUIData.gameMessage = `Player ${winnerIndex} wins!`;
-      } else {
-        defaultUIData.gameMessage = "Game Over.";
-      }
-    } else if (current_player === "chance") {
-      defaultUIData.gameMessage = `Dealing...`;
-    } else {
-      defaultUIData.gameMessage = `Player ${current_player}'s turn.`;
-    }
-
-    return defaultUIData;
+    return stateUIData;
   }
 
 
   function _renderPokerTableUI(data, passedOptions) {
     if (!elements.pokerTable || !data) return;
-    const { players, communityCards, pot, isTerminal, gameMessage } = data;
+    const { players, communityCards, pot, isTerminal } = data;
 
     if (elements.diagnosticHeader && data.rawObservation) {
       // Optional: Show diagnostics for debugging
       // elements.diagnosticHeader.textContent = `[${passedOptions.step}] P_TURN:${data.rawObservation.current_player} POT:${data.pot}`;
       // elements.diagnosticHeader.style.display = 'block';
     }
-    if (elements.gameMessageArea) {
-      elements.gameMessageArea.textContent = gameMessage;
-    }
 
     elements.communityCardsContainer.innerHTML = '';
     // Always show 5 slots for the river
@@ -630,7 +677,16 @@ function renderer(options) {
 
         const betDisplay = playerInfoArea.querySelector('.bet-display');
         if (playerData.currentBet > 0) {
-          betDisplay.textContent = `Bet: ${playerData.currentBet}`;
+          if (data.lastMoves[index]) {
+            betDisplay.textContent = data.lastMoves[index];
+          }
+          else {
+            if (playerData.isDealer) {
+              betDisplay.textContent = 'small blind';
+            } else {
+              betDisplay.textContent = 'big blind';
+            }
+          }
           betDisplay.style.display = 'block';
         } else {
           betDisplay.style.display = 'none';

{kaggle_environments-1.22.14 → kaggle_environments-1.23.0}/pyproject.toml

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

kaggle_environments-1.22.14/docker/cloudbuild.cloudrun.yaml

@@ -1,25 +0,0 @@
-# docker/cloudbuild.cloudrun.yaml
-
-steps:
-  - name: "gcr.io/cloud-builders/docker"
-    args:
-      - "build"
-      - "-t"
-      - "us-central1-docker.pkg.dev/$PROJECT_ID/gcf-artifacts/kaggle-simulations-v2:$COMMIT_SHA"
-      - "./docker/cloud-run-source"
-
-  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk"
-    args:
-      - "gcloud"
-      - "run"
-      - "deploy"
-      - "kaggle-simulations-v2"
-      - "--image=us-central1-docker.pkg.dev/$PROJECT_ID/gcf-artifacts/kaggle-simulations-v2:$COMMIT_SHA"
-      - "--region=us-central1"
-      - "--project=kaggle-comps-prod-eval"
-
-images:
-  - "us-central1-docker.pkg.dev/$PROJECT_ID/gcf-artifacts/kaggle-simulations-v2:$COMMIT_SHA"
-
-options:
-  machineType: "E2_HIGHCPU_32"