dyff-schema 0.3.3__tar.gz → 0.3.5__tar.gz

{dyff-schema-0.3.3/dyff_schema.egg-info → dyff-schema-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dyff-schema
-Version: 0.3.3
+Version: 0.3.5
 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.3 → dyff-schema-0.3.5}/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.",
     )
 
 
@@ -1154,7 +1145,7 @@ class Measurement(DyffEntity, MeasurementSpec, AnalysisOutputQueryFields):
     kind: Literal["Measurement"] = Entities.Measurement.value
 
     def dependencies(self) -> list[str]:
-        return []
+        return [self.analysis]
 
     def resource_allocation(self) -> Optional[ResourceAllocation]:
         return None
@@ -1171,7 +1162,7 @@ class SafetyCase(DyffEntity, SafetyCaseSpec, AnalysisOutputQueryFields):
     kind: Literal["SafetyCase"] = Entities.SafetyCase.value
 
     def dependencies(self) -> list[str]:
-        return []
+        return [self.analysis]
 
     def resource_allocation(self) -> Optional[ResourceAllocation]:
         return None
@@ -1327,7 +1318,13 @@ class Method(DyffEntity, MethodBase):
         return None
 
 
-class AnalysisInputMapping(DyffSchemaBaseModel):
+AnalysisOutputType = Union[
+    Measurement,
+    SafetyCase,
+]
+
+
+class AnalysisInput(DyffSchemaBaseModel):
     keyword: str = pydantic.Field(
         description="The 'keyword' specified for this input in the MethodSpec."
     )
@@ -1352,11 +1349,12 @@ class ForeignMethod(DyffModelWithID, MethodBase):
 
 class AnalysisBase(DyffSchemaBaseModel):
     arguments: list[AnalysisArgument] = pydantic.Field(
-        description="Arguments to pass to the Method implementation."
+        default_factory=list,
+        description="Arguments to pass to the Method implementation.",
     )
 
-    inputs: list[AnalysisInputMapping] = pydantic.Field(
-        description="Mapping of keywords to data entities."
+    inputs: list[AnalysisInput] = pydantic.Field(
+        default_factory=list, description="Mapping of keywords to data entities."
     )
 
 
@@ -1374,6 +1372,13 @@ class Analysis(DyffEntity, AnalysisBase):
         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
 
@@ -1659,10 +1664,12 @@ __all__ = [
     "AcceleratorGPU",
     "AccessGrant",
     "Analysis",
+    "AnalysisAndOutputs",
     "AnalysisArgument",
     "AnalysisBase",
-    "AnalysisInputMapping",
+    "AnalysisInput",
     "AnalysisOutputQueryFields",
+    "AnalysisOutputType",
     "Annotation",
     "APIFunctions",
     "APIKey",

{dyff-schema-0.3.3 → dyff-schema-0.3.5}/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.3 → dyff-schema-0.3.5/dyff_schema.egg-info}/PKG-INFO

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