From ee73897ba21f57dcc6031cf3aa1a94581c52d1b1 Mon Sep 17 00:00:00 2001 From: stainless-bot Date: Fri, 1 Nov 2024 14:57:27 +0000 Subject: [PATCH] chore: rebuild project due to codegen change --- .../braintrustdata/api/core/ClientOptions.kt | 54 ++-- .../com/braintrustdata/api/core/Utils.kt | 32 +- .../com/braintrustdata/api/core/Values.kt | 4 +- .../api/core/http/BinaryResponseContent.kt | 16 - .../braintrustdata/api/core/http/Headers.kt | 92 ++++++ .../api/core/http/HttpRequest.kt | 6 +- .../api/errors/BraintrustError.kt | 4 +- .../com/braintrustdata/api/models/Acl.kt | 4 +- .../api/models/AclBatchUpdateParams.kt | 22 +- .../api/models/AclBatchUpdateResponse.kt | 8 +- .../api/models/AclCreateParams.kt | 10 +- .../api/models/AclDeleteParams.kt | 8 +- .../api/models/AclFindAndDeleteParams.kt | 10 +- .../braintrustdata/api/models/AclListPage.kt | 4 +- .../api/models/AclListPageAsync.kt | 4 +- .../api/models/AclListParams.kt | 8 +- .../api/models/AclRetrieveParams.kt | 6 +- .../com/braintrustdata/api/models/AiSecret.kt | 6 +- .../api/models/AiSecretCreateParams.kt | 12 +- .../api/models/AiSecretDeleteParams.kt | 8 +- .../api/models/AiSecretFindAndDeleteParams.kt | 10 +- .../api/models/AiSecretListPage.kt | 4 +- .../api/models/AiSecretListPageAsync.kt | 4 +- .../api/models/AiSecretListParams.kt | 8 +- .../api/models/AiSecretReplaceParams.kt | 12 +- .../api/models/AiSecretRetrieveParams.kt | 6 +- .../api/models/AiSecretUpdateParams.kt | 12 +- .../com/braintrustdata/api/models/ApiKey.kt | 4 +- .../api/models/ApiKeyCreateParams.kt | 10 +- .../api/models/ApiKeyDeleteParams.kt | 8 +- .../api/models/ApiKeyListPage.kt | 4 +- .../api/models/ApiKeyListPageAsync.kt | 4 +- .../api/models/ApiKeyListParams.kt | 8 +- .../api/models/ApiKeyRetrieveParams.kt | 6 +- .../models/ChatCompletionContentPartImage.kt | 6 +- .../models/ChatCompletionContentPartText.kt | 4 +- .../models/ChatCompletionMessageToolCall.kt | 6 +- .../braintrustdata/api/models/CodeBundle.kt | 10 +- .../api/models/CreateApiKeyOutput.kt | 4 +- .../api/models/CrossObjectInsertResponse.kt | 10 +- .../braintrustdata/api/models/DataSummary.kt | 4 +- .../com/braintrustdata/api/models/Dataset.kt | 6 +- .../api/models/DatasetCreateParams.kt | 10 +- .../api/models/DatasetDeleteParams.kt | 8 +- .../braintrustdata/api/models/DatasetEvent.kt | 8 +- .../api/models/DatasetFeedbackParams.kt | 15 +- .../api/models/DatasetFetchParams.kt | 8 +- .../api/models/DatasetFetchPostParams.kt | 14 +- .../api/models/DatasetInsertParams.kt | 15 +- .../api/models/DatasetListPage.kt | 4 +- .../api/models/DatasetListPageAsync.kt | 4 +- .../api/models/DatasetListParams.kt | 8 +- .../api/models/DatasetRetrieveParams.kt | 6 +- .../api/models/DatasetSummarizeParams.kt | 8 +- .../api/models/DatasetUpdateParams.kt | 12 +- .../com/braintrustdata/api/models/EnvVar.kt | 4 +- .../api/models/EnvVarCreateParams.kt | 10 +- .../api/models/EnvVarDeleteParams.kt | 8 +- .../api/models/EnvVarListParams.kt | 8 +- .../api/models/EnvVarListResponse.kt | 7 +- .../api/models/EnvVarReplaceParams.kt | 10 +- .../api/models/EnvVarRetrieveParams.kt | 6 +- .../api/models/EnvVarUpdateParams.kt | 10 +- .../api/models/EvalCreateParams.kt | 49 ++-- .../braintrustdata/api/models/Experiment.kt | 6 +- .../api/models/ExperimentCreateParams.kt | 12 +- .../api/models/ExperimentDeleteParams.kt | 8 +- .../api/models/ExperimentEvent.kt | 18 +- .../api/models/ExperimentFeedbackParams.kt | 15 +- .../api/models/ExperimentFetchParams.kt | 8 +- .../api/models/ExperimentFetchPostParams.kt | 14 +- .../api/models/ExperimentInsertParams.kt | 15 +- .../api/models/ExperimentListPage.kt | 4 +- .../api/models/ExperimentListPageAsync.kt | 4 +- .../api/models/ExperimentListParams.kt | 8 +- .../api/models/ExperimentRetrieveParams.kt | 6 +- .../api/models/ExperimentSummarizeParams.kt | 8 +- .../api/models/ExperimentUpdateParams.kt | 12 +- .../api/models/FeedbackDatasetItem.kt | 6 +- .../api/models/FeedbackExperimentItem.kt | 8 +- .../api/models/FeedbackProjectLogsItem.kt | 8 +- .../api/models/FeedbackResponseSchema.kt | 4 +- .../api/models/FetchDatasetEventsResponse.kt | 6 +- .../models/FetchExperimentEventsResponse.kt | 6 +- .../models/FetchProjectLogsEventsResponse.kt | 6 +- .../com/braintrustdata/api/models/Function.kt | 24 +- .../api/models/FunctionCreateParams.kt | 30 +- .../api/models/FunctionDeleteParams.kt | 8 +- .../api/models/FunctionInvokeParams.kt | 36 +-- .../api/models/FunctionInvokeResponse.kt | 4 +- .../api/models/FunctionListPage.kt | 4 +- .../api/models/FunctionListPageAsync.kt | 4 +- .../api/models/FunctionListParams.kt | 8 +- .../api/models/FunctionReplaceParams.kt | 30 +- .../api/models/FunctionRetrieveParams.kt | 6 +- .../api/models/FunctionToolChoice.kt | 4 +- .../api/models/FunctionUpdateParams.kt | 29 +- .../com/braintrustdata/api/models/Group.kt | 8 +- .../api/models/GroupCreateParams.kt | 18 +- .../api/models/GroupDeleteParams.kt | 8 +- .../api/models/GroupListPage.kt | 4 +- .../api/models/GroupListPageAsync.kt | 4 +- .../api/models/GroupListParams.kt | 8 +- .../api/models/GroupReplaceParams.kt | 18 +- .../api/models/GroupRetrieveParams.kt | 6 +- .../api/models/GroupUpdateParams.kt | 26 +- .../api/models/InsertDatasetEventMerge.kt | 10 +- .../api/models/InsertDatasetEventReplace.kt | 8 +- .../api/models/InsertEventsResponse.kt | 6 +- .../api/models/InsertExperimentEventMerge.kt | 18 +- .../models/InsertExperimentEventReplace.kt | 16 +- .../api/models/InsertProjectLogsEventMerge.kt | 18 +- .../models/InsertProjectLogsEventReplace.kt | 16 +- .../api/models/MetricSummary.kt | 4 +- .../api/models/OnlineScoreConfig.kt | 12 +- .../braintrustdata/api/models/Organization.kt | 4 +- .../api/models/OrganizationDeleteParams.kt | 8 +- .../api/models/OrganizationListPage.kt | 4 +- .../api/models/OrganizationListPageAsync.kt | 4 +- .../api/models/OrganizationListParams.kt | 8 +- .../models/OrganizationMemberUpdateParams.kt | 26 +- .../api/models/OrganizationRetrieveParams.kt | 6 +- .../api/models/OrganizationUpdateParams.kt | 10 +- .../models/PatchOrganizationMembersOutput.kt | 4 +- .../api/models/PathLookupFilter.kt | 6 +- .../com/braintrustdata/api/models/Project.kt | 4 +- .../api/models/ProjectCreateParams.kt | 10 +- .../api/models/ProjectDeleteParams.kt | 8 +- .../api/models/ProjectListPage.kt | 4 +- .../api/models/ProjectListPageAsync.kt | 4 +- .../api/models/ProjectListParams.kt | 8 +- .../api/models/ProjectLogFeedbackParams.kt | 15 +- .../api/models/ProjectLogFetchParams.kt | 8 +- .../api/models/ProjectLogFetchPostParams.kt | 14 +- .../api/models/ProjectLogInsertParams.kt | 15 +- .../api/models/ProjectLogsEvent.kt | 18 +- .../api/models/ProjectRetrieveParams.kt | 6 +- .../braintrustdata/api/models/ProjectScore.kt | 9 +- .../api/models/ProjectScoreCategory.kt | 4 +- .../api/models/ProjectScoreConfig.kt | 4 +- .../api/models/ProjectScoreCreateParams.kt | 15 +- .../api/models/ProjectScoreDeleteParams.kt | 8 +- .../api/models/ProjectScoreListPage.kt | 4 +- .../api/models/ProjectScoreListPageAsync.kt | 4 +- .../api/models/ProjectScoreListParams.kt | 8 +- .../api/models/ProjectScoreReplaceParams.kt | 15 +- .../api/models/ProjectScoreRetrieveParams.kt | 6 +- .../api/models/ProjectScoreUpdateParams.kt | 15 +- .../api/models/ProjectSettings.kt | 4 +- .../braintrustdata/api/models/ProjectTag.kt | 4 +- .../api/models/ProjectTagCreateParams.kt | 10 +- .../api/models/ProjectTagDeleteParams.kt | 8 +- .../api/models/ProjectTagListPage.kt | 4 +- .../api/models/ProjectTagListPageAsync.kt | 4 +- .../api/models/ProjectTagListParams.kt | 8 +- .../api/models/ProjectTagReplaceParams.kt | 10 +- .../api/models/ProjectTagRetrieveParams.kt | 6 +- .../api/models/ProjectTagUpdateParams.kt | 10 +- .../api/models/ProjectUpdateParams.kt | 10 +- .../com/braintrustdata/api/models/Prompt.kt | 8 +- .../api/models/PromptCreateParams.kt | 14 +- .../braintrustdata/api/models/PromptData.kt | 61 ++-- .../api/models/PromptDeleteParams.kt | 8 +- .../api/models/PromptListPage.kt | 4 +- .../api/models/PromptListPageAsync.kt | 4 +- .../api/models/PromptListParams.kt | 8 +- .../api/models/PromptReplaceParams.kt | 14 +- .../api/models/PromptRetrieveParams.kt | 6 +- .../api/models/PromptUpdateParams.kt | 14 +- .../com/braintrustdata/api/models/RepoInfo.kt | 4 +- .../com/braintrustdata/api/models/Role.kt | 10 +- .../api/models/RoleCreateParams.kt | 20 +- .../api/models/RoleDeleteParams.kt | 8 +- .../braintrustdata/api/models/RoleListPage.kt | 4 +- .../api/models/RoleListPageAsync.kt | 4 +- .../api/models/RoleListParams.kt | 8 +- .../api/models/RoleReplaceParams.kt | 20 +- .../api/models/RoleRetrieveParams.kt | 6 +- .../api/models/RoleUpdateParams.kt | 30 +- .../braintrustdata/api/models/ScoreSummary.kt | 4 +- .../com/braintrustdata/api/models/Scorer.kt | 4 +- .../api/models/SummarizeDatasetResponse.kt | 4 +- .../api/models/SummarizeExperimentResponse.kt | 8 +- .../com/braintrustdata/api/models/Task.kt | 4 +- .../braintrustdata/api/models/ToolChoice.kt | 4 +- .../api/models/TopLevelHelloWorldParams.kt | 6 +- .../com/braintrustdata/api/models/User.kt | 4 +- .../braintrustdata/api/models/UserListPage.kt | 4 +- .../api/models/UserListPageAsync.kt | 4 +- .../api/models/UserListParams.kt | 8 +- .../api/models/UserRetrieveParams.kt | 6 +- .../com/braintrustdata/api/models/View.kt | 4 +- .../api/models/ViewCreateParams.kt | 10 +- .../com/braintrustdata/api/models/ViewData.kt | 4 +- .../api/models/ViewDataSearch.kt | 12 +- .../api/models/ViewDeleteParams.kt | 10 +- .../braintrustdata/api/models/ViewListPage.kt | 4 +- .../api/models/ViewListPageAsync.kt | 4 +- .../api/models/ViewListParams.kt | 8 +- .../braintrustdata/api/models/ViewOptions.kt | 10 +- .../api/models/ViewReplaceParams.kt | 10 +- .../api/models/ViewRetrieveParams.kt | 8 +- .../api/models/ViewUpdateParams.kt | 10 +- .../braintrustdata/api/services/Handlers.kt | 186 ------------ .../api/services/HttpRequestBodies.kt | 114 -------- .../api/core/http/HeadersTest.kt | 274 ++++++++++++++++++ .../api/core/http/SerializerTest.kt | 2 +- 207 files changed, 1320 insertions(+), 1306 deletions(-) delete mode 100755 braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/BinaryResponseContent.kt create mode 100644 braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/Headers.kt delete mode 100755 braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/Handlers.kt delete mode 100755 braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/HttpRequestBodies.kt create mode 100644 braintrust-java-core/src/test/kotlin/com/braintrustdata/api/core/http/HeadersTest.kt diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/ClientOptions.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/ClientOptions.kt index 77f87fc8..3a266f69 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/ClientOptions.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/ClientOptions.kt @@ -17,11 +17,11 @@ private constructor( @get:JvmName("jsonMapper") val jsonMapper: JsonMapper, @get:JvmName("clock") val clock: Clock, @get:JvmName("baseUrl") val baseUrl: String, - @get:JvmName("apiKey") val apiKey: String?, @get:JvmName("headers") val headers: ListMultimap, @get:JvmName("queryParams") val queryParams: ListMultimap, @get:JvmName("responseValidation") val responseValidation: Boolean, @get:JvmName("maxRetries") val maxRetries: Int, + @get:JvmName("apiKey") val apiKey: String?, ) { fun toBuilder() = Builder().from(this) @@ -38,11 +38,11 @@ private constructor( class Builder { private var httpClient: HttpClient? = null - private var jsonMapper: JsonMapper? = null + private var jsonMapper: JsonMapper = jsonMapper() private var clock: Clock = Clock.systemUTC() private var baseUrl: String = PRODUCTION_URL - private var headers: MutableMap> = mutableMapOf() - private var queryParams: MutableMap> = mutableMapOf() + private var headers: ListMultimap = ArrayListMultimap.create() + private var queryParams: ListMultimap = ArrayListMultimap.create() private var responseValidation: Boolean = false private var maxRetries: Int = 2 private var apiKey: String? = null @@ -53,14 +53,8 @@ private constructor( jsonMapper = clientOptions.jsonMapper clock = clientOptions.clock baseUrl = clientOptions.baseUrl - headers = - clientOptions.headers.asMap().mapValuesTo(mutableMapOf()) { (_, value) -> - value.toMutableList() - } - queryParams = - clientOptions.queryParams.asMap().mapValuesTo(mutableMapOf()) { (_, value) -> - value.toMutableList() - } + headers = ArrayListMultimap.create(clientOptions.headers) + queryParams = ArrayListMultimap.create(clientOptions.queryParams) responseValidation = clientOptions.responseValidation maxRetries = clientOptions.maxRetries apiKey = clientOptions.apiKey @@ -70,47 +64,43 @@ private constructor( fun jsonMapper(jsonMapper: JsonMapper) = apply { this.jsonMapper = jsonMapper } - fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl } - fun clock(clock: Clock) = apply { this.clock = clock } + fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl } + fun headers(headers: Map>) = apply { this.headers.clear() putAllHeaders(headers) } - fun putHeader(name: String, value: String) = apply { - this.headers.getOrPut(name) { mutableListOf() }.add(value) - } + fun putHeader(name: String, value: String) = apply { headers.put(name, value) } fun putHeaders(name: String, values: Iterable) = apply { - this.headers.getOrPut(name) { mutableListOf() }.addAll(values) + headers.putAll(name, values) } fun putAllHeaders(headers: Map>) = apply { - headers.forEach(this::putHeaders) + headers.forEach(::putHeaders) } - fun removeHeader(name: String) = apply { this.headers.put(name, mutableListOf()) } + fun removeHeader(name: String) = apply { headers.removeAll(name) } fun queryParams(queryParams: Map>) = apply { this.queryParams.clear() putAllQueryParams(queryParams) } - fun putQueryParam(name: String, value: String) = apply { - this.queryParams.getOrPut(name) { mutableListOf() }.add(value) - } + fun putQueryParam(name: String, value: String) = apply { queryParams.put(name, value) } fun putQueryParams(name: String, values: Iterable) = apply { - this.queryParams.getOrPut(name) { mutableListOf() }.addAll(values) + queryParams.putAll(name, values) } fun putAllQueryParams(queryParams: Map>) = apply { - queryParams.forEach(this::putQueryParams) + queryParams.forEach(::putQueryParams) } - fun removeQueryParam(name: String) = apply { this.queryParams.put(name, mutableListOf()) } + fun removeQueryParam(name: String) = apply { queryParams.removeAll(name) } fun responseValidation(responseValidation: Boolean) = apply { this.responseValidation = responseValidation @@ -137,8 +127,8 @@ private constructor( if (!apiKey.isNullOrEmpty()) { headers.put("Authorization", "Bearer ${apiKey}") } - this.headers.forEach(headers::replaceValues) - this.queryParams.forEach(queryParams::replaceValues) + this.headers.asMap().forEach(headers::replaceValues) + this.queryParams.asMap().forEach(queryParams::replaceValues) return ClientOptions( httpClient!!, @@ -149,14 +139,14 @@ private constructor( .maxRetries(maxRetries) .build() ), - jsonMapper ?: jsonMapper(), + jsonMapper, clock, baseUrl, - apiKey, - headers.toUnmodifiable(), - queryParams.toUnmodifiable(), + headers.toImmutable(), + queryParams.toImmutable(), responseValidation, maxRetries, + apiKey, ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/Utils.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/Utils.kt index 795c75cd..499786b9 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/Utils.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/Utils.kt @@ -5,38 +5,28 @@ package com.braintrustdata.api.core import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.google.common.collect.ImmutableListMultimap import com.google.common.collect.ListMultimap -import com.google.common.collect.Multimaps import java.util.Collections +import java.util.SortedMap @JvmSynthetic internal fun T?.getOrThrow(name: String): T = this ?: throw BraintrustInvalidDataException("`${name}` is not present") @JvmSynthetic -internal fun List.toUnmodifiable(): List { - if (isEmpty()) { - return Collections.emptyList() - } - - return Collections.unmodifiableList(this) -} +internal fun List.toImmutable(): List = + if (isEmpty()) Collections.emptyList() else Collections.unmodifiableList(toList()) @JvmSynthetic -internal fun Map.toUnmodifiable(): Map { - if (isEmpty()) { - return Collections.emptyMap() - } - - return Collections.unmodifiableMap(this) -} +internal fun Map.toImmutable(): Map = + if (isEmpty()) Collections.emptyMap() else Collections.unmodifiableMap(toMap()) @JvmSynthetic -internal fun ListMultimap.toUnmodifiable(): ListMultimap { - if (isEmpty()) { - return ImmutableListMultimap.of() - } +internal fun , V> SortedMap.toImmutable(): SortedMap = + if (isEmpty()) Collections.emptySortedMap() + else Collections.unmodifiableSortedMap(toSortedMap(comparator())) - return Multimaps.unmodifiableListMultimap(this) -} +@JvmSynthetic +internal fun ListMultimap.toImmutable(): ListMultimap = + ImmutableListMultimap.copyOf(this) internal interface Enum diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/Values.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/Values.kt index 1dfdbfa7..48703257 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/Values.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/Values.kt @@ -389,7 +389,7 @@ private constructor( override fun toString() = values.toString() companion object { - @JsonCreator @JvmStatic fun of(values: List) = JsonArray(values.toUnmodifiable()) + @JsonCreator @JvmStatic fun of(values: List) = JsonArray(values.toImmutable()) } } @@ -415,7 +415,7 @@ private constructor( companion object { @JsonCreator @JvmStatic - fun of(values: Map) = JsonObject(values.toUnmodifiable()) + fun of(values: Map) = JsonObject(values.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/BinaryResponseContent.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/BinaryResponseContent.kt deleted file mode 100755 index c10ab40f..00000000 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/BinaryResponseContent.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.braintrustdata.api.core.http - -import java.io.IOException -import java.io.InputStream -import java.io.OutputStream -import java.lang.AutoCloseable -import java.util.Optional - -interface BinaryResponseContent : AutoCloseable { - - fun contentType(): Optional - - fun body(): InputStream - - @Throws(IOException::class) fun writeTo(outputStream: OutputStream) -} diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/Headers.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/Headers.kt new file mode 100644 index 00000000..2f344105 --- /dev/null +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/Headers.kt @@ -0,0 +1,92 @@ +package com.braintrustdata.api.core.http + +import com.braintrustdata.api.core.toImmutable +import java.util.TreeMap + +class Headers +private constructor( + private val map: Map>, + @get:JvmName("size") val size: Int +) { + + fun isEmpty(): Boolean = map.isEmpty() + + fun names(): Set = map.keys + + fun values(name: String): List = map[name].orEmpty() + + fun toBuilder(): Builder = Builder().putAll(map) + + companion object { + + @JvmStatic fun builder() = Builder() + } + + class Builder { + + private val map: MutableMap> = + TreeMap(String.CASE_INSENSITIVE_ORDER) + private var size: Int = 0 + + fun put(name: String, value: String) = apply { + map.getOrPut(name) { mutableListOf() }.add(value) + size++ + } + + fun put(name: String, values: Iterable) = apply { values.forEach { put(name, it) } } + + fun putAll(headers: Map>) = apply { headers.forEach(::put) } + + fun putAll(headers: Headers) = apply { + headers.names().forEach { put(it, headers.values(it)) } + } + + fun remove(name: String) = apply { size -= map.remove(name).orEmpty().size } + + fun removeAll(names: Set) = apply { names.forEach(::remove) } + + fun clear() = apply { + map.clear() + size = 0 + } + + fun replace(name: String, value: String) = apply { + remove(name) + put(name, value) + } + + fun replace(name: String, values: Iterable) = apply { + remove(name) + put(name, values) + } + + fun replaceAll(headers: Map>) = apply { + headers.forEach(::replace) + } + + fun replaceAll(headers: Headers) = apply { + headers.names().forEach { replace(it, headers.values(it)) } + } + + fun build() = + Headers( + map.mapValuesTo(TreeMap(String.CASE_INSENSITIVE_ORDER)) { (_, values) -> + values.toImmutable() + } + .toImmutable(), + size + ) + } + + override fun hashCode(): Int = map.hashCode() + + override fun equals(other: Any?): Boolean { + if (this === other) { + return true + } + + return other is Headers && map == other.map + } + + override fun toString(): String = "Headers{map=$map}" +} diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/HttpRequest.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/HttpRequest.kt index 4662ece7..340f33d7 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/HttpRequest.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/http/HttpRequest.kt @@ -1,6 +1,6 @@ package com.braintrustdata.api.core.http -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ListMultimap import com.google.common.collect.Multimap @@ -83,8 +83,8 @@ private constructor( HttpRequest( checkNotNull(method) { "`method` is required but was not set" }, url, - pathSegments.toUnmodifiable(), - queryParams.toUnmodifiable(), + pathSegments.toImmutable(), + queryParams.toImmutable(), headers, body, ) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/errors/BraintrustError.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/errors/BraintrustError.kt index aa821e80..29925864 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/errors/BraintrustError.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/errors/BraintrustError.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.errors import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.databind.annotation.JsonDeserialize @@ -62,6 +62,6 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): BraintrustError = BraintrustError(additionalProperties.toUnmodifiable()) + fun build(): BraintrustError = BraintrustError(additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Acl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Acl.kt index 25b577be..5dc79cec 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Acl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Acl.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -317,7 +317,7 @@ private constructor( roleId, _objectOrgId, created, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclBatchUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclBatchUpdateParams.kt index f41f20ec..be172f2e 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclBatchUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclBatchUpdateParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -145,9 +145,9 @@ constructor( fun build(): AclBatchUpdateBody = AclBatchUpdateBody( - addAcls?.toUnmodifiable(), - removeAcls?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + addAcls?.toImmutable(), + removeAcls?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -328,11 +328,11 @@ constructor( fun build(): AclBatchUpdateParams = AclBatchUpdateParams( - if (addAcls.size == 0) null else addAcls.toUnmodifiable(), - if (removeAcls.size == 0) null else removeAcls.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + if (addAcls.size == 0) null else addAcls.toImmutable(), + if (removeAcls.size == 0) null else removeAcls.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -493,7 +493,7 @@ constructor( permission, restrictObjectType, roleId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -991,7 +991,7 @@ constructor( permission, restrictObjectType, roleId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclBatchUpdateResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclBatchUpdateResponse.kt index 48ad5d75..a9055b0d 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclBatchUpdateResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclBatchUpdateResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -175,9 +175,9 @@ private constructor( fun build(): AclBatchUpdateResponse = AclBatchUpdateResponse( - addedAcls.map { it.toUnmodifiable() }, - removedAcls.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + addedAcls.map { it.toImmutable() }, + removedAcls.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclCreateParams.kt index 82944d42..ef8f99be 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclCreateParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -221,7 +221,7 @@ constructor( restrictObjectType, roleId, userId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -400,9 +400,9 @@ constructor( restrictObjectType, roleId, userId, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclDeleteParams.kt index 93e7f1e1..fac4c02a 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): AclDeleteParams = AclDeleteParams( checkNotNull(aclId) { "`aclId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclFindAndDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclFindAndDeleteParams.kt index 7d334fa5..2d8a55c3 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclFindAndDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclFindAndDeleteParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -221,7 +221,7 @@ constructor( restrictObjectType, roleId, userId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -400,9 +400,9 @@ constructor( restrictObjectType, roleId, userId, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListPage.kt index 86271fa0..2e952c62 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.AclService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -150,7 +150,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListPageAsync.kt index 05369260..681e3c3a 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.AclServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -153,7 +153,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt index 70a432dd..799893b9 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt @@ -9,7 +9,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonCreator @@ -57,7 +57,7 @@ constructor( this.limit?.let { params.put("limit", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -205,8 +205,8 @@ constructor( ids, limit, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclRetrieveParams.kt index 11b1ce01..145ffc77 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): AclRetrieveParams = AclRetrieveParams( checkNotNull(aclId) { "`aclId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecret.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecret.kt index 8543661d..fcd4b525 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecret.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecret.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -189,7 +189,7 @@ private constructor( type, metadata, previewSecret, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -242,7 +242,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretCreateParams.kt index c8ac3207..20666ab6 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretCreateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -157,7 +157,7 @@ constructor( orgName, secret, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -315,9 +315,9 @@ constructor( orgName, secret, type, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -362,7 +362,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretDeleteParams.kt index 5403ba52..239f8ab3 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): AiSecretDeleteParams = AiSecretDeleteParams( checkNotNull(aiSecretId) { "`aiSecretId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretFindAndDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretFindAndDeleteParams.kt index 064eb2fa..2e8aa872 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretFindAndDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretFindAndDeleteParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -112,7 +112,7 @@ constructor( AiSecretFindAndDeleteBody( checkNotNull(name) { "`name` is required but was not set" }, orgName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -251,9 +251,9 @@ constructor( AiSecretFindAndDeleteParams( checkNotNull(name) { "`name` is required but was not set" }, orgName, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListPage.kt index a0e9abfc..23448015 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.AiSecretService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -156,7 +156,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListPageAsync.kt index 7b2b31aa..1a91a044 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.AiSecretServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -163,7 +163,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt index 4be9c8dc..1388bdbe 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -58,7 +58,7 @@ constructor( this.orgName?.let { params.put("org_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -219,8 +219,8 @@ constructor( limit, orgName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretReplaceParams.kt index 130b0aef..1301136a 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretReplaceParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -157,7 +157,7 @@ constructor( orgName, secret, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -315,9 +315,9 @@ constructor( orgName, secret, type, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -362,7 +362,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretRetrieveParams.kt index c4d8d0e2..d8fc8a97 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): AiSecretRetrieveParams = AiSecretRetrieveParams( checkNotNull(aiSecretId) { "`aiSecretId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretUpdateParams.kt index 449d0223..ad973d8d 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -136,7 +136,7 @@ constructor( name, secret, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -286,9 +286,9 @@ constructor( name, secret, type, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -333,7 +333,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKey.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKey.kt index 78072843..3442296e 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKey.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKey.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -175,7 +175,7 @@ private constructor( previewName, userId, orgId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyCreateParams.kt index 79d4d800..04374360 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyCreateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -112,7 +112,7 @@ constructor( ApiKeyCreateBody( checkNotNull(name) { "`name` is required but was not set" }, orgName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -251,9 +251,9 @@ constructor( ApiKeyCreateParams( checkNotNull(name) { "`name` is required but was not set" }, orgName, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyDeleteParams.kt index 337d12c8..3793cc0e 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): ApiKeyDeleteParams = ApiKeyDeleteParams( checkNotNull(apiKeyId) { "`apiKeyId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListPage.kt index 5a79da82..46913160 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.ApiKeyService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -150,7 +150,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListPageAsync.kt index b3d2f9a4..dc2c5d58 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.ApiKeyServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -153,7 +153,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt index bf72099b..8cc30c18 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -54,7 +54,7 @@ constructor( this.orgName?.let { params.put("org_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -202,8 +202,8 @@ constructor( limit, orgName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyRetrieveParams.kt index 1a577eb5..b4b1b0d5 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): ApiKeyRetrieveParams = ApiKeyRetrieveParams( checkNotNull(apiKeyId) { "`apiKeyId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionContentPartImage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionContentPartImage.kt index cd41c589..2e7b9f90 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionContentPartImage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionContentPartImage.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -99,7 +99,7 @@ private constructor( ChatCompletionContentPartImage( imageUrl, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -184,7 +184,7 @@ private constructor( ImageUrl( url, detail, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionContentPartText.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionContentPartText.kt index 0a46ca17..f8787516 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionContentPartText.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionContentPartText.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -99,7 +99,7 @@ private constructor( ChatCompletionContentPartText( text, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionMessageToolCall.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionMessageToolCall.kt index dbe33932..5327e7f0 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionMessageToolCall.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ChatCompletionMessageToolCall.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -111,7 +111,7 @@ private constructor( id, function, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -196,7 +196,7 @@ private constructor( Function( arguments, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CodeBundle.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CodeBundle.kt index 844b82b2..cc2574a6 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CodeBundle.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CodeBundle.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -145,7 +145,7 @@ private constructor( location, bundleId, preview, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -363,7 +363,7 @@ private constructor( type, evalName, position, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -639,7 +639,7 @@ private constructor( Function( type, index, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -797,7 +797,7 @@ private constructor( RuntimeContext( runtime, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CreateApiKeyOutput.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CreateApiKeyOutput.kt index aa08e7f4..733e9d8d 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CreateApiKeyOutput.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CreateApiKeyOutput.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -194,7 +194,7 @@ private constructor( userId, orgId, key, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CrossObjectInsertResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CrossObjectInsertResponse.kt index b4f6ca10..88cf8bd4 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CrossObjectInsertResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/CrossObjectInsertResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -127,7 +127,7 @@ private constructor( experiment, dataset, projectLogs, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -181,7 +181,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Dataset = Dataset(additionalProperties.toUnmodifiable()) + fun build(): Dataset = Dataset(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -254,7 +254,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Experiment = Experiment(additionalProperties.toUnmodifiable()) + fun build(): Experiment = Experiment(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -327,7 +327,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): ProjectLogs = ProjectLogs(additionalProperties.toUnmodifiable()) + fun build(): ProjectLogs = ProjectLogs(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DataSummary.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DataSummary.kt index b09f0838..b07ee919 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DataSummary.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DataSummary.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -82,7 +82,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): DataSummary = DataSummary(totalRecords, additionalProperties.toUnmodifiable()) + fun build(): DataSummary = DataSummary(totalRecords, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Dataset.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Dataset.kt index 325b230e..df03f7a7 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Dataset.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Dataset.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -219,7 +219,7 @@ private constructor( deletedAt, userId, metadata, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -273,7 +273,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetCreateParams.kt index 5390c300..84e5deb3 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetCreateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -119,7 +119,7 @@ constructor( checkNotNull(name) { "`name` is required but was not set" }, checkNotNull(projectId) { "`projectId` is required but was not set" }, description, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -260,9 +260,9 @@ constructor( checkNotNull(name) { "`name` is required but was not set" }, checkNotNull(projectId) { "`projectId` is required but was not set" }, description, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetDeleteParams.kt index aa332eff..1355cf43 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): DatasetDeleteParams = DatasetDeleteParams( checkNotNull(datasetId) { "`datasetId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetEvent.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetEvent.kt index 08d204b8..cdc81f4c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetEvent.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetEvent.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -344,10 +344,10 @@ private constructor( input, expected, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, spanId, rootSpanId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -407,7 +407,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFeedbackParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFeedbackParams.kt index b3fbe140..3b9ee122 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFeedbackParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFeedbackParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -96,8 +96,8 @@ constructor( fun build(): DatasetFeedbackBody = DatasetFeedbackBody( checkNotNull(feedback) { "`feedback` is required but was not set" } - .toUnmodifiable(), - additionalProperties.toUnmodifiable() + .toImmutable(), + additionalProperties.toImmutable() ) } @@ -237,11 +237,10 @@ constructor( fun build(): DatasetFeedbackParams = DatasetFeedbackParams( checkNotNull(datasetId) { "`datasetId` is required but was not set" }, - checkNotNull(feedback) { "`feedback` is required but was not set" } - .toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + checkNotNull(feedback) { "`feedback` is required but was not set" }.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt index 6202841f..afaa9da2 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -37,7 +37,7 @@ constructor( this.maxXactId?.let { params.put("max_xact_id", listOf(it.toString())) } this.version?.let { params.put("version", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -200,8 +200,8 @@ constructor( maxRootSpanId, maxXactId, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchPostParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchPostParams.kt index 945c769d..3781f559 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchPostParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchPostParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -276,12 +276,12 @@ constructor( fun build(): DatasetFetchPostBody = DatasetFetchPostBody( cursor, - filters?.toUnmodifiable(), + filters?.toImmutable(), limit, maxRootSpanId, maxXactId, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -508,14 +508,14 @@ constructor( DatasetFetchPostParams( checkNotNull(datasetId) { "`datasetId` is required but was not set" }, cursor, - if (filters.size == 0) null else filters.toUnmodifiable(), + if (filters.size == 0) null else filters.toImmutable(), limit, maxRootSpanId, maxXactId, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetInsertParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetInsertParams.kt index ef809f0f..57d030a3 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetInsertParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetInsertParams.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -105,9 +105,8 @@ constructor( fun build(): DatasetInsertBody = DatasetInsertBody( - checkNotNull(events) { "`events` is required but was not set" } - .toUnmodifiable(), - additionalProperties.toUnmodifiable() + checkNotNull(events) { "`events` is required but was not set" }.toImmutable(), + additionalProperties.toImmutable() ) } @@ -247,10 +246,10 @@ constructor( fun build(): DatasetInsertParams = DatasetInsertParams( checkNotNull(datasetId) { "`datasetId` is required but was not set" }, - checkNotNull(events) { "`events` is required but was not set" }.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + checkNotNull(events) { "`events` is required but was not set" }.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListPage.kt index 636f0fbf..6e878af8 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.DatasetService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -156,7 +156,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListPageAsync.kt index b0a51d0c..75bfa66f 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.DatasetServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -163,7 +163,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt index 2f4645b3..89d040ca 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -62,7 +62,7 @@ constructor( this.projectName?.let { params.put("project_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -222,8 +222,8 @@ constructor( projectId, projectName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetRetrieveParams.kt index 833cc3fc..b8079c17 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): DatasetRetrieveParams = DatasetRetrieveParams( checkNotNull(datasetId) { "`datasetId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt index bc730d6d..377115e8 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -25,7 +25,7 @@ constructor( val params = mutableMapOf>() this.summarizeData?.let { params.put("summarize_data", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -131,8 +131,8 @@ constructor( DatasetSummarizeParams( checkNotNull(datasetId) { "`datasetId` is required but was not set" }, summarizeData, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetUpdateParams.kt index 148e70e1..6a567c8b 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -129,7 +129,7 @@ constructor( description, metadata, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -276,9 +276,9 @@ constructor( description, metadata, name, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -324,7 +324,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVar.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVar.kt index f6242dc9..483a52a5 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVar.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVar.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -182,7 +182,7 @@ private constructor( name, created, used, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarCreateParams.kt index 56aeae21..9eee9beb 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarCreateParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -137,7 +137,7 @@ constructor( checkNotNull(objectId) { "`objectId` is required but was not set" }, checkNotNull(objectType) { "`objectType` is required but was not set" }, value, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -284,9 +284,9 @@ constructor( checkNotNull(objectId) { "`objectId` is required but was not set" }, checkNotNull(objectType) { "`objectType` is required but was not set" }, value, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarDeleteParams.kt index e3e82fb3..def79a86 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): EnvVarDeleteParams = EnvVarDeleteParams( checkNotNull(envVarId) { "`envVarId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt index 9dcaf1d1..377c8226 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt @@ -9,7 +9,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonCreator @@ -53,7 +53,7 @@ constructor( this.objectId?.let { params.put("object_id", listOf(it.toString())) } this.objectType?.let { params.put("object_type", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -183,8 +183,8 @@ constructor( limit, objectId, objectType, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListResponse.kt index 22112cd4..983be40d 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -82,10 +82,7 @@ private constructor( } fun build(): EnvVarListResponse = - EnvVarListResponse( - objects.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable() - ) + EnvVarListResponse(objects.map { it.toImmutable() }, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarReplaceParams.kt index cb7eb09d..b673f7af 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarReplaceParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -137,7 +137,7 @@ constructor( checkNotNull(objectId) { "`objectId` is required but was not set" }, checkNotNull(objectType) { "`objectType` is required but was not set" }, value, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -284,9 +284,9 @@ constructor( checkNotNull(objectId) { "`objectId` is required but was not set" }, checkNotNull(objectType) { "`objectType` is required but was not set" }, value, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarRetrieveParams.kt index 764d154d..32689ef5 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): EnvVarRetrieveParams = EnvVarRetrieveParams( checkNotNull(envVarId) { "`envVarId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarUpdateParams.kt index e502769a..d6646700 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -113,7 +113,7 @@ constructor( EnvVarUpdateBody( checkNotNull(name) { "`name` is required but was not set" }, value, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -254,9 +254,9 @@ constructor( checkNotNull(envVarId) { "`envVarId` is required but was not set" }, checkNotNull(name) { "`name` is required but was not set" }, value, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EvalCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EvalCreateParams.kt index 0ef11ee3..9c9213dd 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EvalCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EvalCreateParams.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -207,13 +207,12 @@ constructor( EvalCreateBody( checkNotNull(data) { "`data` is required but was not set" }, checkNotNull(projectId) { "`projectId` is required but was not set" }, - checkNotNull(scores) { "`scores` is required but was not set" } - .toUnmodifiable(), + checkNotNull(scores) { "`scores` is required but was not set" }.toImmutable(), checkNotNull(task) { "`task` is required but was not set" }, experimentName, metadata, stream, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -423,14 +422,14 @@ constructor( EvalCreateParams( checkNotNull(data) { "`data` is required but was not set" }, checkNotNull(projectId) { "`projectId` is required but was not set" }, - checkNotNull(scores) { "`scores` is required but was not set" }.toUnmodifiable(), + checkNotNull(scores) { "`scores` is required but was not set" }.toImmutable(), checkNotNull(task) { "`task` is required but was not set" }, experimentName, metadata, stream, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -622,7 +621,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): DatasetId = DatasetId(datasetId, additionalProperties.toUnmodifiable()) + fun build(): DatasetId = DatasetId(datasetId, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -733,7 +732,7 @@ constructor( ProjectDatasetName( projectName, datasetName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1059,7 +1058,7 @@ constructor( FunctionId( functionId, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1196,7 +1195,7 @@ constructor( projectName, slug, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1306,7 +1305,7 @@ constructor( } fun build(): GlobalFunction = - GlobalFunction(globalFunction, additionalProperties.toUnmodifiable()) + GlobalFunction(globalFunction, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1451,7 +1450,7 @@ constructor( promptSessionId, promptSessionFunctionId, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1585,7 +1584,7 @@ constructor( inlineContext, code, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1671,7 +1670,7 @@ constructor( InlineContext( runtime, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1870,7 +1869,7 @@ constructor( InlinePrompt( inlinePrompt, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2195,7 +2194,7 @@ constructor( FunctionId( functionId, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2332,7 +2331,7 @@ constructor( projectName, slug, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2442,7 +2441,7 @@ constructor( } fun build(): GlobalFunction = - GlobalFunction(globalFunction, additionalProperties.toUnmodifiable()) + GlobalFunction(globalFunction, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -2587,7 +2586,7 @@ constructor( promptSessionId, promptSessionFunctionId, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2721,7 +2720,7 @@ constructor( inlineContext, code, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2807,7 +2806,7 @@ constructor( InlineContext( runtime, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -3006,7 +3005,7 @@ constructor( InlinePrompt( inlinePrompt, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -3077,7 +3076,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Experiment.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Experiment.kt index 7d6d775b..76a90944 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Experiment.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Experiment.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -364,7 +364,7 @@ private constructor( public_, userId, metadata, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -418,7 +418,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentCreateParams.kt index df88f2a2..446b35d3 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentCreateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -250,7 +250,7 @@ constructor( name, public_, repoInfo, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -445,9 +445,9 @@ constructor( name, public_, repoInfo, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -493,7 +493,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentDeleteParams.kt index d1522848..90a4dcb0 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): ExperimentDeleteParams = ExperimentDeleteParams( checkNotNull(experimentId) { "`experimentId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentEvent.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentEvent.kt index debb6043..a2b19b1e 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentEvent.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentEvent.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -633,14 +633,14 @@ private constructor( error, scores, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, metrics, context, spanId, - spanParents.map { it.toUnmodifiable() }, + spanParents.map { it.toImmutable() }, rootSpanId, spanAttributes, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -770,7 +770,7 @@ private constructor( callerFunctionname, callerFilename, callerLineno, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -851,7 +851,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1082,7 +1082,7 @@ private constructor( promptTokens, completionTokens, tokens, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1165,7 +1165,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1278,7 +1278,7 @@ private constructor( SpanAttributes( name, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFeedbackParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFeedbackParams.kt index 8b2a759e..d6fc77c1 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFeedbackParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFeedbackParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -98,8 +98,8 @@ constructor( fun build(): ExperimentFeedbackBody = ExperimentFeedbackBody( checkNotNull(feedback) { "`feedback` is required but was not set" } - .toUnmodifiable(), - additionalProperties.toUnmodifiable() + .toImmutable(), + additionalProperties.toImmutable() ) } @@ -239,11 +239,10 @@ constructor( fun build(): ExperimentFeedbackParams = ExperimentFeedbackParams( checkNotNull(experimentId) { "`experimentId` is required but was not set" }, - checkNotNull(feedback) { "`feedback` is required but was not set" } - .toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + checkNotNull(feedback) { "`feedback` is required but was not set" }.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt index cb530419..8e86da70 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -37,7 +37,7 @@ constructor( this.maxXactId?.let { params.put("max_xact_id", listOf(it.toString())) } this.version?.let { params.put("version", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -200,8 +200,8 @@ constructor( maxRootSpanId, maxXactId, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchPostParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchPostParams.kt index 36eafdcb..c0fa53ba 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchPostParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchPostParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -276,12 +276,12 @@ constructor( fun build(): ExperimentFetchPostBody = ExperimentFetchPostBody( cursor, - filters?.toUnmodifiable(), + filters?.toImmutable(), limit, maxRootSpanId, maxXactId, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -508,14 +508,14 @@ constructor( ExperimentFetchPostParams( checkNotNull(experimentId) { "`experimentId` is required but was not set" }, cursor, - if (filters.size == 0) null else filters.toUnmodifiable(), + if (filters.size == 0) null else filters.toImmutable(), limit, maxRootSpanId, maxXactId, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentInsertParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentInsertParams.kt index 728d5bdb..cc86d923 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentInsertParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentInsertParams.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -105,9 +105,8 @@ constructor( fun build(): ExperimentInsertBody = ExperimentInsertBody( - checkNotNull(events) { "`events` is required but was not set" } - .toUnmodifiable(), - additionalProperties.toUnmodifiable() + checkNotNull(events) { "`events` is required but was not set" }.toImmutable(), + additionalProperties.toImmutable() ) } @@ -247,10 +246,10 @@ constructor( fun build(): ExperimentInsertParams = ExperimentInsertParams( checkNotNull(experimentId) { "`experimentId` is required but was not set" }, - checkNotNull(events) { "`events` is required but was not set" }.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + checkNotNull(events) { "`events` is required but was not set" }.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListPage.kt index 4e6b5d8f..84f15d25 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.ExperimentService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -160,7 +160,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListPageAsync.kt index ff0a1487..9b7089c9 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.ExperimentServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -163,7 +163,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt index a2b8bb99..3e6a63f0 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -62,7 +62,7 @@ constructor( this.projectName?.let { params.put("project_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -222,8 +222,8 @@ constructor( projectId, projectName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentRetrieveParams.kt index ebb46148..3d683823 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): ExperimentRetrieveParams = ExperimentRetrieveParams( checkNotNull(experimentId) { "`experimentId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt index 8923ed07..1c7fa7dc 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -31,7 +31,7 @@ constructor( } this.summarizeScores?.let { params.put("summarize_scores", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -153,8 +153,8 @@ constructor( checkNotNull(experimentId) { "`experimentId` is required but was not set" }, comparisonExperimentId, summarizeScores, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentUpdateParams.kt index 37a22a12..5f690c3e 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -222,7 +222,7 @@ constructor( name, public_, repoInfo, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -407,9 +407,9 @@ constructor( name, public_, repoInfo, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -455,7 +455,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackDatasetItem.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackDatasetItem.kt index 3422a014..180d5da5 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackDatasetItem.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackDatasetItem.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -167,7 +167,7 @@ private constructor( comment, metadata, source, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -224,7 +224,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackExperimentItem.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackExperimentItem.kt index f05a762a..9a7f2303 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackExperimentItem.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackExperimentItem.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -223,7 +223,7 @@ private constructor( comment, metadata, source, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -280,7 +280,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -356,7 +356,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackProjectLogsItem.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackProjectLogsItem.kt index 776bee1a..46b6f743 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackProjectLogsItem.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackProjectLogsItem.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -223,7 +223,7 @@ private constructor( comment, metadata, source, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -280,7 +280,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -356,7 +356,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackResponseSchema.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackResponseSchema.kt index a14a83a4..f97ba0b6 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackResponseSchema.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FeedbackResponseSchema.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -81,7 +81,7 @@ private constructor( } fun build(): FeedbackResponseSchema = - FeedbackResponseSchema(status, additionalProperties.toUnmodifiable()) + FeedbackResponseSchema(status, additionalProperties.toImmutable()) } class Status diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchDatasetEventsResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchDatasetEventsResponse.kt index 6d3bd511..671c2340 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchDatasetEventsResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchDatasetEventsResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -122,9 +122,9 @@ private constructor( fun build(): FetchDatasetEventsResponse = FetchDatasetEventsResponse( - events.map { it.toUnmodifiable() }, + events.map { it.toImmutable() }, cursor, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchExperimentEventsResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchExperimentEventsResponse.kt index 6be52808..e8874422 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchExperimentEventsResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchExperimentEventsResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -122,9 +122,9 @@ private constructor( fun build(): FetchExperimentEventsResponse = FetchExperimentEventsResponse( - events.map { it.toUnmodifiable() }, + events.map { it.toImmutable() }, cursor, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchProjectLogsEventsResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchProjectLogsEventsResponse.kt index 49bebdf3..84c37b04 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchProjectLogsEventsResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FetchProjectLogsEventsResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -122,9 +122,9 @@ private constructor( fun build(): FetchProjectLogsEventsResponse = FetchProjectLogsEventsResponse( - events.map { it.toUnmodifiable() }, + events.map { it.toImmutable() }, cursor, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Function.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Function.kt index b81f35c2..b6981e01 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Function.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Function.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -390,13 +390,13 @@ private constructor( description, created, promptData, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, metadata, functionType, functionData, origin, functionSchema, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -600,7 +600,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Prompt = Prompt(type, additionalProperties.toUnmodifiable()) + fun build(): Prompt = Prompt(type, additionalProperties.toImmutable()) } class Type @@ -757,7 +757,7 @@ private constructor( Code( type, data, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1030,7 +1030,7 @@ private constructor( bundleId, preview, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1211,7 +1211,7 @@ private constructor( type, runtimeContext, code, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1302,7 +1302,7 @@ private constructor( RuntimeContext( runtime, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1616,7 +1616,7 @@ private constructor( Global( type, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1822,7 +1822,7 @@ private constructor( FunctionSchema( parameters, returns, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1966,7 +1966,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -2111,7 +2111,7 @@ private constructor( objectType, objectId, internal_, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionCreateParams.kt index 178000dd..12d2f166 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionCreateParams.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -234,8 +234,8 @@ constructor( functionType, origin, promptData, - tags?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + tags?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -434,10 +434,10 @@ constructor( functionType, origin, promptData, - if (tags.size == 0) null else tags.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + if (tags.size == 0) null else tags.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -641,7 +641,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Prompt = Prompt(type, additionalProperties.toUnmodifiable()) + fun build(): Prompt = Prompt(type, additionalProperties.toImmutable()) } class Type @@ -798,7 +798,7 @@ constructor( Code( type, data, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1068,7 +1068,7 @@ constructor( bundleId, preview, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1249,7 +1249,7 @@ constructor( type, runtimeContext, code, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1340,7 +1340,7 @@ constructor( RuntimeContext( runtime, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1654,7 +1654,7 @@ constructor( Global( type, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1793,7 +1793,7 @@ constructor( FunctionSchema( parameters, returns, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1969,7 +1969,7 @@ constructor( checkNotNull(objectType) { "`objectType` is required but was not set" }, checkNotNull(objectId) { "`objectId` is required but was not set" }, internal_, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionDeleteParams.kt index bbadeeff..70c05266 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): FunctionDeleteParams = FunctionDeleteParams( checkNotNull(functionId) { "`functionId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionInvokeParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionInvokeParams.kt index 6c16f962..d7eff11a 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionInvokeParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionInvokeParams.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -186,12 +186,12 @@ constructor( fun build(): FunctionInvokeBody = FunctionInvokeBody( input, - messages?.toUnmodifiable(), + messages?.toImmutable(), mode, parent, stream, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -368,14 +368,14 @@ constructor( FunctionInvokeParams( checkNotNull(functionId) { "`functionId` is required but was not set" }, input, - if (messages.size == 0) null else messages.toUnmodifiable(), + if (messages.size == 0) null else messages.toImmutable(), mode, parent, stream, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -676,7 +676,7 @@ constructor( content, role, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -849,7 +849,7 @@ constructor( content, role, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1176,8 +1176,8 @@ constructor( content, functionCall, name, - toolCalls.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + toolCalls.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } @@ -1316,7 +1316,7 @@ constructor( FunctionCall( arguments, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1462,7 +1462,7 @@ constructor( content, role, toolCallId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1635,7 +1635,7 @@ constructor( content, name, role, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1793,7 +1793,7 @@ constructor( Fallback( role, content, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2178,7 +2178,7 @@ constructor( objectId, rowIds, propagatedEvent, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2291,7 +2291,7 @@ constructor( } fun build(): PropagatedEvent = - PropagatedEvent(additionalProperties.toUnmodifiable()) + PropagatedEvent(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -2427,7 +2427,7 @@ constructor( id, spanId, rootSpanId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionInvokeResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionInvokeResponse.kt index da7f8dd4..854fbf3f 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionInvokeResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionInvokeResponse.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.databind.annotation.JsonDeserialize @@ -61,7 +61,7 @@ private constructor( } fun build(): FunctionInvokeResponse = - FunctionInvokeResponse(additionalProperties.toUnmodifiable()) + FunctionInvokeResponse(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListPage.kt index cd1d3a44..033c109b 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.FunctionService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -156,7 +156,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListPageAsync.kt index ba488e94..7a907505 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.FunctionServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -163,7 +163,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListParams.kt index 20350b57..771a250d 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -70,7 +70,7 @@ constructor( this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } this.version?.let { params.put("version", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -247,8 +247,8 @@ constructor( slug, startingAfter, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionReplaceParams.kt index 37051a80..0ea808d1 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionReplaceParams.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -234,8 +234,8 @@ constructor( functionType, origin, promptData, - tags?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + tags?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -434,10 +434,10 @@ constructor( functionType, origin, promptData, - if (tags.size == 0) null else tags.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + if (tags.size == 0) null else tags.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -641,7 +641,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Prompt = Prompt(type, additionalProperties.toUnmodifiable()) + fun build(): Prompt = Prompt(type, additionalProperties.toImmutable()) } class Type @@ -798,7 +798,7 @@ constructor( Code( type, data, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1068,7 +1068,7 @@ constructor( bundleId, preview, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1249,7 +1249,7 @@ constructor( type, runtimeContext, code, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1340,7 +1340,7 @@ constructor( RuntimeContext( runtime, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1654,7 +1654,7 @@ constructor( Global( type, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1793,7 +1793,7 @@ constructor( FunctionSchema( parameters, returns, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1969,7 +1969,7 @@ constructor( checkNotNull(objectType) { "`objectType` is required but was not set" }, checkNotNull(objectId) { "`objectId` is required but was not set" }, internal_, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionRetrieveParams.kt index ada64538..24c84097 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): FunctionRetrieveParams = FunctionRetrieveParams( checkNotNull(functionId) { "`functionId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionToolChoice.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionToolChoice.kt index 4c21b784..6964d2bf 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionToolChoice.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionToolChoice.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -78,7 +78,7 @@ private constructor( } fun build(): FunctionToolChoice = - FunctionToolChoice(name, additionalProperties.toUnmodifiable()) + FunctionToolChoice(name, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionUpdateParams.kt index a179f3b8..00e8a7d8 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionUpdateParams.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -171,8 +171,8 @@ constructor( functionData, name, promptData, - tags?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + tags?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -351,10 +351,10 @@ constructor( functionData, name, promptData, - if (tags.size == 0) null else tags.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + if (tags.size == 0) null else tags.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -579,7 +579,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Prompt = Prompt(type, additionalProperties.toUnmodifiable()) + fun build(): Prompt = Prompt(type, additionalProperties.toImmutable()) } class Type @@ -736,7 +736,7 @@ constructor( Code( type, data, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1006,7 +1006,7 @@ constructor( bundleId, preview, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1187,7 +1187,7 @@ constructor( type, runtimeContext, code, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1278,7 +1278,7 @@ constructor( RuntimeContext( runtime, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1592,7 +1592,7 @@ constructor( Global( type, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1718,8 +1718,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): NullableVariant = - NullableVariant(additionalProperties.toUnmodifiable()) + fun build(): NullableVariant = NullableVariant(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Group.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Group.kt index f82897d5..ad3cac21 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Group.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Group.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -283,9 +283,9 @@ private constructor( name, description, deletedAt, - memberUsers.map { it.toUnmodifiable() }, - memberGroups.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + memberUsers.map { it.toImmutable() }, + memberGroups.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupCreateParams.kt index 91245477..35722c3f 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupCreateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -166,10 +166,10 @@ constructor( GroupCreateBody( checkNotNull(name) { "`name` is required but was not set" }, description, - memberGroups?.toUnmodifiable(), - memberUsers?.toUnmodifiable(), + memberGroups?.toImmutable(), + memberUsers?.toImmutable(), orgName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -345,12 +345,12 @@ constructor( GroupCreateParams( checkNotNull(name) { "`name` is required but was not set" }, description, - if (memberGroups.size == 0) null else memberGroups.toUnmodifiable(), - if (memberUsers.size == 0) null else memberUsers.toUnmodifiable(), + if (memberGroups.size == 0) null else memberGroups.toImmutable(), + if (memberUsers.size == 0) null else memberUsers.toImmutable(), orgName, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupDeleteParams.kt index dd1df7ef..edb55533 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): GroupDeleteParams = GroupDeleteParams( checkNotNull(groupId) { "`groupId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListPage.kt index 1c96005e..fd65dbbe 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.GroupService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -150,7 +150,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListPageAsync.kt index 3f977879..b4ba90ad 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.GroupServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -153,7 +153,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListParams.kt index 79f31933..f2ccc6d9 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -54,7 +54,7 @@ constructor( this.orgName?.let { params.put("org_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -202,8 +202,8 @@ constructor( limit, orgName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupReplaceParams.kt index 347027b9..bcb78789 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupReplaceParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -166,10 +166,10 @@ constructor( GroupReplaceBody( checkNotNull(name) { "`name` is required but was not set" }, description, - memberGroups?.toUnmodifiable(), - memberUsers?.toUnmodifiable(), + memberGroups?.toImmutable(), + memberUsers?.toImmutable(), orgName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -345,12 +345,12 @@ constructor( GroupReplaceParams( checkNotNull(name) { "`name` is required but was not set" }, description, - if (memberGroups.size == 0) null else memberGroups.toUnmodifiable(), - if (memberUsers.size == 0) null else memberUsers.toUnmodifiable(), + if (memberGroups.size == 0) null else memberGroups.toImmutable(), + if (memberUsers.size == 0) null else memberUsers.toImmutable(), orgName, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupRetrieveParams.kt index a4b5bae1..efd1b184 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): GroupRetrieveParams = GroupRetrieveParams( checkNotNull(groupId) { "`groupId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupUpdateParams.kt index 94ff5248..375a08d2 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -178,13 +178,13 @@ constructor( fun build(): GroupUpdateBody = GroupUpdateBody( - addMemberGroups?.toUnmodifiable(), - addMemberUsers?.toUnmodifiable(), + addMemberGroups?.toImmutable(), + addMemberUsers?.toImmutable(), description, name, - removeMemberGroups?.toUnmodifiable(), - removeMemberUsers?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + removeMemberGroups?.toImmutable(), + removeMemberUsers?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -375,15 +375,15 @@ constructor( fun build(): GroupUpdateParams = GroupUpdateParams( checkNotNull(groupId) { "`groupId` is required but was not set" }, - if (addMemberGroups.size == 0) null else addMemberGroups.toUnmodifiable(), - if (addMemberUsers.size == 0) null else addMemberUsers.toUnmodifiable(), + if (addMemberGroups.size == 0) null else addMemberGroups.toImmutable(), + if (addMemberUsers.size == 0) null else addMemberUsers.toImmutable(), description, name, - if (removeMemberGroups.size == 0) null else removeMemberGroups.toUnmodifiable(), - if (removeMemberUsers.size == 0) null else removeMemberUsers.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + if (removeMemberGroups.size == 0) null else removeMemberGroups.toImmutable(), + if (removeMemberUsers.size == 0) null else removeMemberUsers.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertDatasetEventMerge.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertDatasetEventMerge.kt index 4445f55c..d2f57519 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertDatasetEventMerge.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertDatasetEventMerge.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -381,13 +381,13 @@ private constructor( input, expected, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, id, created, _objectDelete, _isMerge, - _mergePaths.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + _mergePaths.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } @@ -447,7 +447,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertDatasetEventReplace.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertDatasetEventReplace.kt index 62b686cb..7e0e8227 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertDatasetEventReplace.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertDatasetEventReplace.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -374,13 +374,13 @@ private constructor( input, expected, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, id, created, _objectDelete, _isMerge, _parentId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -440,7 +440,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertEventsResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertEventsResponse.kt index 4daad75e..49e6a262 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertEventsResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertEventsResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -93,8 +93,8 @@ private constructor( fun build(): InsertEventsResponse = InsertEventsResponse( - rowIds.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable() + rowIds.map { it.toImmutable() }, + additionalProperties.toImmutable() ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertExperimentEventMerge.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertExperimentEventMerge.kt index a757f159..347e678b 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertExperimentEventMerge.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertExperimentEventMerge.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -634,7 +634,7 @@ private constructor( error, scores, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, metrics, context, spanAttributes, @@ -643,8 +643,8 @@ private constructor( created, _objectDelete, _isMerge, - _mergePaths.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + _mergePaths.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } @@ -774,7 +774,7 @@ private constructor( callerFunctionname, callerFilename, callerLineno, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -855,7 +855,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1086,7 +1086,7 @@ private constructor( promptTokens, completionTokens, tokens, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1169,7 +1169,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1282,7 +1282,7 @@ private constructor( SpanAttributes( name, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertExperimentEventReplace.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertExperimentEventReplace.kt index f939b6da..534b5552 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertExperimentEventReplace.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertExperimentEventReplace.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -627,7 +627,7 @@ private constructor( error, scores, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, metrics, context, spanAttributes, @@ -637,7 +637,7 @@ private constructor( _objectDelete, _isMerge, _parentId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -767,7 +767,7 @@ private constructor( callerFunctionname, callerFilename, callerLineno, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -848,7 +848,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1079,7 +1079,7 @@ private constructor( promptTokens, completionTokens, tokens, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1162,7 +1162,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1275,7 +1275,7 @@ private constructor( SpanAttributes( name, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertProjectLogsEventMerge.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertProjectLogsEventMerge.kt index 5ec14eb3..d6b9ec48 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertProjectLogsEventMerge.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertProjectLogsEventMerge.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -587,7 +587,7 @@ private constructor( error, scores, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, metrics, context, spanAttributes, @@ -595,8 +595,8 @@ private constructor( created, _objectDelete, _isMerge, - _mergePaths.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + _mergePaths.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } @@ -726,7 +726,7 @@ private constructor( callerFunctionname, callerFilename, callerLineno, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -807,7 +807,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1038,7 +1038,7 @@ private constructor( promptTokens, completionTokens, tokens, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1121,7 +1121,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1234,7 +1234,7 @@ private constructor( SpanAttributes( name, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertProjectLogsEventReplace.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertProjectLogsEventReplace.kt index 8b1ee414..077294aa 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertProjectLogsEventReplace.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/InsertProjectLogsEventReplace.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -580,7 +580,7 @@ private constructor( error, scores, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, metrics, context, spanAttributes, @@ -589,7 +589,7 @@ private constructor( _objectDelete, _isMerge, _parentId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -719,7 +719,7 @@ private constructor( callerFunctionname, callerFilename, callerLineno, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -800,7 +800,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1031,7 +1031,7 @@ private constructor( promptTokens, completionTokens, tokens, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1114,7 +1114,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1227,7 +1227,7 @@ private constructor( SpanAttributes( name, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/MetricSummary.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/MetricSummary.kt index 4336a5f1..029e9b9c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/MetricSummary.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/MetricSummary.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -181,7 +181,7 @@ private constructor( diff, improvements, regressions, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OnlineScoreConfig.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OnlineScoreConfig.kt index 9c8a1620..79c3826c 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OnlineScoreConfig.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OnlineScoreConfig.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -161,10 +161,10 @@ private constructor( fun build(): OnlineScoreConfig = OnlineScoreConfig( samplingRate, - scorers.map { it.toUnmodifiable() }, + scorers.map { it.toImmutable() }, applyToRootSpan, - applyToSpanNames.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + applyToSpanNames.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } @@ -367,7 +367,7 @@ private constructor( Function( type, id, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -525,7 +525,7 @@ private constructor( Global( type, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Organization.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Organization.kt index a586fcb4..1baae702 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Organization.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Organization.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -186,7 +186,7 @@ private constructor( proxyUrl, realtimeUrl, created, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationDeleteParams.kt index 3e5294c1..8867b84a 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): OrganizationDeleteParams = OrganizationDeleteParams( checkNotNull(organizationId) { "`organizationId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListPage.kt index 6555fc93..d9617280 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.OrganizationService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -160,7 +160,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListPageAsync.kt index 1f73b9f9..e3e67824 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.OrganizationServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -163,7 +163,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListParams.kt index fca42385..1d93a5a4 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -50,7 +50,7 @@ constructor( this.orgName?.let { params.put("org_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -192,8 +192,8 @@ constructor( limit, orgName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationMemberUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationMemberUpdateParams.kt index 6cacca69..31d58e68 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationMemberUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationMemberUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -152,7 +152,7 @@ constructor( orgId, orgName, removeUsers, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -307,9 +307,9 @@ constructor( orgId, orgName, removeUsers, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -428,14 +428,14 @@ constructor( fun build(): InviteUsers = InviteUsers( - ids?.toUnmodifiable(), - emails?.toUnmodifiable(), + ids?.toImmutable(), + emails?.toImmutable(), sendInviteEmails, - groupIds?.toUnmodifiable(), - groupNames?.toUnmodifiable(), + groupIds?.toImmutable(), + groupNames?.toImmutable(), groupId, groupName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -523,9 +523,9 @@ constructor( fun build(): RemoveUsers = RemoveUsers( - ids?.toUnmodifiable(), - emails?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + ids?.toImmutable(), + emails?.toImmutable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationRetrieveParams.kt index 63569b8a..b55457db 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): OrganizationRetrieveParams = OrganizationRetrieveParams( checkNotNull(organizationId) { "`organizationId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationUpdateParams.kt index 468cef37..c3e24b6e 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -152,7 +152,7 @@ constructor( name, proxyUrl, realtimeUrl, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -307,9 +307,9 @@ constructor( name, proxyUrl, realtimeUrl, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PatchOrganizationMembersOutput.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PatchOrganizationMembersOutput.kt index f7948d50..7b98d59d 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PatchOrganizationMembersOutput.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PatchOrganizationMembersOutput.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -118,7 +118,7 @@ private constructor( PatchOrganizationMembersOutput( status, sendEmailError, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PathLookupFilter.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PathLookupFilter.kt index 5dc888a5..84540bbc 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PathLookupFilter.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PathLookupFilter.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -156,9 +156,9 @@ private constructor( fun build(): PathLookupFilter = PathLookupFilter( type, - path.map { it.toUnmodifiable() }, + path.map { it.toImmutable() }, value, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Project.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Project.kt index 8b2ed686..d5339198 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Project.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Project.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -196,7 +196,7 @@ private constructor( deletedAt, userId, settings, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectCreateParams.kt index bcb55527..9d8ce8a0 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectCreateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -112,7 +112,7 @@ constructor( ProjectCreateBody( checkNotNull(name) { "`name` is required but was not set" }, orgName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -251,9 +251,9 @@ constructor( ProjectCreateParams( checkNotNull(name) { "`name` is required but was not set" }, orgName, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectDeleteParams.kt index 132d0c2a..779b3b69 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): ProjectDeleteParams = ProjectDeleteParams( checkNotNull(projectId) { "`projectId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListPage.kt index fece2a7d..5635ae73 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.ProjectService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -156,7 +156,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListPageAsync.kt index 401fb412..a019b26b 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.ProjectServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -163,7 +163,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListParams.kt index 19ebdba0..6abf8388 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -54,7 +54,7 @@ constructor( this.projectName?.let { params.put("project_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -202,8 +202,8 @@ constructor( orgName, projectName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFeedbackParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFeedbackParams.kt index b94e9eb8..953e3ef1 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFeedbackParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFeedbackParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -98,8 +98,8 @@ constructor( fun build(): ProjectLogFeedbackBody = ProjectLogFeedbackBody( checkNotNull(feedback) { "`feedback` is required but was not set" } - .toUnmodifiable(), - additionalProperties.toUnmodifiable() + .toImmutable(), + additionalProperties.toImmutable() ) } @@ -239,11 +239,10 @@ constructor( fun build(): ProjectLogFeedbackParams = ProjectLogFeedbackParams( checkNotNull(projectId) { "`projectId` is required but was not set" }, - checkNotNull(feedback) { "`feedback` is required but was not set" } - .toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + checkNotNull(feedback) { "`feedback` is required but was not set" }.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchParams.kt index c24ff3ad..ac72c562 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -37,7 +37,7 @@ constructor( this.maxXactId?.let { params.put("max_xact_id", listOf(it.toString())) } this.version?.let { params.put("version", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -200,8 +200,8 @@ constructor( maxRootSpanId, maxXactId, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchPostParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchPostParams.kt index 8b156a99..016acf59 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchPostParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchPostParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -276,12 +276,12 @@ constructor( fun build(): ProjectLogFetchPostBody = ProjectLogFetchPostBody( cursor, - filters?.toUnmodifiable(), + filters?.toImmutable(), limit, maxRootSpanId, maxXactId, version, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -508,14 +508,14 @@ constructor( ProjectLogFetchPostParams( checkNotNull(projectId) { "`projectId` is required but was not set" }, cursor, - if (filters.size == 0) null else filters.toUnmodifiable(), + if (filters.size == 0) null else filters.toImmutable(), limit, maxRootSpanId, maxXactId, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogInsertParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogInsertParams.kt index 02042d61..a1ea28fc 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogInsertParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogInsertParams.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -105,9 +105,8 @@ constructor( fun build(): ProjectLogInsertBody = ProjectLogInsertBody( - checkNotNull(events) { "`events` is required but was not set" } - .toUnmodifiable(), - additionalProperties.toUnmodifiable() + checkNotNull(events) { "`events` is required but was not set" }.toImmutable(), + additionalProperties.toImmutable() ) } @@ -247,10 +246,10 @@ constructor( fun build(): ProjectLogInsertParams = ProjectLogInsertParams( checkNotNull(projectId) { "`projectId` is required but was not set" }, - checkNotNull(events) { "`events` is required but was not set" }.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + checkNotNull(events) { "`events` is required but was not set" }.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogsEvent.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogsEvent.kt index baabf2e2..4b00e9ed 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogsEvent.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogsEvent.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -604,14 +604,14 @@ private constructor( error, scores, metadata, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, metrics, context, spanId, - spanParents.map { it.toUnmodifiable() }, + spanParents.map { it.toImmutable() }, rootSpanId, spanAttributes, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -792,7 +792,7 @@ private constructor( callerFunctionname, callerFilename, callerLineno, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -873,7 +873,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1104,7 +1104,7 @@ private constructor( promptTokens, completionTokens, tokens, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1187,7 +1187,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1300,7 +1300,7 @@ private constructor( SpanAttributes( name, type, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectRetrieveParams.kt index 8c8116df..d9b3f9e0 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): ProjectRetrieveParams = ProjectRetrieveParams( checkNotNull(projectId) { "`projectId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScore.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScore.kt index 56f66f2a..50a0170c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScore.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScore.kt @@ -10,7 +10,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -260,7 +260,7 @@ private constructor( categories, config, position, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -480,7 +480,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Weighted = Weighted(additionalProperties.toUnmodifiable()) + fun build(): Weighted = Weighted(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -553,8 +553,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): NullableVariant = - NullableVariant(additionalProperties.toUnmodifiable()) + fun build(): NullableVariant = NullableVariant(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCategory.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCategory.kt index b131ecb5..79db9fbd 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCategory.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCategory.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -104,7 +104,7 @@ private constructor( ProjectScoreCategory( name, value, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreConfig.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreConfig.kt index b60f236b..1bf51379 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreConfig.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreConfig.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -118,7 +118,7 @@ private constructor( multiSelect, destination, online, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCreateParams.kt index f721e169..5ca6975c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCreateParams.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -173,7 +173,7 @@ constructor( categories, config, description, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -351,9 +351,9 @@ constructor( categories, config, description, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -573,7 +573,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Weighted = Weighted(additionalProperties.toUnmodifiable()) + fun build(): Weighted = Weighted(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -646,8 +646,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): NullableVariant = - NullableVariant(additionalProperties.toUnmodifiable()) + fun build(): NullableVariant = NullableVariant(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreDeleteParams.kt index a528d830..8b3ff920 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): ProjectScoreDeleteParams = ProjectScoreDeleteParams( checkNotNull(projectScoreId) { "`projectScoreId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListPage.kt index b7a3af06..ce5bf53e 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.ProjectScoreService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -160,7 +160,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListPageAsync.kt index 6efe963c..1f09685c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.ProjectScoreServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -163,7 +163,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListParams.kt index ab95668d..dfce9e0b 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -66,7 +66,7 @@ constructor( this.scoreType?.let { params.put("score_type", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -244,8 +244,8 @@ constructor( projectScoreName, scoreType, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreReplaceParams.kt index 704ca8a7..2a7baf73 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreReplaceParams.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -173,7 +173,7 @@ constructor( categories, config, description, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -351,9 +351,9 @@ constructor( categories, config, description, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -573,7 +573,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Weighted = Weighted(additionalProperties.toUnmodifiable()) + fun build(): Weighted = Weighted(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -646,8 +646,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): NullableVariant = - NullableVariant(additionalProperties.toUnmodifiable()) + fun build(): NullableVariant = NullableVariant(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreRetrieveParams.kt index 7ff755d1..37919485 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): ProjectScoreRetrieveParams = ProjectScoreRetrieveParams( checkNotNull(projectScoreId) { "`projectScoreId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreUpdateParams.kt index eea95b00..d43edfaf 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreUpdateParams.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -168,7 +168,7 @@ constructor( description, name, scoreType, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -346,9 +346,9 @@ constructor( description, name, scoreType, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -568,7 +568,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Weighted = Weighted(additionalProperties.toUnmodifiable()) + fun build(): Weighted = Weighted(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -641,8 +641,7 @@ constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): NullableVariant = - NullableVariant(additionalProperties.toUnmodifiable()) + fun build(): NullableVariant = NullableVariant(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectSettings.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectSettings.kt index d14a8707..dddda0c9 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectSettings.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectSettings.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -86,7 +86,7 @@ private constructor( } fun build(): ProjectSettings = - ProjectSettings(comparisonKey, additionalProperties.toUnmodifiable()) + ProjectSettings(comparisonKey, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTag.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTag.kt index aa10d385..55a488a0 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTag.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTag.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -199,7 +199,7 @@ private constructor( name, description, color, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagCreateParams.kt index f31204d8..fc5ebb1f 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagCreateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -133,7 +133,7 @@ constructor( checkNotNull(projectId) { "`projectId` is required but was not set" }, color, description, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -280,9 +280,9 @@ constructor( checkNotNull(projectId) { "`projectId` is required but was not set" }, color, description, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagDeleteParams.kt index 71458816..3580cb93 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): ProjectTagDeleteParams = ProjectTagDeleteParams( checkNotNull(projectTagId) { "`projectTagId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListPage.kt index f93071d5..ac4fbfea 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.ProjectTagService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -160,7 +160,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListPageAsync.kt index aee77897..2ba47420 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.ProjectTagServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -163,7 +163,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListParams.kt index 9b43b54d..8f83d31c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -62,7 +62,7 @@ constructor( this.projectTagName?.let { params.put("project_tag_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -222,8 +222,8 @@ constructor( projectName, projectTagName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagReplaceParams.kt index 51a0bdba..1be2b74e 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagReplaceParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -133,7 +133,7 @@ constructor( checkNotNull(projectId) { "`projectId` is required but was not set" }, color, description, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -280,9 +280,9 @@ constructor( checkNotNull(projectId) { "`projectId` is required but was not set" }, color, description, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagRetrieveParams.kt index 90f5a22a..68ffb3fc 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): ProjectTagRetrieveParams = ProjectTagRetrieveParams( checkNotNull(projectTagId) { "`projectTagId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagUpdateParams.kt index 3641ff1a..3add1220 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -128,7 +128,7 @@ constructor( color, description, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -275,9 +275,9 @@ constructor( color, description, name, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectUpdateParams.kt index 505467b5..f550e9de 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -120,7 +120,7 @@ constructor( ProjectUpdateBody( name, settings, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -264,9 +264,9 @@ constructor( checkNotNull(projectId) { "`projectId` is required but was not set" }, name, settings, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Prompt.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Prompt.kt index e4c891cf..438b3ad8 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Prompt.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Prompt.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -329,10 +329,10 @@ private constructor( description, created, promptData, - tags.map { it.toUnmodifiable() }, + tags.map { it.toImmutable() }, metadata, functionType, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -506,7 +506,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metadata = Metadata(additionalProperties.toUnmodifiable()) + fun build(): Metadata = Metadata(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptCreateParams.kt index d31c2b09..0ae9e9c5 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptCreateParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -180,8 +180,8 @@ constructor( description, functionType, promptData, - tags?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + tags?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -350,10 +350,10 @@ constructor( description, functionType, promptData, - if (tags.size == 0) null else tags.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + if (tags.size == 0) null else tags.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptData.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptData.kt index ef3c319f..dcf2ff85 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptData.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptData.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -156,9 +156,9 @@ private constructor( prompt, options, parser, - toolFunctions.map { it.toUnmodifiable() }, + toolFunctions.map { it.toImmutable() }, origin, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -258,7 +258,7 @@ private constructor( model, params, position, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -720,8 +720,8 @@ private constructor( toolChoice, functionCall, n, - stop.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + stop.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } @@ -1028,7 +1028,7 @@ private constructor( ) = apply { this.additionalProperties.putAll(additionalProperties) } fun build(): Function = - Function(name, additionalProperties.toUnmodifiable()) + Function(name, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1119,7 +1119,7 @@ private constructor( ) = apply { this.additionalProperties.putAll(additionalProperties) } fun build(): ResponseFormat = - ResponseFormat(type, additionalProperties.toUnmodifiable()) + ResponseFormat(type, additionalProperties.toImmutable()) } class Type @@ -1390,9 +1390,9 @@ private constructor( temperature, topP, topK, - stopSequences.map { it.toUnmodifiable() }, + stopSequences.map { it.toImmutable() }, maxTokensToSample, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1554,7 +1554,7 @@ private constructor( maxOutputTokens, topP, topK, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1680,7 +1680,7 @@ private constructor( useCache, temperature, topK, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -1771,7 +1771,7 @@ private constructor( } fun build(): JsCompletionParams = - JsCompletionParams(useCache, additionalProperties.toUnmodifiable()) + JsCompletionParams(useCache, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -1916,7 +1916,7 @@ private constructor( promptId, projectId, promptVersion, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2039,7 +2039,7 @@ private constructor( type, useCot, choiceScores, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2093,7 +2093,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): ChoiceScores = ChoiceScores(additionalProperties.toUnmodifiable()) + fun build(): ChoiceScores = ChoiceScores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -2408,7 +2408,7 @@ private constructor( Completion( type, content, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2581,9 +2581,9 @@ private constructor( fun build(): Chat = Chat( type, - messages.map { it.toUnmodifiable() }, + messages.map { it.toImmutable() }, tools, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -2887,7 +2887,7 @@ private constructor( content, role, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -3063,7 +3063,7 @@ private constructor( content, role, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -3401,8 +3401,8 @@ private constructor( content, functionCall, name, - toolCalls.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + toolCalls.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } @@ -3543,7 +3543,7 @@ private constructor( FunctionCall( arguments, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -3691,7 +3691,7 @@ private constructor( content, role, toolCallId, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -3867,7 +3867,7 @@ private constructor( content, name, role, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -4028,7 +4028,7 @@ private constructor( Fallback( role, content, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -4228,8 +4228,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): NullableVariant = - NullableVariant(additionalProperties.toUnmodifiable()) + fun build(): NullableVariant = NullableVariant(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -4452,7 +4451,7 @@ private constructor( Function( type, id, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -4610,7 +4609,7 @@ private constructor( Global( type, name, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptDeleteParams.kt index 197004ad..84239868 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): PromptDeleteParams = PromptDeleteParams( checkNotNull(promptId) { "`promptId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListPage.kt index c7ca805e..0e8d72a0 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.PromptService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -150,7 +150,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListPageAsync.kt index c55289e4..c7aa8ec6 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.PromptServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -153,7 +153,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListParams.kt index 28984928..d7d2c273 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -70,7 +70,7 @@ constructor( this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } this.version?.let { params.put("version", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -247,8 +247,8 @@ constructor( slug, startingAfter, version, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptReplaceParams.kt index 9b731273..32cbcf9e 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptReplaceParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -180,8 +180,8 @@ constructor( description, functionType, promptData, - tags?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + tags?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -350,10 +350,10 @@ constructor( description, functionType, promptData, - if (tags.size == 0) null else tags.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + if (tags.size == 0) null else tags.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptRetrieveParams.kt index ace5c98d..4d7b1c25 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): PromptRetrieveParams = PromptRetrieveParams( checkNotNull(promptId) { "`promptId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptUpdateParams.kt index f03ef924..f219fa4c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptUpdateParams.kt @@ -5,7 +5,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -156,8 +156,8 @@ constructor( name, promptData, slug, - tags?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + tags?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -321,10 +321,10 @@ constructor( name, promptData, slug, - if (tags.size == 0) null else tags.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + if (tags.size == 0) null else tags.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RepoInfo.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RepoInfo.kt index d57bd593..135364d3 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RepoInfo.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RepoInfo.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -254,7 +254,7 @@ private constructor( commitMessage, commitTime, gitDiff, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Role.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Role.kt index 610b1156..9f311854 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Role.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Role.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -299,9 +299,9 @@ private constructor( name, description, deletedAt, - memberPermissions.map { it.toUnmodifiable() }, - memberRoles.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + memberPermissions.map { it.toImmutable() }, + memberRoles.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } @@ -420,7 +420,7 @@ private constructor( MemberPermission( permission, restrictObjectType, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleCreateParams.kt index 4d55e6e5..ed2bbe33 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleCreateParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -172,10 +172,10 @@ constructor( RoleCreateBody( checkNotNull(name) { "`name` is required but was not set" }, description, - memberPermissions?.toUnmodifiable(), - memberRoles?.toUnmodifiable(), + memberPermissions?.toImmutable(), + memberRoles?.toImmutable(), orgName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -353,12 +353,12 @@ constructor( RoleCreateParams( checkNotNull(name) { "`name` is required but was not set" }, description, - if (memberPermissions.size == 0) null else memberPermissions.toUnmodifiable(), - if (memberRoles.size == 0) null else memberRoles.toUnmodifiable(), + if (memberPermissions.size == 0) null else memberPermissions.toImmutable(), + if (memberRoles.size == 0) null else memberRoles.toImmutable(), orgName, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -439,7 +439,7 @@ constructor( MemberPermission( checkNotNull(permission) { "`permission` is required but was not set" }, restrictObjectType, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleDeleteParams.kt index 0423855c..3d3e82d4 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleDeleteParams.kt @@ -4,7 +4,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects import java.util.Optional @@ -139,9 +139,9 @@ constructor( fun build(): RoleDeleteParams = RoleDeleteParams( checkNotNull(roleId) { "`roleId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListPage.kt index 99125be5..b78f7bec 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.RoleService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -150,7 +150,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListPageAsync.kt index 14597025..452fb9b6 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.RoleServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -153,7 +153,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListParams.kt index 44250688..0d0b9824 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -54,7 +54,7 @@ constructor( this.roleName?.let { params.put("role_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -202,8 +202,8 @@ constructor( orgName, roleName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleReplaceParams.kt index a9d35087..a46e8966 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleReplaceParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -172,10 +172,10 @@ constructor( RoleReplaceBody( checkNotNull(name) { "`name` is required but was not set" }, description, - memberPermissions?.toUnmodifiable(), - memberRoles?.toUnmodifiable(), + memberPermissions?.toImmutable(), + memberRoles?.toImmutable(), orgName, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -353,12 +353,12 @@ constructor( RoleReplaceParams( checkNotNull(name) { "`name` is required but was not set" }, description, - if (memberPermissions.size == 0) null else memberPermissions.toUnmodifiable(), - if (memberRoles.size == 0) null else memberRoles.toUnmodifiable(), + if (memberPermissions.size == 0) null else memberPermissions.toImmutable(), + if (memberRoles.size == 0) null else memberRoles.toImmutable(), orgName, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -439,7 +439,7 @@ constructor( MemberPermission( checkNotNull(permission) { "`permission` is required but was not set" }, restrictObjectType, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleRetrieveParams.kt index 7bcb1535..31122bef 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): RoleRetrieveParams = RoleRetrieveParams( checkNotNull(roleId) { "`roleId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleUpdateParams.kt index edf284f2..6fa82247 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleUpdateParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -186,13 +186,13 @@ constructor( fun build(): RoleUpdateBody = RoleUpdateBody( - addMemberPermissions?.toUnmodifiable(), - addMemberRoles?.toUnmodifiable(), + addMemberPermissions?.toImmutable(), + addMemberRoles?.toImmutable(), description, name, - removeMemberPermissions?.toUnmodifiable(), - removeMemberRoles?.toUnmodifiable(), - additionalProperties.toUnmodifiable(), + removeMemberPermissions?.toImmutable(), + removeMemberRoles?.toImmutable(), + additionalProperties.toImmutable(), ) } @@ -383,16 +383,16 @@ constructor( fun build(): RoleUpdateParams = RoleUpdateParams( checkNotNull(roleId) { "`roleId` is required but was not set" }, - if (addMemberPermissions.size == 0) null else addMemberPermissions.toUnmodifiable(), - if (addMemberRoles.size == 0) null else addMemberRoles.toUnmodifiable(), + if (addMemberPermissions.size == 0) null else addMemberPermissions.toImmutable(), + if (addMemberRoles.size == 0) null else addMemberRoles.toImmutable(), description, name, if (removeMemberPermissions.size == 0) null - else removeMemberPermissions.toUnmodifiable(), - if (removeMemberRoles.size == 0) null else removeMemberRoles.toUnmodifiable(), - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + else removeMemberPermissions.toImmutable(), + if (removeMemberRoles.size == 0) null else removeMemberRoles.toImmutable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } @@ -473,7 +473,7 @@ constructor( AddMemberPermission( checkNotNull(permission) { "`permission` is required but was not set" }, restrictObjectType, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -780,7 +780,7 @@ constructor( RemoveMemberPermission( checkNotNull(permission) { "`permission` is required but was not set" }, restrictObjectType, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ScoreSummary.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ScoreSummary.kt index b274297a..7d0c76cf 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ScoreSummary.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ScoreSummary.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -162,7 +162,7 @@ private constructor( diff, improvements, regressions, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Scorer.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Scorer.kt index 8276a02d..9ddb4683 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Scorer.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Scorer.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -98,7 +98,7 @@ private constructor( Scorer( type, index, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SummarizeDatasetResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SummarizeDatasetResponse.kt index de9121fa..178d3cc7 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SummarizeDatasetResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SummarizeDatasetResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -165,7 +165,7 @@ private constructor( projectUrl, datasetUrl, dataSummary, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SummarizeExperimentResponse.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SummarizeExperimentResponse.kt index 4048ae6c..1a2564f4 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SummarizeExperimentResponse.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SummarizeExperimentResponse.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -210,7 +210,7 @@ private constructor( comparisonExperimentName, scores, metrics, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -264,7 +264,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Metrics = Metrics(additionalProperties.toUnmodifiable()) + fun build(): Metrics = Metrics(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -337,7 +337,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Scores = Scores(additionalProperties.toUnmodifiable()) + fun build(): Scores = Scores(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Task.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Task.kt index 9a57685d..9b854bee 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Task.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/Task.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -80,7 +80,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): Task = Task(type, additionalProperties.toUnmodifiable()) + fun build(): Task = Task(type, additionalProperties.toImmutable()) } class Type diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ToolChoice.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ToolChoice.kt index 33a4c796..13f3209d 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ToolChoice.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ToolChoice.kt @@ -11,7 +11,7 @@ import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -344,7 +344,7 @@ private constructor( Function( type, function, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/TopLevelHelloWorldParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/TopLevelHelloWorldParams.kt index 957a80ca..66a34ed3 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/TopLevelHelloWorldParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/TopLevelHelloWorldParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -97,8 +97,8 @@ constructor( fun build(): TopLevelHelloWorldParams = TopLevelHelloWorldParams( - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable() + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable() ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/User.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/User.kt index 039c11c8..b3563520 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/User.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/User.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -179,7 +179,7 @@ private constructor( email, avatarUrl, created, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListPage.kt index 388aad00..8a7c8b9a 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.UserService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -150,7 +150,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListPageAsync.kt index e4f5560e..3698364c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.UserServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -153,7 +153,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListParams.kt index ee2d46b6..7f5a0e82 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.BaseSerializer import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.core.JsonGenerator @@ -62,7 +62,7 @@ constructor( this.orgName?.let { params.put("org_name", listOf(it.toString())) } this.startingAfter?.let { params.put("starting_after", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -271,8 +271,8 @@ constructor( limit, orgName, startingAfter, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserRetrieveParams.kt index 32c8279c..65d235d6 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserRetrieveParams.kt @@ -3,7 +3,7 @@ package com.braintrustdata.api.models import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.models.* import java.util.Objects @@ -113,8 +113,8 @@ constructor( fun build(): UserRetrieveParams = UserRetrieveParams( checkNotNull(userId) { "`userId` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/View.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/View.kt index 79698b99..7a28ec96 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/View.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/View.kt @@ -8,7 +8,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -259,7 +259,7 @@ private constructor( options, userId, deletedAt, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewCreateParams.kt index 1671609d..19f48c82 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewCreateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewCreateParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -198,7 +198,7 @@ constructor( options, userId, viewData, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -369,9 +369,9 @@ constructor( options, userId, viewData, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewData.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewData.kt index 06bb2708..80c4da3f 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewData.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewData.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -79,7 +79,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): ViewData = ViewData(search, additionalProperties.toUnmodifiable()) + fun build(): ViewData = ViewData(search, additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewDataSearch.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewDataSearch.kt index 9381f892..881c8201 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewDataSearch.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewDataSearch.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -122,11 +122,11 @@ private constructor( fun build(): ViewDataSearch = ViewDataSearch( - filter.map { it.toUnmodifiable() }, - tag.map { it.toUnmodifiable() }, - match.map { it.toUnmodifiable() }, - sort.map { it.toUnmodifiable() }, - additionalProperties.toUnmodifiable(), + filter.map { it.toImmutable() }, + tag.map { it.toImmutable() }, + match.map { it.toImmutable() }, + sort.map { it.toImmutable() }, + additionalProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewDeleteParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewDeleteParams.kt index ec6007a6..47a98109 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewDeleteParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewDeleteParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -118,7 +118,7 @@ constructor( ViewDeleteBody( checkNotNull(objectId) { "`objectId` is required but was not set" }, checkNotNull(objectType) { "`objectType` is required but was not set" }, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -259,9 +259,9 @@ constructor( checkNotNull(viewId) { "`viewId` is required but was not set" }, checkNotNull(objectId) { "`objectId` is required but was not set" }, checkNotNull(objectType) { "`objectType` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListPage.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListPage.kt index c6968b6b..33f66db2 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListPage.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListPage.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.blocking.ViewService import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -150,7 +150,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListPageAsync.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListPageAsync.kt index 305931bf..eb9f0a24 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListPageAsync.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListPageAsync.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.services.async.ViewServiceAsync import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter @@ -153,7 +153,7 @@ private constructor( this.additionalProperties.put(key, value) } - fun build() = Response(objects, additionalProperties.toUnmodifiable()) + fun build() = Response(objects, additionalProperties.toImmutable()) } } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListParams.kt index 012100a8..92ef1a8b 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListParams.kt @@ -9,7 +9,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect import com.braintrustdata.api.core.getOrThrow -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonCreator @@ -65,7 +65,7 @@ constructor( this.viewName?.let { params.put("view_name", listOf(it.toString())) } this.viewType?.let { params.put("view_type", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -225,8 +225,8 @@ constructor( startingAfter, viewName, viewType, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewOptions.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewOptions.kt index 816d8937..eeb08af4 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewOptions.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewOptions.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonMissing import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonProperty @@ -120,9 +120,9 @@ private constructor( fun build(): ViewOptions = ViewOptions( columnVisibility, - columnOrder.map { it.toUnmodifiable() }, + columnOrder.map { it.toImmutable() }, columnSizing, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -175,7 +175,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): ColumnSizing = ColumnSizing(additionalProperties.toUnmodifiable()) + fun build(): ColumnSizing = ColumnSizing(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { @@ -247,7 +247,7 @@ private constructor( this.additionalProperties.putAll(additionalProperties) } - fun build(): ColumnVisibility = ColumnVisibility(additionalProperties.toUnmodifiable()) + fun build(): ColumnVisibility = ColumnVisibility(additionalProperties.toImmutable()) } override fun equals(other: Any?): Boolean { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewReplaceParams.kt index c16c3983..020d436f 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewReplaceParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewReplaceParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -198,7 +198,7 @@ constructor( options, userId, viewData, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -369,9 +369,9 @@ constructor( options, userId, viewData, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewRetrieveParams.kt index d5c72ce1..022cb326 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewRetrieveParams.kt @@ -6,7 +6,7 @@ import com.braintrustdata.api.core.Enum import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonCreator @@ -33,7 +33,7 @@ constructor( this.objectId.let { params.put("object_id", listOf(it.toString())) } this.objectType.let { params.put("object_type", listOf(it.toString())) } params.putAll(additionalQueryParams) - return params.toUnmodifiable() + return params.toImmutable() } @JvmSynthetic internal fun getHeaders(): Map> = additionalHeaders @@ -143,8 +143,8 @@ constructor( checkNotNull(viewId) { "`viewId` is required but was not set" }, checkNotNull(objectId) { "`objectId` is required but was not set" }, checkNotNull(objectType) { "`objectType` is required but was not set" }, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewUpdateParams.kt index 519c1fa3..c0874f72 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewUpdateParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewUpdateParams.kt @@ -7,7 +7,7 @@ import com.braintrustdata.api.core.ExcludeMissing import com.braintrustdata.api.core.JsonField import com.braintrustdata.api.core.JsonValue import com.braintrustdata.api.core.NoAutoDetect -import com.braintrustdata.api.core.toUnmodifiable +import com.braintrustdata.api.core.toImmutable import com.braintrustdata.api.errors.BraintrustInvalidDataException import com.braintrustdata.api.models.* import com.fasterxml.jackson.annotation.JsonAnyGetter @@ -192,7 +192,7 @@ constructor( userId, viewData, viewType, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } @@ -363,9 +363,9 @@ constructor( userId, viewData, viewType, - additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(), - additionalBodyProperties.toUnmodifiable(), + additionalQueryParams.mapValues { it.value.toImmutable() }.toImmutable(), + additionalHeaders.mapValues { it.value.toImmutable() }.toImmutable(), + additionalBodyProperties.toImmutable(), ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/Handlers.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/Handlers.kt deleted file mode 100755 index 8ac9e3df..00000000 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/Handlers.kt +++ /dev/null @@ -1,186 +0,0 @@ -@file:JvmName("Handlers") - -package com.braintrustdata.api.services - -import com.braintrustdata.api.core.http.BinaryResponseContent -import com.braintrustdata.api.core.http.HttpResponse -import com.braintrustdata.api.core.http.HttpResponse.Handler -import com.braintrustdata.api.errors.BadRequestException -import com.braintrustdata.api.errors.BraintrustError -import com.braintrustdata.api.errors.BraintrustException -import com.braintrustdata.api.errors.InternalServerException -import com.braintrustdata.api.errors.NotFoundException -import com.braintrustdata.api.errors.PermissionDeniedException -import com.braintrustdata.api.errors.RateLimitException -import com.braintrustdata.api.errors.UnauthorizedException -import com.braintrustdata.api.errors.UnexpectedStatusCodeException -import com.braintrustdata.api.errors.UnprocessableEntityException -import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef -import com.google.common.collect.ListMultimap -import java.io.ByteArrayInputStream -import java.io.InputStream -import java.io.OutputStream -import java.util.Optional - -@JvmSynthetic internal fun emptyHandler(): Handler = EmptyHandler - -private object EmptyHandler : Handler { - override fun handle(response: HttpResponse): Void? = null -} - -@JvmSynthetic internal fun stringHandler(): Handler = StringHandler - -@JvmSynthetic internal fun binaryHandler(): Handler = BinaryHandler - -private object StringHandler : Handler { - override fun handle(response: HttpResponse): String { - return response.body().readBytes().toString(Charsets.UTF_8) - } -} - -private object BinaryHandler : Handler { - override fun handle(response: HttpResponse): BinaryResponseContent { - return object : BinaryResponseContent { - override fun contentType(): Optional = - Optional.ofNullable(response.headers().get("Content-Type").firstOrNull()) - - override fun body(): InputStream = response.body() - - override fun close() = response.close() - - override fun writeTo(outputStream: OutputStream) { - response.body().copyTo(outputStream) - } - } - } -} - -@JvmSynthetic -internal inline fun jsonHandler(jsonMapper: JsonMapper): Handler { - return object : Handler { - override fun handle(response: HttpResponse): T { - try { - return jsonMapper.readValue(response.body(), jacksonTypeRef()) - } catch (e: Exception) { - throw BraintrustException("Error reading response", e) - } - } - } -} - -@JvmSynthetic -internal fun errorHandler(jsonMapper: JsonMapper): Handler { - val handler = jsonHandler(jsonMapper) - - return object : Handler { - override fun handle(response: HttpResponse): BraintrustError { - try { - return handler.handle(response) - } catch (e: Exception) { - return BraintrustError.builder().build() - } - } - } -} - -@JvmSynthetic -internal fun Handler.withErrorHandler(errorHandler: Handler): Handler { - return object : Handler { - override fun handle(response: HttpResponse): T { - when (val statusCode = response.statusCode()) { - in 200..299 -> { - return this@withErrorHandler.handle(response) - } - 400 -> { - val buffered = response.buffered() - throw BadRequestException( - buffered.headers(), - StringHandler.handle(buffered), - errorHandler.handle(buffered), - ) - } - 401 -> { - val buffered = response.buffered() - throw UnauthorizedException( - buffered.headers(), - StringHandler.handle(buffered), - errorHandler.handle(buffered), - ) - } - 403 -> { - val buffered = response.buffered() - throw PermissionDeniedException( - buffered.headers(), - StringHandler.handle(buffered), - errorHandler.handle(buffered), - ) - } - 404 -> { - val buffered = response.buffered() - throw NotFoundException( - buffered.headers(), - StringHandler.handle(buffered), - errorHandler.handle(buffered), - ) - } - 422 -> { - val buffered = response.buffered() - throw UnprocessableEntityException( - buffered.headers(), - StringHandler.handle(buffered), - errorHandler.handle(buffered), - ) - } - 429 -> { - val buffered = response.buffered() - throw RateLimitException( - buffered.headers(), - StringHandler.handle(buffered), - errorHandler.handle(buffered), - ) - } - in 500..599 -> { - val buffered = response.buffered() - throw InternalServerException( - statusCode, - buffered.headers(), - StringHandler.handle(buffered), - errorHandler.handle(buffered), - ) - } - else -> { - val buffered = response.buffered() - throw UnexpectedStatusCodeException( - statusCode, - buffered.headers(), - StringHandler.handle(buffered), - errorHandler.handle(buffered), - ) - } - } - } - } -} - -private fun HttpResponse.buffered(): HttpResponse { - val body = body().readBytes() - - return object : HttpResponse { - override fun statusCode(): Int { - return this@buffered.statusCode() - } - - override fun headers(): ListMultimap { - return this@buffered.headers() - } - - override fun body(): InputStream { - return ByteArrayInputStream(body) - } - - override fun close() { - this@buffered.close() - } - } -} diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/HttpRequestBodies.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/HttpRequestBodies.kt deleted file mode 100755 index 4312ec38..00000000 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/HttpRequestBodies.kt +++ /dev/null @@ -1,114 +0,0 @@ -@file:JvmName("HttpRequestBodies") - -package com.braintrustdata.api.services - -import com.braintrustdata.api.core.Enum -import com.braintrustdata.api.core.JsonValue -import com.braintrustdata.api.core.MultipartFormValue -import com.braintrustdata.api.core.http.HttpRequestBody -import com.braintrustdata.api.errors.BraintrustException -import com.fasterxml.jackson.databind.json.JsonMapper -import java.io.ByteArrayOutputStream -import java.io.OutputStream -import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder - -@JvmSynthetic -internal inline fun json( - jsonMapper: JsonMapper, - value: T, -): HttpRequestBody { - return object : HttpRequestBody { - private var cachedBytes: ByteArray? = null - - private fun serialize(): ByteArray { - if (cachedBytes != null) return cachedBytes!! - - val buffer = ByteArrayOutputStream() - try { - jsonMapper.writeValue(buffer, value) - cachedBytes = buffer.toByteArray() - return cachedBytes!! - } catch (e: Exception) { - throw BraintrustException("Error writing request", e) - } - } - - override fun writeTo(outputStream: OutputStream) { - outputStream.write(serialize()) - } - - override fun contentType(): String = "application/json" - - override fun contentLength(): Long { - return serialize().size.toLong() - } - - override fun repeatable(): Boolean = true - - override fun close() {} - } -} - -@JvmSynthetic -internal fun multipartFormData( - jsonMapper: JsonMapper, - parts: Array?> -): HttpRequestBody { - val builder = MultipartEntityBuilder.create() - parts.forEach { part -> - if (part?.value != null) { - when (part.value) { - is JsonValue -> { - val buffer = ByteArrayOutputStream() - try { - jsonMapper.writeValue(buffer, part.value) - } catch (e: Exception) { - throw BraintrustException("Error serializing value to json", e) - } - builder.addBinaryBody( - part.name, - buffer.toByteArray(), - part.contentType, - part.filename - ) - } - is Boolean -> - builder.addTextBody( - part.name, - if (part.value) "true" else "false", - part.contentType - ) - is Int -> builder.addTextBody(part.name, part.value.toString(), part.contentType) - is Long -> builder.addTextBody(part.name, part.value.toString(), part.contentType) - is Double -> builder.addTextBody(part.name, part.value.toString(), part.contentType) - is ByteArray -> - builder.addBinaryBody(part.name, part.value, part.contentType, part.filename) - is String -> builder.addTextBody(part.name, part.value, part.contentType) - is Enum -> builder.addTextBody(part.name, part.value.toString(), part.contentType) - else -> - throw IllegalArgumentException( - "Unsupported content type: ${part.value::class.java.simpleName}" - ) - } - } - } - val entity = builder.build() - - return object : HttpRequestBody { - override fun writeTo(outputStream: OutputStream) { - try { - return entity.writeTo(outputStream) - } catch (e: Exception) { - throw BraintrustException("Error writing request", e) - } - } - - override fun contentType(): String = entity.contentType - - override fun contentLength(): Long = -1 - - override fun repeatable(): Boolean = entity.isRepeatable - - override fun close() = entity.close() - } -} diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/core/http/HeadersTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/core/http/HeadersTest.kt new file mode 100644 index 00000000..30156281 --- /dev/null +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/core/http/HeadersTest.kt @@ -0,0 +1,274 @@ +package com.braintrustdata.api.core.http + +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.catchThrowable +import org.assertj.core.api.Assumptions.assumeThat +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.EnumSource + +internal class HeadersTest { + + enum class TestCase( + val headers: Headers, + val expectedMap: Map>, + val expectedSize: Int + ) { + EMPTY(Headers.builder().build(), expectedMap = mapOf(), expectedSize = 0), + PUT_ONE( + Headers.builder().put("name", "value").build(), + expectedMap = mapOf("name" to listOf("value")), + expectedSize = 1 + ), + PUT_MULTIPLE( + Headers.builder().put("name", listOf("value1", "value2")).build(), + expectedMap = mapOf("name" to listOf("value1", "value2")), + expectedSize = 2 + ), + MULTIPLE_PUT( + Headers.builder().put("name1", "value").put("name2", "value").build(), + expectedMap = mapOf("name1" to listOf("value"), "name2" to listOf("value")), + expectedSize = 2 + ), + MULTIPLE_PUT_SAME_NAME( + Headers.builder().put("name", "value1").put("name", "value2").build(), + expectedMap = mapOf("name" to listOf("value1", "value2")), + expectedSize = 2 + ), + MULTIPLE_PUT_MULTIPLE( + Headers.builder() + .put("name", listOf("value1", "value2")) + .put("name", listOf("value1", "value2")) + .build(), + expectedMap = mapOf("name" to listOf("value1", "value2", "value1", "value2")), + expectedSize = 4 + ), + PUT_CASE_INSENSITIVE( + Headers.builder() + .put("name", "value1") + .put("NAME", "value2") + .put("nAmE", "value3") + .build(), + expectedMap = mapOf("name" to listOf("value1", "value2", "value3")), + expectedSize = 3 + ), + PUT_ALL_MAP( + Headers.builder() + .putAll( + mapOf( + "name1" to listOf("value1", "value2"), + "name2" to listOf("value1", "value2") + ) + ) + .build(), + expectedMap = + mapOf("name1" to listOf("value1", "value2"), "name2" to listOf("value1", "value2")), + expectedSize = 4 + ), + PUT_ALL_HEADERS( + Headers.builder().putAll(Headers.builder().put("name", "value").build()).build(), + expectedMap = mapOf("name" to listOf("value")), + expectedSize = 1 + ), + PUT_ALL_CASE_INSENSITIVE( + Headers.builder() + .putAll( + mapOf( + "name" to listOf("value1"), + "NAME" to listOf("value2"), + "nAmE" to listOf("value3") + ) + ) + .build(), + expectedMap = mapOf("name" to listOf("value1", "value2", "value3")), + expectedSize = 3 + ), + REMOVE_ABSENT( + Headers.builder().remove("name").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_PRESENT_ONE( + Headers.builder().put("name", "value").remove("name").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_PRESENT_MULTIPLE( + Headers.builder().put("name", listOf("value1", "value2")).remove("name").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_CASE_INSENSITIVE( + Headers.builder().put("name", listOf("value1", "value2")).remove("NAME").build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_ALL( + Headers.builder() + .put("name1", "value") + .put("name3", "value") + .removeAll(setOf("name1", "name2", "name3")) + .build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REMOVE_ALL_CASE_INSENSITIVE( + Headers.builder() + .put("name1", "value") + .put("name3", "value") + .removeAll(setOf("NAME1", "nAmE3")) + .build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + CLEAR( + Headers.builder().put("name1", "value").put("name2", "value").clear().build(), + expectedMap = mapOf(), + expectedSize = 0 + ), + REPLACE_ONE_ABSENT( + Headers.builder().replace("name", "value").build(), + expectedMap = mapOf("name" to listOf("value")), + expectedSize = 1 + ), + REPLACE_ONE_PRESENT_ONE( + Headers.builder().put("name", "value1").replace("name", "value2").build(), + expectedMap = mapOf("name" to listOf("value2")), + expectedSize = 1 + ), + REPLACE_ONE_PRESENT_MULTIPLE( + Headers.builder() + .put("name", listOf("value1", "value2")) + .replace("name", "value3") + .build(), + expectedMap = mapOf("name" to listOf("value3")), + expectedSize = 1 + ), + REPLACE_MULTIPLE_ABSENT( + Headers.builder().replace("name", listOf("value1", "value2")).build(), + expectedMap = mapOf("name" to listOf("value1", "value2")), + expectedSize = 2 + ), + REPLACE_MULTIPLE_PRESENT_ONE( + Headers.builder() + .put("name", "value1") + .replace("name", listOf("value2", "value3")) + .build(), + expectedMap = mapOf("name" to listOf("value2", "value3")), + expectedSize = 2 + ), + REPLACE_MULTIPLE_PRESENT_MULTIPLE( + Headers.builder() + .put("name", listOf("value1", "value2")) + .replace("name", listOf("value3", "value4")) + .build(), + expectedMap = mapOf("name" to listOf("value3", "value4")), + expectedSize = 2 + ), + REPLACE_CASE_INSENSITIVE( + Headers.builder() + .put("name", "value1") + .replace("NAME", listOf("value2", "value3")) + .build(), + expectedMap = mapOf("NAME" to listOf("value2", "value3")), + expectedSize = 2 + ), + REPLACE_ALL_MAP( + Headers.builder() + .put("name1", "value1") + .put("name2", "value1") + .put("name3", "value1") + .replaceAll(mapOf("name1" to listOf("value2"), "name3" to listOf("value2"))) + .build(), + expectedMap = + mapOf( + "name1" to listOf("value2"), + "name2" to listOf("value1"), + "name3" to listOf("value2") + ), + expectedSize = 3 + ), + REPLACE_ALL_HEADERS( + Headers.builder() + .put("name1", "value1") + .put("name2", "value1") + .put("name3", "value1") + .replaceAll(Headers.builder().put("name1", "value2").put("name3", "value2").build()) + .build(), + expectedMap = + mapOf( + "name1" to listOf("value2"), + "name2" to listOf("value1"), + "name3" to listOf("value2") + ), + expectedSize = 3 + ), + REPLACE_ALL_CASE_INSENSITIVE( + Headers.builder() + .put("name1", "value1") + .put("name2", "value1") + .replaceAll(mapOf("NAME1" to listOf("value2"), "nAmE2" to listOf("value2"))) + .build(), + expectedMap = mapOf("NAME1" to listOf("value2"), "nAmE2" to listOf("value2")), + expectedSize = 2 + ) + } + + @ParameterizedTest + @EnumSource + fun namesAndValues(testCase: TestCase) { + val map = mutableMapOf>() + val headers = testCase.headers + headers.names().forEach { name -> map[name] = headers.values(name) } + + assertThat(map).isEqualTo(testCase.expectedMap) + } + + @ParameterizedTest + @EnumSource + fun caseInsensitiveNames(testCase: TestCase) { + val headers = testCase.headers + + for (name in headers.names()) { + assertThat(headers.values(name)).isEqualTo(headers.values(name.lowercase())) + assertThat(headers.values(name)).isEqualTo(headers.values(name.uppercase())) + } + } + + @ParameterizedTest + @EnumSource + fun size(testCase: TestCase) { + val size = testCase.headers.size + + assertThat(size).isEqualTo(testCase.expectedSize) + } + + @ParameterizedTest + @EnumSource + fun namesAreImmutable(testCase: TestCase) { + val headers = testCase.headers + val headerNamesCopy = headers.names().toSet() + + val throwable = catchThrowable { + (headers.names() as MutableSet).add("another name") + } + + assertThat(throwable).isInstanceOf(UnsupportedOperationException::class.java) + assertThat(headers.names()).isEqualTo(headerNamesCopy) + } + + @ParameterizedTest + @EnumSource + fun valuesAreImmutable(testCase: TestCase) { + val headers = testCase.headers + assumeThat(headers.size).isNotEqualTo(0) + val name = headers.names().first() + val headerValuesCopy = headers.values(name).toList() + + val throwable = catchThrowable { + (headers.values(name) as MutableList).add("another value") + } + + assertThat(throwable).isInstanceOf(UnsupportedOperationException::class.java) + assertThat(headers.values(name)).isEqualTo(headerValuesCopy) + } +} diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/core/http/SerializerTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/core/http/SerializerTest.kt index f1c1f965..fa99908e 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/core/http/SerializerTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/core/http/SerializerTest.kt @@ -92,7 +92,7 @@ internal class SerializerTest { fun build(): ClassWithBooleanFieldPrefixedWithIs = ClassWithBooleanFieldPrefixedWithIs( isActive, - additionalProperties.toUnmodifiable(), + additionalProperties.toImmutable(), ) } }