Refactor mapper class names

Author: bruno-f-cruz

src/aind_behavior_vr_foraging/data_mappers/__init__.py

@@ -24,17 +24,17 @@ class DataMapperCli(BaseSettings, cli_kebab_case=True):
 
     def cli_cmd(self):
         """Generate aind-data-schema metadata for the VR Foraging dataset located at the specified path."""
-        from ._rig import AindRigDataMapper
-        from ._session import AindSessionDataMapper
+        from ._rig import AindInstrumentDataMapper
+        from ._session import AindAcquisitionDataMapper
 
-        session_mapper = AindSessionDataMapper(
+        session_mapper = AindAcquisitionDataMapper(
             data_path=Path(self.data_path),
             repo_path=Path(self.repo_path),
             session_end_time=self.session_end_time,
         )
         session_mapper.map()
 
-        rig_mapper = AindRigDataMapper(data_path=Path(self.data_path))
+        rig_mapper = AindInstrumentDataMapper(data_path=Path(self.data_path))
         rig_mapper.map()
 
         assert session_mapper.mapped is not None

src/aind_behavior_vr_foraging/data_mappers/_rig.py

@@ -39,7 +39,7 @@ def get_spawned_device(self, name: str) -> devices.Device:
         raise ValueError(f"Device {name} not found in spawned devices of {self.device_name}")
 
 
-class AindRigDataMapper(ads.AindDataSchemaRigDataMapper):
+class AindInstrumentDataMapper(ads.AindDataSchemaRigDataMapper):
     def __init__(
         self,
         data_path: os.PathLike,

src/aind_behavior_vr_foraging/data_mappers/_session.py

@@ -28,7 +28,7 @@
 logger = logging.getLogger(__name__)
 
 
-class AindSessionDataMapper(ads.AindDataSchemaSessionDataMapper):
+class AindAcquisitionDataMapper(ads.AindDataSchemaSessionDataMapper):
     def __init__(
         self,
         data_path: os.PathLike,

tests/test_aind_data_mapper.py

@@ -9,7 +9,8 @@
 from aind_data_schema.core import acquisition, instrument
 from aind_data_schema.utils import compatibility_check
 
-from aind_behavior_vr_foraging.data_mappers import AindRigDataMapper, AindSessionDataMapper
+from aind_behavior_vr_foraging.data_mappers._rig import AindInstrumentDataMapper
+from aind_behavior_vr_foraging.data_mappers._session import AindAcquisitionDataMapper
 
 sys.path.append(".")
 from aind_behavior_vr_foraging.cli import DataMapperCli
@@ -41,18 +42,18 @@ def setUp(self):
         self.repo_path = Path("./")
         self.session_end_time = datetime(2023, 1, 1, 12, 0, 0, tzinfo=timezone.utc)
 
-        self.session_mapper = AindSessionDataMapper(
+        self.session_mapper = AindAcquisitionDataMapper(
             data_path=self.data_path,
             repo_path=self.repo_path,
             session_end_time=self.session_end_time,
         )
 
-        self.rig_mapper = AindRigDataMapper(data_path=self.data_path)
+        self.rig_mapper = AindInstrumentDataMapper(data_path=self.data_path)
 
     def tearDown(self):
         self.temp_dir.cleanup()
 
-    @patch("aind_behavior_vr_foraging.data_mappers._session.AindSessionDataMapper._map")
+    @patch("aind_behavior_vr_foraging.data_mappers._session.AindAcquisitionDataMapper._map")
     def test_session_mock_map(self, mock_map):
         mock_map.return_value = MagicMock()
         result = self.session_mapper.map()
@@ -68,7 +69,7 @@ def test_session_round_trip(self):
         assert mapped is not None
         acquisition.Acquisition.model_validate_json(mapped.model_dump_json())
 
-    @patch("aind_behavior_vr_foraging.data_mappers._rig.AindRigDataMapper._map")
+    @patch("aind_behavior_vr_foraging.data_mappers._rig.AindInstrumentDataMapper._map")
     def test_rig_mock_map(self, mock_map):
         mock_map.return_value = MagicMock()
         result = self.rig_mapper.map()