taranis-models 1.2.4.dev1__tar.gz → 1.2.4.dev3__tar.gz

{taranis_models-1.2.4.dev1/taranis_models.egg-info → taranis_models-1.2.4.dev3}/PKG-INFO

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

{taranis_models-1.2.4.dev1 → taranis_models-1.2.4.dev3}/models/admin.py

@@ -1,4 +1,5 @@
-from pydantic import Field, AnyUrl, computed_field
+from pydantic import Field, AnyUrl
+from functools import cached_property
 from typing import Literal, Any
 from datetime import datetime
 
@@ -48,7 +49,7 @@ class TaskResult(TaranisBaseModel):
 
         if self.status is None:
             return other_status is not None
-        return False if other_status is None else self.status < other_status
+        return False if other_status is None else str(self.status) < str(other_status)
 
 
 class Address(TaranisBaseModel):
@@ -195,9 +196,12 @@ class OSINTSource(TaranisBaseModel):
     enabled: bool | None = True
     status: TaskResult | None = None
 
-    @computed_field
+    @cached_property
     def search_field(self) -> str:
-        return f"{self.name} {self.description} {' '.join(self.parameters.values())}"
+        search = f"{self.name} {self.description} "
+        if self.parameters:
+            search += " ".join(self.parameters.values())
+        return search
 
 
 class OSINTSourceGroup(TaranisBaseModel):

{taranis_models-1.2.4.dev1 → taranis_models-1.2.4.dev3/taranis_models.egg-info}/PKG-INFO

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