kaggle-environments 1.23.4__tar.gz → 1.23.5__tar.gz

{kaggle_environments-1.23.4 → kaggle_environments-1.23.5}/PKG-INFO

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

{kaggle_environments-1.23.4 → kaggle_environments-1.23.5}/kaggle_environments/envs/open_spiel_env/games/repeated_poker/visualizer/default/src/components/getRepeatedPokerStateForStep.js

@@ -1,6 +1,5 @@
-function _getLastMovesACPC(bettingString, currentPlayer) {
-  // We will store all human-readable moves here
-  const allMoves = [];
+function _getActionStringsFromACPC(bettingString, currentPlayer) {
+  const moves = [];
 
   // Split the action string by street (e.g., ["r5c", "cr11f"])
   const streets = bettingString.split('/');
@@ -10,60 +9,33 @@ function _getLastMovesACPC(bettingString, currentPlayer) {
     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)
+      if (char === 'r') {
         let amount = '';
         i++;
-        // Continue to parse all digits of the raise amount
+        // 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
+        moves.push(`r${amount}`)
       } else {
-        // Should not happen with valid input, but good to prevent infinite loops
+        moves.push(char);
         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 lastMove = moves.length > 0 ? moves[moves.length - 1] : null;
 
-  const lastMoves = currentPlayer === 0 ? [secondLastMove, lastMove] : [lastMove, secondLastMove];
+  const actionStrings = currentPlayer === 0 ? [lastMove, ''] : ['', lastMove];
 
-  return lastMoves;
+  return actionStrings;
 }
 
 function _parseStepHistoryData(universalPokerJSON) {
@@ -71,7 +43,7 @@ function _parseStepHistoryData(universalPokerJSON) {
     cards: [],
     communityCards: '',
     bets: [],
-    lastMoves: ['', ''],
+    playerActionStrings: ['', ''],
     winOdds: [0, 0],
   };
 
@@ -135,7 +107,7 @@ function _parseStepHistoryData(universalPokerJSON) {
     const bettingString = stateParts.slice(2, stateParts.length - 1).join(':');
 
     if (bettingString) {
-      result.lastMoves = _getLastMovesACPC(bettingString, universalPokerJSON.current_player);
+      result.playerActionStrings = _getActionStringsFromACPC(bettingString);
     }
   }
 
@@ -147,18 +119,6 @@ function _parseStepHistoryData(universalPokerJSON) {
   return result;
 }
 
-
-function _getCurrentUniversalPokerFromStateHistory(stateHistory, step) {
-  if (stateHistory) {
-
-    const agentSteps = stateHistory.filter(s => JSON.parse(JSON.parse(s).current_universal_poker_json).current_player !== -1);
-    const currentStep = agentSteps[step];
-    return JSON.parse(JSON.parse(currentStep).current_universal_poker_json);
-  }
-  return null;
-}
-
-
 export const getPokerStateForStep = (environment, step) => {
   const numPlayers = 2;
   // --- Step Validation ---
@@ -167,6 +127,8 @@ export const getPokerStateForStep = (environment, step) => {
     return null;
   }
 
+  const stepsWithEndStates = environment.steps;
+
   // --- Default State ---
   const stateUIData = {
     players: Array(numPlayers).fill(null).map((_, i) => {
@@ -182,33 +144,32 @@ export const getPokerStateForStep = (environment, step) => {
         currentBet: 0,
         isDealer: i === 0,
         isTurn: false,
-        reward: null
+        reward: null,
+        actionDisplayText: ""
       };
     }),
     communityCards: [],
     pot: 0,
     isTerminal: false,
-    blinds: [1, 2],
-    lastMoves: [],
     rawObservation: null, // For debugging
     step: step,
     winOdds: [],
     fiveCardBestHands: [],
-    currentPlayer: -1
+    currentPlayer: -1,
+    winner: -1,
   };
 
   // We have two sources for current game state: stepHistory and steps
   // This is because neither source contains all the information we need 
+  const currentStepData = stepsWithEndStates[step > 2 ? step - 2 : 0]; // Skip over setup steps
 
-  const p0stateFromSteps = environment.steps[step][0];
-  const p1stateFromSteps = environment.steps[step][1];
+  const currentPlayer = currentStepData?.step?.observation?.currentPlayer || 0; // TODO: find better way to get current player
 
-  const currentStateHistory = JSON.parse(environment.info.stateHistory[step]);
-  const currentStateFromStateHistory = JSON.parse(currentStateHistory.current_universal_poker_json);
+  const currentStateHistoryEntry = JSON.parse(currentStepData.stateHistory);
+  const currentUniversalPokerJSON = JSON.parse(currentStateHistoryEntry.current_universal_poker_json);
 
   // TODO: Handle the flop phase steps (chance steps)
 
-  const currentUniversalPokerJSON = _getCurrentUniversalPokerFromStateHistory(environment.info.stateHistory, step);
   const currentStepFromStateHistory = _parseStepHistoryData(currentUniversalPokerJSON);
 
   const currentStepAgents = environment.steps[step];
@@ -233,8 +194,6 @@ export const getPokerStateForStep = (environment, step) => {
   stateUIData.isTerminal = isTerminal;
   stateUIData.pot = pot_size || 0;
   stateUIData.communityCards = board_cards || [];
-  stateUIData.lastMoves = currentStepFromStateHistory.lastMoves;
-  stateUIData.blinds = currentStateFromStateHistory.blinds;
 
   // --- Update Players ---
   for (let i = 0; i < numPlayers; i++) {
@@ -245,8 +204,23 @@ export const getPokerStateForStep = (environment, step) => {
     pData.currentBet = contribution;
     pData.stack = startStack - contribution;
     pData.cards = (player_hands[i] || []).map(c => c === "??" ? null : c);
-    pData.isTurn = p0stateFromSteps.observation.currentPlayer === i; // TODO: this may need to be flipped to show the other player responding to this move, which will display instantly
-    pData.isDealer = currentStateFromStateHistory.blinds[i] === 1; // infer dealer from small blind
+    pData.isTurn = currentPlayer === i; // TODO: this may need to be flipped to show the other player responding to this move, which will display instantly
+    pData.isDealer = currentStateHistoryEntry.dealer === i;
+    pData.actionDisplayText = currentStepFromStateHistory.playerActionStrings[i];
+
+    if (currentStepData.isEndState) {
+      pData.isTurn = false;
+      pData.isWinner = currentStepData.winner === i;
+      if (currentStepData.winner === i) {
+        pData.actionDisplayText = "WINNER"
+      } else {
+        if (currentStepData.handConclusion === "fold") {
+          pData.actionDisplayText = "FOLD"
+        } else {
+          pData.actionDisplayText = "LOSER"
+        }
+      }
+    }
 
     if (isTerminal) {
       const reward = environment.rewards ? environment.rewards[i] : null;
@@ -264,4 +238,4 @@ export const getPokerStateForStep = (environment, step) => {
   }
 
   return stateUIData;
-}
+}

{kaggle_environments-1.23.4 → kaggle_environments-1.23.5}/kaggle_environments/envs/open_spiel_env/games/repeated_poker/visualizer/default/src/repeated_poker_renderer.js

@@ -151,6 +151,10 @@ export function renderer(options) {
       border-color: #20BEFF;
       box-shadow: 0 4px 16px rgba(0, 0, 0, 0.4), 0 0 20px rgba(32, 190, 255, 0.5);
     }
+    .player-info-area.winner-player {
+      border-color: #FFEB70;
+      box-shadow: 0 4px 16px rgba(0, 0, 0, 0.4), 0 0 20px rgba(255, 235, 112, 0.6);
+    }
     .player-container-0 .player-info-area { flex-direction: column-reverse; }
     .player-name-wrapper {
       display: flex;
@@ -226,6 +230,7 @@ export function renderer(options) {
       text-align: center;
       height: 20pxrem; line-height: 20px;
       width: 150px;
+      height: 20px;
       box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
     }
     .blind-indicator { font-size: 0.7rem; color: #a0aec0; margin-top: 3px; }
@@ -560,7 +565,7 @@ export function renderer(options) {
 
     // Update step counter
     if (elements.stepCounter && step !== undefined) {
-      elements.stepCounter.textContent = `Step: ${step}`;
+      elements.stepCounter.textContent = `Debug Step: ${step}`;
     }
 
     if (elements.diagnosticHeader && data.rawObservation) {
@@ -596,9 +601,7 @@ export function renderer(options) {
     players.forEach((playerData, index) => {
       const playerNameElement = elements.playerNames[index];
       if (playerNameElement) {
-        const playerNameText =
-          !playerData.isTurn && !isTerminal ? `${playerData.name} responding...` : playerData.name;
-        playerNameElement.textContent = playerNameText;
+        playerNameElement.textContent = playerData.name;
 
         // Highlight current player's turn
         if (playerData.isTurn && !isTerminal) {
@@ -653,18 +656,21 @@ export function renderer(options) {
           playerInfoArea.classList.remove('active-player');
         }
 
+        // Highlight winner's pod
+        if (playerData.isWinner) {
+          playerInfoArea.classList.add('winner-player');
+        } else {
+          playerInfoArea.classList.remove('winner-player');
+        }
+
         playerInfoArea.querySelector('.player-stack-value').textContent = `${playerData.stack}`;
 
         const betDisplay = playerInfoArea.querySelector('.bet-display');
         if (playerData.currentBet > 0) {
-          if (data.lastMoves[index]) {
-            betDisplay.textContent = data.lastMoves[index];
+          if (playerData.actionDisplayText) {
+            betDisplay.textContent = playerData.actionDisplayText;
           } else {
-            if (playerData.isDealer) {
-              betDisplay.textContent = 'Small Blind';
-            } else {
-              betDisplay.textContent = 'Big Blind';
-            }
+            betDisplay.textContent = '';
           }
           betDisplay.style.display = 'block';
         } else {

{kaggle_environments-1.23.4 → kaggle_environments-1.23.5}/pyproject.toml

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

{kaggle_environments-1.23.4 → kaggle_environments-1.23.5}/web/core/src/player.ts

@@ -130,7 +130,11 @@ export class Player {
                     this.replay = { name: 'unknown', version: 'unknown', steps: [], configuration: {}, info: {} };
                 }
                 // Use Object.assign to merge new data without overwriting the whole object
-                Object.assign(this.replay, event.data.environment);
+                const { steps, ...rest } = event.data.environment;
+                Object.assign(this.replay, rest);
+                if (Array.isArray(steps)) {
+                    this.replay.steps = steps;
+                }
                 needsRender = true;
             }
 
@@ -175,6 +179,7 @@ export class Player {
     }
 
     private setData(replay: ReplayData, agents: any[] = []) {
+        console.log('setData called', replay);
         this.replay = replay;
         this.agents = agents;
 
@@ -251,4 +256,4 @@ export class Player {
         this.stepSlider.value = this.step.toString();
         this.stepCounter.textContent = `${this.step + 1} / ${maxSteps + 1}`;
     }
-}
+}

{kaggle_environments-1.23.4 → kaggle_environments-1.23.5}/web/core/src/transformers/repeatedPokerTransformer.ts

@@ -85,7 +85,7 @@ const _getEndCondition = (
 } => {
   const current_player = parseInt(currentPlayer);
 
-  if (stateHistoryPointer >= stateHistory.length) {
+  if (stateHistoryPointer >= stateHistory.length - 1) {
     return {
       // TODO: handle tail end
       // for now, fold + tie = impossible state