@mikugg/guidance 0.16.0 → 0.17.0

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-import * as Tokenizer from "./lib/tokenizer";
-import * as TokenGenerator from "./lib/token-generator";
+import * as Agents from "./lib/Agent";
 import * as Template from "./lib/template";
-export { Tokenizer, TokenGenerator, Template };
+import * as TokenGenerator from "./lib/token-generator";
+import * as Tokenizer from "./lib/tokenizer";
+export { Agents, Template, TokenGenerator, Tokenizer };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC"}

package/dist/index.js

@@ -23,10 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Template = exports.TokenGenerator = exports.Tokenizer = void 0;
-const Tokenizer = __importStar(require("./lib/tokenizer"));
-exports.Tokenizer = Tokenizer;
-const TokenGenerator = __importStar(require("./lib/token-generator"));
-exports.TokenGenerator = TokenGenerator;
+exports.Tokenizer = exports.TokenGenerator = exports.Template = exports.Agents = void 0;
+const Agents = __importStar(require("./lib/Agent"));
+exports.Agents = Agents;
 const Template = __importStar(require("./lib/template"));
 exports.Template = Template;
+const TokenGenerator = __importStar(require("./lib/token-generator"));
+exports.TokenGenerator = TokenGenerator;
+const Tokenizer = __importStar(require("./lib/tokenizer"));
+exports.Tokenizer = Tokenizer;

package/dist/lib/Agent.d.ts

@@ -0,0 +1,24 @@
+export interface AgentPromptConfiguration<AgentInputs extends string[], AgentOutputs extends string[]> {
+    instruction: string;
+    description: string;
+    shotTemplate: {
+        input: string;
+        output: string;
+    };
+    shots: {
+        inputs: Record<AgentInputs[number], string>;
+        outputs: Record<AgentOutputs[number], string>;
+    }[];
+    instructSettings?: {
+        system?: string;
+        instruction?: string;
+        input?: string;
+        output?: string;
+    };
+}
+export declare class AgentPrompt<AgentInputs extends string[], AgentOutputs extends string[]> {
+    private configuration;
+    constructor(configuration: AgentPromptConfiguration<AgentInputs, AgentOutputs>);
+    generatePrompt(inputs: Record<AgentInputs[number], string>): string;
+}
+//# sourceMappingURL=Agent.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../../src/lib/Agent.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,wBAAwB,CAEvC,WAAW,SAAS,MAAM,EAAE,EAC5B,YAAY,SAAS,MAAM,EAAE;IAE7B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE;QACL,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5C,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;KAC/C,EAAE,CAAC;IACJ,gBAAgB,CAAC,EAAE;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,qBAAa,WAAW,CACtB,WAAW,SAAS,MAAM,EAAE,EAC5B,YAAY,SAAS,MAAM,EAAE;IAE7B,OAAO,CAAC,aAAa,CAOnB;gBAGA,aAAa,EAAE,wBAAwB,CAAC,WAAW,EAAE,YAAY,CAAC;IAc7D,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM;CA+B3E"}

