modelfusion 0.104.0 → 0.105.0

package/model-provider/openai/OpenAICompletionModel.cjs

@@ -5,14 +5,12 @@ const zod_1 = require("zod");
 const callWithRetryAndThrottle_js_1 = require("../../core/api/callWithRetryAndThrottle.cjs");
 const postToApi_js_1 = require("../../core/api/postToApi.cjs");
 const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
-const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptTemplateTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptTemplateTextStreamingModel.cjs");
 const TextGenerationModel_js_1 = require("../../model-function/generate-text/TextGenerationModel.cjs");
 const TextPromptTemplate_js_1 = require("../../model-function/generate-text/prompt-template/TextPromptTemplate.cjs");
 const countTokens_js_1 = require("../../model-function/tokenize-text/countTokens.cjs");
-const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
-const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSourceStream.cjs");
+const createEventSourceResponseHandler_js_1 = require("../../util/streaming/createEventSourceResponseHandler.cjs");
 const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
 const OpenAIError_js_1 = require("./OpenAIError.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");
@@ -186,18 +184,17 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
             ? options.run?.userId
             : undefined;
         const abortSignal = options.run?.abortSignal;
-        let { stopSequences } = this.settings;
         const openaiResponseFormat = options.responseFormat;
+        // empty arrays are not allowed for stop:
+        const stopSequences = this.settings.stopSequences != null &&
+            Array.isArray(this.settings.stopSequences) &&
+            this.settings.stopSequences.length === 0
+            ? undefined
+            : this.settings.stopSequences;
         return (0, callWithRetryAndThrottle_js_1.callWithRetryAndThrottle)({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => {
-                // empty arrays are not allowed for stop:
-                if (stopSequences != null &&
-                    Array.isArray(stopSequences) &&
-                    stopSequences.length === 0) {
-                    stopSequences = undefined;
-                }
                 return (0, postToApi_js_1.postJsonToApi)({
                     url: api.assembleUrl("/completions"),
                     headers: api.headers,
@@ -212,7 +209,7 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
                         n: this.settings.numberOfGenerations,
                         logprobs: this.settings.logprobs,
                         echo: this.settings.echo,
-                        stop: this.settings.stopSequences,
+                        stop: stopSequences,
                         seed: this.settings.seed,
                         presence_penalty: this.settings.presencePenalty,
                         frequency_penalty: this.settings.frequencyPenalty,
@@ -281,6 +278,14 @@ class OpenAICompletionModel extends AbstractModel_js_1.AbstractModel {
             responseFormat: exports.OpenAITextResponseFormat.deltaIterable,
         });
     }
+    extractTextDelta(delta) {
+        const chunk = delta;
+        const firstChoice = chunk.choices[0];
+        if (firstChoice.index > 0) {
+            return undefined;
+        }
+        return chunk.choices[0].text;
+    }
     /**
      * Returns this model with an instruction prompt template.
      */
@@ -330,6 +335,21 @@ const OpenAICompletionResponseSchema = zod_1.z.object({
         total_tokens: zod_1.z.number(),
     }),
 });
+const openaiCompletionStreamChunkSchema = (0, ZodSchema_js_1.zodSchema)(zod_1.z.object({
+    choices: zod_1.z.array(zod_1.z.object({
+        text: zod_1.z.string(),
+        finish_reason: zod_1.z
+            .enum(["stop", "length", "content_filter"])
+            .optional()
+            .nullable(),
+        index: zod_1.z.number(),
+    })),
+    created: zod_1.z.number(),
+    id: zod_1.z.string(),
+    model: zod_1.z.string(),
+    system_fingerprint: zod_1.z.string().optional(),
+    object: zod_1.z.literal("text_completion"),
+}));
 exports.OpenAITextResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -344,78 +364,6 @@ exports.OpenAITextResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: async ({ response }) => createOpenAITextFullDeltaIterableQueue(response.body),
+        handler: (0, createEventSourceResponseHandler_js_1.createEventSourceResponseHandler)(openaiCompletionStreamChunkSchema),
     },
 };
