Skip to content

Commit f167000

Browse files
google-genai-botcopybara-github
authored andcommitted
rollback(cli): unintended breaking changes
PiperOrigin-RevId: 1018595024
1 parent 96b79b3 commit f167000

11 files changed

Lines changed: 7 additions & 219 deletions

File tree

‎google/genai/_gaos/environments.py‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@
2727
from .types.environments import (
2828
createenvironmentrequest as environments_createenvironmentrequest,
2929
)
30-
from .types.interactions import (
31-
environmentmode as interactions_environmentmode,
32-
source as interactions_source,
33-
)
30+
from .types.interactions import source as interactions_source
3431
from .utils import get_security_from_env, response_helpers
3532
from .utils.unmarshal_json_response import unmarshal_json_response
3633
try:
3734
import httpx
3835
except ImportError:
3936
import httpx2 as httpx
40-
from typing import Any, Dict, Iterable, List, Mapping, Optional, Union, cast
37+
from typing import Any, Iterable, List, Mapping, Optional, Union, cast
4138

4239

4340
class Environments(BaseSDK):
@@ -67,7 +64,6 @@ def list_environments(
6764
self,
6865
*,
6966
api_version: Optional[str] = None,
70-
mode: Optional[interactions_environmentmode.EnvironmentMode] = None,
7167
page_size: Optional[int] = None,
7268
page_token: Optional[str] = None,
7369
extra_headers: Optional[Mapping[str, str]] = None,
@@ -77,7 +73,6 @@ def list_environments(
7773
r"""Lists environments.
7874
7975
:param api_version: API version for request routing.
80-
:param mode: Optional. Filter environments by compute lifecycle mode.
8176
:param page_size: Optional. Maximum number of environments to return.
8277
If unspecified, defaults to 50. Maximum is 1000.
8378
:param page_token: Optional. Pagination token.
@@ -101,7 +96,6 @@ def list_environments(
10196

10297
request = models.ListEnvironmentsRequest(
10398
api_version=api_version,
104-
mode=mode,
10599
page_size=page_size,
106100
page_token=page_token,
107101
)
@@ -224,9 +218,7 @@ def create_environment(
224218
self,
225219
*,
226220
api_version: Optional[str] = None,
227-
custom_config: Optional[Mapping[str, Any]] = None,
228221
from_environment: Optional[str] = None,
229-
mode: Optional[interactions_environmentmode.EnvironmentMode] = None,
230222
network: Optional[
231223
Union[
232224
environments_createenvironmentrequest.CreateEnvironmentRequestNetworkUnion,
@@ -239,7 +231,6 @@ def create_environment(
239231
Iterable[interactions_source.SourceParam],
240232
]
241233
] = None,
242-
system_instruction: Optional[str] = None,
243234
extra_headers: Optional[Mapping[str, str]] = None,
244235
extra_query: Optional[Mapping[str, Any]] = None,
245236
extra_body: Optional[Mapping[str, Any]] = None,
@@ -248,18 +239,11 @@ def create_environment(
248239
r"""Creates an environment.
249240
250241
:param api_version: API version for request routing.
251-
:param custom_config: Optional. Arbitrary customer-defined JSON configuration passed through
252-
to the self-hosted environment poller. Only supported when `mode` is
253-
`SELF_HOSTED`.
254242
:param from_environment: Optional. The source environment to copy/fork from.
255243
Format: `environments/{environment_id}` or `{environment_id}`.
256244
When specified, `sources` and `env` must be empty.
257-
:param mode: The compute lifecycle mode for an environment.
258245
:param network: Network configuration for the environment.
259246
:param sources: Sources to be mounted into the environment.
260-
:param system_instruction: Optional. System instruction applied to interactions running in this
261-
environment. Only supported for `SELF_HOSTED` environments, where it is
262-
recommended.
263247
:param extra_headers: Additional headers to set or replace on requests.
264248
:param extra_query: Additional query parameters to append to requests.
265249
:param extra_body: Additional JSON object fields to merge into request bodies.
@@ -282,16 +266,13 @@ def create_environment(
282266
request = models.CreateEnvironmentRequest(
283267
api_version=api_version,
284268
body=environments.CreateEnvironmentRequest(
285-
custom_config=utils.unmarshal(custom_config, Optional[Dict[str, Any]]),
286269
from_environment=from_environment,
287-
mode=mode,
288270
network=utils.get_pydantic_model(
289271
network, Optional[environments.CreateEnvironmentRequestNetworkUnion]
290272
),
291273
sources=utils.get_pydantic_model(
292274
sources, Optional[List[interactions.Source]]
293275
),
294-
system_instruction=system_instruction,
295276
),
296277
)
297278

@@ -799,7 +780,6 @@ async def list_environments(
799780
self,
800781
*,
801782
api_version: Optional[str] = None,
802-
mode: Optional[interactions_environmentmode.EnvironmentMode] = None,
803783
page_size: Optional[int] = None,
804784
page_token: Optional[str] = None,
805785
extra_headers: Optional[Mapping[str, str]] = None,
@@ -809,7 +789,6 @@ async def list_environments(
809789
r"""Lists environments.
810790
811791
:param api_version: API version for request routing.
812-
:param mode: Optional. Filter environments by compute lifecycle mode.
813792
:param page_size: Optional. Maximum number of environments to return.
814793
If unspecified, defaults to 50. Maximum is 1000.
815794
:param page_token: Optional. Pagination token.
@@ -833,7 +812,6 @@ async def list_environments(
833812

834813
request = models.ListEnvironmentsRequest(
835814
api_version=api_version,
836-
mode=mode,
837815
page_size=page_size,
838816
page_token=page_token,
839817
)
@@ -959,9 +937,7 @@ async def create_environment(
959937
self,
960938
*,
961939
api_version: Optional[str] = None,
962-
custom_config: Optional[Mapping[str, Any]] = None,
963940
from_environment: Optional[str] = None,
964-
mode: Optional[interactions_environmentmode.EnvironmentMode] = None,
965941
network: Optional[
966942
Union[
967943
environments_createenvironmentrequest.CreateEnvironmentRequestNetworkUnion,
@@ -974,7 +950,6 @@ async def create_environment(
974950
Iterable[interactions_source.SourceParam],
975951
]
976952
] = None,
977-
system_instruction: Optional[str] = None,
978953
extra_headers: Optional[Mapping[str, str]] = None,
979954
extra_query: Optional[Mapping[str, Any]] = None,
980955
extra_body: Optional[Mapping[str, Any]] = None,
@@ -983,18 +958,11 @@ async def create_environment(
983958
r"""Creates an environment.
984959
985960
:param api_version: API version for request routing.
986-
:param custom_config: Optional. Arbitrary customer-defined JSON configuration passed through
987-
to the self-hosted environment poller. Only supported when `mode` is
988-
`SELF_HOSTED`.
989961
:param from_environment: Optional. The source environment to copy/fork from.
990962
Format: `environments/{environment_id}` or `{environment_id}`.
991963
When specified, `sources` and `env` must be empty.
992-
:param mode: The compute lifecycle mode for an environment.
993964
:param network: Network configuration for the environment.
994965
:param sources: Sources to be mounted into the environment.
995-
:param system_instruction: Optional. System instruction applied to interactions running in this
996-
environment. Only supported for `SELF_HOSTED` environments, where it is
997-
recommended.
998966
:param extra_headers: Additional headers to set or replace on requests.
999967
:param extra_query: Additional query parameters to append to requests.
1000968
:param extra_body: Additional JSON object fields to merge into request bodies.
@@ -1017,16 +985,13 @@ async def create_environment(
1017985
request = models.CreateEnvironmentRequest(
1018986
api_version=api_version,
1019987
body=environments.CreateEnvironmentRequest(
1020-
custom_config=utils.unmarshal(custom_config, Optional[Dict[str, Any]]),
1021988
from_environment=from_environment,
1022-
mode=mode,
1023989
network=utils.get_pydantic_model(
1024990
network, Optional[environments.CreateEnvironmentRequestNetworkUnion]
1025991
),
1026992
sources=utils.get_pydantic_model(
1027993
sources, Optional[List[interactions.Source]]
1028994
),
1029-
system_instruction=system_instruction,
1030995
),
1031996
)
1032997

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
current_filtered_dump,
2525
current_serialization_methods_dump,
2626
)
27-
from ..types.interactions import environmentmode as interactions_environmentmode
2827
from ..utils import FieldMetadata, PathParamMetadata, QueryParamMetadata
2928
from pydantic import model_serializer
3029
from typing import Optional
@@ -80,8 +79,6 @@ def serialize_model(self, handler):
8079
class ListEnvironmentsRequestParam(TypedDict):
8180
api_version: NotRequired[str]
8281
r"""API version for request routing."""
83-
mode: NotRequired[interactions_environmentmode.EnvironmentMode]
84-
r"""Optional. Filter environments by compute lifecycle mode."""
8582
page_size: NotRequired[int]
8683
r"""Optional. Maximum number of environments to return.
8784
If unspecified, defaults to 50. Maximum is 1000.
@@ -97,12 +94,6 @@ class ListEnvironmentsRequest(BaseModel):
9794
] = None
9895
r"""API version for request routing."""
9996

100-
mode: Annotated[
101-
Optional[interactions_environmentmode.EnvironmentMode],
102-
FieldMetadata(query=QueryParamMetadata(style="form", explode=True)),
103-
] = None
104-
r"""Optional. Filter environments by compute lifecycle mode."""
105-
10697
page_size: Annotated[
10798
Optional[int],
10899
FieldMetadata(query=QueryParamMetadata(style="form", explode=True)),
@@ -122,7 +113,7 @@ def _serialize_model_with_info(self, handler, info):
122113
return serialize_with_info(self.serialize_model, handler, info)
123114

124115
def serialize_model(self, handler):
125-
optional_fields = set(["api_version", "mode", "page_size", "page_token"])
116+
optional_fields = set(["api_version", "page_size", "page_token"])
126117
exclude_none = current_exclude_none()
127118
by_alias = current_by_alias()
128119
use_field_names = by_alias is False

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
)
2626
from ...types.environments.listenvironmentsresponse import ListEnvironmentsResponse
2727
from ...types.interactions.empty import Empty as EnvironmentDeleteResponse
28-
from ...types.interactions.environmentmode import EnvironmentMode
2928

3029
EnvironmentListResponse = ListEnvironmentsResponse
3130
__all__ = [
@@ -34,7 +33,6 @@
3433
"EnvironmentDeleteResponse",
3534
"EnvironmentFile",
3635
"EnvironmentListResponse",
37-
"EnvironmentMode",
3836
"GetEnvironmentFilesResponse",
3937
"ListEnvironmentsResponse",
4038
]

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
from ...types.interactions.dynamicagentconfig import DynamicAgentConfig
5151
from ...types.interactions.empty import Empty as InteractionDeleteResponse
5252
from ...types.interactions.environment import Environment
53-
from ...types.interactions.environmentmode import EnvironmentMode
5453
from ...types.interactions.error import Error
5554
from ...types.interactions.errorevent import ErrorEvent
5655
from ...types.interactions.filecitation import FileCitation
@@ -157,7 +156,6 @@
157156
"DocumentContent",
158157
"DynamicAgentConfig",
159158
"Environment",
160-
"EnvironmentMode",
161159
"Error",
162160
"ErrorEvent",
163161
"FileCitation",

‎google/genai/_gaos/types/environments/createenvironmentrequest.py‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
current_serialization_methods_dump,
2626
)
2727
from ..interactions import (
28-
environmentmode as interactions_environmentmode,
2928
environmentnetworkegressallowlist as interactions_environmentnetworkegressallowlist,
3029
source as interactions_source,
3130
)
3231
from pydantic import model_serializer
33-
from typing import Any, Dict, List, Literal, Optional, Union
32+
from typing import List, Literal, Optional, Union
3433
from typing_extensions import NotRequired, TypeAliasType, TypedDict
3534

3635

@@ -60,74 +59,38 @@
6059
class CreateEnvironmentRequestParam(TypedDict):
6160
r"""Request for `CreateEnvironment`."""
6261

63-
custom_config: NotRequired[Dict[str, Any]]
64-
r"""Optional. Arbitrary customer-defined JSON configuration passed through
65-
to the self-hosted environment poller. Only supported when `mode` is
66-
`SELF_HOSTED`.
67-
"""
6862
from_environment: NotRequired[str]
6963
r"""Optional. The source environment to copy/fork from.
7064
Format: `environments/{environment_id}` or `{environment_id}`.
7165
When specified, `sources` and `env` must be empty.
7266
"""
73-
mode: NotRequired[interactions_environmentmode.EnvironmentMode]
74-
r"""The compute lifecycle mode for an environment."""
7567
network: NotRequired[CreateEnvironmentRequestNetworkUnionParam]
7668
r"""Network configuration for the environment."""
7769
sources: NotRequired[List[interactions_source.SourceParam]]
7870
r"""Sources to be mounted into the environment."""
79-
system_instruction: NotRequired[str]
80-
r"""Optional. System instruction applied to interactions running in this
81-
environment. Only supported for `SELF_HOSTED` environments, where it is
82-
recommended.
83-
"""
8471

8572

8673
class CreateEnvironmentRequest(BaseModel):
8774
r"""Request for `CreateEnvironment`."""
8875

89-
custom_config: Optional[Dict[str, Any]] = None
90-
r"""Optional. Arbitrary customer-defined JSON configuration passed through
91-
to the self-hosted environment poller. Only supported when `mode` is
92-
`SELF_HOSTED`.
93-
"""
94-
9576
from_environment: Optional[str] = None
9677
r"""Optional. The source environment to copy/fork from.
9778
Format: `environments/{environment_id}` or `{environment_id}`.
9879
When specified, `sources` and `env` must be empty.
9980
"""
10081

101-
mode: Optional[interactions_environmentmode.EnvironmentMode] = None
102-
r"""The compute lifecycle mode for an environment."""
103-
10482
network: Optional[CreateEnvironmentRequestNetworkUnion] = None
10583
r"""Network configuration for the environment."""
10684

10785
sources: Optional[List[interactions_source.Source]] = None
10886
r"""Sources to be mounted into the environment."""
10987

110-
system_instruction: Optional[str] = None
111-
r"""Optional. System instruction applied to interactions running in this
112-
environment. Only supported for `SELF_HOSTED` environments, where it is
113-
recommended.
114-
"""
115-
11688
@model_serializer(mode="wrap")
11789
def _serialize_model_with_info(self, handler, info):
11890
return serialize_with_info(self.serialize_model, handler, info)
11991

12092
def serialize_model(self, handler):
121-
optional_fields = set(
122-
[
123-
"custom_config",
124-
"from_environment",
125-
"mode",
126-
"network",
127-
"sources",
128-
"system_instruction",
129-
]
130-
)
93+
optional_fields = set(["from_environment", "network", "sources"])
13194
exclude_none = current_exclude_none()
13295
by_alias = current_by_alias()
13396
use_field_names = by_alias is False

0 commit comments

Comments
 (0)