diff --git a/build.gradle b/build.gradle index 683a171..491fb60 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ publishing { maven(MavenPublication) { groupId = 'com.cohere' artifactId = 'cohere-java' - version = '1.3.2' + version = '1.4.0' from components.java pom { name = 'cohere' diff --git a/src/main/java/com/cohere/api/core/ClientOptions.java b/src/main/java/com/cohere/api/core/ClientOptions.java index 943764d..2139560 100644 --- a/src/main/java/com/cohere/api/core/ClientOptions.java +++ b/src/main/java/com/cohere/api/core/ClientOptions.java @@ -30,7 +30,7 @@ private ClientOptions( { put("X-Fern-Language", "JAVA"); put("X-Fern-SDK-Name", "com.cohere.fern:api-sdk"); - put("X-Fern-SDK-Version", "1.3.2"); + put("X-Fern-SDK-Version", "1.4.0"); } }); this.headerSuppliers = headerSuppliers; diff --git a/src/main/java/com/cohere/api/resources/v2/requests/V2ChatRequest.java b/src/main/java/com/cohere/api/resources/v2/requests/V2ChatRequest.java index 54b8630..542bef7 100644 --- a/src/main/java/com/cohere/api/resources/v2/requests/V2ChatRequest.java +++ b/src/main/java/com/cohere/api/resources/v2/requests/V2ChatRequest.java @@ -141,7 +141,7 @@ public Optional getResponseFormat() { /** * @return Used to select the safety instruction inserted into the prompt. Defaults to CONTEXTUAL. - * When NONE is specified, the safety instruction will be omitted. + * When OFF is specified, the safety instruction will be omitted. *

Safety modes are not yet configurable in combination with tools, tool_results and documents parameters.

*

Note: This parameter is only compatible with models Command R 08-2024, Command R+ 08-2024 and newer.

*

Compatible Deployments: Cohere Platform, Azure, AWS Sagemaker/Bedrock, Private Deployments

@@ -604,7 +604,7 @@ public _FinalStage maxTokens(Optional maxTokens) { /** *

Used to select the safety instruction inserted into the prompt. Defaults to CONTEXTUAL. - * When NONE is specified, the safety instruction will be omitted.

+ * When OFF is specified, the safety instruction will be omitted.

*

Safety modes are not yet configurable in combination with tools, tool_results and documents parameters.

*

Note: This parameter is only compatible with models Command R 08-2024, Command R+ 08-2024 and newer.

*

Compatible Deployments: Cohere Platform, Azure, AWS Sagemaker/Bedrock, Private Deployments

diff --git a/src/main/java/com/cohere/api/resources/v2/requests/V2ChatStreamRequest.java b/src/main/java/com/cohere/api/resources/v2/requests/V2ChatStreamRequest.java index 7dd71ec..5900055 100644 --- a/src/main/java/com/cohere/api/resources/v2/requests/V2ChatStreamRequest.java +++ b/src/main/java/com/cohere/api/resources/v2/requests/V2ChatStreamRequest.java @@ -141,7 +141,7 @@ public Optional getResponseFormat() { /** * @return Used to select the safety instruction inserted into the prompt. Defaults to CONTEXTUAL. - * When NONE is specified, the safety instruction will be omitted. + * When OFF is specified, the safety instruction will be omitted. *

Safety modes are not yet configurable in combination with tools, tool_results and documents parameters.

*

Note: This parameter is only compatible with models Command R 08-2024, Command R+ 08-2024 and newer.

*

Compatible Deployments: Cohere Platform, Azure, AWS Sagemaker/Bedrock, Private Deployments

@@ -604,7 +604,7 @@ public _FinalStage maxTokens(Optional maxTokens) { /** *

Used to select the safety instruction inserted into the prompt. Defaults to CONTEXTUAL. - * When NONE is specified, the safety instruction will be omitted.

+ * When OFF is specified, the safety instruction will be omitted.

*

Safety modes are not yet configurable in combination with tools, tool_results and documents parameters.

*

Note: This parameter is only compatible with models Command R 08-2024, Command R+ 08-2024 and newer.

*

Compatible Deployments: Cohere Platform, Azure, AWS Sagemaker/Bedrock, Private Deployments

diff --git a/src/main/java/com/cohere/api/resources/v2/types/V2ChatRequestSafetyMode.java b/src/main/java/com/cohere/api/resources/v2/types/V2ChatRequestSafetyMode.java index 1081e6a..ff9faca 100644 --- a/src/main/java/com/cohere/api/resources/v2/types/V2ChatRequestSafetyMode.java +++ b/src/main/java/com/cohere/api/resources/v2/types/V2ChatRequestSafetyMode.java @@ -10,7 +10,7 @@ public enum V2ChatRequestSafetyMode { STRICT("STRICT"), - NONE("NONE"); + OFF("OFF"); private final String value; diff --git a/src/main/java/com/cohere/api/resources/v2/types/V2ChatStreamRequestSafetyMode.java b/src/main/java/com/cohere/api/resources/v2/types/V2ChatStreamRequestSafetyMode.java index 09caaeb..d7b2404 100644 --- a/src/main/java/com/cohere/api/resources/v2/types/V2ChatStreamRequestSafetyMode.java +++ b/src/main/java/com/cohere/api/resources/v2/types/V2ChatStreamRequestSafetyMode.java @@ -10,7 +10,7 @@ public enum V2ChatStreamRequestSafetyMode { STRICT("STRICT"), - NONE("NONE"); + OFF("OFF"); private final String value; diff --git a/src/main/java/com/cohere/api/types/Document.java b/src/main/java/com/cohere/api/types/Document.java index e166cd2..ff6900e 100644 --- a/src/main/java/com/cohere/api/types/Document.java +++ b/src/main/java/com/cohere/api/types/Document.java @@ -42,7 +42,7 @@ public Map getData() { } /** - * @return Unique identifier for this document which will be referenced in citations. If not provided an ID will be automatically generated + * @return Unique identifier for this document which will be referenced in citations. If not provided an ID will be automatically generated. */ @JsonProperty("id") public Optional getId() { diff --git a/src/main/java/com/cohere/api/types/ToolMessageV2.java b/src/main/java/com/cohere/api/types/ToolMessageV2.java index b7c80e5..88d36e4 100644 --- a/src/main/java/com/cohere/api/types/ToolMessageV2.java +++ b/src/main/java/com/cohere/api/types/ToolMessageV2.java @@ -10,24 +10,26 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import java.util.Optional; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonDeserialize(builder = ToolMessageV2.Builder.class) public final class ToolMessageV2 { private final String toolCallId; - private final ToolMessageV2ToolContent toolContent; + private final Optional content; private final Map additionalProperties; private ToolMessageV2( - String toolCallId, ToolMessageV2ToolContent toolContent, Map additionalProperties) { + String toolCallId, Optional content, Map additionalProperties) { this.toolCallId = toolCallId; - this.toolContent = toolContent; + this.content = content; this.additionalProperties = additionalProperties; } @@ -42,9 +44,9 @@ public String getToolCallId() { /** * @return A single or list of outputs from a tool. The content should formatted as a JSON object string, or a list of tool content blocks */ - @JsonProperty("tool_content") - public ToolMessageV2ToolContent getToolContent() { - return toolContent; + @JsonProperty("content") + public Optional getContent() { + return content; } @java.lang.Override @@ -59,12 +61,12 @@ public Map getAdditionalProperties() { } private boolean equalTo(ToolMessageV2 other) { - return toolCallId.equals(other.toolCallId) && toolContent.equals(other.toolContent); + return toolCallId.equals(other.toolCallId) && content.equals(other.content); } @java.lang.Override public int hashCode() { - return Objects.hash(this.toolCallId, this.toolContent); + return Objects.hash(this.toolCallId, this.content); } @java.lang.Override @@ -77,24 +79,24 @@ public static ToolCallIdStage builder() { } public interface ToolCallIdStage { - ToolContentStage toolCallId(String toolCallId); + _FinalStage toolCallId(String toolCallId); Builder from(ToolMessageV2 other); } - public interface ToolContentStage { - _FinalStage toolContent(ToolMessageV2ToolContent toolContent); - } - public interface _FinalStage { ToolMessageV2 build(); + + _FinalStage content(Optional content); + + _FinalStage content(ToolMessageV2Content content); } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements ToolCallIdStage, ToolContentStage, _FinalStage { + public static final class Builder implements ToolCallIdStage, _FinalStage { private String toolCallId; - private ToolMessageV2ToolContent toolContent; + private Optional content = Optional.empty(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -104,7 +106,7 @@ private Builder() {} @java.lang.Override public Builder from(ToolMessageV2 other) { toolCallId(other.getToolCallId()); - toolContent(other.getToolContent()); + content(other.getContent()); return this; } @@ -114,7 +116,7 @@ public Builder from(ToolMessageV2 other) { */ @java.lang.Override @JsonSetter("tool_call_id") - public ToolContentStage toolCallId(String toolCallId) { + public _FinalStage toolCallId(String toolCallId) { this.toolCallId = toolCallId; return this; } @@ -124,15 +126,21 @@ public ToolContentStage toolCallId(String toolCallId) { * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("tool_content") - public _FinalStage toolContent(ToolMessageV2ToolContent toolContent) { - this.toolContent = toolContent; + public _FinalStage content(ToolMessageV2Content content) { + this.content = Optional.of(content); + return this; + } + + @java.lang.Override + @JsonSetter(value = "content", nulls = Nulls.SKIP) + public _FinalStage content(Optional content) { + this.content = content; return this; } @java.lang.Override public ToolMessageV2 build() { - return new ToolMessageV2(toolCallId, toolContent, additionalProperties); + return new ToolMessageV2(toolCallId, content, additionalProperties); } } } diff --git a/src/main/java/com/cohere/api/types/ToolMessageV2ToolContent.java b/src/main/java/com/cohere/api/types/ToolMessageV2Content.java similarity index 74% rename from src/main/java/com/cohere/api/types/ToolMessageV2ToolContent.java rename to src/main/java/com/cohere/api/types/ToolMessageV2Content.java index 5a141a1..fdfe1ce 100644 --- a/src/main/java/com/cohere/api/types/ToolMessageV2ToolContent.java +++ b/src/main/java/com/cohere/api/types/ToolMessageV2Content.java @@ -15,13 +15,13 @@ import java.util.List; import java.util.Objects; -@JsonDeserialize(using = ToolMessageV2ToolContent.Deserializer.class) -public final class ToolMessageV2ToolContent { +@JsonDeserialize(using = ToolMessageV2Content.Deserializer.class) +public final class ToolMessageV2Content { private final Object value; private final int type; - private ToolMessageV2ToolContent(Object value, int type) { + private ToolMessageV2Content(Object value, int type) { this.value = value; this.type = type; } @@ -43,10 +43,10 @@ public T visit(Visitor visitor) { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof ToolMessageV2ToolContent && equalTo((ToolMessageV2ToolContent) other); + return other instanceof ToolMessageV2Content && equalTo((ToolMessageV2Content) other); } - private boolean equalTo(ToolMessageV2ToolContent other) { + private boolean equalTo(ToolMessageV2Content other) { return value.equals(other.value); } @@ -60,12 +60,12 @@ public String toString() { return this.value.toString(); } - public static ToolMessageV2ToolContent of(String value) { - return new ToolMessageV2ToolContent(value, 0); + public static ToolMessageV2Content of(String value) { + return new ToolMessageV2Content(value, 0); } - public static ToolMessageV2ToolContent of(List value) { - return new ToolMessageV2ToolContent(value, 1); + public static ToolMessageV2Content of(List value) { + return new ToolMessageV2Content(value, 1); } public interface Visitor { @@ -74,13 +74,13 @@ public interface Visitor { T visit(List value); } - static final class Deserializer extends StdDeserializer { + static final class Deserializer extends StdDeserializer { Deserializer() { - super(ToolMessageV2ToolContent.class); + super(ToolMessageV2Content.class); } @java.lang.Override - public ToolMessageV2ToolContent deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + public ToolMessageV2Content deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { Object value = p.readValueAs(Object.class); try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class));