modprompt 0.0.10 → 0.0.12

package/dist/cls.d.ts

@@ -8,10 +8,14 @@ declare class PromptTemplate {
     shots?: Array<TurnBlock>;
     stop?: Array<string>;
     linebreaks?: SpacingSlots;
+    afterShot?: string;
+    prefix?: string;
     _extraSystem: string;
     _extraAssistant: string;
+    _replacePrompt: string;
+    _replaceSystem: string;
     constructor(template: string | LmTemplate);
-    cloneTo(name: string): PromptTemplate;
+    cloneTo(template: string | LmTemplate, keepShots?: boolean): PromptTemplate;
     toJson(): LmTemplate;
     replaceSystem(msg: string): PromptTemplate;
     afterSystem(msg: string): PromptTemplate;

package/dist/interfaces.d.ts

@@ -20,5 +20,7 @@ interface LmTemplate {
     shots?: Array<TurnBlock>;
     stop?: Array<string>;
     linebreaks?: SpacingSlots;
+    afterShot?: string;
+    prefix?: string;
 }
 export { SpacingSlots, PromptBlock, TurnBlock, LmTemplate };

package/dist/mod.es.mjs

@@ -17,7 +17,7 @@ const templates = {
         "id": "llama",
         "name": "Llama",
         "system": {
-            "schema": "<s>[INST] <<SYS>>\n{system}\n<</SYS>>",
+            "schema": "[INST] <<SYS>>\n{system}\n<</SYS>>",
             "message": "You are a helpful, respectful and honest assistant. Always answer as helpfully as possible\n\nIf a question does not make any sense, or is not factually coherent, explain why instead of answering something not correct. If you don't know the answer to a question, please don't share false information."
         },
         "user": "{prompt}",
@@ -25,7 +25,8 @@ const templates = {
         "linebreaks": {
             "system": 2,
             "user": 0
-        }
+        },
+        "prefix": "<s>",
     },
     "llama_instruct": {
         "id": "llama_instruct",
@@ -39,9 +40,11 @@ const templates = {
     "mistral": {
         "id": "mistral",
         "name": "Mistral",
-        "user": "<s>[INST] {prompt}",
+        "user": "[INST] {prompt}",
         "assistant": " [/INST]",
-        "stop": ["</s>"]
+        "stop": ["</s>"],
+        "afterShot": "\n",
+        "prefix": "<s>",
     },
     "orca": {
         "id": "orca",
@@ -55,7 +58,7 @@ const templates = {
         "linebreaks": {
             "system": 2,
             "user": 2
-        }
+        },
     },
     "vicuna": {
         "id": "vicuna",
@@ -109,7 +112,9 @@ const templates = {
             "system": 1,
             "user": 1,
             "assistant": 1,
-        }
+        },
+        "stop": ["<|im_end|>"],
+        "afterShot": " <|im_end|>",
     },
     "mamba": {
         "id": "mamba",
@@ -166,8 +171,12 @@ class PromptTemplate {
     shots;
     stop;
     linebreaks;
+    afterShot;
+    prefix;
     _extraSystem = "";
     _extraAssistant = "";
+    _replacePrompt = "";
+    _replaceSystem = "";
     constructor(template) {
         let tpl;
         if (typeof template == "string") {
@@ -180,40 +189,34 @@ class PromptTemplate {
         this.name = tpl.name;
         this.user = tpl.user;
         this.assistant = tpl.assistant;
-        if (tpl?.system) {
-            this.system = tpl.system;
-        }
-        if (tpl?.shots) {
-            this.shots = tpl.shots;
-        }
-        if (tpl?.stop) {
-            this.stop = tpl.stop;
-        }
-        if (tpl?.linebreaks) {
-            this.linebreaks = tpl.linebreaks;
-        }
+        this.system = tpl.system;
+        this.shots = tpl.shots;
+        this.stop = tpl.stop;
+        this.linebreaks = tpl.linebreaks;
+        this.afterShot = tpl.afterShot;
+        this.prefix = tpl.prefix;
     }
-    cloneTo(name) {
-        const tpl = new PromptTemplate(name);
-        if (this?.system) {
-            tpl.system = this.system;
-        }
-        if (this?.shots) {
-            tpl.shots = this.shots;
-        }
-        if (this?.stop) {
-            tpl.stop = this.stop;
-        }
-        if (this?.linebreaks) {
-            tpl.linebreaks = this.linebreaks;
+    cloneTo(template, keepShots = true) {
+        const tpl = new PromptTemplate(template);
+        if (keepShots) {
+            if (this?.shots) {
+                this.shots.forEach((s) => {
+                    tpl.addShot(s.user, s.assistant);
+                });
+            }
         }
         if (this._extraSystem.length > 0) {
             tpl.afterSystem(this._extraSystem);
         }
+        if (this._replaceSystem.length > 0) {
+            tpl.replaceSystem(this._replaceSystem);
+        }
         if (this._extraAssistant.length > 0) {
             tpl.afterAssistant(this._extraAssistant);
         }
-        tpl.user = this.user;
+        if (this._replacePrompt.length > 0) {
+            tpl.replacePrompt(this._replacePrompt);
+        }
         return tpl;
     }
     toJson() {
@@ -241,16 +244,13 @@ class PromptTemplate {
         if (!this.system) {
             return this;
         }
-        this.system.message = msg;
+        this._replaceSystem = msg;
         return this;
     }
     afterSystem(msg) {
         if (!this.system) {
             return this;
         }
-        if (!this.system?.message) {
-            this.system.message = "";
-        }
         this._extraSystem = msg;
         return this;
     }
@@ -259,21 +259,25 @@ class PromptTemplate {
         return this;
     }
     replacePrompt(msg) {
-        this.user = this.user.replace("{prompt}", msg);
+        this._replacePrompt = msg;
         return this;
     }
     addShot(user, assistant) {
         if (!this?.shots) {
             this.shots = [];
         }
+        let _assistantMsg = assistant;
         this.shots.push({
             user: user,
-            assistant: assistant,
+            assistant: _assistantMsg,
         });
         return this;
     }
     render() {
         const buf = new Array();
+        if (this.prefix) {
+            buf.push(this.prefix);
+        }
         const _systemBlock = this._buildSystemBlock();
         if (_systemBlock.length > 0) {
             buf.push(_systemBlock);
@@ -284,7 +288,14 @@ class PromptTemplate {
         if (this?.shots) {
             for (const shot of this.shots) {
                 buf.push(this._buildUserBlock(shot.user));
-                buf.push(this._buildAssistantBlock(shot.assistant));
+                let _assistantMsg = shot.assistant;
+                if (this.afterShot) {
+                    _assistantMsg += this.afterShot;
+                }
+                else {
+                    _assistantMsg += "\n\n";
+                }
+                buf.push(this._buildAssistantBlock(_assistantMsg));
             }
         }
         buf.push(this._buildUserBlock());
@@ -299,25 +310,29 @@ class PromptTemplate {
         if (!this?.system) {
             return "";
         }
+        if (this._replaceSystem) {
+            this.system.message = this._replaceSystem;
+        }
         if (this.system?.message) {
             res = this.system.schema.replace("{system}", this.system.message);
-        }
-        else {
-            res = this.system.schema.replace("{system}", "");
-        }
-        if (this._extraSystem) {
-            res = res + this._extraSystem;
+            if (this._extraSystem) {
+                res = res + this._extraSystem;
+            }
         }
         return res;
     }
     _buildUserBlock(msg) {
         let buf = [];
-        buf.push(this.user);
+        let _userBlock = this.user;
+        if (this._replacePrompt.length > 0) {
+            _userBlock = _userBlock.replace("{prompt}", this._replacePrompt);
+        }
+        buf.push(_userBlock);
         if (this?.linebreaks?.user) {
             buf.push("\n".repeat(this.linebreaks.user));
         }
         if (msg) {
-            buf[0] = buf[0].replace("{prompt}", msg);
+            buf[0] = _userBlock.replace("{prompt}", msg);
         }
         return buf.join("");
     }
@@ -332,7 +347,7 @@ class PromptTemplate {
             buf.push("\n".repeat(this.linebreaks.assistant));
         }
         if (msg) {
-            buf[0] = buf[0] + msg + "\n";
+            buf[0] = buf[0] + msg;
         }
         return buf.join("");
     }

package/dist/mod.min.js

@@ -1 +1 @@
-var $tpl=function(s){"use strict";const t={alpaca:{id:"alpaca",name:"Alpaca",system:{schema:"{system}",message:"Below is an instruction that describes a task. Write a response that appropriately completes the request."},user:"### Instruction:\n{prompt}",assistant:"### Response:",linebreaks:{system:2,user:2}},llama:{id:"llama",name:"Llama",system:{schema:"<s>[INST] <<SYS>>\n{system}\n<</SYS>>",message:"You are a helpful, respectful and honest assistant. Always answer as helpfully as possible\n\nIf a question does not make any sense, or is not factually coherent, explain why instead of answering something not correct. If you don't know the answer to a question, please don't share false information."},user:"{prompt}",assistant:" [/INST] ",linebreaks:{system:2,user:0}},llama_instruct:{id:"llama_instruct",name:"Llama instruct",user:"[INST] {prompt}",assistant:" [/INST]",linebreaks:{user:1}},mistral:{id:"mistral",name:"Mistral",user:"<s>[INST] {prompt}",assistant:" [/INST]",stop:["</s>"]},orca:{id:"orca",name:"Orca",system:{schema:"### System:\n{system}",message:"You are an AI assistant that follows instruction extremely well. Help as much as you can."},user:"### User:\n{prompt}",assistant:"### Response:",linebreaks:{system:2,user:2}},vicuna:{id:"vicuna",name:"Vicuna",user:"USER: {prompt}",assistant:"### ASSISTANT:",linebreaks:{user:2}},vicuna_system:{id:"vicuna_system",name:"Vicuna system",system:{schema:"SYSTEM: {system}"},user:"USER: {prompt}",assistant:"### ASSISTANT:",linebreaks:{user:2}},wizard_vicuna:{id:"wizard_vicuna",name:"Wizard Vicuna",user:"### Human:\n{prompt}",assistant:"### ASSISTANT:",linebreaks:{user:2},stop:["<|endoftext|>"]},guanaco:{id:"guanaco",name:"Guanaco",user:"### Human: {prompt}",assistant:"### Assistant:",linebreaks:{user:1}},chatml:{id:"chatml",name:"ChatMl",system:{schema:"<|im_start|>system\n{system}\n<|im_end|>"},user:"<|im_start|>user\n{prompt}<|im_end|>",assistant:"<|im_start|>assistant",linebreaks:{system:1,user:1,assistant:1}},mamba:{id:"mamba",name:"Mamba",user:"<|prompt|>{prompt}</s>",assistant:"<|answer|>",stop:["<|endoftext|>"]},wizardlm:{id:"wizardlm",name:"WizardLM",system:{schema:"{system}",message:"You are a helpful AI assistant."},user:"USER: {prompt}",assistant:"ASSISTANT:",linebreaks:{user:1}},human_response:{id:"human_response",name:"Human response",user:"### HUMAN:\n{prompt}",assistant:"### RESPONSE:",linebreaks:{user:2,assistant:1}},coding_assistant:{id:"coding_assistant",name:"Coding assistant",system:{schema:"{system}",message:"You are a coding assistant that will help the user to resolve the following instruction:"},user:"### Instruction: {prompt}",assistant:"### Solution:",linebreaks:{user:2,system:1}}};class e{id;name;user;assistant;system;shots;stop;linebreaks;_extraSystem="";_extraAssistant="";constructor(s){let t;t="string"==typeof s?this._load(s):s,this.id=t.id,this.name=t.name,this.user=t.user,this.assistant=t.assistant,t?.system&&(this.system=t.system),t?.shots&&(this.shots=t.shots),t?.stop&&(this.stop=t.stop),t?.linebreaks&&(this.linebreaks=t.linebreaks)}cloneTo(s){const t=new e(s);return this?.system&&(t.system=this.system),this?.shots&&(t.shots=this.shots),this?.stop&&(t.stop=this.stop),this?.linebreaks&&(t.linebreaks=this.linebreaks),this._extraSystem.length>0&&t.afterSystem(this._extraSystem),this._extraAssistant.length>0&&t.afterAssistant(this._extraAssistant),t.user=this.user,t}toJson(){const s={id:this.id,name:this.name,user:this.user,assistant:this.assistant};return this?.system&&(this.system=this.system),this?.shots&&(this.shots=this.shots),this?.stop&&(this.stop=this.stop),this?.linebreaks&&(this.linebreaks=this.linebreaks),s}replaceSystem(s){return this.system?(this.system.message=s,this):this}afterSystem(s){return this.system?(this.system?.message||(this.system.message=""),this._extraSystem=s,this):this}afterAssistant(s){return this._extraAssistant=s,this}replacePrompt(s){return this.user=this.user.replace("{prompt}",s),this}addShot(s,t){return this?.shots||(this.shots=[]),this.shots.push({user:s,assistant:t}),this}render(){const s=new Array,t=this._buildSystemBlock();if(t.length>0&&(s.push(t),this?.linebreaks?.system&&s.push("\n".repeat(this.linebreaks.system))),this?.shots)for(const t of this.shots)s.push(this._buildUserBlock(t.user)),s.push(this._buildAssistantBlock(t.assistant));return s.push(this._buildUserBlock()),s.push(this._buildAssistantBlock()),s.join("")}prompt(s){return this.render().replace("{prompt}",s)}_buildSystemBlock(){let s="";return this?.system?(s=this.system?.message?this.system.schema.replace("{system}",this.system.message):this.system.schema.replace("{system}",""),this._extraSystem&&(s+=this._extraSystem),s):""}_buildUserBlock(s){let t=[];return t.push(this.user),this?.linebreaks?.user&&t.push("\n".repeat(this.linebreaks.user)),s&&(t[0]=t[0].replace("{prompt}",s)),t.join("")}_buildAssistantBlock(s){let t=[],e=this.assistant;return this._extraAssistant.length>0&&(e+=this._extraAssistant),t.push(e),this?.linebreaks?.assistant&&t.push("\n".repeat(this.linebreaks.assistant)),s&&(t[0]=t[0]+s+"\n"),t.join("")}_load(s){try{if(s in t)return t[s];throw new Error(`Template ${s} not found`)}catch(t){throw new Error(`Error loading template ${s}: ${t}`)}}}return s.PromptTemplate=e,s.templates=t,s}({});
+var $tpl=function(s){"use strict";const t={alpaca:{id:"alpaca",name:"Alpaca",system:{schema:"{system}",message:"Below is an instruction that describes a task. Write a response that appropriately completes the request."},user:"### Instruction:\n{prompt}",assistant:"### Response:",linebreaks:{system:2,user:2}},llama:{id:"llama",name:"Llama",system:{schema:"[INST] <<SYS>>\n{system}\n<</SYS>>",message:"You are a helpful, respectful and honest assistant. Always answer as helpfully as possible\n\nIf a question does not make any sense, or is not factually coherent, explain why instead of answering something not correct. If you don't know the answer to a question, please don't share false information."},user:"{prompt}",assistant:" [/INST] ",linebreaks:{system:2,user:0},prefix:"<s>"},llama_instruct:{id:"llama_instruct",name:"Llama instruct",user:"[INST] {prompt}",assistant:" [/INST]",linebreaks:{user:1}},mistral:{id:"mistral",name:"Mistral",user:"[INST] {prompt}",assistant:" [/INST]",stop:["</s>"],afterShot:"\n",prefix:"<s>"},orca:{id:"orca",name:"Orca",system:{schema:"### System:\n{system}",message:"You are an AI assistant that follows instruction extremely well. Help as much as you can."},user:"### User:\n{prompt}",assistant:"### Response:",linebreaks:{system:2,user:2}},vicuna:{id:"vicuna",name:"Vicuna",user:"USER: {prompt}",assistant:"### ASSISTANT:",linebreaks:{user:2}},vicuna_system:{id:"vicuna_system",name:"Vicuna system",system:{schema:"SYSTEM: {system}"},user:"USER: {prompt}",assistant:"### ASSISTANT:",linebreaks:{user:2}},wizard_vicuna:{id:"wizard_vicuna",name:"Wizard Vicuna",user:"### Human:\n{prompt}",assistant:"### ASSISTANT:",linebreaks:{user:2},stop:["<|endoftext|>"]},guanaco:{id:"guanaco",name:"Guanaco",user:"### Human: {prompt}",assistant:"### Assistant:",linebreaks:{user:1}},chatml:{id:"chatml",name:"ChatMl",system:{schema:"<|im_start|>system\n{system}\n<|im_end|>"},user:"<|im_start|>user\n{prompt}<|im_end|>",assistant:"<|im_start|>assistant",linebreaks:{system:1,user:1,assistant:1},stop:["<|im_end|>"],afterShot:" <|im_end|>"},mamba:{id:"mamba",name:"Mamba",user:"<|prompt|>{prompt}</s>",assistant:"<|answer|>",stop:["<|endoftext|>"]},wizardlm:{id:"wizardlm",name:"WizardLM",system:{schema:"{system}",message:"You are a helpful AI assistant."},user:"USER: {prompt}",assistant:"ASSISTANT:",linebreaks:{user:1}},human_response:{id:"human_response",name:"Human response",user:"### HUMAN:\n{prompt}",assistant:"### RESPONSE:",linebreaks:{user:2,assistant:1}},coding_assistant:{id:"coding_assistant",name:"Coding assistant",system:{schema:"{system}",message:"You are a coding assistant that will help the user to resolve the following instruction:"},user:"### Instruction: {prompt}",assistant:"### Solution:",linebreaks:{user:2,system:1}}};class e{id;name;user;assistant;system;shots;stop;linebreaks;afterShot;prefix;_extraSystem="";_extraAssistant="";_replacePrompt="";_replaceSystem="";constructor(s){let t;t="string"==typeof s?this._load(s):s,this.id=t.id,this.name=t.name,this.user=t.user,this.assistant=t.assistant,this.system=t.system,this.shots=t.shots,this.stop=t.stop,this.linebreaks=t.linebreaks,this.afterShot=t.afterShot,this.prefix=t.prefix}cloneTo(s,t=!0){const a=new e(s);return t&&this?.shots&&this.shots.forEach((s=>{a.addShot(s.user,s.assistant)})),this._extraSystem.length>0&&a.afterSystem(this._extraSystem),this._replaceSystem.length>0&&a.replaceSystem(this._replaceSystem),this._extraAssistant.length>0&&a.afterAssistant(this._extraAssistant),this._replacePrompt.length>0&&a.replacePrompt(this._replacePrompt),a}toJson(){const s={id:this.id,name:this.name,user:this.user,assistant:this.assistant};return this?.system&&(this.system=this.system),this?.shots&&(this.shots=this.shots),this?.stop&&(this.stop=this.stop),this?.linebreaks&&(this.linebreaks=this.linebreaks),s}replaceSystem(s){return this.system?(this._replaceSystem=s,this):this}afterSystem(s){return this.system?(this._extraSystem=s,this):this}afterAssistant(s){return this._extraAssistant=s,this}replacePrompt(s){return this._replacePrompt=s,this}addShot(s,t){this?.shots||(this.shots=[]);let e=t;return this.shots.push({user:s,assistant:e}),this}render(){const s=new Array;this.prefix&&s.push(this.prefix);const t=this._buildSystemBlock();if(t.length>0&&(s.push(t),this?.linebreaks?.system&&s.push("\n".repeat(this.linebreaks.system))),this?.shots)for(const t of this.shots){s.push(this._buildUserBlock(t.user));let e=t.assistant;this.afterShot?e+=this.afterShot:e+="\n\n",s.push(this._buildAssistantBlock(e))}return s.push(this._buildUserBlock()),s.push(this._buildAssistantBlock()),s.join("")}prompt(s){return this.render().replace("{prompt}",s)}_buildSystemBlock(){let s="";return this?.system?(this._replaceSystem&&(this.system.message=this._replaceSystem),this.system?.message&&(s=this.system.schema.replace("{system}",this.system.message),this._extraSystem&&(s+=this._extraSystem)),s):""}_buildUserBlock(s){let t=[],e=this.user;return this._replacePrompt.length>0&&(e=e.replace("{prompt}",this._replacePrompt)),t.push(e),this?.linebreaks?.user&&t.push("\n".repeat(this.linebreaks.user)),s&&(t[0]=e.replace("{prompt}",s)),t.join("")}_buildAssistantBlock(s){let t=[],e=this.assistant;return this._extraAssistant.length>0&&(e+=this._extraAssistant),t.push(e),this?.linebreaks?.assistant&&t.push("\n".repeat(this.linebreaks.assistant)),s&&(t[0]=t[0]+s),t.join("")}_load(s){try{if(s in t)return t[s];throw new Error(`Template ${s} not found`)}catch(t){throw new Error(`Error loading template ${s}: ${t}`)}}}return s.PromptTemplate=e,s.templates=t,s}({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modprompt",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Prompt templates for language models",
   "license": "MIT",
   "scripts": {