BaseMessage json formats fix

cequence-io · Aug 28, 2024 · 397f21f · 397f21f
1 parent e574416
commit 397f21f
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/openai-core/src/main/scala/io/cequence/openaiscala/JsonFormats.scala b/openai-core/src/main/scala/io/cequence/openaiscala/JsonFormats.scala
@@ -224,14 +224,12 @@ object JsonFormats {
         }
 
       case ChatRole.Tool =>
-        json.asOpt[AssistantToolMessage] match {
-          case Some(assistantToolMessage) => assistantToolMessage
-          case None                       => json.as[ToolMessage]
-        }
+        json.as[ToolMessage]
 
       case ChatRole.Assistant =>
-        json.asOpt[AssistantToolMessage] match {
-          case Some(assistantToolMessage) => assistantToolMessage
+        // if contains tool_calls, then it is AssistantToolMessage
+        (json \ "tool_calls").asOpt[JsArray] match {
+          case Some(_) => json.as[AssistantToolMessage]
           case None =>
             json.asOpt[AssistantMessage] match {
               case Some(assistantMessage) => assistantMessage