dyff-schema 0.26.0__py3-none-any.whl → 0.26.2__py3-none-any.whl

dyff/schema/v0/r1/commands.py

@@ -41,8 +41,13 @@ class EntityIdentifier(DyffSchemaBaseModel):
         """Create an identifier that identifies the given entity."""
         return EntityIdentifier(kind=entity.kind, id=entity.id)
 
-    kind: EntityKindLiteral = pydantic.Field(description="The .kind of the entity.")
     id: str = pydantic.Field(description="The .id of the entity.")
+    kind: Optional[EntityKindLiteral] = pydantic.Field(
+        default=None,
+        description="The .kind of the entity. This is optional because"
+        " sometimes you need to send a command without knowing the kind,"
+        " but it should be set whenever possible.",
+    )
 
 
 class FamilyIdentifier(EntityIdentifier):
@@ -51,7 +56,7 @@ class FamilyIdentifier(EntityIdentifier):
     kind: Literal["Family"] = "Family"
 
 
-class Command(SchemaVersion):
+class Command(SchemaVersion, DyffSchemaBaseModel):
     """Base class for Command messages.
 
     Commands define the API of the "command model" in our CQRS architecture.
@@ -95,17 +100,17 @@ class CreateEntity(Command):
 
 
 class EditEntityDocumentationPatch(DyffSchemaBaseModel):
-    """Same properties as DocumentationBase, but generates a JSON Schema that allows
-    fields to be set to JSON 'null'.
+    """Same properties as DocumentationBase, but assigning None to a field is
+    interpreted as a command to delete that field.
 
-    This is needed to get JSON Merge Patch semantics, where explicit 'null' means
-    "delete that field".
+    Fields that are assigned explicitly remain unchanged.
     """
 
     title: Optional[Union[pydantic.constr(max_length=title_maxlen()), Null]] = (  # type: ignore
         pydantic.Field(
             default=None,
-            description='A short plain string suitable as a title or "headline".',
+            description='A short plain string suitable as a title or "headline".'
+            " Providing an explicit None value deletes the current value.",
         )
     )
 
@@ -113,19 +118,22 @@ class EditEntityDocumentationPatch(DyffSchemaBaseModel):
         pydantic.Field(
             default=None,
             description="A brief summary, suitable for display in"
-            " small UI elements. Interpreted as Markdown. Excessively long"
-            " summaries may be truncated in the UI, especially on small displays.",
+            " small UI elements. Providing an explicit None value deletes the"
+            " current value.",
         )
     )
 
     fullPage: Optional[Union[str, Null]] = pydantic.Field(
         default=None,
         description="Long-form documentation. Interpreted as"
-        " Markdown. There are no length constraints, but be reasonable.",
+        " Markdown. There are no length constraints, but be reasonable."
+        " Providing an explicit None value deletes the current value.",
     )
 
 
 class EditEntityDocumentationAttributes(DyffSchemaBaseModel):
+    """Attributes for the EditEntityDocumentation command."""
+
     documentation: EditEntityDocumentationPatch = pydantic.Field(
         description="Edits to make to the documentation."
     )
@@ -155,18 +163,13 @@ class EditEntityDocumentation(Command):
 
 
 class EditEntityLabelsAttributes(DyffSchemaBaseModel):
+    """Attributes for the EditEntityLabels command."""
+
     labels: dict[LabelKeyType, Optional[Union[LabelValueType, Null]]] = pydantic.Field(
         default_factory=dict,
-        description="A set of key-value labels for the resource. Used to"
-        " specify identifying attributes of resources that are meaningful to"
-        " users but do not imply semantics in the dyff system.\n\n"
-        "The keys are DNS labels with an optional DNS domain prefix."
-        " For example: 'my-key', 'your.com/key_0'. Keys prefixed with"
-        " 'dyff.io/', 'subdomain.dyff.io/', etc. are reserved.\n\n"
-        "The label values are alphanumeric characters separated by"
-        " '.', '-', or '_'.\n\n"
-        "We follow the kubernetes label conventions closely."
-        " See: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels",
+        description="A set of key-value labels for the resource."
+        " Existing label keys that are not provided in the edit remain unchanged."
+        " Providing an explicit None value deletes the corresponding key.",
     )
 
 
@@ -194,7 +197,7 @@ class EditEntityLabels(Command):
 
 
 class EditFamilyMembersAttributes(DyffSchemaBaseModel):
