From 092fa136b5581df215e52fdf536b0cb4f3e9b515 Mon Sep 17 00:00:00 2001 From: Romain BAUGUE Date: Thu, 19 Nov 2026 18:18:51 +0100 Subject: [PATCH] feat: update generated APIs --- .../dataorchestrator/v1alpha2/__init__.py | 8 +-- .../dataorchestrator/v1alpha2/marshalling.py | 64 +++++++++---------- .../dataorchestrator/v1alpha2/types.py | 38 +++++------ .../dataorchestrator/v1alpha2/__init__.py | 8 +-- .../dataorchestrator/v1alpha2/marshalling.py | 64 +++++++++---------- .../dataorchestrator/v1alpha2/types.py | 38 +++++------ 6 files changed, 110 insertions(+), 110 deletions(-) diff --git a/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/__init__.py b/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/__init__.py index 97ff651d9..719e34a2d 100644 --- a/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/__init__.py +++ b/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/__init__.py @@ -3,20 +3,20 @@ from .types import DefaultTaskDefaultRunReason from .types import ListWorkflowDefinitionsRequestOrderBy from .types import ListWorkflowRunsRequestOrderBy +from .types import ObjectStorageTaskReason from .types import RunServerlessContainersTaskAction from .types import RunServerlessContainersTaskReason from .types import RunServerlessContainersTaskStatus from .content import RUN_SERVERLESS_CONTAINERS_TASK_TRANSIENT_STATUSES from .types import RunStatus from .content import RUN_TRANSIENT_STATUSES -from .types import S3TaskReason from .types import ScheduleOverlapPolicy from .types import ServerlessJobsTaskServerlessJobRunReason from .types import TriggerType from .types import WorkflowRunReason from .types import DefaultTask +from .types import ObjectStorageTask from .types import RunServerlessContainersTask -from .types import S3Task from .types import ServerlessJobsTask from .types import CronSchedule from .types import WorkflowRunInfo @@ -48,20 +48,20 @@ "DefaultTaskDefaultRunReason", "ListWorkflowDefinitionsRequestOrderBy", "ListWorkflowRunsRequestOrderBy", + "ObjectStorageTaskReason", "RunServerlessContainersTaskAction", "RunServerlessContainersTaskReason", "RunServerlessContainersTaskStatus", "RUN_SERVERLESS_CONTAINERS_TASK_TRANSIENT_STATUSES", "RunStatus", "RUN_TRANSIENT_STATUSES", - "S3TaskReason", "ScheduleOverlapPolicy", "ServerlessJobsTaskServerlessJobRunReason", "TriggerType", "WorkflowRunReason", "DefaultTask", + "ObjectStorageTask", "RunServerlessContainersTask", - "S3Task", "ServerlessJobsTask", "CronSchedule", "WorkflowRunInfo", diff --git a/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/marshalling.py b/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/marshalling.py index b5a2ce88e..6881fc739 100644 --- a/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/marshalling.py +++ b/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/marshalling.py @@ -19,8 +19,8 @@ WorkflowRunInfo, WorkflowDefinition, DefaultTask, + ObjectStorageTask, RunServerlessContainersTask, - S3Task, ServerlessJobsTask, TaskRun, WorkflowRun, @@ -267,43 +267,25 @@ def unmarshal_DefaultTask(data: Any) -> DefaultTask: return DefaultTask(**args) -def unmarshal_RunServerlessContainersTask(data: Any) -> RunServerlessContainersTask: +def unmarshal_ObjectStorageTask(data: Any) -> ObjectStorageTask: if not isinstance(data, dict): raise TypeError( - "Unmarshalling the type 'RunServerlessContainersTask' failed as data isn't a dictionary." + "Unmarshalling the type 'ObjectStorageTask' failed as data isn't a dictionary." ) args: dict[str, Any] = {} - field = data.get("container_id", None) - if field is not None: - args["container_id"] = field - else: - args["container_id"] = None - - field = data.get("image_url", None) - if field is not None: - args["image_url"] = field - else: - args["image_url"] = None - - field = data.get("status", None) - if field is not None: - args["status"] = field - else: - args["status"] = RunServerlessContainersTaskStatus.UNKNOWN_STATUS - field = data.get("action", None) if field is not None: args["action"] = field else: - args["action"] = RunServerlessContainersTaskAction.UNKNOWN_ACTION + args["action"] = None field = data.get("reason", None) if field is not None: args["reason"] = field else: - args["reason"] = RunServerlessContainersTaskReason.UNKNOWN_REASON + args["reason"] = None field = data.get("error_message", None) if field is not None: @@ -311,28 +293,46 @@ def unmarshal_RunServerlessContainersTask(data: Any) -> RunServerlessContainersT else: args["error_message"] = None - return RunServerlessContainersTask(**args) + return ObjectStorageTask(**args) -def unmarshal_S3Task(data: Any) -> S3Task: +def unmarshal_RunServerlessContainersTask(data: Any) -> RunServerlessContainersTask: if not isinstance(data, dict): raise TypeError( - "Unmarshalling the type 'S3Task' failed as data isn't a dictionary." + "Unmarshalling the type 'RunServerlessContainersTask' failed as data isn't a dictionary." ) args: dict[str, Any] = {} + field = data.get("container_id", None) + if field is not None: + args["container_id"] = field + else: + args["container_id"] = None + + field = data.get("image_url", None) + if field is not None: + args["image_url"] = field + else: + args["image_url"] = None + + field = data.get("status", None) + if field is not None: + args["status"] = field + else: + args["status"] = RunServerlessContainersTaskStatus.UNKNOWN_STATUS + field = data.get("action", None) if field is not None: args["action"] = field else: - args["action"] = None + args["action"] = RunServerlessContainersTaskAction.UNKNOWN_ACTION field = data.get("reason", None) if field is not None: args["reason"] = field else: - args["reason"] = None + args["reason"] = RunServerlessContainersTaskReason.UNKNOWN_REASON field = data.get("error_message", None) if field is not None: @@ -340,7 +340,7 @@ def unmarshal_S3Task(data: Any) -> S3Task: else: args["error_message"] = None - return S3Task(**args) + return RunServerlessContainersTask(**args) def unmarshal_ServerlessJobsTask(data: Any) -> ServerlessJobsTask: @@ -496,11 +496,11 @@ def unmarshal_TaskRun(data: Any) -> TaskRun: else: args["call_serverless_container_task_run_details"] = None - field = data.get("s3_task_run_details", None) + field = data.get("object_storage_task_run_details", None) if field is not None: - args["s3_task_run_details"] = unmarshal_S3Task(field) + args["object_storage_task_run_details"] = unmarshal_ObjectStorageTask(field) else: - args["s3_task_run_details"] = None + args["object_storage_task_run_details"] = None field = data.get("generative_api_task_run_details", None) if field is not None: diff --git a/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/types.py b/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/types.py index e0d667ff3..2a2d13b2d 100644 --- a/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/types.py +++ b/scaleway-async/scaleway_async/dataorchestrator/v1alpha2/types.py @@ -52,6 +52,17 @@ def __str__(self) -> str: return str(self.value) +class ObjectStorageTaskReason(str, Enum, metaclass=StrEnumMeta): + UNKNOWN_DEFAULT_RUN_REASON = "unknown_default_run_reason" + TIMEOUT = "timeout" + CANCELLATION = "cancellation" + TECHNICAL_ERROR = "technical_error" + FUNCTIONAL_ERROR = "functional_error" + + def __str__(self) -> str: + return str(self.value) + + class RunServerlessContainersTaskAction(str, Enum, metaclass=StrEnumMeta): UNKNOWN_ACTION = "unknown_action" DEPLOY = "deploy" @@ -106,17 +117,6 @@ def __str__(self) -> str: return str(self.value) -class S3TaskReason(str, Enum, metaclass=StrEnumMeta): - UNKNOWN_DEFAULT_RUN_REASON = "unknown_default_run_reason" - TIMEOUT = "timeout" - CANCELLATION = "cancellation" - TECHNICAL_ERROR = "technical_error" - FUNCTIONAL_ERROR = "functional_error" - - def __str__(self) -> str: - return str(self.value) - - class ScheduleOverlapPolicy(str, Enum, metaclass=StrEnumMeta): UNKNOWN_SCHEDULE_OVERLAP_POLICY = "unknown_schedule_overlap_policy" FORBID = "forbid" @@ -183,6 +183,13 @@ class DefaultTask: """ +@dataclass +class ObjectStorageTask: + action: str + reason: Optional[ObjectStorageTaskReason] = None + error_message: Optional[str] = None + + @dataclass class RunServerlessContainersTask: container_id: str @@ -218,13 +225,6 @@ class RunServerlessContainersTask: """ -@dataclass -class S3Task: - action: str - reason: Optional[S3TaskReason] = None - error_message: Optional[str] = None - - @dataclass class ServerlessJobsTask: job_definition_id: str @@ -399,7 +399,7 @@ class TaskRun: call_serverless_container_task_run_details: Optional[DefaultTask] = None - s3_task_run_details: Optional[S3Task] = None + object_storage_task_run_details: Optional[ObjectStorageTask] = None generative_api_task_run_details: Optional[DefaultTask] = None diff --git a/scaleway/scaleway/dataorchestrator/v1alpha2/__init__.py b/scaleway/scaleway/dataorchestrator/v1alpha2/__init__.py index 97ff651d9..719e34a2d 100644 --- a/scaleway/scaleway/dataorchestrator/v1alpha2/__init__.py +++ b/scaleway/scaleway/dataorchestrator/v1alpha2/__init__.py @@ -3,20 +3,20 @@ from .types import DefaultTaskDefaultRunReason from .types import ListWorkflowDefinitionsRequestOrderBy from .types import ListWorkflowRunsRequestOrderBy +from .types import ObjectStorageTaskReason from .types import RunServerlessContainersTaskAction from .types import RunServerlessContainersTaskReason from .types import RunServerlessContainersTaskStatus from .content import RUN_SERVERLESS_CONTAINERS_TASK_TRANSIENT_STATUSES from .types import RunStatus from .content import RUN_TRANSIENT_STATUSES -from .types import S3TaskReason from .types import ScheduleOverlapPolicy from .types import ServerlessJobsTaskServerlessJobRunReason from .types import TriggerType from .types import WorkflowRunReason from .types import DefaultTask +from .types import ObjectStorageTask from .types import RunServerlessContainersTask -from .types import S3Task from .types import ServerlessJobsTask from .types import CronSchedule from .types import WorkflowRunInfo @@ -48,20 +48,20 @@ "DefaultTaskDefaultRunReason", "ListWorkflowDefinitionsRequestOrderBy", "ListWorkflowRunsRequestOrderBy", + "ObjectStorageTaskReason", "RunServerlessContainersTaskAction", "RunServerlessContainersTaskReason", "RunServerlessContainersTaskStatus", "RUN_SERVERLESS_CONTAINERS_TASK_TRANSIENT_STATUSES", "RunStatus", "RUN_TRANSIENT_STATUSES", - "S3TaskReason", "ScheduleOverlapPolicy", "ServerlessJobsTaskServerlessJobRunReason", "TriggerType", "WorkflowRunReason", "DefaultTask", + "ObjectStorageTask", "RunServerlessContainersTask", - "S3Task", "ServerlessJobsTask", "CronSchedule", "WorkflowRunInfo", diff --git a/scaleway/scaleway/dataorchestrator/v1alpha2/marshalling.py b/scaleway/scaleway/dataorchestrator/v1alpha2/marshalling.py index b5a2ce88e..6881fc739 100644 --- a/scaleway/scaleway/dataorchestrator/v1alpha2/marshalling.py +++ b/scaleway/scaleway/dataorchestrator/v1alpha2/marshalling.py @@ -19,8 +19,8 @@ WorkflowRunInfo, WorkflowDefinition, DefaultTask, + ObjectStorageTask, RunServerlessContainersTask, - S3Task, ServerlessJobsTask, TaskRun, WorkflowRun, @@ -267,43 +267,25 @@ def unmarshal_DefaultTask(data: Any) -> DefaultTask: return DefaultTask(**args) -def unmarshal_RunServerlessContainersTask(data: Any) -> RunServerlessContainersTask: +def unmarshal_ObjectStorageTask(data: Any) -> ObjectStorageTask: if not isinstance(data, dict): raise TypeError( - "Unmarshalling the type 'RunServerlessContainersTask' failed as data isn't a dictionary." + "Unmarshalling the type 'ObjectStorageTask' failed as data isn't a dictionary." ) args: dict[str, Any] = {} - field = data.get("container_id", None) - if field is not None: - args["container_id"] = field - else: - args["container_id"] = None - - field = data.get("image_url", None) - if field is not None: - args["image_url"] = field - else: - args["image_url"] = None - - field = data.get("status", None) - if field is not None: - args["status"] = field - else: - args["status"] = RunServerlessContainersTaskStatus.UNKNOWN_STATUS - field = data.get("action", None) if field is not None: args["action"] = field else: - args["action"] = RunServerlessContainersTaskAction.UNKNOWN_ACTION + args["action"] = None field = data.get("reason", None) if field is not None: args["reason"] = field else: - args["reason"] = RunServerlessContainersTaskReason.UNKNOWN_REASON + args["reason"] = None field = data.get("error_message", None) if field is not None: @@ -311,28 +293,46 @@ def unmarshal_RunServerlessContainersTask(data: Any) -> RunServerlessContainersT else: args["error_message"] = None - return RunServerlessContainersTask(**args) + return ObjectStorageTask(**args) -def unmarshal_S3Task(data: Any) -> S3Task: +def unmarshal_RunServerlessContainersTask(data: Any) -> RunServerlessContainersTask: if not isinstance(data, dict): raise TypeError( - "Unmarshalling the type 'S3Task' failed as data isn't a dictionary." + "Unmarshalling the type 'RunServerlessContainersTask' failed as data isn't a dictionary." ) args: dict[str, Any] = {} + field = data.get("container_id", None) + if field is not None: + args["container_id"] = field + else: + args["container_id"] = None + + field = data.get("image_url", None) + if field is not None: + args["image_url"] = field + else: + args["image_url"] = None + + field = data.get("status", None) + if field is not None: + args["status"] = field + else: + args["status"] = RunServerlessContainersTaskStatus.UNKNOWN_STATUS + field = data.get("action", None) if field is not None: args["action"] = field else: - args["action"] = None + args["action"] = RunServerlessContainersTaskAction.UNKNOWN_ACTION field = data.get("reason", None) if field is not None: args["reason"] = field else: - args["reason"] = None + args["reason"] = RunServerlessContainersTaskReason.UNKNOWN_REASON field = data.get("error_message", None) if field is not None: @@ -340,7 +340,7 @@ def unmarshal_S3Task(data: Any) -> S3Task: else: args["error_message"] = None - return S3Task(**args) + return RunServerlessContainersTask(**args) def unmarshal_ServerlessJobsTask(data: Any) -> ServerlessJobsTask: @@ -496,11 +496,11 @@ def unmarshal_TaskRun(data: Any) -> TaskRun: else: args["call_serverless_container_task_run_details"] = None - field = data.get("s3_task_run_details", None) + field = data.get("object_storage_task_run_details", None) if field is not None: - args["s3_task_run_details"] = unmarshal_S3Task(field) + args["object_storage_task_run_details"] = unmarshal_ObjectStorageTask(field) else: - args["s3_task_run_details"] = None + args["object_storage_task_run_details"] = None field = data.get("generative_api_task_run_details", None) if field is not None: diff --git a/scaleway/scaleway/dataorchestrator/v1alpha2/types.py b/scaleway/scaleway/dataorchestrator/v1alpha2/types.py index e0d667ff3..2a2d13b2d 100644 --- a/scaleway/scaleway/dataorchestrator/v1alpha2/types.py +++ b/scaleway/scaleway/dataorchestrator/v1alpha2/types.py @@ -52,6 +52,17 @@ def __str__(self) -> str: return str(self.value) +class ObjectStorageTaskReason(str, Enum, metaclass=StrEnumMeta): + UNKNOWN_DEFAULT_RUN_REASON = "unknown_default_run_reason" + TIMEOUT = "timeout" + CANCELLATION = "cancellation" + TECHNICAL_ERROR = "technical_error" + FUNCTIONAL_ERROR = "functional_error" + + def __str__(self) -> str: + return str(self.value) + + class RunServerlessContainersTaskAction(str, Enum, metaclass=StrEnumMeta): UNKNOWN_ACTION = "unknown_action" DEPLOY = "deploy" @@ -106,17 +117,6 @@ def __str__(self) -> str: return str(self.value) -class S3TaskReason(str, Enum, metaclass=StrEnumMeta): - UNKNOWN_DEFAULT_RUN_REASON = "unknown_default_run_reason" - TIMEOUT = "timeout" - CANCELLATION = "cancellation" - TECHNICAL_ERROR = "technical_error" - FUNCTIONAL_ERROR = "functional_error" - - def __str__(self) -> str: - return str(self.value) - - class ScheduleOverlapPolicy(str, Enum, metaclass=StrEnumMeta): UNKNOWN_SCHEDULE_OVERLAP_POLICY = "unknown_schedule_overlap_policy" FORBID = "forbid" @@ -183,6 +183,13 @@ class DefaultTask: """ +@dataclass +class ObjectStorageTask: + action: str + reason: Optional[ObjectStorageTaskReason] = None + error_message: Optional[str] = None + + @dataclass class RunServerlessContainersTask: container_id: str @@ -218,13 +225,6 @@ class RunServerlessContainersTask: """ -@dataclass -class S3Task: - action: str - reason: Optional[S3TaskReason] = None - error_message: Optional[str] = None - - @dataclass class ServerlessJobsTask: job_definition_id: str @@ -399,7 +399,7 @@ class TaskRun: call_serverless_container_task_run_details: Optional[DefaultTask] = None - s3_task_run_details: Optional[S3Task] = None + object_storage_task_run_details: Optional[ObjectStorageTask] = None generative_api_task_run_details: Optional[DefaultTask] = None