llm-exe 1.0.2 → 2.0.0-beta.2

package/dist/utils/modules/json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObjectStringified = exports.maybeParseJSON = exports.maybeStringifyJSON = void 0;
+exports.helpJsonMarkup = exports.isObjectStringified = exports.maybeParseJSON = exports.maybeStringifyJSON = void 0;
 const maybeStringifyJSON = (objOrMaybeString) => {
     if (!objOrMaybeString || typeof objOrMaybeString !== "object") {
         return objOrMaybeString;
@@ -18,7 +18,8 @@ const maybeParseJSON = (objOrMaybeJSON) => {
         return {};
     if (typeof objOrMaybeJSON === "string") {
         try {
-            const result = JSON.parse(objOrMaybeJSON);
+            const cleanMarkdown = helpJsonMarkup(objOrMaybeJSON);
+            const result = JSON.parse(cleanMarkdown);
             if (typeof result === "object" && result !== null) {
                 return result;
             }
@@ -54,4 +55,23 @@ function isObjectStringified(maybeObject) {
     return canDecode;
 }
 exports.isObjectStringified = isObjectStringified;
+function helpJsonMarkup(str) {
+    if (typeof str !== "string") {
+        return str;
+    }
+    // TODO: improve?
+    const input = str.trim();
+    const markdownJsonStartsWith = "```json";
+    const markdownJsonEndsWith = "```";
+    if (input.substring(0, markdownJsonStartsWith.length) ===
+        markdownJsonStartsWith &&
+        input.substring(input.length - markdownJsonEndsWith.length, input.length) ===
+            markdownJsonEndsWith) {
+        return str
+            .substring(markdownJsonStartsWith.length, input.length - markdownJsonEndsWith.length)
+            ?.trim();
+    }
+    return str;
+}
+exports.helpJsonMarkup = helpJsonMarkup;
 //# sourceMappingURL=json.js.map

package/dist/utils/modules/json.js.map

@@ -1 +1 @@
-{"version":3,"file":"json.js","sourceRoot":"src/","sources":["utils/modules/json.ts"],"names":[],"mappings":";;;AAAO,MAAM,kBAAkB,GAAG,CAAC,gBAAqB,EAAU,EAAE;IAClE,IAAI,CAAC,gBAAgB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;QAC7D,OAAO,gBAAgB,CAAC;KACzB;IACD,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,KAAK,EAAE,GAAE;IAClB,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B;AAEK,MAAM,cAAc,GAAG,CAC5B,cAAmB,EACT,EAAE;IACZ,IAAI,CAAC,cAAc;QAAE,OAAO,EAAc,CAAC;IAE3C,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QACtC,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC1C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE;gBACjD,OAAO,MAAkB,CAAC;aAC3B;SACF;QAAC,OAAO,KAAK,EAAE;YACd,oBAAoB;SACrB;KACF;IAED,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,KAAK,IAAI,EAAE;QACjE,OAAO,cAA0B,CAAC;KACnC;IAED,OAAO,EAAc,CAAC;AACxB,CAAC,CAAC;AArBW,QAAA,cAAc,kBAqBzB;AAEF,SAAgB,mBAAmB,CAAC,WAAmB;IACrD,IAAI,OAAO,WAAW,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAElD,MAAM,aAAa,GACjB,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG;QACnC,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;IAE5E,MAAM,YAAY,GAChB,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG;QACnC,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;IAE5E,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY,EAAE;QACnC,OAAO,KAAK,CAAC;KACd;IAED,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI;QACF,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACxB,SAAS,GAAG,IAAI,CAAC;KAClB;IAAC,OAAO,KAAK,EAAE;QACd,SAAS,GAAG,KAAK,CAAC;KACnB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAvBD,kDAuBC"}
+{"version":3,"file":"json.js","sourceRoot":"src/","sources":["utils/modules/json.ts"],"names":[],"mappings":"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"}

package/dist/utils/modules/openai.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateOpenAiPrice = void 0;
+const utils_1 = require("../../utils");
 const const_1 = require("../const");
 /**
  * Calculate the API call cost based on input and output tokens.
@@ -14,7 +15,7 @@ function calculateOpenAiPrice(model, input_tokens, output_tokens) {
         output_cost: 0,
         total_cost: 0,
     };
-    const price = const_1.OpenAiPricing[model];
+    const price = (0, utils_1.get)(const_1.OpenAiPricing, model, [0, 0, 0]);
     if (price) {
         const [amount, inputAmount, outputAmount] = price;
         if (inputAmount && input_tokens) {

package/dist/utils/modules/openai.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["utils/modules/openai.ts"],"names":[],"mappings":";;;AACA,oCAAyC;AAEzC;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,KAAsB,EACtB,YAAoB,EACpB,aAAqB;IAErB,MAAM,GAAG,GAAG;QACV,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,CAAC;KACd,CAAC;IAEF,MAAM,KAAK,GAAG,qBAAa,CAAC,KAAK,CAAC,CAAC;IACnC,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC;QAClD,IAAI,WAAW,IAAI,YAAY,EAAE;YAC/B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,GAAG,WAAW,CAAC;SAC3D;QACD,IAAI,YAAY,IAAI,aAAa,EAAE;YACjC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,GAAG,YAAY,CAAC;SAC9D;QAED,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;KAC5D;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAzBD,oDAyBC"}
+{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["utils/modules/openai.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAE9B,oCAAyC;AAEzC;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,KAAsB,EACtB,YAAoB,EACpB,aAAqB;IAErB,MAAM,GAAG,GAAG;QACV,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,CAAC;KACd,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,WAAG,EAAC,qBAAa,EAAE,KAAK,EAAE,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAA;IAChD,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC;QAClD,IAAI,WAAW,IAAI,YAAY,EAAE;YAC/B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,GAAG,WAAW,CAAC;SAC3D;QACD,IAAI,YAAY,IAAI,aAAa,EAAE;YACjC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,GAAG,YAAY,CAAC;SAC9D;QAED,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;KAC5D;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAzBD,oDAyBC"}

package/dist/utils/modules/replaceTemplateString.d.ts

@@ -1,2 +1,3 @@
 import { PromptTemplateOptions } from "../../types";
 export declare function replaceTemplateString(templateString?: string, substitutions?: Record<string, any>, configuration?: PromptTemplateOptions): string;
+export declare function replaceTemplateStringAsync(templateString?: string, substitutions?: Record<string, any>, configuration?: PromptTemplateOptions): Promise<string>;

package/dist/utils/modules/replaceTemplateString.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceTemplateString = void 0;
+exports.replaceTemplateStringAsync = exports.replaceTemplateString = void 0;
 const handlebars_1 = require("./handlebars");
+const hbs_1 = require("./handlebars/hbs");
 function replaceTemplateString(templateString, substitutions = {}, configuration = {
     helpers: [],
     partials: [],
 }) {
     if (!templateString)
         return templateString || "";
-    const hbs = (0, handlebars_1.useHandlebars)(configuration);
-    const template = hbs.compile(templateString);
+    const instance = (0, handlebars_1.useHandlebars)(configuration, hbs_1.hbs);
+    const template = instance.compile(templateString);
     const res = template(substitutions, {
         allowedProtoMethods: {
             substring: true,
@@ -18,4 +19,19 @@ function replaceTemplateString(templateString, substitutions = {}, configuration
     return res;
 }
 exports.replaceTemplateString = replaceTemplateString;
+function replaceTemplateStringAsync(templateString, substitutions = {}, configuration = {
+    helpers: [],
+    partials: [],
+}) {
+    if (!templateString)
+        return Promise.resolve(templateString || "");
+    const instance = (0, handlebars_1.useHandlebars)(configuration, hbs_1.hbsAsync);
+    const template = instance.compile(templateString);
+    return template(substitutions, {
+        allowedProtoMethods: {
+            substring: true,
+        },
+    });
+}
+exports.replaceTemplateStringAsync = replaceTemplateStringAsync;
 //# sourceMappingURL=replaceTemplateString.js.map

package/dist/utils/modules/replaceTemplateString.js.map

@@ -1 +1 @@
-{"version":3,"file":"replaceTemplateString.js","sourceRoot":"src/","sources":["utils/modules/replaceTemplateString.ts"],"names":[],"mappings":";;;AACA,6CAA6C;AAE7C,SAAgB,qBAAqB,CACnC,cAAuB,EACvB,gBAAqC,EAAE,EACvC,gBAAuC;IACrC,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,EAAE;CACb;IAED,IAAI,CAAC,cAAc;QAAE,OAAO,cAAc,IAAI,EAAE,CAAC;IAEjD,MAAM,GAAG,GAAG,IAAA,0BAAa,EAAC,aAAa,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,EAAE;QAClC,mBAAmB,EAAE;YACnB,SAAS,EAAE,IAAI;SAChB;KACF,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAlBD,sDAkBC"}
+{"version":3,"file":"replaceTemplateString.js","sourceRoot":"src/","sources":["utils/modules/replaceTemplateString.ts"],"names":[],"mappings":";;;AACA,6CAA6C;AAC7C,0CAAoD;AACpD,SAAgB,qBAAqB,CACnC,cAAuB,EACvB,gBAAqC,EAAE,EACvC,gBAAuC;IACrC,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,EAAE;CACb;IAED,IAAI,CAAC,cAAc;QAAE,OAAO,cAAc,IAAI,EAAE,CAAC;IAEjD,MAAM,QAAQ,GAAG,IAAA,0BAAa,EAAC,aAAa,EAAE,SAAG,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,EAAE;QAClC,mBAAmB,EAAE;YACnB,SAAS,EAAE,IAAI;SAChB;KACF,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAlBD,sDAkBC;AAGD,SAAgB,0BAA0B,CACxC,cAAuB,EACvB,gBAAqC,EAAE,EACvC,gBAAuC;IACrC,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,EAAE;CACb;IAED,IAAI,CAAC,cAAc;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,IAAA,0BAAa,EAAC,aAAa,EAAE,cAAQ,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAClD,OAAO,QAAQ,CAAC,aAAa,EAAE;QAC7B,mBAAmB,EAAE;YACnB,SAAS,EAAE,IAAI;SAChB;KACF,CAA+B,CAAA;AAClC,CAAC;AAhBD,gEAgBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-exe",
-  "version": "1.0.2",
+  "version": "2.0.0-beta.2",
   "description": "Simplify building LLM-powered apps with easy-to-use base components, supporting text and chat-based prompts with handlebars template engine, output parsers, and flexible function calling capabilities.",
   "keywords": [
     "ai",
@@ -23,7 +23,7 @@
   "scripts": {
     "tsc": "tsc --project ./tsconfig.json && tsc-alias -p ./tsconfig.json -w",
     "tsc-ci": "tsc --project ./tsconfig.json && tsc-alias -p ./tsconfig.json",
-    "tsc-build": "tsc --project ./tsconfig-build.json  && tsc-alias -p tsconfig-build.json",
+    "tsc-build": "tsc --project ./tsconfig-build.json  && tsc-alias -p tsconfig-build.json -w",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --coverage --forceExit",
     "docs:dev": "vuepress dev docs --clean-temp --clean-cache",
     "docs:build": "vuepress build docs --clean-temp --clean-cache",
@@ -35,7 +35,8 @@
   "license": "MIT",
   "dependencies": {
     "exponential-backoff": "3.1.1",
-    "handlebars": "4.7.7",
+    "handlebars": "4.7.6",
+    "handlebars-async-helpers": "^1.0.6",
     "json-schema-to-ts": "^2.8.2",
     "jsonschema": "1.4.1",
     "lodash.camelcase": "^4.3.0",
@@ -45,7 +46,6 @@
     "lodash.set": "^4.3.2",
     "lodash.unescape": "^4.0.1",
     "object-assign-deep": "0.4.0",
-    "openai": "^3.2.1",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
@@ -68,6 +68,7 @@
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.5.0",
+    "openai": "^4.24.1",
     "prettier": "^2.8.8",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",