robocandywrapper 0.2.12__tar.gz → 0.2.13__tar.gz

{robocandywrapper-0.2.12/robocandywrapper.egg-info → robocandywrapper-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robocandywrapper
-Version: 0.2.12
+Version: 0.2.13
 Summary: Sweet wrappers for extending and remixing LeRobot Datasets
 Author: RoboCandyWrapper Contributors
 License: MIT License
@@ -42,7 +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: lerobot-policy-diffusion-motion-primitives
 Requires-Dist: motion-primitives
 Requires-Dist: rewact_tools
 Provides-Extra: dev
@@ -50,6 +49,7 @@ Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: black>=22.0.0; extra == "dev"
 Requires-Dist: isort>=5.10.0; extra == "dev"
 Requires-Dist: flake8>=4.0.0; extra == "dev"
+Requires-Dist: lerobot-policy-diffusion-motion-primitives; extra == "dev"
 Dynamic: license-file
 Dynamic: requires-python
 

{robocandywrapper-0.2.12 → robocandywrapper-0.2.13}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "robocandywrapper"
-version = "0.2.12"
+version = "0.2.13"
 description = "Sweet wrappers for extending and remixing LeRobot Datasets"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.11"
 license = {file = "LICENSE"}
 authors = [
     {name = "RoboCandyWrapper Contributors"}
@@ -27,7 +27,6 @@ dependencies = [
     "torch>=2.0.0",
     "lerobot>=0.4,<0.5",
     "pandas>=1.3.0",
-    "lerobot-policy-diffusion-motion-primitives",
     "motion-primitives",
     "rewact_tools",
 ]
@@ -38,6 +37,7 @@ dev = [
     "black>=22.0.0",
     "isort>=5.10.0",
     "flake8>=4.0.0",
+    "lerobot-policy-diffusion-motion-primitives"
 ]
 
 [project.urls]

{robocandywrapper-0.2.12 → robocandywrapper-0.2.13}/robocandywrapper/__init__.py

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

{robocandywrapper-0.2.12 → robocandywrapper-0.2.13}/robocandywrapper/wrapper.py

@@ -388,33 +388,36 @@ class WrappedRobotDataset(torch.utils.data.Dataset):
         dataset_renames = []
         for dataset in self._datasets:
             ds_renames = {}
-            ds_keys = set(dataset.features)
+            # Track available keys as renames are applied: start with original
+            # features, remove sources that are renamed away, add targets that
+            # are renamed into.  This allows transitionary renames like
+            # action → action.pos  then  action.eef_pose → action.
+            available_keys = set(dataset.features)
             
             for source, target in self.key_rename_map.items():
-                if source in ds_keys:
-                    if target in ds_keys:
-                        # Target already exists in this dataset - skip rename to avoid conflict
+                if source in available_keys:
+                    if target in available_keys:
                         logging.warning(
                             f"Skipping rename '{source}' -> '{target}' for {dataset.repo_id}: "
                             f"target key already exists in dataset"
                         )
                     else:
                         ds_renames[source] = target
+                        available_keys.discard(source)
+                        available_keys.add(target)
                         
-                        # Also handle the _is_pad suffix that LeRobot adds for delta_timestamps
-                        # These keys are dynamically added during __getitem__ and may not be in
-                        # dataset.features, but we still want to rename them consistently
                         is_pad_source = f"{source}_is_pad"
                         is_pad_target = f"{target}_is_pad"
                         
-                        # Check for conflicts on the _is_pad key as well
-                        if is_pad_target in ds_keys:
+                        if is_pad_target in available_keys:
                             logging.warning(
                                 f"Skipping derived rename '{is_pad_source}' -> '{is_pad_target}' "
                                 f"for {dataset.repo_id}: target key already exists in dataset"
                             )
                         else:
                             ds_renames[is_pad_source] = is_pad_target
+                            available_keys.discard(is_pad_source)
+                            available_keys.add(is_pad_target)
             
             dataset_renames.append(ds_renames)
         

{robocandywrapper-0.2.12 → robocandywrapper-0.2.13/robocandywrapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robocandywrapper
-Version: 0.2.12
+Version: 0.2.13
 Summary: Sweet wrappers for extending and remixing LeRobot Datasets
 Author: RoboCandyWrapper Contributors
 License: MIT License
@@ -42,7 +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: lerobot-policy-diffusion-motion-primitives
 Requires-Dist: motion-primitives
 Requires-Dist: rewact_tools
 Provides-Extra: dev
@@ -50,6 +49,7 @@ Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: black>=22.0.0; extra == "dev"
 Requires-Dist: isort>=5.10.0; extra == "dev"
 Requires-Dist: flake8>=4.0.0; extra == "dev"
+Requires-Dist: lerobot-policy-diffusion-motion-primitives; extra == "dev"
 Dynamic: license-file
 Dynamic: requires-python
 

{robocandywrapper-0.2.12 → robocandywrapper-0.2.13}/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.12",
+    version="0.2.13",
     description="Sweet wrappers for extending and remixing LeRobot Datasets",
     long_description=long_description,
     long_description_content_type="text/markdown",

{robocandywrapper-0.2.12 → robocandywrapper-0.2.13}/robocandywrapper.egg-info/requires.txt

@@ -2,7 +2,6 @@ numpy>=1.20.0
 torch>=2.0.0
 lerobot<0.5,>=0.4
 pandas>=1.3.0
-lerobot-policy-diffusion-motion-primitives
 motion-primitives
 rewact_tools
 
@@ -11,3 +10,4 @@ pytest>=7.0.0
 black>=22.0.0
 isort>=5.10.0
 flake8>=4.0.0
+lerobot-policy-diffusion-motion-primitives