https://portal.app.cequence.io/#/projects/3485 scalafmt

cequence-io · Sep 13, 2024 · 987d21b · 987d21b
1 parent ba05aa7
commit 987d21b
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 62 deletions.
diff --git a/...src/main/scala/io/cequence/openaiscala/service/impl/OpenAIChatCompletionServiceImpl.scala b/...src/main/scala/io/cequence/openaiscala/service/impl/OpenAIChatCompletionServiceImpl.scala
@@ -5,7 +5,6 @@ import io.cequence.openaiscala.domain.BaseMessage
 import io.cequence.openaiscala.domain.response._
 import io.cequence.openaiscala.domain.settings._
 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

diff --git a/openai-examples/src/main/scala/io/cequence/openaiscala/examples/ChatCompletionProvider.scala b/openai-examples/src/main/scala/io/cequence/openaiscala/examples/ChatCompletionProvider.scala
@@ -12,6 +12,7 @@ import io.cequence.openaiscala.vertexai.service.VertexAIServiceFactory
 import io.cequence.wsclient.domain.WsRequestContext
 
 import scala.concurrent.ExecutionContext
+import io.cequence.openaiscala.service.StreamedServiceTypes
 
 object ChatCompletionProvider {
   case class ProviderSettings(
@@ -60,12 +61,14 @@ object ChatCompletionProvider {
   def vertexAI(
     implicit ec: ExecutionContext,
     m: Materializer
-  ) = VertexAIServiceFactory.asOpenAI()
+  ): StreamedServiceTypes.OpenAIChatCompletionStreamedService =
+    VertexAIServiceFactory.asOpenAI()
 
   def anthropic(
     implicit ec: ExecutionContext,
     m: Materializer
-  ) = AnthropicServiceFactory.asOpenAI()
+  ): StreamedServiceTypes.OpenAIChatCompletionStreamedService =
+    AnthropicServiceFactory.asOpenAI()
 
   object streamed {
     def cerebras(

diff --git a/...enaiscala/examples/nonopenai/AnthropicCreateChatCompletionStreamedWithOpenAIAdapter.scala b/...enaiscala/examples/nonopenai/AnthropicCreateChatCompletionStreamedWithOpenAIAdapter.scala
@@ -3,7 +3,6 @@ package io.cequence.openaiscala.examples.nonopenai
 import akka.NotUsed
 import akka.stream.scaladsl.{RestartSource, Sink, Source}
 import io.cequence.openaiscala.OpenAIScalaClientException
-import io.cequence.openaiscala.anthropic.service.AnthropicServiceFactory
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.domain.{NonOpenAIModelId, SystemMessage, UserMessage}
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}

diff --git a/...uence/openaiscala/examples/nonopenai/AnthropicCreateChatCompletionWithOpenAIAdapter.scala b/...uence/openaiscala/examples/nonopenai/AnthropicCreateChatCompletionWithOpenAIAdapter.scala
@@ -1,6 +1,5 @@
 package io.cequence.openaiscala.examples.nonopenai
 
-import io.cequence.openaiscala.anthropic.service.AnthropicServiceFactory
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.domain.{NonOpenAIModelId, SystemMessage, UserMessage}
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}

diff --git a/.../main/scala/io/cequence/openaiscala/examples/nonopenai/CerebrasCreateChatCompletion.scala b/.../main/scala/io/cequence/openaiscala/examples/nonopenai/CerebrasCreateChatCompletion.scala
@@ -3,11 +3,7 @@ package io.cequence.openaiscala.examples.nonopenai
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionService,
-  OpenAIChatCompletionServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionService
 
 import scala.concurrent.Future
 

diff --git a/...ala/io/cequence/openaiscala/examples/nonopenai/CerebrasCreateChatCompletionStreamed.scala b/...ala/io/cequence/openaiscala/examples/nonopenai/CerebrasCreateChatCompletionStreamed.scala
@@ -4,11 +4,7 @@ import akka.stream.scaladsl.Sink
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionStreamedServiceExtra,
-  OpenAIChatCompletionStreamedServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionStreamedServiceExtra
 
 import scala.concurrent.Future
 

diff --git a/...in/scala/io/cequence/openaiscala/examples/nonopenai/FireworksAICreateChatCompletion.scala b/...in/scala/io/cequence/openaiscala/examples/nonopenai/FireworksAICreateChatCompletion.scala
@@ -3,11 +3,7 @@ package io.cequence.openaiscala.examples.nonopenai
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionService,
-  OpenAIChatCompletionServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionService
 
 import scala.concurrent.Future
 

diff --git a/.../io/cequence/openaiscala/examples/nonopenai/FireworksAICreateChatCompletionStreamed.scala b/.../io/cequence/openaiscala/examples/nonopenai/FireworksAICreateChatCompletionStreamed.scala
@@ -4,11 +4,7 @@ import akka.stream.scaladsl.Sink
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionStreamedServiceExtra,
-  OpenAIChatCompletionStreamedServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionStreamedServiceExtra
 
 import scala.concurrent.Future
 

diff --git a/.../src/main/scala/io/cequence/openaiscala/examples/nonopenai/GroqCreateChatCompletion.scala b/.../src/main/scala/io/cequence/openaiscala/examples/nonopenai/GroqCreateChatCompletion.scala
@@ -3,11 +3,7 @@ package io.cequence.openaiscala.examples.nonopenai
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionService,
-  OpenAIChatCompletionServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionService
 
 import scala.concurrent.Future
 

diff --git a/...n/scala/io/cequence/openaiscala/examples/nonopenai/GroqCreateChatCompletionStreamed.scala b/...n/scala/io/cequence/openaiscala/examples/nonopenai/GroqCreateChatCompletionStreamed.scala
@@ -4,11 +4,7 @@ import akka.stream.scaladsl.Sink
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionStreamedServiceExtra,
-  OpenAIChatCompletionStreamedServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionStreamedServiceExtra
 
 import scala.concurrent.Future
 

diff --git a/...c/main/scala/io/cequence/openaiscala/examples/nonopenai/MistralCreateChatCompletion.scala b/...c/main/scala/io/cequence/openaiscala/examples/nonopenai/MistralCreateChatCompletion.scala
@@ -3,11 +3,7 @@ package io.cequence.openaiscala.examples.nonopenai
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionService,
-  OpenAIChatCompletionServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionService
 
 import scala.concurrent.Future
 

diff --git a/...cala/io/cequence/openaiscala/examples/nonopenai/MistralCreateChatCompletionStreamed.scala b/...cala/io/cequence/openaiscala/examples/nonopenai/MistralCreateChatCompletionStreamed.scala
@@ -4,11 +4,7 @@ import akka.stream.scaladsl.Sink
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionStreamedServiceExtra,
-  OpenAIChatCompletionStreamedServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionStreamedServiceExtra
 
 import scala.concurrent.Future
 

diff --git a/...rc/main/scala/io/cequence/openaiscala/examples/nonopenai/OctoMLCreateChatCompletion.scala b/...rc/main/scala/io/cequence/openaiscala/examples/nonopenai/OctoMLCreateChatCompletion.scala
@@ -3,11 +3,7 @@ package io.cequence.openaiscala.examples.nonopenai
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionService,
-  OpenAIChatCompletionServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionService
 
 import scala.concurrent.Future
 

diff --git a/...scala/io/cequence/openaiscala/examples/nonopenai/OctoMLCreateChatCompletionStreamed.scala b/...scala/io/cequence/openaiscala/examples/nonopenai/OctoMLCreateChatCompletionStreamed.scala
@@ -4,11 +4,7 @@ import akka.stream.scaladsl.Sink
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionStreamedServiceExtra,
-  OpenAIChatCompletionStreamedServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionStreamedServiceExtra
 
 import scala.concurrent.Future
 

diff --git a/...ain/scala/io/cequence/openaiscala/examples/nonopenai/TogetherAICreateChatCompletion.scala b/...ain/scala/io/cequence/openaiscala/examples/nonopenai/TogetherAICreateChatCompletion.scala
@@ -3,11 +3,7 @@ package io.cequence.openaiscala.examples.nonopenai
 import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionService,
-  OpenAIChatCompletionServiceFactory
-}
-import io.cequence.wsclient.domain.WsRequestContext
+import io.cequence.openaiscala.service.OpenAIChatCompletionService
 
 import scala.concurrent.Future
 

