oliver review

Author: h-mayorquin

src/pynwb/base.py

@@ -405,26 +405,29 @@ def get_starting_time(self):
         Returns
         -------
         float or None
-            The starting time in seconds, or None if the TimeSeries has no data.
+            The starting time in seconds, or None if no starting time is defined
+            and there is no data.
         """
-        if self.num_samples is None or self.num_samples == 0:
-            return None
-        if self.fields.get('timestamps'):
+        if self.starting_time is not None:
+            return self.starting_time
+        elif self.num_samples is not None and self.num_samples > 0:
             return float(self.timestamps[0])
         else:
-            return self.starting_time
+            # No starting_time defined and no data (e.g., empty timestamps-based TimeSeries)
+            return None
 
     def get_duration(self):
         """
         Get the duration of this TimeSeries in seconds.
 
         Returns the time span from the first sample to the last sample.
-        For a single sample, returns 0.
+        For a single sample or empty TimeSeries with a defined starting_time, returns 0.
 
         Returns
         -------
         float or None
-            The duration in seconds, or None if the TimeSeries has no data.
+            The duration in seconds, or None if the TimeSeries has no data and
+            no starting_time defined.
 
         Notes
         -----
@@ -435,19 +438,21 @@ def get_duration(self):
         recording time. If you need to account for the last sample's duration
         (e.g., for continuous recordings), add 1/rate manually.
         """
-        n = self.num_samples
-        if n is None or n == 0:
+        if self.num_samples is None or self.num_samples == 0:
+            # Empty TimeSeries with a starting_time has duration 0
+            if self.starting_time is not None:
+                return 0.0
             return None
 
-        if n == 1:
+        if self.num_samples == 1:
             return 0.0
 
         if self.fields.get('timestamps'):
             timestamps = self.timestamps
             return float(timestamps[-1] - timestamps[0])
         else:
             # Rate-based
-            return (n - 1) / self.rate
+            return (self.num_samples - 1) / self.rate
 
     def get_data_in_units(self):
         """

tests/unit/test_base.py

@@ -555,9 +555,14 @@ def test_get_starting_time_with_timestamps(self):
         ts = mock_TimeSeries(data=[1, 2, 3], timestamps=[2.5, 3.5, 4.5])
         self.assertEqual(ts.get_starting_time(), 2.5)
 
-    def test_get_starting_time_empty_data(self):
-        """Test get_starting_time with empty data returns None"""
-        ts = mock_TimeSeries(data=[], rate=10.0)
+    def test_get_starting_time_empty_data_with_starting_time(self):
+        """Test get_starting_time with empty data but defined starting_time"""
+        ts = mock_TimeSeries(data=[], rate=10.0, starting_time=5.0)
+        self.assertEqual(ts.get_starting_time(), 5.0)
+
+    def test_get_starting_time_empty_data_no_starting_time(self):
+        """Test get_starting_time with empty data and no starting_time returns None"""
+        ts = mock_TimeSeries(data=[], timestamps=[])
         self.assertIsNone(ts.get_starting_time())
 
     def test_get_duration_with_rate(self):
@@ -580,9 +585,14 @@ def test_get_duration_single_sample(self):
         ts_timestamps = mock_TimeSeries(data=[1], timestamps=[5.0])
         self.assertEqual(ts_timestamps.get_duration(), 0.0)
 
-    def test_get_duration_empty_data(self):
-        """Test get_duration with empty data returns None"""
-        ts = mock_TimeSeries(data=[], rate=10.0)
+    def test_get_duration_empty_data_with_starting_time(self):
+        """Test get_duration with empty data but defined starting_time returns 0"""
+        ts = mock_TimeSeries(data=[], rate=10.0, starting_time=5.0)
+        self.assertEqual(ts.get_duration(), 0.0)
+
+    def test_get_duration_empty_data_no_starting_time(self):
+        """Test get_duration with empty data and no starting_time returns None"""
+        ts = mock_TimeSeries(data=[], timestamps=[])
         self.assertIsNone(ts.get_duration())