multi-agent-rlenv 3.6.2__tar.gz → 3.6.3__tar.gz

{multi_agent_rlenv-3.6.2 → multi_agent_rlenv-3.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-agent-rlenv
-Version: 3.6.2
+Version: 3.6.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>

{multi_agent_rlenv-3.6.2 → multi_agent_rlenv-3.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "multi-agent-rlenv"
-version = "3.6.2"
+version = "3.6.3"
 description = "A strongly typed Multi-Agent Reinforcement Learning framework"
 authors = [
     { "name" = "Yannick Molinghen", "email" = "yannick.molinghen@ulb.be" },

multi_agent_rlenv-3.6.3/src/marlenv/catalog/__init__.py

@@ -0,0 +1,22 @@
+from marlenv.adapters import SMAC
+from .deepsea import DeepSea
+
+
+__all__ = [
+    "SMAC",
+    "DeepSea",
+    "lle",
+    "overcooked",
+]
+
+
+def lle():
+    from lle import LLE  # pyright: ignore[reportMissingImports]
+
+    return LLE
+
+
+def overcooked():
+    from overcooked import Overcooked  # pyright: ignore[reportMissingImports]
+
+    return Overcooked

{multi_agent_rlenv-3.6.2 → multi_agent_rlenv-3.6.3}/src/marlenv/catalog/deepsea.py

@@ -32,6 +32,7 @@ class DeepSea(MARLEnv[MultiDiscreteSpace]):
         self._row = 0
         self._col = 0
         self._step_right_penalty = -0.01 / self.max_depth
+        self.name = f"{self.__class__.__name__}-{self.max_depth}"
 
     def get_observation(self) -> Observation:
         return Observation(np.array([[self._row, self._col]], dtype=np.float32), self.available_actions())

{multi_agent_rlenv-3.6.2 → multi_agent_rlenv-3.6.3}/tests/test_catalog.py

@@ -2,18 +2,27 @@ import pytest
 from marlenv import catalog
 from marlenv.utils import dummy_type, dummy_function
 
-skip_lle = not catalog.HAS_LLE
-skip_overcooked = not catalog.HAS_OVERCOOKED
+try:
+    catalog.lle()
+    skip_lle = False
+except ImportError:
+    skip_lle = True
+
+try:
+    catalog.overcooked()
+    skip_overcooked = False
+except ImportError:
+    skip_overcooked = True
 
 
 @pytest.mark.skipif(skip_lle, reason="LLE is not installed")
 def test_lle():
-    catalog.LLE.level(1)
+    catalog.lle().level(1)
 
 
 @pytest.mark.skipif(skip_overcooked, reason="Overcooked is not installed")
 def test_overcooked():
-    catalog.Overcooked.from_layout("scenario4")
+    catalog.overcooked().from_layout("scenario4")
 
 
 def test_dummy_type():

multi_agent_rlenv-3.6.2/src/marlenv/catalog/__init__.py

@@ -1,26 +0,0 @@
-from importlib.util import find_spec
-from ..utils.import_placeholders import dummy_type
-from marlenv.adapters import SMAC
-from .deepsea import DeepSea
-
-
-HAS_LLE = find_spec("lle") is not None
-if HAS_LLE:
-    from lle import LLE  # pyright: ignore[reportMissingImports]
-else:
-    LLE = dummy_type("lle", "laser-learning-environment")
-
-HAS_OVERCOOKED = find_spec("overcooked") is not None
-if HAS_OVERCOOKED:
-    from overcooked import Overcooked  # pyright: ignore[reportMissingImports]
-else:
-    Overcooked = dummy_type("overcooked", "overcooked")
-
-__all__ = [
-    "Overcooked",
-    "SMAC",
-    "LLE",
-    "DeepSea",
-    "HAS_LLE",
-    "HAS_OVERCOOKED",
-]