multi-agent-rlenv 3.7.1__py3-none-any.whl → 3.7.3__py3-none-any.whl

marlenv/adapters/__init__.py

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

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

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

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():

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)

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)

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.dist-info → multi_agent_rlenv-3.7.3.dist-info}/METADATA

@@ -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.dist-info → multi_agent_rlenv-3.7.3.dist-info}/RECORD

@@ -4,12 +4,12 @@ marlenv/env_pool.py,sha256=mJhJUROX9k2A2njwnUOBl2EAuhotksQMugH_Zydg1IU,951
 marlenv/exceptions.py,sha256=gJUC_2rVAvOfK_ypVFc7Myh-pIfSU3To38VBVS_0rZA,1179
 marlenv/mock_env.py,sha256=rvl4QAn046HM79IMMiAj1Aoy3_GBSNBBR1_9fHPutR8,4682
 marlenv/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-marlenv/adapters/__init__.py,sha256=JsKWaeXvUjWEg3JC9TOtyjtZlTI9AAkLyab-jDa5yzM,783
+marlenv/adapters/__init__.py,sha256=G-PwyGDymdAMFWtCpnlHkHQuSE40Q8bv_-yQ7gVcbbM,600
 marlenv/adapters/gym_adapter.py,sha256=DXQ1czcvRoL9hTwcVzfMyXArZeVIHP1gAKqZJO87y7Y,3065
-marlenv/adapters/pettingzoo_adapter.py,sha256=A3dcwsQa7jlWc14TybXpBknl0FPK5YK9w-6tzMBHlDI,2913
+marlenv/adapters/pettingzoo_adapter.py,sha256=UzSUdP4EUJOt49AB7H45ToA8rUkGmPQgrJKegvK86og,2877
 marlenv/adapters/pymarl_adapter.py,sha256=2s7EY31s1hrml3q-BBaXo_eDMXTjkebozZPvzsgrb9c,3353
-marlenv/adapters/smac_adapter.py,sha256=nGWNRpn1F6ZFIoTcU0IJGApc_1GHaoBOVsoNljJ-PAg,8509
-marlenv/catalog/__init__.py,sha256=UCJGbmVzNtKvO3fZQWxR_EigGpXhAyIMevyXxghB2F8,535
+marlenv/adapters/smac_adapter.py,sha256=HXECjK4hs4c1zAr1qWUChrJZdcvsu-OhnDovS0_u9Z0,8240
+marlenv/catalog/__init__.py,sha256=l9_lvqpV2wKKMYDrStbW93WGEBDhGw6KjgbZsOcLKx0,570
 marlenv/catalog/coordinated_grid.py,sha256=Kq5UzG9rr5gYRO0QWFCmKmO56JIzgIR19an9_pvypJU,4997
 marlenv/catalog/deepsea.py,sha256=yTyvskWZiAZem11L8cZwHedBIDQ4EAxE2IaUKrjKL2U,2413
 marlenv/catalog/matrix_game.py,sha256=zkErnh6ZIa1kBryYMVLw-jeMCd2AJ-BlP2yROxpbb0w,1519
@@ -20,14 +20,14 @@ marlenv/catalog/connectn/env.py,sha256=Ot5vfAbzS6eRe3-nLW_AkhEH7F1WVvv4_odoxZU7H
 marlenv/models/__init__.py,sha256=uihmRs71Gg5z7Bvau_xtaQVg7xEtX8sTzi74bIHL5P0,443
 marlenv/models/env.py,sha256=BG1iVHxGD_p827mF0ewyOBn6wU2gtFsHLW1b4UtW-V0,7841
 marlenv/models/episode.py,sha256=zsyxsW4LIioPKyY4DZKn64A31e5ZvlwOf3HIGuRUzhs,13531
