dyff-schema 0.29.0__py3-none-any.whl → 0.30.0__py3-none-any.whl

dyff/schema/v0/r1/requests.py

@@ -22,7 +22,7 @@ import pydantic
 
 from ... import upcast
 from . import commands
-from .base import DyffBaseModel, JsonMergePatchSemantics, Null
+from .base import DyffBaseModel, JsonMergePatchSemantics
 from .platform import (
     AnalysisBase,
     AnalysisScope,
@@ -58,9 +58,9 @@ class DyffRequestDefaultValidators(DyffBaseModel):
     but we allow requests to have non-UTC timezones for user convenience.
     """
 
-    @pydantic.root_validator
+    @pydantic.model_validator(mode="after")
     def _require_datetime_timezone_aware(cls, values):
-        for k, v in values.items():
+        for k, v in values.__dict__.items():
             if isinstance(v, datetime):
                 if v.tzinfo is None:
                     raise ValueError(f"{cls.__qualname__}.{k}: timezone not set")
@@ -74,10 +74,14 @@ class DyffRequestBase(SchemaVersion, DyffRequestDefaultValidators):
     def dict(
         self, *, by_alias: bool = True, exclude_unset=True, **kwargs
     ) -> _ModelAsDict:
-        return super().dict(by_alias=by_alias, exclude_unset=exclude_unset, **kwargs)
+        return super().model_dump(
+            by_alias=by_alias, exclude_unset=exclude_unset, **kwargs
+        )
 
     def json(self, *, by_alias: bool = True, exclude_unset=True, **kwargs) -> str:
-        return super().json(by_alias=by_alias, exclude_unset=exclude_unset, **kwargs)
+        return super().model_dump_json(
+            by_alias=by_alias, exclude_unset=exclude_unset, **kwargs
+        )
 
 
 # ----------------------------------------------------------------------------
@@ -93,7 +97,7 @@ class AnalysisCreateRequest(DyffEntityCreateRequest, AnalysisBase):
 
     method: str = pydantic.Field(description="Method ID")
 
-    @pydantic.validator("scope", check_fields=False)
+    @pydantic.field_validator("scope", check_fields=False)
     def _validate_scope(cls, scope: AnalysisScope) -> AnalysisScope:
         # TODO: This has to be a validator function because we can't apply the
         # regex contraint to AnalysisScope, since there are already entities
@@ -114,7 +118,7 @@ class AnalysisCreateRequest(DyffEntityCreateRequest, AnalysisBase):
 
 
 class ConcernCreateRequest(DyffEntityCreateRequest, ConcernBase):
-    @pydantic.validator("documentation", check_fields=False)
+    @pydantic.field_validator("documentation", check_fields=False)
     def _validate_documentation(
         cls, documentation: DocumentationBase
     ) -> DocumentationBase:
@@ -148,7 +152,7 @@ class InferenceServiceCreateRequest(DyffEntityCreateRequest, InferenceServiceBas
     )
 
     # TODO: (DYFF-421) Make .image required and remove this validator
-    @pydantic.validator("image", check_fields=False)
+    @pydantic.field_validator("image", check_fields=False)
     def validate_image_not_none(cls, v):
         if v is None:
             raise ValueError(
@@ -189,10 +193,10 @@ class EvaluationCreateRequest(DyffEntityCreateRequest, EvaluationBase):
         " for the evaluation, instead of starting a new one.",
     )
 
-    @pydantic.root_validator
+    @pydantic.model_validator(mode="after")
     def check_session_exactly_one(cls, values):
-        session = values.get("inferenceSession") is not None
-        session_ref = values.get("inferenceSessionReference") is not None
+        session = values.inferenceSession is not None
+        session_ref = values.inferenceSessionReference is not None
         if not (session ^ session_ref):
             raise ValueError(
                 "must specify exactly one of {inferenceSession, inferenceSessionReference}"
@@ -208,16 +212,18 @@ class EvaluationCreateRequest(DyffEntityCreateRequest, EvaluationBase):
             return EvaluationCreateRequest(
                 account=evaluation.account,
                 inferenceSessionReference=evaluation.inferenceSessionReference,
-                **base.dict(),
+                **base.model_dump(),
             )
         else:
             return EvaluationCreateRequest(
                 account=evaluation.account,
                 inferenceSession=EvaluationInferenceSessionRequest(
                     inferenceService=evaluation.inferenceSession.inferenceService.id,
-                    **upcast(InferenceSessionBase, evaluation.inferenceSession).dict(),
+                    **upcast(
+                        InferenceSessionBase, evaluation.inferenceSession
+                    ).model_dump(),
                 ),
-                **base.dict(),
+                **base.model_dump(),
             )
 
 
@@ -268,10 +274,8 @@ class DocumentationEditRequest(
 
 
 class FamilyMembersEditRequest(DyffRequestBase, JsonMergePatchSemantics):
-    members: dict[TagNameType, Optional[Union[FamilyMemberBase, Null]]] = (
-        pydantic.Field(
-            description="Mapping of names to IDs of member resources.",
-        )
+    members: dict[TagNameType, Optional[FamilyMemberBase]] = pydantic.Field(
+        description="Mapping of names to IDs of member resources.",
     )
 
 

dyff/schema/v0/r1/version.py

@@ -10,7 +10,8 @@ SCHEMA_VERSION: str = "0.1"
 
 class SchemaVersion(pydantic.BaseModel):
     schemaVersion: Literal["0.1"] = pydantic.Field(
-        default=SCHEMA_VERSION, description="The schema version."
+        default=SCHEMA_VERSION,  # type: ignore [arg-type]
+        description="The schema version.",
     )
 
 

{dyff_schema-0.29.0.dist-info → dyff_schema-0.30.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dyff-schema
-Version: 0.29.0
+Version: 0.30.0
 Summary: Data models for the Dyff AI auditing platform.
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0
@@ -26,7 +26,7 @@ Requires-Dist: hypothesis-jsonschema
 Requires-Dist: jsonpath-ng
 Requires-Dist: numpy<2
 Requires-Dist: pyarrow
-Requires-Dist: pydantic<2
+Requires-Dist: pydantic<3.0.0,>=2.0.0
 Dynamic: license-file
 
 # dyff-schema

{dyff_schema-0.29.0.dist-info → dyff_schema-0.30.0.dist-info}/RECORD

@@ -1,9 +1,10 @@
-dyff/schema/__init__.py,sha256=Nua_5EC8HHIxBp6u0SmnApz1WmlYSJ8tDsayD4zEl_Y,2237
+dyff/schema/__init__.py,sha256=w7OWDFuyGKd6xt_yllNtKzHahPgywrfU4Ue02psYaMA,2244
+dyff/schema/_version.py,sha256=jaJNt0cIPw7pKpa1ZksSexFHwIRD7mvffKUdrE657pk,80
 dyff/schema/adapters.py,sha256=YMTHv_2VlLGFp-Kqwa6H51hjffHmk8gXjZilHysIF5Q,123
 dyff/schema/annotations.py,sha256=nE6Jk1PLqlShj8uqjE_EzZC9zYnTDW5AVtQcjysiK8M,10018
 dyff/schema/base.py,sha256=jvaNtsSZyFfsdUZTcY_U-yfLY5_GyrMxSXhON2R9XR0,119
 dyff/schema/commands.py,sha256=hlqMJ99ZF_ElnGF6vQO_T872WM7aClFoFKkAXA66boI,123
-dyff/schema/copydoc.py,sha256=B4ZRpQmbFxi-3l9LCHvaJiVKb9VxADgC5vey804Febc,1075
+dyff/schema/copydoc.py,sha256=MSZTU3mHToqV2fx3QCb8H0nbh6JYBOqfzS-tPOw1W54,1075
 dyff/schema/errors.py,sha256=ow3yiucU4wGkeLmapUURp3eyaebwGUwDaVTXpPcrA7M,1542
 dyff/schema/ids.py,sha256=M3kdGRYGPCMnFkRRo0nzHlntdJtBrRwGJ_9R7LlN0bI,2085
 dyff/schema/platform.py,sha256=peHzGGSd5dQ-EFXrWDjBqMUtoOL3iCHxcV3XzW6Rjag,123
@@ -23,25 +24,25 @@ dyff/schema/io/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
 dyff/schema/io/vllm.py,sha256=2q05M_-lTzq9oywKXHPPpCFCSDVCSsRQqtmERzWTtio,123
 dyff/schema/v0/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
 dyff/schema/v0/r1/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
-dyff/schema/v0/r1/adapters.py,sha256=dmQS2ecgDX4ZvTMOW-6NzV_Oq_UpaiyFd7QnSNoOnK8,33057
-dyff/schema/v0/r1/base.py,sha256=Rry7GKdQyCLNXskB1CxqVlhVsgM8pw6a4xy3BFk_lRc,21095
-dyff/schema/v0/r1/commands.py,sha256=zgaggy9x2lPaDwRSVtyd7jrZ2gjJDbyghsdj2RmEaBs,9607
-dyff/schema/v0/r1/platform.py,sha256=r69zA2BBzR5TVb1AoE50RmvARH8WuqIqzT1vmdJn_PE,81722
-dyff/schema/v0/r1/requests.py,sha256=56R_yOdbDOEcY0og2GoY5bXeG6ifn7z3ypNdBOF_igk,17043
+dyff/schema/v0/r1/adapters.py,sha256=hpwCSW8lkMkUKCLe0zaMUDu-VS_caSxJvPsECEi_XRA,33069
+dyff/schema/v0/r1/base.py,sha256=WEy-xSL_FoC1gwAij1V_TEqPsITiIF_KlBDaDpPLWr8,20359
+dyff/schema/v0/r1/commands.py,sha256=wDNMB8lry-H9G5hlT4m6y4fysoq4glY5qKsHytfehqU,9052
+dyff/schema/v0/r1/platform.py,sha256=Hp9hTaDqWCDsPGHouCmiCMLXByjW8UadXIlgRtb0vZc,82305
+dyff/schema/v0/r1/requests.py,sha256=VLdhyAKpdQytNdZZW60Y5Kg35GmB6BezDwDengl18Ws,17168
 dyff/schema/v0/r1/test.py,sha256=X6dUyVd5svcPCI-PBMOAqEfK9jv3bRDvkQTJzwS96c0,10720
-dyff/schema/v0/r1/version.py,sha256=isKAGuGxsdru8vDaYmI4YiZdJOu_wNxXK7u6QzD6FE4,392
+dyff/schema/v0/r1/version.py,sha256=NONebgcv5Thsw_ymud6PacZdGjV6ndBrmLnap-obcpo,428
 dyff/schema/v0/r1/dataset/__init__.py,sha256=LbVlkO2asyGYBKk2z49xjJYTM-pu9y9e4eQDXgTDLnM,2553
-dyff/schema/v0/r1/dataset/arrow.py,sha256=PHNtBe32e4NXNQIqUMh0SxCPzTdidVkKBaFqYr6-aFo,12857
+dyff/schema/v0/r1/dataset/arrow.py,sha256=2XzJ1D2RqwfYRfLrJrsz-czOXZaPuGiWqXGfTGDBomY,12324
 dyff/schema/v0/r1/dataset/binary.py,sha256=KXvn79SUt3e_ZZXrju2atT_yMFwgAkCgDYXBtfv0E_I,636
 dyff/schema/v0/r1/dataset/classification.py,sha256=pbbEXhxyZ0pgYwzaTlM8hVHPNEJDCdHKOeGowPXgWYc,311
-dyff/schema/v0/r1/dataset/embedding.py,sha256=qcHHIzpFQj9bQ2vuECO9g1EU4WT1yjvUZbTlw0qwkc8,642
-dyff/schema/v0/r1/dataset/text.py,sha256=nLIn91Zlt0tNdXUklSgjJ-kEDxoPX32ISLkiv2DzLvE,1008
+dyff/schema/v0/r1/dataset/embedding.py,sha256=2cmcoV6AsvUBRrefmJ-_Vdfg9NVvdMr0-s7dqki15ls,792
+dyff/schema/v0/r1/dataset/text.py,sha256=MYG5seGODDryRSCy-g0Unh5dD0HCytmZ3FeElC-eE8A,1213
 dyff/schema/v0/r1/dataset/vision.py,sha256=aIe0fbfM_g3DsrDTdg2K803YKLjZBpurM_VJcJFuZLc,369
 dyff/schema/v0/r1/io/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
-dyff/schema/v0/r1/io/vllm.py,sha256=CUE9y8KthtUI7sD49S875rDmPvKotSXVIRaBS79aBZs,5320
-dyff_schema-0.29.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dyff_schema-0.29.0.dist-info/licenses/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
-dyff_schema-0.29.0.dist-info/METADATA,sha256=iOoEBuJ_p1pdIe5yqLPhYDN6U5j2i9d6513Yt39a78Y,3611
-dyff_schema-0.29.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dyff_schema-0.29.0.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
-dyff_schema-0.29.0.dist-info/RECORD,,
+dyff/schema/v0/r1/io/vllm.py,sha256=vWyLg-susbg0JDfv6VExBpgFdU2GHP2a14ChOdbckvs,5321
+dyff_schema-0.30.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dyff_schema-0.30.0.dist-info/licenses/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
+dyff_schema-0.30.0.dist-info/METADATA,sha256=g0DxR2SxqA7qTpENblTBKliqpHsnAqwcoJr7J78dAIg,3623
+dyff_schema-0.30.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dyff_schema-0.30.0.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
+dyff_schema-0.30.0.dist-info/RECORD,,