Skip to content

Add native structured output support for Mistral AI #5044

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.

Sign up for GitHub

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
KyleKreuter wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add native structured output support for Mistral AI #5044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion ...ng-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionRequest.ResponseFormat;
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionRequest.ToolChoice;
import org.springframework.ai.mistralai.api.MistralAiApi.FunctionTool;
import org.springframework.ai.model.ModelOptionsUtils;
import org.springframework.ai.model.tool.StructuredOutputChatOptions;
import org.springframework.ai.model.tool.ToolCallingChatOptions;
import org.springframework.ai.tool.ToolCallback;
import org.springframework.lang.Nullable;
Expand All @@ -49,7 +51,7 @@
* @since 0.8.1
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
public class MistralAiChatOptions implements ToolCallingChatOptions {
public class MistralAiChatOptions implements ToolCallingChatOptions, StructuredOutputChatOptions {

/**
* ID of the model to use
Expand Down Expand Up @@ -367,6 +369,22 @@ public void setToolContext(Map<String, Object> toolContext) {
this.toolContext = toolContext;
}

@Override
@JsonIgnore
public String getOutputSchema() {
if (this.responseFormat == null || this.responseFormat.getJsonSchema() == null) {
return null;
}
return ModelOptionsUtils.toJsonString(this.responseFormat.getJsonSchema().getSchema());
}

@Override
@JsonIgnore
public void setOutputSchema(String outputSchema) {
this.setResponseFormat(
ResponseFormat.builder().type(ResponseFormat.Type.JSON_SCHEMA).jsonSchema(outputSchema).build());
}

@Override
@SuppressWarnings("unchecked")
public MistralAiChatOptions copy() {
Expand Down Expand Up @@ -518,6 +536,11 @@ public Builder toolContext(Map<String, Object> toolContext) {
return this;
}

public Builder outputSchema(String outputSchema) {
this.options.setOutputSchema(outputSchema);
return this;
}

public MistralAiChatOptions build() {
return this.options;
}
Expand Down
Loading