Skip to content

Commit 7b6010b

Browse files
gcf-owl-bot[bot]copybara-github
authored andcommitted
Copybara import of the project:
-- 94bb896 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: Add service_account to Reasoning Engine public protos PiperOrigin-RevId: 785977703 Source-Link: googleapis/googleapis@a0a150a Source-Link: googleapis/googleapis-gen@1a2482c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMWEyNDgyYzMxOTBjMTUzMGMxOTkxNjNhNmY4MjI0NjU5NzJhOWNkOSJ9 feat: Add service_account to Reasoning Engine public protos PiperOrigin-RevId: 785969680 Source-Link: googleapis/googleapis@2e4cb44 Source-Link: googleapis/googleapis-gen@cdae6f6 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2RhZTZmNjRmMzY0ZjRkY2NhMjk5NWIzNmE2NjdiMWNiMTg4MzVkNSJ9 fix!: remove gemini_template_config and request_column_name fields from DatasetService.AssessData and DatasetService.AssembleData PiperOrigin-RevId: 784583197 Source-Link: googleapis/googleapis@fc59d68 Source-Link: googleapis/googleapis-gen@d334e99 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDMzNGU5OWFkZDg1YmM3YmQ5NDg1NDc2MTcwNWQzY2RiMzRiMzEyYSJ9 -- 6bcc7cd by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md COPYBARA_INTEGRATE_REVIEW=#5572 from googleapis:owl-bot-copy b9e825a PiperOrigin-RevId: 786831098
1 parent 6c72801 commit 7b6010b

14 files changed

+74
-119
lines changed

