Skip to content
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

Jump to bottom

feat: [vertexai] Update gapic to include system instruction #10733

Merged
merged 1 commit into from
Apr 25, 2024
Merged

feat: [vertexai] Update gapic to include system instruction #10733

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
3 changes: 3 additions & 0 deletions ...e-cloud-vertexai/src/main/java/com/google/cloud/vertexai/api/PredictionServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,6 +1408,7 @@ public final GenerateContentResponse generateContent(String model, List<Content>
* GenerateContentRequest.newBuilder()
* .setModel("model104069929")
* .addAllContents(new ArrayList<Content>())
* .setSystemInstruction(Content.newBuilder().build())
* .addAllTools(new ArrayList<Tool>())
* .addAllSafetySettings(new ArrayList<SafetySetting>())
* .setGenerationConfig(GenerationConfig.newBuilder().build())
Expand Down Expand Up @@ -1440,6 +1441,7 @@ public final GenerateContentResponse generateContent(GenerateContentRequest requ
* GenerateContentRequest.newBuilder()
* .setModel("model104069929")
* .addAllContents(new ArrayList<Content>())
* .setSystemInstruction(Content.newBuilder().build())
* .addAllTools(new ArrayList<Tool>())
* .addAllSafetySettings(new ArrayList<SafetySetting>())
* .setGenerationConfig(GenerationConfig.newBuilder().build())
Expand Down Expand Up @@ -1473,6 +1475,7 @@ public final GenerateContentResponse generateContent(GenerateContentRequest requ
* GenerateContentRequest.newBuilder()
* .setModel("model104069929")
* .addAllContents(new ArrayList<Content>())
* .setSystemInstruction(Content.newBuilder().build())
* .addAllTools(new ArrayList<Tool>())
* .addAllSafetySettings(new ArrayList<SafetySetting>())
* .setGenerationConfig(GenerationConfig.newBuilder().build())
Expand Down
52 changes: 51 additions & 1 deletion ...ertexai/src/main/java/com/google/cloud/vertexai/api/stub/HttpJsonEndpointServiceStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,11 @@ protected HttpJsonEndpointServiceStub(
.setPost(
"/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}:cancel")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setPost(
"/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}:cancel")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setPost(
Expand Down Expand Up @@ -1002,6 +1007,11 @@ protected HttpJsonEndpointServiceStub(
.setPost(
"/v1/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}:cancel")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setPost(
"/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}:cancel")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setPost(
Expand Down Expand Up @@ -1192,6 +1202,11 @@ protected HttpJsonEndpointServiceStub(
.setDelete(
"/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setDelete(
"/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setDelete(
Expand Down Expand Up @@ -1396,6 +1411,11 @@ protected HttpJsonEndpointServiceStub(
.setDelete(
"/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setDelete(
"/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setDelete(
Expand Down Expand Up @@ -1598,6 +1618,11 @@ protected HttpJsonEndpointServiceStub(
.setGet(
"/ui/{name=projects/*/locations/*/models/*/evaluations/*/operations/*}")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet(
"/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet("/ui/{name=projects/*/locations/*/studies/*/operations/*}")
Expand Down Expand Up @@ -1802,6 +1827,11 @@ protected HttpJsonEndpointServiceStub(
.setGet(
"/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet(
"/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet(
Expand Down Expand Up @@ -2009,6 +2039,11 @@ protected HttpJsonEndpointServiceStub(
.setGet(
"/ui/{name=projects/*/locations/*/trainingPipelines/*}/operations")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet(
"/ui/{name=projects/*/locations/*/persistentResources/*}/operations")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet(
Expand Down Expand Up @@ -2131,7 +2166,7 @@ protected HttpJsonEndpointServiceStub(
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet("/ui/{name=projects/*/locations/*/tuningJobs/*}/operations")
.setGet("/v1/{name=projects/*/locations/*/tuningJobs/*}/operations")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
Expand Down Expand Up @@ -2195,6 +2230,11 @@ protected HttpJsonEndpointServiceStub(
.setGet(
"/v1/{name=projects/*/locations/*/trainingPipelines/*}/operations")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet(
"/v1/{name=projects/*/locations/*/persistentResources/*}/operations")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setGet(
Expand Down Expand Up @@ -2409,6 +2449,11 @@ protected HttpJsonEndpointServiceStub(
.setPost(
"/ui/{name=projects/*/locations/*/trainingPipelines/*/operations/*}:wait")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setPost(
"/ui/{name=projects/*/locations/*/persistentResources/*/operations/*}:wait")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setPost(
Expand Down Expand Up @@ -2598,6 +2643,11 @@ protected HttpJsonEndpointServiceStub(
.setPost(
"/v1/{name=projects/*/locations/*/trainingPipelines/*/operations/*}:wait")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setPost(
"/v1/{name=projects/*/locations/*/persistentResources/*/operations/*}:wait")
.build())
.addAdditionalBindings(
HttpRule.newBuilder()
.setPost(
Expand Down
27 changes: 27 additions & 0 deletions ...rc/main/resources/META-INF/native-image/com.google.cloud.vertexai.api/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2348,6 +2348,15 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.cloud.vertexai.api.SafetySetting$HarmBlockMethod",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.cloud.vertexai.api.SafetySetting$HarmBlockThreshold",
"queryAllDeclaredConstructors": true,
Expand Down Expand Up @@ -2411,6 +2420,24 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.cloud.vertexai.api.ShieldedVmConfig",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.cloud.vertexai.api.ShieldedVmConfig$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.cloud.vertexai.api.SmoothGradConfig",
"queryAllDeclaredConstructors": true,
Expand Down
2 changes: 2 additions & 0 deletions ...oud-vertexai/src/test/java/com/google/cloud/vertexai/api/PredictionServiceClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,7 @@ public void streamGenerateContentTest() throws Exception {
GenerateContentRequest.newBuilder()
.setModel("model104069929")
.addAllContents(new ArrayList<Content>())
.setSystemInstruction(Content.newBuilder().build())
.addAllTools(new ArrayList<Tool>())
.addAllSafetySettings(new ArrayList<SafetySetting>())
.setGenerationConfig(GenerationConfig.newBuilder().build())
Expand All @@ -952,6 +953,7 @@ public void streamGenerateContentExceptionTest() throws Exception {
GenerateContentRequest.newBuilder()
.setModel("model104069929")
.addAllContents(new ArrayList<Content>())
.setSystemInstruction(Content.newBuilder().build())
.addAllTools(new ArrayList<Tool>())
.addAllSafetySettings(new ArrayList<SafetySetting>())
.setGenerationConfig(GenerationConfig.newBuilder().build())
Expand Down
2 changes: 1 addition & 1 deletion ...google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AcceleratorType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/accelerator_type.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...e-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AcceleratorTypeProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/accelerator_type.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

public final class AcceleratorTypeProto {
Expand Down
2 changes: 1 addition & 1 deletion ...oto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/Attribution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/explanation.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...e-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AttributionOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/explanation.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

public interface AttributionOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...gle-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutomaticResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/machine_resources.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutomaticResourcesOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/machine_resources.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

public interface AutomaticResourcesOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutoscalingMetricSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/machine_resources.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...rtexai-v1/src/main/java/com/google/cloud/vertexai/api/AutoscalingMetricSpecOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/machine_resources.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

public interface AutoscalingMetricSpecOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...roto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AvroSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/io.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...le-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AvroSourceOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/io.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

public interface AvroSourceOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...loud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BatchDedicatedResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/machine_resources.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...exai-v1/src/main/java/com/google/cloud/vertexai/api/BatchDedicatedResourcesOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/machine_resources.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

public interface BatchDedicatedResourcesOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...le-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQueryDestination.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/io.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQueryDestinationOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/io.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

public interface BigQueryDestinationOrBuilder
Expand Down
2 changes: 1 addition & 1 deletion ...-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQuerySource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/io.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...loud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQuerySourceOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/cloud/vertexai/v1/io.proto

// Protobuf Java Version: 3.25.2
// Protobuf Java Version: 3.25.3
package com.google.cloud.vertexai.api;

public interface BigQuerySourceOrBuilder
Expand Down
Loading
Loading