taranis-models 1.3.1__py3-none-any.whl → 1.3.1.dev1__py3-none-any.whl

models/admin.py

@@ -1,21 +1,20 @@
-from datetime import datetime
+from pydantic import Field, AnyUrl
 from functools import cached_property
-from typing import Any, Literal
-
-from pydantic import AnyUrl, Field, SecretStr, field_serializer
+from typing import Literal, Any
+from datetime import datetime
 
 from models.base import TaranisBaseModel
 from models.types import (
-    BOT_TYPES,
+    TLPLevel,
+    ItemType,
     COLLECTOR_TYPES,
     CONNECTOR_TYPES,
-    PRESENTER_TYPES,
-    PUBLISHER_TYPES,
-    WORKER_CATEGORY,
     WORKER_TYPES,
+    WORKER_CATEGORY,
+    PRESENTER_TYPES,
     AttributeType,
-    ItemType,
-    TLPLevel,
+    BOT_TYPES,
+    PUBLISHER_TYPES,
 )
 
 
@@ -144,13 +143,7 @@ class User(TaranisBaseModel):
     profile: dict | None = None
     roles: list[int] | list[dict] = Field(default_factory=list)
     username: str = ""
-    password: SecretStr | None = None
-
-    @field_serializer("password", when_used="json")
-    def dump_secret(self, v):
-        if isinstance(v, SecretStr):
-            return v.get_secret_value()
-        return v
+    password: str | None = Field(default=None, exclude=True)
 
 
 class TaranisConfig(TaranisBaseModel):

models/user.py

@@ -1,6 +1,5 @@
-from typing import Any
-
 from pydantic import Field
+from typing import Any
 
 from models.base import TaranisBaseModel
 

{taranis_models-1.3.1.dist-info → taranis_models-1.3.1.dev1.dist-info}/METADATA

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

{taranis_models-1.3.1.dist-info → taranis_models-1.3.1.dev1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 models/__init__.py,sha256=PvAkuaQRsocjPY5C61q6TQ8ac-EYSXTHfiOuwlIAg0M,576
-models/admin.py,sha256=0itSQNIyGPo0d30lNWzMr19Y-x_2wT_larsjGSo694s,10156
+models/admin.py,sha256=zfLVbBnJseWg003uoEmHa50YYoZpyAvlx8qJtMd_m7Q,9972
 models/assess.py,sha256=TR7GvMQZ3Ka-9e-WqHdubYDnO3zB6B5c_2PU4xo4h2k,2947
 models/asset.py,sha256=Zbzkspqlnya7Uj8Ig-pLm41VgmMnPXdPzacovNFXRPU,530
 models/base.py,sha256=CBW_YcrwDSdTe-RbszXCj4yQnHW86fxSai_G7uVuBrE,594
@@ -8,9 +8,9 @@ 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.1.dist-info/licenses/LICENSE.md,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
-taranis_models-1.3.1.dist-info/METADATA,sha256=n-0reAm6tqDWmRySxV1eupJL50aqlHME3qmUMxO7m6Y,1447
-taranis_models-1.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-taranis_models-1.3.1.dist-info/top_level.txt,sha256=vH5ByFtkqB2bXlXOuK5zaaM_1GFEE9six0KgGIdPaU0,7
-taranis_models-1.3.1.dist-info/RECORD,,
+models/user.py,sha256=-LAfblz4q9slp9ouggojZ438MHVOY4HbZd8eseW61M8,1325
+taranis_models-1.3.1.dev1.dist-info/licenses/LICENSE.md,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
+taranis_models-1.3.1.dev1.dist-info/METADATA,sha256=fMPDk7dqI_CN3bp2PXHd0cOh2VQg6BHwc6MzibD4bU8,1452
+taranis_models-1.3.1.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+taranis_models-1.3.1.dev1.dist-info/top_level.txt,sha256=vH5ByFtkqB2bXlXOuK5zaaM_1GFEE9six0KgGIdPaU0,7
+taranis_models-1.3.1.dev1.dist-info/RECORD,,