llm-fns 1.0.4 → 1.0.6

package/dist/createLlmClient.js

@@ -141,12 +141,17 @@ function getPromptSummary(messages) {
     const fullText = concatMessageText(messages);
     // Replace multiple whitespace chars with a single space and trim.
     const cleanedText = fullText.replace(/\s+/g, ' ').trim();
-    // Truncate to a reasonable length.
-    const maxLength = 150;
-    if (cleanedText.length > maxLength) {
-        return cleanedText.substring(0, maxLength) + '...';
+    if (cleanedText.length <= 50) {
+        return cleanedText;
     }
-    return cleanedText;
+    const partLength = 15;
+    const start = cleanedText.substring(0, partLength);
+    const end = cleanedText.substring(cleanedText.length - partLength);
+    const midIndex = Math.floor(cleanedText.length / 2);
+    const midStart = Math.max(partLength, midIndex - Math.ceil(partLength / 2));
+    const midEnd = Math.min(cleanedText.length - partLength, midStart + partLength);
+    const middle = cleanedText.substring(midStart, midEnd);
+    return `${start}...${middle}...${end}`;
 }
 function normalizeOptions(arg1, arg2) {
     if (typeof arg1 === 'string') {
@@ -229,7 +234,7 @@ function createLlmClient(params) {
                 }
                 return true;
             });
-            const response = (await (queue ? queue.add(task, { id: promptSummary }) : task()));
+            const response = (await (queue ? queue.add(task, { id: promptSummary, messages: finalMessages }) : task()));
             if (cacheInstance && response && cacheKey) {
                 try {
                     await cacheInstance.set(cacheKey, JSON.stringify(response), ttl);

package/dist/createZodLlmClient.d.ts

@@ -25,20 +25,21 @@ export interface CreateZodLlmClientParams {
     disableJsonFixer?: boolean;
 }
 export interface NormalizedZodArgs<T extends ZodTypeAny> {
-    mainInstruction: string;
-    userMessagePayload: string | OpenAI.Chat.Completions.ChatCompletionContentPart[];
+    messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[];
     dataExtractionSchema: T;
     options?: ZodLlmClientOptions;
 }
-export declare function normalizeZodArgs<T extends ZodTypeAny>(arg1: string | T, arg2?: string | OpenAI.Chat.Completions.ChatCompletionContentPart[] | T | ZodLlmClientOptions, arg3?: T | ZodLlmClientOptions, arg4?: ZodLlmClientOptions): NormalizedZodArgs<T>;
+export declare function normalizeZodArgs<T extends ZodTypeAny>(arg1: string | OpenAI.Chat.Completions.ChatCompletionMessageParam[] | T, arg2?: string | OpenAI.Chat.Completions.ChatCompletionContentPart[] | T | ZodLlmClientOptions, arg3?: T | ZodLlmClientOptions, arg4?: ZodLlmClientOptions): NormalizedZodArgs<T>;
 export declare function createZodLlmClient(params: CreateZodLlmClientParams): {
     promptZod: {
         <T extends ZodTypeAny>(schema: T, options?: ZodLlmClientOptions): Promise<z.infer<T>>;
+        <T extends ZodTypeAny>(messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[], schema: T, options?: ZodLlmClientOptions): Promise<z.infer<T>>;
         <T extends ZodTypeAny>(prompt: string, schema: T, options?: ZodLlmClientOptions): Promise<z.infer<T>>;
         <T extends ZodTypeAny>(mainInstruction: string, userMessagePayload: string | OpenAI.Chat.Completions.ChatCompletionContentPart[], dataExtractionSchema: T, options?: ZodLlmClientOptions): Promise<z.infer<T>>;
     };
     isPromptZodCached: {
         <T extends ZodTypeAny>(schema: T, options?: ZodLlmClientOptions): Promise<boolean>;
+        <T extends ZodTypeAny>(messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[], schema: T, options?: ZodLlmClientOptions): Promise<boolean>;
         <T extends ZodTypeAny>(prompt: string, schema: T, options?: ZodLlmClientOptions): Promise<boolean>;
         <T extends ZodTypeAny>(mainInstruction: string, userMessagePayload: string | OpenAI.Chat.Completions.ChatCompletionContentPart[], dataExtractionSchema: T, options?: ZodLlmClientOptions): Promise<boolean>;
     };

package/dist/createZodLlmClient.js

@@ -45,11 +45,21 @@ function isZodSchema(obj) {
         '_def' in obj);
 }
 function normalizeZodArgs(arg1, arg2, arg3, arg4) {
+    // Case 0: promptZod(messages[], schema, options?)
+    if (Array.isArray(arg1)) {
+        return {
+            messages: arg1,
+            dataExtractionSchema: arg2,
+            options: arg3
+        };
+    }
     if (isZodSchema(arg1)) {
         // Case 1: promptZod(schema, options?)
         return {
-            mainInstruction: "Generate a valid JSON object based on the schema.",
-            userMessagePayload: "Generate the data.",
+            messages: [
+                { role: 'system', content: "Generate a valid JSON object based on the schema." },
+                { role: 'user', content: "Generate the data." }
+            ],
             dataExtractionSchema: arg1,
             options: arg2
         };
@@ -58,16 +68,20 @@ function normalizeZodArgs(arg1, arg2, arg3, arg4) {
         if (isZodSchema(arg2)) {
             // Case 2: promptZod(prompt, schema, options?)
             return {
-                mainInstruction: "You are a helpful assistant that outputs JSON matching the provided schema.",
-                userMessagePayload: arg1,
+                messages: [
+                    { role: 'system', content: "You are a helpful assistant that outputs JSON matching the provided schema." },
+                    { role: 'user', content: arg1 }
+                ],
                 dataExtractionSchema: arg2,
                 options: arg3
             };
         }
         // Case 3: promptZod(system, user, schema, options?)
         return {
-            mainInstruction: arg1,
-            userMessagePayload: arg2,
+            messages: [
+                { role: 'system', content: arg1 },
+                { role: 'user', content: arg2 }
+            ],
             dataExtractionSchema: arg3,
             options: arg4
         };
@@ -179,7 +193,7 @@ ${brokenResponse}
             throw validationError; // if no fixed response
         }
     }
-    function _getZodPromptConfig(mainInstruction, dataExtractionSchema, options) {
+    function _getZodPromptConfig(messages, dataExtractionSchema, options) {
         const schema = z.toJSONSchema(dataExtractionSchema, {
             unrepresentable: 'any'
         });
@@ -190,16 +204,34 @@ Do NOT include any other text, explanations, or markdown formatting (like \`\`\`
 
 JSON schema:
 ${schemaJsonString}`;
-        const finalMainInstruction = `${mainInstruction}\n${commonPromptFooter}`;
+        // Clone messages to avoid mutating the input
+        const finalMessages = [...messages];
+        // Find the first system message to append instructions to
+        const systemMessageIndex = finalMessages.findIndex(m => m.role === 'system');
+        if (systemMessageIndex !== -1) {
+            // Append to existing system message
+            const existingContent = finalMessages[systemMessageIndex].content;
+            finalMessages[systemMessageIndex] = {
+                ...finalMessages[systemMessageIndex],
+                content: `${existingContent}\n${commonPromptFooter}`
+            };
+        }
+        else {
+            // Prepend new system message
+            finalMessages.unshift({
+                role: 'system',
+                content: commonPromptFooter
+            });
+        }
         const useResponseFormat = options?.useResponseFormat ?? true;
         const response_format = useResponseFormat
             ? { type: 'json_object' }
             : undefined;
-        return { finalMainInstruction, schemaJsonString, response_format };
+        return { finalMessages, schemaJsonString, response_format };
     }
     async function promptZod(arg1, arg2, arg3, arg4) {
-        const { mainInstruction, userMessagePayload, dataExtractionSchema, options } = normalizeZodArgs(arg1, arg2, arg3, arg4);
-        const { finalMainInstruction, schemaJsonString, response_format } = _getZodPromptConfig(mainInstruction, dataExtractionSchema, options);
+        const { messages, dataExtractionSchema, options } = normalizeZodArgs(arg1, arg2, arg3, arg4);
+        const { finalMessages, schemaJsonString, response_format } = _getZodPromptConfig(messages, dataExtractionSchema, options);
         const processResponse = async (llmResponseString) => {
             let jsonData;
             try {
@@ -230,13 +262,9 @@ The response was valid JSON but did not conform to the required schema. Please r
                 throw validationError;
             }
         };
-        const messages = [
-            { role: "system", content: finalMainInstruction },
-            { role: "user", content: userMessagePayload }
-        ];
         const retryOptions = {
             ...options,
-            messages,
+            messages: finalMessages,
             response_format,
             validate: processResponse
         };
@@ -244,15 +272,11 @@ The response was valid JSON but did not conform to the required schema. Please r
         return llmRetryClient.promptTextRetry(retryOptions);
     }
     async function isPromptZodCached(arg1, arg2, arg3, arg4) {
-        const { mainInstruction, userMessagePayload, dataExtractionSchema, options } = normalizeZodArgs(arg1, arg2, arg3, arg4);
-        const { finalMainInstruction, response_format } = _getZodPromptConfig(mainInstruction, dataExtractionSchema, options);
-        const messages = [
-            { role: "system", content: finalMainInstruction },
-            { role: "user", content: userMessagePayload }
-        ];
+        const { messages, dataExtractionSchema, options } = normalizeZodArgs(arg1, arg2, arg3, arg4);
+        const { finalMessages, response_format } = _getZodPromptConfig(messages, dataExtractionSchema, options);
         const { maxRetries, useResponseFormat: _u, beforeValidation, ...restOptions } = options || {};
         return isPromptCached({
-            messages,
+            messages: finalMessages,
             response_format,
             ...restOptions
         });

package/dist/createZodLlmClient.spec.js

@@ -9,24 +9,24 @@ const createZodLlmClient_js_1 = require("./createZodLlmClient.js");
     });
     (0, vitest_1.it)('should normalize Schema Only (Case 1)', () => {
         const result = (0, createZodLlmClient_js_1.normalizeZodArgs)(TestSchema);
-        (0, vitest_1.expect)(result.mainInstruction).toContain('Generate a valid JSON');
-        (0, vitest_1.expect)(result.userMessagePayload).toBe('Generate the data.');
+        (0, vitest_1.expect)(result.messages[0].content).toContain('Generate a valid JSON');
+        (0, vitest_1.expect)(result.messages[1].content).toBe('Generate the data.');
         (0, vitest_1.expect)(result.dataExtractionSchema).toBe(TestSchema);
         (0, vitest_1.expect)(result.options).toBeUndefined();
     });
     (0, vitest_1.it)('should normalize Schema Only with Options (Case 1)', () => {
         const options = { temperature: 0.5 };
         const result = (0, createZodLlmClient_js_1.normalizeZodArgs)(TestSchema, options);
-        (0, vitest_1.expect)(result.mainInstruction).toContain('Generate a valid JSON');
-        (0, vitest_1.expect)(result.userMessagePayload).toBe('Generate the data.');
+        (0, vitest_1.expect)(result.messages[0].content).toContain('Generate a valid JSON');
+        (0, vitest_1.expect)(result.messages[1].content).toBe('Generate the data.');
         (0, vitest_1.expect)(result.dataExtractionSchema).toBe(TestSchema);
         (0, vitest_1.expect)(result.options).toBe(options);
     });
     (0, vitest_1.it)('should normalize Prompt + Schema (Case 2)', () => {
         const prompt = "Extract data";
         const result = (0, createZodLlmClient_js_1.normalizeZodArgs)(prompt, TestSchema);
-        (0, vitest_1.expect)(result.mainInstruction).toContain('You are a helpful assistant');
-        (0, vitest_1.expect)(result.userMessagePayload).toBe(prompt);
+        (0, vitest_1.expect)(result.messages[0].content).toContain('You are a helpful assistant');
+        (0, vitest_1.expect)(result.messages[1].content).toBe(prompt);
         (0, vitest_1.expect)(result.dataExtractionSchema).toBe(TestSchema);
         (0, vitest_1.expect)(result.options).toBeUndefined();
     });
@@ -34,8 +34,8 @@ const createZodLlmClient_js_1 = require("./createZodLlmClient.js");
         const prompt = "Extract data";
         const options = { temperature: 0.5 };
         const result = (0, createZodLlmClient_js_1.normalizeZodArgs)(prompt, TestSchema, options);
-        (0, vitest_1.expect)(result.mainInstruction).toContain('You are a helpful assistant');
-        (0, vitest_1.expect)(result.userMessagePayload).toBe(prompt);
+        (0, vitest_1.expect)(result.messages[0].content).toContain('You are a helpful assistant');
+        (0, vitest_1.expect)(result.messages[1].content).toBe(prompt);
         (0, vitest_1.expect)(result.dataExtractionSchema).toBe(TestSchema);
         (0, vitest_1.expect)(result.options).toBe(options);
     });
@@ -43,8 +43,8 @@ const createZodLlmClient_js_1 = require("./createZodLlmClient.js");
         const system = "System prompt";
         const user = "User prompt";
         const result = (0, createZodLlmClient_js_1.normalizeZodArgs)(system, user, TestSchema);
-        (0, vitest_1.expect)(result.mainInstruction).toBe(system);
-        (0, vitest_1.expect)(result.userMessagePayload).toBe(user);
+        (0, vitest_1.expect)(result.messages[0].content).toBe(system);
+        (0, vitest_1.expect)(result.messages[1].content).toBe(user);
         (0, vitest_1.expect)(result.dataExtractionSchema).toBe(TestSchema);
         (0, vitest_1.expect)(result.options).toBeUndefined();
     });
@@ -53,8 +53,29 @@ const createZodLlmClient_js_1 = require("./createZodLlmClient.js");
         const user = "User prompt";
         const options = { temperature: 0.5 };
         const result = (0, createZodLlmClient_js_1.normalizeZodArgs)(system, user, TestSchema, options);
-        (0, vitest_1.expect)(result.mainInstruction).toBe(system);
-        (0, vitest_1.expect)(result.userMessagePayload).toBe(user);
+        (0, vitest_1.expect)(result.messages[0].content).toBe(system);
+        (0, vitest_1.expect)(result.messages[1].content).toBe(user);
+        (0, vitest_1.expect)(result.dataExtractionSchema).toBe(TestSchema);
+        (0, vitest_1.expect)(result.options).toBe(options);
+    });
+    (0, vitest_1.it)('should normalize Messages Array + Schema (Case 0)', () => {
+        const messages = [
+            { role: 'system', content: 'Sys' },
+            { role: 'user', content: 'Usr' }
+        ];
+        const result = (0, createZodLlmClient_js_1.normalizeZodArgs)(messages, TestSchema);
+        (0, vitest_1.expect)(result.messages).toBe(messages);
+        (0, vitest_1.expect)(result.dataExtractionSchema).toBe(TestSchema);
+        (0, vitest_1.expect)(result.options).toBeUndefined();
+    });
+    (0, vitest_1.it)('should normalize Messages Array + Schema with Options (Case 0)', () => {
+        const messages = [
+            { role: 'system', content: 'Sys' },
+            { role: 'user', content: 'Usr' }
+        ];
+        const options = { temperature: 0.5 };
+        const result = (0, createZodLlmClient_js_1.normalizeZodArgs)(messages, TestSchema, options);
+        (0, vitest_1.expect)(result.messages).toBe(messages);
         (0, vitest_1.expect)(result.dataExtractionSchema).toBe(TestSchema);
         (0, vitest_1.expect)(result.options).toBe(options);
     });

