Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert back to previous OpenAiApi implementation and disable config prop tests

Browse Source
This commit is contained in:
Mark Pollack
2024-11-02 16:16:22 -04:00
parent 4184af5341
commit 0c07edc2e7
3 changed files with 14 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatOptions.java
View File

@@ -38,7 +38,6 @@ import org.springframework.ai.openai.api.OpenAiApi.ChatCompletionRequest.Respons
import org.springframework.ai.openai.api.OpenAiApi.ChatCompletionRequest.StreamOptions;
import org.springframework.ai.openai.api.OpenAiApi.ChatCompletionRequest.ToolChoiceBuilder;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
* @author Christian Tzolov
@@ -314,14 +313,6 @@ public class OpenAiChatOptions implements FunctionCallingOptions, ChatOptions {
}
public void setResponseFormat(ResponseFormat responseFormat) {
if (responseFormat != null) {
ResponseFormat.JsonSchema jsonSchema = StringUtils.hasText(responseFormat.getSchema())
? new ResponseFormat.JsonSchema(responseFormat.getName(), responseFormat.getSchema(),
responseFormat.getStrict())
: null;
responseFormat.setJsonSchema(jsonSchema);
}
this.responseFormat = responseFormat;
}

104
models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java
View File

@@ -18,7 +18,6 @@ package org.springframework.ai.openai.api;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.function.Predicate;
@@ -868,62 +867,16 @@ public class OpenAiApi {
}
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static class ResponseFormat {
@JsonProperty("type")
private Type type;
private String name;
private String schema;
private Boolean strict;
@JsonProperty("json_schema")
private JsonSchema jsonSchema;
@JsonProperty("type")
public Type getType() {
return this.type;
}
@JsonProperty("json_schema")
public JsonSchema getJsonSchema() {
return StringUtils.hasText(this.schema) ? new JsonSchema(this.name, this.schema, this.strict) : null;
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public String getSchema() {
return this.schema;
}
public void setSchema(String schema) {
this.schema = schema;
}
public Boolean getStrict() {
return this.strict;
}
public void setStrict(Boolean strict) {
this.strict = strict;
}
private ResponseFormat() {
}
public ResponseFormat(Type type, JsonSchema jsonSchema) {
this.type = type;
this.jsonSchema = jsonSchema;
}
/**
* An object specifying the format that the model must output.
* @param type Must be one of 'text' or 'json_object'.
* @param jsonSchema JSON schema object that describes the format of the JSON object.
* Only applicable when type is 'json_schema'.
*/
@JsonInclude(Include.NON_NULL)
public record ResponseFormat(
@JsonProperty("type") Type type,
@JsonProperty("json_schema") JsonSchema jsonSchema) {
public ResponseFormat(Type type) {
this(type, (JsonSchema) null);
@@ -937,40 +890,6 @@ public class OpenAiApi {
this(type, StringUtils.hasText(schema) ? new JsonSchema(name, schema, strict) : null);
}
public void setType(Type type) {
this.type = type;
}
public void setJsonSchema(JsonSchema jsonSchema) {
this.jsonSchema = jsonSchema;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
ResponseFormat that = (ResponseFormat) o;
return Objects.equals(this.type, that.type) &&
Objects.equals(this.jsonSchema, that.jsonSchema);
}
@Override
public int hashCode() {
return Objects.hash(this.type, this.jsonSchema);
}
@Override
public String toString() {
return "ResponseFormat{" +
"type=" + this.type +
", jsonSchema=" + this.jsonSchema +
'}';
}
public enum Type {
/**
* Generates a text response. (default)
@@ -1000,7 +919,7 @@ public class OpenAiApi {
* @param schema The JSON schema object that describes the format of the JSON object.
* @param strict If true, the model will only generate outputs that match the schema.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonInclude(Include.NON_NULL)
public record JsonSchema(
@JsonProperty("name") String name,
@JsonProperty("schema") Map<String, Object> schema,
@@ -1016,7 +935,6 @@ public class OpenAiApi {
}
}
/**
* @param includeUsage If set, an additional chunk will be streamed
* before the data: [DONE] message. The usage field on this chunk

3
spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/openai/OpenAiResponseFormatPropertiesTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.ai.autoconfigure.openai;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.ai.openai.OpenAiAudioSpeechModel;
@@ -38,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class OpenAiResponseFormatPropertiesTests {
@Test
@Disabled("GH-1645")
public void responseFormatJsonSchema() {
String responseFormatJsonSchema = """
@@ -76,6 +78,7 @@ public class OpenAiResponseFormatPropertiesTests {
}
@Test
@Disabled("GH-1645")
public void responseFormatJsonObject() {
new ApplicationContextRunner()