From 9b5a4538fcf3fb39023a43e1d5224bebd9fe015a Mon Sep 17 00:00:00 2001 From: Ben Kazemi Date: Wed, 19 Nov 2025 13:36:00 -0800 Subject: [PATCH] chore: [vertexai] Introduce modules PiperOrigin-RevId: 834424318 --- vertexai/_genai/datasets.py | 28 +++---- vertexai/_genai/types/__init__.py | 12 +-- vertexai/_genai/types/common.py | 124 +++++++++++++++--------------- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/vertexai/_genai/datasets.py b/vertexai/_genai/datasets.py index b1be300c15..68a5367bdf 100644 --- a/vertexai/_genai/datasets.py +++ b/vertexai/_genai/datasets.py @@ -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"])) @@ -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 @@ -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"])) @@ -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 @@ -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]] @@ -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 @@ -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]] @@ -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]] @@ -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 @@ -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]] diff --git a/vertexai/_genai/types/__init__.py b/vertexai/_genai/types/__init__.py index e460024dc5..6ff808a52e 100644 --- a/vertexai/_genai/types/__init__.py +++ b/vertexai/_genai/types/__init__.py @@ -1647,9 +1647,6 @@ "ListAgentEngineSessionEventsResponse", "ListAgentEngineSessionEventsResponseDict", "ListAgentEngineSessionEventsResponseOrDict", - "AssembleDatasetConfig", - "AssembleDatasetConfigDict", - "AssembleDatasetConfigOrDict", "GeminiExample", "GeminiExampleDict", "GeminiExampleOrDict", @@ -1659,12 +1656,12 @@ "GeminiRequestReadConfig", "GeminiRequestReadConfigDict", "GeminiRequestReadConfigOrDict", + "AssembleDatasetConfig", + "AssembleDatasetConfigDict", + "AssembleDatasetConfigOrDict", "MultimodalDatasetOperation", "MultimodalDatasetOperationDict", "MultimodalDatasetOperationOrDict", - "AssessDatasetConfig", - "AssessDatasetConfigDict", - "AssessDatasetConfigOrDict", "TuningResourceUsageAssessmentConfig", "TuningResourceUsageAssessmentConfigDict", "TuningResourceUsageAssessmentConfigOrDict", @@ -1677,6 +1674,9 @@ "BatchPredictionValidationAssessmentConfig", "BatchPredictionValidationAssessmentConfigDict", "BatchPredictionValidationAssessmentConfigOrDict", + "AssessDatasetConfig", + "AssessDatasetConfigDict", + "AssessDatasetConfigOrDict", "SchemaTablesDatasetMetadataBigQuerySource", "SchemaTablesDatasetMetadataBigQuerySourceDict", "SchemaTablesDatasetMetadataBigQuerySourceOrDict", diff --git a/vertexai/_genai/types/common.py b/vertexai/_genai/types/common.py index 03b97aa203..b1d0dd88be 100644 --- a/vertexai/_genai/types/common.py +++ b/vertexai/_genai/types/common.py @@ -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.""" @@ -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 @@ -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.""" @@ -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="""""" @@ -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] """""" @@ -10250,6 +10247,9 @@ class _AssessDatasetParametersDict(TypedDict, total=False): ] """""" + config: Optional[AssessDatasetConfigDict] + """""" + _AssessDatasetParametersOrDict = Union[ _AssessDatasetParameters, _AssessDatasetParametersDict