fairagro-middleware-shared 11.0.1.dev29__tar.gz → 11.0.1.dev30__tar.gz

{fairagro_middleware_shared-11.0.1.dev29 → fairagro_middleware_shared-11.0.1.dev30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fairagro-middleware-shared
-Version: 11.0.1.dev29
+Version: 11.0.1.dev30
 Summary: The FAIRagro advanced middleware shared components
 Requires-Python: >=3.12
 Requires-Dist: opentelemetry-api>=1.26.0

{fairagro_middleware_shared-11.0.1.dev29 → fairagro_middleware_shared-11.0.1.dev30}/src/middleware/shared/report/model.py

@@ -8,10 +8,10 @@ from datetime import UTC, datetime
 
 
 def _require_aware_utc(value: datetime, *, what: str) -> datetime:
-    """Reject naive datetimes; callers must pass timezone-aware UTC timestamps."""
+    """Reject naive datetimes and normalize timezone-aware values to UTC."""
     if value.tzinfo is None:
         raise ValueError(f"{what} must be timezone-aware UTC")
-    return value
+    return value.astimezone(UTC)
 
 
 @dataclass(frozen=True)
@@ -76,7 +76,7 @@ class RepositoryScope:
 
     @property
     def rdi(self) -> str:
-        """Return the RDI identifier for this scope."""
+        """RDI identifier for this scope."""
         return self._rdi
 
     def close(self, *, closed_at: datetime | None = None) -> None:
@@ -183,12 +183,12 @@ class HarvestReport:
 
     @property
     def start_time(self) -> datetime:
-        """Return the run start timestamp."""
+        """Run start timestamp."""
         return self._start_time
 
     @property
     def end_time(self) -> datetime:
-        """Return the run end timestamp.
+        """Run end timestamp.
 
         Raises:
             ValueError: If :meth:`finish` has not been called yet.
@@ -199,12 +199,12 @@ class HarvestReport:
 
     @property
     def duration_seconds(self) -> float:
-        """Return the total harvest run duration in seconds."""
+        """Total harvest run duration in seconds."""
         return (self.end_time - self.start_time).total_seconds()
 
     @property
     def repository_reports(self) -> tuple[RepositoryReport, ...]:
-        """Return immutable snapshots of all repository scopes in open order."""
+        """Immutable snapshots of all repository scopes in open order."""
         with self._scopes_lock:
             scopes = list(self._scopes)
         return tuple(scope.snapshot() for scope in scopes)
@@ -217,7 +217,13 @@ class HarvestReport:
         return scope
 
     def finish(self, *, end_time: datetime | None = None) -> None:
-        """Finish the harvest run, close open scopes, and record the end timestamp."""
+        """Finish the harvest run, close open scopes, and record the end timestamp.
+
+        Raises:
+            ValueError: If :meth:`finish` has already been called.
+        """
+        if self._end_time is not None:
+            raise ValueError("HarvestReport.finish() has already been called")
         if end_time is None:
             finished_at = datetime.now(UTC)
         else:

{fairagro_middleware_shared-11.0.1.dev29 → fairagro_middleware_shared-11.0.1.dev30}/tests/unit/test_harvest_report.py

@@ -8,6 +8,7 @@ import threading
 from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor
 from datetime import UTC, datetime, timedelta
+from zoneinfo import ZoneInfo
 
 import pytest
 
@@ -203,11 +204,26 @@ def test_finish_closes_open_scopes_deterministically() -> None:
     scope = report.open_repository("bonares", opened_at=opened)
     report.finish(end_time=_END)
     assert scope.snapshot().duration_seconds == (_END - opened).total_seconds()
-    # Second finish must not change an already-closed scope.
-    later = _END + timedelta(seconds=30)
-    report.finish(end_time=later)
-    assert scope.snapshot().duration_seconds == (_END - opened).total_seconds()
-    assert report.end_time == later
+    assert report.end_time == _END
+
+
+def test_finish_is_single_shot() -> None:
+    """Calling finish() twice raises so run and scope durations stay aligned."""
+    report = HarvestReport(start_time=_START)
+    report.open_repository("bonares", opened_at=_START)
+    report.finish(end_time=_END)
+    with pytest.raises(ValueError, match="already been called"):
+        report.finish(end_time=_END + timedelta(seconds=30))
+    assert report.end_time == _END
+
+
+def test_require_aware_utc_normalizes_non_utc() -> None:
+    """Timezone-aware non-UTC timestamps are stored as UTC equivalents."""
+    berlin = ZoneInfo("Europe/Berlin")
+    local_start = datetime(2026, 5, 6, 16, 0, 0, tzinfo=berlin)  # UTC+2 in May
+    report = HarvestReport(start_time=local_start)
+    assert report.start_time == datetime(2026, 5, 6, 14, 0, 0, tzinfo=UTC)
+    assert report.start_time.tzinfo == UTC
 
 
 def test_jsonld_context_and_types() -> None: