Skip to content

Send GenerateContentRequest in CountTokensRequest #175

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
May 29, 2024
Merged

Send GenerateContentRequest in CountTokensRequest #175

merged 1 commit into from
May 29, 2024

Conversation

andrewheard
Copy link
Collaborator

@andrewheard andrewheard commented May 22, 2024 •
edited
Loading

  • Updated the countTokens implementation to populate generateContentRequest instead of contents in the request body.
    • This provides a more accurate token count since, e.g., function declarations and system instructions from the request are now counted.
  • Updated the GenerateContentRequest encoding implementation to serialize the model field.
    • Currently only needed for countTokens but is always serialized (it is ignored by the backend in generateContent and generateContentStream).

@andrewheard andrewheard changed the title Alternative: Send GenerateContentRequest in CountTokensRequest <alt> Send GenerateContentRequest in CountTokensRequest May 28, 2024
@andrewheard andrewheard marked this pull request as ready for review May 28, 2024 22:04
@github-actions github-actions bot added component:swift sdk Issue/PR related to Swift SDK status:awaiting review PR awaiting review from a maintainer labels May 28, 2024
@andrewheard andrewheard force-pushed the ah/count-tokens-generate-alt branch from 62a8dfc to eae0721 Compare May 28, 2024 22:10
@andrewheard andrewheard requested a review from paulb777 May 28, 2024 22:21
@andrewheard andrewheard merged commit 97a81a2 into main May 29, 2024
8 checks passed
@andrewheard andrewheard deleted the ah/count-tokens-generate-alt branch May 29, 2024 14:24
@github-actions github-actions bot removed the status:awaiting review PR awaiting review from a maintainer label May 29, 2024
enefry added a commit to enefry/generative-ai-swift that referenced this pull request Jun 12, 2024
@enefry
Merge commit '54784005b57c2235a7669e0c12e8dafa68f0ca5f'
07b03f9 
* commit '54784005b57c2235a7669e0c12e8dafa68f0ca5f':
  Log server error responses without `-GoogleGenerativeAIDebugLogEnabled` (google-gemini#177)
  Send `GenerateContentRequest` in `CountTokensRequest` (google-gemini#175)
  Add `responseSchema` to `GenerationConfig` (google-gemini#176)
  Update models in samples and README to `gemini-1.5-flash-latest` (google-gemini#173)
  Sync UI from VertexAI for Firebase (google-gemini#172)
  Increment SDK version to `0.5.4` (google-gemini#171)
  Add default `RequestOptions.timeout` of 300 seconds (google-gemini#170)
  Delete repo specific Issue Template (google-gemini#169)
  Increment SDK version to `0.5.3` (google-gemini#167)
  Make `text` computed property handle mixed-parts responses (google-gemini#165)
  update doc comments (google-gemini#166)
SsomsakTH pushed a commit to SsomsakTH/generative-ai-swift that referenced this pull request Jun 21, 2024
@andrewheard
Send GenerateContentRequest in CountTokensRequest (google-gemini#175
d10cf0d 
)
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@paulb777 paulb777 paulb777 approved these changes

Assignees
No one assigned
Labels
component:swift sdk Issue/PR related to Swift SDK
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@andrewheard @paulb777