fix(python): accept PettingZoo framework reset options

Author: nosam1998

crates/apps/gfa-py/src/lib.rs

@@ -112,8 +112,12 @@ impl NativeEnv {
     }
 
     fn public_text(&self, py: Python<'_>) -> PyResult<String> {
-        py.detach(|| self.inner.observe(Viewer::Spectator).map(|observation| observation.text))
-            .map_err(error)
+        py.detach(|| {
+            self.inner
+                .observe(Viewer::Spectator)
+                .map(|observation| observation.text)
+        })
+        .map_err(error)
     }
 
     fn clone(&self) -> Self {

crates/apps/gfa-server/src/briefing_tests.rs

@@ -151,6 +151,8 @@ async fn every_game_briefing_contains_executable_examples_and_matching_views() -
             data(&compact, "observation_format")?["tensor_shape"],
             if game == "tictactoe" {
                 json!([3, 3, 3])
+            } else if game == "connect4" {
+                json!([3, 6, 7])
             } else if game == "chess" {
                 json!([20, 8, 8])
             } else if game == "sudoku" {

crates/games/gfa-game-connect4/src/lib.rs

@@ -323,7 +323,10 @@ impl Game for Connect4 {
                 rows,
                 to_move: state.to_move
             }),
-            tensor: Some(Tensor { shape: vec![3, 6, 7], values }),
+            tensor: Some(Tensor {
+                shape: vec![3, 6, 7],
+                values,
+            }),
         }
     }
 
@@ -439,7 +442,9 @@ mod tensor_tests {
         assert_eq!(observation, Connect4::observe(&state, Viewer::Player(0)));
         assert_eq!(observation, Connect4::observe(&state, Viewer::Player(1)));
         let board: Board = serde_json::from_value(observation.json)?;
-        let tensor = observation.tensor.ok_or_else(|| GameError::position("missing tensor"))?;
+        let tensor = observation
+            .tensor
+            .ok_or_else(|| GameError::position("missing tensor"))?;
         assert_eq!(tensor.shape, vec![3, 6, 7]);
         assert_eq!(tensor.values.len(), 126);
         assert_eq!(tensor.values[4 * 7], 1.0);
@@ -450,7 +455,11 @@ mod tensor_tests {
                 for plane in 0..2 {
                     assert_eq!(
                         tensor.values[plane * 42 + row * 7 + col],
-                        if *cell == Some(plane as PlayerId) { 1.0 } else { 0.0 }
+                        if *cell == Some(plane as PlayerId) {
+                            1.0
+                        } else {
+                            0.0
+                        }
                     );
                 }
             }

python/gamesforai/aec_env.py

@@ -56,8 +56,7 @@ def _refresh_infos(self):
 
     def reset(self, seed=None, options=None):
         options = options or {}
-        if set(options) - {"position"}:
-            raise ValueError("supported reset option: position")
+        # PettingZoo callers may pass options intended for other wrappers.
         position = options.get("position")
         if position is not None and not isinstance(position, str):
             raise ValueError("position must be a notation string")

python/tests/test_aec.py

@@ -68,3 +68,12 @@ def test_seeded_self_play_and_cap_endings():
     assert not any(first.terminations.values())
     assert first.native.get_state() == second.native.get_state()
     assert first.render() == first.native.public_text()
+
+
+def test_reset_accepts_framework_options_and_validates_position():
+    env = aec("tictactoe")
+    env.reset(seed=4, options={"options": 1})
+    before = env.native.get_state()
+    with pytest.raises(ValueError, match="notation string"):
+        env.reset(seed=4, options={"position": 12})
+    assert env.native.get_state() == before