package/dist/lib/Agent.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AgentPrompt = void 0;
+function replaceTemplate(template, key, value) {
+    let regex = new RegExp(`{{GEN ${key}[^}]*}}`, "g");
+    template = template.replace(regex, value);
+    regex = new RegExp(`{{SEL ${key}[^}]*}}`, "g");
+    return template.replace(regex, value);
+}
+class AgentPrompt {
+    constructor(configuration) {
+        this.configuration = Object.assign(Object.assign({}, configuration), { instructSettings: Object.assign({ system: "", instruction: "\n### Instruction:\n", input: "\n### Input:\n", output: "\n### Response:\n" }, configuration.instructSettings) });
+    }
+    generatePrompt(inputs) {
+        let prompt = this.configuration.instructSettings.system;
+        prompt += this.configuration.description;
+        prompt += this.configuration.instructSettings.instruction;
+        prompt += this.configuration.instruction;
+        this.configuration.shots.forEach((shot) => {
+            prompt += this.configuration.instructSettings.input;
+            prompt += this.configuration.shotTemplate.input;
+            Object.keys(shot.inputs).forEach((key) => {
+                const value = shot.inputs[key];
+                prompt = prompt.replace(new RegExp(`{{${key}}}`, "g"), value);
+            });
+            prompt += this.configuration.instructSettings.output;
+            prompt += this.configuration.shotTemplate.output;
+            Object.keys(shot.outputs).forEach((key) => {
+                const value = shot.outputs[key];
+                prompt = prompt.replace(new RegExp(`{{${key}}}`, "g"), value);
+                prompt = replaceTemplate(prompt, key, value);
+            });
+        });
+        prompt += this.configuration.instructSettings.input;
+        prompt += this.configuration.shotTemplate.input;
+        Object.keys(inputs).forEach((key) => {
+            const value = inputs[key];
+            prompt = prompt.replace(new RegExp(`{{${key}}}`, "g"), value);
+        });
+        prompt += this.configuration.instructSettings.output;
+        prompt += this.configuration.shotTemplate.output;
+        return prompt;
+    }
+}
+exports.AgentPrompt = AgentPrompt;

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;AAG3D,oBAAY,gBAAgB;IAC1B,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAED,qBAAa,iBAAiB,CAAC,eAAe,GAAG,SAAS;IACxD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,SAAS,CAA0C;gBAGzD,SAAS,EAAE,iBAAiB,EAC5B,SAAS,EAAE,sBAAsB,CAAC,eAAe,CAAC;IAM7C,YAAY,CAAC,SAAS,EAAE,iBAAiB;IAIzC,YAAY,CAAC,SAAS,EAAE,sBAAsB,CAAC,eAAe,CAAC;IAIzD,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EACzC,UAAU,CAAC,EAAE,eAAe,GAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAajB,qBAAqB,CACjC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EACzC,UAAU,CAAC,EAAE,eAAe,GAC3B,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC;IAyI5C,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,CAAC,eAAe,GAAG,SAAS;IACxD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,SAAS,CAA0C;gBAGzD,SAAS,EAAE,iBAAiB,EAC5B,SAAS,EAAE,sBAAsB,CAAC,eAAe,CAAC;IAM7C,YAAY,CAAC,SAAS,EAAE,iBAAiB;IAIzC,YAAY,CAAC,SAAS,EAAE,sBAAsB,CAAC,eAAe,CAAC;IAIzD,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EACzC,UAAU,CAAC,EAAE,eAAe,GAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAajB,qBAAqB,CACjC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EACzC,UAAU,CAAC,EAAE,eAAe,GAC3B,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC;IA0I5C,OAAO,CAAC,cAAc;CAQvB"}

package/dist/lib/template.js

@@ -122,9 +122,10 @@ class TemplateProcessor {
                         if (!options) {
                             throw new Error(`${methodArgs["options"]} variable not found`);
                         }
+                        prompt = this.tokenizer.decodeString(this.tokenizer.encodeString(prompt));
                         // Add all options to trie
                         options.forEach((option) => {
-                            const prefix = this.tokenizer.encodeString(prompt + option + this.tokenizer.getEOS());
+                            const prefix = this.tokenizer.encodeString(prompt + option);
                             trie.addPrefix(prefix);
                         });
                         let currentPrefixPrompt = prompt;
@@ -136,8 +137,7 @@ class TemplateProcessor {
                                 // If there is only one child, we complete
                                 completion = this.tokenizer
                                     .decodeString(trie.getWord(currentPrefix))
-                                    .substring(prompt.length)
-                                    .replace(this.tokenizer.getEOS(), "");
+                                    .substring(prompt.length);
                                 break;
                             }
                             else {
@@ -146,7 +146,7 @@ class TemplateProcessor {
                                     acc[child.toString()] = 100;
                                     return acc;
                                 }, {});
-                                const top_logprobs = yield __await(this.generator.generateTokenLogProgs(prompt, logit_bias, reqOptions));
+                                const top_logprobs = yield __await(this.generator.generateTokenLogProgs(currentPrefixPrompt, logit_bias, reqOptions));
                                 // get max top_logpobs that is in logit_bias
                                 let max = -Infinity;
                                 let max_key = "";

package/dist/lib/token-generator.js

@@ -55,7 +55,7 @@ class OpenAITokenGenerator extends AbstractTokenGenerator {
                 model: this.model,
                 prompt,
                 logit_bias,
-                logprobs: 10,
+                logprobs: 5,
                 max_tokens: 1,
             }, reqOptions);
             const logprobsResult = ((_a = result.choices[0].logprobs) === null || _a === void 0 ? void 0 : _a.top_logprobs) || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikugg/guidance",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,6 +10,7 @@
   "scripts": {
     "build": "tsc",
     "demo": "ts-node demo/index.ts",
+    "demo-agent": "ts-node demo/agent.ts",
     "lint": "eslint . --ext .ts",
     "prepare": "npm run build",
     "test": "jest"
@@ -39,5 +40,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   },
-  "gitHead": "e2cc1463ebb7a360deda3459dc1c32a1f2c4bb4d"
+  "gitHead": "bc2da106abe2ac0473544691c85f5f1731b6edc1"
 }