dyff-schema 0.5.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

dyff/schema/v0/r1/platform.py

@@ -1097,6 +1097,16 @@ class InferenceSessionAndToken(DyffSchemaBaseModel):
     token: str
 
 
+class InferenceSessionReference(DyffSchemaBaseModel):
+    session: str = pydantic.Field(
+        description="The ID of a running inference session.",
+    )
+
+    interface: InferenceInterface = pydantic.Field(
+        description="How to move data in and out of the service."
+    )
+
+
 class DatasetFilter(DyffSchemaBaseModel):
     """A rule for restrcting which instances in a Dataset are returned."""
 
@@ -1134,10 +1144,20 @@ class Evaluation(DyffEntity, EvaluationBase):
     kind: Literal["Evaluation"] = Entities.Evaluation.value
 
     inferenceSession: InferenceSessionSpec = pydantic.Field(
-        description="Specification of the InferenceSession that will perform inference for the evaluation.",
+        description="Specification of the InferenceSession that will perform"
+        " inference for the evaluation.",
+    )
+
+    inferenceSessionReference: Optional[str] = pydantic.Field(
+        default=None,
+        description="ID of a running inference session that will be used"
+        " for the evaluation instead of starting a new one.",
     )
 
     def dependencies(self) -> list[str]:
+        # TODO: It would be nice if the session could be a dependency,
+        # so that the client doesn't start until the session is ready, but
+        # dyff-orchestrator can't handle dependencies on sessions currently.
         return [self.dataset, self.inferenceSession.inferenceService.id]
 
     def resource_allocation(self) -> Optional[ResourceAllocation]:
@@ -1867,6 +1887,7 @@ __all__ = [
     "InferenceSession",
     "InferenceSessionAndToken",
     "InferenceSessionBase",
+    "InferenceSessionReference",
     "InferenceSessionSpec",
     "Label",
     "LabelKey",

dyff/schema/v0/r1/requests.py

@@ -73,10 +73,27 @@ class EvaluationCreateRequest(DyffEntityCreateRequest, EvaluationBase):
     """A description of how to run an InferenceService on a Dataset to obtain a set of
     evaluation results."""
 
-    inferenceSession: EvaluationInferenceSessionRequest = pydantic.Field(
+    inferenceSession: Optional[EvaluationInferenceSessionRequest] = pydantic.Field(
+        default=None,
         description="Specification of the InferenceSession that will perform inference for the evaluation.",
     )
 
+    inferenceSessionReference: Optional[str] = pydantic.Field(
+        default=None,
+        description="The ID of a running inference session that will be used"
+        " for the evaluation, instead of starting a new one.",
+    )
+
+    @pydantic.root_validator
+    def check_session_exactly_one(cls, values):
+        session = values.get("inferenceSession") is not None
+        session_ref = values.get("inferenceSessionReference") is not None
+        if not (session ^ session_ref):
+            raise ValueError(
+                "must specify exactly one of {inferenceSession, inferenceSessionReference}"
+            )
+        return values
+
 
 class MethodCreateRequest(DyffEntityCreateRequest, MethodBase):
     pass
@@ -141,16 +158,12 @@ class DyffEntityQueryRequest(DyffSchemaBaseModel):
 
 
 class _AnalysisProductQueryRequest(DyffEntityQueryRequest):
-    analysis: Optional[str] = pydantic.Field(default=None)
-    method: Optional[str] = pydantic.Field(default=None)
-    methodName: 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)
+    dataset: Optional[str] = pydantic.Field(default=None)
+    evaluation: Optional[str] = pydantic.Field(default=None)
+    inferenceService: Optional[str] = pydantic.Field(default=None)
+    model: Optional[str] = pydantic.Field(default=None)
     inputsAnyOf: Optional[str] = pydantic.Field(default=None)
 
 
@@ -215,7 +228,6 @@ class SafetyCaseQueryRequest(_AnalysisProductQueryRequest):
 
 __all__ = [
     "AnalysisCreateRequest",
-    "AnalysisQueryRequest",
     "AuditQueryRequest",
     "DyffEntityCreateRequest",
     "DyffEntityQueryRequest",

{dyff_schema-0.5.1.dist-info → dyff_schema-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dyff-schema
-Version: 0.5.1
+Version: 0.6.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.5.1.dist-info → dyff_schema-0.6.0.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=YTkQpjkwjf2L0EKu69HvdzqRJOsJCkyDhagzosSz6tE,59933
-dyff/schema/v0/r1/requests.py,sha256=NYh7uiEux_RNAy9hGbp8vc5J7XyAa5eQFkV6EVRXp2k,7960
+dyff/schema/v0/r1/platform.py,sha256=2QcXlSxPZDLqbICoAvwebXcRf3ssvK_X6MJRqxx3AXI,60712
+dyff/schema/v0/r1/requests.py,sha256=15MzY1l-RMH68SoihYRa9hX0McFadz9slcbIOQmdvuU,8490
 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
@@ -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.5.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dyff_schema-0.5.1.dist-info/METADATA,sha256=cSkDWXHglwh-L0JR7miRsz_qHy-VdUs000t8Wa4YjxI,3459
-dyff_schema-0.5.1.dist-info/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
-dyff_schema-0.5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dyff_schema-0.5.1.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
-dyff_schema-0.5.1.dist-info/RECORD,,
+dyff_schema-0.6.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dyff_schema-0.6.0.dist-info/METADATA,sha256=HLHebKirGXnxLtDAGD-lK6wUfxWG7JzPB8czgEqfG6s,3459
+dyff_schema-0.6.0.dist-info/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
+dyff_schema-0.6.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dyff_schema-0.6.0.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
+dyff_schema-0.6.0.dist-info/RECORD,,