style: apply pre-commit formatting and lint fixes

Author: kydrahul

highway_env/__init__.py

@@ -185,6 +185,7 @@ def _register_highway_envs():
 
     _register_pettingzoo_envs()
 
+
 def _register_pettingzoo_envs() -> None:
     """Register PettingZoo ParallelEnv IDs (skipped silently if pettingzoo not installed).
     IDs continue the ``intersection-multi-agent-vN`` series from v2:
@@ -213,4 +214,5 @@ def _register_pettingzoo_envs() -> None:
             ),
         )
 
+
 _register_highway_envs()

highway_env/envs/__init__.py

@@ -38,11 +38,11 @@
 
 # PettingZoo environments — requires highway-env[multi-agent]
 try:
+    from highway_env.envs.common.pettingzoo_env import HighwayParallelEnv  # noqa: F401
     from highway_env.envs.intersection_pz_env import (  # noqa: F401
         ConnectedLaneIntersectionParallelEnv,
         IntersectionParallelEnv,
     )
-    from highway_env.envs.common.pettingzoo_env import HighwayParallelEnv  # noqa: F401
 
     __all__ += [
         "HighwayParallelEnv",

highway_env/envs/common/abstract.py

@@ -7,7 +7,6 @@
 
 import gymnasium as gym
 import numpy as np
-import warnings
 from gymnasium import Wrapper
 from gymnasium.utils import RecordConstructorArgs
 from gymnasium.wrappers import RecordVideo
@@ -473,6 +472,7 @@ class MultiAgentWrapper(Wrapper, RecordConstructorArgs):
         Use the PettingZoo ``ParallelEnv`` interface instead::
             from highway_env.envs.common.pettingzoo_env import HighwayParallelEnv
     """
+
     def __init__(self, env):
         warnings.warn(
             "MultiAgentWrapper is deprecated and will be removed in a future release. "
@@ -484,6 +484,7 @@ def __init__(self, env):
         )
         Wrapper.__init__(self, env)
         RecordConstructorArgs.__init__(self)
+
     def step(self, action):  # unchanged
         obs, _, _, truncated, info = super().step(action)
         reward = info["agents_rewards"]

highway_env/envs/common/pettingzoo_env.py

@@ -6,6 +6,7 @@
 import gymnasium as gym
 from pettingzoo.utils.env import ParallelEnv
 
+
 if TYPE_CHECKING:
     from highway_env.envs.common.abstract import AbstractEnv
 
@@ -41,7 +42,10 @@ class HighwayParallelEnv(ParallelEnv):
         and ``MultiAgentAction`` configured.
     """
 
-    metadata: dict = {"render_modes": ["human", "rgb_array"], "name": "highway_parallel_v0"}
+    metadata: dict = {
+        "render_modes": ["human", "rgb_array"],
+        "name": "highway_parallel_v0",
+    }
 
     def __init__(self, env: AbstractEnv) -> None:
         super().__init__()
@@ -182,4 +186,5 @@ def _idle_action(self, agent: str):
             return min(1, space.n - 1)
         # Continuous: return zeros
         import numpy as np
+
         return np.zeros(space.shape, dtype=space.dtype)

highway_env/envs/intersection_pz_env.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+from highway_env.envs.common.pettingzoo_env import HighwayParallelEnv
 from highway_env.envs.intersection_env import (
     ConnectedLaneMultiAgentIntersectionEnv,
     MultiAgentIntersectionEnv,
 )
-from highway_env.envs.common.pettingzoo_env import HighwayParallelEnv
 
 
 class IntersectionParallelEnv(HighwayParallelEnv):
@@ -29,7 +29,9 @@ class IntersectionParallelEnv(HighwayParallelEnv):
         "name": "intersection_parallel_v3",
     }
 
-    def __init__(self, config: dict | None = None, render_mode: str | None = None) -> None:
+    def __init__(
+        self, config: dict | None = None, render_mode: str | None = None
+    ) -> None:
         base = MultiAgentIntersectionEnv(config=config, render_mode=render_mode)
         super().__init__(base)
 
@@ -48,7 +50,9 @@ class ConnectedLaneIntersectionParallelEnv(HighwayParallelEnv):
         "name": "intersection_parallel_v4",
     }
 
-    def __init__(self, config: dict | None = None, render_mode: str | None = None) -> None:
+    def __init__(
+        self, config: dict | None = None, render_mode: str | None = None
+    ) -> None:
         base = ConnectedLaneMultiAgentIntersectionEnv(
             config=config, render_mode=render_mode
         )

tests/envs/test_pettingzoo.py

@@ -3,29 +3,31 @@
 Skipped automatically if pettingzoo is not installed
 (e.g. in base CI without the [multi-agent] extra).
 """
+
 from __future__ import annotations
 
 import pytest
 
+
 # Skip entire module if pettingzoo is not available
 pytest.importorskip(
     "pettingzoo.test",
     reason="pettingzoo not installed; run with: pip install highway-env[multi-agent]",
 )
-from pettingzoo.test import parallel_api_test
+from pettingzoo.test import parallel_api_test  # noqa: E402
 
