-
Notifications
You must be signed in to change notification settings - Fork 51
feat: add Bedrock Mantle API format support for harness #1412
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
2d9b936
feat: add Bedrock Mantle API format support for harness model config
notgitika 3029d2a
test: add unit tests for Bedrock Mantle apiFormat support
notgitika f1ab114
fix: use BedrockApiFormatSchema constants and add apiFormat validatio…
notgitika 7f86768
feat: extend apiFormat support to OpenAI provider
notgitika 2ecfa6f
test: update schema tests for OpenAI apiFormat support
notgitika 80a2480
refactor: move apiFormat validation logic to schema
notgitika 8143692
fix unit test
notgitika File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -153,13 +153,14 @@ export async function mapHarnessSpecToCreateOptions(options: MapHarnessOptions): | |
| // ============================================================================ | ||
|
|
||
| function mapModel(model: HarnessSpec['model']): HarnessModelConfiguration { | ||
| const { provider, modelId, apiKeyArn, temperature, topP, topK, maxTokens } = model; | ||
| const { provider, modelId, apiKeyArn, apiFormat, temperature, topP, topK, maxTokens } = model; | ||
|
|
||
| switch (provider) { | ||
| case 'bedrock': | ||
| return { | ||
| bedrockModelConfig: { | ||
| modelId, | ||
| ...(apiFormat && apiFormat !== 'converse_stream' && { apiFormat }), | ||
| ...(temperature !== undefined && { temperature }), | ||
| ...(topP !== undefined && { topP }), | ||
| ...(maxTokens !== undefined && { maxTokens }), | ||
|
|
@@ -170,6 +171,7 @@ function mapModel(model: HarnessSpec['model']): HarnessModelConfiguration { | |
| openAiModelConfig: { | ||
| modelId, | ||
| ...(apiKeyArn && { apiKeyArn }), | ||
| ...(apiFormat && apiFormat !== 'responses' && { apiFormat: apiFormat as 'responses' | 'chat_completions' }), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this cast is only necessary because the the validation logic isn't on the schema. |
||
| ...(temperature !== undefined && { temperature }), | ||
| ...(topP !== undefined && { topP }), | ||
| ...(maxTokens !== undefined && { maxTokens }), | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could this validation logic live on the schema itself as either a discriminated union or part of the superRefine block? curious if we can get zod to do some of the heavy lifting here.