Skip to content

Commit 8340a49

Browse files
copybara-service[bot]Zhenyi Qi
copybara-service[bot]
and
Zhenyi Qi
authored
feat: [vertexai] Update gapic to include system instruction (#10733)
PiperOrigin-RevId: 627373267 Co-authored-by: Zhenyi Qi <[email protected]>
1 parent 9c09fe7 commit 8340a49

File tree

255 files changed

+5087
-1107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+5087
-1107
lines changed

‎java-vertexai/google-cloud-vertexai/src/main/java/com/google/cloud/vertexai/api/PredictionServiceClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,6 +1408,7 @@ public final GenerateContentResponse generateContent(String model, List<Content>
14081408
* GenerateContentRequest.newBuilder()
14091409
* .setModel("model104069929")
14101410
* .addAllContents(new ArrayList<Content>())
1411+
* .setSystemInstruction(Content.newBuilder().build())
14111412
* .addAllTools(new ArrayList<Tool>())
14121413
* .addAllSafetySettings(new ArrayList<SafetySetting>())
14131414
* .setGenerationConfig(GenerationConfig.newBuilder().build())
@@ -1440,6 +1441,7 @@ public final GenerateContentResponse generateContent(GenerateContentRequest requ
14401441
* GenerateContentRequest.newBuilder()
14411442
* .setModel("model104069929")
14421443
* .addAllContents(new ArrayList<Content>())
1444+
* .setSystemInstruction(Content.newBuilder().build())
14431445
* .addAllTools(new ArrayList<Tool>())
14441446
* .addAllSafetySettings(new ArrayList<SafetySetting>())
14451447
* .setGenerationConfig(GenerationConfig.newBuilder().build())
@@ -1473,6 +1475,7 @@ public final GenerateContentResponse generateContent(GenerateContentRequest requ
14731475
* GenerateContentRequest.newBuilder()
14741476
* .setModel("model104069929")
14751477
* .addAllContents(new ArrayList<Content>())
1478+
* .setSystemInstruction(Content.newBuilder().build())
14761479
* .addAllTools(new ArrayList<Tool>())
14771480
* .addAllSafetySettings(new ArrayList<SafetySetting>())
14781481
* .setGenerationConfig(GenerationConfig.newBuilder().build())

‎java-vertexai/google-cloud-vertexai/src/main/java/com/google/cloud/vertexai/api/stub/HttpJsonEndpointServiceStub.java‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,11 @@ protected HttpJsonEndpointServiceStub(
828828
.setPost(
829829
"/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}:cancel")
830830
.build())
831+
.addAdditionalBindings(
832+
HttpRule.newBuilder()
833+
.setPost(
834+
"/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}:cancel")
835+
.build())
831836
.addAdditionalBindings(
832837
HttpRule.newBuilder()
833838
.setPost(
@@ -1002,6 +1007,11 @@ protected HttpJsonEndpointServiceStub(
10021007
.setPost(
10031008
"/v1/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}:cancel")
10041009
.build())
1010+
.addAdditionalBindings(
1011+
HttpRule.newBuilder()
1012+
.setPost(
1013+
"/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}:cancel")
1014+
.build())
10051015
.addAdditionalBindings(
10061016
HttpRule.newBuilder()
10071017
.setPost(
@@ -1192,6 +1202,11 @@ protected HttpJsonEndpointServiceStub(
11921202
.setDelete(
11931203
"/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}")
11941204
.build())
1205+
.addAdditionalBindings(
1206+
HttpRule.newBuilder()
1207+
.setDelete(
1208+
"/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}")
1209+
.build())
11951210
.addAdditionalBindings(
11961211
HttpRule.newBuilder()
11971212
.setDelete(
@@ -1396,6 +1411,11 @@ protected HttpJsonEndpointServiceStub(
13961411
.setDelete(
13971412
"/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}")
13981413
.build())
1414+
.addAdditionalBindings(
1415+
HttpRule.newBuilder()
1416+
.setDelete(
1417+
"/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}")
1418+
.build())
13991419
.addAdditionalBindings(
14001420
HttpRule.newBuilder()
14011421
.setDelete(
@@ -1598,6 +1618,11 @@ protected HttpJsonEndpointServiceStub(
15981618
.setGet(
15991619
"/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}")
16001620
.build())
1621+
.addAdditionalBindings(
1622+
HttpRule.newBuilder()
1623+
.setGet(
1624+
"/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}")
1625+
.build())
16011626
.addAdditionalBindings(
16021627
HttpRule.newBuilder()
16031628
.setGet("/ui/{name=projects/*/locations/*/studies/*/operations/*}")
@@ -1802,6 +1827,11 @@ protected HttpJsonEndpointServiceStub(
18021827
.setGet(
18031828
"/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}")
18041829
.build())
1830+
.addAdditionalBindings(
1831+
HttpRule.newBuilder()
1832+
.setGet(
1833+
"/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}")
1834+
.build())
18051835
.addAdditionalBindings(
18061836
HttpRule.newBuilder()
18071837
.setGet(
@@ -2009,6 +2039,11 @@ protected HttpJsonEndpointServiceStub(
20092039
.setGet(
20102040
"/ui/{name=projects/*/locations/*/trainingPipelines/*}/operations")
20112041
.build())
2042+
.addAdditionalBindings(
2043+
HttpRule.newBuilder()
2044+
.setGet(
2045+
"/ui/{name=projects/*/locations/*/persistentResources/*}/operations")
2046+
.build())
20122047
.addAdditionalBindings(
20132048
HttpRule.newBuilder()
20142049
.setGet(
@@ -2131,7 +2166,7 @@ protected HttpJsonEndpointServiceStub(
21312166
.build())
21322167
.addAdditionalBindings(
21332168
HttpRule.newBuilder()
2134-
.setGet("/ui/{name=projects/*/locations/*/tuningJobs/*}/operations")
2169+
.setGet("/v1/{name=projects/*/locations/*/tuningJobs/*}/operations")
21352170
.build())
21362171
.addAdditionalBindings(
21372172
HttpRule.newBuilder()
@@ -2195,6 +2230,11 @@ protected HttpJsonEndpointServiceStub(
21952230
.setGet(
21962231
"/v1/{name=projects/*/locations/*/trainingPipelines/*}/operations")
21972232
.build())
2233+
.addAdditionalBindings(
2234+
HttpRule.newBuilder()
2235+
.setGet(
2236+
"/v1/{name=projects/*/locations/*/persistentResources/*}/operations")
2237+
.build())
21982238
.addAdditionalBindings(
21992239
HttpRule.newBuilder()
22002240
.setGet(
@@ -2409,6 +2449,11 @@ protected HttpJsonEndpointServiceStub(
24092449
.setPost(
24102450
"/ui/{name=projects/*/locations/*/trainingPipelines/*/operations/*}:wait")
24112451
.build())
2452+
.addAdditionalBindings(
2453+
HttpRule.newBuilder()
2454+
.setPost(
2455+
"/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}:wait")
2456+
.build())
24122457
.addAdditionalBindings(
24132458
HttpRule.newBuilder()
24142459
.setPost(
@@ -2598,6 +2643,11 @@ protected HttpJsonEndpointServiceStub(
25982643
.setPost(
25992644
"/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}:wait")
26002645
.build())
2646+
.addAdditionalBindings(
2647+
HttpRule.newBuilder()
2648+
.setPost(
2649+
"/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}:wait")
2650+
.build())
26012651
.addAdditionalBindings(
26022652
HttpRule.newBuilder()
26032653
.setPost(

‎java-vertexai/google-cloud-vertexai/src/main/resources/META-INF/native-image/com.google.cloud.vertexai.api/reflect-config.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2348,6 +2348,15 @@
23482348
"allDeclaredClasses": true,
23492349
"allPublicClasses": true
23502350
},
2351+
{
2352+
"name": "com.google.cloud.vertexai.api.SafetySetting$HarmBlockMethod",
2353+
"queryAllDeclaredConstructors": true,
2354+
"queryAllPublicConstructors": true,
2355+
"queryAllDeclaredMethods": true,
2356+
"allPublicMethods": true,
2357+
"allDeclaredClasses": true,
2358+
"allPublicClasses": true
2359+
},
23512360
{
23522361
"name": "com.google.cloud.vertexai.api.SafetySetting$HarmBlockThreshold",
23532362
"queryAllDeclaredConstructors": true,
@@ -2411,6 +2420,24 @@
24112420
"allDeclaredClasses": true,
24122421
"allPublicClasses": true
24132422
},
2423+
{
2424+
"name": "com.google.cloud.vertexai.api.ShieldedVmConfig",
2425+
"queryAllDeclaredConstructors": true,
2426+
"queryAllPublicConstructors": true,
2427+
"queryAllDeclaredMethods": true,
2428+
"allPublicMethods": true,
2429+
"allDeclaredClasses": true,
2430+
"allPublicClasses": true
2431+
},
2432+
{
2433+
"name": "com.google.cloud.vertexai.api.ShieldedVmConfig$Builder",
2434+
"queryAllDeclaredConstructors": true,
2435+
"queryAllPublicConstructors": true,
2436+
"queryAllDeclaredMethods": true,
2437+
"allPublicMethods": true,
2438+
"allDeclaredClasses": true,
2439+
"allPublicClasses": true
2440+
},
24142441
{
24152442
"name": "com.google.cloud.vertexai.api.SmoothGradConfig",
24162443
"queryAllDeclaredConstructors": true,

‎java-vertexai/google-cloud-vertexai/src/test/java/com/google/cloud/vertexai/api/PredictionServiceClientTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -928,6 +928,7 @@ public void streamGenerateContentTest() throws Exception {
928928
GenerateContentRequest.newBuilder()
929929
.setModel("model104069929")
930930
.addAllContents(new ArrayList<Content>())
931+
.setSystemInstruction(Content.newBuilder().build())
931932
.addAllTools(new ArrayList<Tool>())
932933
.addAllSafetySettings(new ArrayList<SafetySetting>())
933934
.setGenerationConfig(GenerationConfig.newBuilder().build())
@@ -952,6 +953,7 @@ public void streamGenerateContentExceptionTest() throws Exception {
952953
GenerateContentRequest.newBuilder()
953954
.setModel("model104069929")
954955
.addAllContents(new ArrayList<Content>())
956+
.setSystemInstruction(Content.newBuilder().build())
955957
.addAllTools(new ArrayList<Tool>())
956958
.addAllSafetySettings(new ArrayList<SafetySetting>())
957959
.setGenerationConfig(GenerationConfig.newBuilder().build())

‎java-vertexai/proto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AcceleratorType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/cloud/vertexai/v1/accelerator_type.proto
1818

19-
// Protobuf Java Version: 3.25.2
19+
// Protobuf Java Version: 3.25.3
2020
package com.google.cloud.vertexai.api;
2121

2222
/**

‎java-vertexai/proto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AcceleratorTypeProto.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/cloud/vertexai/v1/accelerator_type.proto
1818

19-
// Protobuf Java Version: 3.25.2
19+
// Protobuf Java Version: 3.25.3
2020
package com.google.cloud.vertexai.api;
2121

2222
public final class AcceleratorTypeProto {

‎java-vertexai/proto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/Attribution.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/cloud/vertexai/v1/explanation.proto
1818

19-
// Protobuf Java Version: 3.25.2
19+
// Protobuf Java Version: 3.25.3
2020
package com.google.cloud.vertexai.api;
2121

2222
/**

‎java-vertexai/proto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AttributionOrBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/cloud/vertexai/v1/explanation.proto
1818

19-
// Protobuf Java Version: 3.25.2
19+
// Protobuf Java Version: 3.25.3
2020
package com.google.cloud.vertexai.api;
2121

2222
public interface AttributionOrBuilder

‎java-vertexai/proto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutomaticResources.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/cloud/vertexai/v1/machine_resources.proto
1818

19-
// Protobuf Java Version: 3.25.2
19+
// Protobuf Java Version: 3.25.3
2020
package com.google.cloud.vertexai.api;
2121

2222
/**

‎java-vertexai/proto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutomaticResourcesOrBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/cloud/vertexai/v1/machine_resources.proto
1818

19-
// Protobuf Java Version: 3.25.2
19+
// Protobuf Java Version: 3.25.3
2020
package com.google.cloud.vertexai.api;
2121

2222
public interface AutomaticResourcesOrBuilder

0 commit comments

Comments
 (0)