From 0ad0116388ecd0440f951bd030d96cda123c67ec Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 18 Mar 2025 00:24:05 +0000 Subject: [PATCH] chore(internal): refactor query param serialization impl and tests --- .../api/models/AclListParams.kt | 33 ++++++--- .../api/models/AiSecretListParams.kt | 45 +++++++++---- .../api/models/ApiKeyListParams.kt | 33 ++++++--- .../api/models/DatasetFetchParams.kt | 19 +++--- .../api/models/DatasetListParams.kt | 37 ++++++---- .../api/models/DatasetSummarizeParams.kt | 13 ++-- .../api/models/EnvVarListParams.kt | 31 ++++++--- .../api/models/ExperimentFetchParams.kt | 19 +++--- .../api/models/ExperimentListParams.kt | 37 ++++++---- .../api/models/ExperimentSummarizeParams.kt | 17 +++-- .../api/models/FunctionListParams.kt | 41 +++++++----- .../api/models/GroupListParams.kt | 33 ++++++--- .../api/models/OrganizationListParams.kt | 31 ++++++--- .../api/models/ProjectListParams.kt | 33 ++++++--- .../api/models/ProjectLogFetchParams.kt | 19 +++--- .../api/models/ProjectScoreListParams.kt | 51 ++++++++++---- .../api/models/ProjectTagListParams.kt | 37 ++++++---- .../api/models/PromptListParams.kt | 41 +++++++----- .../api/models/RoleListParams.kt | 33 ++++++--- .../api/models/SpanIframeListParams.kt | 33 ++++++--- .../api/models/UserListParams.kt | 67 +++++++++++++++---- .../api/models/ViewListParams.kt | 37 ++++++---- .../api/models/ViewRetrieveParams.kt | 15 +++-- .../api/models/AclListParamsTest.kt | 39 ++++++----- .../api/models/AiSecretListParamsTest.kt | 36 +++++----- .../api/models/ApiKeyListParamsTest.kt | 31 +++++---- .../api/models/DatasetFetchParamsTest.kt | 24 ++++--- .../api/models/DatasetListParamsTest.kt | 35 +++++----- .../api/models/DatasetSummarizeParamsTest.kt | 14 ++-- .../api/models/EnvVarListParamsTest.kt | 29 ++++---- .../api/models/ExperimentFetchParamsTest.kt | 24 ++++--- .../api/models/ExperimentListParamsTest.kt | 35 +++++----- .../models/ExperimentSummarizeParamsTest.kt | 20 ++++-- .../api/models/FunctionListParamsTest.kt | 39 ++++++----- .../api/models/GroupListParamsTest.kt | 31 +++++---- .../api/models/OrganizationListParamsTest.kt | 29 ++++---- .../api/models/ProjectListParamsTest.kt | 31 +++++---- .../api/models/ProjectLogFetchParamsTest.kt | 24 ++++--- .../api/models/ProjectScoreListParamsTest.kt | 41 ++++++------ .../api/models/ProjectTagListParamsTest.kt | 35 +++++----- .../api/models/PromptListParamsTest.kt | 39 ++++++----- .../api/models/RoleListParamsTest.kt | 31 +++++---- .../api/models/SpanIframeListParamsTest.kt | 31 +++++---- .../api/models/UserListParamsTest.kt | 35 +++++----- .../api/models/ViewListParamsTest.kt | 43 +++++++----- .../api/models/ViewRetrieveParamsTest.kt | 28 +++++--- .../async/FunctionServiceAsyncTest.kt | 4 +- .../services/blocking/FunctionServiceTest.kt | 4 +- 48 files changed, 930 insertions(+), 557 deletions(-) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt index bf957172..a49c07f5 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt @@ -78,17 +78,28 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.objectId.let { queryParams.put("object_id", listOf(it.toString())) } - this.objectType.let { queryParams.put("object_type", listOf(it.toString())) } - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + put("object_id", objectId) + put("object_type", objectType.asString()) + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt index d05d9d2d..4359719a 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt @@ -80,18 +80,39 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.aiSecretName?.let { queryParams.put("ai_secret_name", listOf(it.toString())) } - this.aiSecretType?.let { queryParams.put("ai_secret_type", listOf(it.toString())) } - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + aiSecretName?.let { put("ai_secret_name", it) } + aiSecretType?.accept( + object : AiSecretType.Visitor { + override fun visitString(string: String) { + put("ai_secret_type", string) + } + + override fun visitStrings(strings: List) { + put("ai_secret_type", strings.joinToString(",")) + } + } + ) + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt index e5b8a26a..03c6a458 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt @@ -77,17 +77,28 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.apiKeyName?.let { queryParams.put("api_key_name", listOf(it.toString())) } - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + apiKeyName?.let { put("api_key_name", it) } + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt index 30277ee0..b00ce504 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt @@ -88,15 +88,16 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.maxRootSpanId?.let { queryParams.put("max_root_span_id", listOf(it.toString())) } - this.maxXactId?.let { queryParams.put("max_xact_id", listOf(it.toString())) } - this.version?.let { queryParams.put("version", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + limit?.let { put("limit", it.toString()) } + maxRootSpanId?.let { put("max_root_span_id", it) } + maxXactId?.let { put("max_xact_id", it) } + version?.let { put("version", it) } + putAll(additionalQueryParams) + } + .build() fun getPathParam(index: Int): String { return when (index) { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt index e9216491..90416929 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt @@ -85,19 +85,30 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.datasetName?.let { queryParams.put("dataset_name", listOf(it.toString())) } - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.projectId?.let { queryParams.put("project_id", listOf(it.toString())) } - this.projectName?.let { queryParams.put("project_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + datasetName?.let { put("dataset_name", it) } + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + projectId?.let { put("project_id", it) } + projectName?.let { put("project_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt index 84dedcec..d188b51b 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt @@ -32,12 +32,13 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.summarizeData?.let { queryParams.put("summarize_data", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + summarizeData?.let { put("summarize_data", it.toString()) } + putAll(additionalQueryParams) + } + .build() fun getPathParam(index: Int): String { return when (index) { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt index cae2986b..4977d934 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt @@ -61,16 +61,27 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.envVarName?.let { queryParams.put("env_var_name", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.objectId?.let { queryParams.put("object_id", listOf(it.toString())) } - this.objectType?.let { queryParams.put("object_type", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + envVarName?.let { put("env_var_name", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + objectId?.let { put("object_id", it) } + objectType?.let { put("object_type", it.asString()) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt index 777128ee..93faaa22 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt @@ -88,15 +88,16 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.maxRootSpanId?.let { queryParams.put("max_root_span_id", listOf(it.toString())) } - this.maxXactId?.let { queryParams.put("max_xact_id", listOf(it.toString())) } - this.version?.let { queryParams.put("version", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + limit?.let { put("limit", it.toString()) } + maxRootSpanId?.let { put("max_root_span_id", it) } + maxXactId?.let { put("max_xact_id", it) } + version?.let { put("version", it) } + putAll(additionalQueryParams) + } + .build() fun getPathParam(index: Int): String { return when (index) { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt index 39694dc8..6e2f5bef 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt @@ -85,19 +85,30 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.experimentName?.let { queryParams.put("experiment_name", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.projectId?.let { queryParams.put("project_id", listOf(it.toString())) } - this.projectName?.let { queryParams.put("project_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + experimentName?.let { put("experiment_name", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + projectId?.let { put("project_id", it) } + projectName?.let { put("project_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt index b67078a3..10cf6fc7 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt @@ -43,15 +43,14 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.comparisonExperimentId?.let { - queryParams.put("comparison_experiment_id", listOf(it.toString())) - } - this.summarizeScores?.let { queryParams.put("summarize_scores", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + comparisonExperimentId?.let { put("comparison_experiment_id", it) } + summarizeScores?.let { put("summarize_scores", it.toString()) } + putAll(additionalQueryParams) + } + .build() fun getPathParam(index: Int): String { return when (index) { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListParams.kt index 6883357c..534f5284 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionListParams.kt @@ -98,21 +98,32 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.functionName?.let { queryParams.put("function_name", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.projectId?.let { queryParams.put("project_id", listOf(it.toString())) } - this.projectName?.let { queryParams.put("project_name", listOf(it.toString())) } - this.slug?.let { queryParams.put("slug", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - this.version?.let { queryParams.put("version", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + functionName?.let { put("function_name", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + projectId?.let { put("project_id", it) } + projectName?.let { put("project_name", it) } + slug?.let { put("slug", it) } + startingAfter?.let { put("starting_after", it) } + version?.let { put("version", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListParams.kt index f2d91464..94cc7e6a 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/GroupListParams.kt @@ -77,17 +77,28 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.groupName?.let { queryParams.put("group_name", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + groupName?.let { put("group_name", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListParams.kt index 7e469d20..ee4d5674 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/OrganizationListParams.kt @@ -73,16 +73,27 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListParams.kt index dd3d4d9b..6b30061c 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectListParams.kt @@ -77,17 +77,28 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.projectName?.let { queryParams.put("project_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + projectName?.let { put("project_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchParams.kt index f9a83228..a3629afc 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectLogFetchParams.kt @@ -88,15 +88,16 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.maxRootSpanId?.let { queryParams.put("max_root_span_id", listOf(it.toString())) } - this.maxXactId?.let { queryParams.put("max_xact_id", listOf(it.toString())) } - this.version?.let { queryParams.put("version", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + limit?.let { put("limit", it.toString()) } + maxRootSpanId?.let { put("max_root_span_id", it) } + maxXactId?.let { put("max_xact_id", it) } + version?.let { put("version", it) } + putAll(additionalQueryParams) + } + .build() fun getPathParam(index: Int): String { return when (index) { diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListParams.kt index 4e16fae1..a1946a16 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreListParams.kt @@ -89,20 +89,43 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.projectId?.let { queryParams.put("project_id", listOf(it.toString())) } - this.projectName?.let { queryParams.put("project_name", listOf(it.toString())) } - this.projectScoreName?.let { queryParams.put("project_score_name", listOf(it.toString())) } - this.scoreType?.let { queryParams.put("score_type", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + projectId?.let { put("project_id", it) } + projectName?.let { put("project_name", it) } + projectScoreName?.let { put("project_score_name", it) } + scoreType?.accept( + object : ScoreType.Visitor { + override fun visitProject(project: ProjectScoreType) { + put("score_type", project.asString()) + } + + override fun visitProjectScoreTypes( + projectScoreTypes: List + ) { + put("score_type", projectScoreTypes.joinToString(",") { it.asString() }) + } + } + ) + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListParams.kt index 8dd8c729..9bc9a039 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectTagListParams.kt @@ -85,19 +85,30 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.projectId?.let { queryParams.put("project_id", listOf(it.toString())) } - this.projectName?.let { queryParams.put("project_name", listOf(it.toString())) } - this.projectTagName?.let { queryParams.put("project_tag_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + projectId?.let { put("project_id", it) } + projectName?.let { put("project_name", it) } + projectTagName?.let { put("project_tag_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListParams.kt index 01178d8c..d5c704fa 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptListParams.kt @@ -98,21 +98,32 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.projectId?.let { queryParams.put("project_id", listOf(it.toString())) } - this.projectName?.let { queryParams.put("project_name", listOf(it.toString())) } - this.promptName?.let { queryParams.put("prompt_name", listOf(it.toString())) } - this.slug?.let { queryParams.put("slug", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - this.version?.let { queryParams.put("version", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + projectId?.let { put("project_id", it) } + projectName?.let { put("project_name", it) } + promptName?.let { put("prompt_name", it) } + slug?.let { put("slug", it) } + startingAfter?.let { put("starting_after", it) } + version?.let { put("version", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListParams.kt index 0b4654b6..333d1d99 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/RoleListParams.kt @@ -77,17 +77,28 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.roleName?.let { queryParams.put("role_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + roleName?.let { put("role_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SpanIframeListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SpanIframeListParams.kt index bc8f76e3..fdfa8f86 100644 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SpanIframeListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/SpanIframeListParams.kt @@ -77,17 +77,28 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.spanIframeName?.let { queryParams.put("span_iframe_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + spanIframeName?.let { put("span_iframe_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListParams.kt index de1003a9..55618ca7 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/UserListParams.kt @@ -94,19 +94,60 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.email?.let { queryParams.put("email", listOf(it.toString())) } - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.familyName?.let { queryParams.put("family_name", listOf(it.toString())) } - this.givenName?.let { queryParams.put("given_name", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.orgName?.let { queryParams.put("org_name", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + email?.accept( + object : Email.Visitor { + override fun visitString(string: String) { + put("email", string) + } + + override fun visitStrings(strings: List) { + put("email", strings.joinToString(",")) + } + } + ) + endingBefore?.let { put("ending_before", it) } + familyName?.accept( + object : FamilyName.Visitor { + override fun visitString(string: String) { + put("family_name", string) + } + + override fun visitStrings(strings: List) { + put("family_name", strings.joinToString(",")) + } + } + ) + givenName?.accept( + object : GivenName.Visitor { + override fun visitString(string: String) { + put("given_name", string) + } + + override fun visitStrings(strings: List) { + put("given_name", strings.joinToString(",")) + } + } + ) + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + orgName?.let { put("org_name", it) } + startingAfter?.let { put("starting_after", it) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListParams.kt index b72d35c8..ef2525d5 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewListParams.kt @@ -86,19 +86,30 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.objectId.let { queryParams.put("object_id", listOf(it.toString())) } - this.objectType.let { queryParams.put("object_type", listOf(it.toString())) } - this.endingBefore?.let { queryParams.put("ending_before", listOf(it.toString())) } - this.ids?.let { queryParams.put("ids", listOf(it.toString())) } - this.limit?.let { queryParams.put("limit", listOf(it.toString())) } - this.startingAfter?.let { queryParams.put("starting_after", listOf(it.toString())) } - this.viewName?.let { queryParams.put("view_name", listOf(it.toString())) } - this.viewType?.let { queryParams.put("view_type", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + put("object_id", objectId) + put("object_type", objectType.asString()) + endingBefore?.let { put("ending_before", it) } + ids?.accept( + object : Ids.Visitor { + override fun visitString(string: String) { + put("ids", string) + } + + override fun visitStrings(strings: List) { + put("ids", strings.joinToString(",")) + } + } + ) + limit?.let { put("limit", it.toString()) } + startingAfter?.let { put("starting_after", it) } + viewName?.let { put("view_name", it) } + viewType?.let { put("view_type", it.asString()) } + putAll(additionalQueryParams) + } + .build() fun toBuilder() = Builder().from(this) diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewRetrieveParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewRetrieveParams.kt index 8ff82f27..0e6067a2 100755 --- a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewRetrieveParams.kt +++ b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ViewRetrieveParams.kt @@ -34,13 +34,14 @@ private constructor( override fun _headers(): Headers = additionalHeaders - override fun _queryParams(): QueryParams { - val queryParams = QueryParams.builder() - this.objectId.let { queryParams.put("object_id", listOf(it.toString())) } - this.objectType.let { queryParams.put("object_type", listOf(it.toString())) } - queryParams.putAll(additionalQueryParams) - return queryParams.build() - } + override fun _queryParams(): QueryParams = + QueryParams.builder() + .apply { + put("object_id", objectId) + put("object_type", objectType.asString()) + putAll(additionalQueryParams) + } + .build() fun getPathParam(index: Int): String { return when (index) { diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/AclListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/AclListParamsTest.kt index 3cfdbe75..e5288078 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/AclListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/AclListParamsTest.kt @@ -31,17 +31,20 @@ internal class AclListParamsTest { .limit(0L) .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("object_type", AclObjectType.ORGANIZATION.toString()) - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - AclListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("object_type", "organization") + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test @@ -51,9 +54,15 @@ internal class AclListParamsTest { .objectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .objectType(AclObjectType.ORGANIZATION) .build() - val expected = QueryParams.builder() - expected.put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("object_type", AclObjectType.ORGANIZATION.toString()) - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("object_type", "organization") + .build() + ) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/AiSecretListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/AiSecretListParamsTest.kt index 3e18fc34..20af378c 100644 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/AiSecretListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/AiSecretListParamsTest.kt @@ -33,27 +33,29 @@ internal class AiSecretListParamsTest { .orgName("org_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ai_secret_name", "ai_secret_name") - expected.put( - "ai_secret_type", - AiSecretListParams.AiSecretType.ofString("string").toString(), - ) - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - AiSecretListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ai_secret_name", "ai_secret_name") + .put("ai_secret_type", "string") + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = AiSecretListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ApiKeyListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ApiKeyListParamsTest.kt index fc950cfe..e9582d7c 100644 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ApiKeyListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ApiKeyListParamsTest.kt @@ -31,23 +31,28 @@ internal class ApiKeyListParamsTest { .orgName("org_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("api_key_name", "api_key_name") - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - ApiKeyListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("api_key_name", "api_key_name") + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = ApiKeyListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetFetchParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetFetchParamsTest.kt index 6e81ad31..1c31fd85 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetFetchParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetFetchParamsTest.kt @@ -29,20 +29,28 @@ internal class DatasetFetchParamsTest { .maxXactId("max_xact_id") .version("version") .build() - val expected = QueryParams.builder() - expected.put("limit", "0") - expected.put("max_root_span_id", "max_root_span_id") - expected.put("max_xact_id", "max_xact_id") - expected.put("version", "version") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("limit", "0") + .put("max_root_span_id", "max_root_span_id") + .put("max_xact_id", "max_xact_id") + .put("version", "version") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = DatasetFetchParams.builder().datasetId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } @Test diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetListParamsTest.kt index 98586408..a6ffbbd4 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetListParamsTest.kt @@ -35,25 +35,30 @@ internal class DatasetListParamsTest { .projectName("project_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("dataset_name", "dataset_name") - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - DatasetListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("project_name", "project_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("dataset_name", "dataset_name") + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("project_name", "project_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = DatasetListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetSummarizeParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetSummarizeParamsTest.kt index de4e5a5b..24bc6c0f 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetSummarizeParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/DatasetSummarizeParamsTest.kt @@ -23,9 +23,11 @@ internal class DatasetSummarizeParamsTest { .datasetId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .summarizeData(true) .build() - val expected = QueryParams.builder() - expected.put("summarize_data", "true") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo(QueryParams.builder().put("summarize_data", "true").build()) } @Test @@ -34,8 +36,10 @@ internal class DatasetSummarizeParamsTest { DatasetSummarizeParams.builder() .datasetId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } @Test diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/EnvVarListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/EnvVarListParamsTest.kt index e150aed4..4978303f 100644 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/EnvVarListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/EnvVarListParamsTest.kt @@ -29,22 +29,27 @@ internal class EnvVarListParamsTest { .objectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .objectType(EnvVarObjectType.ORGANIZATION) .build() - val expected = QueryParams.builder() - expected.put("env_var_name", "env_var_name") - expected.put( - "ids", - EnvVarListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("object_type", EnvVarObjectType.ORGANIZATION.toString()) - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("env_var_name", "env_var_name") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("object_type", "organization") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = EnvVarListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentFetchParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentFetchParamsTest.kt index 6f3ff78f..a4d0d229 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentFetchParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentFetchParamsTest.kt @@ -29,12 +29,18 @@ internal class ExperimentFetchParamsTest { .maxXactId("max_xact_id") .version("version") .build() - val expected = QueryParams.builder() - expected.put("limit", "0") - expected.put("max_root_span_id", "max_root_span_id") - expected.put("max_xact_id", "max_xact_id") - expected.put("version", "version") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("limit", "0") + .put("max_root_span_id", "max_root_span_id") + .put("max_xact_id", "max_xact_id") + .put("version", "version") + .build() + ) } @Test @@ -43,8 +49,10 @@ internal class ExperimentFetchParamsTest { ExperimentFetchParams.builder() .experimentId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } @Test diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentListParamsTest.kt index f0da65fc..9c1814c3 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentListParamsTest.kt @@ -35,25 +35,30 @@ internal class ExperimentListParamsTest { .projectName("project_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("experiment_name", "experiment_name") - expected.put( - "ids", - ExperimentListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("project_name", "project_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("experiment_name", "experiment_name") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("project_name", "project_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = ExperimentListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParamsTest.kt index 3a506159..3260545d 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParamsTest.kt @@ -25,10 +25,16 @@ internal class ExperimentSummarizeParamsTest { .comparisonExperimentId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .summarizeScores(true) .build() - val expected = QueryParams.builder() - expected.put("comparison_experiment_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("summarize_scores", "true") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("comparison_experiment_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("summarize_scores", "true") + .build() + ) } @Test @@ -37,8 +43,10 @@ internal class ExperimentSummarizeParamsTest { ExperimentSummarizeParams.builder() .experimentId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } @Test diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/FunctionListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/FunctionListParamsTest.kt index 94f2cc3c..00e37ef9 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/FunctionListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/FunctionListParamsTest.kt @@ -39,27 +39,32 @@ internal class FunctionListParamsTest { .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .version("version") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("function_name", "function_name") - expected.put( - "ids", - FunctionListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("project_name", "project_name") - expected.put("slug", "slug") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("version", "version") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("function_name", "function_name") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("project_name", "project_name") + .put("slug", "slug") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("version", "version") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = FunctionListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/GroupListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/GroupListParamsTest.kt index 152279d4..17892a31 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/GroupListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/GroupListParamsTest.kt @@ -31,23 +31,28 @@ internal class GroupListParamsTest { .orgName("org_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("group_name", "group_name") - expected.put( - "ids", - GroupListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("group_name", "group_name") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = GroupListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/OrganizationListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/OrganizationListParamsTest.kt index fe4df3d0..32cdfdf6 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/OrganizationListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/OrganizationListParamsTest.kt @@ -29,22 +29,27 @@ internal class OrganizationListParamsTest { .orgName("org_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - OrganizationListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = OrganizationListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectListParamsTest.kt index 0e309b60..9f6452cd 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectListParamsTest.kt @@ -31,23 +31,28 @@ internal class ProjectListParamsTest { .projectName("project_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - ProjectListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("project_name", "project_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("project_name", "project_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = ProjectListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectLogFetchParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectLogFetchParamsTest.kt index 61d382e2..2f305737 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectLogFetchParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectLogFetchParamsTest.kt @@ -29,12 +29,18 @@ internal class ProjectLogFetchParamsTest { .maxXactId("max_xact_id") .version("version") .build() - val expected = QueryParams.builder() - expected.put("limit", "0") - expected.put("max_root_span_id", "max_root_span_id") - expected.put("max_xact_id", "max_xact_id") - expected.put("version", "version") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("limit", "0") + .put("max_root_span_id", "max_root_span_id") + .put("max_xact_id", "max_xact_id") + .put("version", "version") + .build() + ) } @Test @@ -43,8 +49,10 @@ internal class ProjectLogFetchParamsTest { ProjectLogFetchParams.builder() .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } @Test diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreListParamsTest.kt index 4f67003d..e1ff4653 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreListParamsTest.kt @@ -37,30 +37,31 @@ internal class ProjectScoreListParamsTest { .scoreType(ProjectScoreType.SLIDER) .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - ProjectScoreListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("project_name", "project_name") - expected.put("project_score_name", "project_score_name") - expected.put( - "score_type", - ProjectScoreListParams.ScoreType.ofProject(ProjectScoreType.SLIDER.toString()) - .toString(), - ) - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("project_name", "project_name") + .put("project_score_name", "project_score_name") + .put("score_type", "slider") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = ProjectScoreListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectTagListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectTagListParamsTest.kt index 1a227720..5b43e3ad 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectTagListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectTagListParamsTest.kt @@ -35,25 +35,30 @@ internal class ProjectTagListParamsTest { .projectTagName("project_tag_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - ProjectTagListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("project_name", "project_name") - expected.put("project_tag_name", "project_tag_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("project_name", "project_name") + .put("project_tag_name", "project_tag_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = ProjectTagListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/PromptListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/PromptListParamsTest.kt index 66dd05b3..ef6a5e48 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/PromptListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/PromptListParamsTest.kt @@ -39,27 +39,32 @@ internal class PromptListParamsTest { .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .version("version") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - PromptListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("project_name", "project_name") - expected.put("prompt_name", "prompt_name") - expected.put("slug", "slug") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("version", "version") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("project_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("project_name", "project_name") + .put("prompt_name", "prompt_name") + .put("slug", "slug") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("version", "version") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = PromptListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/RoleListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/RoleListParamsTest.kt index 6908d93f..c023fec1 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/RoleListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/RoleListParamsTest.kt @@ -31,23 +31,28 @@ internal class RoleListParamsTest { .roleName("role_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - RoleListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("role_name", "role_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("role_name", "role_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = RoleListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/SpanIframeListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/SpanIframeListParamsTest.kt index da762a78..47aed4d6 100644 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/SpanIframeListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/SpanIframeListParamsTest.kt @@ -31,23 +31,28 @@ internal class SpanIframeListParamsTest { .spanIframeName("span_iframe_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - SpanIframeListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("span_iframe_name", "span_iframe_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("span_iframe_name", "span_iframe_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = SpanIframeListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/UserListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/UserListParamsTest.kt index 6600197f..59ea68cd 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/UserListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/UserListParamsTest.kt @@ -35,25 +35,30 @@ internal class UserListParamsTest { .orgName("org_name") .startingAfter("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .build() - val expected = QueryParams.builder() - expected.put("email", UserListParams.Email.ofString("string").toString()) - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("family_name", UserListParams.FamilyName.ofString("string").toString()) - expected.put("given_name", UserListParams.GivenName.ofString("string").toString()) - expected.put( - "ids", - UserListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("org_name", "org_name") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("email", "string") + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("family_name", "string") + .put("given_name", "string") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("org_name", "org_name") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .build() + ) } @Test fun queryParamsWithoutOptionalFields() { val params = UserListParams.builder().build() - val expected = QueryParams.builder() - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams).isEqualTo(QueryParams.builder().build()) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ViewListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ViewListParamsTest.kt index 96d39d8a..05c283a8 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ViewListParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ViewListParamsTest.kt @@ -35,19 +35,22 @@ internal class ViewListParamsTest { .viewName("view_name") .viewType(ViewType.PROJECTS) .build() - val expected = QueryParams.builder() - expected.put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("object_type", AclObjectType.ORGANIZATION.toString()) - expected.put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put( - "ids", - ViewListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e").toString(), - ) - expected.put("limit", "0") - expected.put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("view_name", "view_name") - expected.put("view_type", ViewType.PROJECTS.toString()) - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("object_type", "organization") + .put("ending_before", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("ids", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("limit", "0") + .put("starting_after", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("view_name", "view_name") + .put("view_type", "projects") + .build() + ) } @Test @@ -57,9 +60,15 @@ internal class ViewListParamsTest { .objectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .objectType(AclObjectType.ORGANIZATION) .build() - val expected = QueryParams.builder() - expected.put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("object_type", AclObjectType.ORGANIZATION.toString()) - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("object_type", "organization") + .build() + ) } } diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ViewRetrieveParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ViewRetrieveParamsTest.kt index 17c8a2dd..d73a583b 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ViewRetrieveParamsTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ViewRetrieveParamsTest.kt @@ -25,10 +25,16 @@ internal class ViewRetrieveParamsTest { .objectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .objectType(AclObjectType.ORGANIZATION) .build() - val expected = QueryParams.builder() - expected.put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("object_type", AclObjectType.ORGANIZATION.toString()) - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("object_type", "organization") + .build() + ) } @Test @@ -39,10 +45,16 @@ internal class ViewRetrieveParamsTest { .objectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") .objectType(AclObjectType.ORGANIZATION) .build() - val expected = QueryParams.builder() - expected.put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") - expected.put("object_type", AclObjectType.ORGANIZATION.toString()) - assertThat(params._queryParams()).isEqualTo(expected.build()) + + val queryParams = params._queryParams() + + assertThat(queryParams) + .isEqualTo( + QueryParams.builder() + .put("object_id", "182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e") + .put("object_type", "organization") + .build() + ) } @Test diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/async/FunctionServiceAsyncTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/async/FunctionServiceAsyncTest.kt index 8e65f276..74787883 100644 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/async/FunctionServiceAsyncTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/async/FunctionServiceAsyncTest.kt @@ -15,7 +15,6 @@ import com.braintrustdata.api.models.FunctionUpdateParams import com.braintrustdata.api.models.PromptData import com.braintrustdata.api.models.PromptOptions import kotlin.jvm.optionals.getOrNull -import kotlin.test.assertNotNull import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -368,8 +367,7 @@ internal class FunctionServiceAsyncTest { val response = responseFuture.get() val unwrappedResponse = response.getOrNull() - assertNotNull(unwrappedResponse) - unwrappedResponse.validate() + unwrappedResponse?.validate() } @Test diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/blocking/FunctionServiceTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/blocking/FunctionServiceTest.kt index 1398db02..5666dd34 100755 --- a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/blocking/FunctionServiceTest.kt +++ b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/blocking/FunctionServiceTest.kt @@ -15,7 +15,6 @@ import com.braintrustdata.api.models.FunctionUpdateParams import com.braintrustdata.api.models.PromptData import com.braintrustdata.api.models.PromptOptions import kotlin.jvm.optionals.getOrNull -import kotlin.test.assertNotNull import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -362,8 +361,7 @@ internal class FunctionServiceTest { ) val unwrappedResponse = response.getOrNull() - assertNotNull(unwrappedResponse) - unwrappedResponse.validate() + unwrappedResponse?.validate() } @Test