unienv 0.0.1b5__tar.gz → 0.0.1b7__tar.gz

{unienv-0.0.1b5/unienv.egg-info → unienv-0.0.1b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unienv
-Version: 0.0.1b5
+Version: 0.0.1b7
 Summary: Unified robot environment framework supporting multiple tensor and simulation backends
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/UniEnvOrg/UniEnv
@@ -12,9 +12,10 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
-Requires-Dist: xbarray>=0.0.1a8
+Requires-Dist: xbarray>=0.0.1a13
 Requires-Dist: pillow
 Requires-Dist: cloudpickle
+Requires-Dist: pyvers
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Provides-Extra: gymnasium

{unienv-0.0.1b5 → unienv-0.0.1b7}/pyproject.toml

@@ -3,13 +3,14 @@ name = "unienv"
 description = "Unified robot environment framework supporting multiple tensor and simulation backends"
 readme = "README.md"
 license = "MIT"
-version = "0.0.1b5"
+version = "0.0.1b7"
 requires-python = ">= 3.10"
 dependencies = [
     "numpy",
-    "xbarray>=0.0.1a8",
+    "xbarray>=0.0.1a13",
     "pillow",
     "cloudpickle",
+    "pyvers",
 ]
 
 [project.optional-dependencies]

{unienv-0.0.1b5 → unienv-0.0.1b7/unienv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unienv
-Version: 0.0.1b5
+Version: 0.0.1b7
 Summary: Unified robot environment framework supporting multiple tensor and simulation backends
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/UniEnvOrg/UniEnv
@@ -12,9 +12,10 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
-Requires-Dist: xbarray>=0.0.1a8
+Requires-Dist: xbarray>=0.0.1a13
 Requires-Dist: pillow
 Requires-Dist: cloudpickle
+Requires-Dist: pyvers
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Provides-Extra: gymnasium

{unienv-0.0.1b5 → unienv-0.0.1b7}/unienv.egg-info/SOURCES.txt

@@ -23,11 +23,18 @@ unienv_data/replay_buffer/trajectory_replay_buffer.py
 unienv_data/samplers/__init__.py
 unienv_data/samplers/multiprocessing_sampler.py
 unienv_data/samplers/step_sampler.py
+unienv_data/storages/_episode_storage.py
+unienv_data/storages/_list_storage.py
+unienv_data/storages/backend_compat.py
 unienv_data/storages/dict_storage.py
 unienv_data/storages/flattened.py
 unienv_data/storages/hdf5.py
+unienv_data/storages/image_storage.py
+unienv_data/storages/npz_storage.py
 unienv_data/storages/pytorch.py
 unienv_data/storages/transformation.py
+unienv_data/storages/video_storage.py
+unienv_data/third_party/tensordict/memmap_tensor.py
 unienv_data/transformations/image_compress.py
 unienv_interface/__init__.py
 unienv_interface/backends/__init__.py
@@ -66,8 +73,10 @@ unienv_interface/space/spaces/union.py
 unienv_interface/transformations/__init__.py
 unienv_interface/transformations/batch_and_unbatch.py
 unienv_interface/transformations/chained_transform.py
+unienv_interface/transformations/crop.py
 unienv_interface/transformations/dict_transform.py
 unienv_interface/transformations/filter_dict.py
+unienv_interface/transformations/identity.py
 unienv_interface/transformations/image_resize.py
 unienv_interface/transformations/iter_transform.py
 unienv_interface/transformations/rescale.py

{unienv-0.0.1b5 → unienv-0.0.1b7}/unienv.egg-info/requires.txt

@@ -1,7 +1,8 @@
 numpy
-xbarray>=0.0.1a8
+xbarray>=0.0.1a13
 pillow
 cloudpickle
+pyvers
 
 [dev]
 pytest

{unienv-0.0.1b5 → unienv-0.0.1b7}/unienv_data/base/common.py

@@ -7,6 +7,7 @@ from unienv_interface.env_base.env import ContextType, ObsType, ActType
 from unienv_interface.space import Space, BoxSpace, DictSpace
 import dataclasses
 
+from functools import cached_property
 from unienv_interface.space.space_utils import batch_utils as space_batch_utils, flatten_utils as space_flatten_utils
 
 __all__ = [
@@ -46,13 +47,18 @@ class BatchBase(abc.ABC, Generic[BatchT, BArrayType, BDeviceType, BDtypeType, BR
     ):
         self.single_space = single_space
         self.single_metadata_space = single_metadata_space
-        self._batched_space : Space[BatchT, BDeviceType, BDtypeType, BRNGType] = space_batch_utils.batch_space(single_space, 1)
-        if single_metadata_space is not None:
-            self._batched_metadata_space : DictSpace[
-                BDeviceType, BDtypeType, BRNGType
-            ] = space_batch_utils.batch_space(single_metadata_space, 1)
+
+    # For backwards compatibility
+    @cached_property
+    def _batched_space(self) -> Space[BatchT, BDeviceType, BDtypeType, BRNGType]:
+        return space_batch_utils.batch_space(self.single_space, 1)
+    
+    @cached_property
+    def _batched_metadata_space(self) -> Optional[DictSpace[BDeviceType, BDtypeType, BRNGType]]:
+        if self.single_metadata_space is not None:
+            return space_batch_utils.batch_space(self.single_metadata_space, 1)
         else:
-            self._batched_metadata_space = None
+            return None
 
     @property
     def backend(self) -> ComputeBackend[BArrayType, BDeviceType, BDtypeType, BRNGType]:
@@ -146,7 +152,7 @@ class BatchBase(abc.ABC, Generic[BatchT, BArrayType, BDeviceType, BDtypeType, BR
         if tqdm:
             from tqdm import tqdm
             iterable_start = tqdm(iterable_start, desc="Extending Batch")
-        for start_idx in range(0, n_total, chunk_size):
+        for start_idx in iterable_start:
             end_idx = min(start_idx + chunk_size, n_total)
             data_chunk = other.get_at(slice(start_idx, end_idx))
             self.extend(data_chunk)
@@ -183,15 +189,24 @@ class BatchSampler(
     ) -> None:
         super().__init__(single_space=single_space, single_metadata_space=single_metadata_space)
         self.batch_size = batch_size
-        self._batched_space : Space[SamplerBatchT, SamplerDeviceType, SamplerDtypeType, SamplerRNGType] = space_batch_utils.batch_space(self.single_space, batch_size)
-        self._batched_metadata_space : Optional[DictSpace[SamplerDeviceType, SamplerDtypeType, SamplerRNGType]] = space_batch_utils.batch_space(self.single_metadata_space, batch_size) if self.single_metadata_space is not None else None
-
+    
     def manual_seed(self, seed : int) -> None:
         if self.rng is not None:
             self.rng = self.backend.random.random_number_generator(seed, device=self.device)
         if self.data_rng is not None:
             self.data_rng = self.backend.random.random_number_generator(seed, device=self.data.device)
 
+    @cached_property
+    def _batched_space(self) -> Space[BatchT, BDeviceType, BDtypeType, BRNGType]:
+        return space_batch_utils.batch_space(self.single_space, self.batch_size)
+    
+    @cached_property
+    def _batched_metadata_space(self) -> Optional[DictSpace[BDeviceType, BDtypeType, BRNGType]]:
+        if self.single_metadata_space is not None:
+            return space_batch_utils.batch_space(self.single_metadata_space, self.batch_size)
+        else:
+            return None
+    
     @property
     def sampled_space(self) -> Space[SamplerBatchT, SamplerDeviceType, SamplerDtypeType, SamplerRNGType]:
         return self._batched_space

{unienv-0.0.1b5 → unienv-0.0.1b7}/unienv_data/batches/backend_compat.py

@@ -36,7 +36,7 @@ def data_to(
             key: data_to(value, source_backend, target_backend, target_device)
             for key, value in data.items()
         }
-    elif isinstance(data, Sequence):
+    elif isinstance(data, Sequence) and not isinstance(data, (str, bytes)):
         data = [
             data_to(value, source_backend, target_backend, target_device)
             for value in data

{unienv-0.0.1b5 → unienv-0.0.1b7}/unienv_data/batches/combined_batch.py

@@ -94,7 +94,7 @@ class CombinedBatch(BatchBase[
         batch_index = int(self.backend.sum(
             idx >= self.index_caches[:, 0]
         ) - 1)
-        return batch_index, idx - self.index_caches[batch_index, 0]
+        return batch_index, idx - int(self.index_caches[batch_index, 0])
 
     def _convert_index(self, idx : Union[IndexableType, BArrayType]) -> Tuple[
         int, 

{unienv-0.0.1b5 → unienv-0.0.1b7}/unienv_data/replay_buffer/replay_buffer.py

@@ -2,6 +2,7 @@ import abc
 import os
 import dataclasses
 import multiprocessing as mp
+import ctypes
 from contextlib import nullcontext
 
 from typing import Generic, TypeVar, Optional, Any, Dict, Union, Tuple, Sequence, Callable, Type
@@ -94,6 +95,48 @@ class ReplayBuffer(BatchBase[BatchT, BArrayType, BDeviceType, BDtypeType, BRNGTy
                 metadata = json.load(f)
             return metadata.get('type', None) == __class__.__name__
         return False
+    
+    @staticmethod
+    def get_length_from_path(
+        path : Union[str, os.PathLike]
+    ) -> Optional[int]:
+        if os.path.exists(os.path.join(path, "metadata.json")):
+            with open(os.path.join(path, "metadata.json"), "r") as f:
+                metadata = json.load(f)
+            if metadata.get('type', None) != __class__.__name__:
+                return None
+            return int(metadata["count"])
+        return None
+    
+    @staticmethod
+    def get_capacity_from_path(
+        path : Union[str, os.PathLike]
+    ) -> Optional[int]:
+        if os.path.exists(os.path.join(path, "metadata.json")):
+            with open(os.path.join(path, "metadata.json"), "r") as f:
+                metadata = json.load(f)
+            if metadata.get('type', None) != __class__.__name__:
+                return None
+            return int(metadata["capacity"])
+        return None
+    
+    @staticmethod
+    def get_space_from_path(
+        path : Union[str, os.PathLike],
+        *,
+        backend: ComputeBackend[BArrayType, BDeviceType, BDtypeType, BRNGType],
+        device: Optional[BDeviceType] = None,
+    ) -> Optional[Space[BatchT, BDeviceType, BDtypeType, BRNGType]]:
+        if os.path.exists(os.path.join(path, "metadata.json")):
+            with open(os.path.join(path, "metadata.json"), "r") as f:
+                metadata = json.load(f)
+            if metadata.get('type', None) != __class__.__name__:
+                return None
+            single_instance_space = bsu.json_to_space(
+                metadata["single_instance_space"], backend, device
+            )
+            return single_instance_space
+        return None
 
     @staticmethod
     def load_from(
@@ -167,11 +210,11 @@ class ReplayBuffer(BatchBase[BatchT, BArrayType, BDeviceType, BDtypeType, BRNGTy
         self._storage_path_relative = storage_path_relative
         self._cache_path = cache_path
         self._multiprocessing = multiprocessing
-        if multiprocessing:
+        if multiprocessing and storage.is_mutable:
             assert storage.is_multiprocessing_safe, "Storage is not multiprocessing safe"
-            self._lock = mp.Lock()
-            self._count_value = mp.Value("q", int(count))
-            self._offset_value = mp.Value("q", int(offset))
+            self._lock = mp.RLock()
+            self._count_value = mp.Value(ctypes.c_long, int(count))
+            self._offset_value = mp.Value(ctypes.c_long, int(offset))
         else:
             self._lock = None
             self._count_value = int(count)
@@ -201,22 +244,22 @@ class ReplayBuffer(BatchBase[BatchT, BArrayType, BDeviceType, BDtypeType, BRNGTy
 
     @property
     def count(self) -> int:
-        return self._count_value.value if self._multiprocessing else self._count_value
+        return self._count_value.value if not isinstance(self._count_value, int) else self._count_value
 
     @count.setter
     def count(self, value: int) -> None:
-        if self._multiprocessing:
+        if not isinstance(self._count_value, int):
             self._count_value.value = int(value)
         else:
             self._count_value = int(value)
     
     @property
     def offset(self) -> int:
-        return self._offset_value.value if self._multiprocessing else self._offset_value
+        return self._offset_value.value if not isinstance(self._offset_value, int) else self._offset_value
 
     @offset.setter
     def offset(self, value: int) -> None:
-        if self._multiprocessing:
+        if not isinstance(self._offset_value, int):
             self._offset_value.value = int(value)
         else:
             self._offset_value = int(value)