Skip to content

chore: [vertexai] Introduce modules #6171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+82 −82
Open

chore: [vertexai] Introduce modules #6171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions vertexai/_genai/datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ def _AssembleDatasetParameters_to_vertex(
parent_object: Optional[dict[str, Any]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

if getv(from_object, ["name"]) is not None:
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))

Expand All @@ -53,6 +50,9 @@ def _AssembleDatasetParameters_to_vertex(
getv(from_object, ["gemini_request_read_config"]),
)

if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

return to_object


Expand All @@ -61,9 +61,6 @@ def _AssessDatasetParameters_to_vertex(
parent_object: Optional[dict[str, Any]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

if getv(from_object, ["name"]) is not None:
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))

Expand Down Expand Up @@ -105,6 +102,9 @@ def _AssessDatasetParameters_to_vertex(
getv(from_object, ["batch_prediction_validation_assessment_config"]),
)

if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

return to_object


Expand Down Expand Up @@ -250,20 +250,20 @@ class Datasets(_api_module.BaseModule):
def _assemble_multimodal_dataset(
self,
*,
config: Optional[types.AssembleDatasetConfigOrDict] = None,
name: str,
gemini_request_read_config: Optional[
types.GeminiRequestReadConfigOrDict
] = None,
config: Optional[types.AssembleDatasetConfigOrDict] = None,
) -> types.MultimodalDatasetOperation:
"""
Assembles a multimodal dataset resource.
"""

