From f48b8e4129781723934ce99b31398a7106a3b5e4 Mon Sep 17 00:00:00 2001 From: stainless-bot Date: Tue, 5 Nov 2024 17:07:29 +0000 Subject: [PATCH] chore: rebuild project due to codegen change --- .../api/core/http/HttpRequest.kt | 81 ++++++++++++------- .../api/services/async/AclServiceAsyncImpl.kt | 48 +++++------ .../async/AiSecretServiceAsyncImpl.kt | 56 ++++++------- .../services/async/ApiKeyServiceAsyncImpl.kt | 32 ++++---- .../services/async/DatasetServiceAsyncImpl.kt | 80 +++++++++--------- .../services/async/EnvVarServiceAsyncImpl.kt | 48 +++++------ .../services/async/EvalServiceAsyncImpl.kt | 8 +- .../async/ExperimentServiceAsyncImpl.kt | 80 +++++++++--------- .../async/FunctionServiceAsyncImpl.kt | 56 ++++++------- .../services/async/GroupServiceAsyncImpl.kt | 48 +++++------ .../async/OrganizationServiceAsyncImpl.kt | 32 ++++---- .../async/ProjectScoreServiceAsyncImpl.kt | 48 +++++------ .../services/async/ProjectServiceAsyncImpl.kt | 40 ++++----- .../async/ProjectTagServiceAsyncImpl.kt | 48 +++++------ .../services/async/PromptServiceAsyncImpl.kt | 48 +++++------ .../services/async/RoleServiceAsyncImpl.kt | 48 +++++------ .../async/TopLevelServiceAsyncImpl.kt | 8 +- .../services/async/UserServiceAsyncImpl.kt | 16 ++-- .../services/async/ViewServiceAsyncImpl.kt | 48 +++++------ .../organizations/MemberServiceAsyncImpl.kt | 8 +- .../async/projects/LogServiceAsyncImpl.kt | 32 ++++---- .../api/services/blocking/AclServiceImpl.kt | 48 +++++------ .../services/blocking/AiSecretServiceImpl.kt | 56 ++++++------- .../services/blocking/ApiKeyServiceImpl.kt | 32 ++++---- .../services/blocking/DatasetServiceImpl.kt | 80 +++++++++--------- .../services/blocking/EnvVarServiceImpl.kt | 48 +++++------ .../api/services/blocking/EvalServiceImpl.kt | 8 +- .../blocking/ExperimentServiceImpl.kt | 80 +++++++++--------- .../services/blocking/FunctionServiceImpl.kt | 56 ++++++------- .../api/services/blocking/GroupServiceImpl.kt | 48 +++++------ .../blocking/OrganizationServiceImpl.kt | 32 ++++---- .../blocking/ProjectScoreServiceImpl.kt | 48 +++++------ .../services/blocking/ProjectServiceImpl.kt | 40 ++++----- .../blocking/ProjectTagServiceImpl.kt | 48 +++++------ .../services/blocking/PromptServiceImpl.kt | 48 +++++------ .../api/services/blocking/RoleServiceImpl.kt | 48 +++++------ .../services/blocking/TopLevelServiceImpl.kt | 8 +- .../api/services/blocking/UserServiceImpl.kt | 16 ++-- .../api/services/blocking/ViewServiceImpl.kt | 48 +++++------ .../organizations/MemberServiceImpl.kt | 8 +- .../blocking/projects/LogServiceImpl.kt | 32 ++++---- 41 files changed, 886 insertions(+), 859 deletions(-) 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 340f33d7..2420ddf2 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 @@ -3,7 +3,6 @@ package com.braintrustdata.api.core.http import com.braintrustdata.api.core.toImmutable import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ListMultimap -import com.google.common.collect.Multimap import com.google.common.collect.MultimapBuilder class HttpRequest @@ -11,13 +10,13 @@ private constructor( @get:JvmName("method") val method: HttpMethod, @get:JvmName("url") val url: String?, @get:JvmName("pathSegments") val pathSegments: List, - @get:JvmName("queryParams") val queryParams: ListMultimap, @get:JvmName("headers") val headers: ListMultimap, + @get:JvmName("queryParams") val queryParams: ListMultimap, @get:JvmName("body") val body: HttpRequestBody?, ) { override fun toString(): String = - "HttpRequest{method=$method, pathSegments=$pathSegments, queryParams=$queryParams, headers=$headers, body=$body}" + "HttpRequest{method=$method, url=$url, pathSegments=$pathSegments, headers=$headers, queryParams=$queryParams, body=$body}" companion object { @JvmStatic fun builder() = Builder() @@ -27,56 +26,84 @@ private constructor( private var method: HttpMethod? = null private var url: String? = null - private var pathSegments: MutableList = ArrayList() - private var queryParams: ListMultimap = ArrayListMultimap.create() - private var body: HttpRequestBody? = null + private var pathSegments: MutableList = mutableListOf() private var headers: ListMultimap = MultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER).arrayListValues().build() + private var queryParams: ListMultimap = ArrayListMultimap.create() + private var body: HttpRequestBody? = null fun method(method: HttpMethod) = apply { this.method = method } fun url(url: String) = apply { this.url = url } - fun addPathSegment(pathSegment: String) = apply { this.pathSegments.add(pathSegment) } + fun addPathSegment(pathSegment: String) = apply { pathSegments.add(pathSegment) } fun addPathSegments(vararg pathSegments: String) = apply { - for (pathSegment in pathSegments) { - this.pathSegments.add(pathSegment) - } + this.pathSegments.addAll(pathSegments) } - fun putQueryParam(name: String, value: String) = apply { - this.queryParams.replaceValues(name, listOf(value)) + fun headers(headers: Map>) = apply { + this.headers.clear() + putAllHeaders(headers) } - fun putQueryParams(name: String, values: Iterable) = apply { - this.queryParams.replaceValues(name, values) + fun putHeader(name: String, value: String) = apply { headers.put(name, value) } + + fun putHeaders(name: String, values: Iterable) = apply { + headers.putAll(name, values) } - fun putAllQueryParams(queryParams: Map>) = apply { - queryParams.forEach(this::putQueryParams) + fun putAllHeaders(headers: Map>) = apply { + headers.forEach(::putHeaders) } - fun putAllQueryParams(queryParams: Multimap) = apply { - queryParams.asMap().forEach(this::putQueryParams) + fun replaceHeaders(name: String, value: String) = apply { + headers.replaceValues(name, listOf(value)) } - fun putHeader(name: String, value: String) = apply { - this.headers.replaceValues(name, listOf(value)) + fun replaceHeaders(name: String, values: Iterable) = apply { + headers.replaceValues(name, values) } - fun putHeaders(name: String, values: Iterable) = apply { - this.headers.replaceValues(name, values) + fun replaceAllHeaders(headers: Map>) = apply { + headers.forEach(::replaceHeaders) } - fun putAllHeaders(headers: Map>) = apply { - headers.forEach(this::putHeaders) + fun removeHeaders(name: String) = apply { headers.removeAll(name) } + + fun removeAllHeaders(names: Set) = apply { names.forEach(::removeHeaders) } + + fun queryParams(queryParams: Map>) = apply { + this.queryParams.clear() + putAllQueryParams(queryParams) } - fun putAllHeaders(headers: Multimap) = apply { - headers.asMap().forEach(this::putHeaders) + fun putQueryParam(key: String, value: String) = apply { queryParams.put(key, value) } + + fun putQueryParams(key: String, values: Iterable) = apply { + queryParams.putAll(key, values) + } + + fun putAllQueryParams(queryParams: Map>) = apply { + queryParams.forEach(::putQueryParams) + } + + fun replaceQueryParams(key: String, value: String) = apply { + queryParams.replaceValues(key, listOf(value)) + } + + fun replaceQueryParams(key: String, values: Iterable) = apply { + queryParams.replaceValues(key, values) + } + + fun replaceAllQueryParams(queryParams: Map>) = apply { + queryParams.forEach(::replaceQueryParams) } + fun removeQueryParams(key: String) = apply { queryParams.removeAll(key) } + + fun removeAllQueryParams(keys: Set) = apply { keys.forEach(::removeQueryParams) } + fun body(body: HttpRequestBody) = apply { this.body = body } fun build(): HttpRequest = @@ -84,8 +111,8 @@ private constructor( checkNotNull(method) { "`method` is required but was not set" }, url, pathSegments.toImmutable(), - queryParams.toImmutable(), headers, + queryParams.toImmutable(), body, ) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/AclServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/AclServiceAsyncImpl.kt index 6edea0c2..0779d5ef 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/AclServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/AclServiceAsyncImpl.kt @@ -45,10 +45,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "acl") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -75,10 +75,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "acl", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -108,10 +108,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "acl") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -138,10 +138,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "acl", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -171,10 +171,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "acl", "batch-update") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -201,10 +201,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "acl") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/AiSecretServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/AiSecretServiceAsyncImpl.kt index e4cfe750..9b2ca289 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/AiSecretServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/AiSecretServiceAsyncImpl.kt @@ -45,10 +45,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "ai_secret") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -75,10 +75,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "ai_secret", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -108,10 +108,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "ai_secret", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -142,10 +142,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "ai_secret") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -172,10 +172,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "ai_secret", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -202,10 +202,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "ai_secret") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -235,10 +235,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "ai_secret") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ApiKeyServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ApiKeyServiceAsyncImpl.kt index 75a6af2d..b765ea25 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ApiKeyServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ApiKeyServiceAsyncImpl.kt @@ -43,10 +43,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "api_key") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -73,10 +73,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "api_key", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -106,10 +106,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "api_key") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -136,10 +136,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "api_key", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/DatasetServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/DatasetServiceAsyncImpl.kt index 0dd2647b..dd899f0b 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/DatasetServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/DatasetServiceAsyncImpl.kt @@ -52,10 +52,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "dataset") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -82,10 +82,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "dataset", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -115,10 +115,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "dataset", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -149,10 +149,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "dataset") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -179,10 +179,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "dataset", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -209,10 +209,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "dataset", params.getPathParam(0), "feedback") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -243,10 +243,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "dataset", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -276,10 +276,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "dataset", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -306,10 +306,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "dataset", params.getPathParam(0), "insert") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -337,10 +337,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "dataset", params.getPathParam(0), "summarize") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/EnvVarServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/EnvVarServiceAsyncImpl.kt index 40334775..7fc576fe 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/EnvVarServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/EnvVarServiceAsyncImpl.kt @@ -44,10 +44,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "env_var") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -74,10 +74,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "env_var", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -107,10 +107,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "env_var", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -140,10 +140,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "env_var") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -169,10 +169,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "env_var", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -202,10 +202,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "env_var") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/EvalServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/EvalServiceAsyncImpl.kt index aa2dddda..7e36490c 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/EvalServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/EvalServiceAsyncImpl.kt @@ -42,10 +42,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "eval") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ExperimentServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ExperimentServiceAsyncImpl.kt index 3ae26dda..97ae98d9 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ExperimentServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ExperimentServiceAsyncImpl.kt @@ -52,10 +52,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "experiment") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -82,10 +82,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "experiment", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -115,10 +115,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "experiment", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -149,10 +149,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "experiment") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -179,10 +179,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "experiment", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -209,10 +209,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "experiment", params.getPathParam(0), "feedback") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -243,10 +243,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "experiment", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -276,10 +276,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "experiment", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -306,10 +306,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "experiment", params.getPathParam(0), "insert") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -337,10 +337,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "experiment", params.getPathParam(0), "summarize") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/FunctionServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/FunctionServiceAsyncImpl.kt index 491cca41..8a4c14fa 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/FunctionServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/FunctionServiceAsyncImpl.kt @@ -46,10 +46,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "function") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -76,10 +76,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "function", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -109,10 +109,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "function", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -143,10 +143,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "function") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -173,10 +173,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "function", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -203,10 +203,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "function", params.getPathParam(0), "invoke") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -231,10 +231,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "function") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/GroupServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/GroupServiceAsyncImpl.kt index 0cb84f89..cbf816b0 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/GroupServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/GroupServiceAsyncImpl.kt @@ -44,10 +44,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "group") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -74,10 +74,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "group", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -107,10 +107,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "group", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -141,10 +141,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "group") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -171,10 +171,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "group", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -204,10 +204,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "group") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/OrganizationServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/OrganizationServiceAsyncImpl.kt index 1f66e1c3..a39ecc9c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/OrganizationServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/OrganizationServiceAsyncImpl.kt @@ -45,10 +45,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "organization", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -78,10 +78,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "organization", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -112,10 +112,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "organization") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -142,10 +142,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "organization", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectScoreServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectScoreServiceAsyncImpl.kt index 8f592589..a96f8bbe 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectScoreServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectScoreServiceAsyncImpl.kt @@ -45,10 +45,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_score") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -75,10 +75,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_score", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -108,10 +108,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "project_score", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -142,10 +142,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_score") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -172,10 +172,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "project_score", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -206,10 +206,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "project_score") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectServiceAsyncImpl.kt index d064b194..33b735d2 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectServiceAsyncImpl.kt @@ -49,10 +49,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -79,10 +79,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -112,10 +112,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "project", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -146,10 +146,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -176,10 +176,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "project", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectTagServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectTagServiceAsyncImpl.kt index 7cc499c6..7ca246a4 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectTagServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ProjectTagServiceAsyncImpl.kt @@ -44,10 +44,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_tag") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -74,10 +74,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_tag", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -107,10 +107,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "project_tag", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -141,10 +141,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_tag") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -171,10 +171,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "project_tag", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -205,10 +205,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "project_tag") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/PromptServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/PromptServiceAsyncImpl.kt index 6e56557a..8a9723a2 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/PromptServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/PromptServiceAsyncImpl.kt @@ -44,10 +44,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "prompt") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -74,10 +74,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "prompt", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -107,10 +107,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "prompt", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -141,10 +141,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "prompt") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -171,10 +171,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "prompt", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -204,10 +204,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "prompt") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/RoleServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/RoleServiceAsyncImpl.kt index 837c6e66..d113a03d 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/RoleServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/RoleServiceAsyncImpl.kt @@ -44,10 +44,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "role") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -74,10 +74,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "role", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -107,10 +107,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "role", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -141,10 +141,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "role") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -171,10 +171,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "role", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -204,10 +204,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "role") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/TopLevelServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/TopLevelServiceAsyncImpl.kt index 759787bd..cac07a65 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/TopLevelServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/TopLevelServiceAsyncImpl.kt @@ -32,10 +32,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/UserServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/UserServiceAsyncImpl.kt index 246d614f..03cbbf79 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/UserServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/UserServiceAsyncImpl.kt @@ -36,10 +36,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "user", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -69,10 +69,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "user") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ViewServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ViewServiceAsyncImpl.kt index ddc3dad5..79da3e5d 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ViewServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/ViewServiceAsyncImpl.kt @@ -44,10 +44,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "view") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -74,10 +74,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "view", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -107,10 +107,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "view", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -141,10 +141,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "view") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -171,10 +171,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "view", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -204,10 +204,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "view") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/organizations/MemberServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/organizations/MemberServiceAsyncImpl.kt index 65480fe5..89348dae 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/organizations/MemberServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/organizations/MemberServiceAsyncImpl.kt @@ -36,10 +36,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "organization", "members") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/projects/LogServiceAsyncImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/projects/LogServiceAsyncImpl.kt index 69a9dc3f..82fb7f12 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/projects/LogServiceAsyncImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/async/projects/LogServiceAsyncImpl.kt @@ -40,10 +40,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_logs", params.getPathParam(0), "feedback") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -74,10 +74,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_logs", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response -> @@ -107,10 +107,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_logs", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response @@ -137,10 +137,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_logs", params.getPathParam(0), "insert") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.executeAsync(request, requestOptions).thenApply { response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/AclServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/AclServiceImpl.kt index 9d266d42..b5a947e5 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/AclServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/AclServiceImpl.kt @@ -41,10 +41,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "acl") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -67,10 +67,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "acl", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -95,10 +95,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "acl") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -121,10 +121,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "acl", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -153,10 +153,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "acl", "batch-update") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -182,10 +182,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "acl") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/AiSecretServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/AiSecretServiceImpl.kt index f61b7be6..9f5ce473 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/AiSecretServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/AiSecretServiceImpl.kt @@ -41,10 +41,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "ai_secret") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -70,10 +70,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "ai_secret", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -99,10 +99,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "ai_secret", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -132,10 +132,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "ai_secret") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -158,10 +158,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "ai_secret", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -187,10 +187,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "ai_secret") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -216,10 +216,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "ai_secret") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ApiKeyServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ApiKeyServiceImpl.kt index 0f6d80aa..56c2de94 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ApiKeyServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ApiKeyServiceImpl.kt @@ -42,10 +42,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "api_key") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -68,10 +68,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "api_key", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -97,10 +97,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "api_key") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -123,10 +123,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "api_key", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/DatasetServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/DatasetServiceImpl.kt index 4dc34521..deb7df96 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/DatasetServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/DatasetServiceImpl.kt @@ -48,10 +48,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "dataset") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -74,10 +74,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "dataset", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -103,10 +103,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "dataset", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -133,10 +133,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "dataset") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -159,10 +159,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "dataset", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -188,10 +188,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "dataset", params.getPathParam(0), "feedback") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -221,10 +221,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "dataset", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -253,10 +253,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "dataset", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -282,10 +282,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "dataset", params.getPathParam(0), "insert") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -312,10 +312,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "dataset", params.getPathParam(0), "summarize") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/EnvVarServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/EnvVarServiceImpl.kt index 34db366c..56381c22 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/EnvVarServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/EnvVarServiceImpl.kt @@ -40,10 +40,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "env_var") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -66,10 +66,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "env_var", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -95,10 +95,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "env_var", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -127,10 +127,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "env_var") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -152,10 +152,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "env_var", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -181,10 +181,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "env_var") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/EvalServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/EvalServiceImpl.kt index f8a2f694..9ea44d18 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/EvalServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/EvalServiceImpl.kt @@ -41,10 +41,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "eval") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ExperimentServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ExperimentServiceImpl.kt index df57dad1..158ffd38 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ExperimentServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ExperimentServiceImpl.kt @@ -51,10 +51,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "experiment") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -80,10 +80,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "experiment", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -112,10 +112,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "experiment", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -145,10 +145,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "experiment") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -174,10 +174,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "experiment", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -203,10 +203,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "experiment", params.getPathParam(0), "feedback") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -236,10 +236,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "experiment", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -268,10 +268,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "experiment", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -297,10 +297,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "experiment", params.getPathParam(0), "insert") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -327,10 +327,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "experiment", params.getPathParam(0), "summarize") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/FunctionServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/FunctionServiceImpl.kt index 00bcbe94..57b63f36 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/FunctionServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/FunctionServiceImpl.kt @@ -42,10 +42,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "function") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -71,10 +71,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "function", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -100,10 +100,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "function", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -133,10 +133,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "function") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -159,10 +159,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "function", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -188,10 +188,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "function", params.getPathParam(0), "invoke") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -212,10 +212,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "function") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/GroupServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/GroupServiceImpl.kt index 080f21e2..59e96aa0 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/GroupServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/GroupServiceImpl.kt @@ -40,10 +40,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "group") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -66,10 +66,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "group", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -95,10 +95,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "group", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -124,10 +124,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "group") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -150,10 +150,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "group", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -179,10 +179,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "group") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/OrganizationServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/OrganizationServiceImpl.kt index fd55f46a..8adea90e 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/OrganizationServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/OrganizationServiceImpl.kt @@ -44,10 +44,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "organization", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -76,10 +76,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "organization", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -109,10 +109,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "organization") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -138,10 +138,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "organization", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectScoreServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectScoreServiceImpl.kt index 9576e14a..f1fc18f7 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectScoreServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectScoreServiceImpl.kt @@ -44,10 +44,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_score") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -73,10 +73,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_score", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -105,10 +105,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "project_score", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -138,10 +138,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_score") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -167,10 +167,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "project_score", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -200,10 +200,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "project_score") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectServiceImpl.kt index 1349bed5..487799ec 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectServiceImpl.kt @@ -45,10 +45,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -71,10 +71,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -100,10 +100,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "project", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -130,10 +130,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -156,10 +156,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "project", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectTagServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectTagServiceImpl.kt index daf6171e..6358af7a 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectTagServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ProjectTagServiceImpl.kt @@ -43,10 +43,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_tag") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -72,10 +72,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_tag", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -104,10 +104,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "project_tag", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -137,10 +137,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_tag") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -166,10 +166,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "project_tag", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -199,10 +199,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "project_tag") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/PromptServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/PromptServiceImpl.kt index dc23ed4d..94e8e0be 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/PromptServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/PromptServiceImpl.kt @@ -40,10 +40,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "prompt") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -66,10 +66,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "prompt", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -95,10 +95,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "prompt", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -125,10 +125,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "prompt") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -151,10 +151,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "prompt", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -180,10 +180,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "prompt") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/RoleServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/RoleServiceImpl.kt index ef6cba86..81314aae 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/RoleServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/RoleServiceImpl.kt @@ -40,10 +40,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "role") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -66,10 +66,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "role", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -95,10 +95,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "role", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -124,10 +124,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "role") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -150,10 +150,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "role", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .apply { params.getBody().ifPresent { body(json(clientOptions.jsonMapper, it)) } } .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -179,10 +179,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "role") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/TopLevelServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/TopLevelServiceImpl.kt index 59d5c939..c20802be 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/TopLevelServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/TopLevelServiceImpl.kt @@ -31,10 +31,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response.use { helloWorldHandler.handle(it) } diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/UserServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/UserServiceImpl.kt index b07330fe..dfb59811 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/UserServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/UserServiceImpl.kt @@ -32,10 +32,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "user", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -60,10 +60,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "user") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ViewServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ViewServiceImpl.kt index 4f17ebf9..62f6abff 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ViewServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/ViewServiceImpl.kt @@ -40,10 +40,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "view") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -66,10 +66,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "view", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -95,10 +95,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "view", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -124,10 +124,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "view") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -150,10 +150,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.DELETE) .addPathSegments("v1", "view", params.getPathParam(0)) - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -179,10 +179,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PUT) .addPathSegments("v1", "view") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/organizations/MemberServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/organizations/MemberServiceImpl.kt index 31901bd3..5777be65 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/organizations/MemberServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/organizations/MemberServiceImpl.kt @@ -35,10 +35,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.PATCH) .addPathSegments("v1", "organization", "members") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/projects/LogServiceImpl.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/projects/LogServiceImpl.kt index 5fc922bd..1cd65e5c 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/projects/LogServiceImpl.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/services/blocking/projects/LogServiceImpl.kt @@ -39,10 +39,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_logs", params.getPathParam(0), "feedback") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -72,10 +72,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.GET) .addPathSegments("v1", "project_logs", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> response @@ -104,10 +104,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_logs", params.getPathParam(0), "fetch") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response -> @@ -133,10 +133,10 @@ constructor( HttpRequest.builder() .method(HttpMethod.POST) .addPathSegments("v1", "project_logs", params.getPathParam(0), "insert") - .putAllQueryParams(clientOptions.queryParams) - .putAllQueryParams(params.getQueryParams()) - .putAllHeaders(clientOptions.headers) - .putAllHeaders(params.getHeaders()) + .putAllQueryParams(clientOptions.queryParams.asMap()) + .replaceAllQueryParams(params.getQueryParams()) + .putAllHeaders(clientOptions.headers.asMap()) + .replaceAllHeaders(params.getHeaders()) .body(json(clientOptions.jsonMapper, params.getBody())) .build() return clientOptions.httpClient.execute(request, requestOptions).let { response ->