Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.fasterxml.jackson.databind.json.JsonMapper
import com.fasterxml.jackson.databind.node.JsonNodeType
import com.openlayer.api.core.MultipartField
import com.openlayer.api.errors.OpenlayerInvalidDataException
import java.io.ByteArrayInputStream
import java.io.InputStream
import java.io.OutputStream
import kotlin.jvm.optionals.getOrNull
Expand Down Expand Up @@ -74,12 +73,12 @@ internal fun multipartFormData(
when (node.nodeType) {
JsonNodeType.MISSING,
JsonNodeType.NULL -> emptySequence()
JsonNodeType.BINARY -> sequenceOf(name to ByteArrayInputStream(node.binaryValue()))
JsonNodeType.STRING -> sequenceOf(name to node.textValue().toInputStream())
JsonNodeType.BINARY -> sequenceOf(name to node.binaryValue().inputStream())
JsonNodeType.STRING -> sequenceOf(name to node.textValue().inputStream())
JsonNodeType.BOOLEAN ->
sequenceOf(name to node.booleanValue().toString().toInputStream())
sequenceOf(name to node.booleanValue().toString().inputStream())
JsonNodeType.NUMBER ->
sequenceOf(name to node.numberValue().toString().toInputStream())
sequenceOf(name to node.numberValue().toString().inputStream())
JsonNodeType.ARRAY ->
sequenceOf(
name to
Expand All @@ -104,7 +103,7 @@ internal fun multipartFormData(
}
}
.joinToString(",")
.toInputStream()
.inputStream()
)
JsonNodeType.OBJECT ->
node.fields().asSequence().flatMap { (key, value) ->
Expand All @@ -117,7 +116,7 @@ internal fun multipartFormData(
)
}

private fun String.toInputStream(): InputStream = ByteArrayInputStream(toByteArray())
private fun String.inputStream(): InputStream = toByteArray().inputStream()

override fun writeTo(outputStream: OutputStream) = entity.writeTo(outputStream)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

package com.openlayer.api.models.inferencepipelines

import kotlin.test.assertNotNull
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -42,7 +41,6 @@ internal class InferencePipelineUpdateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.description()).contains("This pipeline is used for production.")
assertThat(body.name()).contains("production")
assertThat(body.referenceDatasetUri()).contains("referenceDatasetUri")
Expand All @@ -56,7 +54,5 @@ internal class InferencePipelineUpdateParamsTest {
.build()

val body = params._body()

assertNotNull(body)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package com.openlayer.api.models.inferencepipelines.data

import com.openlayer.api.core.JsonValue
import kotlin.test.assertNotNull
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -109,7 +108,6 @@ internal class DataStreamParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.config())
.isEqualTo(
DataStreamParams.Config.ofLlmData(
Expand Down Expand Up @@ -167,7 +165,6 @@ internal class DataStreamParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.config())
.isEqualTo(
DataStreamParams.Config.ofLlmData(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package com.openlayer.api.models.inferencepipelines.rows

import com.openlayer.api.core.JsonValue
import com.openlayer.api.core.http.QueryParams
import kotlin.test.assertNotNull
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -98,7 +97,6 @@ internal class RowUpdateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body._row()).isEqualTo(JsonValue.from(mapOf<String, Any>()))
assertThat(body.config())
.contains(
Expand All @@ -122,7 +120,6 @@ internal class RowUpdateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body._row()).isEqualTo(JsonValue.from(mapOf<String, Any>()))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package com.openlayer.api.models.projects

import java.time.OffsetDateTime
import kotlin.test.assertNotNull
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -97,7 +96,6 @@ internal class ProjectCreateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.id()).isEqualTo("3fa85f64-5717-4562-b3fc-2c963f66afa6")
assertThat(body.creatorId()).contains("589ece63-49a2-41b4-98e1-10547761d4b0")
assertThat(body.dateCreated()).isEqualTo(OffsetDateTime.parse("2024-03-22T11:31:01.185Z"))
Expand Down Expand Up @@ -167,7 +165,6 @@ internal class ProjectCreateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.id()).isEqualTo("3fa85f64-5717-4562-b3fc-2c963f66afa6")
assertThat(body.creatorId()).contains("589ece63-49a2-41b4-98e1-10547761d4b0")
assertThat(body.dateCreated()).isEqualTo(OffsetDateTime.parse("2024-03-22T11:31:01.185Z"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package com.openlayer.api.models.projects.commits

import java.time.OffsetDateTime
import kotlin.test.assertNotNull
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -138,7 +137,6 @@ internal class CommitCreateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.id()).isEqualTo("3fa85f64-5717-4562-b3fc-2c963f66afa6")
assertThat(body.commit())
.isEqualTo(
Expand Down Expand Up @@ -215,7 +213,6 @@ internal class CommitCreateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.id()).isEqualTo("3fa85f64-5717-4562-b3fc-2c963f66afa6")
assertThat(body.commit())
.isEqualTo(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package com.openlayer.api.models.projects.inferencepipelines

import java.time.LocalDate
import java.time.OffsetDateTime
import kotlin.test.assertNotNull
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -235,7 +234,6 @@ internal class InferencePipelineCreateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.id()).isEqualTo("3fa85f64-5717-4562-b3fc-2c963f66afa6")
assertThat(body.dateCreated()).isEqualTo(OffsetDateTime.parse("2024-03-22T11:31:01.185Z"))
assertThat(body.dateLastEvaluated())
Expand Down Expand Up @@ -362,7 +360,6 @@ internal class InferencePipelineCreateParamsTest {

val body = params._body()

assertNotNull(body)
assertThat(body.id()).isEqualTo("3fa85f64-5717-4562-b3fc-2c963f66afa6")
assertThat(body.dateCreated()).isEqualTo(OffsetDateTime.parse("2024-03-22T11:31:01.185Z"))
assertThat(body.dateLastEvaluated())
Expand Down