generated from cloudwego/.github
-
Notifications
You must be signed in to change notification settings - Fork 274
feat(claude): add structured output support #709
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
Open
marwan38
wants to merge
1
commit into
cloudwego:main
Choose a base branch
from
marwan38:claude-json-schema
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ import ( | |
| "github.com/anthropics/anthropic-sdk-go/vertex" | ||
| awsConfig "github.com/aws/aws-sdk-go-v2/config" | ||
| "github.com/aws/aws-sdk-go-v2/credentials" | ||
| "github.com/eino-contrib/jsonschema" | ||
|
|
||
| "github.com/cloudwego/eino/components" | ||
|
|
||
|
|
@@ -146,6 +147,7 @@ func NewChatModel(ctx context.Context, config *Config) (*ChatModel, error) { | |
| thinking: config.Thinking, | ||
| topK: config.TopK, | ||
| topP: config.TopP, | ||
| responseFormat: config.ResponseFormat, | ||
| disableParallelToolUse: config.DisableParallelToolUse, | ||
| }, nil | ||
| } | ||
|
|
@@ -240,6 +242,10 @@ type Config struct { | |
|
|
||
| DisableParallelToolUse *bool `json:"disable_parallel_tool_use"` | ||
|
|
||
| // ResponseFormat specifies the format of the model's response | ||
| // Optional. Use for structured outputs | ||
| ResponseFormat *ResponseFormat `json:"response_format,omitempty"` | ||
|
|
||
| // Additional fields to set in the HTTP request header. | ||
| AdditionalHeaderFields map[string]string `json:"additional_header_fields"` | ||
|
|
||
|
|
@@ -253,6 +259,12 @@ type Thinking struct { | |
| BudgetTokens int `json:"budget_tokens"` | ||
| } | ||
|
|
||
| // ResponseFormat configures structured JSON output using a JSON schema. | ||
| type ResponseFormat struct { | ||
| // Schema is the JSON schema that the model's response must conform to. | ||
| Schema *jsonschema.Schema `json:"schema"` | ||
|
Author
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 was hesitant on providing a wrapper for ResponseFormat, but this is consistent in how all the other models define it. |
||
| } | ||
|
|
||
| type ChatModel struct { | ||
| cli anthropic.Client | ||
|
|
||
|
|
@@ -263,6 +275,7 @@ type ChatModel struct { | |
| topK *int32 | ||
| topP *float32 | ||
| thinking *Thinking | ||
| responseFormat *ResponseFormat | ||
| tools []anthropic.ToolUnionParam | ||
| origTools []*schema.ToolInfo | ||
| toolChoice *schema.ToolChoice | ||
|
|
@@ -527,7 +540,8 @@ func (cm *ChatModel) genMessageNewParams(input []*schema.Message, opts ...model. | |
| specOptions := model.GetImplSpecificOptions(&options{ | ||
| TopK: cm.topK, | ||
| Thinking: cm.thinking, | ||
| DisableParallelToolUse: cm.disableParallelToolUse}, opts...) | ||
| DisableParallelToolUse: cm.disableParallelToolUse, | ||
| ResponseFormat: cm.responseFormat}, opts...) | ||
|
|
||
| params := anthropic.MessageNewParams{} | ||
| if commonOptions.Model != nil { | ||
|
|
@@ -558,6 +572,18 @@ func (cm *ChatModel) genMessageNewParams(input []*schema.Message, opts ...model. | |
| } | ||
| } | ||
|
|
||
| if specOptions.ResponseFormat != nil && specOptions.ResponseFormat.Schema != nil { | ||
| schemaMap, mErr := jsonSchemaToMap(specOptions.ResponseFormat.Schema) | ||
| if mErr != nil { | ||
| return anthropic.MessageNewParams{}, fmt.Errorf("failed to marshal response format schema: %w", mErr) | ||
| } | ||
| params.OutputConfig = anthropic.OutputConfigParam{ | ||
| Format: anthropic.JSONOutputFormatParam{ | ||
| Schema: schemaMap, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| if err = cm.populateTools(¶ms, commonOptions, specOptions); err != nil { | ||
| return anthropic.MessageNewParams{}, err | ||
| } | ||
|
|
||
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
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.
I wasn't sure if example > readme.
I found the readme helpful on the documentation website when I initially started using eino.
examples/ are better for more complex use cases, and I don't think this is one.