dyff-schema 0.3.8__py3-none-any.whl → 0.4.0__py3-none-any.whl

dyff/schema/v0/r1/platform.py

@@ -139,15 +139,6 @@ def _k8s_label_value_maxlen():
     return _k8s_label_maxlen()
 
 
-class StorageSignedURL(DyffSchemaBaseModel):
-    url: str = pydantic.Field(description="The signed URL")
-    method: str = pydantic.Field(description="The HTTP method applicable to the URL")
-    headers: dict[str, str] = pydantic.Field(
-        default_factory=dict,
-        description="Mandatory headers that must be passed with the request",
-    )
-
-
 class Entities(str, enum.Enum):
     """The kinds of entities in the dyff system."""
 
@@ -471,6 +462,43 @@ class APIKey(DyffSchemaBaseModel):
     )
 
 
+# ----------------------------------------------------------------------------
+
+
+class Digest(DyffSchemaBaseModel):
+    md5: Optional[str] = pydantic.Field(
+        default=None, description="md5 digest of artifact data"
+    )
+
+
+class Artifact(DyffSchemaBaseModel):
+    # TODO: In v1, rename this to 'contentType' or something and commit to making it the MIME type
+    kind: Optional[str] = pydantic.Field(
+        default=None, description="The kind of artifact"
+    )
+    path: str = pydantic.Field(
+        description="The relative path of the artifact within the tree"
+    )
+    digest: Digest = pydantic.Field(
+        default_factory=Digest,
+        description="One or more message digests (hashes) of the artifact data",
+    )
+
+
+class StorageSignedURL(DyffSchemaBaseModel):
+    url: str = pydantic.Field(description="The signed URL")
+    method: str = pydantic.Field(description="The HTTP method applicable to the URL")
+    headers: dict[str, str] = pydantic.Field(
+        default_factory=dict,
+        description="Mandatory headers that must be passed with the request",
+    )
+
+
+class ArtifactURL(DyffSchemaBaseModel):
+    artifact: Artifact
+    signedURL: StorageSignedURL
+
+
 class AuditRequirement(DyffSchemaBaseModel):
     """An evaluation report that must exist in order to apply an AuditProcedure."""
 
@@ -543,21 +571,6 @@ class ExtractorStep(DyffSchemaBaseModel):
     type: Optional[str] = None
 
 
-class Digest(DyffSchemaBaseModel):
-    md5: Optional[str] = pydantic.Field(None)
-
-
-class Artifact(DyffSchemaBaseModel):
-    # TODO: Enumerate the available kinds
-    kind: str = pydantic.Field(description="The kind of artifact")
-    path: str = pydantic.Field(
-        description="The relative path of the artifact within the dataset"
-    )
-    digest: Digest = pydantic.Field(
-        description="One or more message digests (hashes) of the artifact data"
-    )
-
-
 class DyffDataSchema(DyffSchemaBaseModel):
     components: list[str] = pydantic.Field(
         min_items=1,
@@ -1332,16 +1345,34 @@ class ForeignMethod(DyffModelWithID, MethodBase):
 
 
 class AnalysisScope(DyffSchemaBaseModel):
-    dataset: Optional[str]
-    inferenceService: Optional[str]
-    evaluation: Optional[str]
-    model: Optional[str]
+    """The specific entities to which the analysis applies.
+
+    When applying an InferenceService-scoped Method, at least
+    ``.inferenceService`` must be set.
+
+    When applying an Evaluation-scoped Method, at least ``.evaluation``,
+    ``.inferenceService``, and ``.dataset`` must be set.
+    """
+
+    dataset: Optional[str] = pydantic.Field(
+        default=None, description="The Dataset to which the analysis applies."
+    )
+    inferenceService: Optional[str] = pydantic.Field(
+        default=None, description="The InferenceService to which the analysis applies."
+    )
+    evaluation: Optional[str] = pydantic.Field(
+        default=None, description="The Evaluation to which the analysis applies."
+    )
+    model: Optional[str] = pydantic.Field(
+        default=None, description="The Model to which the analysis applies."
+    )
 
 
 class AnalysisBase(DyffSchemaBaseModel):
     scope: AnalysisScope = pydantic.Field(
+        default_factory=AnalysisScope,
         description="The specific entities to which the analysis results apply."
-        " At a minimum, the field corresponding to method.scope must be set."
+        " At a minimum, the field corresponding to method.scope must be set.",
     )
 
     arguments: list[AnalysisArgument] = pydantic.Field(
@@ -1695,6 +1726,7 @@ __all__ = [
     "APIKey",
     "ArchiveFormat",
     "Artifact",
+    "ArtifactURL",
     "Audit",
     "AuditProcedure",
     "AuditRequirement",

{dyff_schema-0.3.8.dist-info → dyff_schema-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dyff-schema
-Version: 0.3.8
+Version: 0.4.0
 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.3.8.dist-info → dyff_schema-0.4.0.dist-info}/RECORD

@@ -21,7 +21,7 @@ dyff/schema/v0/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
 dyff/schema/v0/r1/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
 dyff/schema/v0/r1/adapters.py,sha256=2t2oxsnGfSEDKKDIEYw4qqLXMH7qlFIwPVuLyUmbsHs,23552
 dyff/schema/v0/r1/base.py,sha256=g_wqh4OU_9ftMHovVxPtdeup4O5MZi422v3eZH99ZQI,17139
-dyff/schema/v0/r1/platform.py,sha256=s29alLQ5wyRKFbw-oGawF1RNT-IsLi_iEEtMxgTn1PM,55483
+dyff/schema/v0/r1/platform.py,sha256=pu6N3Gh94V1-7fdwGuXTqDzlzTCFkp7Ne3lqxN41u9Q,56634
 dyff/schema/v0/r1/requests.py,sha256=ZD31iDNyJQFDzJlFrSsDBorS7TXyhRBk-R6oG7PI3kE,7762
 dyff/schema/v0/r1/test.py,sha256=X6dUyVd5svcPCI-PBMOAqEfK9jv3bRDvkQTJzwS96c0,10720
 dyff/schema/v0/r1/version.py,sha256=SG9ds8afHgdrqOA4CEY8-MM3lKfAE9G0rxsG4uyeglE,363
@@ -33,9 +33,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.3.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dyff_schema-0.3.8.dist-info/METADATA,sha256=8zEv_sAGEh6IdpqJT1HzmpbDT9dMiwEn_634S4J_pYw,3459
-dyff_schema-0.3.8.dist-info/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
-dyff_schema-0.3.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dyff_schema-0.3.8.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
-dyff_schema-0.3.8.dist-info/RECORD,,
+dyff_schema-0.4.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dyff_schema-0.4.0.dist-info/METADATA,sha256=uActriu3gclgkQfUz4B0D4RMhpYdMVATwjjBVx1aHmM,3459
+dyff_schema-0.4.0.dist-info/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
+dyff_schema-0.4.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dyff_schema-0.4.0.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
+dyff_schema-0.4.0.dist-info/RECORD,,