@mikugg/guidance 0.10.0 → 0.12.0

package/dist/lib/__test__/templateParser.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=templateParser.test.d.ts.map

package/dist/lib/__test__/templateParser.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"templateParser.test.d.ts","sourceRoot":"","sources":["../../../src/lib/__test__/templateParser.test.ts"],"names":[],"mappings":""}

package/dist/lib/__test__/templateParser.test.js

@@ -0,0 +1,73 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const templateParser_1 = __importDefault(require("../templateParser")); // Adjust the import path as needed
+describe("extractGenParams", () => {
+    it("extracts simple parameters correctly", () => {
+        const template = `some text{{GEN example max_tokens=2000 stop=["End"]}}some other text`;
+        expect((0, templateParser_1.default)(template)).toEqual({
+            name: "example",
+            params: {
+                max_tokens: 2000,
+                stop: ["End"],
+            },
+            type: "GEN",
+        });
+    });
+    it("handles multiple parameters and array values", () => {
+        const template = `{{GEN complex max_tokens=3000 stop=["\\nExit:", "\\nAnon:"]}}`;
+        console.log((0, templateParser_1.default)(template));
+        expect((0, templateParser_1.default)(template)).toEqual({
+            type: "GEN",
+            name: "complex",
+            params: {
+                max_tokens: 3000,
+                stop: ["\nExit:", "\nAnon:"],
+            },
+        });
+    });
+    it("returns null for a string without GEN pattern", () => {
+        const template = `some regular text without GEN`;
+        expect((0, templateParser_1.default)(template)).toEqual({
+            type: "",
+            name: "",
+            params: {},
+        });
+    });
+    it("handles the SEL pattern with options parameter", () => {
+        const template = `{{SEL choice options=SomeConstantName}}`;
+        expect((0, templateParser_1.default)(template)).toEqual({
+            type: "SEL",
+            name: "choice",
+            params: {
+                options: "SomeConstantName",
+            },
+        });
+    });
+    it("extracts multiple parameters including strings, numbers, and arrays", () => {
+        const template = `{{GEN multiParam type="stringType" count=10 flags=["flag1", "flag2"]}}`;
+        expect((0, templateParser_1.default)(template)).toEqual({
+            type: "GEN",
+            name: "multiParam",
+            params: {
+                type: "stringType",
+                count: 10,
+                flags: ["flag1", "flag2"],
+            },
+        });
+    });
+    it("handles complex parameters in SEL pattern", () => {
+        const template = `{{SEL complexChoice options=ComplexOptions max_selections=3 custom_flag="enabled"}}`;
+        expect((0, templateParser_1.default)(template)).toEqual({
+            type: "SEL",
+            name: "complexChoice",
+            params: {
+                options: "ComplexOptions",
+                max_selections: 3,
+                custom_flag: "enabled",
+            },
+        });
+    });
+});

package/dist/lib/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/lib/template.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,oBAAY,gBAAgB;IAC1B,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,SAAS,CAAyB;gBAE9B,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,sBAAsB;IAKpE,YAAY,CAAC,SAAS,EAAE,iBAAiB;IAIzC,YAAY,CAAC,SAAS,EAAE,sBAAsB;IAIxC,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GACxC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAYjB,qBAAqB,CACjC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GACxC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC;IA2G5C,OAAO,CAAC,cAAc;CAQvB"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/lib/template.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAG3D,oBAAY,gBAAgB;IAC1B,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,SAAS,CAAyB;gBAE9B,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,sBAAsB;IAKpE,YAAY,CAAC,SAAS,EAAE,iBAAiB;IAIzC,YAAY,CAAC,SAAS,EAAE,sBAAsB;IAIxC,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GACxC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAYjB,qBAAqB,CACjC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GACxC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC;IAkG5C,OAAO,CAAC,cAAc;CAQvB"}

package/dist/lib/template.js

@@ -33,6 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateProcessor = exports.TEMPLATE_METHODS = void 0;
 const _trie_1 = __importDefault(require("./_trie"));
