llm-fns 1.0.9 → 1.0.11

package/dist/createJsonSchemaLlmClient.d.ts

@@ -15,6 +15,13 @@ export type JsonSchemaLlmClientOptions = Omit<LlmPromptOptions, 'messages' | 're
      * @returns The processed data to be validated.
      */
     beforeValidation?: (data: any) => any;
+    /**
+     * A custom validator function.
+     * If provided, this function will be used to validate the parsed JSON data.
+     * It should throw an error if the data is invalid, or return the validated data (potentially transformed).
+     * If not provided, an AJV-based validator will be used.
+     */
+    validator?: (data: any) => any;
 };
 export interface CreateJsonSchemaLlmClientParams {
     prompt: PromptFunction;
@@ -27,3 +34,4 @@ export declare function createJsonSchemaLlmClient(params: CreateJsonSchemaLlmCli
     isPromptJsonCached: (messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[], schema: Record<string, any>, options?: JsonSchemaLlmClientOptions) => Promise<boolean>;
 };
 export type JsonSchemaClient = ReturnType<typeof createJsonSchemaLlmClient>;
+export type PromptJsonFunction = JsonSchemaClient['promptJson'];

package/dist/createJsonSchemaLlmClient.js

@@ -146,16 +146,22 @@ ${schemaJsonString}`;
         return { finalMessages, schemaJsonString, response_format };
     }
     async function promptJson(messages, schema, options) {
-        // Always validate against the schema using AJV
-        const ajvValidator = (data) => {
-            const validate = ajv.compile(schema);
-            const valid = validate(data);
-            if (!valid) {
-                const errors = validate.errors?.map(e => `${e.instancePath} ${e.message}`).join(', ');
-                throw new Error(`AJV Validation Error: ${errors}`);
+        // Default validator using AJV
+        const defaultValidator = (data) => {
+            try {
+                const validate = ajv.compile(schema);
+                const valid = validate(data);
+                if (!valid) {
+                    const errors = validate.errors?.map(e => `${e.instancePath} ${e.message}`).join(', ');
+                    throw new Error(`AJV Validation Error: ${errors}`);
+                }
+                return data;
+            }
+            catch (error) {
+                throw error;
             }
-            return data;
         };
+        const validator = options?.validator ?? defaultValidator;
         const { finalMessages, schemaJsonString, response_format } = _getJsonPromptConfig(messages, schema, options);
         const processResponse = async (llmResponseString) => {
             let jsonData;
@@ -170,7 +176,7 @@ The response provided was not valid JSON. Please correct it.`;
                 throw new createLlmRetryClient_js_1.LlmRetryError(errorMessage, 'JSON_PARSE_ERROR', undefined, llmResponseString);
             }
             try {
-                const validatedData = await _validateOrFix(jsonData, ajvValidator, schemaJsonString, options);
+                const validatedData = await _validateOrFix(jsonData, validator, schemaJsonString, options);
                 return validatedData;
             }
             catch (validationError) {
@@ -194,7 +200,7 @@ The response was valid JSON but did not conform to the required schema. Please r
     }
     async function isPromptJsonCached(messages, schema, options) {
         const { finalMessages, response_format } = _getJsonPromptConfig(messages, schema, options);
-        const { maxRetries, useResponseFormat: _u, beforeValidation, ...restOptions } = options || {};
+        const { maxRetries, useResponseFormat: _u, beforeValidation, validator, ...restOptions } = options || {};
         return isPromptCached({
             messages: finalMessages,
             response_format,

package/dist/createLlmRetryClient.d.ts

@@ -45,3 +45,4 @@ export declare function createLlmRetryClient(params: CreateLlmRetryClientParams)
         <T = Buffer<ArrayBufferLike>>(options: LlmRetryOptions<T>): Promise<T>;
     };
 };
+export type LlmRetryClient = ReturnType<typeof createLlmRetryClient>;

package/dist/createZodLlmClient.d.ts

@@ -26,3 +26,5 @@ export declare function createZodLlmClient(params: CreateZodLlmClientParams): {
         <T extends ZodTypeAny>(mainInstruction: string, userMessagePayload: string | OpenAI.Chat.Completions.ChatCompletionContentPart[], dataExtractionSchema: T, options?: ZodLlmClientOptions): Promise<boolean>;
     };
 };
+export type ZodLlmClient = ReturnType<typeof createZodLlmClient>;
+export type PromptZodFunction = ZodLlmClient['promptZod'];

package/dist/createZodLlmClient.js

@@ -93,11 +93,14 @@ function createZodLlmClient(params) {
         const schema = z.toJSONSchema(dataExtractionSchema, {
             unrepresentable: 'any'
         });
-        const result = await jsonSchemaClient.promptJson(messages, schema, options);
-        // We still parse with Zod to ensure the types are correct and to apply any transformations/refinements
-        // that JSON Schema might not capture perfectly, or just to get the typed return.
-        // Note: If this fails, it won't trigger a retry in promptJson anymore, because promptJson only retries on AJV errors.
-        return dataExtractionSchema.parse(result);
+        const zodValidator = (data) => {
+            return dataExtractionSchema.parse(data);
+        };
+        const result = await jsonSchemaClient.promptJson(messages, schema, {
+            ...options,
+            validator: zodValidator
+        });
+        return result;
     }
     async function isPromptZodCached(arg1, arg2, arg3, arg4) {
         const { messages, dataExtractionSchema, options } = normalizeZodArgs(arg1, arg2, arg3, arg4);

package/dist/llmFactory.d.ts

@@ -45,3 +45,4 @@ export declare function createLlm(params: CreateLlmFactoryParams): {
         (options: import("./createLlmClient.js").LlmPromptOptions): Promise<Buffer>;
     };
 };
+export type LlmClient = ReturnType<typeof createLlm>;

package/package.json

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