Merge remote-tracking branch 'origin/master' into feature/3654-prompt-caching

# Conflicts:
#	anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service/impl/OpenAIAnthropicChatCompletionService.scala
#	anthropic-client/src/test/scala/io/cequence/openaiscala/anthropic/service/impl/AnthropicServiceSpec.scala
#	openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai/AnthropicCreateCachedMessage.scala
#	openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai/AnthropicCreateMessageStreamed.scala
#	openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai/AnthropicCreateSystemMessage.scala

Author: bburdiliak

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

@@ -32,6 +32,7 @@ trait AnthropicService extends CloseableService with AnthropicServiceConsts {
    *   <a href="https://docs.anthropic.com/claude/reference/messages_post">Anthropic Doc</a>
    */
   def createMessage(
+    system: Option[Content],
     messages: Seq[Message],
     settings: AnthropicCreateMessageSettings = DefaultSettings.CreateMessage
   ): Future[CreateMessageResponse]

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

@@ -38,13 +38,14 @@ object AnthropicServiceFactory extends AnthropicServiceConsts {
    */
   def asOpenAI(
     apiKey: String = getAPIKeyFromEnv(),
-    timeouts: Option[Timeouts] = None
+    timeouts: Option[Timeouts] = None,
+    withCache: Boolean = false
   )(
     implicit ec: ExecutionContext,
     materializer: Materializer
   ): OpenAIChatCompletionStreamedService =
     new OpenAIAnthropicChatCompletionService(
-      AnthropicServiceFactory(apiKey, timeouts)
+      AnthropicServiceFactory(apiKey, timeouts, withPdf = false, withCache)
     )
 
   /**

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

@@ -35,6 +35,7 @@ private[service] trait AnthropicServiceImpl extends Anthropic {
   private val logger = LoggerFactory.getLogger("AnthropicServiceImpl")
 
   override def createMessage(
+    system: Option[Content],
     messages: Seq[Message],
     settings: AnthropicCreateMessageSettings
   ): Future[CreateMessageResponse] =

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

@@ -7,10 +7,23 @@ object CreateChatCompletionSettingsOps {
     private val AnthropicCachedUserMessagesCount = "cached_user_messages_count"
     private val AnthropicUseSystemMessagesCache = "use_system_messages_cache"
 
+    def setAnthropicCachedUserMessagesCount(count: Int): CreateChatCompletionSettings =
+      settings.copy(
+        extra_params = settings.extra_params + (AnthropicCachedUserMessagesCount -> count)
+      )
+
+    def setUseAnthropicSystemMessagesCache(useCache: Boolean): CreateChatCompletionSettings =
+      settings.copy(
+        extra_params = settings.extra_params + (AnthropicUseSystemMessagesCache -> useCache)
+      )
+
     def anthropicCachedUserMessagesCount: Int =
       settings.extra_params
         .get(AnthropicCachedUserMessagesCount)
-        .flatMap(numberAsString => Try(numberAsString.toString.toInt).toOption)
+        .flatMap {
+          case value: Int => Some(value)
+          case value: Any => Try(value.toString.toInt).toOption
+        }
         .getOrElse(0)
 
     def useAnthropicSystemMessagesCache: Boolean =

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

@@ -0,0 +1,31 @@
+package io.cequence.openaiscala.examples.nonopenai
+
+import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
+import io.cequence.openaiscala.domain.{NonOpenAIModelId, SystemMessage, UserMessage}
+import io.cequence.openaiscala.examples.ExampleBase
+import io.cequence.openaiscala.service.OpenAIChatCompletionService
+
+import scala.concurrent.Future
+
+// requires `openai-scala-anthropic-client` as a dependency and `ANTHROPIC_API_KEY` environment variable to be set
+object AnthropicCreateChatCompletionCachedWithOpenAIAdapter
+    extends ExampleBase[OpenAIChatCompletionService] {
+
+  override val service: OpenAIChatCompletionService =
+    ChatCompletionProvider.anthropic(withCache = true)
+
+  private val messages = Seq(
+    SystemMessage("You are a helpful assistant."),
+    UserMessage("What is the weather like in Norway?")
+  )
+
+  override protected def run: Future[_] =
+    service
+      .createChatCompletion(
+        messages = messages,
+        settings = CreateChatCompletionSettings(NonOpenAIModelId.claude_3_5_sonnet_20241022)
+      )
+      .map { content =>
+        println(content.choices.headOption.map(_.message.content).getOrElse("N/A"))
+      }
+}

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

@@ -18,7 +18,8 @@ object AnthropicCreateChatCompletionStreamedWithOpenAIAdapter
 
   private val logger = LoggerFactory.getLogger(this.getClass)
 
-  override val service: OpenAIChatCompletionStreamedService = ChatCompletionProvider.anthropic
+  override val service: OpenAIChatCompletionStreamedService =
+    ChatCompletionProvider.anthropic()
 
   private val messages = Seq(
     SystemMessage("You are a helpful assistant."),

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

@@ -11,7 +11,7 @@ import scala.concurrent.Future
 object AnthropicCreateChatCompletionWithOpenAIAdapter
     extends ExampleBase[OpenAIChatCompletionService] {
 
-  override val service: OpenAIChatCompletionService = ChatCompletionProvider.anthropic
+  override val service: OpenAIChatCompletionService = ChatCompletionProvider.anthropic()
 
   private val messages = Seq(
     SystemMessage("You are a helpful assistant."),

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

@@ -1,8 +1,8 @@
 package io.cequence.openaiscala.examples.nonopenai
 
 import io.cequence.openaiscala.anthropic.domain.Content.ContentBlock.TextBlock
-import io.cequence.openaiscala.anthropic.domain.Content.ContentBlockBase
-import io.cequence.openaiscala.anthropic.domain.Message
+import io.cequence.openaiscala.anthropic.domain.Content.{ContentBlockBase, SingleString}
+import io.cequence.openaiscala.anthropic.domain.{Content, Message}
 import io.cequence.openaiscala.anthropic.domain.Message.UserMessage
 import io.cequence.openaiscala.anthropic.domain.response.CreateMessageResponse
 import io.cequence.openaiscala.anthropic.domain.settings.AnthropicCreateMessageSettings
@@ -17,11 +17,13 @@ object AnthropicCreateMessage extends ExampleBase[AnthropicService] {
 
   override protected val service: AnthropicService = AnthropicServiceFactory(withCache = true)
 
+  val systemMessage: Content = SingleString("You are a helpful assistant.")
   val messages: Seq[Message] = Seq(UserMessage("What is the weather like in Norway?"))
 
   override protected def run: Future[_] =
     service
       .createMessage(
+        Some(systemMessage),
         messages,
         settings = AnthropicCreateMessageSettings(
           model = NonOpenAIModelId.claude_3_haiku_20240307,

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

@@ -38,6 +38,7 @@ object AnthropicCreateMessageWithImage extends ExampleBase[AnthropicService] {
   override protected def run: Future[_] =
     service
       .createMessage(
+        system = None,
         messages,
         settings = AnthropicCreateMessageSettings(
           model = NonOpenAIModelId.claude_3_opus_20240229,

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

@@ -37,6 +37,7 @@ object AnthropicCreateMessageWithPdf extends ExampleBase[AnthropicService] {
   override protected def run: Future[_] =
     service
       .createMessage(
+        system = None,
         messages,
         settings = AnthropicCreateMessageSettings(
           model =

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

@@ -83,10 +83,12 @@ object ChatCompletionProvider {
    * Requires `ANTHROPIC_API_KEY`
    */
   def anthropic(
+    withCache: Boolean = false
+  )(
     implicit ec: ExecutionContext,
     m: Materializer
   ): OpenAIChatCompletionStreamedService =
-    AnthropicServiceFactory.asOpenAI()
+    AnthropicServiceFactory.asOpenAI(withCache = withCache)
 
   private def provide(
     settings: ProviderSettings