llm-exe 1.0.2 → 2.0.0-beta.2

package/dist/embedding/openai.js

@@ -30,9 +30,7 @@ class EmbeddingOpenAI extends base_1.BaseEmbedding {
         this.batchSize = options.temperature || 0;
         this.stripNewLines = !!options.stripNewLines;
         const apiKey = options.openAIApiKey || (0, utils_1.getEnvironmentVariable)("OPENAI_API_KEY");
-        this.client = new openai_1.OpenAIApi(new openai_1.Configuration({
-            apiKey,
-        }));
+        this.client = new openai_1.OpenAI({ apiKey });
     }
     async embedDocuments(texts) {
         const subPrompts = (0, utils_1.chunkArray)(this.stripNewLines ? texts.map((t) => t.replace(/\n/g, " ")) : texts, this.batchSize);
@@ -61,7 +59,7 @@ class EmbeddingOpenAI extends base_1.BaseEmbedding {
             numOfAttempts: this.numOfAttempts,
             jitter: this.jitter,
             retry: () => {
-                console.log(`OpenAI timeout after ${this.timeout}. Retrying...`);
+                console.log(`LlmOpenAI timeout after ${this.timeout}. Retrying...`);
                 return true;
             },
         });

package/dist/embedding/openai.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["embedding/openai.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["embedding/openai.ts"],"names":[],"mappings":"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"}

package/dist/executor/llm-openai-function.d.ts

@@ -1,5 +1,5 @@
 import { PromptInput, ParserOutput, CoreExecutorExecuteOptions, ExecutorWithLlmOptions, LlmExecutorHooks, OpenAiLlmExecutorOptions, OpenAiFunctionCall } from "../types";
-import { OpenAI } from "../llm";
+import { LlmOpenAI } from "../llm";
 import { BasePrompt } from "../prompt";
 import { BaseState } from "../state";
 import { BaseParser } from "../parser";
@@ -7,7 +7,7 @@ import { LlmExecutor } from "./llm";
 /**
  * Core Executor With LLM
  */
-export declare class LlmExecutorOpenAiFunctions<Llm extends OpenAI, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState> extends LlmExecutor<Llm, Prompt, Parser, State> {
+export declare class LlmExecutorOpenAiFunctions<Llm extends LlmOpenAI, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState> extends LlmExecutor<Llm, Prompt, Parser, State> {
     constructor(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>);
     execute<T extends OpenAiFunctionCall>(_input: PromptInput<Prompt>, _options: OpenAiLlmExecutorOptions<T>): Promise<ParserOutput<Parser>>;
 }

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { useExecutors, createCallableExecutor } from "./plugins/callable";
 import { createCoreExecutor, createLlmExecutor } from "./executor/_functions";
 import { BaseExecutor } from "./executor/_base";
 import * as utils from "./utils";
-import { BaseLlm, OpenAI, createLlmOpenAi } from "./llm";
+import { BaseLlm, LlmOpenAI, createLlmOpenAi } from "./llm";
 import { EmbeddingOpenAI } from "./embedding/openai";
 import { PineconeVectorStore } from "./vector";
 import { BasePrompt, ChatPrompt, TextPrompt, createPrompt, createChatPrompt } from "./prompt";
@@ -18,7 +18,8 @@ export declare const llmExe: {
      * Llm
      */
     BaseLlm: typeof BaseLlm;
-    OpenAI: typeof OpenAI;
+    OpenAI: typeof LlmOpenAI;
+    LlmOpenAI: typeof LlmOpenAI;
     createLlmOpenAi: typeof createLlmOpenAi;
     /**
      * Prompt

package/dist/index.js

@@ -45,7 +45,8 @@ exports.llmExe = {
      * Llm
      */
     BaseLlm: llm_1.BaseLlm,
-    OpenAI: llm_1.OpenAI,
+    OpenAI: llm_1.LlmOpenAI,
+    LlmOpenAI: llm_1.LlmOpenAI,
     createLlmOpenAi: llm_1.createLlmOpenAi,
     /**
      * Prompt

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAmE;AACnE,iDAA0E;AAC1E,sDAA8E;AAC9E,4CAAgD;AAChD,+CAAiC;AACjC,+BAAyD;AACzD,+CAAqD;AACrD,qCAA+C;AAE/C,qCAMkB;AAElB,qCAKkB;AAElB,mCAMiB;AAEjB,wEAA4E;AAE/D,QAAA,MAAM,GAAG;IACpB;;OAEG;IACH,KAAK;IACL;;OAEG;IACH,OAAO,EAAP,aAAO;IACP,MAAM,EAAN,YAAM;IACN,eAAe,EAAf,qBAAe;IACf;;OAEG;IACH,UAAU,EAAV,mBAAU;IACV,UAAU,EAAV,mBAAU;IACV,UAAU,EAAV,mBAAU;IACV,YAAY,EAAZ,qBAAY;IACZ,gBAAgB,EAAhB,yBAAgB;IAChB;;OAEG;IACH,UAAU,EAAV,mBAAU;IACV,YAAY,EAAZ,qBAAY;IACZ,YAAY,EAAZ,qBAAY;IACZ,kBAAkB,EAAlB,2BAAkB;IAClB;;OAEG;IACH,YAAY,EAAZ,oBAAY;IACZ,kBAAkB,EAAlB,+BAAkB;IAClB,iBAAiB,EAAjB,8BAAiB;IACjB,0BAA0B,EAA1B,gDAA0B;IAC1B;;OAEG;IACH,YAAY,EAAZ,uBAAY;IACZ,sBAAsB,EAAtB,iCAAsB;IACtB;;OAEG;IACH,eAAe,EAAf,wBAAe;IACf,mBAAmB,EAAnB,4BAAmB;IACnB;;OAEG;IACH,YAAY,EAAZ,oBAAY;IACZ,aAAa,EAAb,qBAAa;IACb,gBAAgB,EAAhB,wBAAgB;IAChB,WAAW,EAAX,mBAAW;IACX,eAAe,EAAf,uBAAe;CAChB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAmE;AACnE,iDAA0E;AAC1E,sDAA8E;AAC9E,4CAAgD;AAChD,+CAAiC;AACjC,+BAA4D;AAC5D,+CAAqD;AACrD,qCAA+C;AAE/C,qCAMkB;AAElB,qCAKkB;AAElB,mCAMiB;AAEjB,wEAA4E;AAE/D,QAAA,MAAM,GAAG;IACpB;;OAEG;IACH,KAAK;IACL;;OAEG;IACH,OAAO,EAAP,aAAO;IACP,MAAM,EAAC,eAAS;IAChB,SAAS,EAAT,eAAS;IACT,eAAe,EAAf,qBAAe;IACf;;OAEG;IACH,UAAU,EAAV,mBAAU;IACV,UAAU,EAAV,mBAAU;IACV,UAAU,EAAV,mBAAU;IACV,YAAY,EAAZ,qBAAY;IACZ,gBAAgB,EAAhB,yBAAgB;IAChB;;OAEG;IACH,UAAU,EAAV,mBAAU;IACV,YAAY,EAAZ,qBAAY;IACZ,YAAY,EAAZ,qBAAY;IACZ,kBAAkB,EAAlB,2BAAkB;IAClB;;OAEG;IACH,YAAY,EAAZ,oBAAY;IACZ,kBAAkB,EAAlB,+BAAkB;IAClB,iBAAiB,EAAjB,8BAAiB;IACjB,0BAA0B,EAA1B,gDAA0B;IAC1B;;OAEG;IACH,YAAY,EAAZ,uBAAY;IACZ,sBAAsB,EAAtB,iCAAsB;IACtB;;OAEG;IACH,eAAe,EAAf,wBAAe;IACf,mBAAmB,EAAnB,4BAAmB;IACnB;;OAEG;IACH,YAAY,EAAZ,oBAAY;IACZ,aAAa,EAAb,qBAAa;IACb,gBAAgB,EAAhB,wBAAgB;IAChB,WAAW,EAAX,mBAAW;IACX,eAAe,EAAf,uBAAe;CAChB,CAAC"}

package/dist/interfaces/chat.d.ts

@@ -1,12 +1,19 @@
 export type IChatMessageRole = "system" | "assistant" | "user" | "function" | "function_call";
 export type FinishReasons = "function_call" | "stop";
+export interface IChatMessageContentDetailed {
+    type: string;
+    text?: string;
+    image_url?: {
+        url: string;
+    };
+}
 export interface IChatMessageBase {
     role: IChatMessageRole;
-    content: string | null;
+    content: string | null | IChatMessageContentDetailed[];
 }
 export interface IChatUserMessage extends IChatMessageBase {
     role: Extract<IChatMessageRole, "user">;
-    content: string;
+    content: string | IChatMessageContentDetailed[];
     name?: string;
 }
 export interface IChatFunctionMessage extends IChatMessageBase {

package/dist/interfaces/openai.d.ts

@@ -8,7 +8,7 @@ export interface BaseLlmOptions {
     jitter?: "none" | "full";
     promptType?: PromptType;
 }
-export type OpenAIChatModelName = "gpt-3.5-turbo" | "gpt-3.5-turbo-0613" | "gpt-3.5-turbo-16k" | "gpt-4-0613" | "gpt-4" | "gpt-4-0613" | "gpt-4-32k-0613";
+export type OpenAIChatModelName = "gpt-3.5-turbo" | "gpt-3.5-turbo-0613" | "gpt-3.5-turbo-16k" | "gpt-4-0613" | "gpt-4" | "gpt-4-0613" | "gpt-4-32k-0613" | `gpt-4-${string}` | `gpt-3.5-turbo-${string}`;
 export type OpenAIConversationModelName = "davinci" | "text-curie-001" | "text-babbage-001" | "text-ada-001";
 export type OpenAIEmbeddingModelName = "text-embedding-ada-002";
 export type OpenAIModelName = OpenAIChatModelName | OpenAIConversationModelName | OpenAIEmbeddingModelName;
@@ -28,6 +28,7 @@ export interface OpenAIOptions extends BaseLlmOptions {
     user?: string;
     function_call?: OpenAiFunctionCall;
     functions?: CallableExecutorCore[];
+    response_format?: Record<string, any>;
 }
 export interface EmbedOpenAIOptions extends OpenAIOptions {
     openAIApiKey: string;

package/dist/interfaces/prompt.d.ts

@@ -16,6 +16,7 @@ export interface PromptTemplateOptions {
 export interface PromptOptions extends PromptTemplateOptions {
     preFilters?: ((prompt: string) => string)[];
     postFilters?: ((prompt: string) => string)[];
+    replaceTemplateString?: (...args: any[]) => string;
 }
 export interface ChatPromptOptions extends PromptOptions {
     allowUnsafeUserTemplate?: boolean;

package/dist/llm/_base.d.ts

@@ -39,7 +39,7 @@ export declare abstract class BaseLlm<C = any> {
      * The BaseLlm constructor takes an options object and sets up the instance.
      * @param {BaseLlmOptions} options - The options object for LLM configuration.
      */
-    constructor(options: BaseLlmOptions);
+    constructor(options: BaseLlmOptions, client: C);
     shouldRetry(_error: any, _stepNumber: number): boolean;
     handleError(_error: any): void;
     getPromptType(): PromptType;

package/dist/llm/_base.js

@@ -14,7 +14,7 @@ class BaseLlm {
      * The BaseLlm constructor takes an options object and sets up the instance.
      * @param {BaseLlmOptions} options - The options object for LLM configuration.
      */
-    constructor(options) {
+    constructor(options, client) {
         /**
          * A property to hold the client instance for the specific LLM.
          */
@@ -91,7 +91,7 @@ class BaseLlm {
             }
         });
         this.traceId = options?.traceId || null;
-        this.client = null;
+        this.client = client;
         this.promptType = options?.promptType || "text";
         this.timeout = options.timeout || 30000;
         this.jitter = options.jitter || "none";

package/dist/llm/_base.js.map

@@ -1 +1 @@
-{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["llm/_base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["llm/_base.ts"],"names":[],"mappings":"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"}

package/dist/llm/bedrock.d.ts

@@ -0,0 +1,95 @@
+import { IChatMessages, OpenAIModelName, OpenAIOptions } from "../types";
+import { BaseLlm } from "./_base";
+import { OutputOpenAICompletion } from "./output/openai";
+interface BedrockClient {
+    client: {
+        send: any;
+    };
+    invoke: any;
+}
+/**
+ * Create a new instance of the OpenAI API wrapper.
+ * @param options - Configuration options for the OpenAI API wrapper.
+ * @returns - A new instance of the OpenAI API wrapper class.
+ */
+export declare function createLlmBedrock(options: OpenAIOptions, client: BedrockClient): LlmBedrock;
+/**
+ * A class that extends BaseLlm and provides functionality for the OpenAI API.
+ */
+export declare class LlmBedrock extends BaseLlm<BedrockClient> {
+    private model;
+    private temperature;
+    private maxTokens;
+    private topP;
+    private n;
+    private stream;
+    private stop;
+    private presencePenalty;
+    private frequencyPenalty;
+    private logitBias;
+    private user;
+    /**
+     * Constructor for the OpenAI class.
+     * @param {OpenAIOptions} options - Configuration options for the OpenAI API wrapper.
+     */
+    constructor(options: OpenAIOptions, client: BedrockClient);
+    /**
+     * Get the total prompt and completion tokens across all calls to the API.
+     * @returns - An object with total prompt and completion tokens.
+     */
+    getMetrics(): {
+        total_completionTokens: number;
+        total_promptTokens: number;
+        total_totalTokens: number;
+    };
+    /**
+     * Calculate the API call cost based on input and output tokens.
+     * @param input_tokens - The number of input tokens.
+     * @param output_tokens=0 - The number of output tokens (defaults to 0).
+     * @returns An object for input/output tokens and cost.
+     */
+    calculatePrice(input_tokens: number, output_tokens?: number): {
+        input_cost: number;
+        output_cost: number;
+        total_cost: number;
+    };
+    /**
+     * Log a table containing usage metrics for the OpenAI API.
+     */
+    logMetrics(): void;
+    /**
+     * Wrapper function to call chat/completion with the specified input.
+     * @private
+     * @param input - The input for the chat/completion API.
+     * @returns The chat/completion response from the API.
+     */
+    _call(input: string | IChatMessages): Promise<OutputOpenAICompletion>;
+    /**
+     * Communicate with the OpenAI Completion API.
+     * @param messages - A list of message objects for the API call.
+     * @returns The chat response from the API.
+     */
+    completion(prompt: string): Promise<OutputOpenAICompletion>;
+    getMetadata(): {
+        traceId: string | null;
+        promptType: import("../types").PromptType;
+        timeout: number;
+        jitter: "none" | "full";
+        maxDelay: number;
+        numOfAttempts: number;
+        metrics: any;
+    } & {
+        model: OpenAIModelName;
+        temperature: number;
+        max_tokens: number;
+        topP: number | null;
+        n: number | null;
+        stream: boolean | null;
+        stop: any;
+        presencePenalty: number | null;
+        frequencyPenalty: number | null;
+        logitBias: object | null;
+        user: string;
+    };
+}
+export {};

package/dist/llm/bedrock.js

@@ -0,0 +1,194 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LlmBedrock = exports.createLlmBedrock = void 0;
+const _base_1 = require("./_base");
+const utils_1 = require("../utils");
+const openai_1 = require("./output/openai");
+/**
+ * Create a new instance of the OpenAI API wrapper.
+ * @param options - Configuration options for the OpenAI API wrapper.
+ * @returns - A new instance of the OpenAI API wrapper class.
+ */
+function createLlmBedrock(options, client) {
+    return new LlmBedrock(options, client);
+}
+exports.createLlmBedrock = createLlmBedrock;
+/**
+ * A class that extends BaseLlm and provides functionality for the OpenAI API.
+ */
+class LlmBedrock extends _base_1.BaseLlm {
+    /**
+     * Constructor for the OpenAI class.
+     * @param {OpenAIOptions} options - Configuration options for the OpenAI API wrapper.
+     */
+    constructor(options, client) {
+        const { openAIApiKey = (0, utils_1.getEnvironmentVariable)("OPEN_AI_API_KEY"), modelName, temperature, maxTokens, topP = null, n = null, stream = null, stop, presencePenalty = null, frequencyPenalty = null, logitBias = null, user = "", ...restOfOptions } = options;
+        super(restOfOptions, client);
+        Object.defineProperty(this, "model", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "temperature", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "maxTokens", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "topP", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "n", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.defineProperty(this, "stream", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "stop", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.defineProperty(this, "presencePenalty", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "frequencyPenalty", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "logitBias", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "user", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.model = modelName || "gpt-3.5-turbo";
+        this.temperature = temperature || 0;
+        this.maxTokens = maxTokens || 500;
+        this.topP = topP;
+        this.n = n;
+        this.stream = stream;
+        this.stop = stop;
+        this.presencePenalty = presencePenalty;
+        this.frequencyPenalty = frequencyPenalty;
+        this.logitBias = logitBias;
+        this.user = user;
+        this.promptType = "text";
+    }
+    /**
+     * Get the total prompt and completion tokens across all calls to the API.
+     * @returns - An object with total prompt and completion tokens.
+     */
+    getMetrics() {
+        let total_completionTokens = 0;
+        let total_promptTokens = 0;
+        let total_totalTokens = 0;
+        for (const item of this.metrics.history) {
+            /* istanbul ignore next */
+            const { completion_tokens = 0, prompt_tokens = 0, total_tokens = 0, } = item.usage;
+            total_completionTokens = total_completionTokens + completion_tokens;
+            total_promptTokens = total_promptTokens + prompt_tokens;
+            total_totalTokens = total_totalTokens + total_tokens;
+        }
+        return {
+            total_completionTokens,
+            total_promptTokens,
+            total_totalTokens,
+        };
+    }
+    /**
+     * Calculate the API call cost based on input and output tokens.
+     * @param input_tokens - The number of input tokens.
+     * @param output_tokens=0 - The number of output tokens (defaults to 0).
+     * @returns An object for input/output tokens and cost.
+     */
+    calculatePrice(input_tokens, output_tokens = 0) {
+        return (0, utils_1.calculateOpenAiPrice)(this.model, input_tokens, output_tokens);
+    }
+    /**
+     * Log a table containing usage metrics for the OpenAI API.
+     */
+    logMetrics() { }
+    /**
+     * Wrapper function to call chat/completion with the specified input.
+     * @private
+     * @param input - The input for the chat/completion API.
+     * @returns The chat/completion response from the API.
+     */
+    async _call(input) {
+        (0, utils_1.assert)(typeof input === "string");
+        return await this.completion(input);
+    }
+    /**
+     * Communicate with the OpenAI Completion API.
+     * @param messages - A list of message objects for the API call.
+     * @returns The chat response from the API.
+     */
+    async completion(prompt) {
+        (0, utils_1.assert)(typeof prompt === "string" && prompt !== "", "Missing prompt.");
+        const options = (0, utils_1.removeEmptyFromObject)({
+            prompt,
+            model: this.model,
+            temperature: this.temperature,
+            max_tokens: this.maxTokens,
+            topP: this.topP,
+            n: this.n,
+            stream: this.stream,
+            stop: this.stop,
+            presencePenalty: this.presencePenalty,
+            frequencyPenalty: this.frequencyPenalty,
+            logitBias: this.logitBias,
+            user: this.user,
+        });
+        console.log("!!response", options);
+        throw new Error("you got here?");
+        const response = await this.client.client.send(new this.client.invoke(options));
+        this.metrics.history.push(response);
+        return new openai_1.OutputOpenAICompletion(response);
+    }
+    getMetadata() {
+        return Object.assign({}, super.getMetadata(), (0, utils_1.removeEmptyFromObject)({
+            model: this.model,
+            temperature: this.temperature,
+            max_tokens: this.maxTokens,
+            topP: this.topP,
+            n: this.n,
+            stream: this.stream,
+            stop: this.stop,
+            presencePenalty: this.presencePenalty,
+            frequencyPenalty: this.frequencyPenalty,
+            logitBias: this.logitBias,
+            user: this.user,
+        }));
+    }
+}
+exports.LlmBedrock = LlmBedrock;
+//# sourceMappingURL=bedrock.js.map

package/dist/llm/bedrock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bedrock.js","sourceRoot":"src/","sources":["llm/bedrock.ts"],"names":[],"mappings":"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"}

package/dist/llm/index.d.ts

@@ -1,2 +1,2 @@
 export { BaseLlm } from "./_base";
-export { createLlmOpenAi, OpenAI } from "./openai";
+export { createLlmOpenAi, LlmOpenAI } from "./openai";

package/dist/llm/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenAI = exports.createLlmOpenAi = exports.BaseLlm = void 0;
+exports.LlmOpenAI = exports.createLlmOpenAi = exports.BaseLlm = void 0;
 var _base_1 = require("./_base");
 Object.defineProperty(exports, "BaseLlm", { enumerable: true, get: function () { return _base_1.BaseLlm; } });
 var openai_1 = require("./openai");
 Object.defineProperty(exports, "createLlmOpenAi", { enumerable: true, get: function () { return openai_1.createLlmOpenAi; } });
-Object.defineProperty(exports, "OpenAI", { enumerable: true, get: function () { return openai_1.OpenAI; } });
+Object.defineProperty(exports, "LlmOpenAI", { enumerable: true, get: function () { return openai_1.LlmOpenAI; } });
 //# sourceMappingURL=index.js.map

package/dist/llm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["llm/index.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAAzB,gGAAA,OAAO,OAAA;AAChB,mCAAmD;AAA1C,yGAAA,eAAe,OAAA;AAAE,gGAAA,MAAM,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["llm/index.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAAzB,gGAAA,OAAO,OAAA;AAChB,mCAAsD;AAA7C,yGAAA,eAAe,OAAA;AAAE,mGAAA,SAAS,OAAA"}

package/dist/llm/openai.d.ts

@@ -1,4 +1,4 @@
-import { OpenAIApi } from "openai";
+import type { OpenAI } from "openai";
 import { IChatMessages, OpenAIModelName, OpenAIOptions, OpenAiLlmExecutorOptions } from "../types";
 import { BaseLlm } from "./_base";
 import { OutputOpenAIChat } from "../llm/output";
@@ -8,11 +8,11 @@ import { OutputOpenAICompletion } from "./output/openai";
  * @param options - Configuration options for the OpenAI API wrapper.
  * @returns - A new instance of the OpenAI API wrapper class.
  */
-export declare function createLlmOpenAi(options: OpenAIOptions): OpenAI;
+export declare function createLlmOpenAi(options: OpenAIOptions, client: OpenAI): LlmOpenAI;
 /**
  * A class that extends BaseLlm and provides functionality for the OpenAI API.
  */
-export declare class OpenAI extends BaseLlm<OpenAIApi> {
+export declare class LlmOpenAI extends BaseLlm<OpenAI> {
     private model;
     private temperature;
     private maxTokens;
@@ -24,11 +24,12 @@ export declare class OpenAI extends BaseLlm<OpenAIApi> {
     private frequencyPenalty;
     private logitBias;
     private user;
+    private useJson;
     /**
      * Constructor for the OpenAI class.
      * @param {OpenAIOptions} options - Configuration options for the OpenAI API wrapper.
      */
-    constructor(options: OpenAIOptions);
+    constructor(options: OpenAIOptions, client: OpenAI);
     /**
      * Get the total prompt and completion tokens across all calls to the API.
      * @returns - An object with total prompt and completion tokens.

package/dist/llm/openai.js

@@ -1,31 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenAI = exports.createLlmOpenAi = void 0;
-const openai_1 = require("openai");
+exports.LlmOpenAI = exports.createLlmOpenAi = void 0;
 const _base_1 = require("./_base");
 const output_1 = require("../llm/output");
 const utils_1 = require("../utils");
-const openai_2 = require("./output/openai");
+const openai_1 = require("./output/openai");
 /**
  * Create a new instance of the OpenAI API wrapper.
  * @param options - Configuration options for the OpenAI API wrapper.
  * @returns - A new instance of the OpenAI API wrapper class.
  */
-function createLlmOpenAi(options) {
-    return new OpenAI(options);
+function createLlmOpenAi(options, client) {
+    return new LlmOpenAI(options, client);
 }
 exports.createLlmOpenAi = createLlmOpenAi;
 /**
  * A class that extends BaseLlm and provides functionality for the OpenAI API.
  */
-class OpenAI extends _base_1.BaseLlm {
+class LlmOpenAI extends _base_1.BaseLlm {
     /**
      * Constructor for the OpenAI class.
      * @param {OpenAIOptions} options - Configuration options for the OpenAI API wrapper.
      */
-    constructor(options) {
-        const { openAIApiKey = (0, utils_1.getEnvironmentVariable)("OPEN_AI_API_KEY"), modelName, temperature, maxTokens, topP = null, n = null, stream = null, stop, presencePenalty = null, frequencyPenalty = null, logitBias = null, user = "", ...restOfOptions } = options;
-        super(restOfOptions);
+    constructor(options, client) {
+        const { openAIApiKey = (0, utils_1.getEnvironmentVariable)("OPEN_AI_API_KEY"), modelName, temperature, maxTokens, topP = null, n = null, stream = null, stop, presencePenalty = null, frequencyPenalty = null, logitBias = null, user = "", response_format, ...restOfOptions } = options;
+        super(restOfOptions, client);
         Object.defineProperty(this, "model", {
             enumerable: true,
             configurable: true,
@@ -92,6 +91,12 @@ class OpenAI extends _base_1.BaseLlm {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "useJson", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.model = modelName || "gpt-3.5-turbo";
         this.temperature = temperature || 0;
         this.maxTokens = maxTokens || 500;
@@ -103,6 +108,7 @@ class OpenAI extends _base_1.BaseLlm {
         this.frequencyPenalty = frequencyPenalty;
         this.logitBias = logitBias;
         this.user = user;
+        this.useJson = !!response_format;
         if (this.model.substring(0, 13) === "gpt-3.5-turbo" ||
             this.model.substring(0, 5) === "gpt-4") {
             this.promptType = "chat";
@@ -110,9 +116,6 @@ class OpenAI extends _base_1.BaseLlm {
         else {
             this.promptType = "text";
         }
-        this.client = new openai_1.OpenAIApi(new openai_1.Configuration({
-            apiKey: openAIApiKey,
-        }));
     }
     /**
      * Get the total prompt and completion tokens across all calls to the API.
@@ -208,10 +211,12 @@ class OpenAI extends _base_1.BaseLlm {
         if (_args && _args?.functions?.length) {
             options["functions"] = _args.functions.map(f => (0, utils_1.pick)(f, ["name", "description", "parameters"]));
         }
-        const response = await this.client.createChatCompletion(options);
-        const { data } = response;
-        this.metrics.history.push(data);
-        return new output_1.OutputOpenAIChat(data);
+        if (this.useJson) {
+            options.response_format = { "type": "json_object" };
+        }
+        const response = await this.client.chat.completions.create(options);
+        this.metrics.history.push(response);
+        return new output_1.OutputOpenAIChat(response);
     }
     /**
      * Communicate with the OpenAI Completion API.
@@ -234,10 +239,9 @@ class OpenAI extends _base_1.BaseLlm {
             logitBias: this.logitBias,
             user: this.user,
         });
-        const response = await this.client.createCompletion(options);
-        const { data } = response;
-        this.metrics.history.push(data);
-        return new openai_2.OutputOpenAICompletion(data);
+        const response = await this.client.completions.create(options);
+        this.metrics.history.push(response);
+        return new openai_1.OutputOpenAICompletion(response);
     }
     getMetadata() {
         return Object.assign({}, super.getMetadata(), (0, utils_1.removeEmptyFromObject)({
@@ -255,5 +259,5 @@ class OpenAI extends _base_1.BaseLlm {
         }));
     }
 }
-exports.OpenAI = OpenAI;
+exports.LlmOpenAI = LlmOpenAI;
 //# sourceMappingURL=openai.js.map