mettagrid 0.2.0.11__tar.gz → 0.2.0.12__tar.gz

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mettagrid
-Version: 0.2.0.11
+Version: 0.2.0.12
 Summary: A fast grid-based open-ended MARL environment
 Author-email: David Bloomin <daveey@gmail.com>
 License-Expression: MIT

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/bindings/mettagrid_c.cpp

@@ -178,7 +178,6 @@ MettaGrid::MettaGrid(const GameConfig& game_config, const py::list map, unsigned
         _grid->add_object(converter);
         _stats->incr("objects." + cell);
         converter->set_event_manager(_event_manager.get());
-        converter->stats.set_environment(this);
         continue;
       }
 
@@ -211,7 +210,6 @@ MettaGrid::MettaGrid(const GameConfig& game_config, const py::list map, unsigned
         Assembler* assembler = new Assembler(r, c, config_with_offsets);
         _grid->add_object(assembler);
         _stats->incr("objects." + cell);
-        assembler->stats.set_environment(this);
         assembler->set_grid(_grid.get());
         assembler->set_current_timestep_ptr(&current_step);
         continue;
@@ -222,7 +220,6 @@ MettaGrid::MettaGrid(const GameConfig& game_config, const py::list map, unsigned
         Chest* chest = new Chest(r, c, *chest_config);
         _grid->add_object(chest);
         _stats->incr("objects." + cell);
-        chest->stats.set_environment(this);
         chest->set_grid(_grid.get());
         continue;
       }
@@ -777,7 +774,6 @@ py::dict MettaGrid::get_episode_stats() {
   // {
   //   "game": dict[str, float],  // Global game statistics
   //   "agent": list[dict[str, float]],  // Per-agent statistics
-  //   "converter": list[dict[str, float]]  // Per-converter statistics
   // }
   // All stat values are guaranteed to be floats from StatsTracker::to_dict()
 
@@ -790,26 +786,6 @@ py::dict MettaGrid::get_episode_stats() {
   }
   stats["agent"] = agent_stats;
 
-  // Collect converter stats
-  py::list converter_stats;
-  for (unsigned int obj_id = 1; obj_id < _grid->objects.size(); obj_id++) {
-    auto obj = _grid->object(obj_id);
-    if (!obj) continue;
-
-    // Check if this is a converter
-    Converter* converter = dynamic_cast<Converter*>(obj);
-    if (converter) {
-      // Add metadata to the converter's stats tracker BEFORE converting to dict
-      converter->stats.set("type_id", converter->type_id);
-      converter->stats.set("location.r", converter->location.r);
-      converter->stats.set("location.c", converter->location.c);
-
-      // Now convert to dict - all values will be floats
-      py::dict converter_stat = py::cast(converter->stats.to_dict());
-      converter_stats.append(converter_stat);
-    }
-  }
-  stats["converter"] = converter_stats;
   return stats;
 }
 
@@ -859,6 +835,13 @@ py::list MettaGrid::resource_names_py() {
   return py::cast(resource_names);
 }
 
+py::none MettaGrid::set_inventory(GridObjectId agent_id, const std::map<InventoryItem, InventoryQuantity>& inventory) {
+  if (agent_id < num_agents()) {
+    this->_agents[agent_id]->set_inventory(inventory);
+  }
+  return py::none();
+}
+
 // StatsTracker implementation that needs complete MettaGrid definition
 unsigned int StatsTracker::get_current_step() const {
   if (!_env) return 0;
@@ -908,7 +891,8 @@ PYBIND11_MODULE(mettagrid_c, m) {
       .def_readonly("max_steps", &MettaGrid::max_steps)
       .def_readonly("current_step", &MettaGrid::current_step)
       .def("resource_names", &MettaGrid::resource_names_py)
-      .def_readonly("initial_grid_hash", &MettaGrid::initial_grid_hash);
+      .def_readonly("initial_grid_hash", &MettaGrid::initial_grid_hash)
+      .def("set_inventory", &MettaGrid::set_inventory, py::arg("agent_id"), py::arg("inventory"));
 
   // Expose this so we can cast python WallConfig / AgentConfig / ConverterConfig to a common GridConfig cpp object.
   py::class_<GridObjectConfig, std::shared_ptr<GridObjectConfig>>(m, "GridObjectConfig");

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/bindings/mettagrid_c.hpp

@@ -80,6 +80,7 @@ public:
   py::dict feature_normalizations();
   py::dict feature_spec();
   size_t num_agents() const;
+  py::none set_inventory(GridObjectId agent_id, const std::map<InventoryItem, InventoryQuantity>& inventory);
   py::array_t<float> get_episode_rewards();
   py::dict get_episode_stats();
   py::object action_space();

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/include/mettagrid/actions/attack.hpp

@@ -4,6 +4,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
+#include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
@@ -175,8 +176,16 @@ private:
       snapshot.emplace_back(item, amount);
     }
 
-    // Transfer resources
+    // Transfer resources (excluding soul-bound resources)
     for (const auto& [item, amount] : snapshot) {
+      // Check if this resource is soul-bound for the target
+      if (std::find(target.soul_bound_resources.begin(),
+                    target.soul_bound_resources.end(),
+                    item) != target.soul_bound_resources.end()) {
+        // Skip soul-bound resources
+        continue;
+      }
+
       InventoryDelta stolen = actor.update_inventory(item, amount);
       target.update_inventory(item, -stolen);
 

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/include/mettagrid/objects/agent.hpp

@@ -29,6 +29,8 @@ public:
   std::map<InventoryItem, InventoryQuantity> resource_limits;
   float action_failure_penalty;
   std::string group_name;
+  // We expect only a small number (single-digit) of soul-bound resources.
+  std::vector<InventoryItem> soul_bound_resources;
   ObservationType color;
   ObservationType glyph;
   // Despite being a GridObjectId, this is different from the `id` property.
@@ -56,6 +58,7 @@ public:
         resource_limits(config.resource_limits),
         action_failure_penalty(config.action_failure_penalty),
         group_name(config.group_name),
+        soul_bound_resources(config.soul_bound_resources),
         color(0),
         glyph(0),
         agent_id(0),
@@ -119,6 +122,33 @@ public:
     return counts;
   }
 
+  void set_inventory(const std::map<InventoryItem, InventoryQuantity>& inventory) {
+    // First, remove items that are not present in the provided inventory map
+    // Make a copy of current item keys to avoid iterator invalidation
+    std::vector<InventoryItem> existing_items;
+    existing_items.reserve(this->inventory.size());
+    for (const auto& [existing_item, existing_amount] : this->inventory) {
+      if (existing_amount > 0) {
+        existing_items.push_back(existing_item);
+      }
+    }
+
+    for (const auto& existing_item : existing_items) {
+      auto it = this->inventory.find(existing_item);
+      assert(it != this->inventory.end());
+      InventoryQuantity current_amount = it->second;
+      if (current_amount > 0) {
+        this->update_inventory(existing_item, -static_cast<InventoryDelta>(current_amount));
+      }
+    }
+
+    // Then, set provided items to their specified amounts
+    for (const auto& [item, amount] : inventory) {
+      // Go through update_inventory to handle limits, deal with rewards, etc.
+      this->update_inventory(item, amount - this->inventory[item]);
+    }
+  }
+
   InventoryDelta update_inventory(InventoryItem item, InventoryDelta attempted_delta) {
     // Apply resource limits if adding items
     if (attempted_delta > 0) {

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/include/mettagrid/objects/agent_config.hpp

@@ -25,7 +25,8 @@ struct AgentConfig : public GridObjectConfig {
               const std::map<std::string, RewardType>& stat_reward_max = {},
               float group_reward_pct = 0,
               const std::map<InventoryItem, InventoryQuantity>& initial_inventory = {},
-              const std::vector<int>& tag_ids = {})
+              const std::vector<int>& tag_ids = {},
+              const std::vector<InventoryItem>& soul_bound_resources = {})
       : GridObjectConfig(type_id, type_name, tag_ids),
         group_id(group_id),
         group_name(group_name),
@@ -37,7 +38,8 @@ struct AgentConfig : public GridObjectConfig {
         stat_rewards(stat_rewards),
         stat_reward_max(stat_reward_max),
         group_reward_pct(group_reward_pct),
-        initial_inventory(initial_inventory) {}
+        initial_inventory(initial_inventory),
+        soul_bound_resources(soul_bound_resources) {}
 
   unsigned char group_id;
   std::string group_name;
@@ -50,6 +52,7 @@ struct AgentConfig : public GridObjectConfig {
   std::map<std::string, RewardType> stat_reward_max;
   float group_reward_pct;
   std::map<InventoryItem, InventoryQuantity> initial_inventory;
+  std::vector<InventoryItem> soul_bound_resources;
 };
 
 namespace py = pybind11;
@@ -69,7 +72,8 @@ inline void bind_agent_config(py::module& m) {
                     const std::map<std::string, RewardType>&,
                     float,
                     const std::map<InventoryItem, InventoryQuantity>&,
-                    const std::vector<int>&>(),
+                    const std::vector<int>&,
+                    const std::vector<InventoryItem>&>(),
            py::arg("type_id"),
            py::arg("type_name") = "agent",
            py::arg("group_id"),
@@ -83,7 +87,8 @@ inline void bind_agent_config(py::module& m) {
            py::arg("stat_reward_max") = std::map<std::string, RewardType>(),
            py::arg("group_reward_pct") = 0,
            py::arg("initial_inventory") = std::map<InventoryItem, InventoryQuantity>(),
-           py::arg("tag_ids") = std::vector<int>())
+           py::arg("tag_ids") = std::vector<int>(),
+           py::arg("soul_bound_resources") = std::vector<InventoryItem>())
       .def_readwrite("type_id", &AgentConfig::type_id)
       .def_readwrite("type_name", &AgentConfig::type_name)
       .def_readwrite("group_name", &AgentConfig::group_name)
@@ -97,7 +102,8 @@ inline void bind_agent_config(py::module& m) {
       .def_readwrite("stat_reward_max", &AgentConfig::stat_reward_max)
       .def_readwrite("group_reward_pct", &AgentConfig::group_reward_pct)
       .def_readwrite("initial_inventory", &AgentConfig::initial_inventory)
-      .def_readwrite("tag_ids", &AgentConfig::tag_ids);
+      .def_readwrite("tag_ids", &AgentConfig::tag_ids)
+      .def_readwrite("soul_bound_resources", &AgentConfig::soul_bound_resources);
 }
 
 #endif  // PACKAGES_METTAGRID_CPP_INCLUDE_METTAGRID_OBJECTS_AGENT_CONFIG_HPP_

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/include/mettagrid/objects/assembler.hpp

@@ -14,7 +14,6 @@
 #include "objects/constants.hpp"
 #include "objects/recipe.hpp"
 #include "objects/usable.hpp"
-#include "systems/stats_tracker.hpp"
 
 // Forward declaration
 class Agent;
@@ -88,12 +87,7 @@ private:
         if (it != agent->inventory.end()) {
           InventoryQuantity available = it->second;
           InventoryQuantity to_consume = static_cast<InventoryQuantity>(std::min<int>(available, remaining));
-          InventoryDelta delta = agent->update_inventory(item, static_cast<InventoryDelta>(-to_consume));
-          InventoryQuantity actually_consumed = static_cast<InventoryQuantity>(-delta);
-          remaining = static_cast<InventoryQuantity>(remaining - actually_consumed);
-          if (actually_consumed > 0) {
-            stats.add(stats.resource_name(item) + ".consumed", actually_consumed);
-          }
+          agent->update_inventory(item, static_cast<InventoryDelta>(-to_consume));
         }
       }
     }
@@ -102,11 +96,7 @@ private:
   // Give output resources to the triggering agent
   void give_output_to_agent(const Recipe& recipe, Agent& agent) {
     for (const auto& [item, amount] : recipe.output_resources) {
-      InventoryDelta delta = agent.update_inventory(item, static_cast<InventoryDelta>(amount));
-      InventoryQuantity actually_produced = static_cast<InventoryQuantity>(delta);
-      if (actually_produced > 0) {
-        stats.add(stats.resource_name(item) + ".produced", actually_produced);
-      }
+      agent.update_inventory(item, static_cast<InventoryDelta>(amount));
     }
   }
 
@@ -117,9 +107,6 @@ public:
   // Current cooldown state
   unsigned int cooldown_end_timestep;
 
-  // Stats tracking
-  class StatsTracker stats;
-
   // Grid access for finding surrounding agents
   class Grid* grid;
 
@@ -200,25 +187,20 @@ public:
       return false;
     }
     if (cooldown_remaining() > 0) {
-      stats.incr("assembler.blocked.cooldown");
       return false;
     }
     const Recipe* recipe = get_current_recipe();
     if (!recipe || (recipe->input_resources.empty() && recipe->output_resources.empty())) {
-      stats.incr("assembler.blocked.no_recipe");
       return false;
     }
     std::vector<Agent*> surrounding_agents = get_surrounding_agents();
     if (!can_afford_recipe(*recipe, surrounding_agents)) {
-      stats.incr("assembler.blocked.insufficient_resources");
       return false;
     }
     consume_resources_for_recipe(*recipe, surrounding_agents);
     give_output_to_agent(*recipe, actor);
-    stats.incr("assembler.recipes_executed");
     if (recipe->cooldown > 0) {
       cooldown_end_timestep = *current_timestep_ptr + recipe->cooldown;
-      stats.incr("assembler.cooldown_started");
     }
     return true;
   }
