feat: add model and contents fields to ComputeTokensRequest v1 (#7502)

feat: add role field to TokensInfo v1 PiperOrigin-RevId: 649172160 Source-Link: googleapis/googleapis@7c0323f Source-Link: googleapis/googleapis-gen@b8b9681 Copy-Tag: eyJwIjoiQWlQbGF0Zm9ybS8uT3dsQm90LnlhbWwiLCJoIjoiYjhiOTY4MTU5YWY3OWU0MzU5MjEyZmIyYTI3NTFhODA5ODJiNGY5NyJ9
googleapis · Jul 8, 2024 · 5ca4b4e · 5ca4b4e
1 parent 972b114
commit 5ca4b4e
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 26 deletions.
diff --git a/AiPlatform/metadata/V1/LlmUtilityService.php b/AiPlatform/metadata/V1/LlmUtilityService.php
diff --git a/AiPlatform/samples/V1/LlmUtilityServiceClient/compute_tokens.php b/AiPlatform/samples/V1/LlmUtilityServiceClient/compute_tokens.php
@@ -27,7 +27,6 @@
 use Google\Cloud\AIPlatform\V1\Client\LlmUtilityServiceClient;
 use Google\Cloud\AIPlatform\V1\ComputeTokensRequest;
 use Google\Cloud\AIPlatform\V1\ComputeTokensResponse;
-use Google\Protobuf\Value;
 
 /**
  * Return a list of tokens based on the input text.
@@ -42,10 +41,8 @@ function compute_tokens_sample(string $formattedEndpoint): void
     $llmUtilityServiceClient = new LlmUtilityServiceClient();
 
     // Prepare the request message.
-    $instances = [new Value()];
     $request = (new ComputeTokensRequest())
-        ->setEndpoint($formattedEndpoint)
-        ->setInstances($instances);
+        ->setEndpoint($formattedEndpoint);
 
     // Call the API and handle any network failures.
     try {

diff --git a/AiPlatform/src/V1/ComputeTokensRequest.php b/AiPlatform/src/V1/ComputeTokensRequest.php
diff --git a/AiPlatform/src/V1/TokensInfo.php b/AiPlatform/src/V1/TokensInfo.php
diff --git a/AiPlatform/tests/Unit/V1/Client/LlmUtilityServiceClientTest.php b/AiPlatform/tests/Unit/V1/Client/LlmUtilityServiceClientTest.php
@@ -86,8 +86,7 @@ public function computeTokensTest()
         $transport->addResponse($expectedResponse);
         // Mock request
         $formattedEndpoint = $gapicClient->endpointName('[PROJECT]', '[LOCATION]', '[ENDPOINT]');
-        $instances = [];
-        $request = (new ComputeTokensRequest())->setEndpoint($formattedEndpoint)->setInstances($instances);
+        $request = (new ComputeTokensRequest())->setEndpoint($formattedEndpoint);
         $response = $gapicClient->computeTokens($request);
         $this->assertEquals($expectedResponse, $response);
         $actualRequests = $transport->popReceivedCalls();
@@ -97,8 +96,6 @@ public function computeTokensTest()
         $this->assertSame('/google.cloud.aiplatform.v1.LlmUtilityService/ComputeTokens', $actualFuncCall);
         $actualValue = $actualRequestObject->getEndpoint();
         $this->assertProtobufEquals($formattedEndpoint, $actualValue);
-        $actualValue = $actualRequestObject->getInstances();
-        $this->assertProtobufEquals($instances, $actualValue);
         $this->assertTrue($transport->isExhausted());
     }
 
@@ -125,8 +122,7 @@ public function computeTokensExceptionTest()
         $transport->addResponse(null, $status);
         // Mock request
         $formattedEndpoint = $gapicClient->endpointName('[PROJECT]', '[LOCATION]', '[ENDPOINT]');
-        $instances = [];
-        $request = (new ComputeTokensRequest())->setEndpoint($formattedEndpoint)->setInstances($instances);
+        $request = (new ComputeTokensRequest())->setEndpoint($formattedEndpoint);
         try {
             $gapicClient->computeTokens($request);
             // If the $gapicClient method call did not throw, fail the test
@@ -573,8 +569,7 @@ public function computeTokensAsyncTest()
         $transport->addResponse($expectedResponse);
         // Mock request
         $formattedEndpoint = $gapicClient->endpointName('[PROJECT]', '[LOCATION]', '[ENDPOINT]');
-        $instances = [];
-        $request = (new ComputeTokensRequest())->setEndpoint($formattedEndpoint)->setInstances($instances);
+        $request = (new ComputeTokensRequest())->setEndpoint($formattedEndpoint);
         $response = $gapicClient->computeTokensAsync($request)->wait();
         $this->assertEquals($expectedResponse, $response);
         $actualRequests = $transport->popReceivedCalls();
@@ -584,8 +579,6 @@ public function computeTokensAsyncTest()
         $this->assertSame('/google.cloud.aiplatform.v1.LlmUtilityService/ComputeTokens', $actualFuncCall);
         $actualValue = $actualRequestObject->getEndpoint();
         $this->assertProtobufEquals($formattedEndpoint, $actualValue);
-        $actualValue = $actualRequestObject->getInstances();
-        $this->assertProtobufEquals($instances, $actualValue);
         $this->assertTrue($transport->isExhausted());
     }
 }