From 51adcbfde18b324b69f1ca2d5118dee99832b862 Mon Sep 17 00:00:00 2001 From: Peter Banda Date: Wed, 18 Sep 2024 17:17:33 +0200 Subject: [PATCH] Formatting + ws client bump --- .../cequence/openaiscala/domain/JsonSchema.scala | 4 ++-- .../service/JsonSchemaReflectionHelper.scala | 3 ++- .../ChatCompletionSettingsConversions.scala | 16 ++++++++++++---- .../service/adapter/MessageConversions.scala | 4 +++- .../CreateChatCompletionJsonForCaseClass.scala | 8 ++++++-- project/Dependencies.scala | 2 +- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/openai-core/src/main/scala/io/cequence/openaiscala/domain/JsonSchema.scala b/openai-core/src/main/scala/io/cequence/openaiscala/domain/JsonSchema.scala index d270d973..93b28804 100644 --- a/openai-core/src/main/scala/io/cequence/openaiscala/domain/JsonSchema.scala +++ b/openai-core/src/main/scala/io/cequence/openaiscala/domain/JsonSchema.scala @@ -9,7 +9,7 @@ sealed trait JsonSchema { object JsonSchema { - import java.lang.{ String => JString } + import java.lang.{String => JString} case class Object( properties: Map[JString, JsonSchema], @@ -53,4 +53,4 @@ object JsonType { case object Array extends JsonType("array") } -sealed abstract class JsonType(value: String) extends NamedEnumValue(value) \ No newline at end of file +sealed abstract class JsonType(value: String) extends NamedEnumValue(value) diff --git a/openai-core/src/main/scala/io/cequence/openaiscala/service/JsonSchemaReflectionHelper.scala b/openai-core/src/main/scala/io/cequence/openaiscala/service/JsonSchemaReflectionHelper.scala index e2387ac8..3dd1cb6a 100644 --- a/openai-core/src/main/scala/io/cequence/openaiscala/service/JsonSchemaReflectionHelper.scala +++ b/openai-core/src/main/scala/io/cequence/openaiscala/service/JsonSchemaReflectionHelper.scala @@ -13,7 +13,8 @@ trait JsonSchemaReflectionHelper { dateAsNumber: Boolean = false, useRuntimeMirror: Boolean = false ): JsonSchema = { - val mirror = if (useRuntimeMirror) runtimeMirror(getClass.getClassLoader) else typeTag[T].mirror + val mirror = + if (useRuntimeMirror) runtimeMirror(getClass.getClassLoader) else typeTag[T].mirror asJsonSchema(typeOf[T], mirror, dateAsNumber) } diff --git a/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/ChatCompletionSettingsConversions.scala b/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/ChatCompletionSettingsConversions.scala index 54a590e7..7e6ae792 100644 --- a/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/ChatCompletionSettingsConversions.scala +++ b/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/ChatCompletionSettingsConversions.scala @@ -45,28 +45,36 @@ object ChatCompletionSettingsConversions { FieldConversionDef( settings => settings.temperature.isDefined && settings.temperature.get != 1, _.copy(temperature = Some(1d)), - Some("O1 models don't support temperature values other than the default of 1, converting to 1."), + Some( + "O1 models don't support temperature values other than the default of 1, converting to 1." + ), warning = true ), // top_p FieldConversionDef( settings => settings.top_p.isDefined && settings.top_p.get != 1, _.copy(top_p = Some(1d)), - Some("O1 models don't support top p values other than the default of 1, converting to 1."), + Some( + "O1 models don't support top p values other than the default of 1, converting to 1." + ), warning = true ), // presence_penalty FieldConversionDef( settings => settings.presence_penalty.isDefined && settings.presence_penalty.get != 0, _.copy(presence_penalty = Some(0d)), - Some("O1 models don't support presence penalty values other than the default of 0, converting to 0."), + Some( + "O1 models don't support presence penalty values other than the default of 0, converting to 0." + ), warning = true ), // frequency_penalty FieldConversionDef( settings => settings.frequency_penalty.isDefined && settings.frequency_penalty.get != 0, _.copy(frequency_penalty = Some(0d)), - Some("O1 models don't support frequency penalty values other than the default of 0, converting to 0."), + Some( + "O1 models don't support frequency penalty values other than the default of 0, converting to 0." + ), warning = true ) ) diff --git a/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/MessageConversions.scala b/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/MessageConversions.scala index bd1819e2..d41b2de6 100644 --- a/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/MessageConversions.scala +++ b/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/MessageConversions.scala @@ -13,7 +13,9 @@ object MessageConversions { (messages: Seq[BaseMessage]) => { val nonSystemMessages = messages.map { case SystemMessage(content, _) => - logger.warn(s"System message found but not supported by an underlying model. Converting to a user message instead: '${content}'") + logger.warn( + s"System message found but not supported by an underlying model. Converting to a user message instead: '${content}'" + ) UserMessage(s"System: ${content}") case x: BaseMessage => x diff --git a/openai-examples/src/main/scala/io/cequence/openaiscala/examples/CreateChatCompletionJsonForCaseClass.scala b/openai-examples/src/main/scala/io/cequence/openaiscala/examples/CreateChatCompletionJsonForCaseClass.scala index a9c19f55..6eca24a9 100644 --- a/openai-examples/src/main/scala/io/cequence/openaiscala/examples/CreateChatCompletionJsonForCaseClass.scala +++ b/openai-examples/src/main/scala/io/cequence/openaiscala/examples/CreateChatCompletionJsonForCaseClass.scala @@ -9,7 +9,11 @@ import play.api.libs.json.Json import scala.concurrent.Future // experimental -object CreateChatCompletionJsonForCaseClass extends Example with TestFixtures with JsonSchemaReflectionHelper with OpenAIServiceConsts { +object CreateChatCompletionJsonForCaseClass + extends Example + with TestFixtures + with JsonSchemaReflectionHelper + with OpenAIServiceConsts { private val messages = Seq( SystemMessage(capitalsPrompt), @@ -18,7 +22,7 @@ object CreateChatCompletionJsonForCaseClass extends Example with TestFixtures wi // Case class(es) private case class CapitalsResponse( - countries: Seq[Country], + countries: Seq[Country] ) private case class Country( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 52e34993..53d5378a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,7 +1,7 @@ object Dependencies { object Versions { - val wsClient = "0.5.9" + val wsClient = "0.6.0" val scalaMock = "6.0.0" } }