Skip to content

Commit dd4775b

Browse files
jaycee-licopybara-github
jaycee-li
authored and
copybara-github
committed
chore: Always put XxxConfig parameter in the last position
PiperOrigin-RevId: 836293507
1 parent 8d4ce38 commit dd4775b

File tree

4 files changed

+205
-205
lines changed

4 files changed

+205
-205
lines changed

‎vertexai/_genai/datasets.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ def _CreateMultimodalDatasetParameters_to_vertex(
113113
parent_object: Optional[dict[str, Any]] = None,
114114
) -> dict[str, Any]:
115115
to_object: dict[str, Any] = {}
116-
if getv(from_object, ["config"]) is not None:
117-
setv(to_object, ["config"], getv(from_object, ["config"]))
118-
119116
if getv(from_object, ["name"]) is not None:
120117
setv(to_object, ["name"], getv(from_object, ["name"]))
121118

@@ -136,6 +133,9 @@ def _CreateMultimodalDatasetParameters_to_vertex(
136133
if getv(from_object, ["encryption_spec"]) is not None:
137134
setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"]))
138135

136+
if getv(from_object, ["config"]) is not None:
137+
setv(to_object, ["config"], getv(from_object, ["config"]))
138+
139139
return to_object
140140

141141

@@ -144,12 +144,12 @@ def _DeleteMultimodalDatasetRequestParameters_to_vertex(
144144
parent_object: Optional[dict[str, Any]] = None,
145145
) -> dict[str, Any]:
146146
to_object: dict[str, Any] = {}
147-
if getv(from_object, ["config"]) is not None:
148-
setv(to_object, ["config"], getv(from_object, ["config"]))
149-
150147
if getv(from_object, ["name"]) is not None:
151148
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))
152149

150+
if getv(from_object, ["config"]) is not None:
151+
setv(to_object, ["config"], getv(from_object, ["config"]))
152+
153153
return to_object
154154

155155

@@ -158,15 +158,15 @@ def _GetMultimodalDatasetOperationParameters_to_vertex(
158158
parent_object: Optional[dict[str, Any]] = None,
159159
) -> dict[str, Any]:
160160
to_object: dict[str, Any] = {}
161-
if getv(from_object, ["config"]) is not None:
162-
setv(to_object, ["config"], getv(from_object, ["config"]))
163-
164161
if getv(from_object, ["dataset_id"]) is not None:
165162
setv(to_object, ["_url", "dataset_id"], getv(from_object, ["dataset_id"]))
166163

167164
if getv(from_object, ["operation_id"]) is not None:
168165
setv(to_object, ["_url", "operation_id"], getv(from_object, ["operation_id"]))
169166

167+
if getv(from_object, ["config"]) is not None:
168+
setv(to_object, ["config"], getv(from_object, ["config"]))
169+
170170
return to_object
171171

172172

@@ -175,12 +175,12 @@ def _GetMultimodalDatasetParameters_to_vertex(
175175
parent_object: Optional[dict[str, Any]] = None,
176176
) -> dict[str, Any]:
177177
to_object: dict[str, Any] = {}
178-
if getv(from_object, ["config"]) is not None:
179-
setv(to_object, ["config"], getv(from_object, ["config"]))
180-
181178
if getv(from_object, ["name"]) is not None:
182179
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))
183180

181+
if getv(from_object, ["config"]) is not None:
182+
setv(to_object, ["config"], getv(from_object, ["config"]))
183+
184184
return to_object
185185

186186

@@ -224,9 +224,6 @@ def _UpdateMultimodalDatasetParameters_to_vertex(
224224
parent_object: Optional[dict[str, Any]] = None,
225225
) -> dict[str, Any]:
226226
to_object: dict[str, Any] = {}
227-
if getv(from_object, ["config"]) is not None:
228-
setv(to_object, ["config"], getv(from_object, ["config"]))
229-
230227
if getv(from_object, ["name"]) is not None:
231228
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))
232229

