Skip to content

Commit ea813a1

Browse files
BenjaminKazemicopybara-github
authored andcommitted
docs: [vertexai] Introduce modules
PiperOrigin-RevId: 834424318
1 parent c24f6a1 commit ea813a1

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
@@ -1628,9 +1628,6 @@
16281628
"ListAgentEngineSessionEventsResponse",
16291629
"ListAgentEngineSessionEventsResponseDict",
16301630
"ListAgentEngineSessionEventsResponseOrDict",
1631-
"AssembleDatasetConfig",
1632-
"AssembleDatasetConfigDict",
1633-
"AssembleDatasetConfigOrDict",
16341631
"GeminiExample",
16351632
"GeminiExampleDict",
16361633
"GeminiExampleOrDict",
@@ -1640,12 +1637,12 @@
16401637
"GeminiRequestReadConfig",
16411638
"GeminiRequestReadConfigDict",
16421639
"GeminiRequestReadConfigOrDict",
1640+
"AssembleDatasetConfig",
1641+
"AssembleDatasetConfigDict",
1642+
"AssembleDatasetConfigOrDict",
16431643
"MultimodalDatasetOperation",
16441644
"MultimodalDatasetOperationDict",
16451645
"MultimodalDatasetOperationOrDict",
1646-
"AssessDatasetConfig",
1647-
"AssessDatasetConfigDict",
1648-
"AssessDatasetConfigOrDict",
16491646
"TuningResourceUsageAssessmentConfig",
16501647
"TuningResourceUsageAssessmentConfigDict",
16511648
"TuningResourceUsageAssessmentConfigOrDict",
@@ -1658,6 +1655,9 @@
16581655
"BatchPredictionValidationAssessmentConfig",
16591656
"BatchPredictionValidationAssessmentConfigDict",
16601657
"BatchPredictionValidationAssessmentConfigOrDict",
1658+
"AssessDatasetConfig",
1659+
"AssessDatasetConfigDict",
1660+
"AssessDatasetConfigOrDict",
16611661
"SchemaTablesDatasetMetadataBigQuerySource",
16621662
"SchemaTablesDatasetMetadataBigQuerySourceDict",
16631663
"SchemaTablesDatasetMetadataBigQuerySourceOrDict",

vertexai/_genai/types/common.py

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

97379737

9738-
class AssembleDatasetConfig(_common.BaseModel):
9739-
"""Config for assembling a multimodal dataset resource."""
9740-
9741-
http_options: Optional[genai_types.HttpOptions] = Field(
9742-
default=None, description="""Used to override HTTP request options."""
9743-
)
9744-
timeout: Optional[int] = Field(
9745-
default=90,
9746-
description="""The timeout for the assemble dataset request in seconds. If not
9747-
set, the default timeout is 90 seconds.""",
9748-
)
9749-
9750-
9751-
class AssembleDatasetConfigDict(TypedDict, total=False):
9752-
"""Config for assembling a multimodal dataset resource."""
9753-
9754-
http_options: Optional[genai_types.HttpOptionsDict]
9755-
"""Used to override HTTP request options."""
9756-
9757-
timeout: Optional[int]
9758-
"""The timeout for the assemble dataset request in seconds. If not
9759-
set, the default timeout is 90 seconds."""
9760-
9761-
9762-
AssembleDatasetConfigOrDict = Union[AssembleDatasetConfig, AssembleDatasetConfigDict]
9763-
9764-
97659738
class GeminiExample(_common.BaseModel):
97669739
"""Represents a Gemini example."""
97679740

@@ -9881,28 +9854,55 @@ class GeminiRequestReadConfigDict(TypedDict, total=False):
98819854
]
98829855

98839856

9857+
class AssembleDatasetConfig(_common.BaseModel):
9858+
"""Config for assembling a multimodal dataset resource."""
9859+
9860+
http_options: Optional[genai_types.HttpOptions] = Field(
9861+
default=None, description="""Used to override HTTP request options."""
9862+
)
9863+
timeout: Optional[int] = Field(
9864+
default=90,
9865+
description="""The timeout for the assemble dataset request in seconds. If not
9866+
set, the default timeout is 90 seconds.""",
9867+
)
9868+
9869+
9870+
class AssembleDatasetConfigDict(TypedDict, total=False):
9871+
"""Config for assembling a multimodal dataset resource."""
9872+
9873+
http_options: Optional[genai_types.HttpOptionsDict]
9874+
"""Used to override HTTP request options."""
9875+
9876+
timeout: Optional[int]
9877+
"""The timeout for the assemble dataset request in seconds. If not
9878+
set, the default timeout is 90 seconds."""
9879+
9880+
9881+
AssembleDatasetConfigOrDict = Union[AssembleDatasetConfig, AssembleDatasetConfigDict]
9882+
9883+
98849884
class _AssembleDatasetParameters(_common.BaseModel):
98859885
"""Parameters for assembling a multimodal dataset resource."""
98869886

9887-
config: Optional[AssembleDatasetConfig] = Field(default=None, description="""""")
98889887
name: Optional[str] = Field(default=None, description="""""")
98899888
gemini_request_read_config: Optional[GeminiRequestReadConfig] = Field(
98909889
default=None, description=""""""
98919890
)
9891+
config: Optional[AssembleDatasetConfig] = Field(default=None, description="""""")
98929892

