Migrate PR to new folder structure introduce on 1417

tests/datasets/test_aggregate.py

@@ -1,7 +1,7 @@
 import torch
 
-from lerobot.common.datasets.aggregate import aggregate_datasets
-from lerobot.common.datasets.lerobot_dataset import LeRobotDataset
+from lerobot.datasets.aggregate import aggregate_datasets
+from lerobot.datasets.lerobot_dataset import LeRobotDataset
 from tests.fixtures.constants import DUMMY_REPO_ID
 
 

tests/datasets/test_datasets.py

@@ -26,19 +26,19 @@ from PIL import Image
 from safetensors.torch import load_file
 
 import lerobot
-from lerobot.common.datasets.factory import make_dataset
-from lerobot.common.datasets.image_writer import image_array_to_pil_image
-from lerobot.common.datasets.lerobot_dataset import (
+from lerobot.datasets.factory import make_dataset
+from lerobot.datasets.image_writer import image_array_to_pil_image
+from lerobot.datasets.lerobot_dataset import (
     LeRobotDataset,
     MultiLeRobotDataset,
 )
-from lerobot.common.datasets.utils import (
+from lerobot.datasets.utils import (
     create_branch,
     hw_to_dataset_features,
 )
-from lerobot.common.envs.factory import make_env_config
-from lerobot.common.policies.factory import make_policy_config
-from lerobot.common.robots import make_robot_from_config
+from lerobot.envs.factory import make_env_config
+from lerobot.policies.factory import make_policy_config
+from lerobot.robots import make_robot_from_config
 from lerobot.configs.default import DatasetConfig
 from lerobot.configs.train import TrainPipelineConfig
 from tests.fixtures.constants import DUMMY_CHW, DUMMY_HWC, DUMMY_REPO_ID
@@ -107,7 +107,7 @@ def test_dataset_initialization(tmp_path, lerobot_dataset_factory):
 # and test the small resulting function that validates the features
 def test_dataset_feature_with_forward_slash_raises_error():
     # make sure dir does not exist
-    from lerobot.common.constants import HF_LEROBOT_HOME
+    from lerobot.constants import HF_LEROBOT_HOME
 
     dataset_dir = HF_LEROBOT_HOME / "lerobot/test/with/slash"
     # make sure does not exist

tests/datasets/test_utils.py

@@ -21,8 +21,8 @@ import torch
 from datasets import Dataset
 from huggingface_hub import DatasetCard
 
-from lerobot.common.datasets.push_dataset_to_hub.utils import calculate_episode_data_index
-from lerobot.common.datasets.utils import (
+from lerobot.datasets.push_dataset_to_hub.utils import calculate_episode_data_index
+from lerobot.datasets.utils import (
     create_lerobot_dataset_card,
     flatten_dict,
     hf_transform_to_torch,

tests/fixtures/files.py

@@ -19,7 +19,7 @@ import pyarrow.compute as pc
 import pyarrow.parquet as pq
 import pytest
 
-from lerobot.common.datasets.utils import (
+from lerobot.datasets.utils import (
     write_episodes,
     write_hf_dataset,
     write_info,

tests/fixtures/hub.py

@@ -18,7 +18,7 @@ import pandas as pd
 import pytest
 from huggingface_hub.utils import filter_repo_objects
 
-from lerobot.common.datasets.utils import (
+from lerobot.datasets.utils import (
     DEFAULT_DATA_PATH,
     DEFAULT_EPISODES_PATH,
     DEFAULT_TASKS_PATH,

tests/policies/test_policies.py

@@ -23,20 +23,20 @@ import torch
 from safetensors.torch import load_file
 
 from lerobot import available_policies
-from lerobot.common.datasets.factory import make_dataset
-from lerobot.common.datasets.utils import cycle, dataset_to_policy_features
-from lerobot.common.envs.factory import make_env, make_env_config
-from lerobot.common.envs.utils import preprocess_observation
-from lerobot.common.optim.factory import make_optimizer_and_scheduler
-from lerobot.common.policies.act.modeling_act import ACTTemporalEnsembler
-from lerobot.common.policies.factory import (
+from lerobot.datasets.factory import make_dataset
+from lerobot.datasets.utils import cycle, dataset_to_policy_features
+from lerobot.envs.factory import make_env, make_env_config
+from lerobot.envs.utils import preprocess_observation
+from lerobot.optim.factory import make_optimizer_and_scheduler
+from lerobot.policies.act.modeling_act import ACTTemporalEnsembler
+from lerobot.policies.factory import (
     get_policy_class,
     make_policy,
     make_policy_config,
 )
-from lerobot.common.policies.normalize import Normalize, Unnormalize
-from lerobot.common.policies.pretrained import PreTrainedPolicy
-from lerobot.common.utils.random_utils import seeded_context
+from lerobot.policies.normalize import Normalize, Unnormalize
+from lerobot.policies.pretrained import PreTrainedPolicy
+from lerobot.utils.random_utils import seeded_context
 from lerobot.configs.default import DatasetConfig
 from lerobot.configs.train import TrainPipelineConfig
 from lerobot.configs.types import FeatureType, NormalizationMode, PolicyFeature