Reverted back files that were changed during the rebase

tests/configs/test_plugin_loading.py

@@ -5,15 +5,15 @@ from typing import Generator
 
 import pytest
 
-from lerobot.common.envs.configs import EnvConfig
 from lerobot.configs.parser import PluginLoadError, load_plugin, parse_plugin_args, wrap
+from lerobot.envs.configs import EnvConfig
 
 
 def create_plugin_code(*, base_class: str = "EnvConfig", plugin_name: str = "test_env") -> str:
     """Creates a dummy plugin module that implements its own EnvConfig subclass."""
     return f"""
 from dataclasses import dataclass
-from lerobot.common.envs.configs import {base_class}
+from lerobot.envs.configs import {base_class}
 
 @{base_class}.register_subclass("{plugin_name}")
 @dataclass

tests/datasets/test_image_transforms.py

@@ -21,7 +21,7 @@ from safetensors.torch import load_file
 from torchvision.transforms import v2
 from torchvision.transforms.v2 import functional as F  # noqa: N812
 
-from lerobot.common.datasets.transforms import (
+from lerobot.datasets.transforms import (
     ImageTransformConfig,
     ImageTransforms,
     ImageTransformsConfig,
@@ -29,11 +29,11 @@ from lerobot.common.datasets.transforms import (
     SharpnessJitter,
     make_transform_from_config,
 )
-from lerobot.common.utils.random_utils import seeded_context
 from lerobot.scripts.visualize_image_transforms import (
     save_all_transforms,
     save_each_transform,
 )
+from lerobot.utils.random_utils import seeded_context
 from tests.artifacts.image_transforms.save_image_transforms_to_safetensors import ARTIFACT_DIR
 from tests.utils import require_x86_64_kernel
 

tests/envs/test_envs.py

@@ -21,8 +21,8 @@ import torch
 from gymnasium.utils.env_checker import check_env
 
 import lerobot
-from lerobot.common.envs.factory import make_env, make_env_config
-from lerobot.common.envs.utils import preprocess_observation
+from lerobot.envs.factory import make_env, make_env_config
+from lerobot.envs.utils import preprocess_observation
 from tests.utils import require_env
 
 OBS_TYPES = ["state", "pixels", "pixels_agent_pos"]

tests/fixtures/constants.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from lerobot.common.constants import HF_LEROBOT_HOME
+from lerobot.constants import HF_LEROBOT_HOME
 
 LEROBOT_TEST_DIR = HF_LEROBOT_HOME / "_testing"
 DUMMY_REPO_ID = "dummy/repo"

tests/optim/test_optimizers.py

@@ -14,11 +14,11 @@
 import pytest
 import torch
 
-from lerobot.common.constants import (
+from lerobot.constants import (
     OPTIMIZER_PARAM_GROUPS,
     OPTIMIZER_STATE,
 )
-from lerobot.common.optim.optimizers import (
+from lerobot.optim.optimizers import (
     AdamConfig,
     AdamWConfig,
     MultiAdamConfig,

tests/policies/test_policies.py

@@ -23,23 +23,23 @@ import torch
 from safetensors.torch import load_file
 
 from lerobot import available_policies
-from lerobot.configs.default import DatasetConfig
-from lerobot.configs.train import TrainPipelineConfig
-from lerobot.configs.types import FeatureType, NormalizationMode, PolicyFeature
-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 (
+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 (
     get_policy_class,
     make_policy,
     make_policy_config,
 )
-from lerobot.policies.normalize import Normalize, Unnormalize
-from lerobot.policies.pretrained import PreTrainedPolicy
-from lerobot.utils.random_utils import seeded_context
+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.configs.default import DatasetConfig
+from lerobot.configs.train import TrainPipelineConfig
+from lerobot.configs.types import FeatureType, NormalizationMode, PolicyFeature
 from tests.artifacts.policies.save_policy_to_safetensors import get_policy_stats
 from tests.utils import DEVICE, require_cpu, require_env, require_x86_64_kernel