@@ -265,7 +247,6 @@ public:
   // Handle cooldown completion
   void finish_cooldown() {
     this->cooldown_end_timestep = 0;
-    stats.incr("assembler.cooldown_completed");
   }
 };
 

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/include/mettagrid/objects/chest.hpp

@@ -14,7 +14,6 @@
 #include "objects/constants.hpp"
 #include "objects/has_inventory.hpp"
 #include "objects/usable.hpp"
-#include "systems/stats_tracker.hpp"
 
 // Forward declaration
 class Agent;
@@ -62,19 +61,15 @@ private:
     // Check if agent has the required resource
     auto it = agent.inventory.find(resource_type);
     if (it == agent.inventory.end() || it->second == 0) {
-      stats.incr("chest.deposit_failed.no_resource");
       return false;
     }
 
     InventoryDelta deposited = update_inventory(resource_type, 1);
     if (deposited == 1) {
       agent.update_inventory(resource_type, -1);
-      stats.incr("chest.deposit_success");
-      stats.add(stats.resource_name(resource_type) + ".deposited", 1);
       return true;
     }
     // Chest couldn't accept the resource, give it back to agent
-    stats.incr("chest.deposit_failed.chest_full");
     return false;
   }
 
@@ -83,19 +78,15 @@ private:
     // Check if chest has the required resource
     auto it = inventory.find(resource_type);
     if (it == inventory.end() || it->second == 0) {
-      stats.incr("chest.withdraw_failed.no_resource");
       return false;
     }
 
     InventoryDelta withdrawn = agent.update_inventory(resource_type, 1);
     if (withdrawn == 1) {
       update_inventory(resource_type, -1);
-      stats.incr("chest.withdraw_success");
-      stats.add(stats.resource_name(resource_type) + ".withdrawn", 1);
       return true;
     }
     // Agent couldn't accept the resource, give it back to chest
