dyff-schema 0.7.1__tar.gz → 0.7.2__tar.gz

{dyff_schema-0.7.1/dyff_schema.egg-info → dyff_schema-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dyff-schema
-Version: 0.7.1
+Version: 0.7.2
 Summary: Data models for the Dyff AI auditing platform.
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0

{dyff_schema-0.7.1 → dyff_schema-0.7.2}/dyff/schema/v0/r1/platform.py

@@ -18,7 +18,7 @@ We use the following naming convention:
 # mypy: disable-error-code="import-untyped"
 import abc
 import enum
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Any, Literal, NamedTuple, Optional, Type, Union
 
@@ -532,7 +532,10 @@ class AccessGrant(DyffSchemaBaseModel):
     )
 
 
-class APIKey(DyffSchemaBaseModel):
+# FIXME: We can't derive from DyffSchemaBaseModel right now because existing
+# APIKeys don't have a timezone set for their datetime members.
+# See: DYFF-406
+class APIKey(pydantic.BaseModel):
     """A description of a set of permissions granted to a single subject (either an
     account or a workload).
 
@@ -561,6 +564,22 @@ class APIKey(DyffSchemaBaseModel):
         default_factory=list, description="AccessGrants associated with the APIKey"
     )
 
+    @pydantic.root_validator
+    def _ensure_datetime_timezone_aware(cls, values):
+        update = {}
+        for k, v in values.items():
+            if isinstance(v, datetime):
+                if v.tzinfo is None:
+                    update[k] = v.replace(tzinfo=timezone.utc)
+        values.update(update)
+        return values
+
+    def dict(self, *, by_alias: bool = True, **kwargs) -> dict[str, Any]:
+        return super().dict(by_alias=by_alias, **kwargs)
+
+    def json(self, *, by_alias: bool = True, **kwargs) -> str:
+        return super().json(by_alias=by_alias, **kwargs)
+
 
 # ----------------------------------------------------------------------------
 

{dyff_schema-0.7.1 → dyff_schema-0.7.2/dyff_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dyff-schema
-Version: 0.7.1
+Version: 0.7.2
 Summary: Data models for the Dyff AI auditing platform.
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0