Skip to content

Commit e5b3cb9

Browse files
wanlin31copybara-github
wanlin31
authored and
copybara-github
committed
chore: Refactor Trigger creation parameters.
PiperOrigin-RevId: 945941959
1 parent 0ab9525 commit e5b3cb9

7 files changed

Lines changed: 95 additions & 269 deletions

File tree

‎google/genai/_gaos/models/createtrigger.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from __future__ import annotations
2020
from ..types import BaseModel, UNSET_SENTINEL
21-
from ..types.triggers import trigger_input as triggers_trigger_input
21+
from ..types.triggers import triggercreateparams as triggers_triggercreateparams
2222
from ..utils import FieldMetadata, PathParamMetadata, RequestMetadata
2323
from pydantic import model_serializer
2424
from typing import Optional
@@ -55,14 +55,14 @@ def serialize_model(self, handler):
5555

5656

5757
class CreateTriggerRequestParam(TypedDict):
58-
body: triggers_trigger_input.TriggerInputParam
58+
body: triggers_triggercreateparams.TriggerCreateParamsParam
5959
api_version: NotRequired[str]
6060
r"""Which version of the API to use."""
6161

6262

6363
class CreateTriggerRequest(BaseModel):
6464
body: Annotated[
65-
triggers_trigger_input.TriggerInput,
65+
triggers_triggercreateparams.TriggerCreateParams,
6666
FieldMetadata(request=RequestMetadata(media_type="application/json")),
6767
]
6868

‎google/genai/_gaos/resources/triggers/__init__.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
1818