-    stats.incr("chest.withdraw_failed.agent_full");
     return false;
   }
 
@@ -105,9 +96,6 @@ public:
   std::set<int> deposit_positions;
   std::set<int> withdrawal_positions;
 
-  // Stats tracking
-  class StatsTracker stats;
-
   // Grid access for finding agent positions
   class Grid* grid;
 
@@ -129,13 +117,11 @@ public:
   // Implement pure virtual method from Usable
   virtual bool onUse(Agent& actor, ActionArg /*arg*/) override {
     if (!grid) {
-      stats.incr("chest.use_failed.no_grid_or_agent");
       return false;
     }
 
     int agent_position_index = get_agent_relative_position_index(actor);
     if (agent_position_index == -1) {
-      stats.incr("chest.use_failed.not_adjacent");
       return false;
     }
 
@@ -145,7 +131,6 @@ public:
     } else if (is_withdrawal_position(agent_position_index)) {
       return withdraw_resource(actor);
     } else {
-      stats.incr("chest.use_failed.invalid_position");
       return false;
     }
   }

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/include/mettagrid/objects/converter.hpp

@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "core/event.hpp"
-#include "systems/stats_tracker.hpp"
 #include "objects/agent.hpp"
 #include "objects/constants.hpp"
 #include "objects/converter_config.hpp"
@@ -28,7 +27,6 @@ private:
     }
     // Check if the converter has reached max conversions
     if (this->max_conversions >= 0 && this->conversions_completed >= this->max_conversions) {
-      stats.incr("conversions.permanent_stop");
       return;
     }
     // Check if the converter is already at max output.
@@ -39,13 +37,11 @@ private:
       }
     }
     if (this->max_output >= 0 && total_output >= this->max_output) {
-      stats.incr("blocked.output_full");
       return;
     }
     // Check if the converter has enough input.
     for (const auto& [item, input_amount] : this->input_resources) {
       if (this->inventory.count(item) == 0 || this->inventory.at(item) < input_amount) {
-        stats.incr("blocked.insufficient_input");
         return;
       }
     }
@@ -64,12 +60,10 @@ private:
       if (this->inventory[item] == 0) {
         this->inventory.erase(item);
       }
-      stats.add(stats.resource_name(item) + ".consumed", amount);
     }
     // All the previous returns were "we don't start converting".
     // This one is us starting to convert.
     this->converting = true;
-    stats.incr("conversions.started");
     this->event_manager->schedule_event(EventType::FinishConverting, this->conversion_ticks, this->id, 0);
   }
 
@@ -89,7 +83,6 @@ public:
   unsigned char color;
   bool recipe_details_obs;
   EventManager* event_manager;
