llm-proxy 1.3.13 → 1.4.14

package/dist/index.js

@@ -46,51 +46,51 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateLLMStreamResponse = exports.generateLLMResponse = void 0;
-const ProviderFinder_1 = require("./middleware/ProviderFinder");
-const InputFormatAdapter_1 = require("./middleware/InputFormatAdapter");
-const OutputFormatAdapter_1 = require("./middleware/OutputFormatAdapter");
 const types_1 = require("./types");
 const OpenAIService_1 = __importDefault(require("./services/OpenAIService"));
 const AwsBedrockAnthropicService_1 = __importDefault(require("./services/AwsBedrockAnthropicService"));
+const ProviderFinder_1 = __importDefault(require("./middleware/ProviderFinder"));
+const InputFormatAdapter_1 = __importDefault(require("./middleware/InputFormatAdapter"));
+const OutputFormatAdapter_1 = __importDefault(require("./middleware/OutputFormatAdapter"));
 // Main function for non-streaming requests
 function generateLLMResponse(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const { messages, model, functions, max_tokens, temperature, credentials } = params;
         // Step 1: Identify the provider based on the model
-        const provider = ProviderFinder_1.ProviderFinder.getProvider(model);
+        const provider = ProviderFinder_1.default.getProvider(model);
         // Initialize the correct service based on the provider
         let service;
         if (provider === types_1.Providers.OPENAI) {
             if (!credentials.apiKey) {
-                return Promise.reject("OpenAI API key is required for OpenAI models.");
+                return Promise.reject(new Error("OpenAI API key is required for OpenAI models."));
             }
             service = new OpenAIService_1.default(credentials.apiKey);
         }
         else if (provider === types_1.Providers.ANTHROPIC_BEDROCK) {
-            const awsConfig = credentials.awsConfig;
+            const { awsConfig } = credentials;
             if (!awsConfig) {
-                return Promise.reject("AWS credentials are required for Bedrock models.");
+                return Promise.reject(new Error("AWS credentials are required for Bedrock models."));
             }
             service = new AwsBedrockAnthropicService_1.default(awsConfig.accessKeyId, awsConfig.secretAccessKey, awsConfig.region);
         }
         else {
-            return Promise.reject("Unsupported provider");
+            return Promise.reject(new Error("Unsupported provider"));
         }
         // Step 2: Adapt messages and extract the system prompt
-        const { adaptedMessages, systemPrompt } = InputFormatAdapter_1.InputFormatAdapter.adaptMessages(messages, provider);
+        const { adaptedMessages, systemPrompt } = InputFormatAdapter_1.default.adaptMessages(messages, provider);
         // Step 3: Generate the completion
         const response = yield service.generateCompletion({
             messages: adaptedMessages,
             model,
-            max_tokens: max_tokens,
+            max_tokens,
             temperature: temperature || 0,
-            functions,
+            tools: functions,
             systemPrompt,
         });
         // Step 4: Adapt the response if needed
         return provider === types_1.Providers.OPENAI
             ? response
-            : OutputFormatAdapter_1.OutputFormatAdapter.adaptResponse(response, provider);
+            : OutputFormatAdapter_1.default.adaptResponse(response, provider);
     });
 }
 exports.generateLLMResponse = generateLLMResponse;
