dyff-schema 0.38.9__py3-none-any.whl → 0.38.13__py3-none-any.whl

dyff/schema/_version.py

@@ -1,2 +1,2 @@
-__version__ = version = "0.38.9"
-__version_tuple__ = version_tuple = (0, 38, 9)
+__version__ = version = "0.38.13"
+__version_tuple__ = version_tuple = (0, 38, 13)

dyff/schema/v0/r1/platform.py

@@ -2656,7 +2656,7 @@ class ChallengeTaskContent(DyffSchemaBaseModel):
     )
 
 
-class ChallengeSubmissionStructure(DyffSchemaBaseModel):
+class SubmissionStructure(DyffSchemaBaseModel):
     submissionKind: EntityKindLiteral = pydantic.Field(
         default=Entities.InferenceService.value,
         description="The kind of entity that you can submit to this task.",
@@ -2683,8 +2683,8 @@ class ChallengeTaskBase(DyffSchemaBaseModel):
     assessment: str = pydantic.Field(
         description="ID of the Pipeline used to assess the submission."
     )
-    submissionStructure: ChallengeSubmissionStructure = pydantic.Field(
-        default_factory=ChallengeSubmissionStructure,
+    submissionStructure: SubmissionStructure = pydantic.Field(
+        default_factory=SubmissionStructure,
         description="How to run the assessment pipeline on a new submission.",
     )
     rules: ChallengeTaskRules = pydantic.Field(description="The rules for submissions.")
@@ -2745,14 +2745,14 @@ class Challenge(DyffEntity):
         return None
 
 
-class ChallengeSubmissionBase(DyffSchemaBaseModel):
+class SubmissionBase(DyffSchemaBaseModel):
     team: str = pydantic.Field(description="The ID of the team making the submission.")
     submission: EntityIdentifier = pydantic.Field(
         description="The resource being submitted for assessment."
     )
 
 
-class ChallengeSubmission(DyffEntity, ChallengeSubmissionBase):
+class Submission(DyffEntity, SubmissionBase):
     """A submission of an inference system to a challenge by a team.
 
     All of the constituent resources must already exist. Creating a Submission simply
@@ -2788,27 +2788,31 @@ class PipelineEvaluationRequest(EvaluationRequestBase):
     kind: Literal["PipelineEvaluationRequest"] = "PipelineEvaluationRequest"
 
     def dependencies(self) -> list[str]:
-        # This is a dirty hack that works because the types are structurally
-        # equivalent as far as .dependencies() cares
-        return Evaluation.dependencies(self)  # type: ignore[arg-type]
+        if self.inferenceSession is None:
+            raise AssertionError()
+        return [self.dataset, self.inferenceSession.inferenceService]
+
+    @pydantic.model_validator(mode="after")
+    def check_session_not_reference(self):
+        if self.inferenceSession is None or self.inferenceSessionReference is not None:
+            raise ValueError(
+                "evaluations in pipelines must set inferenceSession, not inferenceSessionReference"
+            )
+        return self
 
 
 class PipelineMeasurementRequest(AnalysisRequestBase):
     kind: Literal["PipelineMeasurementRequest"] = "PipelineMeasurementRequest"
 
     def dependencies(self) -> list[str]:
-        # This is a dirty hack that works because the types are structurally
-        # equivalent as far as .dependencies() cares
-        return Measurement.dependencies(self)  # type: ignore[arg-type]
+        return [self.method] + [x.entity for x in self.inputs]
 
 
 class PipelineSafetyCaseRequest(AnalysisRequestBase):
     kind: Literal["PipelineSafetyCaseRequest"] = "PipelineSafetyCaseRequest"
 
     def dependencies(self) -> list[str]:
-        # This is a dirty hack that works because the types are structurally
-        # equivalent as far as .dependencies() cares
-        return SafetyCase.dependencies(self)  # type: ignore[arg-type]
+        return [self.method] + [x.entity for x in self.inputs]
 
 
 PipelineNodeRequest = Union[
@@ -3203,7 +3207,6 @@ _DyffEntityTypeRevisable = Union[
     Audit,
     AuditProcedure,
     Challenge,
-    ChallengeSubmission,
     DataSource,
     Dataset,
     Evaluation,
@@ -3220,6 +3223,7 @@ _DyffEntityTypeRevisable = Union[
     PipelineRun,
     Report,
     SafetyCase,
+    Submission,
     Team,
     UseCase,
 ]
@@ -3299,7 +3303,7 @@ _ENTITY_CLASS: dict[Entities, type[DyffEntityType]] = {
     Entities.Report: Report,
     Entities.Revision: Revision,
     Entities.SafetyCase: SafetyCase,
-    Entities.Submission: ChallengeSubmission,
+    Entities.Submission: Submission,
     Entities.Team: Team,
     Entities.UseCase: UseCase,
 }
@@ -3315,7 +3319,6 @@ DyffEntityT = TypeVar(
     Audit,
     AuditProcedure,
     Challenge,
-    ChallengeSubmission,
     DataSource,
     Dataset,
     Evaluation,
@@ -3334,6 +3337,7 @@ DyffEntityT = TypeVar(
     Report,
     Revision,
     SafetyCase,
+    Submission,
     Team,
     UseCase,
 )
@@ -3365,8 +3369,6 @@ __all__ = [
     "Challenge",
     "ChallengeContent",
     "ChallengeContentPage",
-    "ChallengeSubmission",
-    "ChallengeSubmissionBase",
     "ChallengeTask",
     "ChallengeTaskBase",
     "ChallengeTaskContent",
@@ -3503,6 +3505,9 @@ __all__ = [
     "ScoreMetadataRefs",
     "Status",
     "StorageSignedURL",
+    "Submission",
+    "SubmissionBase",
+    "SubmissionStructure",
     "TagName",
     "TagNameType",
     "TaskSchema",

dyff/schema/v0/r1/requests.py

@@ -27,7 +27,6 @@ from .platform import (
     AnalysisRequestBase,
     AnalysisScope,
     ChallengeContent,
-    ChallengeSubmissionBase,
     ChallengeTaskBase,
     ConcernBase,
     DatasetBase,
@@ -46,6 +45,7 @@ from .platform import (
     PipelineBase,
     PipelineRunBase,
     ReportBase,
+    SubmissionBase,
     TagNameType,
     TeamBase,
     summary_maxlen,
@@ -149,9 +149,7 @@ class ChallengeCreateRequest(DyffEntityCreateRequest):
     )
 
 
-class ChallengeSubmissionCreateRequest(
-    DyffEntityCreateRequest, ChallengeSubmissionBase
-):
+class SubmissionCreateRequest(DyffEntityCreateRequest, SubmissionBase):
     pass
 
 
@@ -504,7 +502,6 @@ __all__ = [
     "ChallengeContentEditRequest",
     "ChallengeCreateRequest",
     "ChallengeQueryRequest",
-    "ChallengeSubmissionCreateRequest",
     "ChallengeTaskCreateRequest",
     "ChallengeTaskRulesEditRequest",
     "ChallengeTeamCreateRequest",
@@ -544,6 +541,7 @@ __all__ = [
     "ReportQueryRequest",
     "SafetyCaseQueryRequest",
     "ScoreQueryRequest",
+    "SubmissionCreateRequest",
     "TeamEditRequest",
     "TeamQueryRequest",
     "UseCaseQueryRequest",

{dyff_schema-0.38.9.dist-info → dyff_schema-0.38.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dyff-schema
-Version: 0.38.9
+Version: 0.38.13
 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.38.9.dist-info → dyff_schema-0.38.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dyff/schema/__init__.py,sha256=w7OWDFuyGKd6xt_yllNtKzHahPgywrfU4Ue02psYaMA,2244
-dyff/schema/_version.py,sha256=jP_GNrq_tFLhV5z7uMhGy_OtdKaIY_JHxqyFqQGklVA,80
+dyff/schema/_version.py,sha256=50V94fT_56OCMvK0CeEH1SwgrRmZ0di-SpcyDei7ROA,82
 dyff/schema/adapters.py,sha256=YMTHv_2VlLGFp-Kqwa6H51hjffHmk8gXjZilHysIF5Q,123
 dyff/schema/annotations.py,sha256=nE6Jk1PLqlShj8uqjE_EzZC9zYnTDW5AVtQcjysiK8M,10018
 dyff/schema/base.py,sha256=jvaNtsSZyFfsdUZTcY_U-yfLY5_GyrMxSXhON2R9XR0,119
@@ -29,8 +29,8 @@ dyff/schema/v0/r1/adapters.py,sha256=hpwCSW8lkMkUKCLe0zaMUDu-VS_caSxJvPsECEi_XRA
 dyff/schema/v0/r1/base.py,sha256=1VJXVLKldOq3aH2HdVgxXXk4DJTZEIiaTa4GzMKzziU,20228
 dyff/schema/v0/r1/commands.py,sha256=jqbEvDRLpcVGWXqlbniuSKg3UIjlrpKt6_0hiwUpPfQ,20153
 dyff/schema/v0/r1/oci.py,sha256=YjHDVBJ2IIxqijll70OK6pM-qT6pq8tvU7D3YB9vGM0,6700
-dyff/schema/v0/r1/platform.py,sha256=wpCq2sRBxzVt6cetAUl66BW5fMMEFtrUNKDYyxFqZFU,113848
-dyff/schema/v0/r1/requests.py,sha256=k9T-xI2DDCjvCCmEg_kZ0M6yl_ZG6uh8rocWCLZLKFA,18590
+dyff/schema/v0/r1/platform.py,sha256=x6-JVK_gw1io-8A89zJfH_3pOu9qZxactsuhFrNNQmU,113785
+dyff/schema/v0/r1/requests.py,sha256=OhkM9QpSimsGaX8TtjSHcWlHg1UYyPCiq-WW9DJ7FdQ,18548
 dyff/schema/v0/r1/responses.py,sha256=nxy7FPtfw2B_bljz5UGGuSE79HTkDQxKH56AJVmd4Qo,1287
 dyff/schema/v0/r1/test.py,sha256=X6dUyVd5svcPCI-PBMOAqEfK9jv3bRDvkQTJzwS96c0,10720
 dyff/schema/v0/r1/version.py,sha256=NONebgcv5Thsw_ymud6PacZdGjV6ndBrmLnap-obcpo,428
@@ -43,9 +43,9 @@ dyff/schema/v0/r1/dataset/text.py,sha256=MYG5seGODDryRSCy-g0Unh5dD0HCytmZ3FeElC-
 dyff/schema/v0/r1/dataset/vision.py,sha256=tJFF4dkhHX0UXTj1sPW-G22xTSI40gbYO465FuvmvAU,443
 dyff/schema/v0/r1/io/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
 dyff/schema/v0/r1/io/vllm.py,sha256=vWyLg-susbg0JDfv6VExBpgFdU2GHP2a14ChOdbckvs,5321
-dyff_schema-0.38.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dyff_schema-0.38.9.dist-info/licenses/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
-dyff_schema-0.38.9.dist-info/METADATA,sha256=w8UkdcgYuYkeN7g30eL42IUDzedbe-AyZ59FLqlL_NM,3734
-dyff_schema-0.38.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dyff_schema-0.38.9.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
-dyff_schema-0.38.9.dist-info/RECORD,,
+dyff_schema-0.38.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dyff_schema-0.38.13.dist-info/licenses/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
+dyff_schema-0.38.13.dist-info/METADATA,sha256=0_GHYLYCJl_ivN-40TZwmtwey-qsgf63pHQgIqBaOf0,3735
+dyff_schema-0.38.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dyff_schema-0.38.13.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
+dyff_schema-0.38.13.dist-info/RECORD,,