Skip to content

Commit b668dae

Browse files
BenjaminKazemicopybara-github
authored andcommitted
chore: [vertexai] Introduce modules
PiperOrigin-RevId: 834424318
1 parent 26dfdfe commit b668dae

File tree

3 files changed

+82
-82
lines changed

3 files changed

+82
-82
lines changed

vertexai/_genai/datasets.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ def _AssembleDatasetParameters_to_vertex(
4040
parent_object: Optional[dict[str, Any]] = None,
4141
) -> dict[str, Any]:
4242
to_object: dict[str, Any] = {}
43-
if getv(from_object, ["config"]) is not None:
44-
setv(to_object, ["config"], getv(from_object, ["config"]))
45-
4643
if getv(from_object, ["name"]) is not None:
4744
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))
4845

@@ -53,6 +50,9 @@ def _AssembleDatasetParameters_to_vertex(
5350
getv(from_object, ["gemini_request_read_config"]),
5451
)
5552

53+
if getv(from_object, ["config"]) is not None:
54+
setv(to_object, ["config"], getv(from_object, ["config"]))
55+
5656
return to_object
5757

5858

@@ -61,9 +61,6 @@ def _AssessDatasetParameters_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, ["_url", "name"], getv(from_object, ["name"]))
6966

@@ -105,6 +102,9 @@ def _AssessDatasetParameters_to_vertex(
105102
getv(from_object, ["batch_prediction_validation_assessment_config"]),
106103
)
107104

105+
if getv(from_object, ["config"]) is not None:
106+
setv(to_object, ["config"], getv(from_object, ["config"]))
107+
108108
return to_object
109109

110110

@@ -250,20 +250,20 @@ class Datasets(_api_module.BaseModule):
250250
def _assemble_multimodal_dataset(
251251
self,
252252
*,
253-
config: Optional[types.AssembleDatasetConfigOrDict] = None,
254253
name: str,
255254
gemini_request_read_config: Optional[
256255
types.GeminiRequestReadConfigOrDict
257256
] = None,
257+
config: Optional[types.AssembleDatasetConfigOrDict] = None,
258258
) -> types.MultimodalDatasetOperation:
259259
"""
260260
Assembles a multimodal dataset resource.
261261
"""
262262

263263
parameter_model = types._AssembleDatasetParameters(
264-
config=config,
265264
name=name,
266265
gemini_request_read_config=gemini_request_read_config,
266+
config=config,
267267
)
268268