google/cloud/aiplatform_v1/types/reasoning_engine.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,20 @@
3636
class ReasoningEngineSpec(proto.Message):
3737
r"""ReasoningEngine configurations
3838
39+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
40+
3941
Attributes:
42+
service_account (str):
43+
Optional. The service account that the
44+
Reasoning Engine artifact runs as. It should
45+
have "roles/storage.objectViewer" for reading
46+
the user project's Cloud Storage and
47+
"roles/aiplatform.user" for using Vertex
48+
extensions. If not specified, the Vertex AI
49+
Reasoning Engine Service Agent in the project
50+
will be used.
51+
52+
This field is a member of `oneof`_ ``_service_account``.
4053
package_spec (google.cloud.aiplatform_v1.types.ReasoningEngineSpec.PackageSpec):
4154
Optional. User provided package spec of the ReasoningEngine.
4255
Ignored when users directly specify a deployment image
@@ -121,6 +134,11 @@ class DeploymentSpec(proto.Message):
121134
message=env_var.SecretEnvVar,
122135
)
123136

137+
service_account: str = proto.Field(
138+
proto.STRING,
139+
number=1,
140+
optional=True,
141+
)
124142
package_spec: PackageSpec = proto.Field(
125143
proto.MESSAGE,
126144
number=2,

google/cloud/aiplatform_v1beta1/services/dataset_service/async_client.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2796,12 +2796,8 @@ async def sample_assess_data():
27962796
tuning_validation_assessment_config.model_name = "model_name_value"
27972797
tuning_validation_assessment_config.dataset_usage = "SFT_VALIDATION"
27982798
2799-
gemini_template_config = aiplatform_v1beta1.GeminiTemplateConfig()
2800-
gemini_template_config.gemini_example.contents.parts.text = "text_value"
2801-
28022799
request = aiplatform_v1beta1.AssessDataRequest(
28032800
tuning_validation_assessment_config=tuning_validation_assessment_config,
2804-
gemini_template_config=gemini_template_config,
28052801
name="name_value",
28062802
)
28072803
@@ -2903,11 +2899,7 @@ async def sample_assemble_data():
29032899
client = aiplatform_v1beta1.DatasetServiceAsyncClient()
29042900
29052901
# Initialize request argument(s)
2906-
gemini_template_config = aiplatform_v1beta1.GeminiTemplateConfig()
2907-
gemini_template_config.gemini_example.contents.parts.text = "text_value"
2908-
29092902
request = aiplatform_v1beta1.AssembleDataRequest(
2910-
gemini_template_config=gemini_template_config,
29112903
name="name_value",
29122904
)
29132905

google/cloud/aiplatform_v1beta1/services/dataset_service/client.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,12 +3367,8 @@ def sample_assess_data():
33673367
tuning_validation_assessment_config.model_name = "model_name_value"
33683368
tuning_validation_assessment_config.dataset_usage = "SFT_VALIDATION"
33693369
3370-
gemini_template_config = aiplatform_v1beta1.GeminiTemplateConfig()
3371-
gemini_template_config.gemini_example.contents.parts.text = "text_value"
3372-
33733370
request = aiplatform_v1beta1.AssessDataRequest(
33743371
tuning_validation_assessment_config=tuning_validation_assessment_config,
3375-
gemini_template_config=gemini_template_config,
33763372
name="name_value",
33773373
)
33783374
@@ -3472,11 +3468,7 @@ def sample_assemble_data():
34723468
client = aiplatform_v1beta1.DatasetServiceClient()
34733469
34743470
# Initialize request argument(s)
3475-
gemini_template_config = aiplatform_v1beta1.GeminiTemplateConfig()
3476-
gemini_template_config.gemini_example.contents.parts.text = "text_value"
3477-
34783471
request = aiplatform_v1beta1.AssembleDataRequest(
3479-
gemini_template_config=gemini_template_config,
34803472
name="name_value",
34813473
)
34823474

google/cloud/aiplatform_v1beta1/types/dataset_service.py

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,18 +1164,6 @@ class AssessDataRequest(proto.Message):
11641164
prediction resource usage assessment.
11651165
11661166
This field is a member of `oneof`_ ``assessment_config``.
1167-
gemini_template_config (google.cloud.aiplatform_v1beta1.types.GeminiTemplateConfig):
1168-
Optional. Config for assembling templates
1169-
with a Gemini API structure to assess assembled
1170-
data.
1171-
1172-
This field is a member of `oneof`_ ``read_config``.
1173-
request_column_name (str):
1174-
Optional. The column name in the underlying
1175-
table that contains already fully assembled
1176-
requests.
1177-
1178-
This field is a member of `oneof`_ ``read_config``.
11791167
name (str):
11801168
Required. The name of the Dataset resource. Used only for
11811169
MULTIMODAL datasets. Format:
@@ -1291,17 +1279,6 @@ class BatchPredictionResourceUsageAssessmentConfig(proto.Message):
12911279
oneof="assessment_config",
12921280
message=BatchPredictionResourceUsageAssessmentConfig,
12931281
)
1294-
gemini_template_config: "GeminiTemplateConfig" = proto.Field(
1295-
proto.MESSAGE,
1296-
number=4,
1297-
oneof="read_config",
1298-
message="GeminiTemplateConfig",
1299-
)
1300-
request_column_name: str = proto.Field(
1301-
proto.STRING,
1302-
number=5,
1303-
oneof="read_config",
1304-
)
13051282
name: str = proto.Field(
13061283
proto.STRING,
13071284
number=1,
@@ -1629,26 +1606,7 @@ class AssembleDataRequest(proto.Message):
16291606
[DatasetService.AssembleData][google.cloud.aiplatform.v1beta1.DatasetService.AssembleData].
16301607
Used only for MULTIMODAL datasets.
16311608
1632-
This message has `oneof`_ fields (mutually exclusive fields).
1633-
For each oneof, at most one member field can be set at the same time.
1634-
Setting any member of the oneof automatically clears all other
1635-
members.
1636-
1637-
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
1638-
16391609
Attributes:
1640-
gemini_template_config (google.cloud.aiplatform_v1beta1.types.GeminiTemplateConfig):
1641-
Optional. Config for assembling templates
1642-
with a Gemini API structure.
1643-
1644-
This field is a member of `oneof`_ ``read_config``.
1645-
request_column_name (str):
1646-
Optional. The column name in the underlying
1647-
table that contains already fully assembled
1648-
requests. If this field is set, the original
1649-
request will be copied to the output table.
1650-
1651-
This field is a member of `oneof`_ ``read_config``.
16521610
name (str):
16531611
Required. The name of the Dataset resource (used only for
16541612
MULTIMODAL datasets). Format:
@@ -1657,17 +1615,6 @@ class AssembleDataRequest(proto.Message):
16571615
Optional. The read config for the dataset.
16581616
"""
16591617

