dyff-schema 0.36.5__py3-none-any.whl → 0.36.7__py3-none-any.whl

dyff/schema/_version.py

@@ -1,2 +1,2 @@
-__version__ = version = "0.36.5"
-__version_tuple__ = version_tuple = (0, 36, 5)
+__version__ = version = "0.36.7"
+__version_tuple__ = version_tuple = (0, 36, 7)

dyff/schema/v0/r1/commands.py

@@ -28,6 +28,7 @@ from .platform import (
     SchemaVersion,
     Status,
     TagNameType,
+    Team,
     body_maxlen,
     summary_maxlen,
     title_maxlen,
@@ -48,6 +49,7 @@ class Command(SchemaVersion, DyffSchemaBaseModel):
 
     command: Literal[
         "CreateChallengeTask",
+        "CreateChallengeTeam",
         "CreateEntity",
         "EditChallengeContent",
         "EditChallengeTaskRules",
@@ -101,6 +103,31 @@ class CreateChallengeTask(Command):
 # ----------------------------------------------------------------------------
 
 
+class CreateChallengeTeamAttributes(DyffSchemaBaseModel):
+    """Attributes for the CreateChallengeTeam command."""
+
+    team: Team = pydantic.Field(description="The team to create.")
+
+
+class CreateChallengeTeamData(EntityIdentifier):
+    """Payload data for the CreateChallengeTeam command."""
+
+    attributes: CreateChallengeTeamAttributes = pydantic.Field(
+        description="The command attributes"
+    )
+
+
+class CreateChallengeTeam(Command):
+    """Create a new team participating in an existing challenge."""
+
+    command: Literal["CreateChallengeTeam"] = "CreateChallengeTeam"
+
+    data: CreateChallengeTeamData = pydantic.Field(description="The command data.")
+
+
+# ----------------------------------------------------------------------------
+
+
 class ChallengeContentPagePatch(JsonMergePatchSemantics):
     """Same properties as ChallengeContentPage.
 
@@ -516,6 +543,7 @@ class UpdateEntityStatus(Command):
 
 DyffCommandType = Union[
     CreateChallengeTask,
+    CreateChallengeTeam,
     CreateEntity,
     EditChallengeContent,
     EditEntityDocumentation,
@@ -537,6 +565,9 @@ __all__ = [
     "CreateChallengeTask",
     "CreateChallengeTaskAttributes",
     "CreateChallengeTaskData",
+    "CreateChallengeTeam",
+    "CreateChallengeTeamAttributes",
+    "CreateChallengeTeamData",
     "CreateEntity",
     "DyffCommandType",
     "EditChallengeContent",

dyff/schema/v0/r1/platform.py

@@ -2487,14 +2487,9 @@ class TeamAffiliation(DyffSchemaBaseModel):
     )
 
 
-class Team(DyffEntity):
-    """The members and affiliations of a team that has entered a challenge."""
-
-    kind: Literal["Team"] = Entities.Team.value
+class TeamBase(DyffSchemaBaseModel):
+    """The members and affiliations of a team."""
 
-    challenge: str = pydantic.Field(
-        description="ID of the Challenge that this Team is participating in"
-    )
     members: dict[str, TeamMember] = pydantic.Field(
         description="The members of this team"
     )
@@ -2503,6 +2498,16 @@ class Team(DyffEntity):
         " affiliations by referencing these entries by their keys."
     )
 
+
+class Team(DyffEntity, TeamBase):
+    """The members and affiliations of a team that has entered a challenge."""
+
+    kind: Literal["Team"] = Entities.Team.value
+
+    challenge: str = pydantic.Field(
+        description="ID of the Challenge that this Team is participating in"
+    )
+
     def dependencies(self) -> list[str]:
         return []
 
@@ -2518,9 +2523,17 @@ class ChallengeTaskExecutionEnvironment(DyffSchemaBaseModel):
     use fewer resources.
     """
 
-    cpu: Quantity
-    memory: Quantity
-    accelerators: dict[str, int]
+    cpu: Quantity = pydantic.Field(
+        description="Number of available CPUs. Uses k8s Quantity notation."
+    )
+    memory: Quantity = pydantic.Field(
+        description="Available memory. Uses k8s Quantity notation."
+    )
+    accelerators: dict[str, int] = pydantic.Field(
+        default_factory=dict,
+        description="Available accelerators; the keys are accelerator types"
+        " and the values are the available count.",
+    )
 
 
 class ChallengeTaskExecutionEnvironmentChoices(DyffSchemaBaseModel):
@@ -2532,8 +2545,10 @@ class ChallengeTaskExecutionEnvironmentChoices(DyffSchemaBaseModel):
     defined in the execution environment.
     """
 
-    choices: dict[str, ChallengeTaskExecutionEnvironment]
-    default: str
+    choices: dict[str, ChallengeTaskExecutionEnvironment] = pydantic.Field(
+        description="The choices of execution environment.",
+        min_length=1,
+    )
 
 
 class ChallengeTaskSchedule(DyffSchemaBaseModel):
@@ -2571,7 +2586,7 @@ class ChallengeTaskRules(DyffSchemaBaseModel):
         description="The available choices for the execution environment."
     )
     schedule: ChallengeTaskSchedule = pydantic.Field(
-        description="The challenge schedule."
+        default_factory=ChallengeTaskSchedule, description="The challenge schedule."
     )
 
 
@@ -2579,7 +2594,8 @@ class ChallengeTaskContent(DyffSchemaBaseModel):
     """The content of a ChallengeTask UI view."."""
 
     page: ChallengeContentPage = pydantic.Field(
-        description="The content of the challenge task Web page."
+        default_factory=ChallengeContentPage,
+        description="The content of the challenge task Web page.",
     )
 
 
@@ -2600,7 +2616,8 @@ class ChallengeTaskBase(DyffSchemaBaseModel):
     )
     rules: ChallengeTaskRules = pydantic.Field(description="The rules for submissions.")
     content: ChallengeTaskContent = pydantic.Field(
-        description="Content of the task view in the Dyff App."
+        default_factory=ChallengeTaskContent,
+        description="Content of the task view in the Dyff App.",
     )
 
 
@@ -3084,6 +3101,10 @@ __all__ = [
     "ChallengeSubmission",
     "ChallengeTask",
     "ChallengeTaskBase",
+    "ChallengeTaskExecutionEnvironment",
+    "ChallengeTaskExecutionEnvironmentChoices",
+    "ChallengeTaskRules",
+    "ChallengeTaskSchedule",
     "Concern",
     "ConcernBase",
     "Container",
@@ -3206,6 +3227,7 @@ __all__ = [
     "TagNameType",
     "TaskSchema",
     "Team",
+    "TeamBase",
     "TeamMember",
     "TeamAffiliation",
     "UseCase",

dyff/schema/v0/r1/requests.py

@@ -44,6 +44,7 @@ from .platform import (
     ModuleBase,
     ReportBase,
     TagNameType,
+    TeamBase,
     summary_maxlen,
     title_maxlen,
 )
@@ -151,6 +152,10 @@ class ChallengeTaskCreateRequest(DyffEntityCreateRequest, ChallengeTaskBase):
     pass
 
 
+class ChallengeTeamCreateRequest(DyffEntityCreateRequest, TeamBase):
+    pass
+
+
 class ConcernCreateRequest(DyffEntityCreateRequest, ConcernBase):
     @pydantic.field_validator("documentation", check_fields=False)
     def _validate_documentation(
@@ -493,6 +498,7 @@ __all__ = [
     "ChallengeContentEditRequest",
     "ChallengeCreateRequest",
     "ChallengeTaskCreateRequest",
+    "ChallengeTeamCreateRequest",
     "ConcernCreateRequest",
     "DyffEntityCreateRequest",
     "DyffEntityQueryRequest",

{dyff_schema-0.36.5.dist-info → dyff_schema-0.36.7.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 dyff/schema/__init__.py,sha256=w7OWDFuyGKd6xt_yllNtKzHahPgywrfU4Ue02psYaMA,2244
-dyff/schema/_version.py,sha256=LNJNLLAuV9W0_ZLOmb5RnCEWGjs-0atGtXOeNTo98sU,80
+dyff/schema/_version.py,sha256=KD5WV5HCZsPfQxorC_4yGq-Gn5yQeQuJTW3OY-GUiTs,80
 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=_DsbZvCDzdKkNAnbr32-vso6n5vMi66DhdXUTkWEn8Q,17921
+dyff/schema/v0/r1/commands.py,sha256=QsI_LyVHCXOKYVvA7ERIZdg55_n-XfhZOM5QqoaseAE,18836
 dyff/schema/v0/r1/oci.py,sha256=YjHDVBJ2IIxqijll70OK6pM-qT6pq8tvU7D3YB9vGM0,6700
-dyff/schema/v0/r1/platform.py,sha256=FXtVktxrQO7H00AK-QQ76d6YGK4SJpIQrhmC386JLMM,102944
-dyff/schema/v0/r1/requests.py,sha256=v9t8wg6ZYGCPp05HFtOnw093nCD9ED_lLOK__4Z2d4s,18584
+dyff/schema/v0/r1/platform.py,sha256=tByfRF-9__lX-3nDdiU-RzX6nEfAAycxiw4nqqxpmBg,103802
+dyff/schema/v0/r1/requests.py,sha256=moT7AuIEkOT0zGslTe55g3IlrbjF2MKZPL6VQKggBxk,18712
 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.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dyff_schema-0.36.5.dist-info/licenses/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
-dyff_schema-0.36.5.dist-info/METADATA,sha256=Jt2bh2SEGQzuO2nTl2r-456RKE9pxGry1_zqOQK4R0o,3734
-dyff_schema-0.36.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dyff_schema-0.36.5.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
-dyff_schema-0.36.5.dist-info/RECORD,,
+dyff_schema-0.36.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dyff_schema-0.36.7.dist-info/licenses/NOTICE,sha256=YONACu0s_Ui6jNi-wtEsVQbTU1JIkh8wvLH6d1-Ni_w,43
+dyff_schema-0.36.7.dist-info/METADATA,sha256=X-qkNqeEUZj-iA002NOH8kuPmIVZ57XcDSC4tsZM17M,3734
+dyff_schema-0.36.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dyff_schema-0.36.7.dist-info/top_level.txt,sha256=9e3VVdeX73t_sUJOPQPCcGtYO1JhoErhHIi3WoWGcFI,5
+dyff_schema-0.36.7.dist-info/RECORD,,