Fix OpenAI Interceptor, and make OpenAI specific fixes

Author: nomisRev

.editorconfig

@@ -13,7 +13,7 @@ ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = true
 ij_smart_tabs = false
-ij_visual_guides = 
+ij_visual_guides = 120
 ij_wrap_on_typing = false
 
 [{*.kt,*.kts}]

build.gradle.kts

@@ -1,4 +1,3 @@
-import com.diffplug.gradle.spotless.SpotlessExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.jvm.tasks.Jar
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -9,20 +8,6 @@ plugins {
   alias(libs.plugins.multiplatform) apply false
   alias(libs.plugins.assert)
   alias(libs.plugins.publish)
-  alias(libs.plugins.spotless)
-}
-
-configure<SpotlessExtension> {
-  kotlin {
-    target("**/*.kt")
-    ktfmt().kotlinlangStyle().configure {
-      it.setBlockIndent(2)
-      it.setContinuationIndent(2)
-      it.setRemoveUnusedImport(true)
-    }
-    trimTrailingWhitespace()
-    endWithNewline()
-  }
 }
 
 @Suppress("OPT_IN_USAGE")

example/src/commonMain/kotlin/Main.kt

@@ -1,22 +1,29 @@
-package com.xebia.functional.openai
+package io.github.nomisrev.openapi
 
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.bodyAsChannel
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.readUTF8Line
 import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.serializer
 
