stidantic 0.1.3__py3-none-any.whl → 0.2.1__py3-none-any.whl

stidantic/bundle.py

@@ -1,12 +1,14 @@
 from typing import Annotated
+
 from pydantic import Field
-from stidantic.types import StixCore, Identifier, StixCommon
-from stidantic.sdo import SDOs
-from stidantic.sco import SCOs
-from stidantic.sro import SROs
+
+from stidantic.extension import ExtensionDefinition
 from stidantic.language import LanguageContent
 from stidantic.marking import MarkingDefinition
-from stidantic.extension import ExtensionDefinition
+from stidantic.sco import SCOs
+from stidantic.sdo import SDOs
+from stidantic.sro import SROs
+from stidantic.types import Identifier, StixCommon, StixCore
 
 
 # 8. Stix Bundle
@@ -15,14 +17,7 @@ class StixBundle(StixCore):
     type: str = "bundle"
     objects: list[
         Annotated[
-            (
-                SROs
-                | SDOs
-                | SCOs
-                | MarkingDefinition
-                | LanguageContent
-                | ExtensionDefinition
-            ),
+            (SROs | SDOs | SCOs | MarkingDefinition | LanguageContent | ExtensionDefinition),
             Field(discriminator="type"),
         ]
         | StixCommon

stidantic/extension.py

@@ -1,7 +1,9 @@
-from typing import Literal, Annotated, Self
+from typing import Annotated, Literal, Self
+
 from pydantic import Field
 from pydantic.functional_validators import model_validator
-from stidantic.types import StixExtension, ExtensionType, StixProp
+
+from stidantic.types import ExtensionType, StixExtension, StixProp
 
 
 # 7.3 Extension Definition
@@ -106,8 +108,7 @@ class ExtensionDefinition(StixExtension):
         top-level of an existing object.
         """
         if (
-            self.extension_properties
-            and ExtensionType.toplevel_property_extension not in self.extension_types
+            self.extension_properties and ExtensionType.toplevel_property_extension.value not in self.extension_types  # pyright: ignore[reportUnnecessaryContains] because of use_enum_value=True
         ):
             raise ValueError(
                 "extension_types property can't be used without toplevel-property-extension in extension_types."

stidantic/extensions/pap.py

@@ -1,17 +1,16 @@
+from datetime import UTC, datetime
 from enum import Enum
 from typing import Literal
-from datetime import datetime, timezone
 
 from stidantic.extension import ExtensionDefinition
+from stidantic.marking import MarkingDefinition
 from stidantic.types import (
     Extension,
     ExtensionType,
     Identifier,
 )
-from stidantic.marking import MarkingDefinition
-
 
-STIX_PAP_EXT_CREATION_DATE = datetime(2022, 11, 28, 00, 00, 00, 00, tzinfo=timezone.utc)
+STIX_PAP_EXT_CREATION_DATE = datetime(2022, 11, 28, 00, 00, 00, 00, tzinfo=UTC)
 CISA = Identifier("identity--b3bca3c2-1f3d-4b54-b44f-dac42c3a8f01")
 
 PAPExtensionDefinition = ExtensionDefinition(
@@ -37,30 +36,30 @@ class PAP(Enum):
     white = MarkingDefinition(
         id=Identifier("marking-definition--a3bea94c-b469-41dc-9cfe-d6e7daba7730"),
         name="PAP:WHITE",
-        created=datetime(2022, 10, 1, 00, 00, 00, 00, tzinfo=timezone.utc),
+        created=datetime(2022, 10, 1, 00, 00, 00, 00, tzinfo=UTC),
         extensions={PAPExtensionDefinition.id: PAPExtension(pap="white")},
     )
     clear = MarkingDefinition(
         id=Identifier("marking-definition--ad15a0cd-55b6-4588-a14c-a66105329b92"),
         name="PAP:CLEAR",
-        created=datetime(2022, 10, 1, 00, 00, 00, 00, tzinfo=timezone.utc),
+        created=datetime(2022, 10, 1, 00, 00, 00, 00, tzinfo=UTC),
         extensions={PAPExtensionDefinition.id: PAPExtension(pap="clear")},
     )
     green = MarkingDefinition(
         id=Identifier("marking-definition--c43594d1-4b11-4c59-93ab-1c9b14d53ce9"),
         name="PAP:GREEN",
-        created=datetime(2022, 10, 9, 00, 00, 00, 00, tzinfo=timezone.utc),
+        created=datetime(2022, 10, 9, 00, 00, 00, 00, tzinfo=UTC),
         extensions={PAPExtensionDefinition.id: PAPExtension(pap="green")},
     )
     red = MarkingDefinition(
         id=Identifier("marking-definition--740d36e5-7714-4c30-961a-3ae632ceee0e"),
         name="PAP:RED",
-        created=datetime(2022, 10, 6, 00, 00, 00, 00, tzinfo=timezone.utc),
+        created=datetime(2022, 10, 6, 00, 00, 00, 00, tzinfo=UTC),
         extensions={PAPExtensionDefinition.id: PAPExtension(pap="red")},
     )
     amber = MarkingDefinition(
         id=Identifier("marking-definition--60f8932b-e51e-4458-b265-a2e8be9a80ab"),
         name="PAP:AMBER",
-        created=datetime(2022, 10, 2, 00, 00, 00, 00, tzinfo=timezone.utc),
+        created=datetime(2022, 10, 2, 00, 00, 00, 00, tzinfo=UTC),
         extensions={PAPExtensionDefinition.id: PAPExtension(pap="amber")},
     )

stidantic/language.py

@@ -1,6 +1,8 @@
-from datetime import datetime
 from typing import Literal
-from stidantic.types import Identifier, StixLanguage
+
+from pydantic.types import JsonValue
+
+from stidantic.types import Identifier, StixLanguage, StixTimestamp
 
 
 # 7.1 Language Content
@@ -11,7 +13,7 @@ class LanguageContent(StixLanguage):
     object_ref: Identifier
     # The object_modified property identifies the modified time of the object that this Language Content applies to.
     # It MUST be an exact match for the modified time of the STIX Object being referenced.
-    object_modified: datetime | None = None
+    object_modified: StixTimestamp | None = None
     # The contents property contains the actual Language Content (translation).
     # The keys in the dictionary MUST be RFC 5646 language codes for which language content is being provided [RFC5646].
     # The values each consist of a dictionary that mirrors the properties in the target object
@@ -32,4 +34,4 @@ class LanguageContent(StixLanguage):
     # with the same key in the original.
     # The translation object MAY contain only a subset of the translatable fields of the original. Keys that point to
     # non-translatable properties in the target or to properties that do not exist in the target object MUST be ignored.
-    contents: dict[str, dict[str, str]]
+    contents: dict[str, dict[str, JsonValue]]

stidantic/marking.py

@@ -1,12 +1,13 @@
-from typing import Literal, Self
+from datetime import UTC, datetime
 from enum import Enum
-from datetime import datetime, timezone
+from typing import Literal, Self
 
 from pydantic.functional_validators import model_validator
+
 from stidantic.types import (
+    Identifier,
     StixCore,
     StixMarking,
-    Identifier,
 )
 
 
@@ -78,7 +79,7 @@ class MarkingDefinition(StixMarking):
         return self
 
 
-STIX_ZERO_DATE = datetime(2017, 1, 20, 00, 00, 00, 00, tzinfo=timezone.utc)
+STIX_ZERO_DATE = datetime(2017, 1, 20, 00, 00, 00, 00, tzinfo=UTC)
 
 
 class TLP(Enum):