Skip to content

Commit d957af5

Browse files
jaycee-licopybara-github
jaycee-li
authored and
copybara-github
committed
chore: Always put XxxConfig parameter in the last position
PiperOrigin-RevId: 834496372
1 parent e0bc3d8 commit d957af5

File tree

5 files changed

+213
-216
lines changed

5 files changed

+213
-216
lines changed

‎vertexai/_genai/datasets.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ def _CreateMultimodalDatasetParameters_to_vertex(
6161
parent_object: Optional[dict[str, Any]] = None,
6262
) -> dict[str, Any]:
6363
to_object: dict[str, Any] = {}
64-
if getv(from_object, ["config"]) is not None:
65-
setv(to_object, ["config"], getv(from_object, ["config"]))
66-
6764
if getv(from_object, ["name"]) is not None:
6865
setv(to_object, ["name"], getv(from_object, ["name"]))
6966

@@ -84,6 +81,9 @@ def _CreateMultimodalDatasetParameters_to_vertex(
8481
if getv(from_object, ["encryption_spec"]) is not None:
8582
setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"]))
8683

84+
if getv(from_object, ["config"]) is not None:
85+
setv(to_object, ["config"], getv(from_object, ["config"]))
86+
8787
return to_object
8888

8989

@@ -92,12 +92,12 @@ def _DeleteMultimodalDatasetRequestParameters_to_vertex(
9292
parent_object: Optional[dict[str, Any]] = None,
9393
) -> dict[str, Any]:
9494
to_object: dict[str, Any] = {}
95-
if getv(from_object, ["config"]) is not None:
96-
setv(to_object, ["config"], getv(from_object, ["config"]))
97-
9895
if getv(from_object, ["name"]) is not None:
9996
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))
10097

98+
if getv(from_object, ["config"]) is not None:
99+
setv(to_object, ["config"], getv(from_object, ["config"]))
100+
101101
return to_object
102102

103103

@@ -106,15 +106,15 @@ def _GetMultimodalDatasetOperationParameters_to_vertex(
106106
parent_object: Optional[dict[str, Any]] = None,
107107
) -> dict[str, Any]:
108108
to_object: dict[str, Any] = {}
109-
if getv(from_object, ["config"]) is not None:
110-
setv(to_object, ["config"], getv(from_object, ["config"]))
111-
112109
if getv(from_object, ["dataset_id"]) is not None:
113110
setv(to_object, ["_url", "dataset_id"], getv(from_object, ["dataset_id"]))
114111

115112
if getv(from_object, ["operation_id"]) is not None:
116113
setv(to_object, ["_url", "operation_id"], getv(from_object, ["operation_id"]))
117114

115+
if getv(from_object, ["config"]) is not None:
116+
setv(to_object, ["config"], getv(from_object, ["config"]))
117+
118118
return to_object
119119

120120

@@ -123,12 +123,12 @@ def _GetMultimodalDatasetParameters_to_vertex(
123123
parent_object: Optional[dict[str, Any]] = None,
124124
) -> dict[str, Any]:
125125
to_object: dict[str, Any] = {}
126-
if getv(from_object, ["config"]) is not None:
127-
setv(to_object, ["config"], getv(from_object, ["config"]))
128-
129126
if getv(from_object, ["name"]) is not None:
130127
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))
131128

129+
if getv(from_object, ["config"]) is not None:
130+
setv(to_object, ["config"], getv(from_object, ["config"]))
131+
132132
return to_object
133133

134134

@@ -172,9 +172,6 @@ def _UpdateMultimodalDatasetParameters_to_vertex(
172172
parent_object: Optional[dict[str, Any]] = None,
173173
) -> dict[str, Any]:
174174
to_object: dict[str, Any] = {}
175-
if getv(from_object, ["config"]) is not None:
176-
setv(to_object, ["config"], getv(from_object, ["config"]))
177-
178175
if getv(from_object, ["name"]) is not None:
179176
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))
180177