+@Serializable
+data class ServerSentEvent(
+  val event: String? = null,
+  val data: JsonElement? = null,
+)
 
 // ServerSentEvent, INTERNAL TO THIS MODULE
 // RunDelta | CreateChatCompletionStreamResponse
 internal suspend inline fun <reified A> FlowCollector<A>.streamEvents(
   response: HttpResponse,
-  json: Json,
-  prefix: String,
-  end: String
+  json: Json = Json,
+  prefix: String = "data:",
+  end: String = "data: [DONE]"
 ) {
   val channel: ByteReadChannel = response.bodyAsChannel()
   var nextEvent: String? = null
@@ -29,18 +36,14 @@ internal suspend inline fun <reified A> FlowCollector<A>.streamEvents(
     }
 
     // if the line is an event like "event: thread.created" we want to ensure
-    // A is of type ServerSentEvent and we skip the line treating next `prefix` as a JsonObject
+    // A is of type ServerSentEvent, and we skip the line treating next `prefix` as a JsonObject
     // otherwise we treat the line as a json object if it starts with the prefix
     // and emit the value
-
-    // if the line is an event like "event: thread.created" we want to ensure
-    // A is of type ServerSentEvent and we skip the line treating next `prefix` as a JsonObject
     if (line.startsWith("event:")) {
       nextEvent = line.removePrefix("event:").trim()
       continue
-    }
-    // otherwise we treat the line as a json object if it starts with the prefix
-    else if (line.startsWith(prefix) && nextEvent == null) {
+    } else if (line.startsWith(prefix) && nextEvent == null) {
+      // otherwise we treat the line as a json object if it starts with the prefix
       val data = line.removePrefix(prefix).trim()
       val value: A = json.decodeFromString(serializer(), data)
       emit(value)

example/src/commonMain/kotlin/StreamingOps.kt

@@ -1,56 +1,19 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-
 plugins {
-  id(libs.plugins.multiplatform.get().pluginId)
+  id(libs.plugins.jvm.get().pluginId)
   alias(libs.plugins.serialization)
-  alias(libs.plugins.assert)
   id(libs.plugins.publish.get().pluginId)
+// Failing on Interceptors.kt
+//  alias(libs.plugins.spotless)
 }
 
 kotlin {
-  jvm {
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
-    mainRun { mainClass.set("io.github.nomisrev.openapi.MainKt") }
-  }
-//  macosArm64()
-//  linuxX64()
-
-  sourceSets {
-    commonMain {
-      kotlin.srcDir(project.file("build/generated/openapi/src/commonMain/kotlin"))
-
-      dependencies {
-        api(libs.kasechange)
-        api(libs.okio)
-        implementation("io.ktor:ktor-client-core:2.3.6")
-        api(projects.parser)
-      }
-    }
-    commonTest {
-      dependencies {
-        implementation(libs.test)
-      }
-    }
-    jvmMain {
-      dependencies {
-        implementation("com.squareup:kotlinpoet:1.17.0")
-      }
-    }
-//    jsMain {
-//      dependencies {
-//        implementation("com.squareup.okio:okio-nodefilesystem:3.9.0")
-//      }
-//    }
-    commonTest {
-      dependencies {
-        implementation(libs.okio.fakefilesystem)
-      }
-    }
-  }
+  compilerOptions.freeCompilerArgs.add("-Xcontext-receivers")
 }
 
-task("runMacosArm64") {
-  dependsOn("linkDebugExecutableMacosArm64")
-  dependsOn("runDebugExecutableMacosArm64")
-  group = "run"
+dependencies {
+  implementation(libs.okio)
+  api(libs.ktor.client)
+  api(projects.typed)
+  api(libs.kasechange)
+  api(libs.kotlinpoet)
 }

generation/build.gradle.kts

@@ -101,21 +101,25 @@ private fun TypeSpec.Builder.apiConstructor(): TypeSpec.Builder =
         .build()
     )
 
+context(OpenAPIContext)
 private fun Route.nestedTypes(): List<TypeSpec> = inputs() + returns() + bodies()
 
+context(OpenAPIContext)
 private fun Route.inputs(): List<TypeSpec> =
-  input.mapNotNull { (it.type as? Resolved.Value)?.value?.toTypeSpec() }
+  input.mapNotNull { (it.type as? Resolved.Value)?.value?.toTypeSpecOrNull() }
 
+context(OpenAPIContext)
 private fun Route.returns(): List<TypeSpec> =
-  returnType.types.values.mapNotNull { (it.type as? Resolved.Value)?.value?.toTypeSpec() }
+  returnType.types.values.mapNotNull { (it.type as? Resolved.Value)?.value?.toTypeSpecOrNull() }
 
+context(OpenAPIContext)
 private fun Route.bodies(): List<TypeSpec> =
   body.types.values.flatMap { body ->
     when (body) {
       is Route.Body.Json.Defined ->
-        listOfNotNull((body.type as? Resolved.Value)?.value?.toTypeSpec())
+        listOfNotNull((body.type as? Resolved.Value)?.value?.toTypeSpecOrNull())
 
-      is Route.Body.Multipart.Value -> body.parameters.mapNotNull { it.type.value.toTypeSpec() }
+      is Route.Body.Multipart.Value -> body.parameters.mapNotNull { it.type.value.toTypeSpecOrNull() }
       is Route.Body.Multipart.Ref,
       is Route.Body.Xml,
       is Route.Body.Json.FreeForm,
@@ -198,85 +202,67 @@ private fun Route.toFun(implemented: Boolean): FunSpec =
       if (implemented) {
         addCode(
           CodeBlock.builder()
-            .addStatement(
-              "val response = client.%M {",
-              MemberName("io.ktor.client.request", "request", isExtension = true)
-            )
+            .addStatement("val response = client.%M {", request)
             .withIndent {
               addStatement("configure()")
-              addStatement("method = %T.%L", ClassName("io.ktor.http", "HttpMethod"), method.value)
-              val replace =
-                input
-                  .mapNotNull {
-                    if (it.input == Parameter.Input.Path)
-                      ".replace(\"{${it.name}}\", ${toParamName(Named(it.name))})"
-                    else null
-                  }
-                  .joinToString(separator = "")
-              addStatement(
-                "url { %M(%S$replace) }",
-                MemberName("io.ktor.http", "path", isExtension = true),
-                path
-              )
-              addContentType(body)
-              addBody(body)
+              addStatement("method = %T.%L", HttpMethod, method.name())
+              addPathAndContent()
+              addBody()
             }
             .addStatement("}")
-            .addStatement(
-              "return response.%M()",
-              MemberName("io.ktor.client.call", "body", isExtension = true)
-            )
+            .addStatement("return response.%M()", MemberName("io.ktor.client.call", "body", isExtension = true))
             .build()
         )
       }
     }
     .build()
 
-context(OpenAPIContext)
-fun CodeBlock.Builder.addContentType(bodies: Route.Bodies): CodeBlock.Builder =
+context(OpenAPIContext, CodeBlock.Builder)
+fun Route.addPathAndContent() {
+  val replace = input
+    .mapNotNull {
+      if (it.input == Parameter.Input.Path)
+        ".replace(\"{${it.name}}\", ${toParamName(Named(it.name))})"
+      else null
+    }
+    .joinToString(separator = "")
+  addStatement(
+    "url { %M(%S$replace) }",
+    MemberName("io.ktor.http", "path", isExtension = true),
+    path
+  )
+  addContentType(body)
+}
+
+context(OpenAPIContext, CodeBlock.Builder)
+fun addContentType(bodies: Route.Bodies) {
   bodies.firstNotNullOfOrNull { (_, body) ->
     when (body) {
       is Route.Body.Json -> addStatement(
-        "%M(%T.%L)",
-        MemberName("io.ktor.http", "contentType"),
-        ClassName("io.ktor.http", "ContentType", "Application"),
-        "Json"
+        "%M(%T.%L)", contentType, ContentType.nested("Application"), "Json"
       )
 
       is Route.Body.Xml -> TODO("Xml input body not supported yet.")
       is Route.Body.OctetStream -> TODO("OctetStream  input body not supported yet.")
       is Route.Body.Multipart.Ref,
-      is Route.Body.Multipart.Value -> addStatement(
-        "%M(%T.%L)",
-        MemberName("io.ktor.http", "contentType"),
-        ClassName("io.ktor.http", "ContentType", "MultiPart"),
-        "FormData"
-      )
+      is Route.Body.Multipart.Value ->
+        addStatement("%M(%T.%L)", contentType, ContentType.nested("MultiPart"), "FormData")
     }
   }
-    ?: this
+}
 
-context(OpenAPIContext)
-fun CodeBlock.Builder.addBody(bodies: Route.Bodies): CodeBlock.Builder =
-  bodies.firstNotNullOfOrNull { (_, body) ->
+context(OpenAPIContext, CodeBlock.Builder)
+fun Route.addBody() {
+  body.firstNotNullOfOrNull { (_, body) ->
     when (body) {
-      is Route.Body.Json -> addStatement(
-        "%M(%L)",
-        MemberName("io.ktor.client.request", "setBody", isExtension = true),
-        "body"
-      )
+      is Route.Body.Json -> addStatement("%M(%L)", setBody, "body")
 
       is Route.Body.Xml -> TODO("Xml input body not supported yet.")
       is Route.Body.OctetStream -> TODO("OctetStream  input body not supported yet.")
-      is Route.Body.Multipart.Ref,
-      is Route.Body.Multipart.Value -> {
-        body as Route.Body.Multipart
-        addStatement("%M(", MemberName("io.ktor.client.request", "setBody", isExtension = true))
+      is Route.Body.Multipart -> {
+        addStatement("%M(", setBody)
         withIndent {
-          addStatement(
-            "%M {",
-            MemberName("io.ktor.client.request.forms", "formData", isExtension = true)
-          )
+          addStatement("%M {", formData)
           withIndent {
             when (body) {
               is Route.Body.Multipart.Value ->
@@ -304,7 +290,7 @@ fun CodeBlock.Builder.addBody(bodies: Route.Bodies): CodeBlock.Builder =
       }
     }
   }
-    ?: this
+}
 
 context(OpenAPIContext)
 fun Route.params(defaults: Boolean): List<ParameterSpec> =
@@ -335,6 +321,7 @@ fun Route.requestBody(defaults: Boolean): List<ParameterSpec> {
     description: String?
   ): ParameterSpec =
     ParameterSpec.builder(name, type.toTypeName().copy(nullable = nullable))
+      .description(description)
       .apply { if (defaults && nullable) defaultValue("null") }
       .build()
 

generation/src/main/kotlin/io/github/nomisrev/openapi/APIs.kt

@@ -22,9 +22,9 @@ private fun defaultValueImpl(model: Model): Pair<String, List<Any>>? =
       model.cases
         .find { it.model.value is Model.Primitive.String }
         ?.let { case ->
-          model.default?.let {
+          model.default?.let { default ->
             val typeName = toCaseClassName(model, case.model.value)
-            Pair("%T(%S)", listOf(typeName, model.default))
+            Pair("%T(%S)", listOf(typeName, default))
           }
         }
     is Model.Object ->