Skip to content

Commit f850ff9

Browse files
authored
Merge branch 'main' into migrate-java-shared-config-v2
2 parents 26d4914 + d2bc99d commit f850ff9

1,019 files changed

Lines changed: 451721 additions & 85887 deletions

File tree

Some content is hidden

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

generation_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
googleapis_commitish: f7b17174725f43b5cb11b0b8c6bbad20a3dc5bd1
1+
googleapis_commitish: 7af3f2c7b8927cffb548fd2cf09b04c6371437ee
22
libraries_bom_version: 26.83.0
33
is_monorepo: true
44
libraries:

java-aiplatform/google-cloud-aiplatform/src/main/resources/META-INF/native-image/com.google.cloud.aiplatform.v1beta1/reflect-config.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20789,6 +20789,15 @@
2078920789
"allDeclaredClasses": true,
2079020790
"allPublicClasses": true
2079120791
},
20792+
{
20793+
"name": "com.google.cloud.aiplatform.v1beta1.PublisherModelConfig$ModelProvider",
20794+
"queryAllDeclaredConstructors": true,
20795+
"queryAllPublicConstructors": true,
20796+
"queryAllDeclaredMethods": true,
20797+
"allPublicMethods": true,
20798+
"allDeclaredClasses": true,
20799+
"allPublicClasses": true
20800+
},
2079220801
{
2079320802
"name": "com.google.cloud.aiplatform.v1beta1.PublisherModelEulaAcceptance",
2079420803
"queryAllDeclaredConstructors": true,

java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/EndpointProto.java

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
224224
+ "\024bigquery_destination\030\003 \001(\01324.googl"
225225
+ "e.cloud.aiplatform.v1beta1.BigQueryDestination\0224\n"
226226
+ "\'request_response_logging_schema_version\030\004 \001(\tB\003\340A\003\022\033\n"
227-
+ "\023enable_otel_logging\030\006 \001(\010\"t\n"
227+
+ "\023enable_otel_logging\030\006 \001(\010\"\245\002\n"
228228
+ "\024PublisherModelConfig\022\\\n"
229-
+ "\016logging_config\030\003 \001(\0132D.google.cloud.aiplatf"
230-
+ "orm.v1beta1.PredictRequestResponseLoggingConfig\"N\n"
229+
+ "\016logging_config\030\003 \001(\0132D.google.cloud.aiplat"
230+
+ "form.v1beta1.PredictRequestResponseLoggingConfig\022o\n"
231+
+ "\035data_sharing_enabled_provider\030\004 \001(\0162C.google.cloud.aiplatform.v1beta"
232+
+ "1.PublisherModelConfig.ModelProviderB\003\340A\001\">\n\r"
233+
+ "ModelProvider\022\036\n"
234+
+ "\032MODEL_PROVIDER_UNSPECIFIED\020\000\022\r\n"
235+
+ "\tANTHROPIC\020\001\"N\n"
231236
+ "\026ClientConnectionConfig\0224\n"
232237
+ "\021inference_timeout\030\001 \001(\0132\031.google.protobuf.Duration\"5\n"
233238
+ "\026FasterDeploymentConfig\022\033\n"
@@ -242,15 +247,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
242247
+ "\017max_unavailableB\013\n"
243248
+ "\tmax_surge\"\232\001\n"
244249
+ "\033GenAiAdvancedFeaturesConfig\022Z\n\n"
245-
+ "rag_config\030\001"
246-
+ " \001(\0132F.google.cloud.aiplatform.v1beta1.GenAiAdvancedFeaturesConfig.RagConfig\032\037\n"
250+
+ "rag_config\030\001 \001(\0132F.google.cloud.ai"
251+
+ "platform.v1beta1.GenAiAdvancedFeaturesConfig.RagConfig\032\037\n"
247252
+ "\tRagConfig\022\022\n\n"
248253
+ "enable_rag\030\001 \001(\010\"\243\003\n"
249254
+ "\027SpeculativeDecodingSpec\022q\n"
250-
+ "\027draft_model_speculation\030\002 \001(\0132N.google.cloud.aiplatform.v1b"
251-
+ "eta1.SpeculativeDecodingSpec.DraftModelSpeculationH\000\022f\n"
252-
+ "\021ngram_speculation\030\003 \001(\0132"
253-
+ "I.google.cloud.aiplatform.v1beta1.SpeculativeDecodingSpec.NgramSpeculationH\000\022\037\n"
255+
+ "\027draft_model_speculation\030\002 \001(\0132N.google.cl"
256+
+ "oud.aiplatform.v1beta1.SpeculativeDecodingSpec.DraftModelSpeculationH\000\022f\n"
257+
+ "\021ngram_speculation\030\003 \001(\0132I.google.cloud.aiplatf"
258+
+ "orm.v1beta1.SpeculativeDecodingSpec.NgramSpeculationH\000\022\037\n"
254259
+ "\027speculative_token_count\030\001 \001(\005\032U\n"
255260
+ "\025DraftModelSpeculation\022<\n"
256261
+ "\013draft_model\030\001 \001(\tB\'\340A\002\372A!\n"
@@ -259,10 +264,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
259264
+ "ngram_size\030\001 \001(\005B\r\n"
260265
+ "\013speculationB\344\001\n"
261266
+ "#com.google.cloud.aiplatform.v1beta1B\r"
262-
+ "EndpointProtoP\001ZCcloud.google.com/go/aiplatform/apiv1beta1/aiplatfo"
263-
+ "rmpb;aiplatformpb\252\002\037Google.Cloud.AIPlatf"
264-
+ "orm.V1Beta1\312\002\037Google\\Cloud\\AIPlatform\\V1"
265-
+ "beta1\352\002\"Google::Cloud::AIPlatform::V1beta1b\006proto3"
267+
+ "EndpointProtoP\001ZCcloud.google.com/go/aiplatform/a"
268+
+ "piv1beta1/aiplatformpb;aiplatformpb\252\002\037Go"
269+
+ "ogle.Cloud.AIPlatform.V1Beta1\312\002\037Google\\C"
270+
+ "loud\\AIPlatform\\V1beta1\352\002\"Google::Cloud::AIPlatform::V1beta1b\006proto3"
266271
};
267272
descriptor =
268273
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -395,7 +400,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
395400
new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
396401
internal_static_google_cloud_aiplatform_v1beta1_PublisherModelConfig_descriptor,
397402
new java.lang.String[] {
398-
"LoggingConfig",
403+
"LoggingConfig", "DataSharingEnabledProvider",
399404
});
400405
internal_static_google_cloud_aiplatform_v1beta1_ClientConnectionConfig_descriptor =
401406
getDescriptor().getMessageType(5);

0 commit comments

Comments
 (0)