@@ -190,6 +187,9 @@ def _UpdateMultimodalDatasetParameters_to_vertex(
190187
if getv(from_object, ["encryption_spec"]) is not None:
191188
setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"]))
192189

190+
if getv(from_object, ["config"]) is not None:
191+
setv(to_object, ["config"], getv(from_object, ["config"]))
192+
193193
return to_object
194194

195195

@@ -255,26 +255,26 @@ def _assemble_multimodal_dataset(
255255
def _create_multimodal_dataset(
256256
self,
257257
*,
258-
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
259258
name: Optional[str] = None,
260259
display_name: Optional[str] = None,
261260
metadata_schema_uri: Optional[str] = None,
262261
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
263262
description: Optional[str] = None,
264263
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
264+
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
265265
) -> types.MultimodalDatasetOperation:
266266
"""
267267
Creates a dataset resource to store multimodal datasets.
268268
"""
269269

270270
parameter_model = types._CreateMultimodalDatasetParameters(
271-
config=config,
272271
name=name,
273272
display_name=display_name,
274273
metadata_schema_uri=metadata_schema_uri,
275274
metadata=metadata,
276275
description=description,
277276
encryption_spec=encryption_spec,
277+
config=config,
278278
)
279279

280280
request_url_dict: Optional[dict[str, str]]
@@ -316,15 +316,15 @@ def _create_multimodal_dataset(
316316
return return_value
317317

318318
def _delete_multimodal_dataset(
319-
self, *, config: Optional[types.VertexBaseConfigOrDict] = None, name: str
319+
self, *, name: str, config: Optional[types.VertexBaseConfigOrDict] = None
320320
) -> types.MultimodalDatasetOperation:
321321
"""
322322
Deletes a multimodal dataset resource.
323323
"""
324324

325325
parameter_model = types._DeleteMultimodalDatasetRequestParameters(
326-
config=config,
327326
name=name,
327+
config=config,
328328
)
329329

330330
request_url_dict: Optional[dict[str, str]]
@@ -370,16 +370,16 @@ def _delete_multimodal_dataset(
370370
def _get_multimodal_dataset(
371371
self,
372372
*,
373-
config: Optional[types.VertexBaseConfigOrDict] = None,
374373
name: Optional[str] = None,
374+
config: Optional[types.VertexBaseConfigOrDict] = None,
375375
) -> types.MultimodalDataset:
376376
"""
377377
Gets a multimodal dataset resource.
378378
"""
379379

380380
parameter_model = types._GetMultimodalDatasetParameters(
381-
config=config,
382381
name=name,
382+
config=config,
383383
)
384384

385385
request_url_dict: Optional[dict[str, str]]
@@ -423,18 +423,18 @@ def _get_multimodal_dataset(
423423
def _get_multimodal_dataset_operation(
424424
self,
425425
*,
426-
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
427426
dataset_id: Optional[str] = None,
428427
operation_id: Optional[str] = None,
428+
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
429429
) -> types.MultimodalDatasetOperation:
430430
"""
431431
Gets the operation from creating a multimodal dataset.
432432
"""
433433

434434
parameter_model = types._GetMultimodalDatasetOperationParameters(
435-
config=config,
436435
dataset_id=dataset_id,
437436
operation_id=operation_id,
437+
config=config,
438438
)
439439

440440
request_url_dict: Optional[dict[str, str]]
@@ -533,24 +533,24 @@ def _list_multimodal_datasets(
533533
def _update_multimodal_dataset(
534534
self,
535535
*,
536-
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
537536
name: Optional[str] = None,
538537
display_name: Optional[str] = None,
539538
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
540539
description: Optional[str] = None,
541540
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
541+
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
542542
) -> types.MultimodalDataset:
543543
"""
544544
Updates a multimodal dataset resource.
545545
"""
546546

547547
parameter_model = types._UpdateMultimodalDatasetParameters(
548-
config=config,
549548
name=name,
550549
display_name=display_name,
551550
metadata=metadata,
552551
description=description,
553552
encryption_spec=encryption_spec,
553+
config=config,
554554
)
555555

556556
request_url_dict: Optional[dict[str, str]]
@@ -940,26 +940,26 @@ async def _assemble_multimodal_dataset(
940940
async def _create_multimodal_dataset(
941941
self,
942942
*,
943-
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
944943
name: Optional[str] = None,
945944
display_name: Optional[str] = None,
946945
metadata_schema_uri: Optional[str] = None,
947946
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
948947
description: Optional[str] = None,
949948
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
949+
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
950950
) -> types.MultimodalDatasetOperation:
951951
"""
952952
Creates a dataset resource to store multimodal datasets.
953953
"""
954954

955955
parameter_model = types._CreateMultimodalDatasetParameters(
956-
config=config,
957956
name=name,
958957
display_name=display_name,
959958
metadata_schema_uri=metadata_schema_uri,
960959
metadata=metadata,
961960
description=description,
962961
encryption_spec=encryption_spec,
962+
config=config,
963963
)
964964

965965
request_url_dict: Optional[dict[str, str]]
@@ -1003,15 +1003,15 @@ async def _create_multimodal_dataset(
10031003
return return_value
10041004

10051005
async def _delete_multimodal_dataset(
1006-
self, *, config: Optional[types.VertexBaseConfigOrDict] = None, name: str
1006+
self, *, name: str, config: Optional[types.VertexBaseConfigOrDict] = None
10071007
) -> types.MultimodalDatasetOperation:
10081008
"""
10091009
Deletes a multimodal dataset resource.
10101010
"""
10111011

10121012
parameter_model = types._DeleteMultimodalDatasetRequestParameters(
1013-
config=config,
10141013
name=name,
1014+
config=config,
10151015
)
10161016

10171017
request_url_dict: Optional[dict[str, str]]
@@ -1059,16 +1059,16 @@ async def _delete_multimodal_dataset(
10591059
async def _get_multimodal_dataset(
10601060
self,
10611061
*,
1062-
config: Optional[types.VertexBaseConfigOrDict] = None,
10631062
name: Optional[str] = None,
1063+
config: Optional[types.VertexBaseConfigOrDict] = None,
10641064
) -> types.MultimodalDataset:
10651065
"""
10661066
Gets a multimodal dataset resource.
10671067
"""
10681068

10691069
parameter_model = types._GetMultimodalDatasetParameters(
1070-
config=config,
10711070
name=name,
1071+
config=config,
10721072
)
10731073

10741074
request_url_dict: Optional[dict[str, str]]
@@ -1114,18 +1114,18 @@ async def _get_multimodal_dataset(
11141114
async def _get_multimodal_dataset_operation(
11151115
self,
11161116
*,
1117-
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
11181117
dataset_id: Optional[str] = None,
11191118
operation_id: Optional[str] = None,
1119+
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
11201120
) -> types.MultimodalDatasetOperation:
11211121
"""
11221122
Gets the operation from creating a multimodal dataset.
11231123
"""
11241124

11251125
parameter_model = types._GetMultimodalDatasetOperationParameters(
1126-
config=config,
11271126
dataset_id=dataset_id,
11281127
operation_id=operation_id,
1128+
config=config,
11291129
)
11301130

11311131
request_url_dict: Optional[dict[str, str]]
@@ -1228,24 +1228,24 @@ async def _list_multimodal_datasets(
12281228
async def _update_multimodal_dataset(
12291229
self,
12301230
*,
1231-
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
12321231
name: Optional[str] = None,
12331232
display_name: Optional[str] = None,
12341233
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
12351234
description: Optional[str] = None,
12361235
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
1236+
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
12371237
) -> types.MultimodalDataset:
12381238
"""
12391239
Updates a multimodal dataset resource.
12401240
"""
12411241

12421242
parameter_model = types._UpdateMultimodalDatasetParameters(
1243-
config=config,
12441243
name=name,
12451244
display_name=display_name,
12461245
metadata=metadata,
12471246
description=description,
12481247
encryption_spec=encryption_spec,
1248+
config=config,
12491249
)
12501250

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

‎vertexai/_genai/evals.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ def _CreateEvaluationRunParameters_to_vertex(
8181
if getv(from_object, ["labels"]) is not None:
8282
setv(to_object, ["labels"], getv(from_object, ["labels"]))
8383

84-
if getv(from_object, ["config"]) is not None:
85-
setv(to_object, ["config"], getv(from_object, ["config"]))
86-
8784
if getv(from_object, ["inference_configs"]) is not None:
8885
setv(to_object, ["inferenceConfigs"], getv(from_object, ["inference_configs"]))
8986

@@ -472,10 +469,10 @@ def _create_evaluation_run(
472469
data_source: types.EvaluationRunDataSourceOrDict,
473470
evaluation_config: types.EvaluationRunConfigOrDict,
474471
labels: Optional[dict[str, str]] = None,
475-
config: Optional[types.CreateEvaluationRunConfigOrDict] = None,
476472
inference_configs: Optional[
477473
dict[str, types.EvaluationRunInferenceConfigOrDict]
478474
] = None,
475+
config: Optional[types.CreateEvaluationRunConfigOrDict] = None,
479476
) -> types.EvaluationRun:
480477
"""
481478
Creates an EvaluationRun.
@@ -487,8 +484,8 @@ def _create_evaluation_run(
487484
data_source=data_source,
488485
evaluation_config=evaluation_config,
489486
labels=labels,
490-
config=config,
491487
inference_configs=inference_configs,
488+
config=config,
492489
)
493490

494491
request_url_dict: Optional[dict[str, str]]
@@ -1627,10 +1624,10 @@ async def _create_evaluation_run(
16271624
data_source: types.EvaluationRunDataSourceOrDict,
16281625
evaluation_config: types.EvaluationRunConfigOrDict,
16291626
labels: Optional[dict[str, str]] = None,
1630-
config: Optional[types.CreateEvaluationRunConfigOrDict] = None,
16311627
inference_configs: Optional[
16321628
dict[str, types.EvaluationRunInferenceConfigOrDict]
16331629
] = None,
1630+
config: Optional[types.CreateEvaluationRunConfigOrDict] = None,
16341631
) -> types.EvaluationRun:
16351632
"""
16361633
Creates an EvaluationRun.
@@ -1642,8 +1639,8 @@ async def _create_evaluation_run(
16421639
data_source=data_source,
16431640
evaluation_config=evaluation_config,
16441641
labels=labels,
1645-
config=config,
16461642
inference_configs=inference_configs,
1643+
config=config,
16471644
)
16481645

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

0 commit comments

Comments
 (0)