-  StatsTracker stats;
   ObservationType input_recipe_offset;
   ObservationType output_recipe_offset;
   unsigned short conversions_completed;
@@ -124,8 +117,6 @@ public:
 
   void finish_converting() {
     this->converting = false;
-    // Increment the stat unconditionally
-    stats.incr("conversions.completed");
 
     // Only increment the counter when tracking conversion limits
     if (this->max_conversions >= 0) {
@@ -135,13 +126,11 @@ public:
     // Add output to inventory
     for (const auto& [item, amount] : this->output_resources) {
       HasInventory::update_inventory(item, amount);
-      stats.add(stats.resource_name(item) + ".produced", amount);
     }
 
     if (this->cooldown > 0) {
       // Start cooldown phase
       this->cooling_down = true;
-      stats.incr("cooldown.started");
       this->event_manager->schedule_event(EventType::CoolDown, this->cooldown, this->id, 0);
     } else if (this->cooldown == 0) {
       // No cooldown, try to start converting again immediately
@@ -151,19 +140,11 @@ public:
 
   void finish_cooldown() {
     this->cooling_down = false;
-    stats.incr("cooldown.completed");
     this->maybe_start_converting();
   }
 
   InventoryDelta update_inventory(InventoryItem item, InventoryDelta attempted_delta) override {
     InventoryDelta delta = HasInventory::update_inventory(item, attempted_delta);
-    if (delta != 0) {
-      if (delta > 0) {
-        stats.add(stats.resource_name(item) + ".added", delta);
-      } else {
-        stats.add(stats.resource_name(item) + ".removed", -delta);
-      }
-    }
     this->maybe_start_converting();
     return delta;
   }

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/cpp/include/mettagrid/objects/production_handler.hpp

@@ -19,7 +19,6 @@ public:
     }
 
     converter->finish_converting();
-    converter->stats.incr(converter->type_name + ".produced");
   }
 };
 

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/mettagrid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mettagrid
-Version: 0.2.0.11
+Version: 0.2.0.12
 Summary: A fast grid-based open-ended MARL environment
 Author-email: David Bloomin <daveey@gmail.com>
 License-Expression: MIT

