@node-llm/core 1.5.1 → 1.5.2

package/dist/chat/ChatStream.js

@@ -1,7 +1,12 @@
+import { isBinaryContent, formatMultimodalContent } from "./Content.js";
 import { ChatResponseString } from "./ChatResponse.js";
 import { Stream } from "../streaming/Stream.js";
 import { config } from "../config.js";
 import { ToolExecutionMode } from "../constants.js";
+import { FileLoader } from "../utils/FileLoader.js";
+import { toJsonSchema } from "../schema/to-json-schema.js";
+import { ChatValidator } from "./Validation.js";
+import { ToolHandler } from "./ToolHandler.js";
 /**
  * Internal handler for chat streaming logic.
  * Wraps the provider's stream with side effects like history updates and events.
@@ -18,7 +23,6 @@ export class ChatStream {
         this.options = options;
         this.messages = messages ?? [];
         this.systemMessages = systemMessages ?? [];
-        // Only initialize if we're starting a new history
         if (this.messages.length === 0 && this.systemMessages.length === 0) {
             if (options.systemPrompt) {
                 this.systemMessages.push({
@@ -41,39 +45,74 @@ export class ChatStream {
             this.options.toolExecution = config.toolExecution || ToolExecutionMode.AUTO;
         }
     }
-    /**
-     * Read-only access to message history
-     */
     get history() {
         return [...this.systemMessages, ...this.messages];
     }
