Skip to content

chore(internal): refactor query param serialization impl and tests #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stainless-app merged 1 commit into from
Mar 18, 2025
Merged

chore(internal): refactor query param serialization impl and tests #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AclListParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Unit> {
override fun visitString(string: String) {
put("ids", string)
}

override fun visitStrings(strings: List<String>) {
put("ids", strings.joinToString(","))
}
}
)
limit?.let { put("limit", it.toString()) }
startingAfter?.let { put("starting_after", it) }
putAll(additionalQueryParams)
}
.build()

fun toBuilder() = Builder().from(this)

Expand Down
45 changes: 33 additions & 12 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/AiSecretListParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Unit> {
override fun visitString(string: String) {
put("ai_secret_type", string)
}

override fun visitStrings(strings: List<String>) {
put("ai_secret_type", strings.joinToString(","))
}
}
)
endingBefore?.let { put("ending_before", it) }
ids?.accept(
object : Ids.Visitor<Unit> {
override fun visitString(string: String) {
put("ids", string)
}

override fun visitStrings(strings: List<String>) {
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)

Expand Down
33 changes: 22 additions & 11 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ApiKeyListParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Unit> {
override fun visitString(string: String) {
put("ids", string)
}

override fun visitStrings(strings: List<String>) {
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)

Expand Down
19 changes: 10 additions & 9 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetFetchParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
37 changes: 24 additions & 13 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetListParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Unit> {
override fun visitString(string: String) {
put("ids", string)
}

override fun visitStrings(strings: List<String>) {
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)

Expand Down
13 changes: 7 additions & 6 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/DatasetSummarizeParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
31 changes: 21 additions & 10 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/EnvVarListParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Unit> {
override fun visitString(string: String) {
put("ids", string)
}

override fun visitStrings(strings: List<String>) {
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)

Expand Down
19 changes: 10 additions & 9 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentFetchParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
37 changes: 24 additions & 13 deletions braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentListParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Unit> {
override fun visitString(string: String) {
put("ids", string)
}

override fun visitStrings(strings: List<String>) {
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)

Expand Down
17 changes: 8 additions & 9 deletions ...rust-java-core/src/main/kotlin/com/braintrustdata/api/models/ExperimentSummarizeParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading