@coherentglobal/spark-execute-sdk 0.3.2 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "",
   "mains": "index.js",
   "browser": "dist/browser.js",
@@ -20,7 +20,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@coherentglobal/wasm-runner": "^0.0.45",
+    "@coherentglobal/wasm-runner": "^0.0.46",
     "@types/node": "^18.7.18",
     "axios": "^0.27.2",
     "chai": "^4.3.6",

package/src/browser.js

@@ -4,8 +4,7 @@ const { WasmRunner } = require("@coherentglobal/wasm-runner");
 const validate = require("./validate.js");
 const processModels = require("./models.js");
 
-let registry = [];
-let INVOCATION_CACHE = [];
+let registry = {};
 
 class Spark {
   /**
@@ -84,31 +83,6 @@ class Spark {
 
     return model;
   }
-  /**
-   *
-   * @param {string} versionId
-   */
-  async load(versionId) {
-    const { versionId: versionUuid, binary: modelPath } =
-      this._getModel(versionId);
-
-    console.log("SPARK load: ", modelPath);
-    if (!utils.isEmpty(registry)) {
-      registry = new WasmRunner();
-    }
-
-    await registry.append({
-      id: versionUuid,
-      url: modelPath,
-      // size,
-    });
-
-    INVOCATION_CACHE = [...INVOCATION_CACHE, { id: versionUuid }];
-  }
-
-  isExist = (model) => {
-    return registry.isExist(model);
-  };
 
   /**
    * Execute model
@@ -118,22 +92,14 @@ class Spark {
    * @returns {object}
    */
   async execute(input, version_id) {
-    if (!input.request_meta.version_id && !input.request_meta.version_uuid) {
-      input.request_meta.version_id = version_id;
-    }
     const versionID =
-      input.request_meta.version_id || input.request_meta.version_uuid;
+      version_id ||
+      input.request_meta.version_id ||
+      input.request_meta.version_uuid;
 
     const model = this._getModel(versionID);
 
-    await this.load(model.versionId);
-
-    // logger.info({
-    //   EventType: "ExecuteModel",
-    //   TextMessage: `Execute uuid: ${model.versionId}`,
-    // });
-
-    if (input && this.isExist(model.versionId)) {
+    if (input) {
       let modelUrl = "";
 
       if (
@@ -163,7 +129,6 @@ class Spark {
           headers: { ...{ "content-type": "application/json" }, ...header },
         };
 
-        // console.log("OPTIONS", options);
         modelUrl = new URL(
           `/${this.tenant}/api/v3/version/${input.request_meta.version_id}`,
           this.url
@@ -177,13 +142,18 @@ class Spark {
           throw new WasmRunnerErrors.UnauthorizedError();
         }
       } else if (this.isCompatible) {
-        const modelIndex = INVOCATION_CACHE.findIndex(
-          (item) => item.id === model.versionId
-        );
-
-        INVOCATION_CACHE[modelIndex].lastUsed = Date.now();
+        if (!(registry instanceof WasmRunner)) {
+          registry = new WasmRunner();
+        }
 
-        const result = await registry.execute(input, model.versionId, true);
+        if (!registry.isExist(versionID)) {
+          await registry.append({
+            id: versionID,
+            url: model.binary,
+            // size,
+          });
+        }
+        const result = await registry.execute(input, versionID);
 
         return result;
       } else {

package/src/node.js

@@ -6,9 +6,8 @@ const validate = require("./validate.js");
 const processModels = require("./models.js");
 const got = require("got");
 
-// const resolverDir = path.join(__dirname, "/tenant_resolver");
 let registry = [];
-let INVOCATION_CACHE = [];
+
 class Spark {
   /**
    * @param {object} config
@@ -52,12 +51,6 @@ class Spark {
      * @private
      */
     this.fallbackEnabled = false;
-
-    // (async () => {
-    //   if (!(await utils.isPathExist(resolverDir))) {
-    //     await fs.promises.mkdir(resolverDir, { mode: 0o750 });
-    //   }
-    // })();
   }
 
   /**
@@ -101,66 +94,6 @@ class Spark {
     return model;
   }
 
-  /**
-   *
-   * @param {string} versionId
-   */
-  async load(versionId) {
-    const { versionId: versionUuid, binary: modelPath } =
-      this._getModel(versionId);
-
-    logger.info({
-      EventType: "ModelInfo",
-      TextMessage: `Append model tenant: ${this.tenant} uuid: ${versionUuid}`,
-    });
-
-    // if (!registry[this.tenant]) {
-    if (!utils.isEmpty(registry)) {
-      // const resolverPath = path.join(
-      //   resolverDir,
-      //   `externalResolver_${this.tenant}.js`
-      // );
-
-      // const template = await fs.promises.readFile(
-      //   require.resolve("./resolver/externalResolver"),
-      //   {
-      //     encoding: "utf8",
-      //     flag: "r",
-      //   }
-      // );
-
-      // await fs.promises.writeFile(
-      //   resolverPath,
-      //   template.replace("%%tenant_to_replace%%", this.tenant)
-      // );
-
-      registry = new WasmRunner();
-    }
-
-    console.log("APPENDING");
-    await registry.append({
-      id: versionUuid,
-      url: modelPath,
-      // size,
-    });
-
-    INVOCATION_CACHE = [
-      ...INVOCATION_CACHE,
-      { id: versionUuid },
-      // { id: versionUuid, tenant: this.tenant },
-    ];
-  }
-
-  /**
-   * Check for exiting Model
-   *
-   * @param {string} model
-   * @returns {boolean}
-   */
-  isExist = (model) => {
-    return registry.isExist(model);
-  };
-
   /**
    * Execute model
    *
@@ -169,22 +102,21 @@ class Spark {
    * @returns {object}
    */
   async execute(input, version_id) {
-    if (!input.request_meta.version_id && !input.request_meta.version_uuid) {
-      input.request_meta.version_id = version_id;
-    }
     const versionID =
-      input.request_meta.version_id || input.request_meta.version_uuid;
+      version_id ||
+      input.request_meta.version_id ||
+      input.request_meta.version_uuid;
 
     const model = this._getModel(versionID);
 
-    await this.load(model.versionId);
+    // await this.load(model.versionId);
 
     logger.info({
       EventType: "ExecuteModel",
       TextMessage: `Execute uuid: ${model.versionId}`,
     });
 
-    if (this.isExist(model.versionId)) {
+    if (input) {
       let modelUrl = "";
 
       if (
@@ -226,13 +158,18 @@ class Spark {
           throw new WasmRunnerErrors.UnauthorizedError();
         }
       } else if (this.isCompatible) {
-        const modelIndex = INVOCATION_CACHE.findIndex(
-          (item) => item.id === model.versionId
-        );
-
-        INVOCATION_CACHE[modelIndex].lastUsed = Date.now();
+        if (!(registry instanceof WasmRunner)) {
+          registry = new WasmRunner();
+        }
 
-        const result = await registry.execute(input, model.versionId, true);
+        if (!registry.isExist(versionID)) {
+          await registry.append({
+            id: versionID,
+            url: model.binary,
+            // size,
+          });
+        }
+        const result = await registry.execute(input, versionID);
 
         return result;
       } else {

package/test/spark-sdk.test.js

@@ -1,26 +1,18 @@
-const Spark = require("../src/index");
+const Spark = require("../src/node");
 const dummyConfig = require("./mock-data/dummy-config.json");
 const should = require("should");
 const validMockData = require("./mock-data/valid.json");
 
 describe("Spark Execute", async function () {
-  it("should load model", async function () {
-    const tenant = "test";
-    const model = "dummy-model-uuid";
-    const spark = new Spark(dummyConfig);
-    await spark.load(model);
-
-    should(spark.isExist(tenant, model)).be.true();
-  });
-
   it("should execute model", async function () {
     const model = "dummy-model-uuid";
     const spark = new Spark(dummyConfig);
-    await spark.load(model);
 
     const res = await spark.execute(validMockData);
-    const data = JSON.parse(res);
-    // typeof res === "object" ? JSON.parse(JSON.stringify(res)) : res;
+
+    // const data = JSON.parse(res);
+    const data =
+      typeof res === "object" ? JSON.parse(JSON.stringify(res)) : res;
 
     data.response_data.should.exist;
     data.response_data.outputs.should.exist;

package/types/browser.d.ts

@@ -54,12 +54,6 @@ declare class Spark {
      * @returns {boolean}
      */
     _getModel(id: string): boolean;
-    /**
-     *
-     * @param {string} versionId
-     */
-    load(versionId: string): Promise<void>;
-    isExist: (model: any) => any;
     /**
      * Execute model
      *

package/types/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.js"],"names":[],"mappings":";AASA;IACE;;OAEG;IACH,oBAFW,MAAM,EAwChB;IArCC;;OAEG;IACH,eAAyC;IAMzC;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,iBAAwB;IACxB;;OAEG;IACH,cAAwC;IACxC;;OAEG;IACH,YAAc;IACd;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAwC;IACxC;;OAEG;IACH,wBAA4B;IAE9B;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAUlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IACD;;;OAGG;IACH,gBAFW,MAAM,iBAkBhB;IAED,6BAEE;IAEF;;;;;;OAMG;IACH,eAJW,MAAM,cACN,MAAM,GACJ,MAAM,CA6ElB;CACF"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.js"],"names":[],"mappings":";AAQA;IACE;;OAEG;IACH,oBAFW,MAAM,EAwChB;IArCC;;OAEG;IACH,eAAyC;IAMzC;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,iBAAwB;IACxB;;OAEG;IACH,cAAwC;IACxC;;OAEG;IACH,YAAc;IACd;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAwC;IACxC;;OAEG;IACH,wBAA4B;IAE9B;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAUlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED;;;;;;OAMG;IACH,eAJW,MAAM,cACN,MAAM,GACJ,MAAM,CAyElB;CACF"}

package/types/node.d.ts

@@ -54,18 +54,6 @@ declare class Spark {
      * @returns {boolean}
      */
     _getModel(id: string): boolean;
-    /**
-     *
-     * @param {string} versionId
-     */
-    load(versionId: string): Promise<void>;
-    /**
-     * Check for exiting Model
-     *
-     * @param {string} model
-     * @returns {boolean}
-     */
-    isExist: (model: string) => boolean;
     /**
      * Execute model
      *

package/types/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAWA;IACE;;OAEG;IACH,oBAFW,MAAM,EA+ChB;IA5CC;;OAEG;IACH,eAAyC;IAMzC;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,iBAAwB;IACxB;;OAEG;IACH,cAAwC;IACxC;;OAEG;IACH,YAAc;IACd;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAwC;IAExC;;OAEG;IACH,wBAA4B;IAS9B;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAclB;IAED;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED;;;OAGG;IACH,gBAFW,MAAM,iBA8ChB;IAED;;;;;OAKG;IACH,iBAHW,MAAM,KACJ,OAAO,CAIlB;IAEF;;;;;;OAMG;IACH,eAJW,MAAM,cACN,MAAM,GACJ,MAAM,CA6ElB;CAMF"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAUA;IACE;;OAEG;IACH,oBAFW,MAAM,EAyChB;IAtCC;;OAEG;IACH,eAAyC;IAMzC;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,iBAAwB;IACxB;;OAEG;IACH,cAAwC;IACxC;;OAEG;IACH,YAAc;IACd;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAwC;IAExC;;OAEG;IACH,wBAA4B;IAG9B;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAclB;IAED;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED;;;;;;OAMG;IACH,eAJW,MAAM,cACN,MAAM,GACJ,MAAM,CAmFlB;CAMF"}