Skip to content

chore: GenAI SDK client(multimodal) - Remove UpdateMultimodalDatasetConfig and replace with VertexBaseConfig. #6586

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
+10 −47
Open

chore: GenAI SDK client(multimodal) - Remove UpdateMultimodalDatasetConfig and replace with VertexBaseConfig. #6586

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
16 changes: 8 additions & 8 deletions vertexai/_genai/datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ def _update_multimodal_dataset(
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
description: Optional[str] = None,
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
config: Optional[types.VertexBaseConfigOrDict] = None,
) -> types.MultimodalDataset:
"""
Updates a multimodal dataset resource.
Expand Down Expand Up @@ -1084,7 +1084,7 @@ def update_multimodal_dataset(
self,
*,
multimodal_dataset: types.MultimodalDatasetOrDict,
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
config: Optional[types.VertexBaseConfigOrDict] = None,
) -> types.MultimodalDataset:
"""Updates a multimodal dataset.

Expand All @@ -1108,9 +1108,9 @@ def update_multimodal_dataset(
_datasets_utils.validate_multimodal_dataset_bigquery_uri(multimodal_dataset)

if isinstance(config, dict):
config = types.UpdateMultimodalDatasetConfig(**config)
config = types.VertexBaseConfig(**config)
elif not config:
config = types.UpdateMultimodalDatasetConfig()
config = types.VertexBaseConfig()

return self._update_multimodal_dataset(
config=config,
Expand Down Expand Up @@ -2004,7 +2004,7 @@ async def _update_multimodal_dataset(
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
description: Optional[str] = None,
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
config: Optional[types.VertexBaseConfigOrDict] = None,
) -> types.MultimodalDataset:
"""
Updates a multimodal dataset resource.
Expand Down Expand Up @@ -2310,7 +2310,7 @@ async def update_multimodal_dataset(
self,
*,
multimodal_dataset: types.MultimodalDatasetOrDict,
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
config: Optional[types.VertexBaseConfigOrDict] = None,
) -> types.MultimodalDataset:
"""Updates a multimodal dataset.

Expand All @@ -2330,9 +2330,9 @@ async def update_multimodal_dataset(
_datasets_utils.validate_multimodal_dataset_bigquery_uri(multimodal_dataset)

if isinstance(config, dict):
config = types.UpdateMultimodalDatasetConfig(**config)
config = types.VertexBaseConfig(**config)
elif not config:
config = types.UpdateMultimodalDatasetConfig()
config = types.VertexBaseConfig()

return await self._update_multimodal_dataset(
config=config,
Expand Down
6 changes: 0 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 @@ -1225,9 +1225,6 @@
from .common import UpdateAgentEngineSessionConfig
from .common import UpdateAgentEngineSessionConfigDict
from .common import UpdateAgentEngineSessionConfigOrDict
from .common import UpdateMultimodalDatasetConfig
from .common import UpdateMultimodalDatasetConfigDict
from .common import UpdateMultimodalDatasetConfigOrDict
from .common import UpdatePromptConfig
from .common import UpdatePromptConfigDict
from .common import UpdatePromptConfigOrDict
Expand Down Expand Up @@ -2106,9 +2103,6 @@
"ListMultimodalDatasetsResponse",
"ListMultimodalDatasetsResponseDict",
"ListMultimodalDatasetsResponseOrDict",
"UpdateMultimodalDatasetConfig",
"UpdateMultimodalDatasetConfigDict",
"UpdateMultimodalDatasetConfigOrDict",
"SchemaPredictParamsGroundingConfigSourceEntry",
"SchemaPredictParamsGroundingConfigSourceEntryDict",
"SchemaPredictParamsGroundingConfigSourceEntryOrDict",
Expand Down
35 changes: 2 additions & 33 deletions vertexai/_genai/types/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13798,35 +13798,6 @@ class ListMultimodalDatasetsResponseDict(TypedDict, total=False):
]


class UpdateMultimodalDatasetConfig(_common.BaseModel):
"""Config for updating 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 update dataset request in seconds. If not set,
the default timeout is 90 seconds.""",
)


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

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

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


UpdateMultimodalDatasetConfigOrDict = Union[
UpdateMultimodalDatasetConfig, UpdateMultimodalDatasetConfigDict
]


class _UpdateMultimodalDatasetParameters(_common.BaseModel):
"""Parameters for updating a multimodal dataset resource."""

Expand All @@ -13839,9 +13810,7 @@ class _UpdateMultimodalDatasetParameters(_common.BaseModel):
encryption_spec: Optional[genai_types.EncryptionSpec] = Field(
default=None, description=""""""
)
config: Optional[UpdateMultimodalDatasetConfig] = Field(
default=None, description=""""""
)
config: Optional[VertexBaseConfig] = Field(default=None, description="""""")


class _UpdateMultimodalDatasetParametersDict(TypedDict, total=False):
Expand All @@ -13862,7 +13831,7 @@ class _UpdateMultimodalDatasetParametersDict(TypedDict, total=False):
encryption_spec: Optional[genai_types.EncryptionSpecDict]
""""""

config: Optional[UpdateMultimodalDatasetConfigDict]
config: Optional[VertexBaseConfigDict]
""""""


Expand Down
Loading