dyff-schema 0.3.4__py3-none-any.whl → 0.3.7__py3-none-any.whl

dyff/schema/v0/r1/platform.py

@@ -1114,27 +1114,18 @@ class MeasurementLevel(str, enum.Enum):
 
 
 class AnalysisOutputQueryFields(DyffSchemaBaseModel):
-    method: QueryableDyffEntity = pydantic.Field(
-        description="Identifying information about the Method that was run to produce the output."
-    )
-
-    dataset: Optional[QueryableDyffEntity] = pydantic.Field(
+    analysis: str = pydantic.Field(
         default=None,
-        description="Identifying information about the Dataset being analyzed, if applicable.",
+        description="ID of the Analysis that produced the output.",
     )
 
-    evaluation: Optional[str] = pydantic.Field(
-        default=None,
-        description="ID of the Evaluation being analyzed, if applicable.",
+    method: QueryableDyffEntity = pydantic.Field(
+        description="Identifying information about the Method that was run to produce the output."
     )
 
-    inferenceService: Optional[QueryableDyffEntity] = pydantic.Field(
+    inputs: list[str] = pydantic.Field(
         default=None,
-        description="Identifying information about the InferenceService being analyzed, if applicable.",
-    )
-
-    model: Optional[QueryableDyffEntity] = pydantic.Field(
-        description="Identifying information about the Model being analyzed, if applicable",
+        description="IDs of resources that were inputs to the Analysis.",
     )
 
 
@@ -1150,16 +1141,6 @@ class MeasurementSpec(DyffSchemaBaseModel):
     )
 
 
-class Measurement(DyffEntity, MeasurementSpec, AnalysisOutputQueryFields):
-    kind: Literal["Measurement"] = Entities.Measurement.value
-
-    def dependencies(self) -> list[str]:
-        return []
-
-    def resource_allocation(self) -> Optional[ResourceAllocation]:
-        return None
-
-
 class SafetyCaseSpec(DyffSchemaBaseModel):
     name: str = pydantic.Field(description="Descriptive name of the SafetyCase.")
     description: Optional[str] = pydantic.Field(
@@ -1167,16 +1148,6 @@ class SafetyCaseSpec(DyffSchemaBaseModel):
     )
 
 
-class SafetyCase(DyffEntity, SafetyCaseSpec, AnalysisOutputQueryFields):
-    kind: Literal["SafetyCase"] = Entities.SafetyCase.value
-
-    def dependencies(self) -> list[str]:
-        return []
-
-    def resource_allocation(self) -> Optional[ResourceAllocation]:
-        return None
-
-
 class MethodImplementationKind(str, enum.Enum):
     JupyterNotebook = "JupyterNotebook"
     PythonFunction = "PythonFunction"
@@ -1286,9 +1257,19 @@ class MethodOutput(DyffSchemaBaseModel):
     )
 
 
+class MethodScope(str, enum.Enum):
+    InferenceService = Entities.InferenceService.value
+    Evaluation = Entities.Evaluation.value
+
+
 class MethodBase(DyffSchemaBaseModel):
     name: str = pydantic.Field(description="Descriptive name of the Method.")
 
+    scope: MethodScope = pydantic.Field(
+        description="The scope of the Method. The Method produces outputs that"
+        " are specific to one entity of the type specified in the .scope field."
+    )
+
     description: Optional[str] = pydantic.Field(
         default=None, description="Long-form description, interpreted as Markdown."
     )
@@ -1327,7 +1308,7 @@ class Method(DyffEntity, MethodBase):
         return None
 
 
-class AnalysisInputMapping(DyffSchemaBaseModel):
+class AnalysisInput(DyffSchemaBaseModel):
     keyword: str = pydantic.Field(
         description="The 'keyword' specified for this input in the MethodSpec."
     )
@@ -1350,24 +1331,48 @@ class ForeignMethod(DyffModelWithID, MethodBase):
     pass
 
 
+class AnalysisScope(DyffSchemaBaseModel):
+    dataset: Optional[str]
+    inferenceService: Optional[str]
+    evaluation: Optional[str]
+    model: Optional[str]
+
+
 class AnalysisBase(DyffSchemaBaseModel):
+    scope: AnalysisScope = pydantic.Field(
+        description="The specific entities to which the analysis results apply."
+        " At a minimum, the field corresponding to method.scope must be set."
+    )
+
     arguments: list[AnalysisArgument] = pydantic.Field(
         default_factory=list,
         description="Arguments to pass to the Method implementation.",
     )
 
-    inputs: list[AnalysisInputMapping] = pydantic.Field(
+    inputs: list[AnalysisInput] = pydantic.Field(
         default_factory=list, description="Mapping of keywords to data entities."
     )
 
 
-class Analysis(DyffEntity, AnalysisBase):
-    kind: Literal["Analysis"] = Entities.Analysis.value
-
+class Analysis(AnalysisBase):
     method: ForeignMethod = pydantic.Field(
         description="The analysis Method to run.",
     )
 
+
+class Measurement(DyffEntity, MeasurementSpec, Analysis):
+    kind: Literal["Measurement"] = Entities.Measurement.value
+
+    def dependencies(self) -> list[str]:
+        return [self.method.id] + [x.entity for x in self.inputs]
+
+    def resource_allocation(self) -> Optional[ResourceAllocation]:
+        return None
+
+
+class SafetyCase(DyffEntity, SafetyCaseSpec, Analysis):
+    kind: Literal["SafetyCase"] = Entities.SafetyCase.value
+
     def dependencies(self) -> list[str]:
         return [self.method.id] + [x.entity for x in self.inputs]
 
@@ -1375,6 +1380,27 @@ class Analysis(DyffEntity, AnalysisBase):
         return None
 
 
+# class Analysis(DyffEntity, AnalysisBase):
+#     kind: Literal["Analysis"] = Entities.Analysis.value
+
+#     method: ForeignMethod = pydantic.Field(
+#         description="The analysis Method to run.",
+#     )
+
+#     def dependencies(self) -> list[str]:
+#         return [self.method.id] + [x.entity for x in self.inputs]
+
+#     def resource_allocation(self) -> Optional[ResourceAllocation]:
+#         return None
+
+
+# class AnalysisAndOutputs(DyffSchemaBaseModel):
+#     analysis: Analysis = pydantic.Field(description="The Analysis entity")
+#     outputs: list[AnalysisOutputType] = pydantic.Field(
+#         description="Concrete outputs of the Analysis"
+#     )
+
+
 # ---------------------------------------------------------------------------
 # Status enumerations
 
@@ -1638,7 +1664,6 @@ def entity_class(kind: Entities):
 
 
 DyffEntityType = Union[
-    Analysis,
     Audit,
     AuditProcedure,
     DataSource,
@@ -1662,7 +1687,7 @@ __all__ = [
     "Analysis",
     "AnalysisArgument",
     "AnalysisBase",
-    "AnalysisInputMapping",
+    "AnalysisInput",
     "AnalysisOutputQueryFields",
     "Annotation",
     "APIFunctions",
@@ -1689,6 +1714,7 @@ __all__ = [
     "EvaluationBase",
     "ExtractorStep",
     "ForeignInferenceService",
+    "ForeignMethod",
     "ForeignModel",
     "Frameworks",
     "InferenceInterface",
@@ -1722,6 +1748,7 @@ __all__ = [
     "MethodOutput",
     "MethodOutputKind",
     "MethodParameter",
+    "MethodScope",
     "Model",
     "ModelArtifact",
     "ModelArtifactHuggingFaceCache",

dyff/schema/v0/r1/requests.py

@@ -131,21 +131,17 @@ class DyffEntityQueryRequest(DyffSchemaBaseModel):
 
 
 class _AnalysisProductQueryRequest(DyffEntityQueryRequest):
-    dataset: Optional[str] = pydantic.Field(default=None)
-    datasetName: Optional[str] = pydantic.Field(default=None)
-    evaluation: Optional[str] = pydantic.Field(default=None)
-    inferenceService: Optional[str] = pydantic.Field(default=None)
-    inferenceServiceName: Optional[str] = pydantic.Field(default=None)
+    analysis: Optional[str] = pydantic.Field(default=None)
     method: Optional[str] = pydantic.Field(default=None)
     methodName: Optional[str] = pydantic.Field(default=None)
-    model: Optional[str] = pydantic.Field(default=None)
-    modelName: Optional[str] = pydantic.Field(default=None)
+    inputsAnyOf: Optional[str] = pydantic.Field(default=None)
 
 
 class AnalysisQueryRequest(DyffEntityQueryRequest):
     method: Optional[str] = pydantic.Field(default=None)
     methodName: Optional[str] = pydantic.Field(default=None)
     methodOutputKind: Optional[str] = pydantic.Field(default=None)
+    inputsAnyOf: Optional[str] = pydantic.Field(default=None)
 
 
 class AuditQueryRequest(DyffEntityQueryRequest):

{dyff_schema-0.3.4.dist-info → dyff_schema-0.3.7.dist-info}/METADATA

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

@@ -21,8 +21,8 @@ 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=qugM6V8GuMB8qVfwLtlRtXCX6imJnOOl_A9jRfcCFwo,54703
-dyff/schema/v0/r1/requests.py,sha256=jUznZzafF2qSQBBkdXFMDtslCkayg59yFH99NcQHYmk,8014
+dyff/schema/v0/r1/platform.py,sha256=IoonxCKyPTnVNCmiGIxT9xG3m06V8wRmf_iuzcocPm0,55462
+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
 dyff/schema/v0/r1/dataset/__init__.py,sha256=LbVlkO2asyGYBKk2z49xjJYTM-pu9y9e4eQDXgTDLnM,2553
@@ -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.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dyff_schema-0.3.4.dist-info/METADATA,sha256=993TcxK8XRsF1vFPJS5PDY2oKmLgE1t3XQvg8gQ6vEQ,3459
-dyff_schema-0.3.4.dist-info/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
-dyff_schema-0.3.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dyff_schema-0.3.4.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
-dyff_schema-0.3.4.dist-info/RECORD,,
+dyff_schema-0.3.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dyff_schema-0.3.7.dist-info/METADATA,sha256=FIKMxpdwwuY4OzJXANPAZmsiQF4OQmgaZJid44UqoMY,3459
+dyff_schema-0.3.7.dist-info/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
+dyff_schema-0.3.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dyff_schema-0.3.7.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
+dyff_schema-0.3.7.dist-info/RECORD,,