taranis-models 1.3.2.dev2__py3-none-any.whl → 1.3.2.dev3__py3-none-any.whl

models/assess.py

@@ -1,7 +1,10 @@
 from datetime import datetime
 from functools import cached_property
-from typing import Literal
+from typing import Any, Literal
 
+from langcodes import Language
+from langcodes.tag_parser import LanguageTagError
+from pydantic import ValidationInfo, field_validator, model_validator
 
 from models.base import TaranisBaseModel
 
@@ -10,18 +13,21 @@ class NewsItem(TaranisBaseModel):
     _core_endpoint = "/assess/news-items"
 
     osint_source_id: str
+    id: str | None = None
     hash: str | None = None
     title: str | None = None
     author: str | None = None
     review: str | None = None
     content: str | None = None
-    web_url: str | None = None
+    link: str | None = None
     source: str | None = None
     published: datetime | None = None
     collected: datetime | None = None
-    attributes: list[str | dict] | None = None
+    updated: datetime | None = None
+    attributes: list[str | dict[str, Any]] | None = None
     story_id: str | None = None
     language: str | None = None
+    last_change: str | None = None
 
 
 class StoryTag(TaranisBaseModel):
@@ -53,8 +59,8 @@ class Story(TaranisBaseModel):
     relevance: int | None = None
     comments: str | None = None
     in_reports_count: int | None = None
-    tags: list[dict] | None = None
-    attributes: list[dict] | None = None
+    tags: list[dict[str, Any]] | None = None
+    attributes: list[dict[str, Any]] | None = None
 
     @cached_property
     def search_field(self) -> str:
@@ -81,7 +87,7 @@ class FilterLists(TaranisBaseModel):
 
     tags: list[str] = []
     sources: list[AssessSource] = []
-    groups: list[dict] = []
+    groups: list[dict[str, Any]] = []
 
 
 class StoryUpdatePayload(TaranisBaseModel):
@@ -92,10 +98,49 @@ class StoryUpdatePayload(TaranisBaseModel):
     description: str | None = None
     comments: str | None = None
     summary: str | None = None
-    tags: list[dict] | None = None
-    attributes: list[dict] | None = None
+    tags: list[dict[str, Any]] | None = None
+    attributes: list[dict[str, Any]] | None = None
 
 
 class BulkAction(TaranisBaseModel):
     story_ids: list[str] = []
     payload: StoryUpdatePayload | None = None
+
+
+class NewsItemCreate(TaranisBaseModel):
+    osint_source_id: str
+    title: str | None = None
+    author: str | None = None
+    review: str | None = None
+    content: str | None = None
+    link: str | None = None
+    source: str | None = None
+    published: datetime | None = None
+    collected: datetime | None = None
+    attributes: list[str | dict[str, Any]] | None = None
+    language: str | None = None
+
+    @field_validator("language", mode="before")
+    def normalize_language_code(self, v: str, info: ValidationInfo) -> str:
+        if v:
+            try:
+                return Language.get(v).language or ""
+            except (LanguageTagError, ValueError, TypeError):
+                return ""
+        return ""
+
+    @model_validator(mode="after")
+    def check_required_fields(self) -> "NewsItemCreate":
+        if not self.title and not self.content:
+            raise ValueError("Either title or content must be provided for NewsItemCreate.")
+        return self
+
+
+class StoryCreate(TaranisBaseModel):
+    title: str | None = None
+    summary: str | None = None
+    description: str | None = None
+    news_items: list[NewsItemCreate] = []
+    tags: list[dict[str, Any]] | None = None
+    attributes: list[dict[str, Any]] | None = None
+    created: datetime | None = None

models/dashboard.py

@@ -1,9 +1,8 @@
-from datetime import datetime
-
 from pydantic import Field
+from datetime import datetime
 
-from models.assess import StoryTag
 from models.base import TaranisBaseModel
+from models.assess import StoryTag
 
 
 class Dashboard(TaranisBaseModel):
@@ -39,28 +38,3 @@ class Cluster(TaranisBaseModel):
 
     name: str
     size: int | None = None