-    /**
-     * Creates a high-level Stream object for the chat response.
-     * @param content The user's question.
-     */
-    create(content) {
+    create(content, options = {}) {
         const controller = new AbortController();
-        // We create a wrapper async generator that handles our side effects
-        const sideEffectGenerator = async function* (self, provider, model, messages, systemMessages, options, abortController) {
-            messages.push({ role: "user", content });
+        const sideEffectGenerator = async function* (self, provider, model, messages, systemMessages, baseOptions, abortController, content, requestOptions) {
+            const options = {
+                ...baseOptions,
+                ...requestOptions,
+                headers: { ...baseOptions.headers, ...requestOptions.headers }
+            };
+            // Process Multimodal Content
+            let messageContent = content;
+            const files = [...(requestOptions.images ?? []), ...(requestOptions.files ?? [])];
+            if (files.length > 0) {
+                const processedFiles = await Promise.all(files.map((f) => FileLoader.load(f)));
+                const hasBinary = processedFiles.some(isBinaryContent);
+                ChatValidator.validateVision(provider, model, hasBinary, options);
+                messageContent = formatMultimodalContent(content, processedFiles);
+            }
+            if (options.tools && options.tools.length > 0) {
+                ChatValidator.validateTools(provider, model, true, options);
+            }
+            messages.push({ role: "user", content: messageContent });
+            if (!provider.stream) {
+                throw new Error("Streaming not supported by provider");
+            }
+            // Process Schema/Structured Output
+            let responseFormat = options.responseFormat;
+            if (!responseFormat && options.schema) {
+                ChatValidator.validateStructuredOutput(provider, model, true, options);
+                const jsonSchema = toJsonSchema(options.schema.definition.schema);
+                responseFormat = {
+                    type: "json_schema",
+                    json_schema: {
+                        name: options.schema.definition.name,
+                        description: options.schema.definition.description,
+                        strict: options.schema.definition.strict ?? true,
+                        schema: jsonSchema,
+                    }
+                };
+            }
             if (!provider.stream) {
                 throw new Error("Streaming not supported by provider");
             }
-            let fullContent = "";
-            let fullReasoning = "";
-            let toolCalls;
             let isFirst = true;
             const maxToolCalls = options.maxToolCalls ?? 5;
             let stepCount = 0;
-            // Main streaming loop - may iterate multiple times for tool calls
+            let totalUsage = { input_tokens: 0, output_tokens: 0, total_tokens: 0 };
+            const trackUsage = (u) => {
+                if (u) {
+                    totalUsage.input_tokens += u.input_tokens;
+                    totalUsage.output_tokens += u.output_tokens;
+                    totalUsage.total_tokens += u.total_tokens;
+                    if (u.cached_tokens) {
+                        totalUsage.cached_tokens = (totalUsage.cached_tokens ?? 0) + u.cached_tokens;
+                    }
+                }
+            };
             while (true) {
                 stepCount++;
                 if (stepCount > maxToolCalls) {
                     throw new Error(`[NodeLLM] Maximum tool execution calls (${maxToolCalls}) exceeded during streaming.`);
                 }
-                fullContent = "";
-                fullReasoning = "";
-                toolCalls = undefined;
+                let fullContent = "";
+                let fullReasoning = "";
+                let toolCalls;
+                let currentTurnUsage;
                 try {
                     let requestMessages = [...systemMessages, ...messages];
                     if (options.onBeforeRequest) {
@@ -88,8 +127,11 @@ export class ChatStream {
                         tools: options.tools,
                         temperature: options.temperature,
                         max_tokens: options.maxTokens ?? config.maxTokens,
+                        response_format: responseFormat,
+                        headers: options.headers,
                         requestTimeout: options.requestTimeout ?? config.requestTimeout,
                         signal: abortController.signal,
+                        ...options.params,
                     })) {
                         if (isFirst) {
                             if (options.onNewMessage)
@@ -104,43 +146,40 @@ export class ChatStream {
                             fullReasoning += chunk.reasoning;
                             yield { content: "", reasoning: chunk.reasoning };
                         }
-                        // Accumulate tool calls from the final chunk
                         if (chunk.tool_calls) {
                             toolCalls = chunk.tool_calls;
                         }
+                        if (chunk.usage) {
+                            currentTurnUsage = chunk.usage;
+                            trackUsage(currentTurnUsage);
+                        }
                     }
-                    // Build the response object for hooks and history
-                    let assistantResponse = new ChatResponseString(fullContent || "", { input_tokens: 0, output_tokens: 0, total_tokens: 0 }, model, provider.id, fullReasoning || undefined);
-                    // --- Content Policy Hooks (Output) ---
+                    let assistantResponse = new ChatResponseString(fullContent || "", currentTurnUsage || { input_tokens: 0, output_tokens: 0, total_tokens: 0 }, model, provider.id, fullReasoning || undefined);
                     if (options.onAfterResponse) {
                         const result = await options.onAfterResponse(assistantResponse);
                         if (result) {
                             assistantResponse = result;
                         }
                     }
-                    // Add assistant message to history (now potentially redacted)
                     messages.push({
                         role: "assistant",
                         content: assistantResponse || null,
                         tool_calls: toolCalls,
-                        reasoning: fullReasoning || undefined
+                        reasoning: fullReasoning || undefined,
+                        usage: currentTurnUsage
                     });
-                    // If no tool calls, we're done
                     if (!toolCalls || toolCalls.length === 0) {
                         if (options.onEndMessage) {
                             options.onEndMessage(assistantResponse);
                         }
                         break;
                     }
-                    // Dry-run mode: stop after proposing tools
-                    if (!self.shouldExecuteTools(toolCalls, options.toolExecution)) {
+                    if (!ToolHandler.shouldExecuteTools(toolCalls, options.toolExecution)) {
                         break;
                     }
-                    // Execute tool calls
                     for (const toolCall of toolCalls) {
-                        // Confirm mode: request approval
                         if (options.toolExecution === ToolExecutionMode.CONFIRM) {
-                            const approved = await self.requestToolConfirmation(toolCall, options.onConfirmToolCall);
+                            const approved = await ToolHandler.requestToolConfirmation(toolCall, options.onConfirmToolCall);
                             if (!approved) {
                                 messages.push({
                                     role: "tool",
@@ -150,80 +189,39 @@ export class ChatStream {
                                 continue;
                             }
                         }
-                        // Execute the tool
-                        const toolResult = await self.executeToolCall(toolCall, options.tools, options.onToolCallStart, options.onToolCallEnd, options.onToolCallError);
-                        messages.push(toolResult);
+                        try {
+                            const toolResult = await ToolHandler.execute(toolCall, options.tools, options.onToolCallStart, options.onToolCallEnd);
+                            messages.push(toolResult);
+                        }
+                        catch (error) {
+                            const directive = await options.onToolCallError?.(toolCall, error);
+                            if (directive === 'STOP') {
+                                throw error;
+                            }
+                            messages.push({
+                                role: "tool",
+                                tool_call_id: toolCall.id,
+                                content: `Fatal error executing tool '${toolCall.function.name}': ${error.message}`,
+                            });
+                            if (directive === 'CONTINUE') {
+                                continue;
+                            }
+                            const isFatal = error.fatal === true || error.status === 401 || error.status === 403;
+                            if (isFatal) {
+                                throw error;
+                            }
+                            console.error(`[NodeLLM] Tool execution failed for '${toolCall.function.name}':`, error);
+                        }
                     }
-                    // Continue loop to stream the next response after tool execution
                 }
                 catch (error) {
                     if (error instanceof Error && error.name === 'AbortError') {
-                        // Stream was aborted
+                        // Aborted
                     }
                     throw error;
                 }
             }
         };
-        return new Stream(() => sideEffectGenerator(this, this.provider, this.model, this.messages, this.systemMessages, this.options, controller), controller);
-    }
-    /**
-     * Check if tool execution should proceed based on the current mode.
-     */
-    shouldExecuteTools(toolCalls, mode) {
-        if (!toolCalls || toolCalls.length === 0)
-            return false;
-        if (mode === ToolExecutionMode.DRY_RUN)
-            return false;
-        return true;
-    }
-    /**
-     * Request user confirmation for a tool call in "confirm" mode.
-     * Returns true if approved, false if rejected.
-     */
-    async requestToolConfirmation(toolCall, onConfirm) {
-        if (!onConfirm)
-            return true;
-        const confirmed = await onConfirm(toolCall);
-        return confirmed !== false;
-    }
-    /**
-     * Execute a single tool call and return the result message.
-     */
-    async executeToolCall(toolCall, tools, onStart, onEnd, onError) {
-        if (onStart)
-            onStart(toolCall);
-        const tool = tools?.find((t) => t.function.name === toolCall.function.name);
-        if (tool?.handler) {
-            try {
-                const args = JSON.parse(toolCall.function.arguments);
-                const result = await tool.handler(args);
-                if (onEnd)
-                    onEnd(toolCall, result);
-                return {
-                    role: "tool",
-                    tool_call_id: toolCall.id,
-                    content: result,
-                };
-            }
-            catch (error) {
-                if (onError)
-                    onError(toolCall, error);
-                return {
-                    role: "tool",
-                    tool_call_id: toolCall.id,
-                    content: `Error executing tool: ${error.message}`,
-                };
-            }
-        }
-        else {
-            const error = new Error("Tool not found or no handler provided");
-            if (onError)
-                onError(toolCall, error);
-            return {
-                role: "tool",
-                tool_call_id: toolCall.id,
-                content: "Error: Tool not found or no handler provided",
-            };
-        }
+        return new Stream(() => sideEffectGenerator(this, this.provider, this.model, this.messages, this.systemMessages, this.options, controller, content, options), controller);
     }
 }

package/dist/chat/Content.d.ts

@@ -18,5 +18,15 @@ export type ContentPart = {
         url: string;
     };
 };
+export declare const isBinaryContent: (part: ContentPart) => boolean;
+export declare const isTextContent: (part: ContentPart) => boolean;
+export declare const partitionContentParts: (parts: ContentPart[]) => {
+    textParts: ({
+        type: "text";
+        text: string;
+    })[];
+    binaryParts: ContentPart[];
+};
+export declare const formatMultimodalContent: (content: string | ContentPart[], parts: ContentPart[]) => MessageContent;
 export type MessageContent = string | String | ContentPart[];
 //# sourceMappingURL=Content.d.ts.map

package/dist/chat/Content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Content.d.ts","sourceRoot":"","sources":["../../src/chat/Content.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACtE;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,EAAE,CAAC"}
+{"version":3,"file":"Content.d.ts","sourceRoot":"","sources":["../../src/chat/Content.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACtE;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAEtD,eAAO,MAAM,eAAe,GAAI,MAAM,WAAW,KAAG,OACmC,CAAC;AAExF,eAAO,MAAM,aAAa,GAAI,MAAM,WAAW,KAAG,OAC5B,CAAC;AAEvB,eAAO,MAAM,qBAAqB,GAAI,OAAO,WAAW,EAAE;eAEZ,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;;CAG/E,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,SAAS,MAAM,GAAG,WAAW,EAAE,EAAE,OAAO,WAAW,EAAE,KAAG,cA2B/F,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,EAAE,CAAC"}

package/dist/chat/Content.js

@@ -1 +1,34 @@
-export {};
+export const isBinaryContent = (part) => part.type === "image_url" || part.type === "input_audio" || part.type === "video_url";
+export const isTextContent = (part) => part.type === "text";
+export const partitionContentParts = (parts) => {
+    return {
+        textParts: parts.filter(isTextContent),
+        binaryParts: parts.filter(isBinaryContent)
+    };
+};
+export const formatMultimodalContent = (content, parts) => {
+    const { textParts, binaryParts } = partitionContentParts(parts);
+    let fullText = typeof content === "string" ? content : "";
+    let currentParts = typeof content === "string" ? [] : content;
+    if (textParts.length > 0) {
+        const additionalText = textParts.map(f => f.text).join("\n");
+        if (typeof content === "string") {
+            fullText += "\n" + additionalText;
+        }
+        else {
+            currentParts.push({ type: "text", text: additionalText });
+        }
+    }
+    if (binaryParts.length > 0) {
+        if (typeof content === "string") {
+            return [
+                { type: "text", text: fullText },
+                ...binaryParts
+            ];
+        }
+        else {
+            return [...currentParts, ...binaryParts];
+        }
+    }
+    return typeof content === "string" ? fullText : currentParts;
+};

package/dist/chat/Tool.d.ts

@@ -16,6 +16,12 @@ export interface ToolDefinition {
     };
     handler?: (args: any) => Promise<string>;
 }
+/**
+ * Anything that can be resolved into a ToolDefinition.
+ */
+export type ToolResolvable = Tool | {
+    new (): Tool;
+} | ToolDefinition | any;
 /**
  * Subclass this to create tools with auto-generated schemas and type safety.
  */

package/dist/chat/Tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tool.d.ts","sourceRoot":"","sources":["../../src/chat/Tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACjC,CAAC;IACF,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,8BAAsB,IAAI,CAAC,CAAC,GAAG,GAAG;IAChC;;OAEG;IACH,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAgB,WAAW,EAAE,MAAM,CAAC;IAEpC;;;OAGG;IACH,SAAgB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/D;;;OAGG;aACa,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAE9C;;;OAGG;IACU,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAM9C;;;OAGG;IACI,SAAS,IAAI,cAAc;CAoBnC"}
+{"version":3,"file":"Tool.d.ts","sourceRoot":"","sources":["../../src/chat/Tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACjC,CAAC;IACF,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,IAAI,GAAG;IAAE,QAAO,IAAI,CAAA;CAAE,GAAG,cAAc,GAAG,GAAG,CAAC;AAE3E;;GAEG;AACH,8BAAsB,IAAI,CAAC,CAAC,GAAG,GAAG;IAChC;;OAEG;IACH,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,SAAgB,WAAW,EAAE,MAAM,CAAC;IAEpC;;;OAGG;IACH,SAAgB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/D;;;OAGG;aACa,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAE9C;;;OAGG;IACU,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAM9C;;;OAGG;IACI,SAAS,IAAI,cAAc;CAoBnC"}

package/dist/chat/ToolHandler.d.ts

@@ -0,0 +1,11 @@
+import { ToolExecutionMode } from "../constants.js";
+export declare class ToolHandler {
+    static shouldExecuteTools(toolCalls: any[] | undefined, mode?: ToolExecutionMode): boolean;
+    static requestToolConfirmation(toolCall: any, onConfirm?: (call: any) => Promise<boolean> | boolean): Promise<boolean>;
+    static execute(toolCall: any, tools: any[] | undefined, onStart?: (call: any) => void, onEnd?: (call: any, result: any) => void): Promise<{
+        role: "tool";
+        tool_call_id: string;
+        content: string;
+    }>;
+}
+//# sourceMappingURL=ToolHandler.d.ts.map

package/dist/chat/ToolHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolHandler.d.ts","sourceRoot":"","sources":["../../src/chat/ToolHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,qBAAa,WAAW;IACtB,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,SAAS,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO;WAM7E,uBAAuB,CAClC,QAAQ,EAAE,GAAG,EACb,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,GACpD,OAAO,CAAC,OAAO,CAAC;WAMN,OAAO,CAClB,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,GAAG,EAAE,GAAG,SAAS,EACxB,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,EAC7B,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,GACvC,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAwBpE"}

package/dist/chat/ToolHandler.js

@@ -0,0 +1,41 @@
+import { ToolExecutionMode } from "../constants.js";
+import { ToolError } from "../errors/index.js";
+export class ToolHandler {
+    static shouldExecuteTools(toolCalls, mode) {
+        if (!toolCalls || toolCalls.length === 0)
+            return false;
+        if (mode === ToolExecutionMode.DRY_RUN)
+            return false;
+        return true;
+    }
+    static async requestToolConfirmation(toolCall, onConfirm) {
+        if (!onConfirm)
+            return true;
+        const confirmed = await onConfirm(toolCall);
+        return confirmed !== false;
+    }
+    static async execute(toolCall, tools, onStart, onEnd) {
+        if (onStart)
+            onStart(toolCall);
+        const tool = tools?.find((t) => t.function.name === toolCall.function.name);
+        if (tool?.handler) {
+            try {
+                const args = JSON.parse(toolCall.function.arguments);
+                const result = await tool.handler(args);
+                if (onEnd)
+                    onEnd(toolCall, result);
+                return {
+                    role: "tool",
+                    tool_call_id: toolCall.id,
+                    content: result,
+                };
+            }
+            catch (error) {
+                throw error;
+            }
+        }
+        else {
+            throw new ToolError("Tool not found or no handler provided", toolCall.function?.name ?? "unknown");
+        }
+    }
+}

package/dist/chat/Validation.d.ts

@@ -0,0 +1,10 @@
+import { Provider } from "../providers/Provider.js";
+export interface ValidationOptions {
+    assumeModelExists?: boolean;
+}
+export declare class ChatValidator {
+    static validateVision(provider: Provider, model: string, hasBinary: boolean, options: ValidationOptions): void;
+    static validateTools(provider: Provider, model: string, hasTools: boolean, options: ValidationOptions): void;
+    static validateStructuredOutput(provider: Provider, model: string, hasSchema: boolean, options: ValidationOptions): void;
+}
+//# sourceMappingURL=Validation.d.ts.map

package/dist/chat/Validation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Validation.d.ts","sourceRoot":"","sources":["../../src/chat/Validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB;IAYvG,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB;IAYrG,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB;CAWlH"}

package/dist/chat/Validation.js

@@ -0,0 +1,32 @@
+export class ChatValidator {
+    static validateVision(provider, model, hasBinary, options) {
+        if (!hasBinary)
+            return;
+        if (!options.assumeModelExists && provider.capabilities && !provider.capabilities.supportsVision(model)) {
+            throw new Error(`Model ${model} does not support vision/binary files.`);
+        }
+        if (options.assumeModelExists) {
+            console.warn(`[NodeLLM] Skipping vision capability validation for model ${model}`);
+        }
+    }
+    static validateTools(provider, model, hasTools, options) {
+        if (!hasTools)
+            return;
+        if (!options.assumeModelExists && provider.capabilities && !provider.capabilities.supportsTools(model)) {
+            throw new Error(`Model ${model} does not support tool calling.`);
+        }
+        if (options.assumeModelExists) {
+            console.warn(`[NodeLLM] Skipping tool capability validation for model ${model}`);
+        }
+    }
+    static validateStructuredOutput(provider, model, hasSchema, options) {
+        if (!hasSchema)
+            return;
+        if (!options.assumeModelExists && provider.capabilities && !provider.capabilities.supportsStructuredOutput(model)) {
+            throw new Error(`Model ${model} does not support structured output.`);
+        }
+        if (options.assumeModelExists) {
+            console.warn(`[NodeLLM] Skipping structured output capability validation for model ${model}`);
+        }
+    }
+}

package/dist/config.d.ts

@@ -22,25 +22,54 @@ export interface NodeLLMConfig {
     toolExecution?: ToolExecutionMode;
 }
 import { ToolExecutionMode } from "./constants.js";
-declare class Configuration implements NodeLLMConfig {
-    openaiApiKey?: string;
-    openaiApiBase?: string;
-    anthropicApiKey?: string;
-    anthropicApiBase?: string;
-    geminiApiKey?: string;
-    geminiApiBase?: string;
-    deepseekApiKey?: string;
-    deepseekApiBase?: string;
-    ollamaApiBase?: string;
-    openrouterApiKey?: string;
-    openrouterApiBase?: string;
-    debug?: boolean;
+export declare class Configuration implements NodeLLMConfig {
+    private _openaiApiKey?;
+    private _openaiApiBase?;
+    private _anthropicApiKey?;
+    private _anthropicApiBase?;
+    private _geminiApiKey?;
+    private _geminiApiBase?;
+    private _deepseekApiKey?;
+    private _deepseekApiBase?;
+    private _ollamaApiBase?;
+    private _openrouterApiKey?;
+    private _openrouterApiBase?;
+    private _debug?;
+    get openaiApiKey(): string | undefined;
+    set openaiApiKey(v: string | undefined);
+    get openaiApiBase(): string | undefined;
+    set openaiApiBase(v: string | undefined);
+    get anthropicApiKey(): string | undefined;
+    set anthropicApiKey(v: string | undefined);
+    get anthropicApiBase(): string | undefined;
+    set anthropicApiBase(v: string | undefined);
+    get geminiApiKey(): string | undefined;
+    set geminiApiKey(v: string | undefined);
+    get geminiApiBase(): string | undefined;
+    set geminiApiBase(v: string | undefined);
+    get deepseekApiKey(): string | undefined;
+    set deepseekApiKey(v: string | undefined);
+    get deepseekApiBase(): string | undefined;
+    set deepseekApiBase(v: string | undefined);
+    get ollamaApiBase(): string | undefined;
+    set ollamaApiBase(v: string | undefined);
+    get openrouterApiKey(): string | undefined;
+    set openrouterApiKey(v: string | undefined);
+    get openrouterApiBase(): string | undefined;
+    set openrouterApiBase(v: string | undefined);
+    get debug(): boolean | undefined;
+    set debug(v: boolean | undefined);
     maxToolCalls: number;
     maxRetries: number;
     requestTimeout: number;
     maxTokens: number;
     toolExecution: ToolExecutionMode;
+    /**
+     * Returns a plain object with all configuration values.
+     * This is useful for cloning or serialization.
+     * It handles getters (lazy-loaded values) correctly.
+     */
+    toPlainObject(): NodeLLMConfig;
 }
 export declare const config: Configuration;
-export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,iBAAiB,CAAC;CACnC;AAED,OAAO,EAOL,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AAExB,cAAM,aAAc,YAAW,aAAa;IACnC,YAAY,CAAC,EAAE,MAAM,CAAsC;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAuC;IAC7D,eAAe,CAAC,EAAE,MAAM,CAAyC;IACjE,gBAAgB,CAAC,EAAE,MAAM,CAA0C;IACnE,YAAY,CAAC,EAAE,MAAM,CAAsC;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAuC;IAC7D,cAAc,CAAC,EAAE,MAAM,CAAwC;IAC/D,eAAe,CAAC,EAAE,MAAM,CAAyC;IACjE,aAAa,CAAC,EAAE,MAAM,CAAkE;IACxF,gBAAgB,CAAC,EAAE,MAAM,CAA0C;IACnE,iBAAiB,CAAC,EAAE,MAAM,CAA2C;IACrE,KAAK,CAAC,EAAE,OAAO,CAAwC;IACvD,YAAY,EAAE,MAAM,CAA0B;IAC9C,UAAU,EAAE,MAAM,CAAuB;IACzC,cAAc,EAAE,MAAM,CAA2B;IACjD,SAAS,EAAE,MAAM,CAAsB;IACvC,aAAa,EAAE,iBAAiB,CAA0B;CAClE;AAED,eAAO,MAAM,MAAM,eAAsB,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/config.js

@@ -1,21 +1,66 @@
 import { DEFAULT_MAX_TOOL_CALLS, DEFAULT_MAX_RETRIES, DEFAULT_REQUEST_TIMEOUT, DEFAULT_MAX_TOKENS, DEFAULT_TOOL_EXECUTION, DEFAULT_OLLAMA_BASE_URL } from "./constants.js";
-class Configuration {
-    openaiApiKey = process.env.OPENAI_API_KEY?.trim();
-    openaiApiBase = process.env.OPENAI_API_BASE?.trim();
-    anthropicApiKey = process.env.ANTHROPIC_API_KEY?.trim();
-    anthropicApiBase = process.env.ANTHROPIC_API_BASE?.trim();
-    geminiApiKey = process.env.GEMINI_API_KEY?.trim();
-    geminiApiBase = process.env.GEMINI_API_BASE?.trim();
-    deepseekApiKey = process.env.DEEPSEEK_API_KEY?.trim();
-    deepseekApiBase = process.env.DEEPSEEK_API_BASE?.trim();
-    ollamaApiBase = process.env.OLLAMA_API_BASE?.trim() || DEFAULT_OLLAMA_BASE_URL;
-    openrouterApiKey = process.env.OPENROUTER_API_KEY?.trim();
-    openrouterApiBase = process.env.OPENROUTER_API_BASE?.trim();
-    debug = process.env.NODELLM_DEBUG === "true";
+export class Configuration {
+    _openaiApiKey;
+    _openaiApiBase;
+    _anthropicApiKey;
+    _anthropicApiBase;
+    _geminiApiKey;
+    _geminiApiBase;
+    _deepseekApiKey;
+    _deepseekApiBase;
+    _ollamaApiBase;
+    _openrouterApiKey;
+    _openrouterApiBase;
+    _debug;
+    get openaiApiKey() { return this._openaiApiKey ?? process.env.OPENAI_API_KEY?.trim(); }
+    set openaiApiKey(v) { this._openaiApiKey = v; }
+    get openaiApiBase() { return this._openaiApiBase ?? process.env.OPENAI_API_BASE?.trim(); }
+    set openaiApiBase(v) { this._openaiApiBase = v; }
+    get anthropicApiKey() { return this._anthropicApiKey ?? process.env.ANTHROPIC_API_KEY?.trim(); }
+    set anthropicApiKey(v) { this._anthropicApiKey = v; }
+    get anthropicApiBase() { return this._anthropicApiBase ?? process.env.ANTHROPIC_API_BASE?.trim(); }
+    set anthropicApiBase(v) { this._anthropicApiBase = v; }
+    get geminiApiKey() { return this._geminiApiKey ?? process.env.GEMINI_API_KEY?.trim(); }
+    set geminiApiKey(v) { this._geminiApiKey = v; }
+    get geminiApiBase() { return this._geminiApiBase ?? process.env.GEMINI_API_BASE?.trim(); }
+    set geminiApiBase(v) { this._geminiApiBase = v; }
+    get deepseekApiKey() { return this._deepseekApiKey ?? process.env.DEEPSEEK_API_KEY?.trim(); }
+    set deepseekApiKey(v) { this._deepseekApiKey = v; }
+    get deepseekApiBase() { return this._deepseekApiBase ?? process.env.DEEPSEEK_API_BASE?.trim(); }
+    set deepseekApiBase(v) { this._deepseekApiBase = v; }
+    get ollamaApiBase() { return this._ollamaApiBase ?? process.env.OLLAMA_API_BASE?.trim() ?? DEFAULT_OLLAMA_BASE_URL; }
+    set ollamaApiBase(v) { this._ollamaApiBase = v; }
+    get openrouterApiKey() { return this._openrouterApiKey ?? process.env.OPENROUTER_API_KEY?.trim(); }
+    set openrouterApiKey(v) { this._openrouterApiKey = v; }
+    get openrouterApiBase() { return this._openrouterApiBase ?? process.env.OPENROUTER_API_BASE?.trim(); }
+    set openrouterApiBase(v) { this._openrouterApiBase = v; }
+    get debug() { return this._debug ?? process.env.NODELLM_DEBUG === "true"; }
+    set debug(v) { this._debug = v; }
     maxToolCalls = DEFAULT_MAX_TOOL_CALLS;
     maxRetries = DEFAULT_MAX_RETRIES;
     requestTimeout = DEFAULT_REQUEST_TIMEOUT;
     maxTokens = DEFAULT_MAX_TOKENS;
     toolExecution = DEFAULT_TOOL_EXECUTION;
+    /**
+     * Returns a plain object with all configuration values.
+     * This is useful for cloning or serialization.
+     * It handles getters (lazy-loaded values) correctly.
+     */
+    toPlainObject() {
+        const plain = { ...this }; // Capture all enumerable "own" properties (custom keys, overrides)
+        // Capture all getters from the class prototype (lazy-loaded values)
+        const prototype = Object.getPrototypeOf(this);
+        const propertyNames = Object.getOwnPropertyNames(prototype);
+        for (const name of propertyNames) {
+            if (name === "constructor")
+                continue;
+            const descriptor = Object.getOwnPropertyDescriptor(prototype, name);
+            if (descriptor && descriptor.get) {
+                // Trigger the getter to snapshot the live value (including env fallbacks)
+                plain[name] = this[name];
+            }
+        }
+        return plain;
+    }
 }
 export const config = new Configuration();

package/dist/errors/index.d.ts

@@ -85,4 +85,12 @@ export declare class ModelCapabilityError extends LLMError {
     readonly capability: string;
     constructor(model: string, capability: string);
 }
+/**
+ * Thrown when a tool execution fails
+ */
+export declare class ToolError extends LLMError {
+    readonly toolName?: string | undefined;
+    readonly fatal: boolean;
+    constructor(message: string, toolName?: string | undefined, fatal?: boolean);
+}
 //# sourceMappingURL=index.d.ts.map