Fix count tokens to include model params #209
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DellaBitta
requested changes
Jul 13, 2024
| // cachedContent: modelParams?.cachedContent?.name, | ||
| // contents: [], | ||
| // }, | ||
| // }; |
There was a problem hiding this comment.
Should this be removed?
| model: "gemini-1.5-flash", | ||
| }); | ||
| // expect(result.generateContentRequest.model).to.equal("gemini-1.5-flash"); | ||
| // expect(result.generateContentRequest.contents).to.equal("gemini-1.5-flash"); |
DellaBitta
approved these changes
Jul 15, 2024
This was referenced Sep 15, 2024
This was referenced Sep 18, 2024
This was referenced Sep 23, 2024
This was referenced Oct 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Count tokens request should include any params set on the model parent class, including systemInstruction, tools, cachedContent.
Updated samples to use this.
generationConfig, toolConfig, and safetySettings don't seem like they would affect tokenCount but might as well pass them through, as they are part of a complete GenerateContentRequest and may affect tokenCount in the future.