taranis-models 1.3.3.dev1__tar.gz → 1.3.3.dev2__tar.gz

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/PKG-INFO

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

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/models/__init__.py

@@ -1,14 +1,11 @@
-from models.admin import ACL, Address, Job, Organization, Permission, ProductType, ReportItemType, Role, Template, User
+from models.admin import Job, Address, Organization, Role, User, Permission, ACL, Template, ReportItemType, ProductType
+from models.types import TLPLevel, WORKER_TYPES, WORKER_CATEGORY
 from models.base import TaranisBaseModel
 from models.dashboard import Dashboard, TrendingCluster
-from models.task import Task
-from models.types import WORKER_CATEGORY, WORKER_TYPES, TLPLevel
-
 
 __all__ = [
     "ACL",
     "Job",
-    "Task",
     "Address",
     "Organization",
     "Role",

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/models/admin.py

@@ -29,21 +29,6 @@ class Job(TaranisBaseModel):
     trigger: str | None = None
     kwargs: str | None = None
     next_run_time: str | None = None
-    queue: str | None = None
-    type: Literal["scheduled", "cron"] | None = None
-    schedule: str | None = None
-    status: str | None = None
-    started_at: str | None = None
-    failed_at: str | None = None
-    error: str | None = None
-    previous_run_time: str | None = None
-    last_run: str | None = None
-    last_success: str | None = None
-    last_run_display: str | None = None
-    last_run_relative: str | None = None
-    status_badge: dict[str, str] | None = None
-    is_overdue: bool | None = None
-    interval_seconds: int | None = None
 
 
 class TaskResult(TaranisBaseModel):

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/models/assess.py

@@ -2,6 +2,7 @@ from datetime import datetime
 from functools import cached_property
 from typing import Literal
 
+
 from models.base import TaranisBaseModel
 
 

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/models/asset.py

@@ -1,5 +1,4 @@
 from pydantic import Field
-
 from models.base import TaranisBaseModel
 
 

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/models/base.py

@@ -1,7 +1,5 @@
-from typing import ClassVar, TypeVar
-
 from pydantic import BaseModel, ConfigDict
-
+from typing import ClassVar, TypeVar
 
 T = TypeVar("T", bound="TaranisBaseModel")
 

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/models/dashboard.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Any
 
 from pydantic import Field
 
@@ -39,3 +40,28 @@ 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[str, Any]
+    misp_address: str | None = None

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/models/product.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-
 from pydantic import Field, ValidationInfo, field_validator
 
 from models.base import TaranisBaseModel

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/models/report.py

@@ -1,6 +1,5 @@
-from datetime import datetime
 from typing import ClassVar, Final
-
+from datetime import datetime
 from pydantic import Field
 
 from models.admin import ReportItemAttribute

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/taranis_models.egg-info/PKG-INFO

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

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/taranis_models.egg-info/SOURCES.txt

@@ -14,7 +14,6 @@ models/dashboard.py
 models/product.py
 models/py.typed
 models/report.py
-models/task.py
 models/types.py
 models/user.py
 taranis_models.egg-info/PKG-INFO

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/typings/models/__init__.pyi

@@ -3,9 +3,9 @@ This type stub file was generated by pyright.
 """
 
 from models.admin import ACL, Address, Job, Organization, Permission, ProductType, ReportItemType, Role, Template, User
+from models.types import TLPLevel, WORKER_CATEGORY, WORKER_TYPES
 from models.base import TaranisBaseModel
 from models.dashboard import Dashboard, TrendingCluster
-from models.types import WORKER_CATEGORY, WORKER_TYPES, TLPLevel
 
 __all__ = [
     "ACL",

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/typings/models/admin.pyi

@@ -2,24 +2,22 @@
 This type stub file was generated by pyright.
 """
 
-from datetime import datetime
+from pydantic import AnyUrl
 from functools import cached_property
 from typing import Any, Literal
-
-from pydantic import AnyUrl
-
+from datetime import datetime
 from models.base import TaranisBaseModel
 from models.types import (
+    AttributeType,
     BOT_TYPES,
     COLLECTOR_TYPES,
     CONNECTOR_TYPES,
+    ItemType,
     PRESENTER_TYPES,
     PUBLISHER_TYPES,
+    TLPLevel,
     WORKER_CATEGORY,
     WORKER_TYPES,
-    AttributeType,
-    ItemType,
-    TLPLevel,
 )
 
 class Job(TaranisBaseModel):

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/typings/models/assess.pyi

@@ -3,11 +3,9 @@ This type stub file was generated by pyright.
 """
 
 from datetime import datetime
-from functools import cached_property
-from typing import Literal
-
 from pydantic import field_validator
-
+from typing import Literal
+from functools import cached_property
 from models.base import TaranisBaseModel
 
 class NewsItem(TaranisBaseModel):

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/typings/models/base.pyi

@@ -2,9 +2,8 @@
 This type stub file was generated by pyright.
 """
 
-from typing import ClassVar, TypeVar
-
 from pydantic import BaseModel
+from typing import ClassVar, TypeVar
 
 T = TypeVar("T", bound="TaranisBaseModel")
 

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/typings/models/dashboard.pyi

@@ -3,9 +3,8 @@ This type stub file was generated by pyright.
 """
 
 from datetime import datetime
-
-from models.assess import StoryTag
 from models.base import TaranisBaseModel
+from models.assess import StoryTag
 
 class Dashboard(TaranisBaseModel):
     _core_endpoint = ...

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/typings/models/product.pyi

@@ -3,7 +3,6 @@ This type stub file was generated by pyright.
 """
 
 from datetime import datetime
-
 from models.base import TaranisBaseModel
 
 class WorkerProduct(TaranisBaseModel):

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/typings/models/report.pyi

@@ -2,9 +2,8 @@
 This type stub file was generated by pyright.
 """
 
-from datetime import datetime
 from typing import ClassVar, Final
-
+from datetime import datetime
 from models.admin import ReportItemAttribute
 from models.assess import Story
 from models.base import TaranisBaseModel

{taranis_models-1.3.3.dev1 → taranis_models-1.3.3.dev2}/typings/models/user.pyi

@@ -3,7 +3,6 @@ This type stub file was generated by pyright.
 """
 
 from typing import Any
-
 from models.base import TaranisBaseModel
 
 class ProfileSettingsDashboard(TaranisBaseModel):

taranis_models-1.3.3.dev1/models/task.py

@@ -1,20 +0,0 @@
-from datetime import datetime
-from typing import Any
-
-from models.base import TaranisBaseModel
-
-
-class Task(TaranisBaseModel):
-    """Task execution result model"""
-
-    _core_endpoint = "/config/task-results"
-    _model_name = "task"
-    _pretty_name = "Task"
-    _cache_timeout = 10
-
-    id: str
-    task: str | None = None
-    result: Any | None = None
-    status: str | None = None
-    last_run: datetime | None = None
-    last_success: datetime | None = None