multi-agent-rlenv 3.7.1__tar.gz → 3.7.3__tar.gz

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-agent-rlenv
-Version: 3.7.1
+Version: 3.7.3
 Summary: A strongly typed Multi-Agent Reinforcement Learning framework
 Project-URL: repository, https://github.com/yamoling/multi-agent-rlenv
 Author-email: Yannick Molinghen <yannick.molinghen@ulb.be>
@@ -17,9 +17,8 @@ Requires-Dist: laser-learning-environment>=2.6.1; extra == 'all'
 Requires-Dist: overcooked>=0.1.0; extra == 'all'
 Requires-Dist: pettingzoo>=1.20; extra == 'all'
 Requires-Dist: pymunk>=6.0; extra == 'all'
-Requires-Dist: pysc2; extra == 'all'
 Requires-Dist: scipy>=1.10; extra == 'all'
-Requires-Dist: smac; extra == 'all'
+Requires-Dist: smacv2; extra == 'all'
 Requires-Dist: torch>=2.0; extra == 'all'
 Provides-Extra: gym
 Requires-Dist: gymnasium>=0.29.1; extra == 'gym'
@@ -33,7 +32,7 @@ Requires-Dist: pymunk>=6.0; extra == 'pettingzoo'
 Requires-Dist: scipy>=1.10; extra == 'pettingzoo'
 Provides-Extra: smac
 Requires-Dist: pysc2; extra == 'smac'