@@ -99,34 +99,34 @@ function generateLLMStreamResponse(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const { messages, model, functions, max_tokens, temperature, credentials } = params;
         // Step 1: Identify the provider based on the model
-        const provider = ProviderFinder_1.ProviderFinder.getProvider(model);
+        const provider = ProviderFinder_1.default.getProvider(model);
         // Initialize the correct service based on the provider
         let service;
         if (provider === types_1.Providers.OPENAI) {
             if (!credentials.apiKey) {
-                return Promise.reject("OpenAI API key is required for OpenAI models.");
+                return Promise.reject(new Error("OpenAI API key is required for OpenAI models."));
             }
             service = new OpenAIService_1.default(credentials.apiKey);
         }
         else if (provider === types_1.Providers.ANTHROPIC_BEDROCK) {
-            const awsConfig = credentials.awsConfig;
+            const { awsConfig } = credentials;
             if (!awsConfig) {
-                return Promise.reject("AWS credentials are required for Bedrock models.");
+                return Promise.reject(new Error("AWS credentials are required for Bedrock models."));
             }
             service = new AwsBedrockAnthropicService_1.default(awsConfig.accessKeyId, awsConfig.secretAccessKey, awsConfig.region);
         }
         else {
-            return Promise.reject("Unsupported provider");
+            return Promise.reject(new Error("Unsupported provider"));
         }
         // Step 2: Adapt messages and extract the system prompt
-        const { adaptedMessages, systemPrompt } = InputFormatAdapter_1.InputFormatAdapter.adaptMessages(messages, provider);
+        const { adaptedMessages, systemPrompt } = InputFormatAdapter_1.default.adaptMessages(messages, provider);
         // Step 3: Generate the streaming completion
         const stream = service.generateStreamCompletion({
             messages: adaptedMessages,
             model,
             max_tokens,
             temperature: temperature || 0,
-            functions,
+            tools: functions,
             systemPrompt,
         });
         // Step 4: Create and return the async generator
@@ -141,7 +141,7 @@ function generateLLMStreamResponse(params) {
                             const chunk = _c;
                             yield yield __await(provider === types_1.Providers.OPENAI
                                 ? chunk
-                                : OutputFormatAdapter_1.OutputFormatAdapter.adaptResponse(chunk, provider));
+                                : OutputFormatAdapter_1.default.adaptResponse(chunk, provider));
                         }
                         finally {
                             _d = true;

package/dist/index.js.map

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

package/dist/middleware/InputFormatAdapter.d.ts

@@ -1,6 +1,6 @@
-import { BedrockAnthropicMessage, Messages, OpenAIMessages, Providers } from "../types";
-export declare class InputFormatAdapter {
-    static adaptMessages(messages: Messages, provider: Providers): {
+import { BedrockAnthropicMessage, OpenAIMessages, Providers } from "../types";
+export default class InputFormatAdapter {
+    static adaptMessages(messages: any, provider: Providers): {
         adaptedMessages: OpenAIMessages | BedrockAnthropicMessage[];
         systemPrompt?: string;
     };

package/dist/middleware/InputFormatAdapter.js

@@ -1,21 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InputFormatAdapter = void 0;
 const types_1 = require("../types");
 class InputFormatAdapter {
     static adaptMessages(messages, provider) {
-        //
-        /**!SECTION
-         * There some strange stuff happened, in a function call assistant message the
-         * will be by default null, it must be null, but the openai api was returning error
-         * and it cannot be null of fine, but using same api version, from different app (CMND)
-         *  it works well !!!!!!!! it works with null content on the same version,
-         *  im not convinced with this work to make it empty string instead of null so here is a todo to go back to it
-         */
         var _a;
         switch (provider) {
             case types_1.Providers.OPENAI:
                 return {
+                    // @ts-ignore
                     adaptedMessages: messages.map((msg) => {
                         var _a, _b;
                         if (msg.role === "function") {
@@ -27,7 +19,7 @@ class InputFormatAdapter {
                         }
                         return {
                             role: msg.role,
-                            content: (_b = msg.content) !== null && _b !== void 0 ? _b : "",
+                            content: (_b = msg.content) !== null && _b !== void 0 ? _b : "function call",
                         };
                     }),
                 };
@@ -41,18 +33,61 @@ class InputFormatAdapter {
                     throw new Error("The first message must have a role of 'system' for Anthropic.");
                 }
                 const systemPrompt = (_a = firstMessage.content) !== null && _a !== void 0 ? _a : "";
-                const adaptedMessages = restMessages.map((msg) => {
-                    var _a;
-                    return ({
-                        role: msg.role === "user" ? "user" : "assistant",
-                        content: [
-                            {
-                                type: types_1.BedrockAnthropicContentType.TEXT,
-                                text: (_a = msg.content) !== null && _a !== void 0 ? _a : "",
-                            },
-                        ],
-                    });
+                const adaptedMessages = [];
+                // @ts-ignore
+                restMessages.forEach((msg) => {
+                    var _a, _b;
+                    if (msg.role !== "user" && msg.role !== "assistant") {
+                        // Add the "empty" message before the current one
+                        adaptedMessages.push({
+                            role: "user",
+                            content: [
+                                {
+                                    type: types_1.BedrockAnthropicContentType.TEXT,
+                                    text: ":",
+                                },
+                            ],
+                        });
+                        // Change the role to "assistant" for the current message
+                        adaptedMessages.push({
+                            role: "assistant",
+                            content: [
+                                {
+                                    type: types_1.BedrockAnthropicContentType.TEXT,
+                                    text: (_a = msg.content) !== null && _a !== void 0 ? _a : "",
+                                },
+                            ],
+                        });
+                    }
+                    else {
+                        // Add the message as-is
+                        adaptedMessages.push({
+                            role: msg.role,
+                            content: [
+                                {
+                                    type: types_1.BedrockAnthropicContentType.TEXT,
+                                    text: (_b = msg.content) !== null && _b !== void 0 ? _b : msg.function_call.arguments,
+                                },
+                            ],
+                        });
+                    }
                 });
+                // Ensure no two consecutive messages have the same role
+                for (let i = 0; i < adaptedMessages.length - 1; i += 1) {
+                    if (adaptedMessages[i].role === adaptedMessages[i + 1].role) {
+                        // Insert a placeholder message with the opposite role
+                        adaptedMessages.splice(i + 1, 0, {
+                            role: adaptedMessages[i].role === "user" ? "assistant" : "user",
+                            content: [
+                                {
+                                    type: types_1.BedrockAnthropicContentType.TEXT,
+                                    text: ":",
+                                },
+                            ],
+                        });
+                        i += 1; // Skip the inserted message
+                    }
+                }
                 return { adaptedMessages, systemPrompt };
             }
             default:
@@ -60,5 +95,5 @@ class InputFormatAdapter {
         }
     }
 }
-exports.InputFormatAdapter = InputFormatAdapter;
+exports.default = InputFormatAdapter;
 //# sourceMappingURL=InputFormatAdapter.js.map

package/dist/middleware/InputFormatAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"InputFormatAdapter.js","sourceRoot":"","sources":["../../src/middleware/InputFormatAdapter.ts"],"names":[],"mappings":";;;AAAA,oCAOkB;AAElB,MAAa,kBAAkB;IAC7B,MAAM,CAAC,aAAa,CAClB,QAAkB,EAClB,QAAmB;QAKnB,EAAE;QACF;;;;;;WAMG;;QAEH,QAAQ,QAAQ,EAAE;YAChB,KAAK,iBAAS,CAAC,MAAM;gBACnB,OAAO;oBACL,eAAe,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;;wBACpC,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE;4BAC3B,OAAO;gCACL,IAAI,EAAE,GAAG,CAAC,IAAI;gCACd,OAAO,EAAE,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE;gCAC1B,IAAI,EAAG,GAA6B,CAAC,IAAI;6BAC1C,CAAC;yBACH;wBACD,OAAO;4BACL,IAAI,EAAE,GAAG,CAAC,IAAI;4BACd,OAAO,EAAE,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE;yBAC3B,CAAC;oBACJ,CAAC,CAAmB;iBACrB,CAAC;YAEJ,KAAK,iBAAS,CAAC,iBAAiB,CAAC,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;oBACpB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;iBAClE;gBAED,iDAAiD;gBACjD,MAAM,CAAC,YAAY,EAAE,GAAG,YAAY,CAAC,GAAG,QAAQ,CAAC;gBAEjD,IAAI,YAAY,CAAC,IAAI,KAAK,QAAQ,EAAE;oBAClC,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;iBACH;gBAED,MAAM,YAAY,GAAG,MAAA,YAAY,CAAC,OAAO,mCAAI,EAAE,CAAC;gBAEhD,MAAM,eAAe,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;;oBAAC,OAAA,CAAC;wBACjD,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW;wBAChD,OAAO,EAAE;4BACP;gCACE,IAAI,EAAE,mCAA2B,CAAC,IAAI;gCACtC,IAAI,EAAE,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE;6BACxB;yBACF;qBACF,CAAC,CAAA;iBAAA,CAA8B,CAAC;gBAEjC,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;aAC1C;YAED;gBACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;SACxD;IACH,CAAC;CACF;AApED,gDAoEC"}
+{"version":3,"file":"InputFormatAdapter.js","sourceRoot":"","sources":["../../src/middleware/InputFormatAdapter.ts"],"names":[],"mappings":"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"}

package/dist/middleware/OutputFormatAdapter.d.ts

@@ -1,8 +1,12 @@
 import { LLMResponse, Providers } from "../types";
-export declare class OutputFormatAdapter {
+export default class OutputFormatAdapter {
+    private static isToolUseStream;
+    private static toolArguments;
+    private static model;
+    private static toolName;
     static adaptResponse(response: any, provider: Providers): LLMResponse;
-    private static adaptCompleteResponse;
     private static adaptStreamingResponse;
-    private static mapRole;
-    private static extractContent;
+    private static createToolUseResponse;
+    private static createNonToolUseResponse;
+    private static resetState;
 }

package/dist/middleware/OutputFormatAdapter.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OutputFormatAdapter = void 0;
 const types_1 = require("../types");
 class OutputFormatAdapter {
     static adaptResponse(response, provider) {
@@ -12,13 +11,7 @@ class OutputFormatAdapter {
                 case types_1.Providers.OPENAI:
                     return response;
                 case types_1.Providers.ANTHROPIC_BEDROCK:
-                    // Check if it's a streaming chunk or complete response
-                    if (response.type === "message" && !response.delta) {
-                        return this.adaptCompleteResponse(response);
-                    }
-                    else {
-                        return this.adaptStreamingResponse(response);
-                    }
+                    return this.adaptStreamingResponse(response);
                 default:
                     throw new Error(`Unsupported provider: ${provider}`);
             }
@@ -27,120 +20,122 @@ class OutputFormatAdapter {
             throw new Error(`Failed to adapt response: ${error.message}`);
         }
     }
-    static adaptCompleteResponse(response) {
+    static adaptStreamingResponse(chunk) {
+        var _a, _b, _c, _d, _e;
+        const metrics = chunk["amazon-bedrock-invocationMetrics"];
+        const isStop = chunk.type === "content_block_stop" || chunk.type === "message_stop";
+        // Cache model on the first `message_start` chunk
+        if (chunk.type === "message_start" && ((_a = chunk.message) === null || _a === void 0 ? void 0 : _a.model)) {
+            this.model = chunk.message.model;
+        }
+        // Detect tool use for the current chunk and cache the tool name
+        if (chunk.type === "content_block_start" &&
+            ((_b = chunk.content_block) === null || _b === void 0 ? void 0 : _b.type) === "tool_use") {
+            this.isToolUseStream = true;
+            this.toolName = ((_c = chunk.content_block) === null || _c === void 0 ? void 0 : _c.name) || "unknown_tool"; // Capture tool name
+        }
+        // Accumulate tool arguments for tool-use streams
+        if (chunk.type === "content_block_delta" &&
+            ((_d = chunk.delta) === null || _d === void 0 ? void 0 : _d.type) === "input_json_delta") {
+            this.toolArguments.push(((_e = chunk.delta) === null || _e === void 0 ? void 0 : _e.partial_json) || "nothing");
+        }
+        // Handle the end of the stream
+        if (isStop) {
+            const response = this.isToolUseStream
+                ? this.createToolUseResponse(metrics, isStop)
+                : this.createNonToolUseResponse(metrics, isStop, chunk);
+            // Reset state after processing the end of the stream
+            this.resetState();
+            return response;
+        }
+        // Handle intermediate chunks (non-stop chunks)
+        return this.isToolUseStream
+            ? this.createToolUseResponse(metrics, isStop, chunk)
+            : this.createNonToolUseResponse(metrics, isStop, chunk);
+    }
+    static createToolUseResponse(metrics, isStop, chunk) {
+        var _a, _b;
         return {
-            id: response.id,
-            object: "text_completion",
+            id: `stream-${Date.now()}`,
+            object: "chat.completion.chunk",
             created: Date.now(),
-            model: response.model,
-            choices: response.content.map((contentBlock, index) => ({
-                index,
-                message: {
-                    role: this.mapRole(contentBlock),
-                    content: this.extractContent(contentBlock),
-                },
-                logprobs: null,
-                finish_reason: response.stop_reason || null,
-            })),
-            usage: {
-                prompt_tokens: response.usage.input_tokens,
-                completion_tokens: response.usage.output_tokens,
-                total_tokens: response.usage.input_tokens + response.usage.output_tokens,
-                prompt_tokens_details: { cached_tokens: 0 },
-                completion_tokens_details: { reasoning_tokens: 0 },
-            },
+            model: this.model || "unknown-model",
             system_fingerprint: "anthropic_translation",
-        };
-    }
-    static adaptStreamingResponse(chunk) {
-        var _a, _b;
-        // Handle stop messages
-        if (chunk.type === "content_block_stop" || chunk.type === "message_stop") {
-            const metrics = chunk["amazon-bedrock-invocationMetrics"];
-            return {
-                id: `stream-${Date.now()}`,
-                object: "text_completion",
-                created: Date.now(),
-                model: "anthropic.claude-3-haiku",
-                choices: [
-                    {
-                        index: 0,
-                        delta: {
-                            role: "assistant",
-                            content: "",
-                        },
-                        logprobs: null,
-                        finish_reason: "stop",
+            choices: [
+                {
+                    index: 0,
+                    delta: {
+                        function_call: {
+                            name: this.toolName || "unknown_tool",
+                            arguments: chunk &&
+                                chunk.type === "content_block_delta" &&
+                                ((_a = chunk.delta) === null || _a === void 0 ? void 0 : _a.type) === "input_json_delta"
+                                ? (_b = chunk.delta) === null || _b === void 0 ? void 0 : _b.partial_json
+                                : this.toolArguments.join(", ")
+                        }
                     },
-                ],
-                usage: {
+                    logprobs: null,
+                    finish_reason: isStop ? "stop" : null
+                }
+            ],
+            usage: isStop
+                ? {
                     prompt_tokens: (metrics === null || metrics === void 0 ? void 0 : metrics.inputTokenCount) || 0,
                     completion_tokens: (metrics === null || metrics === void 0 ? void 0 : metrics.outputTokenCount) || 0,
-                    total_tokens: ((metrics === null || metrics === void 0 ? void 0 : metrics.inputTokenCount) || 0) + ((metrics === null || metrics === void 0 ? void 0 : metrics.outputTokenCount) || 0),
-                    prompt_tokens_details: { cached_tokens: 0 },
-                    completion_tokens_details: { reasoning_tokens: 0 },
-                },
-                system_fingerprint: "anthropic_translation",
-            };
-        }
-        // Handle content blocks or deltas
+                    total_tokens: ((metrics === null || metrics === void 0 ? void 0 : metrics.inputTokenCount) || 0) +
+                        ((metrics === null || metrics === void 0 ? void 0 : metrics.outputTokenCount) || 0),
+                    prompt_tokens_details: {
+                        cached_tokens: 0
+                    },
+                    completion_tokens_details: {
+                        reasoning_tokens: 0
+                    }
+                }
+                : null
+        };
+    }
+    static createNonToolUseResponse(metrics, isStop, chunk) {
+        var _a, _b;
         const content = ((_a = chunk.content_block) === null || _a === void 0 ? void 0 : _a.text) || ((_b = chunk.delta) === null || _b === void 0 ? void 0 : _b.text) || "";
         return {
             id: `stream-${Date.now()}`,
-            object: "text_completion",
+            object: "chat.completion.chunk",
             created: Date.now(),
-            model: "anthropic.claude-3-haiku",
+            model: this.model || "unknown-model",
             choices: [
                 {
                     index: 0,
                     delta: {
-                        role: "assistant",
-                        content,
+                        content
                     },
                     logprobs: null,
-                    finish_reason: "null",
-                },
+                    finish_reason: isStop ? "stop" : null
+                }
             ],
-            usage: {
-                prompt_tokens: 0,
-                completion_tokens: 0,
-                total_tokens: 0,
-                prompt_tokens_details: { cached_tokens: 0 },
-                completion_tokens_details: { reasoning_tokens: 0 },
-            },
-            system_fingerprint: "anthropic_translation",
+            usage: isStop
+                ? {
+                    prompt_tokens: (metrics === null || metrics === void 0 ? void 0 : metrics.inputTokenCount) || 0,
+                    completion_tokens: (metrics === null || metrics === void 0 ? void 0 : metrics.outputTokenCount) || 0,
+                    total_tokens: ((metrics === null || metrics === void 0 ? void 0 : metrics.inputTokenCount) || 0) +
+                        ((metrics === null || metrics === void 0 ? void 0 : metrics.outputTokenCount) || 0),
+                    prompt_tokens_details: {
+                        cached_tokens: 0
+                    },
+                    completion_tokens_details: {
+                        reasoning_tokens: 0
+                    }
+                }
+                : null
         };
     }
-    static mapRole(content) {
-        if (!content || !content.type) {
-            throw new Error("Invalid content block structure");
-        }
-        switch (content.type) {
-            case types_1.BedrockAnthropicContentType.TOOL_USE:
-            case types_1.BedrockAnthropicContentType.TOOL_RESULT:
-                return "tool";
-            case types_1.BedrockAnthropicContentType.TEXT:
-                return "assistant";
-            default:
-                return "assistant"; // Default to assistant for unknown types
-        }
-    }
-    static extractContent(content) {
-        if (!content || !content.type) {
-            throw new Error("Invalid content block structure");
-        }
-        switch (content.type) {
-            case types_1.BedrockAnthropicContentType.TEXT:
-                const textContent = content;
-                return textContent.text || "";
-            case types_1.BedrockAnthropicContentType.TOOL_RESULT:
-                return content.content || "";
-            case types_1.BedrockAnthropicContentType.TOOL_USE:
-                return content.id || "";
-            default:
-                return "";
-        }
+    static resetState() {
+        this.isToolUseStream = false;
+        this.toolArguments = [];
+        this.model = undefined;
+        this.toolName = undefined;
     }
 }
-exports.OutputFormatAdapter = OutputFormatAdapter;
+exports.default = OutputFormatAdapter;
+OutputFormatAdapter.isToolUseStream = false;
+OutputFormatAdapter.toolArguments = [];
 //# sourceMappingURL=OutputFormatAdapter.js.map

package/dist/middleware/OutputFormatAdapter.js.map

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

package/dist/middleware/ProviderFinder.d.ts

@@ -1,4 +1,4 @@
 import { Providers } from "../types";
-export declare class ProviderFinder {
+export default class ProviderFinder {
     static getProvider(model: string): Providers;
 }

package/dist/middleware/ProviderFinder.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProviderFinder = void 0;
 const types_1 = require("../types");
 class ProviderFinder {
     static getProvider(model) {
@@ -16,5 +15,5 @@ class ProviderFinder {
         throw new Error(`Unsupported model: ${model}`);
     }
 }
-exports.ProviderFinder = ProviderFinder;
+exports.default = ProviderFinder;
 //# sourceMappingURL=ProviderFinder.js.map

package/dist/middleware/ProviderFinder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderFinder.js","sourceRoot":"","sources":["../../src/middleware/ProviderFinder.ts"],"names":[],"mappings":";;;AAAA,oCAIkB;AAElB,MAAa,cAAc;IACzB,MAAM,CAAC,WAAW,CAAC,KAAa;QAC9B,sDAAsD;QACtD,IACE,MAAM,CAAC,MAAM,CAAC,2BAAmB,CAAC,CAAC,QAAQ,CAAC,KAA4B,CAAC,EACzE;YACA,OAAO,iBAAS,CAAC,MAAM,CAAC;SACzB;QACD,iEAAiE;QACjE,IACE,MAAM,CAAC,MAAM,CAAC,qCAA6B,CAAC,CAAC,QAAQ,CACnD,KAAsC,CACvC,EACD;YACA,OAAO,iBAAS,CAAC,iBAAiB,CAAC;SACpC;QACD,wCAAwC;QACxC,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;IACjD,CAAC;CACF;AAnBD,wCAmBC"}
+{"version":3,"file":"ProviderFinder.js","sourceRoot":"","sources":["../../src/middleware/ProviderFinder.ts"],"names":[],"mappings":";;AAAA,oCAIkB;AAElB,MAAqB,cAAc;IACjC,MAAM,CAAC,WAAW,CAAC,KAAa;QAC9B,sDAAsD;QACtD,IACE,MAAM,CAAC,MAAM,CAAC,2BAAmB,CAAC,CAAC,QAAQ,CAAC,KAA4B,CAAC,EACzE;YACA,OAAO,iBAAS,CAAC,MAAM,CAAC;SACzB;QACD,iEAAiE;QACjE,IACE,MAAM,CAAC,MAAM,CAAC,qCAA6B,CAAC,CAAC,QAAQ,CACnD,KAAsC,CACvC,EACD;YACA,OAAO,iBAAS,CAAC,iBAAiB,CAAC;SACpC;QACD,wCAAwC;QACxC,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;IACjD,CAAC;CACF;AAnBD,iCAmBC"}

package/dist/services/AwsBedrockAnthropicService.d.ts

@@ -5,16 +5,18 @@ export default class AwsBedrockAnthropicService implements ClientService {
     constructor(awsAccessKey: string, awsSecretKey: string, region: string);
     generateCompletion(params: {
         messages: Messages;
-        model: string;
+        model?: string;
         max_tokens?: number;
         temperature?: number;
+        tools?: any;
         systemPrompt?: string;
     }): Promise<BedrockAnthropicResponse>;
     generateStreamCompletion(params: {
         messages: Messages;
-        model: string;
+        model?: string;
         max_tokens?: number;
         temperature?: number;
+        tools?: any;
         systemPrompt?: string;
     }): AsyncGenerator<BedrockAnthropicParsedChunk, void, unknown>;
 }

package/dist/services/AwsBedrockAnthropicService.js

@@ -41,17 +41,13 @@ class AwsBedrockAnthropicService {
     }
     generateCompletion(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { messages, model, max_tokens, temperature, systemPrompt } = params;
+            const { messages, model, max_tokens, temperature, systemPrompt, tools } = params;
             if (!model) {
-                return Promise.reject("Model ID is required for AwsBedrockAnthropicService");
+                return Promise.reject(new Error("Model ID is required for AwsBedrockAnthropicService"));
             }
-            const body = JSON.stringify({
-                anthropic_version: "bedrock-2023-05-31",
-                max_tokens,
+            const body = JSON.stringify(Object.assign({ anthropic_version: "bedrock-2023-05-31", max_tokens,
                 temperature,
-                messages,
-                system: systemPrompt,
-            });
+                messages, system: systemPrompt }, (tools.length ? { tools } : {})));
             const command = new client_bedrock_runtime_1.InvokeModelCommand({
                 modelId: model,
                 body,
@@ -62,21 +58,18 @@ class AwsBedrockAnthropicService {
             return JSON.parse(new TextDecoder().decode(response.body));
         });
     }
+    // eslint-disable-next-line consistent-return
     generateStreamCompletion(params) {
         var _a;
         return __asyncGenerator(this, arguments, function* generateStreamCompletion_1() {
             var _b, e_1, _c, _d;
-            const { messages, model, max_tokens, temperature, systemPrompt } = params;
+            const { messages, model, max_tokens, temperature, tools, systemPrompt } = params;
             if (!model) {
-                return yield __await(Promise.reject("Model ID is required for AwsBedrockAnthropicService"));
+                return yield __await(Promise.reject(new Error("Model ID is required for AwsBedrockAnthropicService")));
             }
-            const body = JSON.stringify({
-                anthropic_version: "bedrock-2023-05-31",
-                max_tokens,
+            const body = JSON.stringify(Object.assign({ anthropic_version: "bedrock-2023-05-31", max_tokens,
                 temperature,
-                messages,
-                system: systemPrompt,
-            });
+                messages, system: systemPrompt }, (tools.length ? { tools } : {})));
             const command = new client_bedrock_runtime_1.InvokeModelWithResponseStreamCommand({
                 modelId: model,
                 body,

package/dist/services/AwsBedrockAnthropicService.js.map

@@ -1 +1 @@
-{"version":3,"file":"AwsBedrockAnthropicService.js","sourceRoot":"","sources":["../../src/services/AwsBedrockAnthropicService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAIyC;AAQzC,MAAqB,0BAA0B;IAG7C,YAAY,YAAoB,EAAE,YAAoB,EAAE,MAAc;QACpE,IAAI,CAAC,OAAO,GAAG,IAAI,6CAAoB,CAAC;YACtC,MAAM;YACN,WAAW,EAAE;gBACX,WAAW,EAAE,YAAY;gBACzB,eAAe,EAAE,YAAY;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;IAEK,kBAAkB,CAAC,MAMxB;;YACC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;YAE1E,IAAI,CAAC,KAAK,EAAE;gBACV,OAAO,OAAO,CAAC,MAAM,CACnB,qDAAqD,CACtD,CAAC;aACH;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC1B,iBAAiB,EAAE,oBAAoB;gBACvC,UAAU;gBACV,WAAW;gBACX,QAAQ;gBACR,MAAM,EAAE,YAAY;aACrB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,2CAAkB,CAAC;gBACrC,OAAO,EAAE,KAAK;gBACd,IAAI;gBACJ,WAAW,EAAE,kBAAkB;gBAC/B,MAAM,EAAE,kBAAkB;aAC3B,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,CAAC;KAAA;IAEM,wBAAwB,CAAC,MAM/B;;;;YACC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;YAE1E,IAAI,CAAC,KAAK,EAAE;gBACV,qBAAO,OAAO,CAAC,MAAM,CACnB,qDAAqD,CACtD,EAAC;aACH;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC1B,iBAAiB,EAAE,oBAAoB;gBACvC,UAAU;gBACV,WAAW;gBACX,QAAQ;gBACR,MAAM,EAAE,YAAY;aACrB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,6DAAoC,CAAC;gBACvD,OAAO,EAAE,KAAK;gBACd,IAAI;gBACJ,WAAW,EAAE,kBAAkB;gBAC/B,MAAM,EAAE,kBAAkB;aAC3B,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,cAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC;YAElD,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACjB,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;;oBAEzC,KAA4B,eAAA,KAAA,cAAA,QAAQ,CAAC,IAAI,CAAA,IAAA;wBAAb,cAAa;wBAAb,WAAa;;4BAA9B,MAAM,OAAO,KAAA,CAAA;4BACtB,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAA,OAAO,CAAC,KAAK,0CAAE,KAAK,EAAE;gCACzD,MAAM,EAAE,IAAI;6BACb,CAAC,CAAC;4BAEH,IAAI;gCACF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gCAC7C,oBAAM,UAAU,CAAA,CAAC;6BAClB;4BAAC,OAAO,KAAK,EAAE;gCACd,qBAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC;6BAC9B;;;;;qBACF;;;;;;;;;aACF;;KACF;CACF;AAhGD,6CAgGC"}
+{"version":3,"file":"AwsBedrockAnthropicService.js","sourceRoot":"","sources":["../../src/services/AwsBedrockAnthropicService.ts"],"names":[],"mappings":"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"}

package/dist/services/ClientService.d.ts

@@ -1,19 +1,19 @@
 import { BedrockAnthropicParsedChunk, LLMResponse, Messages } from "../types";
 export interface ClientService {
-    generateCompletion({ messages, model, max_tokens, temperature, functions, systemPrompt, }: {
+    generateCompletion({ messages, model, max_tokens, temperature, tools, systemPrompt, }: {
         messages: Messages;
         model?: string;
         max_tokens?: number;
         temperature?: number;
-        functions?: any;
+        tools?: any;
         systemPrompt?: string;
     }): Promise<LLMResponse>;
-    generateStreamCompletion({ messages, model, max_tokens, temperature, functions, systemPrompt, }: {
+    generateStreamCompletion({ messages, model, max_tokens, temperature, tools, systemPrompt, }: {
         messages: Messages;
         model?: string;
         max_tokens?: number;
         temperature?: number;
-        functions?: any;
+        tools?: any;
         systemPrompt?: string;
     }): AsyncGenerator<BedrockAnthropicParsedChunk, void, unknown>;
 }

package/dist/services/ClientService.js

@@ -1,9 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//  functions: [
-//   {
-//     name: "function1",
-//     description: "Description of function1",
-//     parameters: {/* JSON schema for function1 */}
-//   },
 //# sourceMappingURL=ClientService.js.map

package/dist/services/ClientService.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClientService.js","sourceRoot":"","sources":["../../src/services/ClientService.ts"],"names":[],"mappings":";;AAoCA,gBAAgB;AAChB,MAAM;AACN,yBAAyB;AACzB,+CAA+C;AAC/C,oDAAoD;AACpD,OAAO"}
+{"version":3,"file":"ClientService.js","sourceRoot":"","sources":["../../src/services/ClientService.ts"],"names":[],"mappings":""}

package/dist/services/OpenAIService.d.ts

@@ -3,20 +3,20 @@ import { ClientService } from "./ClientService";
 export default class OpenAIService implements ClientService {
     private openai;
     constructor(apiKey: string);
-    generateCompletion({ messages, model, max_tokens, temperature, functions, }: {
+    generateCompletion({ messages, model, max_tokens, temperature, tools, }: {
         messages: OpenAIMessages;
         model: string;
         max_tokens: number;
         temperature: number;
         systemPrompt?: string;
-        functions?: any;
+        tools?: any;
     }): Promise<OpenAIResponse>;
-    generateStreamCompletion({ messages, model, max_tokens, temperature, functions, }: {
+    generateStreamCompletion({ messages, model, max_tokens, temperature, tools, }: {
         messages: OpenAIMessages;
         model: string;
         max_tokens: number;
         temperature: number;
         systemPrompt?: string;
-        functions?: any;
+        tools?: any;
     }): AsyncGenerator<any, void, unknown>;
 }

package/dist/services/OpenAIService.js

@@ -36,10 +36,10 @@ class OpenAIService {
     constructor(apiKey) {
         this.openai = new openai_1.default({ apiKey });
     }
-    generateCompletion({ messages, model, max_tokens, temperature, functions, }) {
+    generateCompletion({ messages, model, max_tokens, temperature, tools, }) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!model) {
-                return Promise.reject("Model ID is required for OpenAIService.");
+                return Promise.reject(new Error("Model ID is required for OpenAIService."));
             }
             try {
                 const response = yield this.openai.chat.completions.create({
@@ -47,7 +47,7 @@ class OpenAIService {
                     messages,
                     max_tokens,
                     temperature,
-                    functions,
+                    functions: tools,
                 });
                 return response;
             }
@@ -56,11 +56,12 @@ class OpenAIService {
             }
         });
     }
-    generateStreamCompletion({ messages, model, max_tokens, temperature, functions, }) {
+    // eslint-disable-next-line consistent-return
+    generateStreamCompletion({ messages, model, max_tokens, temperature, tools, }) {
         return __asyncGenerator(this, arguments, function* generateStreamCompletion_1() {
             var _a, e_1, _b, _c;
             if (!model) {
-                return yield __await(Promise.reject("Model ID is required for OpenAIService."));
+                return yield __await(Promise.reject(new Error("Model ID is required for OpenAIService.")));
             }
             try {
                 const stream = yield __await(this.openai.chat.completions.create({
@@ -68,7 +69,7 @@ class OpenAIService {
                     messages,
                     max_tokens,
                     temperature,
-                    functions,
+                    functions: tools,
                     stream: true,
                     stream_options: {
                         include_usage: true,

package/dist/services/OpenAIService.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenAIService.js","sourceRoot":"","sources":["../../src/services/OpenAIService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAI5B,MAAqB,aAAa;IAGhC,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;IAEK,kBAAkB,CAAC,EACvB,QAAQ,EACR,KAAK,EACL,UAAU,EACV,WAAW,EACX,SAAS,GAQV;;YACC,IAAI,CAAC,KAAK,EAAE;gBACV,OAAO,OAAO,CAAC,MAAM,CAAC,yCAAyC,CAAC,CAAC;aAClE;YAED,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;oBACzD,KAAK;oBACL,QAAQ;oBACR,UAAU;oBACV,WAAW;oBACX,SAAS;iBACV,CAAC,CAAC;gBACH,OAAO,QAA0B,CAAC;aACnC;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC9B;QACH,CAAC;KAAA;IAEM,wBAAwB,CAAC,EAC9B,QAAQ,EACR,KAAK,EACL,UAAU,EACV,WAAW,EACX,SAAS,GAQV;;;YACC,IAAI,CAAC,KAAK,EAAE;gBACV,qBAAO,OAAO,CAAC,MAAM,CAAC,yCAAyC,CAAC,EAAC;aAClE;YAED,IAAI;gBACF,MAAM,MAAM,GAAG,cAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;oBACvD,KAAK;oBACL,QAAQ;oBACR,UAAU;oBACV,WAAW;oBACX,SAAS;oBACT,MAAM,EAAE,IAAI;oBACZ,cAAc,EAAE;wBACd,aAAa,EAAE,IAAI;qBACpB;iBACF,CAAC,CAAA,CAAC;;oBAEH,KAA0B,eAAA,WAAA,cAAA,MAAM,CAAA,YAAA;wBAAN,sBAAM;wBAAN,WAAM;;4BAArB,MAAM,KAAK,KAAA,CAAA;4BACpB,oBAAM,KAAK,CAAA,CAAC;;;;;qBACb;;;;;;;;;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,qBAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC;aAC9B;QACH,CAAC;KAAA;CACF;AA7ED,gCA6EC"}
+{"version":3,"file":"OpenAIService.js","sourceRoot":"","sources":["../../src/services/OpenAIService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAI5B,MAAqB,aAAa;IAGhC,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;IAEK,kBAAkB,CAAC,EACvB,QAAQ,EACR,KAAK,EACL,UAAU,EACV,WAAW,EACX,KAAK,GASN;;YACC,IAAI,CAAC,KAAK,EAAE;gBACV,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CAAC,yCAAyC,CAAC,CACrD,CAAC;aACH;YAED,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;oBACzD,KAAK;oBACL,QAAQ;oBACR,UAAU;oBACV,WAAW;oBACX,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC;gBACH,OAAO,QAA0B,CAAC;aACnC;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC9B;QACH,CAAC;KAAA;IAED,6CAA6C;IACtC,wBAAwB,CAAC,EAC9B,QAAQ,EACR,KAAK,EACL,UAAU,EACV,WAAW,EACX,KAAK,GAUN;;;YACC,IAAI,CAAC,KAAK,EAAE;gBACV,qBAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CAAC,yCAAyC,CAAC,CACrD,EAAC;aACH;YAED,IAAI;gBACF,MAAM,MAAM,GAAG,cAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;oBACvD,KAAK;oBACL,QAAQ;oBACR,UAAU;oBACV,WAAW;oBACX,SAAS,EAAE,KAAK;oBAChB,MAAM,EAAE,IAAI;oBACZ,cAAc,EAAE;wBACd,aAAa,EAAE,IAAI;qBACpB;iBACF,CAAC,CAAA,CAAC;;oBAEH,KAA0B,eAAA,WAAA,cAAA,MAAM,CAAA,YAAA;wBAAN,sBAAM;wBAAN,WAAM;;4BAArB,MAAM,KAAK,KAAA,CAAA;4BACpB,oBAAM,KAAK,CAAA,CAAC;;;;;qBACb;;;;;;;;;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,qBAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC;aAC9B;QACH,CAAC;KAAA;CACF;AArFD,gCAqFC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-proxy",
-  "version": "1.3.13",
+  "version": "1.4.14",
   "description": "An LLM Proxy that allows the user to interact with different language models from different providers using unified request and response formats.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
     "aws-sdk": "^2.1691.0",
     "axios": "^1.7.7",
     "dotenv": "^16.4.5",
-    "llm-proxy": "^1.3.13",
+    "llm-proxy": "^1.4.14",
     "openai": "^4.69.0"
   }
 }