@@ -242,6 +239,9 @@ def _UpdateMultimodalDatasetParameters_to_vertex(
242239
if getv(from_object, ["encryption_spec"]) is not None:
243240
setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"]))
244241

242+
if getv(from_object, ["config"]) is not None:
243+
setv(to_object, ["config"], getv(from_object, ["config"]))
244+
245245
return to_object
246246

247247

@@ -380,26 +380,26 @@ def _assess_multimodal_dataset(
380380
def _create_multimodal_dataset(
381381
self,
382382
*,
383-
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
384383
name: Optional[str] = None,
385384
display_name: Optional[str] = None,
386385
metadata_schema_uri: Optional[str] = None,
387386
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
388387
description: Optional[str] = None,
389388
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
389+
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
390390
) -> types.MultimodalDatasetOperation:
391391
"""
392392
Creates a dataset resource to store multimodal datasets.
393393
"""
394394

395395
parameter_model = types._CreateMultimodalDatasetParameters(
396-
config=config,
397396
name=name,
398397
display_name=display_name,
399398
metadata_schema_uri=metadata_schema_uri,
400399
metadata=metadata,
401400
description=description,
402401
encryption_spec=encryption_spec,
402+
config=config,
403403
)
404404

405405
request_url_dict: Optional[dict[str, str]]
@@ -441,15 +441,15 @@ def _create_multimodal_dataset(
441441
return return_value
442442

443443
def _delete_multimodal_dataset(
444-
self, *, config: Optional[types.VertexBaseConfigOrDict] = None, name: str
444+
self, *, name: str, config: Optional[types.VertexBaseConfigOrDict] = None
445445
) -> types.MultimodalDatasetOperation:
446446
"""
447447
Deletes a multimodal dataset resource.
448448
"""
449449

450450
parameter_model = types._DeleteMultimodalDatasetRequestParameters(
451-
config=config,
452451
name=name,
452+
config=config,
453453
)
454454

455455
request_url_dict: Optional[dict[str, str]]
@@ -495,16 +495,16 @@ def _delete_multimodal_dataset(
495495
def _get_multimodal_dataset(
496496
self,
497497
*,
498-
config: Optional[types.VertexBaseConfigOrDict] = None,
499498
name: Optional[str] = None,
499+
config: Optional[types.VertexBaseConfigOrDict] = None,
500500
) -> types.MultimodalDataset:
501501
"""
502502
Gets a multimodal dataset resource.
503503
"""
504504

505505
parameter_model = types._GetMultimodalDatasetParameters(
506-
config=config,
507506
name=name,
507+
config=config,
508508
)
509509

510510
request_url_dict: Optional[dict[str, str]]
@@ -548,18 +548,18 @@ def _get_multimodal_dataset(
548548
def _get_multimodal_dataset_operation(
549549
self,
550550
*,
551-
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
552551
dataset_id: Optional[str] = None,
553552
operation_id: Optional[str] = None,
553+
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
554554
) -> types.MultimodalDatasetOperation:
555555
"""
556556
Gets the operation from creating a multimodal dataset.
557557
"""
558558

559559
parameter_model = types._GetMultimodalDatasetOperationParameters(
560-
config=config,
561560
dataset_id=dataset_id,
562561
operation_id=operation_id,
562+
config=config,
563563
)
564564

565565
request_url_dict: Optional[dict[str, str]]
@@ -658,24 +658,24 @@ def _list_multimodal_datasets(
658658
def _update_multimodal_dataset(
659659
self,
660660
*,
661-
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
662661
name: Optional[str] = None,
663662
display_name: Optional[str] = None,
664663
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
665664
description: Optional[str] = None,
666665
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
666+
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
667667
) -> types.MultimodalDataset:
668668
"""
669669
Updates a multimodal dataset resource.
670670
"""
671671

672672
parameter_model = types._UpdateMultimodalDatasetParameters(
673-
config=config,
674673
name=name,
675674
display_name=display_name,
676675
metadata=metadata,
677676
description=description,
678677
encryption_spec=encryption_spec,
678+
config=config,
679679
)
680680

681681
request_url_dict: Optional[dict[str, str]]
@@ -1194,26 +1194,26 @@ async def _assess_multimodal_dataset(
11941194
async def _create_multimodal_dataset(
11951195
self,
11961196
*,
1197-
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
11981197
name: Optional[str] = None,
11991198
display_name: Optional[str] = None,
12001199
metadata_schema_uri: Optional[str] = None,
12011200
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
12021201
description: Optional[str] = None,
12031202
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
1203+
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
12041204
) -> types.MultimodalDatasetOperation:
12051205
"""
12061206
Creates a dataset resource to store multimodal datasets.
12071207
"""
12081208

12091209
parameter_model = types._CreateMultimodalDatasetParameters(
1210-
config=config,
12111210
name=name,
12121211
display_name=display_name,
12131212
metadata_schema_uri=metadata_schema_uri,
12141213
metadata=metadata,
12151214
description=description,
12161215
encryption_spec=encryption_spec,
1216+
config=config,
12171217
)
12181218

12191219
request_url_dict: Optional[dict[str, str]]
@@ -1257,15 +1257,15 @@ async def _create_multimodal_dataset(
12571257
return return_value
12581258

12591259
async def _delete_multimodal_dataset(
1260-
self, *, config: Optional[types.VertexBaseConfigOrDict] = None, name: str
1260+
self, *, name: str, config: Optional[types.VertexBaseConfigOrDict] = None
12611261
) -> types.MultimodalDatasetOperation:
12621262
"""
12631263
Deletes a multimodal dataset resource.
12641264
"""
12651265

12661266
parameter_model = types._DeleteMultimodalDatasetRequestParameters(
1267-
config=config,
12681267
name=name,
1268+
config=config,
12691269
)
12701270

12711271
request_url_dict: Optional[dict[str, str]]
@@ -1313,16 +1313,16 @@ async def _delete_multimodal_dataset(
13131313
async def _get_multimodal_dataset(
13141314
self,
13151315
*,
1316-
config: Optional[types.VertexBaseConfigOrDict] = None,
13171316
name: Optional[str] = None,
1317+
config: Optional[types.VertexBaseConfigOrDict] = None,
13181318
) -> types.MultimodalDataset:
13191319
"""
13201320
Gets a multimodal dataset resource.
13211321
"""
13221322

13231323
parameter_model = types._GetMultimodalDatasetParameters(
1324-
config=config,
13251324
name=name,
1325+
config=config,
13261326
)
13271327

13281328
request_url_dict: Optional[dict[str, str]]
@@ -1368,18 +1368,18 @@ async def _get_multimodal_dataset(
13681368
async def _get_multimodal_dataset_operation(
13691369
self,
13701370
*,
1371-
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
13721371
dataset_id: Optional[str] = None,
13731372
operation_id: Optional[str] = None,
1373+
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
13741374
) -> types.MultimodalDatasetOperation:
13751375
"""
13761376
Gets the operation from creating a multimodal dataset.
13771377
"""
13781378

13791379
parameter_model = types._GetMultimodalDatasetOperationParameters(
1380-
config=config,
13811380
dataset_id=dataset_id,
13821381
operation_id=operation_id,
1382+
config=config,
13831383
)
13841384

13851385
request_url_dict: Optional[dict[str, str]]
@@ -1482,24 +1482,24 @@ async def _list_multimodal_datasets(
14821482
async def _update_multimodal_dataset(
14831483
self,
14841484
*,
1485-
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
14861485
name: Optional[str] = None,
14871486
display_name: Optional[str] = None,
14881487
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
14891488
description: Optional[str] = None,
14901489
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
1490+
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
14911491
) -> types.MultimodalDataset:
14921492
"""
14931493
Updates a multimodal dataset resource.
14941494
"""
14951495

14961496
parameter_model = types._UpdateMultimodalDatasetParameters(
1497-
config=config,
14981497
name=name,
14991498
display_name=display_name,
15001499
metadata=metadata,
15011500
description=description,
15021501
encryption_spec=encryption_spec,
1502+
config=config,
15031503
)
15041504

15051505
request_url_dict: Optional[dict[str, str]]

0 commit comments

Comments
 (0)