feat: [vertexai] Update gapic to include system instruction

PiperOrigin-RevId: 627373267
googleapis · Apr 25, 2024 · b549bae · b549bae
1 parent 9c09fe7
commit b549bae
Show file tree

Hide file tree

Showing 255 changed files with 5,087 additions and 1,107 deletions.
diff --git a/...e-cloud-vertexai/src/main/java/com/google/cloud/vertexai/api/PredictionServiceClient.java b/...e-cloud-vertexai/src/main/java/com/google/cloud/vertexai/api/PredictionServiceClient.java
@@ -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())
@@ -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())
@@ -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())

diff --git a/...ertexai/src/main/java/com/google/cloud/vertexai/api/stub/HttpJsonEndpointServiceStub.java b/...ertexai/src/main/java/com/google/cloud/vertexai/api/stub/HttpJsonEndpointServiceStub.java
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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/*}")
@@ -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(
@@ -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(
@@ -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()
@@ -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(
@@ -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(
@@ -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(

diff --git a/...rc/main/resources/META-INF/native-image/com.google.cloud.vertexai.api/reflect-config.json b/...rc/main/resources/META-INF/native-image/com.google.cloud.vertexai.api/reflect-config.json
@@ -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,
@@ -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,

diff --git a/...oud-vertexai/src/test/java/com/google/cloud/vertexai/api/PredictionServiceClientTest.java b/...oud-vertexai/src/test/java/com/google/cloud/vertexai/api/PredictionServiceClientTest.java
@@ -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())
@@ -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())

diff --git a/...google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AcceleratorType.java b/...google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AcceleratorType.java
@@ -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;
 
 /**

diff --git a/...e-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AcceleratorTypeProto.java b/...e-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AcceleratorTypeProto.java
@@ -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 {

diff --git a/...oto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/Attribution.java b/...oto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/Attribution.java
@@ -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;
 
 /**

diff --git a/...e-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AttributionOrBuilder.java b/...e-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AttributionOrBuilder.java
@@ -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

diff --git a/...gle-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutomaticResources.java b/...gle-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutomaticResources.java
@@ -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;
 
 /**

diff --git a/...-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutomaticResourcesOrBuilder.java b/...-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutomaticResourcesOrBuilder.java
@@ -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

diff --git a/...-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutoscalingMetricSpec.java b/...-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AutoscalingMetricSpec.java
@@ -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;
 
 /**

diff --git a/...rtexai-v1/src/main/java/com/google/cloud/vertexai/api/AutoscalingMetricSpecOrBuilder.java b/...rtexai-v1/src/main/java/com/google/cloud/vertexai/api/AutoscalingMetricSpecOrBuilder.java
@@ -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

diff --git a/...roto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AvroSource.java b/...roto-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AvroSource.java
@@ -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;
 
 /**

diff --git a/...le-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AvroSourceOrBuilder.java b/...le-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/AvroSourceOrBuilder.java
@@ -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

diff --git a/...loud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BatchDedicatedResources.java b/...loud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BatchDedicatedResources.java
@@ -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;
 
 /**

diff --git a/...exai-v1/src/main/java/com/google/cloud/vertexai/api/BatchDedicatedResourcesOrBuilder.java b/...exai-v1/src/main/java/com/google/cloud/vertexai/api/BatchDedicatedResourcesOrBuilder.java
@@ -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

diff --git a/...le-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQueryDestination.java b/...le-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQueryDestination.java
@@ -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;
 
 /**

diff --git a/...vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQueryDestinationOrBuilder.java b/...vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQueryDestinationOrBuilder.java
@@ -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

diff --git a/...-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQuerySource.java b/...-google-cloud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQuerySource.java
@@ -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;
 
 /**

diff --git a/...loud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQuerySourceOrBuilder.java b/...loud-vertexai-v1/src/main/java/com/google/cloud/vertexai/api/BigQuerySourceOrBuilder.java
@@ -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