mettagrid 0.2__tar.gz → 0.2.0.2__tar.gz

{mettagrid-0.2 → mettagrid-0.2.0.2}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mettagrid
-Version: 0.2
+Version: 0.2.0.2
 Summary: A fast grid-based open-ended MARL environment
 Author-email: David Bloomin <daveey@gmail.com>
 License-Expression: MIT
 Project-URL: Homepage, https://daveey.github.io
 Project-URL: Repository, https://github.com/Metta-AI/mettagrid
 Keywords: gridworld,minigrid,rl,reinforcement-learning,environment,gym
-Requires-Python: ==3.11.7
+Requires-Python: <3.12,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3>=1.38.32
@@ -18,7 +18,7 @@ Requires-Dist: google-auth-oauthlib>=1.0.0
 Requires-Dist: gymnasium==0.29.1
 Requires-Dist: matplotlib>=3.10.3
 Requires-Dist: numpy<2,>=1.26.4
-Requires-Dist: omegaconf>=2.4.0.dev3
+Requires-Dist: omegaconf>=2.3.0
 Requires-Dist: duckdb>=1.3.0
 Requires-Dist: pettingzoo<1.25,>=1.24.1
 Requires-Dist: pufferlib<3.1.0,>=3.0.0

{mettagrid-0.2 → mettagrid-0.2.0.2}/bazel_build.py

@@ -23,6 +23,7 @@ from setuptools.build_meta import (
     prepare_metadata_for_build_editable,
     prepare_metadata_for_build_wheel,
 )
+from setuptools.dist import Distribution
 
 PROJECT_ROOT = Path(__file__).resolve().parent
 
@@ -31,9 +32,7 @@ def _run_bazel_build() -> None:
     """Run Bazel build to compile the C++ extension."""
     # Check if bazel is available
     if shutil.which("bazel") is None:
-        raise RuntimeError(
-            "Bazel is required to build metta-mettagrid. Please install Bazel: https://bazel.build/install"
-        )
+        raise RuntimeError("Bazel is required to build mettagrid. Please install Bazel: https://bazel.build/install")
 
     # Determine build configuration from environment
     debug = os.environ.get("DEBUG", "").lower() in ("1", "true", "yes")
@@ -47,11 +46,13 @@ def _run_bazel_build() -> None:
     else:
         config = "dbg" if debug else "opt"
 
-    # Build the Python extension
+    # Build the Python extension with auto-detected parallelism
     cmd = [
         "bazel",
         "build",
         f"--config={config}",
+        "--jobs=auto",
+        "--verbose_failures",
         "//:mettagrid_c",
     ]
 
@@ -59,7 +60,10 @@ def _run_bazel_build() -> None:
     result = subprocess.run(cmd, cwd=PROJECT_ROOT, capture_output=True, text=True)
 
     if result.returncode != 0:
-        print(f"Bazel build failed:\n{result.stderr}", file=sys.stderr)
+        print("Bazel build failed. STDERR:", file=sys.stderr)
+        print(result.stderr, file=sys.stderr)
+        print("Bazel build STDOUT:", file=sys.stderr)
+        print(result.stdout, file=sys.stderr)
         raise RuntimeError("Bazel build failed")
 
     # Copy the built extension to the package directory
@@ -92,7 +96,14 @@ def _run_bazel_build() -> None:
 def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
     """Build a wheel, compiling the C++ extension with Bazel first."""
     _run_bazel_build()
-    return _build_wheel(wheel_directory, config_settings, metadata_directory)
+    # Ensure wheel is tagged as non-pure (platform-specific) since we bundle a native extension
+    # Setuptools/wheel derive purity from Distribution.has_ext_modules(). Monkeypatch to force True.
+    original_has_ext_modules = Distribution.has_ext_modules
+    try:
+        Distribution.has_ext_modules = lambda self: True  # type: ignore[assignment]
+        return _build_wheel(wheel_directory, config_settings, metadata_directory)
+    finally:
+        Distribution.has_ext_modules = original_has_ext_modules
 
 
 def build_editable(wheel_directory, config_settings=None, metadata_directory=None):

{mettagrid-0.2 → mettagrid-0.2.0.2}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "bazel_build"
 backend-path = ["."]
 
 [project]