1660-
gemini_template_config: "GeminiTemplateConfig" = proto.Field(
1661-
proto.MESSAGE,
1662-
number=2,
1663-
oneof="read_config",
1664-
message="GeminiTemplateConfig",
1665-
)
1666-
request_column_name: str = proto.Field(
1667-
proto.STRING,
1668-
number=5,
1669-
oneof="read_config",
1670-
)
16711618
name: str = proto.Field(
16721619
proto.STRING,
16731620
number=1,

google/cloud/aiplatform_v1beta1/types/reasoning_engine.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,20 @@
3737
class ReasoningEngineSpec(proto.Message):
3838
r"""ReasoningEngine configurations
3939
40+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
41+
4042
Attributes:
43+
service_account (str):
44+
Optional. The service account that the
45+
Reasoning Engine artifact runs as. It should
46+
have "roles/storage.objectViewer" for reading
47+
the user project's Cloud Storage and
48+
"roles/aiplatform.user" for using Vertex
49+
extensions. If not specified, the Vertex AI
50+
Reasoning Engine Service Agent in the project
51+
will be used.
52+
53+
This field is a member of `oneof`_ ``_service_account``.
4154
package_spec (google.cloud.aiplatform_v1beta1.types.ReasoningEngineSpec.PackageSpec):
4255
Optional. User provided package spec of the ReasoningEngine.
4356
Ignored when users directly specify a deployment image
@@ -123,6 +136,11 @@ class DeploymentSpec(proto.Message):
123136
message=env_var.SecretEnvVar,
124137
)
125138

139+
service_account: str = proto.Field(
140+
proto.STRING,
141+
number=1,
142+
optional=True,
143+
)
126144
package_spec: PackageSpec = proto.Field(
127145
proto.MESSAGE,
128146
number=2,

samples/generated_samples/aiplatform_v1beta1_generated_dataset_service_assemble_data_async.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ async def sample_assemble_data():
3939
client = aiplatform_v1beta1.DatasetServiceAsyncClient()
4040

4141
# Initialize request argument(s)
42-
gemini_template_config = aiplatform_v1beta1.GeminiTemplateConfig()
43-
gemini_template_config.gemini_example.contents.parts.text = "text_value"
44-
4542
request = aiplatform_v1beta1.AssembleDataRequest(
46-
gemini_template_config=gemini_template_config,
4743
name="name_value",
4844
)
4945

samples/generated_samples/aiplatform_v1beta1_generated_dataset_service_assemble_data_sync.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ def sample_assemble_data():
3939
client = aiplatform_v1beta1.DatasetServiceClient()
4040

4141
# Initialize request argument(s)
42-
gemini_template_config = aiplatform_v1beta1.GeminiTemplateConfig()
43-
gemini_template_config.gemini_example.contents.parts.text = "text_value"
44-
4542
request = aiplatform_v1beta1.AssembleDataRequest(
46-
gemini_template_config=gemini_template_config,
4743
name="name_value",
4844
)
4945

samples/generated_samples/aiplatform_v1beta1_generated_dataset_service_assess_data_async.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,8 @@ async def sample_assess_data():
4343
tuning_validation_assessment_config.model_name = "model_name_value"
4444
tuning_validation_assessment_config.dataset_usage = "SFT_VALIDATION"
4545

46-
gemini_template_config = aiplatform_v1beta1.GeminiTemplateConfig()
47-
gemini_template_config.gemini_example.contents.parts.text = "text_value"
48-
4946
request = aiplatform_v1beta1.AssessDataRequest(
5047
tuning_validation_assessment_config=tuning_validation_assessment_config,
51-
gemini_template_config=gemini_template_config,
5248
name="name_value",
5349
)
5450

samples/generated_samples/aiplatform_v1beta1_generated_dataset_service_assess_data_sync.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,8 @@ def sample_assess_data():
4343
tuning_validation_assessment_config.model_name = "model_name_value"
4444
tuning_validation_assessment_config.dataset_usage = "SFT_VALIDATION"
4545

46-
gemini_template_config = aiplatform_v1beta1.GeminiTemplateConfig()
47-
gemini_template_config.gemini_example.contents.parts.text = "text_value"
48-
4946
request = aiplatform_v1beta1.AssessDataRequest(
5047
tuning_validation_assessment_config=tuning_validation_assessment_config,
51-
gemini_template_config=gemini_template_config,
5248
name="name_value",
5349
)
5450

samples/generated_samples/snippet_metadata_google.cloud.aiplatform.v1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language": "PYTHON",
1010
"name": "google-cloud-aiplatform",
11-
"version": "1.105.0"
11+
"version": "0.1.0"
1212
},
1313
"snippets": [
1414
{

0 commit comments

Comments
 (0)