From 73a39f023867129f61d83dd76f8d715d07706110 Mon Sep 17 00:00:00 2001 From: "fern-api[bot]" <115122769+fern-api[bot]@users.noreply.github.com> Date: Sat, 28 Mar 2026 23:40:05 +0000 Subject: [PATCH] SDK regeneration --- .fern/metadata.json | 8 +-- build.gradle | 4 +- reference.md | 8 --- .../com/cohere/api/core/ClientOptions.java | 4 +- .../com/cohere/api/core/DoubleSerializer.java | 43 +++++++++++++++ .../com/cohere/api/core/ObjectMappers.java | 1 + .../requests/BatchesListBatchesRequest.java | 8 +-- .../requests/ConnectorsListRequest.java | 6 +-- .../ConnectorsOAuthAuthorizeRequest.java | 4 +- .../requests/DatasetsCreateRequest.java | 18 +++---- .../requests/DatasetsListRequest.java | 14 ++--- .../requests/FinetuningListEventsRequest.java | 8 +-- .../FinetuningListFinetunedModelsRequest.java | 8 +-- ...etuningListTrainingStepMetricsRequest.java | 6 +-- ...FinetuningUpdateFinetunedModelRequest.java | 52 ++----------------- .../models/requests/ModelsListRequest.java | 10 ++-- .../v2/types/V2ChatStreamResponse.java | 28 ++++++++++ .../AssistantMessageResponseContentItem.java | 19 +++++++ .../AssistantMessageV2ContentOneItem.java | 19 +++++++ .../com/cohere/api/types/ChatMessageV2.java | 20 +++++++ .../java/com/cohere/api/types/Content.java | 18 +++++++ .../com/cohere/api/types/EmbedContent.java | 18 +++++++ .../com/cohere/api/types/EmbedResponse.java | 18 +++++++ .../api/types/GenerateStreamedResponse.java | 19 +++++++ .../java/com/cohere/api/types/Message.java | 20 +++++++ .../com/cohere/api/types/ResponseFormat.java | 18 +++++++ .../cohere/api/types/ResponseFormatV2.java | 18 +++++++ .../java/com/cohere/api/types/Source.java | 18 +++++++ .../api/types/StreamedChatResponse.java | 25 +++++++++ .../types/SystemMessageV2ContentOneItem.java | 18 +++++++ .../com/cohere/api/types/ToolContent.java | 18 +++++++ 31 files changed, 391 insertions(+), 105 deletions(-) create mode 100644 src/main/java/com/cohere/api/core/DoubleSerializer.java diff --git a/.fern/metadata.json b/.fern/metadata.json index 01ff4f4..a44090f 100644 --- a/.fern/metadata.json +++ b/.fern/metadata.json @@ -1,10 +1,10 @@ { - "cliVersion": "4.23.0", + "cliVersion": "4.48.0", "generatorName": "fernapi/fern-java-sdk", - "generatorVersion": "3.42.7", + "generatorVersion": "4.0.6", "generatorConfig": { "client-class-name": "Cohere" }, - "originGitCommit": "7ffcb80a5edaf952524b88ad8960151e148ff39b", - "sdkVersion": "1.10.0" + "originGitCommit": "5bd36abb3df64eb4dd528f855dedf6d6a2b4cf52", + "sdkVersion": "1.7.1" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 22c6071..64ed0db 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ java { group = 'com.cohere' -version = '1.10.0' +version = '1.7.1' jar { dependsOn(":generatePomFileForMavenPublication") @@ -78,7 +78,7 @@ publishing { maven(MavenPublication) { groupId = 'com.cohere' artifactId = 'cohere-java' - version = '1.10.0' + version = '1.7.1' from components.java pom { name = 'cohere' diff --git a/reference.md b/reference.md index a33b867..32e7f3c 100644 --- a/reference.md +++ b/reference.md @@ -4868,14 +4868,6 @@ client.finetuning().updateFinetunedModel( **settings:** `Settings` — FinetunedModel settings such as dataset, hyperparameters... - - - -
-
- -**status:** `Optional` — Current stage in the life-cycle of the fine-tuned model. -
diff --git a/src/main/java/com/cohere/api/core/ClientOptions.java b/src/main/java/com/cohere/api/core/ClientOptions.java index a8f5a6f..c71db6c 100644 --- a/src/main/java/com/cohere/api/core/ClientOptions.java +++ b/src/main/java/com/cohere/api/core/ClientOptions.java @@ -38,10 +38,10 @@ private ClientOptions( this.headers.putAll(headers); this.headers.putAll(new HashMap() { { - put("User-Agent", "com.cohere:cohere-java/1.10.0"); + put("User-Agent", "com.cohere:cohere-java/1.7.1"); put("X-Fern-Language", "JAVA"); put("X-Fern-SDK-Name", "com.cohere.fern:api-sdk"); - put("X-Fern-SDK-Version", "1.10.0"); + put("X-Fern-SDK-Version", "1.7.1"); } }); this.headerSuppliers = headerSuppliers; diff --git a/src/main/java/com/cohere/api/core/DoubleSerializer.java b/src/main/java/com/cohere/api/core/DoubleSerializer.java new file mode 100644 index 0000000..fb18cdc --- /dev/null +++ b/src/main/java/com/cohere/api/core/DoubleSerializer.java @@ -0,0 +1,43 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.cohere.api.core; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.module.SimpleModule; +import java.io.IOException; + +/** + * Custom serializer that writes integer-valued doubles without a decimal point. + * For example, {@code 24000.0} is serialized as {@code 24000} instead of {@code 24000.0}. + * Non-integer values like {@code 3.14} are serialized normally. + */ +class DoubleSerializer extends JsonSerializer { + private static final SimpleModule MODULE; + + static { + MODULE = new SimpleModule() + .addSerializer(Double.class, new DoubleSerializer()) + .addSerializer(double.class, new DoubleSerializer()); + } + + /** + * Gets a module wrapping this serializer as an adapter for the Jackson ObjectMapper. + * + * @return A {@link SimpleModule} to be plugged onto Jackson ObjectMapper. + */ + public static SimpleModule getModule() { + return MODULE; + } + + @Override + public void serialize(Double value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + if (value != null && value == Math.floor(value) && !Double.isInfinite(value) && !Double.isNaN(value)) { + gen.writeNumber(value.longValue()); + } else { + gen.writeNumber(value); + } + } +} diff --git a/src/main/java/com/cohere/api/core/ObjectMappers.java b/src/main/java/com/cohere/api/core/ObjectMappers.java index 1790e8e..1934f1f 100644 --- a/src/main/java/com/cohere/api/core/ObjectMappers.java +++ b/src/main/java/com/cohere/api/core/ObjectMappers.java @@ -18,6 +18,7 @@ public final class ObjectMappers { .addModule(new Jdk8Module()) .addModule(new JavaTimeModule()) .addModule(DateTimeDeserializer.getModule()) + .addModule(DoubleSerializer.getModule()) .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) .build(); diff --git a/src/main/java/com/cohere/api/resources/batches/requests/BatchesListBatchesRequest.java b/src/main/java/com/cohere/api/resources/batches/requests/BatchesListBatchesRequest.java index 4a44998..8cb378d 100644 --- a/src/main/java/com/cohere/api/resources/batches/requests/BatchesListBatchesRequest.java +++ b/src/main/java/com/cohere/api/resources/batches/requests/BatchesListBatchesRequest.java @@ -6,9 +6,9 @@ import com.cohere.api.core.ObjectMappers; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -45,7 +45,7 @@ private BatchesListBatchesRequest( * If unspecified, at most 50 batches will be returned. * The maximum value is 1000; values above 1000 will be coerced to 1000. */ - @JsonProperty("page_size") + @JsonIgnore public Optional getPageSize() { return pageSize; } @@ -54,7 +54,7 @@ public Optional getPageSize() { * @return A page token, received from a previous ListBatches call. * Provide this to retrieve the subsequent page. */ - @JsonProperty("page_token") + @JsonIgnore public Optional getPageToken() { return pageToken; } @@ -63,7 +63,7 @@ public Optional getPageToken() { * @return Batches can be ordered by creation time or last updated time. * Use created_at for creation time or updated_at for last updated time. */ - @JsonProperty("order_by") + @JsonIgnore public Optional getOrderBy() { return orderBy; } diff --git a/src/main/java/com/cohere/api/resources/connectors/requests/ConnectorsListRequest.java b/src/main/java/com/cohere/api/resources/connectors/requests/ConnectorsListRequest.java index 11bbc8b..7525c36 100644 --- a/src/main/java/com/cohere/api/resources/connectors/requests/ConnectorsListRequest.java +++ b/src/main/java/com/cohere/api/resources/connectors/requests/ConnectorsListRequest.java @@ -6,9 +6,9 @@ import com.cohere.api.core.ObjectMappers; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -36,7 +36,7 @@ private ConnectorsListRequest( /** * @return Maximum number of connectors to return [0, 100]. */ - @JsonProperty("limit") + @JsonIgnore public Optional getLimit() { return limit; } @@ -44,7 +44,7 @@ public Optional getLimit() { /** * @return Number of connectors to skip before returning results [0, inf]. */ - @JsonProperty("offset") + @JsonIgnore public Optional getOffset() { return offset; } diff --git a/src/main/java/com/cohere/api/resources/connectors/requests/ConnectorsOAuthAuthorizeRequest.java b/src/main/java/com/cohere/api/resources/connectors/requests/ConnectorsOAuthAuthorizeRequest.java index 91d28e2..8b93557 100644 --- a/src/main/java/com/cohere/api/resources/connectors/requests/ConnectorsOAuthAuthorizeRequest.java +++ b/src/main/java/com/cohere/api/resources/connectors/requests/ConnectorsOAuthAuthorizeRequest.java @@ -6,9 +6,9 @@ import com.cohere.api.core.ObjectMappers; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -33,7 +33,7 @@ private ConnectorsOAuthAuthorizeRequest( /** * @return The URL to redirect to after the connector has been authorized. */ - @JsonProperty("after_token_redirect") + @JsonIgnore public Optional getAfterTokenRedirect() { return afterTokenRedirect; } diff --git a/src/main/java/com/cohere/api/resources/datasets/requests/DatasetsCreateRequest.java b/src/main/java/com/cohere/api/resources/datasets/requests/DatasetsCreateRequest.java index 5ef91ad..1015ea0 100644 --- a/src/main/java/com/cohere/api/resources/datasets/requests/DatasetsCreateRequest.java +++ b/src/main/java/com/cohere/api/resources/datasets/requests/DatasetsCreateRequest.java @@ -7,9 +7,9 @@ import com.cohere.api.types.DatasetType; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -66,7 +66,7 @@ private DatasetsCreateRequest( /** * @return List of names of fields that will be persisted in the Dataset. By default the Dataset will retain only the required fields indicated in the schema for the corresponding Dataset type. For example, datasets of type embed-input will drop all fields other than the required text field. If any of the fields in keep_fields are missing from the uploaded file, Dataset validation will fail. */ - @JsonProperty("keep_fields") + @JsonIgnore public Optional> getKeepFields() { return keepFields; } @@ -74,7 +74,7 @@ public Optional> getKeepFields() { /** * @return List of names of fields that will be persisted in the Dataset. By default the Dataset will retain only the required fields indicated in the schema for the corresponding Dataset type. For example, Datasets of type embed-input will drop all fields other than the required text field. If any of the fields in optional_fields are missing from the uploaded file, Dataset validation will pass. */ - @JsonProperty("optional_fields") + @JsonIgnore public Optional> getOptionalFields() { return optionalFields; } @@ -82,7 +82,7 @@ public Optional> getOptionalFields() { /** * @return The name of the uploaded dataset. */ - @JsonProperty("name") + @JsonIgnore public String getName() { return name; } @@ -90,7 +90,7 @@ public String getName() { /** * @return The dataset type, which is used to validate the data. The only valid type is embed-input used in conjunction with the Embed Jobs API. */ - @JsonProperty("type") + @JsonIgnore public DatasetType getType() { return type; } @@ -98,7 +98,7 @@ public DatasetType getType() { /** * @return Indicates if the original file should be stored. */ - @JsonProperty("keep_original_file") + @JsonIgnore public Optional getKeepOriginalFile() { return keepOriginalFile; } @@ -106,7 +106,7 @@ public Optional getKeepOriginalFile() { /** * @return Indicates whether rows with malformed input should be dropped (instead of failing the validation check). Dropped rows will be returned in the warnings field. */ - @JsonProperty("skip_malformed_input") + @JsonIgnore public Optional getSkipMalformedInput() { return skipMalformedInput; } @@ -114,7 +114,7 @@ public Optional getSkipMalformedInput() { /** * @return Raw .txt uploads will be split into entries using the text_separator value. */ - @JsonProperty("text_separator") + @JsonIgnore public Optional getTextSeparator() { return textSeparator; } @@ -122,7 +122,7 @@ public Optional getTextSeparator() { /** * @return The delimiter used for .csv uploads. */ - @JsonProperty("csv_delimiter") + @JsonIgnore public Optional getCsvDelimiter() { return csvDelimiter; } diff --git a/src/main/java/com/cohere/api/resources/datasets/requests/DatasetsListRequest.java b/src/main/java/com/cohere/api/resources/datasets/requests/DatasetsListRequest.java index 930f53b..9218b42 100644 --- a/src/main/java/com/cohere/api/resources/datasets/requests/DatasetsListRequest.java +++ b/src/main/java/com/cohere/api/resources/datasets/requests/DatasetsListRequest.java @@ -7,9 +7,9 @@ import com.cohere.api.types.DatasetValidationStatus; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -56,7 +56,7 @@ private DatasetsListRequest( /** * @return optional filter by dataset type */ - @JsonProperty("datasetType") + @JsonIgnore public Optional getDatasetType() { return datasetType; } @@ -64,7 +64,7 @@ public Optional getDatasetType() { /** * @return optional filter before a date */ - @JsonProperty("before") + @JsonIgnore public Optional getBefore() { return before; } @@ -72,7 +72,7 @@ public Optional getBefore() { /** * @return optional filter after a date */ - @JsonProperty("after") + @JsonIgnore public Optional getAfter() { return after; } @@ -80,7 +80,7 @@ public Optional getAfter() { /** * @return optional limit to number of results */ - @JsonProperty("limit") + @JsonIgnore public Optional getLimit() { return limit; } @@ -88,7 +88,7 @@ public Optional getLimit() { /** * @return optional offset to start of results */ - @JsonProperty("offset") + @JsonIgnore public Optional getOffset() { return offset; } @@ -96,7 +96,7 @@ public Optional getOffset() { /** * @return optional filter by validation status */ - @JsonProperty("validationStatus") + @JsonIgnore public Optional getValidationStatus() { return validationStatus; } diff --git a/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListEventsRequest.java b/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListEventsRequest.java index 70026b5..8415b8e 100644 --- a/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListEventsRequest.java +++ b/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListEventsRequest.java @@ -6,9 +6,9 @@ import com.cohere.api.core.ObjectMappers; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -43,7 +43,7 @@ private FinetuningListEventsRequest( * @return Maximum number of results to be returned by the server. If 0, defaults to * 50. */ - @JsonProperty("page_size") + @JsonIgnore public Optional getPageSize() { return pageSize; } @@ -51,7 +51,7 @@ public Optional getPageSize() { /** * @return Request a specific page of the list results. */ - @JsonProperty("page_token") + @JsonIgnore public Optional getPageToken() { return pageToken; } @@ -65,7 +65,7 @@ public Optional getPageToken() { *
  • created_at (default)
    • * */ - @JsonProperty("order_by") + @JsonIgnore public Optional getOrderBy() { return orderBy; } diff --git a/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListFinetunedModelsRequest.java b/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListFinetunedModelsRequest.java index 87c867a..1ccaf75 100644 --- a/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListFinetunedModelsRequest.java +++ b/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListFinetunedModelsRequest.java @@ -6,9 +6,9 @@ import com.cohere.api.core.ObjectMappers; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -43,7 +43,7 @@ private FinetuningListFinetunedModelsRequest( * @return Maximum number of results to be returned by the server. If 0, defaults to * 50. */ - @JsonProperty("page_size") + @JsonIgnore public Optional getPageSize() { return pageSize; } @@ -51,7 +51,7 @@ public Optional getPageSize() { /** * @return Request a specific page of the list results. */ - @JsonProperty("page_token") + @JsonIgnore public Optional getPageToken() { return pageToken; } @@ -65,7 +65,7 @@ public Optional getPageToken() { *
  • created_at (default)
    • * */ - @JsonProperty("order_by") + @JsonIgnore public Optional getOrderBy() { return orderBy; } diff --git a/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListTrainingStepMetricsRequest.java b/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListTrainingStepMetricsRequest.java index e8294a2..864a590 100644 --- a/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListTrainingStepMetricsRequest.java +++ b/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningListTrainingStepMetricsRequest.java @@ -6,9 +6,9 @@ import com.cohere.api.core.ObjectMappers; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -37,7 +37,7 @@ private FinetuningListTrainingStepMetricsRequest( * @return Maximum number of results to be returned by the server. If 0, defaults to * 50. */ - @JsonProperty("page_size") + @JsonIgnore public Optional getPageSize() { return pageSize; } @@ -45,7 +45,7 @@ public Optional getPageSize() { /** * @return Request a specific page of the list results. */ - @JsonProperty("page_token") + @JsonIgnore public Optional getPageToken() { return pageToken; } diff --git a/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningUpdateFinetunedModelRequest.java b/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningUpdateFinetunedModelRequest.java index d0d68ca..d641e26 100644 --- a/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningUpdateFinetunedModelRequest.java +++ b/src/main/java/com/cohere/api/resources/finetuning/requests/FinetuningUpdateFinetunedModelRequest.java @@ -5,19 +5,16 @@ import com.cohere.api.core.ObjectMappers; import com.cohere.api.resources.finetuning.finetuning.types.Settings; -import com.cohere.api.resources.finetuning.finetuning.types.Status; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) @@ -27,15 +24,12 @@ public final class FinetuningUpdateFinetunedModelRequest { private final Settings settings; - private final Optional status; - private final Map additionalProperties; private FinetuningUpdateFinetunedModelRequest( - String name, Settings settings, Optional status, Map additionalProperties) { + String name, Settings settings, Map additionalProperties) { this.name = name; this.settings = settings; - this.status = status; this.additionalProperties = additionalProperties; } @@ -55,14 +49,6 @@ public Settings getSettings() { return settings; } - /** - * @return Current stage in the life-cycle of the fine-tuned model. - */ - @JsonProperty("status") - public Optional getStatus() { - return status; - } - @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -76,12 +62,12 @@ public Map getAdditionalProperties() { } private boolean equalTo(FinetuningUpdateFinetunedModelRequest other) { - return name.equals(other.name) && settings.equals(other.settings) && status.equals(other.status); + return name.equals(other.name) && settings.equals(other.settings); } @java.lang.Override public int hashCode() { - return Objects.hash(this.name, this.settings, this.status); + return Objects.hash(this.name, this.settings); } @java.lang.Override @@ -115,13 +101,6 @@ public interface _FinalStage { _FinalStage additionalProperty(String key, Object value); _FinalStage additionalProperties(Map additionalProperties); - - /** - *

    Current stage in the life-cycle of the fine-tuned model.

    - */ - _FinalStage status(Optional status); - - _FinalStage status(Status status); } @JsonIgnoreProperties(ignoreUnknown = true) @@ -130,8 +109,6 @@ public static final class Builder implements NameStage, SettingsStage, _FinalSta private Settings settings; - private Optional status = Optional.empty(); - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -141,7 +118,6 @@ private Builder() {} public Builder from(FinetuningUpdateFinetunedModelRequest other) { name(other.getName()); settings(other.getSettings()); - status(other.getStatus()); return this; } @@ -169,29 +145,9 @@ public _FinalStage settings(@NotNull Settings settings) { return this; } - /** - *

    Current stage in the life-cycle of the fine-tuned model.

    - * @return Reference to {@code this} so that method calls can be chained together. - */ - @java.lang.Override - public _FinalStage status(Status status) { - this.status = Optional.ofNullable(status); - return this; - } - - /** - *

    Current stage in the life-cycle of the fine-tuned model.

    - */ - @java.lang.Override - @JsonSetter(value = "status", nulls = Nulls.SKIP) - public _FinalStage status(Optional status) { - this.status = status; - return this; - } - @java.lang.Override public FinetuningUpdateFinetunedModelRequest build() { - return new FinetuningUpdateFinetunedModelRequest(name, settings, status, additionalProperties); + return new FinetuningUpdateFinetunedModelRequest(name, settings, additionalProperties); } @java.lang.Override diff --git a/src/main/java/com/cohere/api/resources/models/requests/ModelsListRequest.java b/src/main/java/com/cohere/api/resources/models/requests/ModelsListRequest.java index 716e59f..d72594a 100644 --- a/src/main/java/com/cohere/api/resources/models/requests/ModelsListRequest.java +++ b/src/main/java/com/cohere/api/resources/models/requests/ModelsListRequest.java @@ -7,9 +7,9 @@ import com.cohere.api.types.CompatibleEndpoint; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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; @@ -48,7 +48,7 @@ private ModelsListRequest( * @return Maximum number of models to include in a page * Defaults to 20, min value of 1, max value of 1000. */ - @JsonProperty("page_size") + @JsonIgnore public Optional getPageSize() { return pageSize; } @@ -56,7 +56,7 @@ public Optional getPageSize() { /** * @return Page token provided in the next_page_token field of a previous response. */ - @JsonProperty("page_token") + @JsonIgnore public Optional getPageToken() { return pageToken; } @@ -64,7 +64,7 @@ public Optional getPageToken() { /** * @return When provided, filters the list of models to only those that are compatible with the specified endpoint. */ - @JsonProperty("endpoint") + @JsonIgnore public Optional getEndpoint() { return endpoint; } @@ -72,7 +72,7 @@ public Optional getEndpoint() { /** * @return When provided, filters the list of models to only the default model to the endpoint. This parameter is only valid when endpoint is provided. */ - @JsonProperty("default_only") + @JsonIgnore public Optional getDefaultOnly() { return defaultOnly; } diff --git a/src/main/java/com/cohere/api/resources/v2/types/V2ChatStreamResponse.java b/src/main/java/com/cohere/api/resources/v2/types/V2ChatStreamResponse.java index f746500..6226135 100644 --- a/src/main/java/com/cohere/api/resources/v2/types/V2ChatStreamResponse.java +++ b/src/main/java/com/cohere/api/resources/v2/types/V2ChatStreamResponse.java @@ -229,6 +229,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof V2ChatStreamResponse && value.equals(((V2ChatStreamResponse) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -286,6 +302,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class MessageStartValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatMessageStartEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -325,6 +342,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ContentStartValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatContentStartEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -364,6 +382,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ContentDeltaValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatContentDeltaEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -403,6 +422,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ContentEndValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatContentEndEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -442,6 +462,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ToolPlanDeltaValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatToolPlanDeltaEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -481,6 +502,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ToolCallStartValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatToolCallStartEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -520,6 +542,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ToolCallDeltaValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatToolCallDeltaEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -559,6 +582,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ToolCallEndValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatToolCallEndEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -598,6 +622,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class CitationStartValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private CitationStartEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -637,6 +662,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class CitationEndValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private CitationEndEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -676,6 +702,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class MessageEndValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatMessageEndEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -715,6 +742,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class DebugValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatDebugEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/AssistantMessageResponseContentItem.java b/src/main/java/com/cohere/api/types/AssistantMessageResponseContentItem.java index 6a44f10..cbc0972 100644 --- a/src/main/java/com/cohere/api/types/AssistantMessageResponseContentItem.java +++ b/src/main/java/com/cohere/api/types/AssistantMessageResponseContentItem.java @@ -67,6 +67,23 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof AssistantMessageResponseContentItem + && value.equals(((AssistantMessageResponseContentItem) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -91,6 +108,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class TextValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatTextContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -130,6 +148,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ThinkingValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatThinkingContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/AssistantMessageV2ContentOneItem.java b/src/main/java/com/cohere/api/types/AssistantMessageV2ContentOneItem.java index b910d0b..f23f5d4 100644 --- a/src/main/java/com/cohere/api/types/AssistantMessageV2ContentOneItem.java +++ b/src/main/java/com/cohere/api/types/AssistantMessageV2ContentOneItem.java @@ -67,6 +67,23 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof AssistantMessageV2ContentOneItem + && value.equals(((AssistantMessageV2ContentOneItem) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -91,6 +108,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class TextValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatTextContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -130,6 +148,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ThinkingValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatThinkingContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/ChatMessageV2.java b/src/main/java/com/cohere/api/types/ChatMessageV2.java index 07e2a69..9012668 100644 --- a/src/main/java/com/cohere/api/types/ChatMessageV2.java +++ b/src/main/java/com/cohere/api/types/ChatMessageV2.java @@ -97,6 +97,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ChatMessageV2 && value.equals(((ChatMessageV2) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -130,6 +146,7 @@ private interface Value { @JsonIgnoreProperties("role") private static final class UserValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "role", allowSetters = true) private UserMessageV2 value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -169,6 +186,7 @@ public String toString() { @JsonIgnoreProperties("role") private static final class AssistantValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "role", allowSetters = true) private AssistantMessage value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -208,6 +226,7 @@ public String toString() { @JsonIgnoreProperties("role") private static final class SystemValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "role", allowSetters = true) private SystemMessageV2 value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -247,6 +266,7 @@ public String toString() { @JsonIgnoreProperties("role") private static final class ToolValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "role", allowSetters = true) private ToolMessageV2 value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/Content.java b/src/main/java/com/cohere/api/types/Content.java index 1e60710..9e4cdcd 100644 --- a/src/main/java/com/cohere/api/types/Content.java +++ b/src/main/java/com/cohere/api/types/Content.java @@ -67,6 +67,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof Content && value.equals(((Content) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -91,6 +107,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class TextValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatTextContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -130,6 +147,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class ImageUrlValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ImageContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/EmbedContent.java b/src/main/java/com/cohere/api/types/EmbedContent.java index 7a88285..76ee820 100644 --- a/src/main/java/com/cohere/api/types/EmbedContent.java +++ b/src/main/java/com/cohere/api/types/EmbedContent.java @@ -67,6 +67,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof EmbedContent && value.equals(((EmbedContent) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -91,6 +107,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class ImageUrlValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private EmbedImage value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -130,6 +147,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class TextValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private EmbedText value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/EmbedResponse.java b/src/main/java/com/cohere/api/types/EmbedResponse.java index 1411636..54c03a1 100644 --- a/src/main/java/com/cohere/api/types/EmbedResponse.java +++ b/src/main/java/com/cohere/api/types/EmbedResponse.java @@ -67,6 +67,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof EmbedResponse && value.equals(((EmbedResponse) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -95,6 +111,7 @@ private interface Value { @JsonIgnoreProperties("response_type") private static final class EmbeddingsFloatsValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "response_type", allowSetters = true) private EmbedFloatsResponse value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -134,6 +151,7 @@ public String toString() { @JsonIgnoreProperties("response_type") private static final class EmbeddingsByTypeValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "response_type", allowSetters = true) private EmbedByTypeResponse value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/GenerateStreamedResponse.java b/src/main/java/com/cohere/api/types/GenerateStreamedResponse.java index 95799fb..9435da3 100644 --- a/src/main/java/com/cohere/api/types/GenerateStreamedResponse.java +++ b/src/main/java/com/cohere/api/types/GenerateStreamedResponse.java @@ -82,6 +82,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof GenerateStreamedResponse && value.equals(((GenerateStreamedResponse) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -116,6 +132,7 @@ private interface Value { @JsonIgnoreProperties("event_type") private static final class TextGenerationValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private GenerateStreamText value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -155,6 +172,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class StreamEndValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private GenerateStreamEnd value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -194,6 +212,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class StreamErrorValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private GenerateStreamError value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/Message.java b/src/main/java/com/cohere/api/types/Message.java index 844ad1b..2b07e4c 100644 --- a/src/main/java/com/cohere/api/types/Message.java +++ b/src/main/java/com/cohere/api/types/Message.java @@ -97,6 +97,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof Message && value.equals(((Message) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -130,6 +146,7 @@ private interface Value { @JsonIgnoreProperties("role") private static final class ChatbotValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "role", allowSetters = true) private ChatMessage value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -169,6 +186,7 @@ public String toString() { @JsonIgnoreProperties("role") private static final class SystemValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "role", allowSetters = true) private ChatMessage value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -208,6 +226,7 @@ public String toString() { @JsonIgnoreProperties("role") private static final class UserValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "role", allowSetters = true) private ChatMessage value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -247,6 +266,7 @@ public String toString() { @JsonIgnoreProperties("role") private static final class ToolValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "role", allowSetters = true) private ChatToolMessage value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/ResponseFormat.java b/src/main/java/com/cohere/api/types/ResponseFormat.java index 74cbf35..0b2ef6f 100644 --- a/src/main/java/com/cohere/api/types/ResponseFormat.java +++ b/src/main/java/com/cohere/api/types/ResponseFormat.java @@ -67,6 +67,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ResponseFormat && value.equals(((ResponseFormat) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -91,6 +107,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class TextValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatTextResponseFormat value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -130,6 +147,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class JsonObjectValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private JsonResponseFormat value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/ResponseFormatV2.java b/src/main/java/com/cohere/api/types/ResponseFormatV2.java index 7d938b4..6b6d8aa 100644 --- a/src/main/java/com/cohere/api/types/ResponseFormatV2.java +++ b/src/main/java/com/cohere/api/types/ResponseFormatV2.java @@ -67,6 +67,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ResponseFormatV2 && value.equals(((ResponseFormatV2) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -91,6 +107,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class TextValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatTextResponseFormatV2 value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -130,6 +147,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class JsonObjectValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private JsonResponseFormatV2 value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/Source.java b/src/main/java/com/cohere/api/types/Source.java index c8d1435..ad9d25a 100644 --- a/src/main/java/com/cohere/api/types/Source.java +++ b/src/main/java/com/cohere/api/types/Source.java @@ -67,6 +67,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof Source && value.equals(((Source) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -91,6 +107,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class ToolValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatToolSource value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -130,6 +147,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class DocumentValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatDocumentSource value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/StreamedChatResponse.java b/src/main/java/com/cohere/api/types/StreamedChatResponse.java index 28ab0f0..47fc526 100644 --- a/src/main/java/com/cohere/api/types/StreamedChatResponse.java +++ b/src/main/java/com/cohere/api/types/StreamedChatResponse.java @@ -172,6 +172,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof StreamedChatResponse && value.equals(((StreamedChatResponse) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -224,6 +240,7 @@ private interface Value { @JsonIgnoreProperties("event_type") private static final class StreamStartValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatStreamStartEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -263,6 +280,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class SearchQueriesGenerationValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatSearchQueriesGenerationEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -302,6 +320,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class SearchResultsValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatSearchResultsEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -341,6 +360,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class TextGenerationValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatTextGenerationEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -380,6 +400,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class CitationGenerationValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatCitationGenerationEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -419,6 +440,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class ToolCallsGenerationValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatToolCallsGenerationEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -458,6 +480,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class StreamEndValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatStreamEndEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -497,6 +520,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class ToolCallsChunkValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatToolCallsChunkEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -536,6 +560,7 @@ public String toString() { @JsonIgnoreProperties("event_type") private static final class DebugValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "event_type", allowSetters = true) private ChatDebugEvent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/SystemMessageV2ContentOneItem.java b/src/main/java/com/cohere/api/types/SystemMessageV2ContentOneItem.java index 1938dad..4280664 100644 --- a/src/main/java/com/cohere/api/types/SystemMessageV2ContentOneItem.java +++ b/src/main/java/com/cohere/api/types/SystemMessageV2ContentOneItem.java @@ -52,6 +52,23 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof SystemMessageV2ContentOneItem + && value.equals(((SystemMessageV2ContentOneItem) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -74,6 +91,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class TextValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatTextContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) diff --git a/src/main/java/com/cohere/api/types/ToolContent.java b/src/main/java/com/cohere/api/types/ToolContent.java index d23533a..7b0b617 100644 --- a/src/main/java/com/cohere/api/types/ToolContent.java +++ b/src/main/java/com/cohere/api/types/ToolContent.java @@ -67,6 +67,22 @@ public Optional _getUnknown() { return Optional.empty(); } + @Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof ToolContent && value.equals(((ToolContent) other).value); + } + + @Override + public int hashCode() { + return Objects.hash(value); + } + + @Override + public String toString() { + return value.toString(); + } + @JsonValue private Value getValue() { return this.value; @@ -91,6 +107,7 @@ private interface Value { @JsonIgnoreProperties("type") private static final class TextValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private ChatTextContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) @@ -130,6 +147,7 @@ public String toString() { @JsonIgnoreProperties("type") private static final class DocumentValue implements Value { @JsonUnwrapped + @JsonIgnoreProperties(value = "type", allowSetters = true) private DocumentContent value; @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)