@ax-llm/ax 9.0.0 → 9.0.3

package/build/module/src/dsp/optimize.d.ts

@@ -1,29 +1,29 @@
-import type { GenIn, GenOut, Program, ProgramDemos, Value } from './program.js';
-export type Example = Record<string, Value>;
-export type MetricFn = <T extends GenOut = GenOut>(arg0: Readonly<{
+import type { AxFieldValue, AxGenIn, AxGenOut, AxProgram, AxProgramDemos } from './program.js';
+export type AxExample = Record<string, AxFieldValue>;
+export type AxMetricFn = <T extends AxGenOut = AxGenOut>(arg0: Readonly<{
     prediction: T;
-    example: Example;
+    example: AxExample;
 }>) => boolean;
-export type MetricFnArgs = Parameters<MetricFn>[0];
-export type OptimizerArgs<IN extends GenIn, OUT extends GenOut> = {
-    program: Readonly<Program<IN, OUT>>;
-    examples: Readonly<Example[]>;
+export type AxMetricFnArgs = Parameters<AxMetricFn>[0];
+export type AxOptimizerArgs<IN extends AxGenIn, OUT extends AxGenOut> = {
+    program: Readonly<AxProgram<IN, OUT>>;
+    examples: Readonly<AxExample[]>;
     options?: {
         maxRounds?: number;
         maxExamples?: number;
         maxDemos?: number;
     };
 };
-export declare class BootstrapFewShot<IN extends GenIn = GenIn, OUT extends GenOut = GenOut> {
+export declare class AxBootstrapFewShot<IN extends AxGenIn = AxGenIn, OUT extends AxGenOut = AxGenOut> {
     private program;
     private examples;
     private maxRounds;
     private maxDemos;
     private maxExamples;
     private traces;
-    constructor({ program, examples, options }: Readonly<OptimizerArgs<IN, OUT>>);
+    constructor({ program, examples, options }: Readonly<AxOptimizerArgs<IN, OUT>>);
     private compileRound;
-    compile(metricFn: MetricFn, options?: Readonly<OptimizerArgs<IN, OUT>['options'] & {
+    compile(metricFn: AxMetricFn, options?: Readonly<AxOptimizerArgs<IN, OUT>['options'] & {
         filename?: string;
-    }>): Promise<ProgramDemos[]>;
+    }>): Promise<AxProgramDemos[]>;
 }

package/build/module/src/dsp/optimize.js

@@ -1,6 +1,6 @@
 import { writeFileSync } from 'fs';
 import { updateProgressBar } from './util.js';
-export class BootstrapFewShot {
+export class AxBootstrapFewShot {
     program;
     examples;
     maxRounds;
@@ -87,12 +87,12 @@ const randomSample = (array, n) => {
     // Shuffle the cloned array
     for (let i = clonedArray.length - 1; i > 0; i--) {
         const j = Math.floor(Math.random() * (i + 1));
-        const ca_i = clonedArray[i];
-        const ca_j = clonedArray[j];
-        if (!ca_i || !ca_j) {
+        const caI = clonedArray[i];
+        const caJ = clonedArray[j];
+        if (!caI || !caJ) {
             throw new Error('Invalid array elements');
         }
-        [clonedArray[i], clonedArray[j]] = [ca_j, ca_i];
+        [clonedArray[i], clonedArray[j]] = [caJ, caI];
     }
     // Return the first `n` items of the shuffled array
     return clonedArray.slice(0, n);

package/build/module/src/dsp/optimize.js.map

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

package/build/module/src/dsp/parser.d.ts

@@ -76,9 +76,10 @@ export type ParsedField = {
     isOptional: true | undefined;
 };
 export type ParsedType = {
-    name: string;
+    name: Type;
     isArray: boolean;
 };
+export type Type = "string" | "number" | "boolean" | "json" | "image";
 export type ParsedIdentifier = string;
 export type ParsedString = string;
 export type _ = "";

package/build/module/src/dsp/parser.js

@@ -280,8 +280,13 @@ const peggyParser = // Generated by Peggy 3.0.2.
         var peg$c2 = "?";
         var peg$c3 = ":";
         var peg$c4 = "[]";
-        var peg$c5 = "'";
-        var peg$c6 = "\"";
+        var peg$c5 = "string";
+        var peg$c6 = "number";
+        var peg$c7 = "boolean";
+        var peg$c8 = "json";
+        var peg$c9 = "image";
+        var peg$c10 = "'";
+        var peg$c11 = "\"";
         var peg$r0 = /^[a-zA-Z_0-9]/;
         var peg$r1 = /^[^']/;
         var peg$r2 = /^[^"]/;
@@ -290,13 +295,18 @@ const peggyParser = // Generated by Peggy 3.0.2.
         var peg$e1 = peg$literalExpectation(",", false);
         var peg$e2 = peg$literalExpectation("?", false);
         var peg$e3 = peg$literalExpectation(":", false);
-        var peg$e4 = peg$classExpectation([["a", "z"], ["A", "Z"], "_", ["0", "9"]], false, false);
-        var peg$e5 = peg$literalExpectation("[]", false);
-        var peg$e6 = peg$literalExpectation("'", false);
-        var peg$e7 = peg$classExpectation(["'"], true, false);
-        var peg$e8 = peg$literalExpectation("\"", false);
-        var peg$e9 = peg$classExpectation(["\""], true, false);
-        var peg$e10 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
+        var peg$e4 = peg$literalExpectation("[]", false);
+        var peg$e5 = peg$literalExpectation("string", false);
+        var peg$e6 = peg$literalExpectation("number", false);
+        var peg$e7 = peg$literalExpectation("boolean", false);
+        var peg$e8 = peg$literalExpectation("json", false);
+        var peg$e9 = peg$literalExpectation("image", false);
+        var peg$e10 = peg$classExpectation([["a", "z"], ["A", "Z"], "_", ["0", "9"]], false, false);
+        var peg$e11 = peg$literalExpectation("'", false);
+        var peg$e12 = peg$classExpectation(["'"], true, false);
+        var peg$e13 = peg$literalExpectation("\"", false);
+        var peg$e14 = peg$classExpectation(["\""], true, false);
+        var peg$e15 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
         // @ts-ignore
         var peg$f0 = function (optionalDesc, inputs, outputs) {
             // @ts-ignore
@@ -322,9 +332,9 @@ const peggyParser = // Generated by Peggy 3.0.2.
                 isOptional: isOptional ? true : undefined
             };
         }; // @ts-ignore
-        var peg$f2 = function (chars, isArray) {
+        var peg$f2 = function (type, isArray) {
             // @ts-ignore
-            return { name: chars.join(""), isArray: isArray ? true : false };
+            return { name: type, isArray: isArray ? true : false };
         }; // @ts-ignore
         var peg$f3 = function (chars) {
             // @ts-ignore
@@ -580,7 +590,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             var s0, s1, s2, s3, s4, s5, s6, s7;
             // @ts-ignore
-            var key = peg$currPos * 8 + 0;
+            var key = peg$currPos * 9 + 0;
             // @ts-ignore
             var cached = peg$resultsCache[key];
             // @ts-ignore
@@ -689,7 +699,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             var s0, s1, s2, s3, s4, s5;
             // @ts-ignore
-            var key = peg$currPos * 8 + 1;
+            var key = peg$currPos * 9 + 1;
             // @ts-ignore
             var cached = peg$resultsCache[key];
             // @ts-ignore
@@ -768,7 +778,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             var s0, s1, s2, s3, s4, s5, s6, s7, s8;
             // @ts-ignore
-            var key = peg$currPos * 8 + 2;
+            var key = peg$currPos * 9 + 2;
             // @ts-ignore
             var cached = peg$resultsCache[key];
             // @ts-ignore
@@ -832,9 +842,19 @@ const peggyParser = // Generated by Peggy 3.0.2.
                 // @ts-ignore
                 s8 = peg$parseParsedType();
                 // @ts-ignore
-                s5 = [s5, s6, s7, s8];
-                // @ts-ignore
-                s4 = s5;
+                if (s8 !== peg$FAILED) {
+                    // @ts-ignore
+                    s5 = [s5, s6, s7, s8];
+                    // @ts-ignore
+                    s4 = s5;
+                    // @ts-ignore
+                }
+                else {
+                    // @ts-ignore
+                    peg$currPos = s4;
+                    // @ts-ignore
+                    s4 = peg$FAILED;
+                }
                 // @ts-ignore
             }
             else {
@@ -887,7 +907,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             var s0, s1, s2;
             // @ts-ignore
-            var key = peg$currPos * 8 + 3;
+            var key = peg$currPos * 9 + 3;
             // @ts-ignore
             var cached = peg$resultsCache[key];
             // @ts-ignore
@@ -900,33 +920,15 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             s0 = peg$currPos;
             // @ts-ignore
-            s1 = [];
+            s1 = peg$parseType();
             // @ts-ignore
-            if (peg$r0.test(input.charAt(peg$currPos))) {
-                // @ts-ignore
-                s2 = input.charAt(peg$currPos);
-                // @ts-ignore
-                peg$currPos++;
-                // @ts-ignore
-            }
-            else {
-                // @ts-ignore
-                s2 = peg$FAILED;
-                // @ts-ignore
-                if (peg$silentFails === 0) {
-                    peg$fail(peg$e4);
-                }
-            }
-            // @ts-ignore
-            while (s2 !== peg$FAILED) {
-                // @ts-ignore
-                s1.push(s2);
+            if (s1 !== peg$FAILED) {
                 // @ts-ignore
-                if (peg$r0.test(input.charAt(peg$currPos))) {
+                if (input.substr(peg$currPos, 2) === peg$c4) {
                     // @ts-ignore
-                    s2 = input.charAt(peg$currPos);
+                    s2 = peg$c4;
                     // @ts-ignore
-                    peg$currPos++;
+                    peg$currPos += 2;
                     // @ts-ignore
                 }
                 else {
@@ -937,33 +939,136 @@ const peggyParser = // Generated by Peggy 3.0.2.
                         peg$fail(peg$e4);
                     }
                 }
+                // @ts-ignore
+                if (s2 === peg$FAILED) {
+                    // @ts-ignore
+                    s2 = null;
+                }
+                // @ts-ignore
+                peg$savedPos = s0;
+                // @ts-ignore
+                s0 = peg$f2(s1, s2);
+                // @ts-ignore
+            }
+            else {
+                // @ts-ignore
+                peg$currPos = s0;
+                // @ts-ignore
+                s0 = peg$FAILED;
             }
             // @ts-ignore
-            if (input.substr(peg$currPos, 2) === peg$c4) {
+            peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+            // @ts-ignore
+            return s0;
+        }
+        // @ts-ignore
+        function peg$parseType() {
+            // @ts-ignore
+            var s0;
+            // @ts-ignore
+            var key = peg$currPos * 9 + 4;
+            // @ts-ignore
+            var cached = peg$resultsCache[key];
+            // @ts-ignore
+            if (cached) {
                 // @ts-ignore
-                s2 = peg$c4;
+                peg$currPos = cached.nextPos;
                 // @ts-ignore
-                peg$currPos += 2;
+                return cached.result;
+            }
+            // @ts-ignore
+            if (input.substr(peg$currPos, 6) === peg$c5) {
+                // @ts-ignore
+                s0 = peg$c5;
+                // @ts-ignore
+                peg$currPos += 6;
                 // @ts-ignore
             }
             else {
                 // @ts-ignore
-                s2 = peg$FAILED;
+                s0 = peg$FAILED;
                 // @ts-ignore
                 if (peg$silentFails === 0) {
                     peg$fail(peg$e5);
                 }
             }
             // @ts-ignore
-            if (s2 === peg$FAILED) {
+            if (s0 === peg$FAILED) {
                 // @ts-ignore
-                s2 = null;
+                if (input.substr(peg$currPos, 6) === peg$c6) {
+                    // @ts-ignore
+                    s0 = peg$c6;
+                    // @ts-ignore
+                    peg$currPos += 6;
+                    // @ts-ignore
+                }
+                else {
+                    // @ts-ignore
+                    s0 = peg$FAILED;
+                    // @ts-ignore
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e6);
+                    }
+                }
+                // @ts-ignore
+                if (s0 === peg$FAILED) {
+                    // @ts-ignore
+                    if (input.substr(peg$currPos, 7) === peg$c7) {
+                        // @ts-ignore
+                        s0 = peg$c7;
+                        // @ts-ignore
+                        peg$currPos += 7;
+                        // @ts-ignore
+                    }
+                    else {
+                        // @ts-ignore
+                        s0 = peg$FAILED;
+                        // @ts-ignore
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e7);
+                        }
+                    }
+                    // @ts-ignore
+                    if (s0 === peg$FAILED) {
+                        // @ts-ignore
+                        if (input.substr(peg$currPos, 4) === peg$c8) {
+                            // @ts-ignore
+                            s0 = peg$c8;
+                            // @ts-ignore
+                            peg$currPos += 4;
+                            // @ts-ignore
+                        }
+                        else {
+                            // @ts-ignore
+                            s0 = peg$FAILED;
+                            // @ts-ignore
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e8);
+                            }
+                        }
+                        // @ts-ignore
+                        if (s0 === peg$FAILED) {
+                            // @ts-ignore
+                            if (input.substr(peg$currPos, 5) === peg$c9) {
+                                // @ts-ignore
+                                s0 = peg$c9;
+                                // @ts-ignore
+                                peg$currPos += 5;
+                                // @ts-ignore
+                            }
+                            else {
+                                // @ts-ignore
+                                s0 = peg$FAILED;
+                                // @ts-ignore
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$e9);
+                                }
+                            }
+                        }
+                    }
+                }
             }
             // @ts-ignore
-            peg$savedPos = s0;
-            // @ts-ignore
-            s0 = peg$f2(s1, s2);
-            // @ts-ignore
             peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
             // @ts-ignore
             return s0;
@@ -973,7 +1078,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             var s0, s1, s2;
             // @ts-ignore
-            var key = peg$currPos * 8 + 4;
+            var key = peg$currPos * 9 + 5;
             // @ts-ignore
             var cached = peg$resultsCache[key];
             // @ts-ignore
@@ -1000,7 +1105,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                 s2 = peg$FAILED;
                 // @ts-ignore
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e4);
+                    peg$fail(peg$e10);
                 }
             }
             // @ts-ignore
@@ -1020,7 +1125,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                     s2 = peg$FAILED;
                     // @ts-ignore
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e4);
+                        peg$fail(peg$e10);
                     }
                 }
             }
