feat: Allow v1beta1 api calls for some dataset_service, llm_utility_service, and prediction_service apis without project and location

Google APIs · copybara-github · commit dba0d7907714 · 2024-08-06T16:41:34.000-07:00
PiperOrigin-RevId: 660146060
diff --git a/google/cloud/aiplatform/v1beta1/dataset_service.proto b/google/cloud/aiplatform/v1beta1/dataset_service.proto
@@ -51,6 +51,7 @@ service DatasetService {
     option (google.api.http) = {
       post: "/v1beta1/{parent=projects/*/locations/*}/datasets"
       body: "dataset"
+      additional_bindings { post: "/v1beta1/datasets" body: "dataset" }
     };
     option (google.api.method_signature) = "parent,dataset";
     option (google.longrunning.operation_info) = {
@@ -63,6 +64,7 @@ service DatasetService {
   rpc GetDataset(GetDatasetRequest) returns (Dataset) {
     option (google.api.http) = {
       get: "/v1beta1/{name=projects/*/locations/*/datasets/*}"
+      additional_bindings { get: "/v1beta1/{name=datasets/*}" }
     };
     option (google.api.method_signature) = "name";
   }
@@ -72,6 +74,10 @@ service DatasetService {
     option (google.api.http) = {
       patch: "/v1beta1/{dataset.name=projects/*/locations/*/datasets/*}"
       body: "dataset"
+      additional_bindings {
+        patch: "/v1beta1/{dataset.name=datasets/*}"
+        body: "dataset"
+      }
     };
     option (google.api.method_signature) = "dataset,update_mask";
   }
@@ -80,6 +86,7 @@ service DatasetService {
   rpc ListDatasets(ListDatasetsRequest) returns (ListDatasetsResponse) {
     option (google.api.http) = {
       get: "/v1beta1/{parent=projects/*/locations/*}/datasets"
+      additional_bindings { get: "/v1beta1/datasets" }
     };
     option (google.api.method_signature) = "parent";
   }
@@ -89,6 +96,7 @@ service DatasetService {
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
       delete: "/v1beta1/{name=projects/*/locations/*/datasets/*}"
+      additional_bindings { delete: "/v1beta1/{name=datasets/*}" }
     };
     option (google.api.method_signature) = "name";
     option (google.longrunning.operation_info) = {
@@ -129,6 +137,10 @@ service DatasetService {
     option (google.api.http) = {
       post: "/v1beta1/{parent=projects/*/locations/*/datasets/*}/datasetVersions"
       body: "dataset_version"
+      additional_bindings {
+        post: "/v1beta1/{parent=datasets/*}/datasetVersions"
+        body: "dataset_version"
+      }
     };
     option (google.api.method_signature) = "parent,dataset_version";
     option (google.longrunning.operation_info) = {
@@ -143,6 +155,10 @@ service DatasetService {
     option (google.api.http) = {
       patch: "/v1beta1/{dataset_version.name=projects/*/locations/*/datasets/*/datasetVersions/*}"
       body: "dataset_version"
+      additional_bindings {
+        patch: "/v1beta1/{dataset_version.name=datasets/*/datasetVersions/*}"
+        body: "dataset_version"
+      }
     };
     option (google.api.method_signature) = "dataset_version,update_mask";
   }
@@ -152,6 +168,9 @@ service DatasetService {
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
       delete: "/v1beta1/{name=projects/*/locations/*/datasets/*/datasetVersions/*}"
+      additional_bindings {
+        delete: "/v1beta1/{name=datasets/*/datasetVersions/*}"
+      }
     };
     option (google.api.method_signature) = "name";
     option (google.longrunning.operation_info) = {
@@ -164,6 +183,9 @@ service DatasetService {
   rpc GetDatasetVersion(GetDatasetVersionRequest) returns (DatasetVersion) {
     option (google.api.http) = {
       get: "/v1beta1/{name=projects/*/locations/*/datasets/*/datasetVersions/*}"
+      additional_bindings {
+        get: "/v1beta1/{name=datasets/*/datasetVersions/*}"
+      }
     };
     option (google.api.method_signature) = "name";
   }
@@ -173,6 +195,9 @@ service DatasetService {
       returns (ListDatasetVersionsResponse) {
     option (google.api.http) = {
       get: "/v1beta1/{parent=projects/*/locations/*/datasets/*}/datasetVersions"
+      additional_bindings {
+        get: "/v1beta1/{parent=datasets/*}/datasetVersions"
+      }
     };
     option (google.api.method_signature) = "parent";
   }
@@ -182,6 +207,9 @@ service DatasetService {
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
       get: "/v1beta1/{name=projects/*/locations/*/datasets/*/datasetVersions/*}:restore"
+      additional_bindings {
+        get: "/v1beta1/{name=datasets/*/datasetVersions/*}:restore"
+      }
     };
     option (google.api.method_signature) = "name";
     option (google.longrunning.operation_info) = {
diff --git a/google/cloud/aiplatform/v1beta1/llm_utility_service.proto b/google/cloud/aiplatform/v1beta1/llm_utility_service.proto
@@ -46,6 +46,14 @@ service LlmUtilityService {
         post: "/v1beta1/{endpoint=projects/*/locations/*/publishers/*/models/*}:computeTokens"
         body: "*"
       }
+      additional_bindings {
+        post: "/v1beta1/{endpoint=endpoints/*}:computeTokens"
+        body: "*"
+      }
+      additional_bindings {
+        post: "/v1beta1/{endpoint=publishers/*/models/*}:computeTokens"
+        body: "*"
+      }
     };
     option (google.api.method_signature) = "endpoint,instances";
   }
diff --git a/google/cloud/aiplatform/v1beta1/prediction_service.proto b/google/cloud/aiplatform/v1beta1/prediction_service.proto
@@ -173,6 +173,14 @@ service PredictionService {
         post: "/v1beta1/{endpoint=projects/*/locations/*/publishers/*/models/*}:countTokens"
         body: "*"
       }
+      additional_bindings {
+        post: "/v1beta1/{endpoint=endpoints/*}:countTokens"
+        body: "*"
+      }
+      additional_bindings {
+        post: "/v1beta1/{endpoint=publishers/*/models/*}:countTokens"
+        body: "*"
+      }
     };
     option (google.api.method_signature) = "endpoint,instances";
   }
@@ -187,6 +195,14 @@ service PredictionService {
         post: "/v1beta1/{model=projects/*/locations/*/publishers/*/models/*}:generateContent"
         body: "*"
       }
+      additional_bindings {
+        post: "/v1beta1/{model=endpoints/*}:generateContent"
+        body: "*"
+      }
+      additional_bindings {
+        post: "/v1beta1/{model=publishers/*/models/*}:generateContent"
+        body: "*"
+      }
     };
     option (google.api.method_signature) = "model,contents";
   }
@@ -201,6 +217,14 @@ service PredictionService {
         post: "/v1beta1/{model=projects/*/locations/*/publishers/*/models/*}:streamGenerateContent"
         body: "*"
       }
+      additional_bindings {
+        post: "/v1beta1/{model=endpoints/*}:streamGenerateContent"
+        body: "*"
+      }
+      additional_bindings {
+        post: "/v1beta1/{model=publishers/*/models/*}:streamGenerateContent"
+        body: "*"
+      }
     };
     option (google.api.method_signature) = "model,contents";
   }
@@ -793,7 +817,9 @@ message GenerateContentResponse {
 
   // Usage metadata about response(s).
   message UsageMetadata {
-    // Number of tokens in the request.
+    // Number of tokens in the request. When `cached_content` is set, this is
+    // still the total effective prompt size meaning this includes the number of
+    // tokens in the cached content.
     int32 prompt_token_count = 1;
 
     // Number of tokens in the response(s).
