Core adapter relocated to ws-client-core

Author: peterbanda

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

@@ -4,24 +4,14 @@ 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}
 import io.cequence.wsclient.domain.WsRequestContext
 import io.cequence.wsclient.service.CloseableService
+import io.cequence.wsclient.service.adapter.ServiceWrapperTypes.CloseableServiceWrapper
+import io.cequence.wsclient.service.adapter.SimpleServiceWrapper
 
 import scala.concurrent.ExecutionContext
 

openai-core/src/main/scala/io/cequence/openaiscala/RetryHelpers.scala

@@ -85,6 +85,7 @@ trait RetryHelpers {
 
   private val logger = LoggerFactory.getLogger(this.getClass)
 
+  // TODO: would be better to reevaluate the future otherwise we handle give a chance only to "external" exceptions
   implicit class FutureWithRetry[T](f: Future[T]) {
 
     def retryOnFailure(

openai-core/src/main/scala/io/cequence/openaiscala/StackWalkerUtil.java

@@ -5,6 +5,7 @@ import io.cequence.openaiscala.domain.response.ChatCompletionResponse
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.service.OpenAIChatCompletionService
 import io.cequence.wsclient.service.CloseableService
+import io.cequence.wsclient.service.adapter.ServiceWrapper
 
 import scala.concurrent.Future
 
@@ -18,7 +19,7 @@ private class ChatCompletionInputAdapter[S <: OpenAIChatCompletionService](
     with OpenAIChatCompletionService {
 
   // we just delegate all the calls to the underlying service
-  override protected[adapter] def wrap[T](
+  override def wrap[T](
     fun: S => Future[T]
   ): Future[T] = fun(underlying)
 

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

@@ -7,6 +7,7 @@ import io.cequence.wsclient.service.CloseableService
 
 import scala.concurrent.Future
 import io.cequence.openaiscala.domain.response.ChatCompletionResponse
+import io.cequence.wsclient.service.adapter.ServiceWrapper
 
 private class ChatCompletionServiceAdapter[S <: CloseableService](
   chatCompletionService: OpenAIChatCompletionService,
@@ -16,7 +17,7 @@ private class ChatCompletionServiceAdapter[S <: CloseableService](
     with OpenAIChatCompletionService {
 
   // we just delegate all the calls to the underlying service
-  override protected[adapter] def wrap[T](
+  override def wrap[T](
     fun: S => Future[T]
   ): Future[T] = fun(underlying)
 

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

@@ -1,23 +1,12 @@
 package io.cequence.openaiscala.service.adapter
 
 import io.cequence.openaiscala.OpenAIScalaClientException
-import io.cequence.openaiscala.domain.{
-  AssistantMessage,
-  BaseMessage,
-  SystemMessage,
-  UserMessage
-}
-import io.cequence.openaiscala.domain.response.{
-  ChatCompletionChoiceInfo,
-  ChatCompletionResponse,
-  TextCompletionResponse
-}
-import io.cequence.openaiscala.domain.settings.{
-  CreateChatCompletionSettings,
-  CreateCompletionSettings
-}
+import io.cequence.openaiscala.domain.{AssistantMessage, BaseMessage, SystemMessage, UserMessage}
+import io.cequence.openaiscala.domain.response.{ChatCompletionChoiceInfo, ChatCompletionResponse, TextCompletionResponse}
+import io.cequence.openaiscala.domain.settings.{CreateChatCompletionSettings, CreateCompletionSettings}
 import io.cequence.openaiscala.service.{OpenAIChatCompletionService, OpenAICompletionService}
 import io.cequence.wsclient.service.CloseableService
+import io.cequence.wsclient.service.adapter.ServiceWrapper
 
 import scala.concurrent.{ExecutionContext, Future}
 
@@ -32,7 +21,7 @@ private class ChatToCompletionAdapter[
     with OpenAIChatCompletionService {
 
   // we just delegate all the calls to the underlying service
-  override protected[adapter] def wrap[T](
+  override def wrap[T](
     fun: S => Future[T]
   ): Future[T] = fun(underlying)
 

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

@@ -1,16 +1,13 @@
 package io.cequence.openaiscala.service.adapter
 
-import akka.actor.Scheduler
-import akka.stream.Materializer
-import io.cequence.openaiscala.RetryHelpers.RetrySettings
-import io.cequence.openaiscala.Retryable
 import io.cequence.openaiscala.domain.BaseMessage
 import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.service._
 import io.cequence.openaiscala.service.adapter.ServiceWrapperTypes._
 import io.cequence.wsclient.service.CloseableService
+import io.cequence.wsclient.service.adapter.ServiceWrapperTypes.CloseableServiceWrapper
 
-import scala.concurrent.{ExecutionContext, Future}
+import scala.concurrent.ExecutionContext
 
 object OpenAIServiceAdapters {
 
@@ -24,53 +21,7 @@ object OpenAIServiceAdapters {
     new OpenAIServiceAdaptersImpl()
 }
 
-trait OpenAIServiceAdapters[S <: CloseableService] {
-
-  def roundRobin(
-    underlyings: S*
-  ): S =
-    wrapAndDelegate(new RoundRobinAdapter(underlyings))
-
-  def randomOrder(
-    underlyings: S*
-  ): S =
-    wrapAndDelegate(new RandomOrderAdapter(underlyings))
-
-  def parallelTakeFirst(
-    underlyings: S*
-  )(
-    implicit materializer: Materializer
-  ): S =
-    wrapAndDelegate(new ParallelTakeFirstAdapter(underlyings))
-
-  def retry(
-    underlying: S,
-    log: Option[String => Unit] = None,
-    isRetryable: Throwable => Boolean = {
-      case Retryable(_) => true
-      case _            => false
-    }
-  )(
-    implicit ec: ExecutionContext,
-    retrySettings: RetrySettings,
-    scheduler: Scheduler
-  ): S =
-    wrapAndDelegate(new RetryServiceAdapter(underlying, log, isRetryable))
-
-  def log(
-    underlying: S,
-    serviceName: String,
-    log: String => Unit
-  ): S =
-    wrapAndDelegate(new LogServiceAdapter(underlying, serviceName, log))
-
-  def preAction(
-    underlying: S,
-    action: () => Future[Unit]
-  )(
-    implicit ec: ExecutionContext
-  ): S =
-    wrapAndDelegate(new PreServiceAdapter(underlying, action))
+trait OpenAIServiceAdapters[S <: CloseableService] extends ServiceAdapters[S] {
 
   def chatCompletion(
     chatCompletionService: OpenAIChatCompletionService,
@@ -119,10 +70,6 @@ trait OpenAIServiceAdapters[S <: CloseableService] {
   ): S =
     wrapAndDelegateChatCompletion(new ChatToCompletionAdapter(service))
 
-  protected def wrapAndDelegate(
-    delegate: CloseableServiceWrapper[S]
-  ): S
-
   protected def wrapAndDelegateChatCompletion(
     delegate: ChatCompletionCloseableServiceWrapper[S]
   ): S

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

@@ -7,11 +7,9 @@ import io.cequence.openaiscala.domain._
 import io.cequence.openaiscala.domain.response._
 import io.cequence.openaiscala.domain.settings._
 import io.cequence.openaiscala.service.adapter.ServiceWrapperTypes._
-import io.cequence.openaiscala.service.{
-  OpenAIChatCompletionService,
-  OpenAICoreService,
-  OpenAIService
-}
+import io.cequence.openaiscala.service.{OpenAIChatCompletionService, OpenAICoreService, OpenAIService}
+import io.cequence.wsclient.service.adapter.DelegatedCloseableServiceWrapper
+import io.cequence.wsclient.service.adapter.ServiceWrapperTypes.CloseableServiceWrapper
 
 import java.io.File
 import scala.concurrent.Future

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

@@ -4,6 +4,7 @@ import akka.actor.Scheduler
 import io.cequence.openaiscala.RetryHelpers
 import io.cequence.openaiscala.RetryHelpers.RetrySettings
 import io.cequence.wsclient.service.CloseableService
+import io.cequence.wsclient.service.adapter.{FunctionNameHelper, ServiceWrapper}
 
 import scala.concurrent.{ExecutionContext, Future}
 
@@ -20,7 +21,7 @@ private class RetryServiceAdapter[+S <: CloseableService](
     with FunctionNameHelper
     with RetryHelpers {
 
-  override protected[adapter] def wrap[T](
+  override def wrap[T](
     fun: S => Future[T]
   ): Future[T] =
     fun(underlying).retryOnFailure(