19-
from ...models.createtrigger import CreateTriggerRequestParam as TriggerCreateParams
2019
from ...models.deletetrigger import DeleteTriggerRequestParam as TriggerDeleteParams
2120
from ...models.gettrigger import GetTriggerRequestParam as TriggerGetParams
2221
from ...models.listtriggerexecutions import (
@@ -31,12 +30,10 @@
3130
)
3231
from ...types.triggers.listtriggersresponse import ListTriggersResponse
3332
from ...types.triggers.trigger import Trigger
34-
from ...types.triggers.trigger_input import (
35-
TriggerInput,
36-
TriggerInputParam as TriggerParam,
33+
from ...types.triggers.triggercreateparams import (
34+
TriggerCreateParamsParam as TriggerCreateParams,
3735
)
3836
from ...types.triggers.triggerexecution import TriggerExecution
39-
from ...types.triggers.triggerinteractionrequest import TriggerInteractionRequest
4037
from ...types.triggers.triggerupdate import TriggerUpdate
4138

4239
TriggerListExecutionsResponse = ListTriggerExecutionsResponse
@@ -50,13 +47,10 @@
5047
"TriggerDeleteResponse",
5148
"TriggerExecution",
5249
"TriggerGetParams",
53-
"TriggerInput",
54-
"TriggerInteractionRequest",
5550
"TriggerListExecutionsParams",
5651
"TriggerListExecutionsResponse",
5752
"TriggerListParams",
5853
"TriggerListResponse",
59-
"TriggerParam",
6054
"TriggerRunParams",
6155
"TriggerUpdate",
6256
"TriggerUpdateParams",

‎google/genai/_gaos/triggers.py‎

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from .basesdk import AsyncBaseSDK, BaseSDK
2222
from .types import OptionalNullable, UNSET, interactions, triggers
2323
from .types.triggers import (
24-
triggerinteractionrequest as triggers_triggerinteractionrequest,
24+
triggercreateparams as triggers_triggercreateparams,
2525
triggerupdate as triggers_triggerupdate,
2626
)
2727
from .utils import get_security_from_env, response_helpers
@@ -42,34 +42,32 @@ def with_streaming_response(self):
4242
def create(
4343
self,
4444
*,
45-
interaction: Union[
46-
triggers_triggerinteractionrequest.TriggerInteractionRequest,
47-
triggers_triggerinteractionrequest.TriggerInteractionRequestParam,
48-
],
4945
schedule: str,
5046
time_zone: str,
47+
interaction: Union[
48+
triggers_triggercreateparams.Interaction,
49+
triggers_triggercreateparams.InteractionParam,
50+
],
5151
api_version: Optional[str] = None,
5252
display_name: Optional[str] = None,
5353
environment_id: Optional[str] = None,
54-
execution_timeout_seconds: Optional[int] = None,
5554
max_consecutive_failures: Optional[int] = None,
55+
execution_timeout_seconds: Optional[int] = None,
5656
extra_headers: Optional[Mapping[str, str]] = None,
5757
extra_query: Optional[Mapping[str, Any]] = None,
5858
extra_body: Optional[Mapping[str, Any]] = None,
5959
timeout: Optional[Union[float, httpx.Timeout]] = None,
6060
) -> triggers.Trigger:
6161
r"""Creates a new trigger that will invoke the specified agent on the given cron schedule.
6262
63-
:param interaction: Configuration parameters for the interaction request template.
64-
:param schedule: Required. The cron schedule on which the trigger should run.
65-
Standard cron format.
63+
:param schedule: Required. The cron schedule on which the trigger should run. Standard cron format.
6664
:param time_zone: Required. Time zone in which the schedule should be interpreted.
65+
:param interaction: Required. The interaction request template to be executed.
6766
:param api_version: Which version of the API to use.
6867
:param display_name: Optional. The display name of the trigger.
6968
:param environment_id: Optional. The environment ID for the trigger execution.
69+
:param max_consecutive_failures: Optional. The maximum number of consecutive failures allowed before the trigger is automatically paused (status becomes ERROR).
7070
:param execution_timeout_seconds: Optional. The execution timeout for the triggered interaction.
71-
:param max_consecutive_failures: Optional. The maximum number of consecutive failures allowed before
72-
the trigger is automatically paused (status becomes ERROR).
7371
:param extra_headers: Additional headers to set or replace on requests.
7472
:param extra_query: Additional query parameters to append to requests.
7573
:param extra_body: Additional JSON object fields to merge into request bodies.
@@ -91,16 +89,14 @@ def create(
9189

9290
request = models.CreateTriggerRequest(
9391
api_version=api_version,
94-
body=triggers.TriggerInput(
92+
body=triggers.TriggerCreateParams(
93+
schedule=schedule,
94+
time_zone=time_zone,
9595
display_name=display_name,
9696
environment_id=environment_id,
97-
execution_timeout_seconds=execution_timeout_seconds,
98-
interaction=utils.get_pydantic_model(
99-
interaction, triggers.TriggerInteractionRequest
100-
),
10197
max_consecutive_failures=max_consecutive_failures,
102-
schedule=schedule,
103-
time_zone=time_zone,
98+
execution_timeout_seconds=execution_timeout_seconds,
99+
interaction=utils.get_pydantic_model(interaction, triggers.Interaction),
104100
),
105101
)
106102

@@ -129,7 +125,7 @@ def create(
129125
False,
130126
False,
131127
"json",
132-
triggers.TriggerInput,
128+
triggers.TriggerCreateParams,
133129
extra_body=extra_body,
134130
),
135131
allow_empty_value=None,
@@ -1215,34 +1211,32 @@ def with_streaming_response(self):
12151211
async def create(
12161212
self,
12171213
*,
1218-
interaction: Union[
1219-
triggers_triggerinteractionrequest.TriggerInteractionRequest,
1220-
triggers_triggerinteractionrequest.TriggerInteractionRequestParam,
1221-
],
12221214
schedule: str,
12231215
time_zone: str,
1216+
interaction: Union[
1217+
triggers_triggercreateparams.Interaction,
1218+
triggers_triggercreateparams.InteractionParam,
1219+
],
12241220
api_version: Optional[str] = None,
12251221
display_name: Optional[str] = None,
12261222
environment_id: Optional[str] = None,
1227-
execution_timeout_seconds: Optional[int] = None,
12281223
max_consecutive_failures: Optional[int] = None,
1224+
execution_timeout_seconds: Optional[int] = None,
12291225
extra_headers: Optional[Mapping[str, str]] = None,
12301226
extra_query: Optional[Mapping[str, Any]] = None,
12311227
extra_body: Optional[Mapping[str, Any]] = None,
12321228
timeout: Optional[Union[float, httpx.Timeout]] = None,
12331229
) -> triggers.Trigger:
12341230
r"""Creates a new trigger that will invoke the specified agent on the given cron schedule.
12351231
1236-
:param interaction: Configuration parameters for the interaction request template.
1237-
:param schedule: Required. The cron schedule on which the trigger should run.
1238-
Standard cron format.
1232+
:param schedule: Required. The cron schedule on which the trigger should run. Standard cron format.
12391233
:param time_zone: Required. Time zone in which the schedule should be interpreted.
1234+
:param interaction: Required. The interaction request template to be executed.
12401235
:param api_version: Which version of the API to use.
12411236
:param display_name: Optional. The display name of the trigger.
12421237
:param environment_id: Optional. The environment ID for the trigger execution.
1238+
:param max_consecutive_failures: Optional. The maximum number of consecutive failures allowed before the trigger is automatically paused (status becomes ERROR).
12431239
:param execution_timeout_seconds: Optional. The execution timeout for the triggered interaction.
1244-
:param max_consecutive_failures: Optional. The maximum number of consecutive failures allowed before
1245-
the trigger is automatically paused (status becomes ERROR).
12461240
:param extra_headers: Additional headers to set or replace on requests.
12471241
:param extra_query: Additional query parameters to append to requests.
12481242
:param extra_body: Additional JSON object fields to merge into request bodies.
@@ -1264,16 +1258,14 @@ async def create(
12641258

12651259
request = models.CreateTriggerRequest(
12661260
api_version=api_version,
1267-
body=triggers.TriggerInput(
1261+
body=triggers.TriggerCreateParams(
1262+
schedule=schedule,
1263+
time_zone=time_zone,
12681264
display_name=display_name,
12691265
environment_id=environment_id,
1270-
execution_timeout_seconds=execution_timeout_seconds,
1271-
interaction=utils.get_pydantic_model(
1272-
interaction, triggers.TriggerInteractionRequest
1273-
),
12741266
max_consecutive_failures=max_consecutive_failures,
1275-
schedule=schedule,
1276-
time_zone=time_zone,
1267+
execution_timeout_seconds=execution_timeout_seconds,
1268+
interaction=utils.get_pydantic_model(interaction, triggers.Interaction),
12771269
),
12781270
)
12791271

@@ -1302,7 +1294,7 @@ async def create(
13021294
False,
13031295
False,
13041296
"json",
1305-
triggers.TriggerInput,
1297+
triggers.TriggerCreateParams,
13061298
extra_body=extra_body,
13071299
),
13081300
allow_empty_value=None,

‎google/genai/_gaos/types/triggers/__init__.py‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,32 @@
3030
ListTriggersResponseTypedDict,
3131
)
3232
from .trigger import Trigger, TriggerStatus, TriggerTypedDict
33-
from .trigger_input import TriggerInput, TriggerInputParam
33+
from .triggercreateparams import (
34+
Interaction,
35+
InteractionParam,
36+
TriggerCreateParams,
37+
TriggerCreateParamsParam,
38+
)
3439
from .triggerexecution import (
3540
TriggerExecution,
3641
TriggerExecutionStatus,
3742
TriggerExecutionTypedDict,
3843
)
39-
from .triggerinteractionrequest import (
40-
TriggerInteractionRequest,
41-
TriggerInteractionRequestParam,
42-
)
4344
from .triggerupdate import TriggerUpdate, TriggerUpdateParam, TriggerUpdateStatus
4445

4546
__all__ = [
47+
"Interaction",
48+
"InteractionParam",
4649
"ListTriggerExecutionsResponse",
4750
"ListTriggerExecutionsResponseTypedDict",
4851
"ListTriggersResponse",
4952
"ListTriggersResponseTypedDict",
5053
"Trigger",
54+
"TriggerCreateParams",
55+
"TriggerCreateParamsParam",
5156
"TriggerExecution",
5257
"TriggerExecutionStatus",
5358
"TriggerExecutionTypedDict",
54-
"TriggerInput",
55-
"TriggerInputParam",
56-
"TriggerInteractionRequest",
57-
"TriggerInteractionRequestParam",
5859
"TriggerStatus",
5960
"TriggerTypedDict",
6061
"TriggerUpdate",
@@ -70,13 +71,13 @@
7071
"Trigger": ".trigger",
7172
"TriggerStatus": ".trigger",
7273
"TriggerTypedDict": ".trigger",
73-
"TriggerInput": ".trigger_input",
74-
"TriggerInputParam": ".trigger_input",
74+
"Interaction": ".triggercreateparams",
75+
"InteractionParam": ".triggercreateparams",
76+
"TriggerCreateParams": ".triggercreateparams",
77+
"TriggerCreateParamsParam": ".triggercreateparams",
7578
"TriggerExecution": ".triggerexecution",
7679
"TriggerExecutionStatus": ".triggerexecution",
7780
"TriggerExecutionTypedDict": ".triggerexecution",
78-
"TriggerInteractionRequest": ".triggerinteractionrequest",
79-
"TriggerInteractionRequestParam": ".triggerinteractionrequest",
8081
"TriggerUpdate": ".triggerupdate",
8182
"TriggerUpdateParam": ".triggerupdate",
8283
"TriggerUpdateStatus": ".triggerupdate",

‎google/genai/_gaos/types/triggers/trigger.py‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818

1919
from __future__ import annotations
2020
from .. import BaseModel, UNSET_SENTINEL, UnrecognizedStr
21-
from .triggerinteractionrequest import (
22-
TriggerInteractionRequest,
23-
TriggerInteractionRequestParam,
24-
)
21+
from ..interactions import interaction as interactions_interaction
2522
from datetime import datetime
2623
from pydantic import model_serializer
2724
from typing import Literal, Optional, Union
@@ -44,8 +41,8 @@ class TriggerTypedDict(TypedDict):
4441

4542
id: str
4643
r"""Required. Output only. Identifier. The ID of the trigger."""
47-
interaction: TriggerInteractionRequestParam
48-
r"""Configuration parameters for the interaction request template."""
44+
interaction: interactions_interaction.InteractionTypedDict
45+
r"""The Interaction resource."""
4946
schedule: str
5047
r"""Required. The cron schedule on which the trigger should run.
5148
Standard cron format.
@@ -90,8 +87,8 @@ class Trigger(BaseModel):
9087
id: str
9188
r"""Required. Output only. Identifier. The ID of the trigger."""
9289

93-
interaction: TriggerInteractionRequest
94-
r"""Configuration parameters for the interaction request template."""
90+
interaction: interactions_interaction.Interaction
91+
r"""The Interaction resource."""
9592

9693
schedule: str
9794
r"""Required. The cron schedule on which the trigger should run.

0 commit comments

Comments
 (0)