-const textResponseStreamEventSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
-    choices: zod_1.z.array(zod_1.z.object({
-        text: zod_1.z.string(),
-        finish_reason: zod_1.z
-            .enum(["stop", "length", "content_filter"])
-            .optional()
-            .nullable(),
-        index: zod_1.z.number(),
-    })),
-    created: zod_1.z.number(),
-    id: zod_1.z.string(),
-    model: zod_1.z.string(),
-    system_fingerprint: zod_1.z.string().optional(),
-    object: zod_1.z.literal("text_completion"),
-}));
-async function createOpenAITextFullDeltaIterableQueue(stream) {
-    const queue = new AsyncQueue_js_1.AsyncQueue();
-    const streamDelta = [];
-    // process the stream asynchonously (no 'await' on purpose):
-    (0, parseEventSourceStream_js_1.parseEventSourceStream)({ stream })
-        .then(async (events) => {
-        try {
-            for await (const event of events) {
-                const data = event.data;
-                if (data === "[DONE]") {
-                    queue.close();
-                    return;
-                }
-                const eventData = (0, parseJSON_js_1.parseJSON)({
-                    text: data,
-                    schema: textResponseStreamEventSchema,
-                });
-                for (let i = 0; i < eventData.choices.length; i++) {
-                    const eventChoice = eventData.choices[i];
-                    const delta = eventChoice.text;
-                    if (streamDelta[i] == null) {
-                        streamDelta[i] = {
-                            content: "",
-                            isComplete: false,
-                            delta: "",
-                        };
-                    }
-                    const choice = streamDelta[i];
-                    choice.delta = delta;
-                    if (eventChoice.finish_reason != null) {
-                        choice.isComplete = true;
-                    }
-                    choice.content += delta;
-                }
-                // Since we're mutating the choices array in an async scenario,
-                // we need to make a deep copy:
-                const streamDeltaDeepCopy = JSON.parse(JSON.stringify(streamDelta));
-                queue.push({
-                    type: "delta",
-                    fullDelta: streamDeltaDeepCopy,
-                    valueDelta: streamDeltaDeepCopy[0].delta,
-                });
-            }
-        }
-        catch (error) {
-            queue.push({ type: "error", error });
-            queue.close();
-            return;
-        }
-    })
-        .catch((error) => {
-        queue.push({ type: "error", error });
-        queue.close();
-        return;
-    });
-    return queue;
-}

package/model-provider/openai/OpenAICompletionModel.d.ts

@@ -3,7 +3,6 @@ import { FunctionOptions } from "../../core/FunctionOptions.js";
 import { ApiConfiguration } from "../../core/api/ApiConfiguration.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
-import { Delta } from "../../model-function/Delta.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { TextGenerationModelSettings, TextStreamingModel } from "../../model-function/generate-text/TextGenerationModel.js";
 import { TextGenerationPromptTemplate } from "../../model-function/generate-text/TextGenerationPromptTemplate.js";
@@ -174,7 +173,19 @@ export declare class OpenAICompletionModel extends AbstractModel<OpenAICompletio
         };
     }>;
     private translateFinishReason;
-    doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<Delta<string>>>;
+    doStreamText(prompt: string, options?: FunctionOptions): Promise<AsyncIterable<import("../../index.js").Delta<{
+        object: "text_completion";
+        model: string;
+        id: string;
+        created: number;
+        choices: {
+            text: string;
+            index: number;
+            finish_reason?: "length" | "stop" | "content_filter" | null | undefined;
+        }[];
+        system_fingerprint?: string | undefined;
+    }>>>;
+    extractTextDelta(delta: unknown): string | undefined;
     /**
      * Returns this model with an instruction prompt template.
      */
