Retry adapter - isRetryable exposed

cequence-io · Nov 12, 2024 · 8b3a581 · 8b3a581
1 parent de9f099
commit 8b3a581
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ val scala3 = "3.2.2"
 
 ThisBuild / organization := "io.cequence"
 ThisBuild / scalaVersion := scala212
-ThisBuild / version := "1.1.1.RC.9"
+ThisBuild / version := "1.1.1.RC.11"
 ThisBuild / isSnapshot := false
 
 lazy val commonSettings = Seq(

diff --git a/...i-core/src/main/scala/io/cequence/openaiscala/service/adapter/OpenAIServiceAdapters.scala b/...i-core/src/main/scala/io/cequence/openaiscala/service/adapter/OpenAIServiceAdapters.scala
@@ -3,6 +3,7 @@ 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._
@@ -44,13 +45,17 @@ trait OpenAIServiceAdapters[S <: CloseableService] {
 
   def retry(
     underlying: S,
-    log: Option[String => Unit] = None
+    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))
+    wrapAndDelegate(new RetryServiceAdapter(underlying, log, isRetryable))
 
   def log(
     underlying: S,

diff --git a/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/RetryServiceAdapter.scala b/openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/RetryServiceAdapter.scala
@@ -1,15 +1,16 @@
 package io.cequence.openaiscala.service.adapter
 
 import akka.actor.Scheduler
-import io.cequence.openaiscala.RetryHelpers
+import io.cequence.openaiscala.{RetryHelpers, Retryable}
 import io.cequence.openaiscala.RetryHelpers.RetrySettings
 import io.cequence.wsclient.service.CloseableService
 
 import scala.concurrent.{ExecutionContext, Future}
 
 private class RetryServiceAdapter[+S <: CloseableService](
   underlying: S,
-  log: Option[String => Unit] = None
+  log: Option[String => Unit] = None,
+  isRetryable: Throwable => Boolean
 )(
   implicit ec: ExecutionContext,
   retrySettings: RetrySettings,
@@ -24,7 +25,8 @@ private class RetryServiceAdapter[+S <: CloseableService](
   ): Future[T] =
     fun(underlying).retryOnFailure(
       Some(s"${getFunctionName().capitalize} call failed"),
-      log
+      log,
+      isRetryable
     )
 
   override def close(): Unit =