taranis-models 1.3.4.dev2__tar.gz → 1.3.4.dev3__tar.gz

{taranis_models-1.3.4.dev2 → taranis_models-1.3.4.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taranis-models
-Version: 1.3.4.dev2
+Version: 1.3.4.dev3
 Summary: Taranis AI Models
 Maintainer-email: AIT <benjamin.akhras@ait.ac.at>
 License-Expression: EUPL-1.2

{taranis_models-1.3.4.dev2 → taranis_models-1.3.4.dev3}/models/assess.py

@@ -1,7 +1,7 @@
 import contextlib
 import hashlib
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Literal, Self
 from urllib.parse import quote
 
@@ -13,6 +13,23 @@ from pydantic import ValidationInfo, field_validator, model_validator
 from models.base import TaranisBaseModel
 
 
+def _utcnow() -> datetime:
+    return datetime.now(timezone.utc).replace(tzinfo=None)
+
+
+def _normalize_datetime(value: str | datetime | None) -> datetime | None:
+    if value is None:
+        return None
+    if isinstance(value, str):
+        with contextlib.suppress(ValueError):
+            value = datetime.fromisoformat(value)
+        if isinstance(value, str):
+            return None
+    if value.tzinfo is None or value.utcoffset() is None:
+        return value
+    return value.astimezone(timezone.utc).replace(tzinfo=None)
+
+
 class NewsItem(TaranisBaseModel):
     _core_endpoint = "/assess/news-items"
 
@@ -83,12 +100,7 @@ class NewsItem(TaranisBaseModel):
     @field_validator("published", "collected", mode="before")
     @classmethod
     def sanitize_date(cls, date: str | None | datetime) -> datetime:
-        if isinstance(date, datetime):
-            return date
-        if isinstance(date, str):
-            with contextlib.suppress(ValueError):
-                return datetime.fromisoformat(date)
-        return datetime.now()
+        return _normalize_datetime(date) or _utcnow()
 
 
 class StoryTag(TaranisBaseModel):
@@ -123,6 +135,11 @@ class Story(TaranisBaseModel):
     tags: list[dict[str, Any]] | None = None
     attributes: list[dict[str, Any]] | None = None
 
+    @field_validator("created", "updated", mode="before")
+    @classmethod
+    def sanitize_story_dates(cls, date: str | None | datetime) -> datetime | None:
+        return _normalize_datetime(date)
+
 
 class AssessSource(TaranisBaseModel):
     id: str | None = None

{taranis_models-1.3.4.dev2 → taranis_models-1.3.4.dev3}/taranis_models.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taranis-models
-Version: 1.3.4.dev2
+Version: 1.3.4.dev3
 Summary: Taranis AI Models
 Maintainer-email: AIT <benjamin.akhras@ait.ac.at>
 License-Expression: EUPL-1.2

{taranis_models-1.3.4.dev2 → taranis_models-1.3.4.dev3}/taranis_models.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ taranis_models.egg-info/SOURCES.txt
 taranis_models.egg-info/dependency_links.txt
 taranis_models.egg-info/requires.txt
 taranis_models.egg-info/top_level.txt
+tests/test_assess.py
 typings/models/__init__.pyi
 typings/models/admin.pyi
 typings/models/assess.pyi

taranis_models-1.3.4.dev3/tests/test_assess.py

@@ -0,0 +1,30 @@
+from datetime import datetime
+
+from models.assess import NewsItem, Story
+
+
+def test_news_item_normalizes_aware_datetimes_to_utc_naive():
+    payload = NewsItem.model_validate(
+        {
+            "osint_source_id": "manual",
+            "title": "Test item",
+            "published": "2024-01-01T00:30:00+02:00",
+            "collected": "2024-01-01T01:30:00+02:00",
+        }
+    )
+
+    assert payload.published == datetime(2023, 12, 31, 22, 30)
+    assert payload.collected == datetime(2023, 12, 31, 23, 30)
+
+
+def test_story_normalizes_aware_datetimes_to_utc_naive():
+    payload = Story.model_validate(
+        {
+            "id": "story-1",
+            "created": "2024-01-01T00:30:00+02:00",
+            "updated": "2024-01-01T01:30:00+02:00",
+        }
+    )
+
+    assert payload.created == datetime(2023, 12, 31, 22, 30)
+    assert payload.updated == datetime(2023, 12, 31, 23, 30)