Skip to content

Commit 5a06eca

Browse files
chore: [vertexai] pass in immutable object in countTokens private method (googleapis#10493)
PiperOrigin-RevId: 613673864 Co-authored-by: Jaycee Li <[email protected]>
1 parent 1f9e632 commit 5a06eca

File tree

1 file changed

+12
-13
lines changed
  • java-vertexai/google-cloud-vertexai/src/main/java/com/google/cloud/vertexai/generativeai

1 file changed

+12
-13
lines changed

java-vertexai/google-cloud-vertexai/src/main/java/com/google/cloud/vertexai/generativeai/GenerativeModel.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,7 @@ public GenerativeModel(
341341
*/
342342
@BetaApi
343343
public CountTokensResponse countTokens(String text) throws IOException {
344-
Content content = ContentMaker.fromString(text);
345-
CountTokensRequest.Builder requestBuilder =
346-
CountTokensRequest.newBuilder().addAllContents(Arrays.asList(content));
347-
return countTokensFromBuilder(requestBuilder);
344+
return countTokens(ContentMaker.fromString(text));
348345
}
349346

350347
/**
@@ -370,25 +367,27 @@ public CountTokensResponse countTokens(Content content) throws IOException {
370367
*/
371368
@BetaApi
372369
public CountTokensResponse countTokens(List<Content> contents) throws IOException {
373-
CountTokensRequest.Builder requestBuilder =
374-
CountTokensRequest.newBuilder().addAllContents(contents);
375-
return countTokensFromBuilder(requestBuilder);
370+
CountTokensRequest request =
371+
CountTokensRequest.newBuilder()
372+
.setEndpoint(resourceName)
373+
.setModel(resourceName)
374+
.addAllContents(contents)
375+
.build();
376+
return countTokensFromRequest(request);
376377
}
377378

378379
/**
379-
* Send CountTokensRequest given a request builder.
380+
* Send CountTokensRequest given a request message.
380381
*
381-
* @param requestBuilder a {@link com.google.cloud.vertexai.api.CountTokensRequest.Builder} that
382-
* contains a list of contents
382+
* @param request a {@link com.google.cloud.vertexai.api.CountTokensRequest} that contains a list
383+
* of contents
383384
* @return a {@link com.google.cloud.vertexai.api.CountTokensResponse} instance that contains the
384385
* total tokens and total billable characters of the given list of contents
385386
* @throws IOException if an I/O error occurs while making the API call
386387
*/
387388
@BetaApi
388-
private CountTokensResponse countTokensFromBuilder(CountTokensRequest.Builder requestBuilder)
389+
private CountTokensResponse countTokensFromRequest(CountTokensRequest request)
389390
throws IOException {
390-
CountTokensRequest request =
391-
requestBuilder.setEndpoint(this.resourceName).setModel(this.resourceName).build();
392391
if (this.transport == Transport.REST) {
393392
return vertexAi.getLlmUtilityRestClient().countTokens(request);
394393
} else {

0 commit comments

Comments
 (0)