handle strict openai compliance for streaming thinking model response…

…s from google
Portkey-AI · Jan 15, 2025 · 3a73f19 · 3a73f19
1 parent 3993321
commit 3a73f19
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/providers/google-vertex-ai/chatComplete.ts b/src/providers/google-vertex-ai/chatComplete.ts
@@ -798,15 +798,23 @@ export const GoogleChatCompleteStreamChunkTransform: (
         if (generation.content?.parts[0]?.text) {
           if (generation.content.parts[0].thought)
             containsChainOfThoughtMessage = true;
-          let content: string = generation.content.parts[0]?.text;
+
+          let content: string =
+            strictOpenAiCompliance && containsChainOfThoughtMessage
+              ? ''
+              : generation.content.parts[0]?.text;
           if (generation.content.parts[1]?.text) {
-            content += '\r\n\r\n' + generation.content.parts[1]?.text;
+            if (strictOpenAiCompliance)
+              content = generation.content.parts[1].text;
+            else content += '\r\n\r\n' + generation.content.parts[1]?.text;
             containsChainOfThoughtMessage = false;
           } else if (
             containsChainOfThoughtMessage &&
             !generation.content.parts[0]?.thought
           ) {
-            content = '\r\n\r\n' + content;
+            if (strictOpenAiCompliance)
+              content = generation.content.parts[0].text;
+            else content = '\r\n\r\n' + content;
             containsChainOfThoughtMessage = false;
           }
           message = {

diff --git a/src/providers/google/chatComplete.ts b/src/providers/google/chatComplete.ts
@@ -581,15 +581,23 @@ export const GoogleChatCompleteStreamChunkTransform: (
           if (generation.content?.parts[0]?.text) {
             if (generation.content.parts[0].thought)
               containsChainOfThoughtMessage = true;
-            let content: string = generation.content.parts[0]?.text;
+
+            let content: string =
+              strictOpenAiCompliance && containsChainOfThoughtMessage
+                ? ''
+                : generation.content.parts[0]?.text;
             if (generation.content.parts[1]?.text) {
-              content += '\r\n\r\n' + generation.content.parts[1]?.text;
+              if (strictOpenAiCompliance)
+                content = generation.content.parts[1].text;
+              else content += '\r\n\r\n' + generation.content.parts[1]?.text;
               containsChainOfThoughtMessage = false;
             } else if (
               containsChainOfThoughtMessage &&
               !generation.content.parts[0]?.thought
             ) {
-              content = '\r\n\r\n' + content;
+              if (strictOpenAiCompliance)
+                content = generation.content.parts[0].text;
+              else content = '\r\n\r\n' + content;
               containsChainOfThoughtMessage = false;
             }
             message = {