robocandywrapper 0.2.15__tar.gz → 0.2.17__tar.gz

{robocandywrapper-0.2.15/robocandywrapper.egg-info → robocandywrapper-0.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robocandywrapper
-Version: 0.2.15
+Version: 0.2.17
 Summary: Sweet wrappers for extending and remixing LeRobot Datasets
 Author: RoboCandyWrapper Contributors
 License: MIT License
@@ -42,10 +42,6 @@ Requires-Dist: numpy>=1.20.0
 Requires-Dist: torch>=2.0.0
 Requires-Dist: lerobot<0.5,>=0.4
 Requires-Dist: pandas>=1.3.0
-Requires-Dist: rewact_tools
-Requires-Dist: motion-primitives
-Requires-Dist: lerobot-policy-diffusion-motion-primitives
-Requires-Dist: lerobot-policy-diffusion-pointing
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: black>=22.0.0; extra == "dev"

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "robocandywrapper"
-version = "0.2.15"
+version = "0.2.17"
 description = "Sweet wrappers for extending and remixing LeRobot Datasets"
 readme = "README.md"
 requires-python = ">=3.10,<3.11"
@@ -27,10 +27,6 @@ dependencies = [
     "torch>=2.0.0",
     "lerobot>=0.4,<0.5",
     "pandas>=1.3.0",
-    "rewact_tools",
-    "motion-primitives",
-    "lerobot-policy-diffusion-motion-primitives",
-    "lerobot-policy-diffusion-pointing",
 ]
 
 [project.optional-dependencies]
@@ -56,12 +52,6 @@ override-dependencies = [
     "evdev>=0.0.0; sys_platform == 'never'",
 ]
 
-[tool.uv.sources]
-lerobot-policy-diffusion-motion-primitives = { path = "../../experimental/lerobot_policy_diffusion_motion_primitives", editable = true }
-lerobot-policy-diffusion-pointing = { path = "../../experimental/lerobot_policy_diffusion_pointing", editable = true }
-motion-primitives = { path = "../../experimental/motion_primitives", editable = true }
-rewact-tools = { path = "../rewACT/rewact_tools", editable = true }
-
 [tool.black]
 line-length = 100
 target-version = ['py310']

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/robocandywrapper/__init__.py

@@ -18,7 +18,7 @@ from robocandywrapper.constants import (
     MOTION_PRIMITIVE_PLUGIN_NAME,
 )
 
-__version__ = "0.2.15"
+__version__ = "0.2.17"
 
 __all__ = [
     "DatasetPlugin",

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/robocandywrapper/dataformats/lerobot_21/convert_v20_to_v21.py

@@ -34,7 +34,7 @@ from huggingface_hub import HfApi
 from tqdm import tqdm
 
 from lerobot.datasets.compute_stats import aggregate_stats, get_feature_stats, sample_indices
-from lerobot.datasets.utils import load_stats, write_info
+from lerobot.datasets.io_utils import load_stats, write_info
 
 from robocandywrapper.dataformats.lerobot_21.dataset import LeRobot21Dataset
 from robocandywrapper.dataformats.lerobot_21.utils import (

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/robocandywrapper/dataformats/lerobot_21/dataset.py

@@ -38,24 +38,34 @@ from lerobot.datasets.utils import (
     DEFAULT_IMAGE_PATH,
     INFO_PATH,
     LEGACY_TASKS_PATH as TASKS_PATH,
+    check_version_compatibility,
+    create_lerobot_dataset_card,
+    get_safe_version,
+    is_valid_version,
+)
+from lerobot.datasets.feature_utils import (
     _validate_feature_names,
     check_delta_timestamps,
-    check_version_compatibility,
     create_empty_dataset_info,
-    create_lerobot_dataset_card,
-    embed_images,
     get_delta_indices,
     get_hf_features_from_features,
-    get_safe_version,
-    hf_transform_to_torch,
-    is_valid_version,
-    load_info,
-    load_stats,
     validate_episode_buffer,
     validate_frame,
+)
+from lerobot.datasets.io_utils import (
+    embed_images,
+    load_info,
+    load_stats,
     write_info,
     write_json,
 )
+
+def hf_transform_to_torch(item):
+    """Compat shim: transforms HF dataset items to torch tensors."""
+    for key in item:
+        if isinstance(item[key], np.ndarray):
+            item[key] = torch.from_numpy(item[key])
+    return item
 # Import legacy v2.1-specific functions that were removed in lerobot 0.4.1
 from robocandywrapper.dataformats.lerobot_21.utils import (
     append_jsonlines,
@@ -749,7 +759,7 @@ class LeRobot21Dataset(torch.utils.data.Dataset):
 
     def __getitem__(self, idx) -> dict:
         item = self.hf_dataset[idx]
-        ep_idx = item["episode_index"].item()
+        ep_idx = item["episode_index"].item() if isinstance(item["episode_index"], torch.Tensor) else item["episode_index"]
 
         query_indices = None
         if self.delta_indices is not None:
@@ -760,7 +770,7 @@ class LeRobot21Dataset(torch.utils.data.Dataset):
                 item[key] = val
 
         if len(self.meta.video_keys) > 0:
-            current_ts = item["timestamp"].item()
+            current_ts = item["timestamp"].item() if isinstance(item["timestamp"], torch.Tensor) else item["timestamp"]
             query_timestamps = self._get_query_timestamps(current_ts, query_indices)
             video_frames = self._query_videos(query_timestamps, ep_idx)
             item = {**video_frames, **item}
@@ -771,7 +781,7 @@ class LeRobot21Dataset(torch.utils.data.Dataset):
                 item[cam] = self.image_transforms(item[cam])
 
         # Add task as a string
-        task_idx = item["task_index"].item()
+        task_idx = item["task_index"].item() if isinstance(item["task_index"], torch.Tensor) else item["task_index"]
         item["task"] = self.meta.tasks[task_idx]
 
         # Hack - add gripper position to end

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/robocandywrapper/factory.py

@@ -10,7 +10,7 @@ from lerobot.datasets.lerobot_dataset import (
     LeRobotDataset,
     LeRobotDatasetMetadata,
 )
-from lerobot.datasets.backward_compatibility import BackwardCompatibilityError
+from lerobot.datasets.utils import BackwardCompatibilityError
 from lerobot.datasets.transforms import ImageTransforms
 from lerobot.datasets.factory import IMAGENET_STATS
 from lerobot.utils.constants import ACTION, REWARD
@@ -71,7 +71,7 @@ def _create_datasets(
     root: Optional[str],
     revision: Optional[str],
     episodes: Optional[list[int] | dict[str, list[int]]],
-    video_backend: str,
+    video_backend: str | None,
     action_delta_indices: Optional[List] = None,
     observation_delta_indices: Optional[List] = None,
     reward_delta_indices: Optional[List] = None,
@@ -250,7 +250,7 @@ def make_dataset_without_config(
     action_delta_indices: List = None,
     observation_delta_indices: List = None,
     root: str = None,
-    video_backend: str = "pyav",
+    video_backend: str | None = None,
     episodes: list[int] | dict[str, list[int]] | None = None,
     revision: str | None = None,
     use_imagenet_stats: bool = True,

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/robocandywrapper/plugins/control_mode.py

@@ -197,9 +197,12 @@ class ControlModeInstance(PluginInstance):
         """Find the episode_modes.json file for a dataset root, or None."""
         cw = dataset_root / CANDYWRAPPER_PLUGINS_DIR
         legacy = cw / "dagger_data_source" / "episode_modes.json"
+        legacy_2 = dataset_root / "dagger_data_source" / "episode_modes.json"
         current = cw / CONTROL_MODE_PLUGIN_NAME / "episode_modes.json"
         if legacy.exists():
             return legacy
+        if legacy_2.exists():
+            return legacy_2
         if current.exists():
             return current
         return None

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/robocandywrapper/wrapper.py

@@ -627,7 +627,7 @@ class WrappedRobotDataset(torch.utils.data.Dataset):
         else:
             item = dataset[local_idx]
 
-        episode_idx = item["episode_index"].item()
+        episode_idx = item["episode_index"].item() if isinstance(item["episode_index"], torch.Tensor) else item["episode_index"]
         
         # Add dataset index
         item["dataset_index"] = torch.tensor(dataset_idx)

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17/robocandywrapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robocandywrapper
-Version: 0.2.15
+Version: 0.2.17
 Summary: Sweet wrappers for extending and remixing LeRobot Datasets
 Author: RoboCandyWrapper Contributors
 License: MIT License
@@ -42,10 +42,6 @@ Requires-Dist: numpy>=1.20.0
 Requires-Dist: torch>=2.0.0
 Requires-Dist: lerobot<0.5,>=0.4
 Requires-Dist: pandas>=1.3.0
-Requires-Dist: rewact_tools
-Requires-Dist: motion-primitives
-Requires-Dist: lerobot-policy-diffusion-motion-primitives
-Requires-Dist: lerobot-policy-diffusion-pointing
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: black>=22.0.0; extra == "dev"

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/robocandywrapper.egg-info/requires.txt

@@ -2,10 +2,6 @@ numpy>=1.20.0
 torch>=2.0.0
 lerobot<0.5,>=0.4
 pandas>=1.3.0
-rewact_tools
-motion-primitives
-lerobot-policy-diffusion-motion-primitives
-lerobot-policy-diffusion-pointing
 
 [dev]
 pytest>=7.0.0

{robocandywrapper-0.2.15 → robocandywrapper-0.2.17}/setup.py

@@ -9,7 +9,7 @@ long_description = readme_file.read_text(encoding="utf-8") if readme_file.exists
 
 setup(
     name="robocandywrapper",
-    version="0.2.15",
+    version="0.2.17",
     description="Sweet wrappers for extending and remixing LeRobot Datasets",
     long_description=long_description,
     long_description_content_type="text/markdown",