@@ -269,7 +280,7 @@ export declare const OpenAITextResponseFormat: {
      * Returns the response as a JSON object.
      */
     json: {
-        stream: false;
+        stream: boolean;
         handler: ResponseHandler<{
             object: "text_completion";
             usage: {
@@ -294,15 +305,21 @@ export declare const OpenAITextResponseFormat: {
      * of the response stream.
      */
     deltaIterable: {
-        stream: true;
+        stream: boolean;
         handler: ({ response }: {
             response: Response;
-        }) => Promise<AsyncIterable<Delta<string>>>;
+        }) => Promise<AsyncIterable<import("../../index.js").Delta<{
+            object: "text_completion";
+            model: string;
+            id: string;
+            created: number;
+            choices: {
+                text: string;
+                index: number;
+                finish_reason?: "length" | "stop" | "content_filter" | null | undefined;
+            }[];
+            system_fingerprint?: string | undefined;
+        }>>>;
     };
 };
-export type OpenAICompletionDelta = Array<{
-    content: string;
-    isComplete: boolean;
-    delta: string;
-}>;
 export {};

package/model-provider/openai/OpenAICompletionModel.js

@@ -1,15 +1,13 @@
 import { z } from "zod";
 import { callWithRetryAndThrottle } from "../../core/api/callWithRetryAndThrottle.js";
 import { createJsonResponseHandler, postJsonToApi, } from "../../core/api/postToApi.js";
-import { ZodSchema } from "../../core/schema/ZodSchema.js";
-import { parseJSON } from "../../core/schema/parseJSON.js";
+import { zodSchema } from "../../core/schema/ZodSchema.js";
 import { AbstractModel } from "../../model-function/AbstractModel.js";
 import { PromptTemplateTextStreamingModel } from "../../model-function/generate-text/PromptTemplateTextStreamingModel.js";
 import { textGenerationModelProperties, } from "../../model-function/generate-text/TextGenerationModel.js";
 import { chat, instruction, } from "../../model-function/generate-text/prompt-template/TextPromptTemplate.js";
 import { countTokens } from "../../model-function/tokenize-text/countTokens.js";
-import { AsyncQueue } from "../../util/AsyncQueue.js";
-import { parseEventSourceStream } from "../../util/streaming/parseEventSourceStream.js";
+import { createEventSourceResponseHandler } from "../../util/streaming/createEventSourceResponseHandler.js";
 import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
 import { failedOpenAICallResponseHandler } from "./OpenAIError.js";
 import { TikTokenTokenizer } from "./TikTokenTokenizer.js";
@@ -180,18 +178,17 @@ export class OpenAICompletionModel extends AbstractModel {
             ? options.run?.userId
             : undefined;
         const abortSignal = options.run?.abortSignal;
-        let { stopSequences } = this.settings;
         const openaiResponseFormat = options.responseFormat;
+        // empty arrays are not allowed for stop:
+        const stopSequences = this.settings.stopSequences != null &&
+            Array.isArray(this.settings.stopSequences) &&
+            this.settings.stopSequences.length === 0
+            ? undefined
+            : this.settings.stopSequences;
         return callWithRetryAndThrottle({
             retry: api.retry,
             throttle: api.throttle,
             call: async () => {
-                // empty arrays are not allowed for stop:
-                if (stopSequences != null &&
-                    Array.isArray(stopSequences) &&
-                    stopSequences.length === 0) {
-                    stopSequences = undefined;
-                }
                 return postJsonToApi({
                     url: api.assembleUrl("/completions"),
                     headers: api.headers,
@@ -206,7 +203,7 @@ export class OpenAICompletionModel extends AbstractModel {
                         n: this.settings.numberOfGenerations,
                         logprobs: this.settings.logprobs,
                         echo: this.settings.echo,
-                        stop: this.settings.stopSequences,
+                        stop: stopSequences,
                         seed: this.settings.seed,
                         presence_penalty: this.settings.presencePenalty,
                         frequency_penalty: this.settings.frequencyPenalty,
@@ -275,6 +272,14 @@ export class OpenAICompletionModel extends AbstractModel {
             responseFormat: OpenAITextResponseFormat.deltaIterable,
         });
     }
+    extractTextDelta(delta) {
+        const chunk = delta;
+        const firstChoice = chunk.choices[0];
+        if (firstChoice.index > 0) {
+            return undefined;
+        }
+        return chunk.choices[0].text;
+    }
     /**
      * Returns this model with an instruction prompt template.
      */
@@ -323,6 +328,21 @@ const OpenAICompletionResponseSchema = z.object({
         total_tokens: z.number(),
     }),
 });
+const openaiCompletionStreamChunkSchema = zodSchema(z.object({
+    choices: z.array(z.object({
+        text: z.string(),
+        finish_reason: z
+            .enum(["stop", "length", "content_filter"])
+            .optional()
+            .nullable(),
+        index: z.number(),
+    })),
+    created: z.number(),
+    id: z.string(),
+    model: z.string(),
+    system_fingerprint: z.string().optional(),
+    object: z.literal("text_completion"),
+}));
 export const OpenAITextResponseFormat = {
     /**
      * Returns the response as a JSON object.
@@ -337,78 +357,6 @@ export const OpenAITextResponseFormat = {
      */
     deltaIterable: {
         stream: true,
-        handler: async ({ response }) => createOpenAITextFullDeltaIterableQueue(response.body),
+        handler: createEventSourceResponseHandler(openaiCompletionStreamChunkSchema),
     },
 };
-const textResponseStreamEventSchema = new ZodSchema(z.object({
-    choices: z.array(z.object({
-        text: z.string(),
-        finish_reason: z
-            .enum(["stop", "length", "content_filter"])
-            .optional()
-            .nullable(),
-        index: z.number(),
-    })),
-    created: z.number(),
-    id: z.string(),
-    model: z.string(),
-    system_fingerprint: z.string().optional(),
-    object: z.literal("text_completion"),
-}));
-async function createOpenAITextFullDeltaIterableQueue(stream) {
-    const queue = new AsyncQueue();
-    const streamDelta = [];
-    // process the stream asynchonously (no 'await' on purpose):
-    parseEventSourceStream({ stream })
-        .then(async (events) => {
-        try {
-            for await (const event of events) {
-                const data = event.data;
-                if (data === "[DONE]") {
-                    queue.close();
-                    return;
-                }
-                const eventData = parseJSON({
-                    text: data,
-                    schema: textResponseStreamEventSchema,
-                });
-                for (let i = 0; i < eventData.choices.length; i++) {
-                    const eventChoice = eventData.choices[i];
-                    const delta = eventChoice.text;
-                    if (streamDelta[i] == null) {
-                        streamDelta[i] = {
-                            content: "",
-                            isComplete: false,
-                            delta: "",
-                        };
-                    }
-                    const choice = streamDelta[i];
-                    choice.delta = delta;
-                    if (eventChoice.finish_reason != null) {
-                        choice.isComplete = true;
-                    }
-                    choice.content += delta;
-                }
-                // Since we're mutating the choices array in an async scenario,
-                // we need to make a deep copy:
-                const streamDeltaDeepCopy = JSON.parse(JSON.stringify(streamDelta));
-                queue.push({
-                    type: "delta",
-                    fullDelta: streamDeltaDeepCopy,
-                    valueDelta: streamDeltaDeepCopy[0].delta,
-                });
-            }
-        }
-        catch (error) {
-            queue.push({ type: "error", error });
-            queue.close();
-            return;
-        }
-    })
-        .catch((error) => {
-        queue.push({ type: "error", error });
-        queue.close();
-        return;
-    });
-    return queue;
-}

package/model-provider/openai/OpenAICompletionModel.test.cjs

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const streamText_js_1 = require("../../model-function/generate-text/streamText.cjs");
+const StreamingTestServer_js_1 = require("../../test/StreamingTestServer.cjs");
+const arrayFromAsync_js_1 = require("../../test/arrayFromAsync.cjs");
+const OpenAIApiConfiguration_js_1 = require("./OpenAIApiConfiguration.cjs");
+const OpenAICompletionModel_js_1 = require("./OpenAICompletionModel.cjs");
+describe("streamText", () => {
+    const server = new StreamingTestServer_js_1.StreamingTestServer("https://api.openai.com/v1/completions");
+    server.setupTestEnvironment();
+    it("should return only values from the first choice when using streamText", async () => {
+        server.responseChunks = [
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"Hello","index":0,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":", ","index":0,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"world!","index":0,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"","index":0,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            "data: [DONE]\n\n",
+        ];
+        const stream = await (0, streamText_js_1.streamText)(new OpenAICompletionModel_js_1.OpenAICompletionModel({
+            api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
+            model: "gpt-3.5-turbo-instruct",
+        }), "hello");
+        // note: space moved to last chunk bc of trimming
+        expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual([
+            "Hello",
+            ",",
+            " world!",
+        ]);
+    });
+    it("should return only values from the first choice when using streamText", async () => {
+        server.responseChunks = [
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"A","index":0,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"B","index":1,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"","index":0,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"","index":1,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            "data: [DONE]\n\n",
+        ];
+        const stream = await (0, streamText_js_1.streamText)(new OpenAICompletionModel_js_1.OpenAICompletionModel({
+            api: new OpenAIApiConfiguration_js_1.OpenAIApiConfiguration({ apiKey: "test-key" }),
+            model: "gpt-3.5-turbo-instruct",
+            numberOfGenerations: 2,
+        }), "test prompt");
+        expect(await (0, arrayFromAsync_js_1.arrayFromAsync)(stream)).toStrictEqual(["A"]);
+    });
+});

package/model-provider/openai/OpenAICompletionModel.test.d.ts

@@ -0,0 +1 @@
+export {};

package/model-provider/openai/OpenAICompletionModel.test.js

@@ -0,0 +1,51 @@
+import { streamText } from "../../model-function/generate-text/streamText.js";
+import { StreamingTestServer } from "../../test/StreamingTestServer.js";
+import { arrayFromAsync } from "../../test/arrayFromAsync.js";
+import { OpenAIApiConfiguration } from "./OpenAIApiConfiguration.js";
+import { OpenAICompletionModel } from "./OpenAICompletionModel.js";
+describe("streamText", () => {
+    const server = new StreamingTestServer("https://api.openai.com/v1/completions");
+    server.setupTestEnvironment();
+    it("should return only values from the first choice when using streamText", async () => {
+        server.responseChunks = [
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"Hello","index":0,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":", ","index":0,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"world!","index":0,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"","index":0,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            "data: [DONE]\n\n",
+        ];
+        const stream = await streamText(new OpenAICompletionModel({
+            api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
+            model: "gpt-3.5-turbo-instruct",
+        }), "hello");
+        // note: space moved to last chunk bc of trimming
+        expect(await arrayFromAsync(stream)).toStrictEqual([
+            "Hello",
+            ",",
+            " world!",
+        ]);
+    });
+    it("should return only values from the first choice when using streamText", async () => {
+        server.responseChunks = [
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"A","index":0,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"B","index":1,"logprobs":null,"finish_reason":null}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"","index":0,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            `data: {"id":"cmpl-8ZNls6dH7X2jUAJbY5joSWF9L0AD3","object":"text_completion","created":1703443548,` +
+                `"choices":[{"text":"","index":1,"logprobs":null,"finish_reason":"length"}],"model":"gpt-3.5-turbo-instruct"}\n\n`,
+            "data: [DONE]\n\n",
+        ];
+        const stream = await streamText(new OpenAICompletionModel({
+            api: new OpenAIApiConfiguration({ apiKey: "test-key" }),
+            model: "gpt-3.5-turbo-instruct",
+            numberOfGenerations: 2,
+        }), "test prompt");
+        expect(await arrayFromAsync(stream)).toStrictEqual(["A"]);
+    });
+});

package/model-provider/openai/OpenAICostCalculator.cjs

@@ -6,7 +6,7 @@ const OpenAIImageGenerationModel_js_1 = require("./OpenAIImageGenerationModel.cj
 const OpenAISpeechModel_js_1 = require("./OpenAISpeechModel.cjs");
 const OpenAITextEmbeddingModel_js_1 = require("./OpenAITextEmbeddingModel.cjs");
 const OpenAITranscriptionModel_js_1 = require("./OpenAITranscriptionModel.cjs");
-const OpenAIChatModel_js_1 = require("./chat/OpenAIChatModel.cjs");
+const OpenAIChatModel_js_1 = require("./OpenAIChatModel.cjs");
 class OpenAICostCalculator {
     constructor() {
         Object.defineProperty(this, "provider", {

package/model-provider/openai/OpenAICostCalculator.js

@@ -3,7 +3,7 @@ import { calculateOpenAIImageGenerationCostInMillicents, } from "./OpenAIImageGe
 import { calculateOpenAISpeechCostInMillicents, } from "./OpenAISpeechModel.js";
 import { calculateOpenAIEmbeddingCostInMillicents, isOpenAIEmbeddingModel, } from "./OpenAITextEmbeddingModel.js";
 import { calculateOpenAITranscriptionCostInMillicents, } from "./OpenAITranscriptionModel.js";
-import { calculateOpenAIChatCostInMillicents, isOpenAIChatModel, } from "./chat/OpenAIChatModel.js";
+import { calculateOpenAIChatCostInMillicents, isOpenAIChatModel, } from "./OpenAIChatModel.js";
 export class OpenAICostCalculator {
     constructor() {
         Object.defineProperty(this, "provider", {

package/model-provider/openai/OpenAIFacade.cjs

@@ -7,7 +7,7 @@ const OpenAISpeechModel_js_1 = require("./OpenAISpeechModel.cjs");
 const OpenAITextEmbeddingModel_js_1 = require("./OpenAITextEmbeddingModel.cjs");
 const OpenAITranscriptionModel_js_1 = require("./OpenAITranscriptionModel.cjs");
 const TikTokenTokenizer_js_1 = require("./TikTokenTokenizer.cjs");
-const OpenAIChatModel_js_1 = require("./chat/OpenAIChatModel.cjs");
+const OpenAIChatModel_js_1 = require("./OpenAIChatModel.cjs");
 /**
  * Create a text generation model that calls the OpenAI text completion API.
  *
@@ -148,5 +148,5 @@ function Tokenizer(settings) {
     return new TikTokenTokenizer_js_1.TikTokenTokenizer(settings);
 }
 exports.Tokenizer = Tokenizer;
-var OpenAIChatMessage_js_1 = require("./chat/OpenAIChatMessage.cjs");
+var OpenAIChatMessage_js_1 = require("./OpenAIChatMessage.cjs");
 Object.defineProperty(exports, "ChatMessage", { enumerable: true, get: function () { return OpenAIChatMessage_js_1.OpenAIChatMessage; } });

package/model-provider/openai/OpenAIFacade.d.ts

@@ -4,7 +4,7 @@ import { OpenAISpeechModel, OpenAISpeechModelSettings } from "./OpenAISpeechMode
 import { OpenAITextEmbeddingModel, OpenAITextEmbeddingModelSettings } from "./OpenAITextEmbeddingModel.js";
 import { OpenAITranscriptionModel, OpenAITranscriptionModelSettings } from "./OpenAITranscriptionModel.js";
 import { TikTokenTokenizer, TikTokenTokenizerSettings } from "./TikTokenTokenizer.js";
-import { OpenAIChatModel, OpenAIChatSettings } from "./chat/OpenAIChatModel.js";
+import { OpenAIChatModel, OpenAIChatSettings } from "./OpenAIChatModel.js";
 /**
  * Create a text generation model that calls the OpenAI text completion API.
  *
@@ -124,5 +124,5 @@ export declare function ImageGenerator(settings: OpenAIImageGenerationSettings):
  * @returns A new instance of {@link TikTokenTokenizer}.
  */
 export declare function Tokenizer(settings: TikTokenTokenizerSettings): TikTokenTokenizer;
-export { OpenAIChatMessage as ChatMessage } from "./chat/OpenAIChatMessage.js";
-export { OpenAIChatPrompt as ChatPrompt } from "./chat/AbstractOpenAIChatModel.js";
+export { OpenAIChatMessage as ChatMessage } from "./OpenAIChatMessage.js";
+export { OpenAIChatPrompt as ChatPrompt } from "./AbstractOpenAIChatModel.js";

package/model-provider/openai/OpenAIFacade.js

@@ -4,7 +4,7 @@ import { OpenAISpeechModel, } from "./OpenAISpeechModel.js";
 import { OpenAITextEmbeddingModel, } from "./OpenAITextEmbeddingModel.js";
 import { OpenAITranscriptionModel, } from "./OpenAITranscriptionModel.js";
 import { TikTokenTokenizer, } from "./TikTokenTokenizer.js";
-import { OpenAIChatModel } from "./chat/OpenAIChatModel.js";
+import { OpenAIChatModel } from "./OpenAIChatModel.js";
 /**
  * Create a text generation model that calls the OpenAI text completion API.
  *
@@ -138,4 +138,4 @@ export function ImageGenerator(settings) {
 export function Tokenizer(settings) {
     return new TikTokenTokenizer(settings);
 }
-export { OpenAIChatMessage as ChatMessage } from "./chat/OpenAIChatMessage.js";
+export { OpenAIChatMessage as ChatMessage } from "./OpenAIChatMessage.js";

package/model-provider/openai/OpenAITranscriptionModel.d.ts

@@ -66,8 +66,8 @@ export declare class OpenAITranscriptionModel extends AbstractModel<OpenAITransc
             text: string;
             segments: {
                 text: string;
-                temperature: number;
                 id: number;
+                temperature: number;
                 tokens: number[];
                 seek: number;
                 start: number;
@@ -115,8 +115,8 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
         transient: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         text: string;
-        temperature: number;
         id: number;
+        temperature: number;
         tokens: number[];
         seek: number;
         start: number;
@@ -127,8 +127,8 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
         transient?: boolean | undefined;
     }, {
         text: string;
-        temperature: number;
         id: number;
+        temperature: number;
         tokens: number[];
         seek: number;
         start: number;
@@ -143,8 +143,8 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
     text: string;
     segments: {
         text: string;
-        temperature: number;
         id: number;
+        temperature: number;
         tokens: number[];
         seek: number;
         start: number;
@@ -161,8 +161,8 @@ declare const openAITranscriptionVerboseJsonSchema: z.ZodObject<{
     text: string;
     segments: {
         text: string;
-        temperature: number;
         id: number;
+        temperature: number;
         tokens: number[];
         seek: number;
         start: number;
@@ -194,8 +194,8 @@ export declare const OpenAITranscriptionResponseFormat: {
             text: string;
             segments: {
                 text: string;
-                temperature: number;
                 id: number;
+                temperature: number;
                 tokens: number[];
                 seek: number;
                 start: number;

package/model-provider/openai/TikTokenTokenizer.d.ts

@@ -1,7 +1,7 @@
 import { FullTokenizer } from "../../model-function/tokenize-text/Tokenizer.js";
 import { OpenAITextEmbeddingModelType } from "./OpenAITextEmbeddingModel.js";
 import { OpenAICompletionBaseModelType } from "./OpenAICompletionModel.js";
-import { OpenAIChatBaseModelType } from "./chat/OpenAIChatModel.js";
+import { OpenAIChatBaseModelType } from "./OpenAIChatModel.js";
 export type TikTokenTokenizerSettings = {
     model: OpenAIChatBaseModelType | OpenAICompletionBaseModelType | OpenAITextEmbeddingModelType;
 };