dyff-schema 0.36.5__tar.gz → 0.36.7__tar.gz

{dyff_schema-0.36.5/dyff_schema.egg-info → dyff_schema-0.36.7}/PKG-INFO

@@ -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.7/dyff/schema/_version.py

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

{dyff_schema-0.36.5 → dyff_schema-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-0.36.5 → dyff_schema-0.36.7}/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-0.36.5 → dyff_schema-0.36.7}/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 → dyff_schema-0.36.7/dyff_schema.egg-info}/PKG-INFO

@@ -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/dyff/schema/_version.py

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