@@ -1040,7 +1145,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             var s0, s1, s2, s3;
             // @ts-ignore
-            var key = peg$currPos * 8 + 5;
+            var key = peg$currPos * 9 + 6;
             // @ts-ignore
             var cached = peg$resultsCache[key];
             // @ts-ignore
@@ -1055,7 +1160,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             if (input.charCodeAt(peg$currPos) === 39) {
                 // @ts-ignore
-                s1 = peg$c5;
+                s1 = peg$c10;
                 // @ts-ignore
                 peg$currPos++;
                 // @ts-ignore
@@ -1065,7 +1170,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                 s1 = peg$FAILED;
                 // @ts-ignore
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e6);
+                    peg$fail(peg$e11);
                 }
             }
             // @ts-ignore
@@ -1085,7 +1190,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                     s3 = peg$FAILED;
                     // @ts-ignore
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e7);
+                        peg$fail(peg$e12);
                     }
                 }
                 // @ts-ignore
@@ -1105,14 +1210,14 @@ const peggyParser = // Generated by Peggy 3.0.2.
                         s3 = peg$FAILED;
                         // @ts-ignore
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e7);
+                            peg$fail(peg$e12);
                         }
                     }
                 }
                 // @ts-ignore
                 if (input.charCodeAt(peg$currPos) === 39) {
                     // @ts-ignore
-                    s3 = peg$c5;
+                    s3 = peg$c10;
                     // @ts-ignore
                     peg$currPos++;
                     // @ts-ignore
@@ -1122,7 +1227,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                     s3 = peg$FAILED;
                     // @ts-ignore
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e6);
+                        peg$fail(peg$e11);
                     }
                 }
                 // @ts-ignore