-marlenv/models/observation.py,sha256=RhvKvmys4bu3UwwVsvu7fJ7TMKt2QkKnBD1e0hw2r7s,3528
+marlenv/models/observation.py,sha256=6uY2h0zHBm6g1ECzD8jZLXuSzuuX-U60QW0E_b4qPuc,3569
 marlenv/models/spaces.py,sha256=d_aIPWwPdaOWZeNRUUdzSiDxs9XQb9itPnrE_EyhhfQ,7810
-marlenv/models/state.py,sha256=LbP--JxBzRwMFpEAaZyxCX13xKQ27xPE2fabohaq9YI,2058
+marlenv/models/state.py,sha256=JvCXwf0l7L2UMHkvYp-WM_aDegJ-hePpQI2yiUw6X_g,2099
 marlenv/models/step.py,sha256=00PhD_ccdCIYAY1SVJdJU91weU0Y_tNIJwK16TN_53I,3056
 marlenv/models/transition.py,sha256=UkJVRNxZoyRkjE7YmKtUf_4xA7cOEh20O60dTldbvys,5070
 marlenv/utils/__init__.py,sha256=ky5mz_T7EF65YNaEN1UDCUYZVlz7hFyKResgIJlE_1Q,462
 marlenv/utils/cached_property_collector.py,sha256=IOjbr61f0DqLhcidXKrl7MhN1BOEGiTzCANIKQCxaF0,600
-marlenv/utils/import_placeholders.py,sha256=QN7gsfbFgSP2Lh-7YBC1RH-SNjbFacvRFmBgNs4Eb90,972
+marlenv/utils/import_placeholders.py,sha256=nNcOGHSsBVmcUXRALJD7YBg5WzX6vTQGTfsl8LnMQgA,1036
 marlenv/utils/schedule.py,sha256=4S0V0RyYHuReVafeHnpfvSLf3oF0buAzD09qMFfexa0,9133
 marlenv/wrappers/__init__.py,sha256=Z4_M-mxRNKQeu52tkmQ4B2m3-zrsmjfXXL5NsWQ4vu4,952
 marlenv/wrappers/action_randomizer.py,sha256=A1kejqGOTA0sc_RQL0EOd6sMSbcIdiV5zlscjKUlzdY,474
@@ -45,7 +45,7 @@ marlenv/wrappers/rlenv_wrapper.py,sha256=iFSQsDMkUUbQJKEO8l6SosNi-eOUVSh4pIJVu7a
 marlenv/wrappers/state_counter.py,sha256=QmEMb55vOnK-VJuvKsDIIBgcNRsHuovqgpK2pcCY7sA,1211
 marlenv/wrappers/time_limit.py,sha256=HctKeiepPQ2NAIa208SnvknioSkRIuUQ4X-Xhf_XTs0,3974
 marlenv/wrappers/video_recorder.py,sha256=mtWcqaYNCu-zjVXvpa8DJe3_062tpK_TChOu-Xyxs3s,2533
-multi_agent_rlenv-3.7.1.dist-info/METADATA,sha256=1yiAoMwqkzgpKby8KV09M-vVLRgJS5ZKZMqZCfHn80A,5751
-multi_agent_rlenv-3.7.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-multi_agent_rlenv-3.7.1.dist-info/licenses/LICENSE,sha256=_eeiGVoIJ7kYt6l1zbIvSBQppTnw0mjnYk1lQ4FxEjE,1074
-multi_agent_rlenv-3.7.1.dist-info/RECORD,,
+multi_agent_rlenv-3.7.3.dist-info/METADATA,sha256=DtS9V3BrBbsJODgcow4SKRUjOag5KWUUxgO6gZSRtyI,5718
+multi_agent_rlenv-3.7.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+multi_agent_rlenv-3.7.3.dist-info/licenses/LICENSE,sha256=_eeiGVoIJ7kYt6l1zbIvSBQppTnw0mjnYk1lQ4FxEjE,1074
+multi_agent_rlenv-3.7.3.dist-info/RECORD,,