+const templateParser_1 = __importDefault(require("./templateParser"));
 var TEMPLATE_METHODS;
 (function (TEMPLATE_METHODS) {
     TEMPLATE_METHODS["SEL"] = "SEL";
@@ -80,24 +81,18 @@ class TemplateProcessor {
                 template = template.replace(new RegExp(`{{${key}}}`, "g"), value.toString());
             });
             // Replace {{method variableName methodArg1=methodArg1Value methodArg2=methodArg2Value}} in template
-            const indexes = this.findAllIndexes(template, "{{");
+            const indexes = [
+                ...this.findAllIndexes(template, "{{GEN"),
+                ...this.findAllIndexes(template, "{{SEL"),
+            ].sort((a, b) => a - b);
             let nextTemplateIndexForPrompt = 0;
             let prompt = "";
             for (let i = 0; i < indexes.length; i++) {
                 prompt += template.substring(nextTemplateIndexForPrompt, indexes[i]);
-                const start = indexes[i] + 2;
-                const end = template.substring(start).indexOf("}}") + start;
+                const start = indexes[i];
+                const end = template.substring(start).indexOf("}}") + 2 + start;
                 const content = template.substring(start, end);
-                const args = content.split(" ");
-                const method = args[0];
-                const variableName = args[1];
-                const methodArgs = args
-                    .slice(2)
-                    .reduce((acc, arg) => {
-                    const [key, value] = arg.split("=");
-                    acc[key] = value;
-                    return acc;
-                }, {});
+                const { type: method, name: variableName, params: methodArgs, } = (0, templateParser_1.default)(content);
                 let completion = "";
                 switch (method) {
                     case TEMPLATE_METHODS.GEN:
@@ -108,12 +103,6 @@ class TemplateProcessor {
                                 _d = false;
                                 const chunk = _c;
                                 completion = chunk;
-                                // Remove string after stop
-                                if (methodArgs["stop"]) {
-                                    if (completion.indexOf(methodArgs["stop"]) >= 0) {
-                                        completion = completion.substring(0, completion.indexOf(methodArgs["stop"]));
-                                    }
-                                }
                                 result.set(variableName, completion);
                                 yield yield __await(result);
                             }
@@ -129,7 +118,7 @@ class TemplateProcessor {
                     case TEMPLATE_METHODS.SEL:
                         const trie = new _trie_1.default();
                         // Get options from variables
-                        const options = variables.get(methodArgs["options"]);
+                        const options = variables.get(String(methodArgs["options"]));
                         if (!options) {
                             throw new Error(`${methodArgs["options"]} variable not found`);
                         }
@@ -167,7 +156,7 @@ class TemplateProcessor {
                         throw new Error(`Invalid method ${method} in template`);
                 }
                 prompt += completion;
-                nextTemplateIndexForPrompt = end + 2;
+                nextTemplateIndexForPrompt = end;
             }
         });
     }

package/dist/lib/templateParser.d.ts

@@ -0,0 +1,6 @@
+export default function templateParser(template: string): {
+    type: string;
+    name: string;
+    params: Record<string, number | string | string[]>;
+};
+//# sourceMappingURL=templateParser.d.ts.map

package/dist/lib/templateParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"templateParser.d.ts","sourceRoot":"","sources":["../../src/lib/templateParser.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;CACpD,CAyCA"}

package/dist/lib/templateParser.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function templateParser(template) {
+    const patternRegex = /{{(GEN|SEL)\s+(\w+)\s+([^}]+)}}/;
+    const match = template.match(patternRegex);
+    if (!match) {
+        return { type: "", name: "", params: {} };
+    }
+    const type = match[1];
+    const name = match[2];
+    const paramsString = match[3];
+    // Updated regex to handle complex array values
+    const paramsRegex = /(\w+)=((?:"(?:\\"|[^"])*"|\[(?:\\.|[^\]])*\]|\w+)(?:,\s*)?)/g;
+    let paramMatch;
+    const params = {};
+    while ((paramMatch = paramsRegex.exec(paramsString)) !== null) {
+        const key = paramMatch[1];
+        const value = paramMatch[2].trim();
+        if (type === "SEL" && key === "options") {
+            params[key] = value;
+        }
+        else if (!isNaN(Number(value))) {
+            params[key] = Number(value);
+        }
+        else if (value.startsWith('["')) {
+            try {
+                params[key] = JSON.parse(value);
+            }
+            catch (e) {
+                console.error("Error parsing JSON:", e);
+            }
+        }
+        else {
+            params[key] = value.replace(/^"|"$/g, "");
+        }
+    }
+    return {
+        type,
+        name,
+        params,
+    };
+}
+exports.default = templateParser;

package/dist/lib/token-generator.d.ts

