microecs 0.3.4__tar.gz → 0.3.7__tar.gz

{microecs-0.3.4 → microecs-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: microecs
-Version: 0.3.4
+Version: 0.3.7
 Summary: MicroECS: Minimal Entity Component System (ECS) in python and numpy
 Home-page: https://gitlab.com/meehai/microecs
 License: MIT

{microecs-0.3.4 → microecs-0.3.7}/microecs/query_result.py

@@ -11,11 +11,12 @@ class _Field(np.lib.mixins.NDArrayOperatorsMixin):
         self._lens = [len(p) for p in self.parts]
         self.len = sum(self._lens)
         self.shape: Shape = (len(self), *self.parts[0].shape[1:])
+        self.dtype = self.parts[0].dtype
         self._bounds = np.cumsum([0, *self._lens])
 
     def numpy(self) -> np.ndarray:
-        """Creates a numpy array from the underlying pool parts"""
-        return np.concatenate(self.parts)
+        """Creates a numpy array from the underlying pool parts. For len==1, we return the same object!"""
+        return np.concatenate(self.parts) if len(self.parts) != 1 else self.parts[0]
 
     def _chunk(self, x: T, i: int) -> T:
         if isinstance(x, _Field):
@@ -58,7 +59,7 @@ class _Field(np.lib.mixins.NDArrayOperatorsMixin):
     def __setitem__(self, key, value):
         if (not (isinstance(key, slice) and key == slice(None)) and
             not (isinstance(key, tuple) and key and key[0] == slice(None))):
-            raise TypeError("entity-axis assignment crosses pools; use [:] or [:, k]")
+            raise TypeError("entity-axis assignment crosses pools; use [:] or [:, k] or [i][...]")
 
         if isinstance(value, _Field):
             for i, part in enumerate(self.parts):
@@ -78,11 +79,11 @@ class _Field(np.lib.mixins.NDArrayOperatorsMixin):
             pool_ix = int(np.searchsorted(self._bounds, key, side="right")) - 1
             return self.parts[pool_ix][key - self._bounds[pool_ix]]
 
-        if not (isinstance(key, tuple) and key and key[0] == slice(None)):
-            raise TypeError("Unsupported indexing. Use .numpy() for a proper array. To set items, use qr.attr[:, k]=xxx"
-                            ". For fancy indexing qr[i, 0:3, k], use qr[i][0:3, k].")
+        if key is Ellipsis or (isinstance(key, tuple) and key and (key[0] is Ellipsis or key[0] == slice(None))):
+            return _Field([part[key] for part in self.parts])
 
-        return _Field([part[key] for part in self.parts])
+        raise TypeError("Unsupported indexing. Use .numpy() for a proper array. To set items, use qr.attr[:, k]=xxx. "
+                        "For fancy indexing qr[i, 0:3, k], use qr[i][0:3, k].")
 
     def __iter__(self):
         for part in self.parts:
@@ -110,7 +111,7 @@ class QueryResult:
         if (data := self.__dict__.get("_data")) is not None and name in data:
             # the 'or' part is in case no pools match the query and we want qr.position[:] += 1 still to work (noop)
             return _Field(data[name] or [np.empty((0, *self._field_shapes[name]), self._field_dtypes[name])])
-        raise AttributeError(name)
+        raise AttributeError(f"'{name}' not part of {self._fields}")
 
     def __setattr__(self, name, value):
         if (data := self.__dict__.get("_data")) is not None and name in data:

{microecs-0.3.4 → microecs-0.3.7}/microecs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: microecs
-Version: 0.3.4
+Version: 0.3.7
 Summary: MicroECS: Minimal Entity Component System (ECS) in python and numpy
 Home-page: https://gitlab.com/meehai/microecs
 License: MIT

{microecs-0.3.4 → microecs-0.3.7}/setup.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from setuptools import setup, find_packages
 
 NAME = "microecs"
-VERSION = "0.3.4"
+VERSION = "0.3.7"
 DESCRIPTION = "MicroECS: Minimal Entity Component System (ECS) in python and numpy"
 URL = "https://gitlab.com/meehai/microecs"