269269
request_url_dict: Optional[dict[str, str]]
@@ -307,7 +307,6 @@ def _assemble_multimodal_dataset(
307307
def _assess_multimodal_dataset(
308308
self,
309309
*,
310-
config: Optional[types.AssessDatasetConfigOrDict] = None,
311310
name: str,
312311
gemini_request_read_config: Optional[
313312
types.GeminiRequestReadConfigOrDict
@@ -324,19 +323,20 @@ def _assess_multimodal_dataset(
324323
batch_prediction_validation_assessment_config: Optional[
325324
types.BatchPredictionValidationAssessmentConfigOrDict
326325
] = None,
326+
config: Optional[types.AssessDatasetConfigOrDict] = None,
327327
) -> types.MultimodalDatasetOperation:
328328
"""
329329
Assesses a multimodal dataset resource.
330330
"""
331331

332332
parameter_model = types._AssessDatasetParameters(
333-
config=config,
334333
name=name,
335334
gemini_request_read_config=gemini_request_read_config,
336335
tuning_resource_usage_assessment_config=tuning_resource_usage_assessment_config,
337336
tuning_validation_assessment_config=tuning_validation_assessment_config,
338337
batch_prediction_resource_usage_assessment_config=batch_prediction_resource_usage_assessment_config,
339338
batch_prediction_validation_assessment_config=batch_prediction_validation_assessment_config,
339+
config=config,
340340
)
341341

342342
request_url_dict: Optional[dict[str, str]]
@@ -1060,20 +1060,20 @@ class AsyncDatasets(_api_module.BaseModule):
10601060
async def _assemble_multimodal_dataset(
10611061
self,
10621062
*,
1063-
config: Optional[types.AssembleDatasetConfigOrDict] = None,
10641063
name: str,
10651064
gemini_request_read_config: Optional[
10661065
types.GeminiRequestReadConfigOrDict
10671066
] = None,
1067+
config: Optional[types.AssembleDatasetConfigOrDict] = None,
10681068
) -> types.MultimodalDatasetOperation:
10691069
"""
10701070
Assembles a multimodal dataset resource.
10711071
"""
10721072

10731073
parameter_model = types._AssembleDatasetParameters(
1074-
config=config,
10751074
name=name,
10761075
gemini_request_read_config=gemini_request_read_config,
1076+
config=config,
10771077
)
10781078

10791079
request_url_dict: Optional[dict[str, str]]
@@ -1119,7 +1119,6 @@ async def _assemble_multimodal_dataset(
11191119
async def _assess_multimodal_dataset(
11201120
self,
11211121
*,
1122-
config: Optional[types.AssessDatasetConfigOrDict] = None,
11231122
name: str,
11241123
gemini_request_read_config: Optional[
11251124
types.GeminiRequestReadConfigOrDict
@@ -1136,19 +1135,20 @@ async def _assess_multimodal_dataset(
11361135
batch_prediction_validation_assessment_config: Optional[
11371136
types.BatchPredictionValidationAssessmentConfigOrDict
11381137
] = None,
1138+
config: Optional[types.AssessDatasetConfigOrDict] = None,
11391139
) -> types.MultimodalDatasetOperation:
11401140
"""
11411141
Assesses a multimodal dataset resource.
11421142
"""
11431143

11441144
parameter_model = types._AssessDatasetParameters(
1145-
config=config,
11461145
name=name,
11471146
gemini_request_read_config=gemini_request_read_config,
11481147
tuning_resource_usage_assessment_config=tuning_resource_usage_assessment_config,
11491148
tuning_validation_assessment_config=tuning_validation_assessment_config,
11501149
batch_prediction_resource_usage_assessment_config=batch_prediction_resource_usage_assessment_config,
11511150
batch_prediction_validation_assessment_config=batch_prediction_validation_assessment_config,
1151+
config=config,
11521152
)
11531153

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

vertexai/_genai/types/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,9 +1647,6 @@
16471647
"ListAgentEngineSessionEventsResponse",
16481648
"ListAgentEngineSessionEventsResponseDict",
16491649
"ListAgentEngineSessionEventsResponseOrDict",
1650-
"AssembleDatasetConfig",
1651-
"AssembleDatasetConfigDict",
1652-
"AssembleDatasetConfigOrDict",
16531650
"GeminiExample",
16541651
"GeminiExampleDict",
16551652
"GeminiExampleOrDict",
@@ -1659,12 +1656,12 @@
16591656
"GeminiRequestReadConfig",
16601657
"GeminiRequestReadConfigDict",
16611658
"GeminiRequestReadConfigOrDict",
1659+
"AssembleDatasetConfig",
1660+
"AssembleDatasetConfigDict",
1661+
"AssembleDatasetConfigOrDict",
16621662
"MultimodalDatasetOperation",
16631663
"MultimodalDatasetOperationDict",
16641664
"MultimodalDatasetOperationOrDict",
1665-
"AssessDatasetConfig",
1666-
"AssessDatasetConfigDict",
1667-
"AssessDatasetConfigOrDict",
16681665
"TuningResourceUsageAssessmentConfig",
16691666
"TuningResourceUsageAssessmentConfigDict",
16701667
"TuningResourceUsageAssessmentConfigOrDict",
@@ -1677,6 +1674,9 @@
16771674
"BatchPredictionValidationAssessmentConfig",
16781675
"BatchPredictionValidationAssessmentConfigDict",
16791676
"BatchPredictionValidationAssessmentConfigOrDict",
1677+
"AssessDatasetConfig",
1678+
"AssessDatasetConfigDict",
1679+
"AssessDatasetConfigOrDict",
16801680
"SchemaTablesDatasetMetadataBigQuerySource",
16811681
"SchemaTablesDatasetMetadataBigQuerySourceDict",
16821682
"SchemaTablesDatasetMetadataBigQuerySourceOrDict",

vertexai/_genai/types/common.py

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9871,33 +9871,6 @@ class ListAgentEngineSessionEventsResponseDict(TypedDict, total=False):
98719871
]
98729872

98739873

9874-
class AssembleDatasetConfig(_common.BaseModel):
9875-
"""Config for assembling a multimodal dataset resource."""
9876-
9877-
http_options: Optional[genai_types.HttpOptions] = Field(
9878-
default=None, description="""Used to override HTTP request options."""
9879-
)
9880-
timeout: Optional[int] = Field(
9881-
default=90,
9882-
description="""The timeout for the assemble dataset request in seconds. If not
9883-
set, the default timeout is 90 seconds.""",
9884-
)
9885-
9886-
9887-
class AssembleDatasetConfigDict(TypedDict, total=False):
9888-
"""Config for assembling a multimodal dataset resource."""
9889-
9890-
http_options: Optional[genai_types.HttpOptionsDict]
9891-
"""Used to override HTTP request options."""
9892-
9893-
timeout: Optional[int]
9894-
"""The timeout for the assemble dataset request in seconds. If not
9895-
set, the default timeout is 90 seconds."""
9896-
9897-
9898-
AssembleDatasetConfigOrDict = Union[AssembleDatasetConfig, AssembleDatasetConfigDict]
9899-
9900-
99019874
class GeminiExample(_common.BaseModel):
99029875
"""Represents a Gemini example."""
99039876

@@ -10017,28 +9990,55 @@ class GeminiRequestReadConfigDict(TypedDict, total=False):
100179990
]
100189991

100199992

9993+
class AssembleDatasetConfig(_common.BaseModel):
9994+
"""Config for assembling a multimodal dataset resource."""
9995+
9996+
http_options: Optional[genai_types.HttpOptions] = Field(
9997+
default=None, description="""Used to override HTTP request options."""
9998+
)
9999+
timeout: Optional[int] = Field(
10000+
default=90,
10001+
description="""The timeout for the assemble dataset request in seconds. If not
10002+
set, the default timeout is 90 seconds.""",
10003+
)
10004+
10005+
10006+
class AssembleDatasetConfigDict(TypedDict, total=False):
10007+
"""Config for assembling a multimodal dataset resource."""
10008+
10009+
http_options: Optional[genai_types.HttpOptionsDict]
10010+
"""Used to override HTTP request options."""
10011+
10012+
timeout: Optional[int]
10013+
"""The timeout for the assemble dataset request in seconds. If not
10014+
set, the default timeout is 90 seconds."""
10015+
10016+
10017+
AssembleDatasetConfigOrDict = Union[AssembleDatasetConfig, AssembleDatasetConfigDict]
10018+
10019+
1002010020
class _AssembleDatasetParameters(_common.BaseModel):
1002110021
"""Parameters for assembling a multimodal dataset resource."""
1002210022

10023-
config: Optional[AssembleDatasetConfig] = Field(default=None, description="""""")
1002410023
name: Optional[str] = Field(default=None, description="""""")
1002510024
gemini_request_read_config: Optional[GeminiRequestReadConfig] = Field(
1002610025
default=None, description=""""""
1002710026
)
10027+
config: Optional[AssembleDatasetConfig] = Field(default=None, description="""""")
1002810028

1002910029

1003010030
class _AssembleDatasetParametersDict(TypedDict, total=False):
1003110031
"""Parameters for assembling a multimodal dataset resource."""
1003210032

10033-
config: Optional[AssembleDatasetConfigDict]
10034-
""""""
10035-
1003610033
name: Optional[str]
1003710034
""""""
1003810035

1003910036
gemini_request_read_config: Optional[GeminiRequestReadConfigDict]
1004010037
""""""
1004110038

10039+
config: Optional[AssembleDatasetConfigDict]
10040+
""""""
10041+
1004210042

1004310043
_AssembleDatasetParametersOrDict = Union[
1004410044
_AssembleDatasetParameters, _AssembleDatasetParametersDict
@@ -10093,33 +10093,6 @@ class MultimodalDatasetOperationDict(TypedDict, total=False):
1009310093
]
1009410094

1009510095

10096-
class AssessDatasetConfig(_common.BaseModel):
10097-
"""Config for assessing a multimodal dataset resource."""
10098-
10099-
http_options: Optional[genai_types.HttpOptions] = Field(
10100-
default=None, description="""Used to override HTTP request options."""
10101-
)
10102-
timeout: Optional[int] = Field(
10103-
default=90,
10104-
description="""The timeout for the assess dataset request in seconds. If not set,
10105-
the default timeout is 90 seconds.""",
10106-
)
10107-
10108-
10109-
class AssessDatasetConfigDict(TypedDict, total=False):
10110-
"""Config for assessing a multimodal dataset resource."""
10111-
10112-
http_options: Optional[genai_types.HttpOptionsDict]
10113-
"""Used to override HTTP request options."""
10114-
10115-
timeout: Optional[int]
10116-
"""The timeout for the assess dataset request in seconds. If not set,
10117-
the default timeout is 90 seconds."""
10118-
10119-
10120-
AssessDatasetConfigOrDict = Union[AssessDatasetConfig, AssessDatasetConfigDict]
10121-
10122-
1012310096
class TuningResourceUsageAssessmentConfig(_common.BaseModel):
1012410097
"""Config for tuning resource usage assessment."""
1012510098

@@ -10198,10 +10171,36 @@ class BatchPredictionValidationAssessmentConfigDict(TypedDict, total=False):
1019810171
]
1019910172

1020010173

10174+
class AssessDatasetConfig(_common.BaseModel):
10175+
"""Config for assessing a multimodal dataset resource."""
10176+
10177+
http_options: Optional[genai_types.HttpOptions] = Field(
10178+
default=None, description="""Used to override HTTP request options."""
10179+
)
10180+
timeout: Optional[int] = Field(
10181+
default=90,
10182+
description="""The timeout for the assess dataset request in seconds. If not set,
10183+
the default timeout is 90 seconds.""",
10184+
)
10185+
10186+
10187+
class AssessDatasetConfigDict(TypedDict, total=False):
10188+
"""Config for assessing a multimodal dataset resource."""
10189+
10190+
http_options: Optional[genai_types.HttpOptionsDict]
10191+
"""Used to override HTTP request options."""
10192+
10193+
timeout: Optional[int]
10194+
"""The timeout for the assess dataset request in seconds. If not set,
10195+
the default timeout is 90 seconds."""
10196+
10197+
10198+
AssessDatasetConfigOrDict = Union[AssessDatasetConfig, AssessDatasetConfigDict]
10199+
10200+
1020110201
class _AssessDatasetParameters(_common.BaseModel):
1020210202
"""Parameters for assessing a multimodal dataset resource."""
1020310203

10204-
config: Optional[AssessDatasetConfig] = Field(default=None, description="""""")
1020510204
name: Optional[str] = Field(default=None, description="""""")
1020610205
gemini_request_read_config: Optional[GeminiRequestReadConfig] = Field(
1020710206
default=None, description=""""""
@@ -10218,14 +10217,12 @@ class _AssessDatasetParameters(_common.BaseModel):
1021810217
batch_prediction_validation_assessment_config: Optional[
1021910218
BatchPredictionValidationAssessmentConfig
1022010219
] = Field(default=None, description="""""")
10220+
config: Optional[AssessDatasetConfig] = Field(default=None, description="""""")
1022110221

1022210222

1022310223
class _AssessDatasetParametersDict(TypedDict, total=False):
1022410224
"""Parameters for assessing a multimodal dataset resource."""
1022510225

10226-
config: Optional[AssessDatasetConfigDict]
10227-
""""""
10228-
1022910226
name: Optional[str]
1023010227
""""""
1023110228

@@ -10250,6 +10247,9 @@ class _AssessDatasetParametersDict(TypedDict, total=False):
1025010247
]
1025110248
""""""
1025210249

10250+
config: Optional[AssessDatasetConfigDict]
10251+
""""""
10252+
1025310253

1025410254
_AssessDatasetParametersOrDict = Union[
1025510255
_AssessDatasetParameters, _AssessDatasetParametersDict

0 commit comments

Comments
 (0)