parameter_model = types._AssembleDatasetParameters(
config=config,
name=name,
gemini_request_read_config=gemini_request_read_config,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -307,7 +307,6 @@ def _assemble_multimodal_dataset(
def _assess_multimodal_dataset(
self,
*,
config: Optional[types.AssessDatasetConfigOrDict] = None,
name: str,
gemini_request_read_config: Optional[
types.GeminiRequestReadConfigOrDict
Expand All @@ -324,19 +323,20 @@ def _assess_multimodal_dataset(
batch_prediction_validation_assessment_config: Optional[
types.BatchPredictionValidationAssessmentConfigOrDict
] = None,
config: Optional[types.AssessDatasetConfigOrDict] = None,
) -> types.MultimodalDatasetOperation:
"""
Assesses a multimodal dataset resource.
"""

parameter_model = types._AssessDatasetParameters(
config=config,
name=name,
gemini_request_read_config=gemini_request_read_config,
tuning_resource_usage_assessment_config=tuning_resource_usage_assessment_config,
tuning_validation_assessment_config=tuning_validation_assessment_config,
batch_prediction_resource_usage_assessment_config=batch_prediction_resource_usage_assessment_config,
batch_prediction_validation_assessment_config=batch_prediction_validation_assessment_config,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -1060,20 +1060,20 @@ class AsyncDatasets(_api_module.BaseModule):
async def _assemble_multimodal_dataset(
self,
*,
config: Optional[types.AssembleDatasetConfigOrDict] = None,
name: str,
gemini_request_read_config: Optional[
types.GeminiRequestReadConfigOrDict
] = None,
config: Optional[types.AssembleDatasetConfigOrDict] = None,
) -> types.MultimodalDatasetOperation:
"""
Assembles a multimodal dataset resource.
"""

parameter_model = types._AssembleDatasetParameters(
config=config,
name=name,
gemini_request_read_config=gemini_request_read_config,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -1119,7 +1119,6 @@ async def _assemble_multimodal_dataset(
async def _assess_multimodal_dataset(
self,
*,
config: Optional[types.AssessDatasetConfigOrDict] = None,
name: str,
gemini_request_read_config: Optional[
types.GeminiRequestReadConfigOrDict
Expand All @@ -1136,19 +1135,20 @@ async def _assess_multimodal_dataset(
batch_prediction_validation_assessment_config: Optional[
types.BatchPredictionValidationAssessmentConfigOrDict
] = None,
config: Optional[types.AssessDatasetConfigOrDict] = None,
) -> types.MultimodalDatasetOperation:
"""
Assesses a multimodal dataset resource.
"""

parameter_model = types._AssessDatasetParameters(
config=config,
name=name,
gemini_request_read_config=gemini_request_read_config,
tuning_resource_usage_assessment_config=tuning_resource_usage_assessment_config,
tuning_validation_assessment_config=tuning_validation_assessment_config,
batch_prediction_resource_usage_assessment_config=batch_prediction_resource_usage_assessment_config,
batch_prediction_validation_assessment_config=batch_prediction_validation_assessment_config,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down
12 changes: 6 additions & 6 deletions vertexai/_genai/types/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,9 +1647,6 @@
"ListAgentEngineSessionEventsResponse",
"ListAgentEngineSessionEventsResponseDict",
"ListAgentEngineSessionEventsResponseOrDict",
"AssembleDatasetConfig",
"AssembleDatasetConfigDict",
"AssembleDatasetConfigOrDict",
"GeminiExample",
"GeminiExampleDict",
"GeminiExampleOrDict",
Expand All @@ -1659,12 +1656,12 @@
"GeminiRequestReadConfig",
"GeminiRequestReadConfigDict",
"GeminiRequestReadConfigOrDict",
"AssembleDatasetConfig",
"AssembleDatasetConfigDict",
"AssembleDatasetConfigOrDict",
"MultimodalDatasetOperation",
"MultimodalDatasetOperationDict",
"MultimodalDatasetOperationOrDict",
"AssessDatasetConfig",
"AssessDatasetConfigDict",
"AssessDatasetConfigOrDict",
"TuningResourceUsageAssessmentConfig",
"TuningResourceUsageAssessmentConfigDict",
"TuningResourceUsageAssessmentConfigOrDict",
Expand All @@ -1677,6 +1674,9 @@
"BatchPredictionValidationAssessmentConfig",
"BatchPredictionValidationAssessmentConfigDict",
"BatchPredictionValidationAssessmentConfigOrDict",
"AssessDatasetConfig",
"AssessDatasetConfigDict",
"AssessDatasetConfigOrDict",
"SchemaTablesDatasetMetadataBigQuerySource",
"SchemaTablesDatasetMetadataBigQuerySourceDict",
"SchemaTablesDatasetMetadataBigQuerySourceOrDict",
Expand Down
124 changes: 62 additions & 62 deletions vertexai/_genai/types/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9871,33 +9871,6 @@ class ListAgentEngineSessionEventsResponseDict(TypedDict, total=False):
]


class AssembleDatasetConfig(_common.BaseModel):
"""Config for assembling a multimodal dataset resource."""

http_options: Optional[genai_types.HttpOptions] = Field(
default=None, description="""Used to override HTTP request options."""
)
timeout: Optional[int] = Field(
default=90,
description="""The timeout for the assemble dataset request in seconds. If not
set, the default timeout is 90 seconds.""",
)


class AssembleDatasetConfigDict(TypedDict, total=False):
"""Config for assembling a multimodal dataset resource."""

http_options: Optional[genai_types.HttpOptionsDict]
"""Used to override HTTP request options."""

timeout: Optional[int]
"""The timeout for the assemble dataset request in seconds. If not
set, the default timeout is 90 seconds."""


AssembleDatasetConfigOrDict = Union[AssembleDatasetConfig, AssembleDatasetConfigDict]


class GeminiExample(_common.BaseModel):
"""Represents a Gemini example."""

Expand Down Expand Up @@ -10017,28 +9990,55 @@ class GeminiRequestReadConfigDict(TypedDict, total=False):
]


class AssembleDatasetConfig(_common.BaseModel):
"""Config for assembling a multimodal dataset resource."""

http_options: Optional[genai_types.HttpOptions] = Field(
default=None, description="""Used to override HTTP request options."""
)
timeout: Optional[int] = Field(
default=90,
description="""The timeout for the assemble dataset request in seconds. If not
set, the default timeout is 90 seconds.""",
)


class AssembleDatasetConfigDict(TypedDict, total=False):
"""Config for assembling a multimodal dataset resource."""

http_options: Optional[genai_types.HttpOptionsDict]
"""Used to override HTTP request options."""

timeout: Optional[int]
"""The timeout for the assemble dataset request in seconds. If not
set, the default timeout is 90 seconds."""


AssembleDatasetConfigOrDict = Union[AssembleDatasetConfig, AssembleDatasetConfigDict]


class _AssembleDatasetParameters(_common.BaseModel):
"""Parameters for assembling a multimodal dataset resource."""

config: Optional[AssembleDatasetConfig] = Field(default=None, description="""""")
name: Optional[str] = Field(default=None, description="""""")
gemini_request_read_config: Optional[GeminiRequestReadConfig] = Field(
default=None, description=""""""
)
config: Optional[AssembleDatasetConfig] = Field(default=None, description="""""")


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

config: Optional[AssembleDatasetConfigDict]
""""""

name: Optional[str]
""""""

gemini_request_read_config: Optional[GeminiRequestReadConfigDict]
""""""

config: Optional[AssembleDatasetConfigDict]
""""""


_AssembleDatasetParametersOrDict = Union[
_AssembleDatasetParameters, _AssembleDatasetParametersDict
Expand Down Expand Up @@ -10093,33 +10093,6 @@ class MultimodalDatasetOperationDict(TypedDict, total=False):
]


class AssessDatasetConfig(_common.BaseModel):
"""Config for assessing a multimodal dataset resource."""

http_options: Optional[genai_types.HttpOptions] = Field(
default=None, description="""Used to override HTTP request options."""
)
timeout: Optional[int] = Field(
default=90,
description="""The timeout for the assess dataset request in seconds. If not set,
the default timeout is 90 seconds.""",
)


class AssessDatasetConfigDict(TypedDict, total=False):
"""Config for assessing a multimodal dataset resource."""

http_options: Optional[genai_types.HttpOptionsDict]
"""Used to override HTTP request options."""

timeout: Optional[int]
"""The timeout for the assess dataset request in seconds. If not set,
the default timeout is 90 seconds."""


AssessDatasetConfigOrDict = Union[AssessDatasetConfig, AssessDatasetConfigDict]


class TuningResourceUsageAssessmentConfig(_common.BaseModel):
"""Config for tuning resource usage assessment."""

Expand Down Expand Up @@ -10198,10 +10171,36 @@ class BatchPredictionValidationAssessmentConfigDict(TypedDict, total=False):
]


class AssessDatasetConfig(_common.BaseModel):
"""Config for assessing a multimodal dataset resource."""

http_options: Optional[genai_types.HttpOptions] = Field(
default=None, description="""Used to override HTTP request options."""
)
timeout: Optional[int] = Field(
default=90,
description="""The timeout for the assess dataset request in seconds. If not set,
the default timeout is 90 seconds.""",
)


class AssessDatasetConfigDict(TypedDict, total=False):
"""Config for assessing a multimodal dataset resource."""

http_options: Optional[genai_types.HttpOptionsDict]
"""Used to override HTTP request options."""

timeout: Optional[int]
"""The timeout for the assess dataset request in seconds. If not set,
the default timeout is 90 seconds."""


AssessDatasetConfigOrDict = Union[AssessDatasetConfig, AssessDatasetConfigDict]


class _AssessDatasetParameters(_common.BaseModel):
"""Parameters for assessing a multimodal dataset resource."""

config: Optional[AssessDatasetConfig] = Field(default=None, description="""""")
name: Optional[str] = Field(default=None, description="""""")
gemini_request_read_config: Optional[GeminiRequestReadConfig] = Field(
default=None, description=""""""
Expand All @@ -10218,14 +10217,12 @@ class _AssessDatasetParameters(_common.BaseModel):
batch_prediction_validation_assessment_config: Optional[
BatchPredictionValidationAssessmentConfig
] = Field(default=None, description="""""")
config: Optional[AssessDatasetConfig] = Field(default=None, description="""""")


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

config: Optional[AssessDatasetConfigDict]
""""""

name: Optional[str]
""""""

Expand All @@ -10250,6 +10247,9 @@ class _AssessDatasetParametersDict(TypedDict, total=False):
]
""""""

config: Optional[AssessDatasetConfigDict]
""""""


_AssessDatasetParametersOrDict = Union[
_AssessDatasetParameters, _AssessDatasetParametersDict
Expand Down
Loading