-name = "mettagrid"
-version = "0.2"
+name = "mettagrid" # Do not change! Has to be 'mettagrid' for our PyPi package
+version = "0.2.0.2"
 description = "A fast grid-based open-ended MARL environment"
 authors = [{ name = "David Bloomin", email = "daveey@gmail.com" }]
-requires-python = "==3.11.7"
+requires-python = ">=3.11,<3.12"
 license = "MIT"
 readme = "README.md"
 urls = { Homepage = "https://daveey.github.io", Repository = "https://github.com/Metta-AI/mettagrid" }
@@ -29,7 +29,7 @@ dependencies = [
   "gymnasium==0.29.1",
   "matplotlib>=3.10.3",
   "numpy>=1.26.4,<2",
-  "omegaconf>=2.4.0.dev3",
+  "omegaconf>=2.3.0",
   "duckdb>=1.3.0",
   "pettingzoo>=1.24.1,<1.25",
   "pufferlib>=3.0.0,<3.1.0",

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/actions/get_output.hpp

@@ -26,11 +26,7 @@ protected:
     // Once we generalize this to `get`, we should be able to get from any HasInventory object, which
     // should include agents. That's (e.g.) why we're checking inventory_is_accessible.
     Converter* converter = dynamic_cast<Converter*>(_grid->object_at(target_loc));
-    Box* box = dynamic_cast<Box*>(_grid->object_at(target_loc));
-    if (!converter && !box) {
-      return false;
-    }
-    // If converter, get output from converter
+
     if (converter) {
       if (!converter->inventory_is_accessible()) {
         return false;
@@ -55,32 +51,6 @@ protected:
       }
       return resources_taken;
     }
-
-    // If box, pick up box if allowed
-    if (box) {
-      if (actor->agent_id == box->creator_agent_id) {
-        // Creator cannot open their own box
-        return false;
-      }
-      // If the creator of the box is an agent, return blue battery to creator and penalize creator
-      if (box->creator_agent_id != 255) {
-        Agent* creator = dynamic_cast<Agent*>(_grid->object(box->creator_agent_object_id));
-        if (!creator) {
-          return false;
-        }
-        // Return required resources to create box to creator inventory
-        for (const auto& [item, amount] : box->returned_resources) {
-          if (amount > 0) {
-            creator->update_inventory(item, amount);
-          }
-        }
-      }
-
-      // Reward the agent for opening the box and teleport back to top-left corner
-      _grid->ghost_move_object(box->id, GridLocation(0, 0, GridLayer::ObjectLayer));
-      actor->stats.add("box.opened", 1.0f);
-      return true;
-    }
     return false;
   }
 };

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/builder/envs.py