-import highway_env  # noqa: F401 — triggers env registration
-from highway_env.envs.intersection_pz_env import (
+import highway_env  # noqa: E402,F401 — triggers env registration
+from highway_env.envs.intersection_pz_env import (  # noqa: E402
     ConnectedLaneIntersectionParallelEnv,
     IntersectionParallelEnv,
 )
-from highway_env.envs.common.pettingzoo_env import HighwayParallelEnv
 
 
 # -----------------------------------------------------------------------
 # Fixtures
 # -----------------------------------------------------------------------
 
+
 @pytest.fixture
 def intersection_env():
     env = IntersectionParallelEnv(config={"controlled_vehicles": 2, "duration": 10})
@@ -46,6 +48,7 @@ def connected_lane_env():
 # PettingZoo API conformance
 # -----------------------------------------------------------------------
 
+
 def test_parallel_api_test_intersection():
     """PettingZoo's built-in API conformance checker must pass."""
     env = IntersectionParallelEnv(config={"controlled_vehicles": 2, "duration": 5})
@@ -66,6 +69,7 @@ def test_parallel_api_test_connected_lane():
 # Observation / action space correctness
 # -----------------------------------------------------------------------
 
+
 def test_reset_returns_agent_dict(intersection_env):
     """reset() must return dicts keyed by agent name."""
     obs, infos = intersection_env.reset(seed=42)
@@ -79,20 +83,26 @@ def test_obs_in_observation_space(intersection_env):
     """Every observation must lie within the declared observation space."""
     obs, _ = intersection_env.reset(seed=0)
     while intersection_env.agents:
-        actions = {a: intersection_env.action_space(a).sample() for a in intersection_env.agents}
+        actions = {
+            a: intersection_env.action_space(a).sample()
+            for a in intersection_env.agents
+        }
         obs, rewards, terminations, truncations, infos = intersection_env.step(actions)
         for agent, agent_obs in obs.items():
-            assert intersection_env.observation_space(agent).contains(agent_obs), (
-                f"{agent}: obs not in observation_space"
-            )
+            assert intersection_env.observation_space(agent).contains(
+                agent_obs
+            ), f"{agent}: obs not in observation_space"
 
 
 def test_possible_agents_is_stable(intersection_env):
     """possible_agents must not change across the episode."""
     intersection_env.reset(seed=1)
     initial_possible = list(intersection_env.possible_agents)
     while intersection_env.agents:
-        actions = {a: intersection_env.action_space(a).sample() for a in intersection_env.agents}
+        actions = {
+            a: intersection_env.action_space(a).sample()
+            for a in intersection_env.agents
+        }
         intersection_env.step(actions)
     assert intersection_env.possible_agents == initial_possible
 
@@ -101,19 +111,23 @@ def test_possible_agents_is_stable(intersection_env):
 # Per-agent termination semantics
 # -----------------------------------------------------------------------
 
+
 def test_terminated_agents_removed_from_agents(intersection_env):
     """Agents flagged as terminated must NOT appear in self.agents next step."""
     intersection_env.reset(seed=2)
     while intersection_env.agents:
         pre_step_agents = set(intersection_env.agents)
-        actions = {a: intersection_env.action_space(a).sample() for a in intersection_env.agents}
+        actions = {
+            a: intersection_env.action_space(a).sample()
+            for a in intersection_env.agents
+        }
         _, _, terminations, truncations, _ = intersection_env.step(actions)
 
         for agent in pre_step_agents:
             if terminations.get(agent, False) or truncations.get(agent, False):
-                assert agent not in intersection_env.agents, (
-                    f"{agent} terminated/truncated but still in env.agents"
-                )
+                assert (
+                    agent not in intersection_env.agents
+                ), f"{agent} terminated/truncated but still in env.agents"
 
 
 def test_episode_ends_when_all_agents_done(intersection_env):
@@ -122,7 +136,10 @@ def test_episode_ends_when_all_agents_done(intersection_env):
     steps = 0
     max_steps = 500
     while intersection_env.agents and steps < max_steps:
-        actions = {a: intersection_env.action_space(a).sample() for a in intersection_env.agents}
+        actions = {
+            a: intersection_env.action_space(a).sample()
+            for a in intersection_env.agents
+        }
         intersection_env.step(actions)
         steps += 1
     # If we reach here without error, the loop terminated correctly
@@ -133,9 +150,11 @@ def test_episode_ends_when_all_agents_done(intersection_env):
 # Seeding / reproducibility
 # -----------------------------------------------------------------------
 
+
 def test_reset_with_same_seed_is_reproducible():
     """Two resets with the same seed must produce identical initial observations."""
     import numpy as np
+
     env1 = IntersectionParallelEnv(config={"controlled_vehicles": 2, "duration": 5})
     env2 = IntersectionParallelEnv(config={"controlled_vehicles": 2, "duration": 5})
 
@@ -153,20 +172,24 @@ def test_reset_with_same_seed_is_reproducible():
 # Deprecation warning for MultiAgentWrapper
 # -----------------------------------------------------------------------
 
+
 def test_multi_agent_wrapper_deprecation_warning():
     """Using MultiAgentWrapper must raise DeprecationWarning."""
     import warnings
+
     import gymnasium as gym
 
     with warnings.catch_warnings(record=True) as caught:
         warnings.simplefilter("always")
         env = gym.make("intersection-multi-agent-v1")
         env.close()
 
-    deprecation_warnings = [w for w in caught if issubclass(w.category, DeprecationWarning)]
-    assert len(deprecation_warnings) > 0, (
-        "Expected DeprecationWarning from MultiAgentWrapper but none was raised"
-    )
+    deprecation_warnings = [
+        w for w in caught if issubclass(w.category, DeprecationWarning)
+    ]
+    assert (
+        len(deprecation_warnings) > 0
+    ), "Expected DeprecationWarning from MultiAgentWrapper but none was raised"
     assert any(
         "MultiAgentWrapper" in str(w.message) for w in deprecation_warnings
     ), "Expected a DeprecationWarning mentioning MultiAgentWrapper"