diff --git a/...penaiscala/examples/nonopenai/VertexAICreateChatCompletionStreamedWithOpenAIAdapter.scala b/...penaiscala/examples/nonopenai/VertexAICreateChatCompletionStreamedWithOpenAIAdapter.scala
@@ -6,7 +6,6 @@ import io.cequence.openaiscala.domain.{NonOpenAIModelId, SystemMessage, UserMess
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
 import io.cequence.openaiscala.service.OpenAIChatCompletionService
 import io.cequence.openaiscala.service.StreamedServiceTypes.OpenAIChatCompletionStreamedService
-import io.cequence.openaiscala.vertexai.service.VertexAIServiceFactory
 
 import scala.concurrent.Future
 

diff --git a/...quence/openaiscala/examples/nonopenai/VertexAICreateChatCompletionWithOpenAIAdapter.scala b/...quence/openaiscala/examples/nonopenai/VertexAICreateChatCompletionWithOpenAIAdapter.scala
@@ -4,7 +4,6 @@ import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.domain.{NonOpenAIModelId, SystemMessage, UserMessage}
 import io.cequence.openaiscala.examples.{ChatCompletionProvider, ExampleBase}
 import io.cequence.openaiscala.service.OpenAIChatCompletionService
-import io.cequence.openaiscala.vertexai.service.VertexAIServiceFactory
 
 import scala.concurrent.Future