scalafmt

Author: bburdiliak

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/JsonFormats.scala

@@ -1,6 +1,5 @@
 package io.cequence.openaiscala.anthropic
 
-import io.cequence.openaiscala.anthropic.domain.CacheControl.Ephemeral
 import io.cequence.openaiscala.anthropic.domain.Content.ContentBlock.{MediaBlock, TextBlock}
 import io.cequence.openaiscala.anthropic.domain.Content.{
   ContentBlockBase,

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/domain/Message.scala

@@ -1,7 +1,6 @@
 package io.cequence.openaiscala.anthropic.domain
 
 import io.cequence.openaiscala.anthropic.domain.Content.{
-  ContentBlock,
   ContentBlockBase,
   ContentBlocks,
   SingleString

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service/impl/AnthropicServiceImpl.scala

@@ -94,7 +94,7 @@ private[service] trait AnthropicServiceImpl extends Anthropic {
     val messageJsons = messages.map(Json.toJson(_))
 
     val systemJson = system.map {
-      case single @ Content.SingleString(text, cacheControl) =>
+      case Content.SingleString(text, cacheControl) =>
         if (cacheControl.isEmpty) JsString(text)
         else {
           val blocks =

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service/impl/OpenAIAnthropicChatCompletionService.scala

@@ -2,7 +2,6 @@ package io.cequence.openaiscala.anthropic.service.impl
 
 import akka.NotUsed
 import akka.stream.scaladsl.Source
-import io.cequence.openaiscala.anthropic.domain.Content
 import io.cequence.openaiscala.anthropic.service.AnthropicService
 import io.cequence.openaiscala.domain.BaseMessage
 import io.cequence.openaiscala.domain.response.{

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service/impl/package.scala

@@ -80,7 +80,7 @@ package object impl extends AnthropicServiceConsts {
       .foldLeft((List.empty[Message], countUserMessagesToCache)) {
         case ((acc, userMessagesToCache), message) =>
           message match {
-            case Message.UserMessage(contentString, cacheControl) =>
+            case Message.UserMessage(contentString, _) =>
               val newCacheControl = if (userMessagesToCache > 0) Some(Ephemeral) else None
               (
                 acc :+ Message.UserMessage(contentString, newCacheControl),

openai-client/src/main/scala/io/cequence/openaiscala/service/impl/OpenAIChatCompletionServiceImpl.scala

@@ -11,7 +11,6 @@ import io.cequence.openaiscala.service.adapter.{
 import io.cequence.openaiscala.service.{OpenAIChatCompletionService, OpenAIServiceConsts}
 import io.cequence.wsclient.JsonUtil
 import io.cequence.wsclient.ResponseImplicits._
-import io.cequence.wsclient.service.WSClient
 import io.cequence.wsclient.service.WSClientWithEngineTypes.WSClientWithEngine
 import play.api.libs.json.{JsObject, JsValue, Json}
 

openai-core/src/main/scala/io/cequence/openaiscala/domain/Batch.scala

@@ -87,15 +87,15 @@ object Batch {
     request_counts: Map[String, Int],
     metadata: Option[Map[String, String]]
   ) {
-    def isRunning =
+    def isRunning: Boolean =
       List("in_progress", "validating", "finalizing", "cancelling").contains(status)
 
     // "failed", "completed", "expired", "cancelled"
-    def isFinished = !isRunning
+    def isFinished: Boolean = !isRunning
 
-    def isSuccess = status == "completed"
+    def isSuccess: Boolean = status == "completed"
 
-    def isFailedOrCancelledOrExpired = isFinished && !isSuccess
+    def isFailedOrCancelledOrExpired: Boolean = isFinished && !isSuccess
   }
 
   case class BatchProcessingErrors(

openai-core/src/main/scala/io/cequence/openaiscala/domain/settings/CreateChatCompletionSettings.scala

@@ -2,8 +2,6 @@ package io.cequence.openaiscala.domain.settings
 
 import io.cequence.wsclient.domain.EnumValue
 
-import scala.util.Try
-
 case class CreateChatCompletionSettings(
   // ID of the model to use. Currently, only gpt-3.5-turbo and gpt-3.5-turbo-0301 are supported.
   model: String,

openai-core/src/main/scala/io/cequence/openaiscala/service/OpenAIChatCompletionExtra.scala

@@ -135,7 +135,7 @@ object OpenAIChatCompletionExtra {
     settings: CreateChatCompletionSettings,
     taskNameForLogging: String,
     jsonSchemaModels: Seq[String] = defaultJsonSchemaModels
-  ) = {
+  ): (Seq[BaseMessage], CreateChatCompletionSettings) = {
     val jsonSchemaDef = settings.jsonSchema.getOrElse(
       throw new IllegalArgumentException("JSON schema is not defined but expected.")
     )

openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/ChatCompletionSettingsConversions.scala

@@ -1,6 +1,5 @@
 package io.cequence.openaiscala.service.adapter
 
-import io.cequence.openaiscala.domain.response.ResponseFormat
 import io.cequence.openaiscala.domain.settings.{
   ChatCompletionResponseFormatType,
   CreateChatCompletionSettings

openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/RetryServiceAdapter.scala

@@ -1,7 +1,7 @@
 package io.cequence.openaiscala.service.adapter
 
 import akka.actor.Scheduler
-import io.cequence.openaiscala.{RetryHelpers, Retryable}
+import io.cequence.openaiscala.RetryHelpers
 import io.cequence.openaiscala.RetryHelpers.RetrySettings
 import io.cequence.wsclient.service.CloseableService
 

openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/RetryAdapterExample.scala

@@ -1,6 +1,5 @@
 package io.cequence.openaiscala.examples.adapter
 
-import akka.actor.Scheduler
 import io.cequence.openaiscala.{OpenAIScalaClientException, OpenAIScalaClientTimeoutException}
 import io.cequence.openaiscala.RetryHelpers.RetrySettings
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings

openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai/AnthropicCreateMessageWithPdf.scala

@@ -10,11 +10,9 @@ import io.cequence.openaiscala.anthropic.service.{AnthropicService, AnthropicSer
 import io.cequence.openaiscala.domain.NonOpenAIModelId
 import io.cequence.openaiscala.examples.ExampleBase
 
-import java.awt.image.RenderedImage
-import java.io.{ByteArrayOutputStream, File}
+import java.io.File
 import java.nio.file.Files
 import java.util.Base64
-import javax.imageio.ImageIO
 import scala.concurrent.Future
 
 // requires `openai-scala-anthropic-client` as a dependency

openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai/AnthropicCreateSystemMessage.scala

@@ -1,6 +1,5 @@
 package io.cequence.openaiscala.examples.nonopenai
 
-import io.cequence.openaiscala.anthropic.domain.CacheControl.Ephemeral
 import io.cequence.openaiscala.anthropic.domain.Content.ContentBlock.TextBlock
 import io.cequence.openaiscala.anthropic.domain.Content.{ContentBlockBase, SingleString}
 import io.cequence.openaiscala.anthropic.domain.{Content, Message}