@@ -1154,7 +1259,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                 // @ts-ignore
                 if (input.charCodeAt(peg$currPos) === 34) {
                     // @ts-ignore
-                    s1 = peg$c6;
+                    s1 = peg$c11;
                     // @ts-ignore
                     peg$currPos++;
                     // @ts-ignore
@@ -1164,7 +1269,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                     s1 = peg$FAILED;
                     // @ts-ignore
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e8);
+                        peg$fail(peg$e13);
                     }
                 }
                 // @ts-ignore
@@ -1184,7 +1289,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                         s3 = peg$FAILED;
                         // @ts-ignore
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e9);
+                            peg$fail(peg$e14);
                         }
                     }
                     // @ts-ignore
@@ -1204,14 +1309,14 @@ const peggyParser = // Generated by Peggy 3.0.2.
                             s3 = peg$FAILED;
                             // @ts-ignore
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e9);
+                                peg$fail(peg$e14);
                             }
                         }
                     }
                     // @ts-ignore
                     if (input.charCodeAt(peg$currPos) === 34) {
                         // @ts-ignore
-                        s3 = peg$c6;
+                        s3 = peg$c11;
                         // @ts-ignore
                         peg$currPos++;
                         // @ts-ignore
@@ -1221,7 +1326,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                         s3 = peg$FAILED;
                         // @ts-ignore
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e8);
+                            peg$fail(peg$e13);
                         }
                     }
                     // @ts-ignore
