Merge branch 'dev' of https://github.com/vyfor/groq-kt

vyfor · Nov 10, 2024 · 1bff29e · 1bff29e
2 parents b3f2cb2 + f6987f9
commit 1bff29e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,5 @@ bin/
 .DS_Store
 
 kls_database.db
+
+src/jvmTest/
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,9 @@
-@file:OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
-@file:Suppress("OPT_IN_USAGE")
+@file:OptIn(ExperimentalWasmDsl::class)
 
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.SonatypeHost
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform") version "2.0.10"
@@ -65,10 +65,11 @@ kotlin {
                 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
             }
         }
-        val commonTest by getting {
+        val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test"))
                 implementation("io.ktor:ktor-client-cio:$ktorVersion")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
             }
         }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/commonMain/kotlin/io/github/vyfor/groqkt/api/chat/ChatCompletionRequest.kt b/src/commonMain/kotlin/io/github/vyfor/groqkt/api/chat/ChatCompletionRequest.kt
@@ -6,7 +6,6 @@ import io.github.vyfor.groqkt.GroqModel
 import io.github.vyfor.groqkt.api.chat.CompletionFunctionCallType.Auto
 import io.github.vyfor.groqkt.api.chat.CompletionFunctionCallType.None
 import io.github.vyfor.groqkt.api.chat.CompletionResponseFormatType.JSON_OBJECT
-import io.github.vyfor.groqkt.api.chat.CompletionToolChoice.*
 import io.github.vyfor.groqkt.api.chat.UserMessageContent.Image
 import io.github.vyfor.groqkt.api.chat.UserMessageContent.Image.ImageObject
 import io.github.vyfor.groqkt.api.chat.UserMessageContent.Text
@@ -173,11 +172,11 @@ data class ChatCompletionRequest(
     var user: String? = null
 
     fun noFunctionCalls() {
-      functionCall = CompletionFunctionCallType.None
+      functionCall = None
     }
 
     fun autoFunctionCalls() {
-      functionCall = CompletionFunctionCallType.Auto
+      functionCall = Auto
     }
 
     fun functionCall(name: String) {
@@ -246,15 +245,15 @@ class ChatCompletionMessageBuilder {
         CompletionMessage.User(
             UserMessageType.Array(
                 imageContent =
-                    UserMessageContent.Image(UserMessageContent.Image.ImageObject(url = image)))))
+                    Image(ImageObject(url = image)))))
   }
 
   fun user(content: String?, image: String?, name: String? = null) {
     messages.add(
         CompletionMessage.User(
             UserMessageType.Array(
-                UserMessageContent.Text(content),
-                UserMessageContent.Image(UserMessageContent.Image.ImageObject(url = image))),
+                Text(content),
+                Image(ImageObject(url = image))),
             name))
   }
 
@@ -472,8 +471,8 @@ sealed class CompletionMessage(val role: String) {
           element<String>("toolCallId")
           element<String>("functionName")
           element<String>("toolName")
-          element<UserMessageContent.Text>("textContent")
-          element<UserMessageContent.Image>("imageContent")
+          element<Text>("textContent")
+          element<Image>("imageContent")
           element<CompletionFunctionCall>("functionCall")
           element<List<CompletionToolCall>>("toolCalls")
         }
@@ -548,13 +547,13 @@ sealed class CompletionMessage(val role: String) {
         User(
             UserMessageType.Array(
                 imageContent =
-                    UserMessageContent.Image(UserMessageContent.Image.ImageObject(url = image))))
+                    Image(ImageObject(url = image))))
 
     fun user(content: String?, image: String?, name: String? = null) =
         User(
             UserMessageType.Array(
-                UserMessageContent.Text(content),
-                UserMessageContent.Image(UserMessageContent.Image.ImageObject(url = image))),
+                Text(content),
+                Image(ImageObject(url = image))),
             name)
 
     fun assistant(
@@ -590,8 +589,8 @@ sealed class UserMessageType {
    */
   @Serializable
   data class Array(
-      val textContent: UserMessageContent.Text = UserMessageContent.Text(),
-      val imageContent: UserMessageContent.Image = UserMessageContent.Image()
+      val textContent: UserMessageContent.Text = Text(),
+      val imageContent: Image = Image()
   ) : UserMessageType() {
     init {
       require(textContent.type != null || imageContent.type != null) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,3 +41,5 @@ bin/
		.DS_Store

		kls_database.db

		src/jvmTest/