mettagrid 0.2.0.1__tar.gz → 0.2.0.2__tar.gz

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mettagrid
-Version: 0.2.0.1
+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

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

@@ -46,11 +46,12 @@ 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",
     ]

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

@@ -5,10 +5,10 @@ backend-path = ["."]
 
 [project]
 name = "mettagrid" # Do not change! Has to be 'mettagrid' for our PyPi package
-version = "0.2.0.1"
+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" }

{mettagrid-0.2.0.1 → 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.0.1 → 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.0.1 → mettagrid-0.2.0.2}/src/mettagrid.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mettagrid
-Version: 0.2.0.1
+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

{mettagrid-0.2.0.1 → mettagrid-0.2.0.2}/src/mettagrid.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ src/metta/mettagrid/builder/__init__.py
 src/metta/mettagrid/builder/building.py
 src/metta/mettagrid/builder/empty_converters.py
 src/metta/mettagrid/builder/envs.py
+src/metta/mettagrid/config/config.py
 src/metta/mettagrid/map_builder/__init__.py
 src/metta/mettagrid/map_builder/ascii.py
 src/metta/mettagrid/map_builder/map_builder.py