@@ -112,7 +112,7 @@ def make_navigation(num_agents: int) -> MettaGridConfig:
             resource_names=["heart"],
             actions=ActionsConfig(
                 move=ActionConfig(),
-                rotate=ActionConfig(),
+                rotate=ActionConfig(enabled=False),
                 get_items=ActionConfig(),
             ),
             agent=AgentConfig(
@@ -149,7 +149,7 @@ def make_navigation_sequence(num_agents: int) -> MettaGridConfig:
             resource_names=["heart", "ore_red", "battery_red"],
             actions=ActionsConfig(
                 move=ActionConfig(),
-                rotate=ActionConfig(),
+                rotate=ActionConfig(enabled=False),
                 get_items=ActionConfig(),
             ),
             agent=AgentConfig(
@@ -173,7 +173,7 @@ def make_navigation_sequence(num_agents: int) -> MettaGridConfig:
 
 
 def make_icl_resource_chain(
-    num_agents: int, max_steps, game_objects: dict, map_builder_objects: dict
+    num_agents: int, max_steps, game_objects: dict, map_builder_objects: dict, width: int = 6, height: int = 6
 ) -> MettaGridConfig:
     game_objects["wall"] = empty_converters.wall
     cfg = MettaGridConfig(
@@ -184,7 +184,7 @@ def make_icl_resource_chain(
             map_builder=MapGen.Config(
                 instances=num_agents,
                 instance_map=PerimeterInContextMapBuilder.Config(
-                    agents=1, width=6, height=6, objects=map_builder_objects
+                    agents=1, width=width, height=height, objects=map_builder_objects
                 ),
             ),
             actions=ActionsConfig(

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/grid.hpp

@@ -69,15 +69,6 @@ public:
     return true;
   }
 
-  inline bool ghost_add_object(GridObject* obj) {
-    if (!is_valid_location(obj->location)) {
-      return false;
-    }
-    obj->id = static_cast<GridObjectId>(this->objects.size());
-    this->objects.push_back(std::unique_ptr<GridObject>(obj));
-    return true;
-  }
-
   // Removes an object from the grid and gives ownership of the object to the caller.
   // Since the caller is now the owner, this can make the raw pointer invalid, if the
   // returned unique_ptr is destroyed.
@@ -104,24 +95,6 @@ public:
     return true;
   }
 
-  // Force move an object to a location without it being registered in the grid at the new location
-  inline bool ghost_move_object(GridObjectId id, const GridLocation& loc) {
-    if (!is_valid_location(loc)) {
-      return false;
-    }
-
-    GridObject* obj = object(id);
-    if (!obj) {
-      return false;
-    }
-
-    // Remove the object from its current location
-    grid[obj->location.r][obj->location.c][obj->location.layer] = 0;
-
-    obj->location = loc;
-    return true;
-  }
-
   inline void swap_objects(GridObjectId id1, GridObjectId id2) {
     GridObject* obj1 = object(id1);
     GridObject* obj2 = object(id2);

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/mettagrid_c.cpp

@@ -16,7 +16,6 @@
 #include "actions/get_output.hpp"
 #include "actions/move.hpp"
 #include "actions/noop.hpp"
-#include "actions/place_box.hpp"
 #include "actions/put_recipe_items.hpp"
 #include "actions/rotate.hpp"
 #include "actions/swap.hpp"
@@ -24,7 +23,6 @@
 #include "grid.hpp"
 #include "hash.hpp"
 #include "objects/agent.hpp"
-#include "objects/box.hpp"
 #include "objects/constants.hpp"
 #include "objects/converter.hpp"
 #include "objects/converter_config.hpp"
@@ -85,8 +83,6 @@ MettaGrid::MettaGrid(const GameConfig& game_config, const py::list map, unsigned
   for (const auto& [action_name, action_config] : game_config.actions) {
     if (action_name == "put_items") {
       _action_handlers.push_back(std::make_unique<PutRecipeItems>(*action_config));
-    } else if (action_name == "place_box") {
-      _action_handlers.push_back(std::make_unique<PlaceBox>(*action_config));
     } else if (action_name == "get_items") {
       _action_handlers.push_back(std::make_unique<GetOutput>(*action_config));
     } else if (action_name == "noop") {
@@ -168,14 +164,6 @@ MettaGrid::MettaGrid(const GameConfig& game_config, const py::list map, unsigned
         continue;
       }
 
-      const BoxConfig* box_config = dynamic_cast<const BoxConfig*>(object_cfg);
-      if (box_config) {
-        Box* box = new Box(r, c, *box_config, 255, 255);  // Default creator values
-        _grid->add_object(box);
-        _stats->incr("objects." + cell);
-        continue;
-      }
-
       const ConverterConfig* converter_config = dynamic_cast<const ConverterConfig*>(object_cfg);
       if (converter_config) {
         // Create a new ConverterConfig with the recipe offsets from the observation encoder
@@ -204,14 +192,6 @@ MettaGrid::MettaGrid(const GameConfig& game_config, const py::list map, unsigned
         if (_global_obs_config.visitation_counts) {
           agent->init_visitation_grid(height, width);
         }
-        // add agent box
-        if (game_config.objects.contains("box")) {
-          const BoxConfig* local_box_cfg = dynamic_cast<const BoxConfig*>(game_config.objects.at("box").get());
-          if (local_box_cfg) {
-            agent->box = new Box(0, 0, *local_box_cfg, agent->id, static_cast<unsigned char>(agent->agent_id));
-            _grid->ghost_add_object(agent->box);
-          }
-        }
         add_agent(agent);
         _group_sizes[agent->group] += 1;
         continue;
@@ -929,15 +909,6 @@ PYBIND11_MODULE(mettagrid_c, m) {
 
   bind_wall_config(m);
 
-  py::class_<BoxConfig, GridObjectConfig, std::shared_ptr<BoxConfig>>(m, "BoxConfig")
-      .def(py::init<TypeId, const std::string&, const std::map<InventoryItem, InventoryQuantity>&>(),
-           py::arg("type_id"),
-           py::arg("type_name") = "box",
-           py::arg("returned_resources"))
-      .def_readwrite("type_id", &BoxConfig::type_id)
-      .def_readwrite("type_name", &BoxConfig::type_name)
-      .def_readwrite("returned_resources", &BoxConfig::returned_resources);
-
   // ##MettaGridConfig
   // We expose these as much as we can to Python. Defining the initializer (and the object's constructor) means
   // we can create these in Python as AgentConfig(**agent_config_dict). And then we expose the fields individually.

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/mettagrid_c.pyi

@@ -186,6 +186,7 @@ class GameConfig:
         track_movement_metrics: bool = False,
         recipe_details_obs: bool = False,
         allow_diagonals: bool = False,
+        reward_estimates: Optional[dict[str, float]] = None,
     ) -> None: ...
     num_agents: int
     max_steps: int
@@ -200,6 +201,7 @@ class GameConfig:
     track_movement_metrics: bool
     recipe_details_obs: bool
     allow_diagonals: bool
+    reward_estimates: Optional[dict[str, float]]
 
 class MettaGrid:
     obs_width: int

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/mettagrid_c_config.py

@@ -1,13 +1,12 @@
 from metta.mettagrid.mettagrid_c import ActionConfig as CppActionConfig
 from metta.mettagrid.mettagrid_c import AgentConfig as CppAgentConfig
 from metta.mettagrid.mettagrid_c import AttackActionConfig as CppAttackActionConfig
-from metta.mettagrid.mettagrid_c import BoxConfig as CppBoxConfig
 from metta.mettagrid.mettagrid_c import ChangeGlyphActionConfig as CppChangeGlyphActionConfig
 from metta.mettagrid.mettagrid_c import ConverterConfig as CppConverterConfig
 from metta.mettagrid.mettagrid_c import GameConfig as CppGameConfig
 from metta.mettagrid.mettagrid_c import GlobalObsConfig as CppGlobalObsConfig
 from metta.mettagrid.mettagrid_c import WallConfig as CppWallConfig
-from metta.mettagrid.mettagrid_config import AgentConfig, BoxConfig, ConverterConfig, GameConfig, WallConfig
+from metta.mettagrid.mettagrid_config import AgentConfig, ConverterConfig, GameConfig, WallConfig
 
 
 def recursive_update(d, u):
@@ -156,16 +155,6 @@ def convert_to_cpp_game_config(mettagrid_config: dict | GameConfig):
                 swappable=object_config.swappable,
             )
             objects_cpp_params[object_type] = cpp_wall_config
-        elif isinstance(object_config, BoxConfig):
-            returned_resources = game_config.actions.place_box.consumed_resources
-            cpp_box_config = CppBoxConfig(
-                type_id=object_config.type_id,
-                type_name=object_type,
-                returned_resources={
-                    resource_name_to_id[k]: v for k, v in returned_resources.items() if k in resource_name_to_id
-                },
-            )
-            objects_cpp_params[object_type] = cpp_box_config
         else:
             raise ValueError(f"Unknown object type: {object_type}")
 

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/mettagrid_config.hpp

@@ -42,6 +42,7 @@ struct GameConfig {
   bool track_movement_metrics = false;
   bool recipe_details_obs = false;
   bool allow_diagonals = false;
+  std::map<std::string, float> reward_estimates = {};
 };
 
 namespace py = pybind11;
@@ -79,7 +80,8 @@ inline void bind_game_config(py::module& m) {
                     // FEATURE FLAGS
                     bool,
                     bool,
-                    bool>(),
+                    bool,
+                    const std::map<std::string, float>&>(),
            py::arg("num_agents"),
            py::arg("max_steps"),
            py::arg("episode_truncates"),
@@ -95,7 +97,8 @@ inline void bind_game_config(py::module& m) {
            // FEATURE FLAGS
            py::arg("track_movement_metrics"),
            py::arg("recipe_details_obs") = false,
-           py::arg("allow_diagonals") = false)
+           py::arg("allow_diagonals") = false,
+           py::arg("reward_estimates") = std::map<std::string, float>())
       .def_readwrite("num_agents", &GameConfig::num_agents)
       .def_readwrite("max_steps", &GameConfig::max_steps)
       .def_readwrite("episode_truncates", &GameConfig::episode_truncates)
@@ -116,7 +119,8 @@ inline void bind_game_config(py::module& m) {
       // FEATURE FLAGS
       .def_readwrite("track_movement_metrics", &GameConfig::track_movement_metrics)
       .def_readwrite("recipe_details_obs", &GameConfig::recipe_details_obs)
-      .def_readwrite("allow_diagonals", &GameConfig::allow_diagonals);
+      .def_readwrite("allow_diagonals", &GameConfig::allow_diagonals)
+      .def_readwrite("reward_estimates", &GameConfig::reward_estimates);
 }
 
 #endif  // METTAGRID_CONFIG_HPP_

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/mettagrid_config.py

@@ -74,8 +74,7 @@ class ActionsConfig(Config):
     noop: ActionConfig = Field(default_factory=lambda: ActionConfig(enabled=False))
     move: ActionConfig = Field(default_factory=lambda: ActionConfig(enabled=True))  # Default movement action
     rotate: ActionConfig = Field(default_factory=lambda: ActionConfig(enabled=False))
-    put_items: ActionConfig = Field(default_factory=lambda: ActionConfig(enabled=False))
-    place_box: ActionConfig = Field(default_factory=lambda: ActionConfig(enabled=False))
+    put_items: ActionConfig = Field(default_factory=lambda: ActionConfig(enabled=True))
     get_items: ActionConfig = Field(default_factory=lambda: ActionConfig(enabled=True))
     attack: AttackActionConfig = Field(default_factory=lambda: AttackActionConfig(enabled=False))
     swap: ActionConfig = Field(default_factory=lambda: ActionConfig(enabled=False))
@@ -107,14 +106,6 @@ class WallConfig(Config):
     swappable: bool = Field(default=False)
 
 
-class BoxConfig(Config):
-    """Python box configuration."""
-
-    type_id: int = Field(default=0, ge=0, le=255)
-    # We don't allow setting of returned_resources -- it should always match
-    # the consumed_resources by place_box.
-
-
 class ConverterConfig(Config):
     """Python converter configuration."""
 
@@ -160,7 +151,7 @@ class GameConfig(Config):
     agents: list[AgentConfig] = Field(default_factory=list)
     actions: ActionsConfig = Field(default_factory=lambda: ActionsConfig(noop=ActionConfig()))
     global_obs: GlobalObsConfig = Field(default_factory=GlobalObsConfig)
-    objects: dict[str, ConverterConfig | WallConfig | BoxConfig] = Field(default_factory=dict)
+    objects: dict[str, ConverterConfig | WallConfig] = Field(default_factory=dict)
     # these are not used in the C++ code, but we allow them to be set for other uses.
     # E.g., templates can use params as a place where values are expected to be written,
     # and other parts of the template can read from there.
@@ -180,6 +171,8 @@ class GameConfig(Config):
     )
     allow_diagonals: bool = Field(default=False, description="Enable actions to be aware of diagonal orientations")
 
+    reward_estimates: Optional[dict[str, float]] = Field(default=None)
+
 
 class MettaGridConfig(Config):
     """Environment configuration."""

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/mettagrid_env.py

@@ -59,6 +59,8 @@ class MettaGridEnv(MettaGridPufferBase):
         self._episode_id: str | None = None
         self._last_reset_ts = datetime.datetime.now()
         self._is_training = is_training
+        self._label_completions = {"completed_tasks": [], "completion_rates": {}}
+        self.per_label_rewards = {}
 
         # DesyncEpisodes - when training we want to stagger experience. The first episode
         # will end early so that the next episode can begin at a different time on each worker.
@@ -125,7 +127,25 @@ class MettaGridEnv(MettaGridPufferBase):
         self.timer.start("thread_idle")
         return observations, rewards, terminals, truncations, infos
 
-    def _process_episode_completion(self, infos: Dict[str, Any]) -> None:
+    def _update_label_completions(self, moving_avg_window: int = 500) -> None:
+        """Update label completions."""
+        label = self.mg_config.label
+
+        # keep track of a list of the last 500 labels
+        if len(self._label_completions["completed_tasks"]) >= moving_avg_window:
+            self._label_completions["completed_tasks"].pop(0)
+        self._label_completions["completed_tasks"].append(label)
+
+        # moving average of the completion rates
+        self._label_completions["completion_rates"] = {t: 0 for t in set(self._label_completions["completed_tasks"])}
+        for t in self._label_completions["completed_tasks"]:
+            self._label_completions["completion_rates"][t] += 1
+        self._label_completions["completion_rates"] = {
+            t: self._label_completions["completion_rates"][t] / len(self._label_completions["completed_tasks"])
+            for t in self._label_completions["completion_rates"]
+        }
+
+    def _process_episode_completion(self, infos: Dict[str, Any], moving_avg_window: int = 500, alpha=0.9) -> None:
         """Process episode completion - stats, etc."""
         self.timer.start("process_episode_stats")
 
@@ -148,6 +168,29 @@ class MettaGridEnv(MettaGridPufferBase):
         for n, v in infos["agent"].items():
             infos["agent"][n] = v / self.num_agents
 
+        # If reward estimates are set, plot them compared to the mean reward
+        if self.mg_config.game.reward_estimates:
+            infos["reward_estimates"] = {}
+            infos["reward_estimates"]["diff_from_efficient_optimal"] = (
+                self.mg_config.game.reward_estimates["most_efficient_optimal_reward"] - episode_rewards.mean()
+            )
+            infos["reward_estimates"]["diff_from_inefficient_optimal"] = (
+                self.mg_config.game.reward_estimates["least_efficient_optimal_reward"] - episode_rewards.mean()
+            )
+
+        self._update_label_completions(moving_avg_window)
+
+        # only plot label completions once we have a full moving average window, to prevent initial bias
+        if len(self._label_completions["completed_tasks"]) == moving_avg_window:
+            infos["label_completions"] = self._label_completions["completion_rates"]
+
+        if self.mg_config.label not in self.per_label_rewards:
+            self.per_label_rewards[self.mg_config.label] = 0
+        self.per_label_rewards[self.mg_config.label] += episode_rewards.mean()
+        infos["per_label_rewards"] = (
+            alpha * self.per_label_rewards[self.mg_config.label] + (1 - alpha) * episode_rewards.mean()
+        )
+
         # Add attributes
         attributes: Dict[str, Any] = {
             "seed": self._current_seed,

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/objects/agent.hpp

@@ -10,7 +10,6 @@
 #include "../stats_tracker.hpp"
 #include "agent_config.hpp"
 #include "constants.hpp"
-#include "objects/box.hpp"
 #include "types.hpp"
 
 class Agent : public GridObject {
@@ -44,7 +43,6 @@ public:
   GridLocation prev_location;
   std::string prev_action_name;
   unsigned int steps_without_motion;
-  Box* box;
 
   Agent(GridCoord r, GridCoord c, const AgentConfig& config)
       : group(config.group_id),
@@ -67,8 +65,7 @@ public:
         reward(nullptr),
         prev_location(r, c, GridLayer::AgentLayer),
         prev_action_name(""),
-        steps_without_motion(0),
-        box(nullptr) {
+        steps_without_motion(0) {
     populate_initial_inventory(config.initial_inventory);
     GridObject::init(config.type_id, config.type_name, GridLocation(r, c, GridLayer::AgentLayer));
   }

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/metta/mettagrid/util/file.py

@@ -34,7 +34,6 @@ from wandb.errors import CommError
 #  Globals                                                                     #
 # --------------------------------------------------------------------------- #
 
-WANDB_ENTITY: str = os.getenv("WANDB_ENTITY", "metta-research")
 GOOGLE_DRIVE_CREDENTIALS_FILE: str = os.getenv("GOOGLE_DRIVE_CREDENTIALS_FILE", "~/.config/gcloud/credentials.json")
 GOOGLE_DRIVE_TOKEN_FILE: str = os.getenv("GOOGLE_DRIVE_TOKEN_FILE", "~/.config/gcloud/token.json")
 
@@ -256,6 +255,7 @@ def is_public_uri(url: str | None) -> bool:
 class WandbURI:
     """Parsed representation of a W&B artifact URI."""
 
+    entity: str
     project: str
     artifact_path: str
     version: str = "latest"
@@ -273,26 +273,40 @@ class WandbURI:
             path_part, version = body, "latest"
 
         if "/" not in path_part:
-            raise ValueError("Malformed W&B URI – expected wandb://<project>/<artifact_path>[:<version>]")
+            raise ValueError("Malformed W&B URI – expected wandb://entity/project/artifact:version")
+
+        parts = path_part.split("/")
+
+        if len(parts) >= 3:
+            entity = parts[0]
+            project = parts[1]
+            artifact_path = "/".join(parts[2:])
+        elif len(parts) == 2:
+            # 2-part format: use WANDB_ENTITY if set; otherwise default to 'metta-research'
+            # Note: Do not import from metta.* here; mettagrid must remain decoupled.
+            project = parts[0]
+            artifact_path = parts[1]
+            entity = os.getenv("WANDB_ENTITY", "metta-research")
+        else:
+            raise ValueError("Malformed W&B URI – expected wandb://entity/project/artifact:version")
 
-        project, artifact_path = path_part.split("/", 1)
-        if not artifact_path:
-            raise ValueError("Artifact path must be non-empty")
+        if not project or not artifact_path:
+            raise ValueError("Project and artifact path must be non-empty")
 
-        return cls(project, artifact_path, version)
+        return cls(entity, project, artifact_path, version)
 
     # ---------- helpers ---------- #
     def qname(self) -> str:
         """`entity/project/artifact_path:version` – accepted by `wandb.Api().artifact()`."""
-        return f"{WANDB_ENTITY}/{self.project}/{self.artifact_path}:{self.version}"
+        return f"{self.entity}/{self.project}/{self.artifact_path}:{self.version}"
 
     def http_url(self) -> str:
         """Human-readable URL for this artifact version."""
-        return f"https://wandb.ai/{WANDB_ENTITY}/{self.project}/artifacts/{self.artifact_path}/{self.version}"
+        return f"https://wandb.ai/{self.entity}/{self.project}/artifacts/{self.artifact_path}/{self.version}"
 
     # pretty print
     def __str__(self) -> str:  # noqa: D401 (keep dunder)
-        return f"wandb://{self.project}/{self.artifact_path}:{self.version}"
+        return f"wandb://{self.entity}/{self.project}/{self.artifact_path}:{self.version}"
 
 
 def upload_bytes_to_wandb(uri: WandbURI, blob: bytes, name: str) -> None:
@@ -306,7 +320,7 @@ def upload_bytes_to_wandb(uri: WandbURI, blob: bytes, name: str) -> None:
 
 
 @contextmanager
-def wandb_export_context(project: str, entity: str = WANDB_ENTITY) -> wandb.Run:
+def wandb_export_context(project: str, entity: str) -> wandb.Run:
     """
     Context manager that ensures a wandb run exists for artifact exports.
     TODO: Remove this after switching to using wandb_context
@@ -376,7 +390,7 @@ def upload_file_to_wandb(uri, local_file: str, name: str) -> None:
         )
 
     try:
-        with wandb_export_context(uri.project, WANDB_ENTITY) as run:
+        with wandb_export_context(uri.project, uri.entity) as run:
             # Create and log the artifact
             artifact = wandb.Artifact(uri.artifact_path, type="file")
             artifact.add_file(local_file, name=name)

{mettagrid-0.2 → mettagrid-0.2.0.2}/src/mettagrid.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mettagrid
-Version: 0.2
+Version: 0.2.0.2
 Summary: A fast grid-based open-ended MARL environment
 Author-email: David Bloomin <daveey@gmail.com>
 License-Expression: MIT
 Project-URL: Homepage, https://daveey.github.io
 Project-URL: Repository, https://github.com/Metta-AI/mettagrid
 Keywords: gridworld,minigrid,rl,reinforcement-learning,environment,gym
-Requires-Python: ==3.11.7
+Requires-Python: <3.12,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3>=1.38.32
@@ -18,7 +18,7 @@ Requires-Dist: google-auth-oauthlib>=1.0.0
 Requires-Dist: gymnasium==0.29.1
 Requires-Dist: matplotlib>=3.10.3
 Requires-Dist: numpy<2,>=1.26.4
-Requires-Dist: omegaconf>=2.4.0.dev3
+Requires-Dist: omegaconf>=2.3.0
 Requires-Dist: duckdb>=1.3.0
 Requires-Dist: pettingzoo<1.25,>=1.24.1
 Requires-Dist: pufferlib<3.1.0,>=3.0.0