{mettagrid-0.2.0.11 → mettagrid-0.2.0.12}/mettagrid.egg-info/SOURCES.txt

@@ -211,7 +211,11 @@ nim/mettascope/data/fonts/Inter-Regular.ttf
 nim/mettascope/data/objects/agent.png
 nim/mettascope/data/objects/altar.png
 nim/mettascope/data/objects/armory.png
+nim/mettascope/data/objects/assembler.png
 nim/mettascope/data/objects/block.png
+nim/mettascope/data/objects/carbon_extractor.png
+nim/mettascope/data/objects/charger.png
+nim/mettascope/data/objects/chest.png
 nim/mettascope/data/objects/clay_oven.png
 nim/mettascope/data/objects/converter.png
 nim/mettascope/data/objects/factory.png
@@ -220,6 +224,7 @@ nim/mettascope/data/objects/generator.png
 nim/mettascope/data/objects/generator_blue.png
 nim/mettascope/data/objects/generator_green.png
 nim/mettascope/data/objects/generator_red.png
+nim/mettascope/data/objects/geranium_extractor.png
 nim/mettascope/data/objects/ice_tower.png
 nim/mettascope/data/objects/ice_vase.png
 nim/mettascope/data/objects/lab.png
@@ -229,7 +234,9 @@ nim/mettascope/data/objects/mine_blue.png
 nim/mettascope/data/objects/mine_green.png
 nim/mettascope/data/objects/mine_red-1.png
 nim/mettascope/data/objects/mine_red.png
+nim/mettascope/data/objects/oxygen_extractor.png
 nim/mettascope/data/objects/palm_tree.png
+nim/mettascope/data/objects/silicon_extractor.png
 nim/mettascope/data/objects/temple.png
 nim/mettascope/data/objects/unknown.png
 nim/mettascope/data/objects/wall.0.png
@@ -492,7 +499,6 @@ python/src/mettagrid/__init__.py
 python/src/mettagrid/core.py
 python/src/mettagrid/demo.py
 python/src/mettagrid/mettagrid_c.pyi
-python/src/mettagrid/mettagrid_c.so
 python/src/mettagrid/mettascope.py
 python/src/mettagrid/py.typed
 python/src/mettagrid/builder/__init__.py
@@ -849,7 +855,6 @@ python/src/mettagrid/mapgen/utils/ascii_grid.py
 python/src/mettagrid/mapgen/utils/draw.py
 python/src/mettagrid/mapgen/utils/make_scene_config.py
 python/src/mettagrid/mapgen/utils/pattern.py
-python/src/mettagrid/mapgen/utils/s3utils.py
 python/src/mettagrid/mapgen/utils/show.py
 python/src/mettagrid/mapgen/utils/storable_map.py
 python/src/mettagrid/mapgen/utils/storable_map_index.py
@@ -888,7 +893,6 @@ python/src/mettagrid/util/char_encoder.py
 python/src/mettagrid/util/debug.py
 python/src/mettagrid/util/dict_utils.py
 python/src/mettagrid/util/diversity.py
-python/src/mettagrid/util/file.py
 python/src/mettagrid/util/grid_object_formatter.py
 python/src/mettagrid/util/module.py
 python/src/mettagrid/util/replay_writer.py
@@ -927,6 +931,7 @@ tests/test_pufferlib_integration.py
 tests/test_resource_loss.py
 tests/test_rewards.py
 tests/test_rotate.py
+tests/test_set_inventory.py
 tests/test_stats_tracker.cpp
 tests/test_swap.py
 tests/test_tags.py