@@ -1257,7 +1362,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             var s0, s1, s2;
             // @ts-ignore
-            var key = peg$currPos * 8 + 6;
+            var key = peg$currPos * 9 + 7;
             // @ts-ignore
             var cached = peg$resultsCache[key];
             // @ts-ignore
@@ -1284,7 +1389,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                 s2 = peg$FAILED;
                 // @ts-ignore
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e10);
+                    peg$fail(peg$e15);
                 }
             }
             // @ts-ignore
@@ -1304,7 +1409,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                     s2 = peg$FAILED;
                     // @ts-ignore
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e10);
+                        peg$fail(peg$e15);
                     }
                 }
             }
@@ -1324,7 +1429,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             var s0, s1, s2;
             // @ts-ignore
-            var key = peg$currPos * 8 + 7;
+            var key = peg$currPos * 9 + 8;
             // @ts-ignore
             var cached = peg$resultsCache[key];
             // @ts-ignore
@@ -1351,7 +1456,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                 s2 = peg$FAILED;
                 // @ts-ignore
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e10);
+                    peg$fail(peg$e15);
                 }
             }
             // @ts-ignore
@@ -1373,7 +1478,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
                         s2 = peg$FAILED;
                         // @ts-ignore
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$e10);
+                            peg$fail(peg$e15);
                         }
                     }
                 }