dyff-schema 0.36.8__py3-none-any.whl → 0.36.10__py3-none-any.whl

dyff/schema/_version.py

@@ -1,2 +1,2 @@
-__version__ = version = "0.36.8"
-__version_tuple__ = version_tuple = (0, 36, 8)
+__version__ = version = "0.36.10"
+__version_tuple__ = version_tuple = (0, 36, 10)

dyff/schema/v0/r1/commands.py

@@ -29,6 +29,8 @@ from .platform import (
     Status,
     TagNameType,
     Team,
+    TeamAffiliation,
+    TeamMember,
     body_maxlen,
     summary_maxlen,
     title_maxlen,
@@ -56,6 +58,7 @@ class Command(SchemaVersion, DyffSchemaBaseModel):
         "EditEntityDocumentation",
         "EditEntityLabels",
         "EditFamilyMembers",
+        "EditTeam",
         "ForgetEntity",
         "RestoreEntity",
         "UpdateEntityStatus",
@@ -215,9 +218,6 @@ class ChallengeTaskRulesExecutionEnvironmentPatch(JsonMergePatchSemantics):
     choices: dict[str, Optional[ChallengeTaskExecutionEnvironment]] = pydantic.Field(
         default_factory=dict, description="Execution environment choices."
     )
-    default: Optional[str] = pydantic.Field(
-        default=None, description="The default execution environment."
-    )
 
 
 class ChallengeTaskRulesSchedulePatch(JsonMergePatchSemantics):
@@ -254,20 +254,15 @@ class ChallengeTaskRulesSchedulePatch(JsonMergePatchSemantics):
 
 
 class ChallengeTaskRulesPatch(DyffSchemaBaseModel):
-    """Same properties as ChallengeTaskRules, but assigning None to a field is
-    interpreted as a command to delete that field.
-
-    Fields that are not assigned explicitly remain unchanged.
-    """
+    """Edits to make to the different rules categories."""
 
-    executionEnvironment: Optional[ChallengeTaskRulesExecutionEnvironmentPatch] = (
-        pydantic.Field(
-            default=None,
-            description="Patch for the .rules.executionEnvironments field.",
-        )
+    executionEnvironment: ChallengeTaskRulesExecutionEnvironmentPatch = pydantic.Field(
+        default_factory=ChallengeTaskRulesExecutionEnvironmentPatch,
+        description="Patch for the .rules.executionEnvironments field.",
     )
-    schedule: Optional[ChallengeTaskRulesSchedulePatch] = pydantic.Field(
-        default=None, description="Patch for the .rules.schedule field."
+    schedule: ChallengeTaskRulesSchedulePatch = pydantic.Field(
+        default_factory=ChallengeTaskRulesSchedulePatch,
+        description="Patch for the .rules.schedule field.",
     )
 
     @field_serializer("executionEnvironment")
@@ -287,10 +282,18 @@ class ChallengeTaskRulesPatch(DyffSchemaBaseModel):
         return schedule.model_dump(mode=_info.mode)
 
 
+class EditChallengeTaskRulesPatch(DyffSchemaBaseModel):
+    """A Json Merge Patch for the rules of one task."""
+
+    rules: ChallengeTaskRulesPatch = pydantic.Field(
+        description="Edits to make to the task rules."
+    )
+
+
 class EditChallengeTaskRulesAttributes(DyffSchemaBaseModel):
     """Attributes for the EditChallengeTaskRules command."""
 
-    rules: ChallengeTaskRulesPatch = pydantic.Field(
+    tasks: dict[str, EditChallengeTaskRulesPatch] = pydantic.Field(
         description="Edits to make to the task rules."
     )
 
@@ -460,6 +463,40 @@ class EditFamilyMembers(Command):
 # ----------------------------------------------------------------------------
 
 
+class EditTeamAttributes(JsonMergePatchSemantics):
+    """Attributes for the EditFamilyMembers command."""
+
+    members: dict[str, Optional[TeamMember]] = pydantic.Field(
+        default_factory=dict, description="The members of this team"
+    )
+    affiliations: dict[str, Optional[TeamAffiliation]] = pydantic.Field(
+        default_factory=dict,
+        description="The affiliations of the team. Team members state their"
+        " affiliations by referencing these entries by their keys.",
+    )
+
+
+class EditTeamData(EntityIdentifier):
+    """Payload data for the EditFamilyMembers command."""
+
+    attributes: EditTeamAttributes = pydantic.Field(
+        description="The command attributes"
+    )
+
+    @field_serializer("attributes")
+    def _serialize_attributes(self, attributes: EditTeamAttributes, _info):
+        return attributes.model_dump(mode=_info.mode)
+
+
+class EditTeam(Command):
+    command: Literal["EditTeam"] = "EditTeam"
+
+    data: EditTeamData = pydantic.Field(description="The edit data.")
+
+
+# ----------------------------------------------------------------------------
+
+
 class ForgetEntity(Command):
     """Forget (permanently delete) an entity."""
 
@@ -546,9 +583,11 @@ DyffCommandType = Union[
     CreateChallengeTeam,
     CreateEntity,
     EditChallengeContent,
+    EditChallengeTaskRules,
     EditEntityDocumentation,
     EditEntityLabels,
     EditFamilyMembers,
+    EditTeam,
     ForgetEntity,
     RestoreEntity,
     UpdateEntityStatus,
@@ -574,9 +613,10 @@ __all__ = [
     "EditChallengeContentAttributes",
     "EditChallengeContentData",
     "EditChallengeContentPatch",
+    "EditChallengeTaskRules",
     "EditChallengeTaskRulesAttributes",
     "EditChallengeTaskRulesData",
-    "EditChallengeTaskRules",
+    "EditChallengeTaskRulesPatch",
     "EditEntityDocumentation",
     "EditEntityDocumentationAttributes",
     "EditEntityDocumentationData",
@@ -587,6 +627,9 @@ __all__ = [
     "EditFamilyMembers",
     "EditFamilyMembersAttributes",
     "EditFamilyMembersData",
+    "EditTeam",
+    "EditTeamAttributes",
+    "EditTeamData",
     "EntityIdentifier",
     "FamilyIdentifier",
     "ForgetEntity",

dyff/schema/v0/r1/platform.py

@@ -2485,6 +2485,11 @@ class TeamAffiliation(DyffSchemaBaseModel):
     url: Optional[pydantic.HttpUrl] = pydantic.Field(
         default=None, description="The organization's Web page or similar."
     )
+    note: Optional[str] = pydantic.Field(
+        default=None,
+        description="A brief note giving additional information about the organization.",
+        max_length=summary_maxlen(),
+    )
 
 
 class TeamBase(DyffSchemaBaseModel):
@@ -3101,6 +3106,7 @@ __all__ = [
     "ChallengeSubmission",
     "ChallengeTask",
     "ChallengeTaskBase",
+    "ChallengeTaskContent",
     "ChallengeTaskExecutionEnvironment",
     "ChallengeTaskExecutionEnvironmentChoices",
     "ChallengeTaskRules",

dyff/schema/v0/r1/requests.py

@@ -310,6 +310,10 @@ class ChallengeContentEditRequest(DyffRequestBase, commands.EditChallengeContent
     pass
 
 
+class ChallengeTaskRulesEditRequest(DyffRequestBase, commands.ChallengeTaskRulesPatch):
+    pass
+
+
 class DocumentationEditRequest(
     DyffRequestBase, commands.EditEntityDocumentationAttributes
 ):
@@ -335,6 +339,10 @@ class LabelUpdateRequest(LabelsEditRequest):
     """
 
 
+class TeamEditRequest(DyffRequestBase, commands.EditTeamAttributes):
+    pass
+
+
 # ----------------------------------------------------------------------------
 
 
@@ -502,6 +510,7 @@ __all__ = [
     "ChallengeContentEditRequest",
     "ChallengeCreateRequest",
     "ChallengeTaskCreateRequest",
+    "ChallengeTaskRulesEditRequest",
     "ChallengeTeamCreateRequest",
     "ConcernCreateRequest",
     "DyffEntityCreateRequest",
@@ -537,6 +546,7 @@ __all__ = [
     "ReportQueryRequest",
     "SafetyCaseQueryRequest",
     "ScoreQueryRequest",
+    "TeamEditRequest",
     "TeamQueryRequest",
     "UseCaseQueryRequest",
 ]

{dyff_schema-0.36.8.dist-info → dyff_schema-0.36.10.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 dyff/schema/__init__.py,sha256=w7OWDFuyGKd6xt_yllNtKzHahPgywrfU4Ue02psYaMA,2244
-dyff/schema/_version.py,sha256=jgJP8WyMhWSTc5Gp3lHhjYP7PwjSVGGvgwu4b2Jbwvs,80
+dyff/schema/_version.py,sha256=D_gwlkLPf6qLvdN0hk8VV2OKAzSW4v5rqK3XtT_BWiU,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
@@ -27,10 +27,10 @@ dyff/schema/v0/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
 dyff/schema/v0/r1/__init__.py,sha256=L5y8UhRnojerPYHumsxQJRcHCNz8Hj9NM8b47mewMNs,92
 dyff/schema/v0/r1/adapters.py,sha256=hpwCSW8lkMkUKCLe0zaMUDu-VS_caSxJvPsECEi_XRA,33069
 dyff/schema/v0/r1/base.py,sha256=1VJXVLKldOq3aH2HdVgxXXk4DJTZEIiaTa4GzMKzziU,20228
-dyff/schema/v0/r1/commands.py,sha256=QsI_LyVHCXOKYVvA7ERIZdg55_n-XfhZOM5QqoaseAE,18836
+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=tByfRF-9__lX-3nDdiU-RzX6nEfAAycxiw4nqqxpmBg,103802
-dyff/schema/v0/r1/requests.py,sha256=Dy7kSw0-ZOIM7-NmoQh_HkejmgUwPROFFMIu0mPTsSE,18846
+dyff/schema/v0/r1/platform.py,sha256=_ZpRyTAUtBDoG2neD6o5nwFT0AUvKAc3WH5L-V9vOFI,104027
+dyff/schema/v0/r1/requests.py,sha256=H_psyQUyThRI8XGG1PAH4yTngRCdIpOAbtxtirW0tw4,19085
 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.36.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dyff_schema-0.36.8.dist-info/licenses/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
-dyff_schema-0.36.8.dist-info/METADATA,sha256=iKfWeHvjMXCpmZ13iQtNOWbnKSDLJpZQ-P_DAf82mrE,3734
-dyff_schema-0.36.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dyff_schema-0.36.8.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
-dyff_schema-0.36.8.dist-info/RECORD,,
+dyff_schema-0.36.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dyff_schema-0.36.10.dist-info/licenses/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
+dyff_schema-0.36.10.dist-info/METADATA,sha256=Kpp8nCb9bQuU1rbKWvuHosX-MOyfMfucMyb45-jkGgc,3735
+dyff_schema-0.36.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dyff_schema-0.36.10.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
+dyff_schema-0.36.10.dist-info/RECORD,,