package/dist/llmFactory.d.ts

@@ -4,11 +4,13 @@ export interface CreateLlmFactoryParams extends CreateLlmClientParams {
 export declare function createLlm(params: CreateLlmFactoryParams): {
     promptZod: {
         <T extends import("zod").ZodType>(schema: T, options?: import("./createZodLlmClient.js").ZodLlmClientOptions): Promise<import("zod").infer<T>>;
+        <T extends import("zod").ZodType>(messages: import("openai/resources/index.js").ChatCompletionMessageParam[], schema: T, options?: import("./createZodLlmClient.js").ZodLlmClientOptions): Promise<import("zod").infer<T>>;
         <T extends import("zod").ZodType>(prompt: string, schema: T, options?: import("./createZodLlmClient.js").ZodLlmClientOptions): Promise<import("zod").infer<T>>;
         <T extends import("zod").ZodType>(mainInstruction: string, userMessagePayload: string | import("openai/resources/index.js").ChatCompletionContentPart[], dataExtractionSchema: T, options?: import("./createZodLlmClient.js").ZodLlmClientOptions): Promise<import("zod").infer<T>>;
     };
     isPromptZodCached: {
         <T extends import("zod").ZodType>(schema: T, options?: import("./createZodLlmClient.js").ZodLlmClientOptions): Promise<boolean>;
+        <T extends import("zod").ZodType>(messages: import("openai/resources/index.js").ChatCompletionMessageParam[], schema: T, options?: import("./createZodLlmClient.js").ZodLlmClientOptions): Promise<boolean>;
         <T extends import("zod").ZodType>(prompt: string, schema: T, options?: import("./createZodLlmClient.js").ZodLlmClientOptions): Promise<boolean>;
         <T extends import("zod").ZodType>(mainInstruction: string, userMessagePayload: string | import("openai/resources/index.js").ChatCompletionContentPart[], dataExtractionSchema: T, options?: import("./createZodLlmClient.js").ZodLlmClientOptions): Promise<boolean>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-fns",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",