CreateChatCompletionWithJSON - parseJson customizable

cequence-io · Jan 6, 2025 · 552b056 · 552b056
1 parent fe468b1
commit 552b056
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/openai-core/src/main/scala/io/cequence/openaiscala/service/OpenAIChatCompletionExtra.scala b/openai-core/src/main/scala/io/cequence/openaiscala/service/OpenAIChatCompletionExtra.scala
@@ -12,7 +12,7 @@ import io.cequence.openaiscala.domain.settings.{
 }
 import io.cequence.openaiscala.domain.{BaseMessage, ChatRole, ModelId, UserMessage}
 import org.slf4j.{Logger, LoggerFactory}
-import play.api.libs.json.{Format, Json}
+import play.api.libs.json.{Format, JsValue, Json}
 
 import scala.concurrent.{ExecutionContext, Future}
 
@@ -61,7 +61,8 @@ object OpenAIChatCompletionExtra {
       failoverModels: Seq[String] = Nil,
       maxRetries: Option[Int] = Some(defaultMaxRetries),
       retryOnAnyError: Boolean = false,
-      taskNameForLogging: Option[String] = None
+      taskNameForLogging: Option[String] = None,
+      parseJson: String => JsValue = defaultParseJsonOrThrow
     )(
       implicit ec: ExecutionContext,
       scheduler: Scheduler
@@ -93,7 +94,7 @@ object OpenAIChatCompletionExtra {
           val content = response.choices.head.message.content
           val contentTrimmed = content.stripPrefix("```json").stripSuffix("```").trim
           val contentJson = contentTrimmed.dropWhile(_ != '{')
-          val json = parseJsonOrThrow(contentJson)
+          val json = parseJson(contentJson)
 
           logger.debug(
             s"${taskNameForLoggingFinal.capitalize} finished in " + (new java.util.Date().getTime - start.getTime) + " ms."
@@ -103,7 +104,7 @@ object OpenAIChatCompletionExtra {
         }
     }
 
-    private def parseJsonOrThrow(
+    private def defaultParseJsonOrThrow(
       jsonString: String
     ) = try {
       Json.parse(jsonString)

diff --git a/...s/src/main/scala/io/cequence/openaiscala/examples/CreateChatCompletionVisionWithURL.scala b/...s/src/main/scala/io/cequence/openaiscala/examples/CreateChatCompletionVisionWithURL.scala
@@ -24,7 +24,7 @@ object CreateChatCompletionVisionWithURL extends Example {
       .createChatCompletion(
         messages,
         settings = CreateChatCompletionSettings(
-          model = ModelId.gpt_4_vision_preview,
+          model = ModelId.gpt_4o,
           temperature = Some(0),
           max_tokens = Some(300)
         )