Structured object streaming

Cerlancism · Sep 28, 2024 · e7bfdd3 · e7bfdd3
1 parent 4ca9bc0
commit e7bfdd3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/translatorStructuredArray.js b/src/translatorStructuredArray.js
@@ -47,7 +47,10 @@ export class TranslatorStructuredArray extends TranslatorStructuredBase
                 ...this.options.createChatCompletionRequest,
                 stream: this.options.createChatCompletionRequest.stream,
                 max_tokens
-            }, { structure: structuredArray, name: "translation_array" })
+            }, {
+                structure: structuredArray,
+                name: "translation_array"
+            })
 
             // console.log("[TranslatorStructuredArray]", output.choices[0].message.content)
 
@@ -62,16 +65,18 @@ export class TranslatorStructuredArray extends TranslatorStructuredBase
                     console.log("[TranslatorStructuredArray] Refusal Fallback", this.options.fallbackModel)
                     const requestOptions = { ...this.options.createChatCompletionRequest }
                     requestOptions.model = this.options.fallbackModel
-                    const fallBackOutput = await this.services.openai.beta.chat.completions.parse({
+                    const fallBackOutput = await this.streamParse({
                         messages,
                         ...requestOptions,
                         stream: false,
-                        response_format: zodResponseFormat(structuredArray, "translation_array"),
                         max_tokens
+                    }, {
+                        structure: structuredArray,
+                        name: "translation_array"
                     })
                     translation = fallBackOutput.choices[0].message
                 }
-                
+
                 if (translation.refusal)
                 {
                     return [translation.refusal]

diff --git a/src/translatorStructuredObject.mjs b/src/translatorStructuredObject.mjs
@@ -73,12 +73,14 @@ export class TranslatorStructuredObject extends TranslatorStructuredBase
 
             await this.services.cooler?.cool()
 
-            const output = await this.services.openai.beta.chat.completions.parse({
+            const output = await this.streamParse({
                 messages,
                 ...this.options.createChatCompletionRequest,
-                stream: false,
-                response_format: zodResponseFormat(translationBatch, "translation_object"),
+                stream: this.options.createChatCompletionRequest.stream,
                 max_tokens
+            }, {
+                structure: translationBatch,
+                name: "translation_object"
             })
 
             // console.log("[TranslatorStructuredObject]", output.choices[0].message.content)
@@ -157,7 +159,8 @@ export class TranslatorStructuredObject extends TranslatorStructuredBase
     {
         const output = {}
 
-        for (let index = 0; index < sourceLines.length; index++) {
+        for (let index = 0; index < sourceLines.length; index++)
+        {
             const source = sourceLines[index];
             const transform = transformLines[index]
             output[source] = transform