diff --git a/api.md b/api.md index d7e5d8e8..d6933bfb 100644 --- a/api.md +++ b/api.md @@ -9,11 +9,14 @@ from gitpod.types import ( Principal, RunsOn, Subject, + Task, TaskExecution, TaskExecutionMetadata, TaskExecutionPhase, TaskExecutionSpec, TaskExecutionStatus, + TaskMetadata, + TaskSpec, UserStatus, ) ``` @@ -141,9 +144,6 @@ Types: ```python from gitpod.types.environments.automations import ( - Task, - TaskMetadata, - TaskSpec, TaskCreateResponse, TaskRetrieveResponse, TaskUpdateResponse, @@ -157,7 +157,7 @@ Methods: - client.environments.automations.tasks.create(\*\*params) -> TaskCreateResponse - client.environments.automations.tasks.retrieve(\*\*params) -> TaskRetrieveResponse - client.environments.automations.tasks.update(\*\*params) -> object -- client.environments.automations.tasks.list(\*\*params) -> SyncTasksPage[Task] +- client.environments.automations.tasks.list(\*\*params) -> SyncTasksPage[Task] - client.environments.automations.tasks.delete(\*\*params) -> object - client.environments.automations.tasks.start(\*\*params) -> TaskStartResponse diff --git a/src/gitpod/resources/environments/automations/tasks/tasks.py b/src/gitpod/resources/environments/automations/tasks/tasks.py index 1e0b197c..98581635 100644 --- a/src/gitpod/resources/environments/automations/tasks/tasks.py +++ b/src/gitpod/resources/environments/automations/tasks/tasks.py @@ -29,6 +29,8 @@ ) from .....pagination import SyncTasksPage, AsyncTasksPage from ....._base_client import AsyncPaginator, make_request_options +from .....types.shared.task import Task +from .....types.shared_params.task_spec import TaskSpec from .....types.environments.automations import ( task_list_params, task_start_params, @@ -37,9 +39,7 @@ task_update_params, task_retrieve_params, ) -from .....types.environments.automations.task import Task -from .....types.environments.automations.task_spec_param import TaskSpecParam -from .....types.environments.automations.task_metadata_param import TaskMetadataParam +from .....types.shared_params.task_metadata import TaskMetadata from .....types.environments.automations.task_start_response import TaskStartResponse from .....types.environments.automations.task_create_response import TaskCreateResponse from .....types.environments.automations.task_retrieve_response import TaskRetrieveResponse @@ -76,8 +76,8 @@ def create( *, depends_on: List[str] | NotGiven = NOT_GIVEN, environment_id: str | NotGiven = NOT_GIVEN, - metadata: TaskMetadataParam | NotGiven = NOT_GIVEN, - spec: TaskSpecParam | NotGiven = NOT_GIVEN, + metadata: TaskMetadata | NotGiven = NOT_GIVEN, + spec: TaskSpec | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, @@ -344,8 +344,8 @@ async def create( *, depends_on: List[str] | NotGiven = NOT_GIVEN, environment_id: str | NotGiven = NOT_GIVEN, - metadata: TaskMetadataParam | NotGiven = NOT_GIVEN, - spec: TaskSpecParam | NotGiven = NOT_GIVEN, + metadata: TaskMetadata | NotGiven = NOT_GIVEN, + spec: TaskSpec | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, diff --git a/src/gitpod/types/__init__.py b/src/gitpod/types/__init__.py index 1ff00e1c..03e376b2 100644 --- a/src/gitpod/types/__init__.py +++ b/src/gitpod/types/__init__.py @@ -9,11 +9,14 @@ from .runner import Runner as Runner from .secret import Secret as Secret from .shared import ( + Task as Task, RunsOn as RunsOn, Subject as Subject, + TaskSpec as TaskSpec, Principal as Principal, FieldValue as FieldValue, UserStatus as UserStatus, + TaskMetadata as TaskMetadata, TaskExecution as TaskExecution, EnvironmentClass as EnvironmentClass, OrganizationRole as OrganizationRole, diff --git a/src/gitpod/types/environments/automations/__init__.py b/src/gitpod/types/environments/automations/__init__.py index 11a40e65..d6c647a7 100644 --- a/src/gitpod/types/environments/automations/__init__.py +++ b/src/gitpod/types/environments/automations/__init__.py @@ -2,14 +2,10 @@ from __future__ import annotations -from .task import Task as Task from .service import Service as Service -from .task_spec import TaskSpec as TaskSpec from .service_spec import ServiceSpec as ServiceSpec from .service_phase import ServicePhase as ServicePhase -from .task_metadata import TaskMetadata as TaskMetadata from .service_status import ServiceStatus as ServiceStatus -from .task_spec_param import TaskSpecParam as TaskSpecParam from .service_metadata import ServiceMetadata as ServiceMetadata from .task_list_params import TaskListParams as TaskListParams from .task_start_params import TaskStartParams as TaskStartParams @@ -19,7 +15,6 @@ from .task_update_params import TaskUpdateParams as TaskUpdateParams from .service_list_params import ServiceListParams as ServiceListParams from .service_stop_params import ServiceStopParams as ServiceStopParams -from .task_metadata_param import TaskMetadataParam as TaskMetadataParam from .task_start_response import TaskStartResponse as TaskStartResponse from .service_start_params import ServiceStartParams as ServiceStartParams from .task_create_response import TaskCreateResponse as TaskCreateResponse diff --git a/src/gitpod/types/environments/automations/task_create_params.py b/src/gitpod/types/environments/automations/task_create_params.py index 331519ba..5bb8916f 100644 --- a/src/gitpod/types/environments/automations/task_create_params.py +++ b/src/gitpod/types/environments/automations/task_create_params.py @@ -6,8 +6,8 @@ from typing_extensions import Annotated, TypedDict from ...._utils import PropertyInfo -from .task_spec_param import TaskSpecParam -from .task_metadata_param import TaskMetadataParam +from ...shared_params.task_spec import TaskSpec +from ...shared_params.task_metadata import TaskMetadata __all__ = ["TaskCreateParams"] @@ -17,6 +17,6 @@ class TaskCreateParams(TypedDict, total=False): environment_id: Annotated[str, PropertyInfo(alias="environmentId")] - metadata: TaskMetadataParam + metadata: TaskMetadata - spec: TaskSpecParam + spec: TaskSpec diff --git a/src/gitpod/types/environments/automations/task_create_response.py b/src/gitpod/types/environments/automations/task_create_response.py index 511677b1..4845e6be 100644 --- a/src/gitpod/types/environments/automations/task_create_response.py +++ b/src/gitpod/types/environments/automations/task_create_response.py @@ -2,8 +2,8 @@ from typing import Optional -from .task import Task from ...._models import BaseModel +from ...shared.task import Task __all__ = ["TaskCreateResponse"] diff --git a/src/gitpod/types/environments/automations/task_retrieve_response.py b/src/gitpod/types/environments/automations/task_retrieve_response.py index 557cccee..0f01e7bb 100644 --- a/src/gitpod/types/environments/automations/task_retrieve_response.py +++ b/src/gitpod/types/environments/automations/task_retrieve_response.py @@ -2,8 +2,8 @@ from typing import Optional -from .task import Task from ...._models import BaseModel +from ...shared.task import Task __all__ = ["TaskRetrieveResponse"] diff --git a/src/gitpod/types/shared/__init__.py b/src/gitpod/types/shared/__init__.py index 4911a8a7..ba0e2567 100644 --- a/src/gitpod/types/shared/__init__.py +++ b/src/gitpod/types/shared/__init__.py @@ -1,10 +1,13 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. +from .task import Task as Task from .runs_on import RunsOn as RunsOn from .subject import Subject as Subject from .principal import Principal as Principal +from .task_spec import TaskSpec as TaskSpec from .field_value import FieldValue as FieldValue from .user_status import UserStatus as UserStatus +from .task_metadata import TaskMetadata as TaskMetadata from .task_execution import TaskExecution as TaskExecution from .environment_class import EnvironmentClass as EnvironmentClass from .organization_role import OrganizationRole as OrganizationRole diff --git a/src/gitpod/types/environments/automations/task.py b/src/gitpod/types/shared/task.py similarity index 94% rename from src/gitpod/types/environments/automations/task.py rename to src/gitpod/types/shared/task.py index 01d91d11..95e85661 100644 --- a/src/gitpod/types/environments/automations/task.py +++ b/src/gitpod/types/shared/task.py @@ -4,8 +4,8 @@ from pydantic import Field as FieldInfo +from ..._models import BaseModel from .task_spec import TaskSpec -from ...._models import BaseModel from .task_metadata import TaskMetadata __all__ = ["Task"] diff --git a/src/gitpod/types/shared/task_execution_spec.py b/src/gitpod/types/shared/task_execution_spec.py index 923f5f6d..17a4bff3 100644 --- a/src/gitpod/types/shared/task_execution_spec.py +++ b/src/gitpod/types/shared/task_execution_spec.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo from ..._models import BaseModel +from .task_spec import TaskSpec from .task_execution_phase import TaskExecutionPhase -from ..environments.automations.task_spec import TaskSpec __all__ = ["TaskExecutionSpec", "Plan", "PlanStep", "PlanStepTask"] diff --git a/src/gitpod/types/environments/automations/task_metadata.py b/src/gitpod/types/shared/task_metadata.py similarity index 97% rename from src/gitpod/types/environments/automations/task_metadata.py rename to src/gitpod/types/shared/task_metadata.py index f99f98ee..23e6c2c1 100644 --- a/src/gitpod/types/environments/automations/task_metadata.py +++ b/src/gitpod/types/shared/task_metadata.py @@ -5,9 +5,9 @@ from pydantic import Field as FieldInfo -from ...._models import BaseModel -from ...shared.subject import Subject -from ...shared.automation_trigger import AutomationTrigger +from .subject import Subject +from ..._models import BaseModel +from .automation_trigger import AutomationTrigger __all__ = ["TaskMetadata"] diff --git a/src/gitpod/types/environments/automations/task_spec.py b/src/gitpod/types/shared/task_spec.py similarity index 86% rename from src/gitpod/types/environments/automations/task_spec.py rename to src/gitpod/types/shared/task_spec.py index 3d1d0f13..c69815fb 100644 --- a/src/gitpod/types/environments/automations/task_spec.py +++ b/src/gitpod/types/shared/task_spec.py @@ -4,8 +4,8 @@ from pydantic import Field as FieldInfo -from ...._models import BaseModel -from ...shared.runs_on import RunsOn +from .runs_on import RunsOn +from ..._models import BaseModel __all__ = ["TaskSpec"] diff --git a/src/gitpod/types/shared_params/__init__.py b/src/gitpod/types/shared_params/__init__.py index d98911f7..51915e7a 100644 --- a/src/gitpod/types/shared_params/__init__.py +++ b/src/gitpod/types/shared_params/__init__.py @@ -3,7 +3,9 @@ from .runs_on import RunsOn as RunsOn from .subject import Subject as Subject from .principal import Principal as Principal +from .task_spec import TaskSpec as TaskSpec from .field_value import FieldValue as FieldValue +from .task_metadata import TaskMetadata as TaskMetadata from .environment_class import EnvironmentClass as EnvironmentClass from .organization_role import OrganizationRole as OrganizationRole from .automation_trigger import AutomationTrigger as AutomationTrigger diff --git a/src/gitpod/types/environments/automations/task_metadata_param.py b/src/gitpod/types/shared_params/task_metadata.py similarity index 95% rename from src/gitpod/types/environments/automations/task_metadata_param.py rename to src/gitpod/types/shared_params/task_metadata.py index 9331c97e..50ffda7e 100644 --- a/src/gitpod/types/environments/automations/task_metadata_param.py +++ b/src/gitpod/types/shared_params/task_metadata.py @@ -6,14 +6,14 @@ from datetime import datetime from typing_extensions import Annotated, TypedDict -from ...._utils import PropertyInfo -from ...shared_params.subject import Subject -from ...shared_params.automation_trigger import AutomationTrigger +from .subject import Subject +from ..._utils import PropertyInfo +from .automation_trigger import AutomationTrigger -__all__ = ["TaskMetadataParam"] +__all__ = ["TaskMetadata"] -class TaskMetadataParam(TypedDict, total=False): +class TaskMetadata(TypedDict, total=False): created_at: Annotated[Union[str, datetime], PropertyInfo(alias="createdAt", format="iso8601")] """ A Timestamp represents a point in time independent of any time zone or local diff --git a/src/gitpod/types/environments/automations/task_spec_param.py b/src/gitpod/types/shared_params/task_spec.py similarity index 71% rename from src/gitpod/types/environments/automations/task_spec_param.py rename to src/gitpod/types/shared_params/task_spec.py index bf0c6294..5f40eef4 100644 --- a/src/gitpod/types/environments/automations/task_spec_param.py +++ b/src/gitpod/types/shared_params/task_spec.py @@ -4,13 +4,13 @@ from typing_extensions import Annotated, TypedDict -from ...._utils import PropertyInfo -from ...shared_params.runs_on import RunsOn +from .runs_on import RunsOn +from ..._utils import PropertyInfo -__all__ = ["TaskSpecParam"] +__all__ = ["TaskSpec"] -class TaskSpecParam(TypedDict, total=False): +class TaskSpec(TypedDict, total=False): command: str """command contains the command the task should execute""" diff --git a/tests/api_resources/environments/automations/test_tasks.py b/tests/api_resources/environments/automations/test_tasks.py index 4cee7ae4..adcf14f8 100644 --- a/tests/api_resources/environments/automations/test_tasks.py +++ b/tests/api_resources/environments/automations/test_tasks.py @@ -11,8 +11,8 @@ from tests.utils import assert_matches_type from gitpod._utils import parse_datetime from gitpod.pagination import SyncTasksPage, AsyncTasksPage +from gitpod.types.shared import Task from gitpod.types.environments.automations import ( - Task, TaskStartResponse, TaskCreateResponse, TaskRetrieveResponse,