mettagrid 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

mettagrid/config/room/ascii.py

@@ -9,6 +9,7 @@ SYMBOLS = {
     "a": "altar",
     "c": "converter",
     "g": "generator",
+    "m": "mine",
     "W": "wall",
     " ": "empty",
     "b": "block",

mettagrid/mettagrid_env.py

@@ -5,14 +5,11 @@ from typing import Any, Dict
 import gymnasium as gym
 import hydra
 import numpy as np
-from torch import sub
-from mettagrid.config.config import make_odd
 import pufferlib
 from omegaconf import OmegaConf, DictConfig
 
 from mettagrid.mettagrid_c import MettaGrid  # pylint: disable=E0611
-from mettagrid.config import config
-from util.config import config_from_path
+
 class MettaGridEnv(pufferlib.PufferEnv, gym.Env):
     def __init__(self, env_cfg: DictConfig, render_mode: str, buf=None, **kwargs):
         self._render_mode = render_mode
@@ -167,13 +164,11 @@ class MettaGridEnv(pufferlib.PufferEnv, gym.Env):
     def close(self):
         pass
 
-
 def make_env_from_cfg(cfg_path: str, *args, **kwargs):
-    cfg = config_from_path(cfg_path)
+    cfg = OmegaConf.load(cfg_path)
     env = MettaGridEnv(cfg, *args, **kwargs)
     return env
 
-
 def oc_uniform(min_val, max_val, center, *, _root_):
     sampling = _root_.get("sampling", 0)
     if sampling == 0:

{mettagrid-0.1.3.dist-info → mettagrid-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mettagrid
-Version: 0.1.3
+Version: 0.1.4
 Summary: A fast grid-based open-ended MARL environment
 Home-page: https://daveey.github.io
 License: MIT

{mettagrid-0.1.3.dist-info → mettagrid-0.1.4.dist-info}/RECORD

@@ -185,8 +185,7 @@ mettagrid/actions/swap.pxd,sha256=mS-fT6rY9ug0c5lXkWeaLOkX9la0ZHSr3ffGz-aZBDY,10
 mettagrid/actions/swap.pyx,sha256=SXgn5mCUFBt4P3BOe61bSBn4zdBRHxBGc6ePekpWQnM,1429
 mettagrid/actions/use.cpython-311-darwin.so,sha256=jrGpfVPqU-LROL6a-6-C7_94B_ADYCcrgEneXFpbZ10,186760
 mettagrid/base_encoder.cpython-311-darwin.so,sha256=5YeHMdKCIGaxm71xEf_zB5shdgMQs_dC45nzJ399LjY,188064
-mettagrid/config/config.py,sha256=0Apm1TwHCDcd2LIdW2BH4pk6dqJ0fVNaVOTC309fI5g,1210
-mettagrid/config/room/ascii.py,sha256=FxcA8eGTc-haNLDeT5fePi7QFtBYGxB-sIXJLbM2dik,793
+mettagrid/config/room/ascii.py,sha256=bahuAvBmP71C_ypMdmGgeORGyxNtOHACWyUVROoUask,810
 mettagrid/config/room/cognitive_evals/barriermaze.py,sha256=MPjGjY-SU06D57KNR-g9cWRIreXYReppp7G3cVxGcH8,4647
 mettagrid/config/room/cognitive_evals/corridor_maze.py,sha256=3KHz16kH6rYE-z0pKlqL1L4rMailcU50zTMeJze9s6U,3539
 mettagrid/config/room/cognitive_evals/cylinder.py,sha256=qFYwrS-_N1njEe0wajcM563yCIrLuBSmrVMYIWNYqRc,4027
@@ -220,7 +219,7 @@ mettagrid/grid_object.pxd,sha256=Plp85O4e0HsZUt5Bl4vrKRIE1ac3E1rwysj2WRgYaUM,882
 mettagrid/grid_object.pyx,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mettagrid/mettagrid.pyx,sha256=Q60WkCskp_pfmux2oVJqEmULSdmqnC49rc8peg7t-CY,9457
 mettagrid/mettagrid_c.cpython-311-darwin.so,sha256=wxA1YIcF9XZ-gyatD1y-5ZkLCJZsKL4ZNrBi9emmyyM,334000
-mettagrid/mettagrid_env.py,sha256=vld7ZRqTqof3yPa-bh4YECAq1ogjayxh8dSwbu41Kto,6478
+mettagrid/mettagrid_env.py,sha256=HLEcfNUb97vGi_wPn1W0sjK34mx04jCvVIoCzFRNIKU,6331
 mettagrid/objects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mettagrid/objects/agent.cpython-311-darwin.so,sha256=BAd--z_jI_Np5sOgV9TV9FjgXW0KB4_3qcpQG9sjNRM,57608
 mettagrid/objects/agent.hpp,sha256=JCbToyoajLPtMpobUnakwQMtY-hg_WJsaKAKtsawL-c,4279
@@ -320,7 +319,7 @@ tests/regen_track_last_action_trace.py,sha256=a1QdBRkvvBC7C0ZANQiwknb3QFQa6iHkNm
 tests/test_basic.py,sha256=moICNw_9L_lfSQRT2k7LWdEIEC9x2kwK1o46ClVvz2Q,4861
 tests/test_kinship.py,sha256=TvyPBbVazgYMGP-KbkWqKoo1QO1d3iT2uPwccyKypss,2406
 tests/test_leaks.py,sha256=Uo-L5h68knTDVcnSUZ8rNXeb-rcMTOqZNOB0SYTC5_I,570
-mettagrid-0.1.3.dist-info/LICENSE,sha256=_0ZygdDOImEUQjXap6LgAetwhuvlOfOqcMDmNlAdjLo,1070
-mettagrid-0.1.3.dist-info/METADATA,sha256=ufVd6N0CuhNWi9y1a1XN5TRRbZh9XaSwwAlwSKm6tMA,7166
-mettagrid-0.1.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-mettagrid-0.1.3.dist-info/RECORD,,
+mettagrid-0.1.4.dist-info/LICENSE,sha256=_0ZygdDOImEUQjXap6LgAetwhuvlOfOqcMDmNlAdjLo,1070
+mettagrid-0.1.4.dist-info/METADATA,sha256=nkDgfNsFwyu7hhzg_OtLV4dkjhxl9-zZJc6TUYWUkJU,7166
+mettagrid-0.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+mettagrid-0.1.4.dist-info/RECORD,,

mettagrid/config/config.py

@@ -1,47 +0,0 @@
-import os
-import random
-import signal
-
-import numpy as np
-import torch
-from omegaconf import OmegaConf
-from rich import traceback
-import warnings
-
-warnings.warn("This config.py file is deprecated", DeprecationWarning)
-
-def uniform(min_val, max_val, center, *, _root_):
-    sampling = _root_["sampling"]
-    if sampling == 0:
-        return center
-
-    center = (max_val + min_val) // 2
-    # Calculate the available range on both sides of the center
-    left_range = center - min_val
-    right_range = max_val - center
-
-    # Scale the ranges based on the sampling parameter
-    scaled_left = min(left_range, sampling * left_range)
-    scaled_right = min(right_range, sampling * right_range)
-
-    # Generate a random value within the scaled range
-    val = np.random.uniform(center - scaled_left, center + scaled_right)
-
-    # Clip to ensure we stay within [min_val, max_val]
-    val = np.clip(val, min_val, max_val)
-
-    # Return integer if the original values were integers
-    return int(round(val)) if isinstance(center, int) else val
-
-def choose(*args):
-    return random.choice(args)
-
-def div(a, b):
-    return a // b
-
-def sub(a, b):
-    return a - b
-
-def make_odd(a):
-    return max(3, a // 2 * 2 + 1)
-