Fix path issues

Author: bruno-f-cruz

scripts/aind.py

@@ -99,7 +99,8 @@ def _run_data_transfer(
             source=launcher.session_directory,
             settings=RobocopySettings(
                 delete_src=False,
-                destination=Path(watchdog_settings.destination),
+                destination=Path(watchdog_settings.destination)
+                / launcher.session_directory.name,
                 exclude_dirs=["behavior-videos"],
             ),
         ).transfer()

src/packages/aind_behavior_vr_foraging/src/aind_behavior_vr_foraging/data_contract/v1.py

@@ -385,17 +385,17 @@ def dataset(
                                 ),
                             ),
                             SoftwareEvents(
-                                name="SessionStartTime",
+                                name="StartSessionTime",
                                 description="An event emitted at the start of the session. Data contains a UTC timestamp of the session start time.",
                                 reader_params=SoftwareEvents.make_params(
-                                    root_path / "behavior/SoftwareEvents/SessionStartTime.json"
+                                    root_path / "behavior/SoftwareEvents/StartSessionTime.json"
                                 ),
                             ),
                             SoftwareEvents(
-                                name="SessionEndTime",
+                                name="EndSessionTime",
                                 description="An event emitted at the end of the session. Data contains a UTC timestamp of the session end time.",
                                 reader_params=SoftwareEvents.make_params(
-                                    root_path / "behavior/SoftwareEvents/SessionEndTime.json"
+                                    root_path / "behavior/SoftwareEvents/EndSessionTime.json"
                                 ),
                             ),
                         ],

src/packages/aind_behavior_vr_foraging/src/aind_behavior_vr_foraging/data_mappers/_acquisition.py

@@ -133,8 +133,8 @@ def _map(self) -> acquisition.Acquisition:
     def _stream_bound_times(self) -> tuple[datetime.datetime, datetime.datetime]:
         """Get the start and end times for the data stream. This is used to determine the duration of the session."""
 
-        stream_start_path = Path(self._data_path) / "behavior/SoftwareEvents/SessionStartTime.json"
-        stream_end_path = Path(self._data_path) / "behavior/SoftwareEvents/SessionEndTime.json"
+        stream_start_path = Path(self._data_path) / "behavior/SoftwareEvents/StartSessionTime.json"
+        stream_end_path = Path(self._data_path) / "behavior/SoftwareEvents/EndSessionTime.json"
         stream_start_time: Optional[datetime.datetime] = None
         stream_end_time: Optional[datetime.datetime] = None
 

src/packages/aind_behavior_vr_foraging/tests/test_aind_data_mapper.py

@@ -47,16 +47,16 @@ def write_mock_software_events(
 
     events_dir = data_path / "behavior" / "SoftwareEvents"
     _write_events(
-        events_dir / "SessionStartTime.json",
+        events_dir / "StartSessionTime.json",
         time_event,
-        [SoftwareEvent[datetime](name="SessionStartTime", timestamp=0.0, timestamp_source="harp", data=start_time)],
+        [SoftwareEvent[datetime](name="StartSessionTime", timestamp=0.0, timestamp_source="harp", data=start_time)],
     )
     _write_events(
-        events_dir / "SessionEndTime.json",
+        events_dir / "EndSessionTime.json",
         time_event,
         [
             SoftwareEvent[datetime](
-                name="SessionEndTime",
+                name="EndSessionTime",
                 timestamp=(end_time - start_time).total_seconds(),
                 timestamp_source="harp",
                 data=end_time,