-    """Payload data for the EditFamilyMembers command."""
+    """Attributes for the EditFamilyMembers command."""
 
     members: dict[TagNameType, Optional[Union[FamilyMember, Null]]] = pydantic.Field(
         description="Mapping of names to IDs of member resources.",
@@ -236,11 +239,13 @@ class ForgetEntity(Command):
 
 
 class UpdateEntityStatusAttributes(DyffSchemaBaseModel):
+    """Attributes for the UpdateEntityStatus command."""
+
     status: str = pydantic.Field(
         description=Status.__fields__["status"].field_info.description
     )
 
-    reason: Union[str, Null] = pydantic.Field(
+    reason: Optional[Union[str, Null]] = pydantic.Field(
         description=Status.__fields__["reason"].field_info.description
     )
 

dyff/schema/v0/r1/platform.py

@@ -305,7 +305,7 @@ def LabelValue() -> type[str]:
 
 def TagName() -> type[str]:
     return pydantic.constr(  # type: ignore
-        regex=_oci_image_tag_regex(), max_length=_k8s_label_key_maxlen()
+        regex=_oci_image_tag_regex(), max_length=_oci_image_tag_maxlen()
     )
 
 

dyff/schema/v0/r1/requests.py

@@ -16,11 +16,12 @@ from __future__ import annotations
 
 import re
 from datetime import datetime
-from typing import Literal, Optional, Union
+from typing import Any, Literal, Optional, Union
 
 import pydantic
 
-from .base import DyffBaseModel, DyffSchemaBaseModel
+from . import commands
+from .base import DyffBaseModel
 from .platform import (
     AnalysisBase,
     AnalysisScope,
@@ -30,10 +31,8 @@ from .platform import (
     DocumentationBase,
     EvaluationBase,
     FamilyBase,
-    FamilyMembers,
     InferenceServiceBase,
     InferenceSessionBase,
-    Labeled,
     MethodBase,
     ModelSpec,
     ModuleBase,
@@ -43,6 +42,9 @@ from .platform import (
 )
 from .version import SchemaVersion
 
+# mypy gets confused because 'dict' is the name of a method in DyffBaseModel
+_ModelAsDict = dict[str, Any]
+
 
 class DyffRequestDefaultValidators(DyffBaseModel):
     """This must be the base class for *all* request models in the Dyff schema.
@@ -62,7 +64,19 @@ class DyffRequestDefaultValidators(DyffBaseModel):
 
 
 class DyffRequestBase(SchemaVersion, DyffRequestDefaultValidators):
-    pass
+    # TODO: (DYFF-223) I think that exclude_unset=True should be the default
+    # for all schema objects, but I'm unsure of the consequences of making
+    # this change and we'll defer it until v1.
+    def dict(
+        self, *, by_alias: bool = True, exclude_unset=True, **kwargs
+    ) -> _ModelAsDict:
+        return super().dict(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)
+
+
+# ----------------------------------------------------------------------------
 
 
 class DyffEntityCreateRequest(DyffRequestBase):
@@ -124,26 +138,6 @@ class DatasetCreateRequest(DyffEntityCreateRequest, DatasetBase):
     pass
 
 
-class DocumentationEditRequest(DyffRequestBase, DocumentationBase):
-    @pydantic.validator("title", check_fields=False)
-    def _validate_title(cls, title: Optional[str]) -> Optional[str]:
-        # TODO: This has to be a validator function because we can't apply the
-        # contraint to DocumentationBase, since there are already entities
-        # that violate the constraints in the data store. Fix in Schema v1.
-        if title is not None and len(title) > title_maxlen():
-            raise ValueError(f".title must have length < {title_maxlen()}")
-        return title
-
-    @pydantic.validator("summary", check_fields=False)
-    def _validate_summary(cls, summary: Optional[str]) -> Optional[str]:
-        # TODO: This has to be a validator function because we can't apply the
-        # contraint to DocumentationBase, since there are already entities
-        # that violate the constraints in the data store. Fix in Schema v1.
-        if summary is not None and len(summary) > summary_maxlen():
-            raise ValueError(f".summary must have length < {summary_maxlen()}")
-        return summary
-
-
 class InferenceServiceCreateRequest(DyffEntityCreateRequest, InferenceServiceBase):
     model: Optional[str] = pydantic.Field(
         default=None, description="ID of Model backing the service, if applicable"
@@ -239,14 +233,35 @@ class ReportCreateRequest(DyffEntityCreateRequest, ReportBase):
     )
 
 
-class FamilyMembersEditRequest(DyffRequestBase, FamilyMembers):
+# ----------------------------------------------------------------------------
+
+
+class DocumentationEditRequest(
+    DyffRequestBase, commands.EditEntityDocumentationAttributes
+):
     pass
 
 
-class LabelUpdateRequest(DyffRequestBase, Labeled):
+class FamilyMembersEditRequest(DyffRequestBase, commands.EditFamilyMembersAttributes):
     pass
 
 
+class LabelsEditRequest(DyffRequestBase, commands.EditEntityLabelsAttributes):
+    pass
+
+
+class LabelUpdateRequest(LabelsEditRequest):
+    """Deprecated alias for LabelsEditRequest.
+
+    .. deprecated:: 0.26.0
+
+        Use LabelsEditRequest
+    """
+
+
+# ----------------------------------------------------------------------------
+
+
 # Note: Query requests, as they currently exist, don't work with Versioned
 # because fastapi will assign None to every field that the client doesn't
 # specify. I think it's not that important, because all of the query parameters
@@ -418,6 +433,7 @@ __all__ = [
     "InferenceSessionQueryRequest",
     "InferenceSessionTokenCreateRequest",
     "LabelUpdateRequest",
+    "LabelsEditRequest",
     "MeasurementQueryRequest",
     "MethodCreateRequest",
     "MethodQueryRequest",

{dyff_schema-0.26.0.dist-info → dyff_schema-0.26.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dyff-schema
-Version: 0.26.0
+Version: 0.26.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.26.0.dist-info → dyff_schema-0.26.2.dist-info}/RECORD

@@ -25,9 +25,9 @@ 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=OW05Wn2ZHBpeutj2sx93jcD1cz4kLzRvRZ_y2dS53lo,20206
-dyff/schema/v0/r1/commands.py,sha256=GUeD5wx-ZkfqLpQa6iI4joq_AVTxR1gFvmluA9AZ1G4,9136
-dyff/schema/v0/r1/platform.py,sha256=ndOu5kOfkQOjfFQ0bX8sp0IvMO1xcVMmpWU0LMQeS88,80754
-dyff/schema/v0/r1/requests.py,sha256=4TM1IKG9IP4MyprIy9E9XA_JqvkuwKAuY1ao1BbVLI0,15676
+dyff/schema/v0/r1/commands.py,sha256=8PN_oBKLOJ7vweMVA01BtrURyN2LjC2C9WMO8Ki-NJI,9136
+dyff/schema/v0/r1/platform.py,sha256=iXlDpL45W8m9RMhEWgFkuDW7rOEwiK18gnu8dgYzRaA,80754
+dyff/schema/v0/r1/requests.py,sha256=ZoaT_g7dPKIWtibWJFwlbuMJ2dXqIkS8h9mJ-7VnLr4,15789
 dyff/schema/v0/r1/test.py,sha256=X6dUyVd5svcPCI-PBMOAqEfK9jv3bRDvkQTJzwS96c0,10720
 dyff/schema/v0/r1/version.py,sha256=isKAGuGxsdru8vDaYmI4YiZdJOu_wNxXK7u6QzD6FE4,392
 dyff/schema/v0/r1/dataset/__init__.py,sha256=LbVlkO2asyGYBKk2z49xjJYTM-pu9y9e4eQDXgTDLnM,2553
@@ -39,9 +39,9 @@ dyff/schema/v0/r1/dataset/text.py,sha256=nLIn91Zlt0tNdXUklSgjJ-kEDxoPX32ISLkiv2D
 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.26.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dyff_schema-0.26.0.dist-info/METADATA,sha256=FNMFyld3y1bRhDrQF8H9WILabZKxeo5zkazsLkCrnkU,3482
-dyff_schema-0.26.0.dist-info/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
-dyff_schema-0.26.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-dyff_schema-0.26.0.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
-dyff_schema-0.26.0.dist-info/RECORD,,
+dyff_schema-0.26.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dyff_schema-0.26.2.dist-info/METADATA,sha256=7Fnl0skcl3BUYwrW3R6OO6-v7rMuRkItvbSa68k40nI,3482
+dyff_schema-0.26.2.dist-info/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
+dyff_schema-0.26.2.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+dyff_schema-0.26.2.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
+dyff_schema-0.26.2.dist-info/RECORD,,