-Requires-Dist: smac; extra == 'smac'
+Requires-Dist: smacv2; extra == 'smac'
 Provides-Extra: torch
 Requires-Dist: torch>=2.0; extra == 'torch'
 Description-Content-Type: text/markdown

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "multi-agent-rlenv"
-version = "3.7.1"
+version = "3.7.3"
 description = "A strongly typed Multi-Agent Reinforcement Learning framework"
 authors = [
     { "name" = "Yannick Molinghen", "email" = "yannick.molinghen@ulb.be" },
@@ -17,7 +17,7 @@ dependencies = ["numpy>=2.0.0", "opencv-python>=4.0", "typing_extensions>=4.0"]
 
 [project.optional-dependencies]
 gym = ["gymnasium>=0.29.1"]
-smac = ["smac", "pysc2"]
+smac = ["smacv2", "pysc2"]
 pettingzoo = ["pettingzoo>=1.20", "pymunk>=6.0", "scipy>=1.10"]
 overcooked = ["overcooked>=0.1.0"]
 lle = ["laser-learning-environment>=2.6.1"]
@@ -26,8 +26,7 @@ all = [
     "gymnasium>0.29.1",
     "pettingzoo>=1.20",
     "overcooked>=0.1.0",
-    "smac",
-    "pysc2",
+    "smacv2",
     "laser-learning-environment>=2.6.1",
     "pymunk>=6.0",
     "scipy>=1.10",
@@ -52,8 +51,8 @@ pythonpath = "src"
 filterwarnings = "ignore::DeprecationWarning"
 
 [tool.uv.sources]
-smac = { git = "https://github.com/oxwhirl/smac.git" }
-pysc2 = { git = "https://github.com/google-deepmind/pysc2.git" }
+smacv2 = { git = "https://github.com/oxwhirl/smacv2.git", rev = "577ab5a" }
+pysc2 = { git = "https://github.com/google-deepmind/pysc2.git", rev = "0df53d3" }
 
 
 [dependency-groups]

multi_agent_rlenv-3.7.3/src/marlenv/adapters/__init__.py

@@ -0,0 +1,36 @@
+from .pymarl_adapter import PymarlAdapter
+from marlenv.utils import dummy_function
+
+try:
+    from .gym_adapter import Gym, make
+
+    HAS_GYM = True
+except ImportError:
+    HAS_GYM = False
+    make = dummy_function("gymnasium")
+
+try:
+    from .pettingzoo_adapter import PettingZoo
+
+    HAS_PETTINGZOO = True
+except ImportError:
+    HAS_PETTINGZOO = False
+
+try:
+    from .smac_adapter import SMAC
+
+    HAS_SMAC = True
+except ImportError:
+    HAS_SMAC = False
+
+
+__all__ = [
+    "PymarlAdapter",
+    "Gym",
+    "make",
+    "PettingZoo",
+    "SMAC",
+    "HAS_GYM",
+    "HAS_PETTINGZOO",
+    "HAS_SMAC",
+]

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/src/marlenv/adapters/pettingzoo_adapter.py

@@ -3,7 +3,7 @@ from typing import Sequence
 
 import numpy as np
 import numpy.typing as npt
-from gymnasium import spaces  # pettingzoo uses gymnasium spaces
+from gymnasium import spaces
 from pettingzoo import ParallelEnv
 
 from marlenv.models import MARLEnv, Observation, State, Step, DiscreteSpace, ContinuousSpace, Space

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/src/marlenv/adapters/smac_adapter.py

@@ -3,7 +3,7 @@ from typing import overload
 
 import numpy as np
 import numpy.typing as npt
-from smac.env import StarCraft2Env  # pyright: ignore[reportMissingImports]
+from smacv2.env import StarCraft2Env
 
 from marlenv.models import MARLEnv, Observation, State, Step, MultiDiscreteSpace, DiscreteSpace
 
@@ -181,20 +181,7 @@ class SMAC(MARLEnv[MultiDiscreteSpace]):
 
     def step(self, action):
         reward, done, info = self._env.step(action)
-        obs = Observation(
-            self._env.get_obs(),  # type: ignore
-            self.available_actions(),
-        )
-        state = self.get_state()
-        step = Step(
-            obs,
-            state,
-            reward,
-            done,
-            False,
-            info,
-        )
-        return step
+        return Step(self.get_observation(), self.get_state(), reward, done, False, info)
 
     def available_actions(self) -> npt.NDArray[np.bool]:
         return np.array(self._env.get_avail_actions()) == 1

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/src/marlenv/catalog/__init__.py

@@ -1,10 +1,15 @@
-from marlenv.adapters import SMAC
 from .deepsea import DeepSea
 from .matrix_game import MatrixGame
 from .coordinated_grid import CoordinatedGrid
 
 
-__all__ = ["SMAC", "DeepSea", "lle", "overcooked", "MatrixGame", "connect_n", "CoordinatedGrid"]
+__all__ = ["smac", "DeepSea", "lle", "overcooked", "MatrixGame", "connect_n", "CoordinatedGrid"]
+
+
+def smac():
+    from marlenv.adapters import SMAC
+
+    return SMAC
 
 
 def lle():

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/src/marlenv/models/observation.py

@@ -92,7 +92,7 @@ class Observation:
         """
         Convert the observation to a tuple of tensors of shape (1, n_agents, <dim>).
         """
-        import torch
+        import torch  # pyright: ignore[reportMissingImports]
 
         data = torch.from_numpy(self.data).unsqueeze(0).to(device, non_blocking=True)
         extras = torch.from_numpy(self.extras).unsqueeze(0).to(device, non_blocking=True)

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/src/marlenv/models/state.py

@@ -55,7 +55,7 @@ class State(Generic[StateType]):
 
     def as_tensors(self, device=None):
         """Convert the state to a tuple of tensors of shape (1, <dim>)."""
-        import torch
+        import torch  # pyright: ignore[reportMissingImports]
 
         data = torch.from_numpy(self.data).unsqueeze(0).to(device, non_blocking=True)
         extras = torch.from_numpy(self.extras).unsqueeze(0).to(device, non_blocking=True)

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/src/marlenv/utils/import_placeholders.py

@@ -3,6 +3,8 @@ from types import SimpleNamespace
 
 
 def _raise_error(module_name: str, package_name: Optional[str] = None):
+    if package_name is None:
+        package_name = module_name
     raise ImportError(
         f"The optional dependency `{module_name}` is not installed.\nInstall the `{package_name}` package (e.g. pip install {package_name})."
     )

{multi_agent_rlenv-3.7.1 → multi_agent_rlenv-3.7.3}/tests/test_adapters.py

@@ -114,7 +114,7 @@ def _check_env_3m(env):
 
 @pytest.mark.skipif(skip_smac, reason="SMAC is not installed")
 def test_smac_from_class():
-    from smac.env import StarCraft2Env  # pyright: ignore[reportMissingImports]
+    from smacv2.env import StarCraft2Env  # pyright: ignore[reportMissingImports]
     from marlenv.adapters import SMAC
 
     env = SMAC(StarCraft2Env("3m"))
@@ -130,6 +130,29 @@ def test_smac_render():
     env.render()
 
 
+@pytest.mark.skipif(skip_smac, reason="SMAC is not installed")
+def test_smac_obs():
+    from marlenv.adapters import SMAC
+
+    def check(obs: Observation, state: State):
+        assert isinstance(obs.data, np.ndarray)
+        assert isinstance(obs.extras, np.ndarray)
+        assert isinstance(obs.available_actions, np.ndarray)
+
+        assert isinstance(state.data, np.ndarray)
+        assert isinstance(state.extras, np.ndarray)
+
+    env = SMAC("3m")
+    obs, state = env.reset()
+    check(obs, state)
+
+    done = False
+    while not done:
+        step = env.random_step()
+        check(step.obs, step.state)
+        done = step.is_terminal
+
+
 def test_pymarl():
     LIMIT = 20
     N_AGENTS = 2

multi_agent_rlenv-3.7.1/src/marlenv/adapters/__init__.py

@@ -1,33 +0,0 @@
-from importlib.util import find_spec
-from .pymarl_adapter import PymarlAdapter
-from marlenv.utils import dummy_type, dummy_function
-
-HAS_GYM = find_spec("gymnasium") is not None
-if HAS_GYM:
-    from .gym_adapter import Gym, make
-else:
-    Gym = dummy_type("gymnasium")
-    make = dummy_function("gymnasium")
-
-HAS_PETTINGZOO = find_spec("pettingzoo") is not None
-if HAS_PETTINGZOO:
-    from .pettingzoo_adapter import PettingZoo
-else:
-    PettingZoo = dummy_type("pettingzoo")
-
-HAS_SMAC = find_spec("smac") is not None
-if HAS_SMAC:
-    from .smac_adapter import SMAC
-else:
-    SMAC = dummy_type("smac", "https://github.com/oxwhirl/smac.git")
-
-__all__ = [
-    "PymarlAdapter",
-    "Gym",
-    "make",
-    "PettingZoo",
-    "SMAC",
-    "HAS_GYM",
-    "HAS_PETTINGZOO",
-    "HAS_SMAC",
-]