98939893

98949894
class _AssembleDatasetParametersDict(TypedDict, total=False):
98959895
"""Parameters for assembling a multimodal dataset resource."""
98969896

9897-
config: Optional[AssembleDatasetConfigDict]
9898-
""""""
9899-
99009897
name: Optional[str]
99019898
""""""
99029899

99039900
gemini_request_read_config: Optional[GeminiRequestReadConfigDict]
99049901
""""""
99059902

9903+
config: Optional[AssembleDatasetConfigDict]
9904+
""""""
9905+
99069906

99079907
_AssembleDatasetParametersOrDict = Union[
99089908
_AssembleDatasetParameters, _AssembleDatasetParametersDict
@@ -9957,33 +9957,6 @@ class MultimodalDatasetOperationDict(TypedDict, total=False):
99579957
]
99589958

99599959

9960-
class AssessDatasetConfig(_common.BaseModel):
9961-
"""Config for assessing a multimodal dataset resource."""
9962-
9963-
http_options: Optional[genai_types.HttpOptions] = Field(
9964-
default=None, description="""Used to override HTTP request options."""
9965-
)
9966-
timeout: Optional[int] = Field(
9967-
default=90,
9968-
description="""The timeout for the assess dataset request in seconds. If not set,
9969-
the default timeout is 90 seconds.""",
9970-
)
9971-
9972-
9973-
class AssessDatasetConfigDict(TypedDict, total=False):
9974-
"""Config for assessing a multimodal dataset resource."""
9975-
9976-
http_options: Optional[genai_types.HttpOptionsDict]
9977-
"""Used to override HTTP request options."""
9978-
9979-
timeout: Optional[int]
9980-
"""The timeout for the assess dataset request in seconds. If not set,
9981-
the default timeout is 90 seconds."""
9982-
9983-
9984-
AssessDatasetConfigOrDict = Union[AssessDatasetConfig, AssessDatasetConfigDict]
9985-
9986-
99879960
class TuningResourceUsageAssessmentConfig(_common.BaseModel):
99889961
"""Config for tuning resource usage assessment."""
99899962

@@ -10062,10 +10035,36 @@ class BatchPredictionValidationAssessmentConfigDict(TypedDict, total=False):
1006210035
]
1006310036

1006410037

10038+
class AssessDatasetConfig(_common.BaseModel):
10039+
"""Config for assessing a multimodal dataset resource."""
10040+
10041+
http_options: Optional[genai_types.HttpOptions] = Field(
10042+
default=None, description="""Used to override HTTP request options."""
10043+
)
10044+
timeout: Optional[int] = Field(
10045+
default=90,
10046+
description="""The timeout for the assess dataset request in seconds. If not set,
10047+
the default timeout is 90 seconds.""",
10048+
)
10049+
10050+
10051+
class AssessDatasetConfigDict(TypedDict, total=False):
10052+
"""Config for assessing a multimodal dataset resource."""
10053+
10054+
http_options: Optional[genai_types.HttpOptionsDict]
10055+
"""Used to override HTTP request options."""
10056+
10057+
timeout: Optional[int]
10058+
"""The timeout for the assess dataset request in seconds. If not set,
10059+
the default timeout is 90 seconds."""
10060+
10061+
10062+
AssessDatasetConfigOrDict = Union[AssessDatasetConfig, AssessDatasetConfigDict]
10063+
10064+
1006510065
class _AssessDatasetParameters(_common.BaseModel):
1006610066
"""Parameters for assessing a multimodal dataset resource."""
1006710067

10068-
config: Optional[AssessDatasetConfig] = Field(default=None, description="""""")
1006910068
name: Optional[str] = Field(default=None, description="""""")
1007010069
gemini_request_read_config: Optional[GeminiRequestReadConfig] = Field(
1007110070
default=None, description=""""""
@@ -10082,14 +10081,12 @@ class _AssessDatasetParameters(_common.BaseModel):
1008210081
batch_prediction_validation_assessment_config: Optional[
1008310082
BatchPredictionValidationAssessmentConfig
1008410083
] = Field(default=None, description="""""")
10084+
config: Optional[AssessDatasetConfig] = Field(default=None, description="""""")
1008510085

1008610086

1008710087
class _AssessDatasetParametersDict(TypedDict, total=False):
1008810088
"""Parameters for assessing a multimodal dataset resource."""
1008910089

10090-
config: Optional[AssessDatasetConfigDict]
10091-
""""""
10092-
1009310090
name: Optional[str]
1009410091
""""""
1009510092

@@ -10114,6 +10111,9 @@ class _AssessDatasetParametersDict(TypedDict, total=False):
1011410111
]
1011510112
""""""
1011610113

10114+
config: Optional[AssessDatasetConfigDict]
10115+
""""""
10116+
1011710117

1011810118
_AssessDatasetParametersOrDict = Union[
1011910119
_AssessDatasetParameters, _AssessDatasetParametersDict

0 commit comments

Comments
 (0)