format

Author: bburdiliak

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

@@ -5,7 +5,6 @@ import io.cequence.openaiscala.anthropic.service.impl.{
  AnthropicServiceImpl,
  OpenAIAnthropicChatCompletionService
 }
-import io.cequence.openaiscala.service.OpenAIChatCompletionService
 import io.cequence.openaiscala.service.StreamedServiceTypes.OpenAIChatCompletionStreamedService
 import io.cequence.wsclient.domain.WsRequestContext
 import io.cequence.wsclient.service.ws.Timeouts

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

@@ -1,7 +1,6 @@
 package io.cequence.openaiscala.anthropic.service.impl
 
 import akka.NotUsed
-import akka.stream.Materializer
 import akka.stream.scaladsl.Source
 import io.cequence.openaiscala.OpenAIScalaClientException
 import io.cequence.openaiscala.anthropic.JsonFormats

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

@@ -58,7 +58,7 @@ package object impl extends AnthropicServiceConsts {
  Content.ContentBlock.ImageBlock(encoding, mediaType, data)
  } else {
  throw new IllegalArgumentException(
- s"Image content only supported by providing image data directly."
+ "Image content only supported by providing image data directly."
  )
  }
  }

openai-client-stream/src/main/scala/io/cequence/openaiscala/service/OpenAIStreamedServiceImplicits.scala

@@ -4,11 +4,22 @@ import akka.NotUsed
 import akka.stream.Materializer
 import akka.stream.scaladsl.Source
 import io.cequence.openaiscala.domain.BaseMessage
-import io.cequence.openaiscala.domain.response.{ChatCompletionChunkResponse, TextCompletionResponse}
-import io.cequence.openaiscala.domain.settings.{CreateChatCompletionSettings, CreateCompletionSettings}
+import io.cequence.openaiscala.domain.response.{
+ ChatCompletionChunkResponse,
+ TextCompletionResponse
+}
+import io.cequence.openaiscala.domain.settings.{
+ CreateChatCompletionSettings,
+ CreateCompletionSettings
+}
 import io.cequence.openaiscala.service.StreamedServiceTypes.OpenAIStreamedService
 import io.cequence.openaiscala.service.adapter.ServiceWrapperTypes.CloseableServiceWrapper
-import io.cequence.openaiscala.service.adapter.{OpenAIChatCompletionServiceWrapper, OpenAICoreServiceWrapper, OpenAIServiceWrapper, SimpleServiceWrapper}
+import io.cequence.openaiscala.service.adapter.{
+ OpenAIChatCompletionServiceWrapper,
+ OpenAICoreServiceWrapper,
+ OpenAIServiceWrapper,
+ SimpleServiceWrapper
+}
 import io.cequence.wsclient.domain.WsRequestContext
 import io.cequence.wsclient.service.CloseableService
 

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

@@ -204,7 +204,7 @@ object JsonFormats {
 
  implicit val messageReads: Reads[BaseMessage] = Reads { (json: JsValue) =>
  val role = (json \ "role").as[ChatRole]
- val nameOpt = (json \ "name").asOpt[String]
+ (json \ "name").asOpt[String]
 
  val message: BaseMessage = role match {
  case ChatRole.System => json.as[SystemMessage]

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

@@ -292,7 +292,7 @@ private[service] trait OpenAIServiceImpl
  file: File,
  displayFileName: Option[String]
  ): Future[FileInfo] = {
- val fileRows = readFile(file)
+ readFile(file)
  // parse the fileContent as Seq[BatchRow] solely for the purpose of validating its structure, OpenAIScalaClientException is thrown if the parsing fails
 
 // fileRows.map { row =>

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

@@ -6,6 +6,7 @@ import io.cequence.openaiscala.service.OpenAIChatCompletionService
 import io.cequence.wsclient.service.CloseableService
 
 import scala.concurrent.Future
+import io.cequence.openaiscala.domain.response.ChatCompletionResponse
 
 private class ChatCompletionServiceAdapter[S <: CloseableService](
  chatCompletionService: OpenAIChatCompletionService,
@@ -23,7 +24,7 @@ private class ChatCompletionServiceAdapter[S <: CloseableService](
  override def createChatCompletion(
  messages: Seq[BaseMessage],
  settings: CreateChatCompletionSettings
- ) =
+ ): Future[ChatCompletionResponse] =
  chatCompletionService.createChatCompletion(messages, settings)
 
  override def close(): Unit = {

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

@@ -30,7 +30,7 @@ trait FunctionNameHelper {
 
  private val ignoreFunNames = Seq("wrap", "anonfun", "getFunctionName")
 
- protected def getFunctionName() = {
+ protected def getFunctionName(): String = {
  // need to use StackWalker to get the caller function name
  val predicate =
  Optional.of[Predicate[String]]((t: String) => ignoreFunNames.forall(!t.contains(_)))

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

@@ -57,7 +57,7 @@ trait OpenAIServiceWrapper
  tools: Seq[ToolSpec],
  responseToolChoice: Option[String],
  settings: CreateChatCompletionSettings
- ) = wrap(
+ ): Future[ChatToolCompletionResponse] = wrap(
  _.createChatToolCompletion(
  messages,
  tools,

openai-count-tokens/src/main/scala/io/cequence/openaiscala/service/OpenAICountTokensHelper.scala

@@ -14,7 +14,7 @@ trait OpenAICountTokensHelper {
  def countMessageTokens(
  model: String,
  messages: Seq[BaseMessage]
- ) = {
+ ): Int = {
  val encoding = registry.getEncodingForModel(model).orElseThrow
  val (tokensPerMessage, tokensPerName) = tokensPerMessageAndName(model)
 
@@ -27,7 +27,7 @@ trait OpenAICountTokensHelper {
  def countMessageTokens(
  model: String,
  message: BaseMessage
- ) = {
+ ): Int = {
  val encoding = registry.getEncodingForModel(model).orElseThrow
  val (tokensPerMessage, tokensPerName) = tokensPerMessageAndName(model)