@@ -2,7 +2,7 @@ import { ClientOptions } from "openai";
 import { CompletionCreateParams } from "openai/resources/completions.mjs";
 export declare abstract class AbstractTokenGenerator {
     abstract generateToken(prompt: string, logit_bias: Record<string, number>): Promise<string>;
-    abstract generateString(prompt: string, options: Record<string, string>): AsyncGenerator<string>;
+    abstract generateString(prompt: string, options: Record<string, number | string | string[]>): AsyncGenerator<string>;
 }
 /**
  * OpenAI Token Generator
@@ -18,6 +18,6 @@ export declare class OpenAITokenGenerator extends AbstractTokenGenerator {
         baseURL?: string;
     }, options?: ClientOptions, defaultCompletionParams?: CompletionCreateParams);
     generateToken(prompt: string, logit_bias: Record<string, number>): Promise<string>;
-    generateString(prompt: string, options: Record<string, string>): AsyncGenerator<string>;
+    generateString(prompt: string, options: Record<string, string | number | string[]>): AsyncGenerator<string>;
 }
 //# sourceMappingURL=token-generator.d.ts.map

package/dist/lib/token-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-generator.d.ts","sourceRoot":"","sources":["../../src/lib/token-generator.ts"],"names":[],"mappings":"AAAA,OAAe,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,8BAAsB,sBAAsB;IAC1C,QAAQ,CAAC,aAAa,CACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC;IAClB,QAAQ,CAAC,cAAc,CACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,cAAc,CAAC,MAAM,CAAC;CAC1B;AACD;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,sBAAsB;IAC9D,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,uBAAuB,CAAC,CAAyB;gBAGvD,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EACD,OAAO,CAAC,EAAE,aAAa,EACvB,uBAAuB,CAAC,EAAE,sBAAsB;IAYnC,aAAa,CAC1B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC;IAwCF,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,cAAc,CAAC,MAAM,CAAC;CAkB1B"}
+{"version":3,"file":"token-generator.d.ts","sourceRoot":"","sources":["../../src/lib/token-generator.ts"],"names":[],"mappings":"AAAA,OAAe,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE1E,8BAAsB,sBAAsB;IAC1C,QAAQ,CAAC,aAAa,CACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC;IAClB,QAAQ,CAAC,cAAc,CACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,GAClD,cAAc,CAAC,MAAM,CAAC;CAC1B;AACD;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,sBAAsB;IAC9D,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,uBAAuB,CAAC,CAAyB;gBAGvD,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,EACD,OAAO,CAAC,EAAE,aAAa,EACvB,uBAAuB,CAAC,EAAE,sBAAsB;IAYnC,aAAa,CAC1B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC;IAwCF,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,GAClD,cAAc,CAAC,MAAM,CAAC;CAc1B"}

package/dist/lib/token-generator.js

@@ -80,27 +80,24 @@ class OpenAITokenGenerator extends AbstractTokenGenerator {
         });
     }
     generateString(prompt, options) {
-        var _a, _b;
+        var _a;
         return __asyncGenerator(this, arguments, function* generateString_1() {
-            var _c, e_1, _d, _e;
-            const stream = yield __await(this.openai.completions.create(Object.assign(Object.assign(Object.assign({}, this.defaultCompletionParams), options), { stop: [
-                    ...(((_a = this.defaultCompletionParams) === null || _a === void 0 ? void 0 : _a.stop) || []),
-                    ...(options.stop ? options.stop.split(",") : []),
-                ], model: this.model, prompt, stream: true })));
+            var _b, e_1, _c, _d;
+            const stream = yield __await(this.openai.completions.create(Object.assign(Object.assign(Object.assign({}, this.defaultCompletionParams), options), { model: this.model, prompt, stream: true })));
             let result = "";
             try {
-                for (var _f = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = yield __await(stream_1.next()), _c = stream_1_1.done, !_c; _f = true) {
-                    _e = stream_1_1.value;
-                    _f = false;
-                    const chunk = _e;
-                    result += (_b = chunk.choices[0]) === null || _b === void 0 ? void 0 : _b.text;
+                for (var _e = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = yield __await(stream_1.next()), _b = stream_1_1.done, !_b; _e = true) {
+                    _d = stream_1_1.value;
+                    _e = false;
+                    const chunk = _d;
+                    result += (_a = chunk.choices[0]) === null || _a === void 0 ? void 0 : _a.text;
                     yield yield __await(result);
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (!_f && !_c && (_d = stream_1.return)) yield __await(_d.call(stream_1));
+                    if (!_e && !_b && (_c = stream_1.return)) yield __await(_c.call(stream_1));
                 }
                 finally { if (e_1) throw e_1.error; }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikugg/guidance",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -39,5 +39,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   },
-  "gitHead": "73073416020c05b15d4f58805fe914743e7ffd6e"
+  "gitHead": "9395167ca79f0cdc5394fbb037f4354fafb5357d"
 }