-
-
-class StoryConflict(TaranisBaseModel):
-    _core_endpoint = "connectors/conflicts/story-conflicts"
-    _cache_timeout = 5
-    _model_name = "story_conflicts"
-    _pretty_name = "Story Conflicts"
-
-    story_id: str
-    existing_story: str
-    incoming_story: str
-    has_proposals: str | None = None
-
-
-class NewsItemConflict(TaranisBaseModel):
-    _core_endpoint = "/connectors/conflicts/news-items"
-    _cache_timeout = 5
-    _model_name = "news_item_conflict"
-    _pretty_name = "News Item Conflicts"
-
-    incoming_story_id: str
-    news_item_id: str
-    existing_story_id: str
-    incoming_story: dict
-    misp_address: str | None = None

{taranis_models-1.3.2.dev2.dist-info → taranis_models-1.3.2.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taranis-models
-Version: 1.3.2.dev2
+Version: 1.3.2.dev3
 Summary: Taranis AI Models
 Maintainer-email: AIT <benjamin.akhras@ait.ac.at>
 License-Expression: EUPL-1.2
@@ -17,6 +17,7 @@ License-File: LICENSE.md
 Requires-Dist: pydantic
 Requires-Dist: pydantic-settings
 Requires-Dist: python-dotenv
+Requires-Dist: langcodes
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{taranis_models-1.3.2.dev2.dist-info → taranis_models-1.3.2.dev3.dist-info}/RECORD

@@ -1,16 +1,16 @@
 models/__init__.py,sha256=PvAkuaQRsocjPY5C61q6TQ8ac-EYSXTHfiOuwlIAg0M,576
 models/admin.py,sha256=0itSQNIyGPo0d30lNWzMr19Y-x_2wT_larsjGSo694s,10156
-models/assess.py,sha256=TR7GvMQZ3Ka-9e-WqHdubYDnO3zB6B5c_2PU4xo4h2k,2947
+models/assess.py,sha256=p3R6d6UpO27O33PTyBM6Ir_k27cMaSrkAYjjeRRPU_U,4545
 models/asset.py,sha256=Zbzkspqlnya7Uj8Ig-pLm41VgmMnPXdPzacovNFXRPU,530
 models/base.py,sha256=CBW_YcrwDSdTe-RbszXCj4yQnHW86fxSai_G7uVuBrE,594
-models/dashboard.py,sha256=SztgsNFvyUrTsm46ztzJhGBFhnA56ZFcgkfV0WZZ6wo,1726
+models/dashboard.py,sha256=7PaB1jaK0c2VM5Deye_-lV0c-Pcg9s4BmQLzjC_V_I0,1083
 models/product.py,sha256=ydsEDEirdZsGVunKiELxZE-3CbkDNHu1ZY4YgnvZzqU,1757
 models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 models/report.py,sha256=ruYnCEdf5ilDqbxsTwGGWenYMvhIQLraZYStBzzm7jY,1202
 models/types.py,sha256=1TTXVXcUARzg2sOJJ2BfTCqboN7RQg-kn48FtE6MFaQ,6491
 models/user.py,sha256=W_ojV4WtZz_I3hyPO8rLZvMWCU0u58Mh-HYhXs96P08,1326
-taranis_models-1.3.2.dev2.dist-info/licenses/LICENSE.md,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
-taranis_models-1.3.2.dev2.dist-info/METADATA,sha256=MgEAQ7ahZT-Uafu09FAmKvrg8rnxeljyAiNgvRby4qo,1452
-taranis_models-1.3.2.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-taranis_models-1.3.2.dev2.dist-info/top_level.txt,sha256=vH5ByFtkqB2bXlXOuK5zaaM_1GFEE9six0KgGIdPaU0,7
-taranis_models-1.3.2.dev2.dist-info/RECORD,,
+taranis_models-1.3.2.dev3.dist-info/licenses/LICENSE.md,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
+taranis_models-1.3.2.dev3.dist-info/METADATA,sha256=cF9qACXknvTX6ejPxppZ4EiKUPHTYN6NIUoV1ti5Ek8,1477
+taranis_models-1.3.2.dev3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+taranis_models-1.3.2.dev3.dist-info/top_level.txt,sha256=vH5ByFtkqB2bXlXOuK5zaaM_1GFEE9six0KgGIdPaU0,7
+taranis_models-1.3.2.dev3.dist-info/RECORD,,