@coherentglobal/spark-execute-sdk 0.4.12 → 0.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "description": "",
   "main": "src/node.js",
   "browser": "dist/browser.js",
@@ -11,7 +11,7 @@
     "bundle:full": "browserify src/browser.js  --standalone Spark > dist/browser.js",
     "bundle:min": "browserify src/browser.js --standalone Spark | uglifyjs --compress --mangle --comments false > lib/sparkexecute.min.js",
     "test": "npx mocha --bail --exit --recursive --timeout 100000 --reporter nyan",
-    "cover": "nyc --check-coverage --reporter=lcov --lines 60 mocha --bail --exit --recursive --timeout 100000"
+    "cover": "nyc --check-coverage --reporter=lcov --lines 65 mocha --bail --exit --recursive --timeout 100000"
   },
   "engines": {
     "node": ">=14.0.0"
@@ -23,21 +23,19 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@coherentglobal/wasm-runner": "^0.0.63",
+    "@coherentglobal/wasm-runner": "^0.0.78",
     "@types/node": "^18.7.18",
     "axios": "^0.27.2",
-    "chai": "^4.3.6",
     "fs": "^0.0.1-security",
-    "got": "^11.8.3",
+    "got": "^11.8.6",
     "http-status-codes": "^2.2.0",
     "joi": "^17.6.0",
-    "jstify": "^0.14.0",
     "pino": "^8.5.0",
-    "prettier": "^2.7.1",
     "serialize-anything": "^1.2.3",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
+    "chai": "^4.3.6",
     "@babel/cli": "^7.18.10",
     "@babel/core": "^7.19.0",
     "@babel/plugin-transform-runtime": "^7.18.10",
@@ -53,7 +51,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "express": "^4.18.2",
     "jest": "^29.0.2",
-    "jsdoc": "^3.6.11",
+    "jsdoc": "^4.0.0",
     "mocha": "^10.0.0",
     "nock": "^13.2.9",
     "nyc": "^15.1.0",

package/src/error.js

@@ -1,3 +1,4 @@
+/* istanbul ignore file */
 class WasmError extends Error {
   constructor(message) {
     super(message);

package/src/logger.js

@@ -1,3 +1,3 @@
 const pino = require("pino");
 
-module.exports = pino({});
+module.exports = pino({ level: process.env.LOG_LEVEL || 'info' });

package/src/node.js

@@ -24,13 +24,14 @@ class Spark {
     this._registry = undefined;
 
     if (apmInstance) {
-      this.apm = apmInstance
+      this.apm = apmInstance;
     }
 
     /**
-    * @private
-    */
-    this.instanceid = option && option.instanceid ? option.instanceid : uuidv4()
+     * @private
+     */
+    this.instanceid =
+      option && option.instanceid ? option.instanceid : uuidv4();
 
     /**
      * @private
@@ -82,7 +83,7 @@ class Spark {
     /**
      * @private
      */
-    this.priority = ["model", "onlineEndpoint"];
+    this.priority = ["offlineModel", "onlineEndpoint"];
   }
 
   /**
@@ -91,7 +92,9 @@ class Spark {
    * @returns {object}
    */
   _models(nodegen) {
-    const models = nodegen.map((n, i) => processModels(n, i, undefined, this.instanceid));
+    const models = nodegen.map((n, i) =>
+      processModels(n, i, undefined, this.instanceid)
+    );
     return models;
   }
 
@@ -115,6 +118,17 @@ class Spark {
     }
   }
 
+  _isPriorityEnable(priority) {
+    switch (priority) {
+      case "offlineModel":
+        return this.model.length > 0;
+      case "onlineEndpoint":
+        return this.config?.sparkEndpoint !== undefined;
+      default:
+        return false;
+    }
+  }
+
   /**
    * Execute model
    *
@@ -129,15 +143,32 @@ class Spark {
       input.request_meta.version_uuid;
 
     let lookup = {
-      model: this.offlineModel.bind(this),
+      offlineModel: this.offlineModel.bind(this),
       onlineEndpoint: this.onlineModelEndpoint.bind(this),
     };
 
     let response;
+    let error;
 
-    response = await lookup[this.priority[0]](input, versionID);
-    if (response instanceof Error && this.config.sparkEndpoint !== undefined && false) {
-      response = await lookup[this.priority[1]](input, versionID);
+    for (let i = 0; i < this.priority.length; i++) {
+      try {
+        const priority = this.priority[i];
+        if (this._isPriorityEnable(priority)) {
+          response = await lookup[priority](input, versionID);
+          break;
+        }
+      } catch (err) {
+        logger.info({
+          EventType: "ExecuteModel.ERROR",
+          InstanceId: this.instanceid,
+          TextMessage: `Error while executing uuid: ${versionID} using priority:${this.priority[i]}`,
+        });
+        error = err;
+      }
+    }
+
+    if (!response && error !== undefined) {
+      throw error;
     }
 
     return response;
@@ -164,7 +195,6 @@ class Spark {
       return require.resolve(filePath);
     }
 
-
     let template = fs.readFileSync(
       require.resolve("./resolver/externalResolver.js"),
       {
@@ -172,53 +202,51 @@ class Spark {
       }
     );
 
-
-
-    template = template.replace(
-      "%%config_to_replace%%",
-      configPath
-    ).replace(
-      "%%instanceid%%",
-      this.instanceid
-    );
+    template = template
+      .replace("%%config_to_replace%%", configPath)
+      .replace("%%instanceid%%", this.instanceid);
 
     fs.writeFileSync(filePath, template);
     if (!this.isSerializedConfig) {
-      const config = { ...this.config }
+      const config = { ...this.config };
 
       if (config.nodeGenModels) {
-        config.nodeGenModels.forEach(m => {
+        config.nodeGenModels.forEach((m) => {
           if (m.binary) {
             const filePath = path.join(
               __dirname,
-              `resolver_temp/${this.instanceid}_model_${m.versionId || m.VersionId || uuidv4()}.binary`
+              `resolver_temp/${this.instanceid}_model_${
+                m.versionId || m.VersionId || uuidv4()
+              }.binary`
             );
 
-            fs.writeFileSync(filePath, Buffer.from(m.binary, 'base64'));
+            fs.writeFileSync(filePath, Buffer.from(m.binary, "base64"));
             m.binaryPath = filePath;
             m.binary = undefined;
           }
         });
       }
       const data = serializeObject.serialize(config);
-      fs.writeFileSync(configPath, Buffer.from(data))
+      fs.writeFileSync(configPath, Buffer.from(data));
     }
 
-    process.once('SIGINT', () => {
+    process.once("SIGINT", () => {
       try {
-        fs.rmSync(path.join(
-          __dirname,
-          `resolver_temp`), { recursive: true, force: true });
+        fs.rmSync(path.join(__dirname, `resolver_temp`), {
+          recursive: true,
+          force: true,
+        });
       } catch (err) {
         // Just ignore
       }
     });
 
-    process.once('exit', () => {
+    process.once("exit", () => {
       try {
-        fs.rmSync(path.join(
-          __dirname,
-          `resolver_temp`), { recursive: true, force: true });
+        fs.rmSync(path.join(__dirname, `resolver_temp`), {
+          recursive: true,
+          force: true,
+        });
       } catch (err) {
         // Just ignore
       }
@@ -234,7 +262,9 @@ class Spark {
         m?.metaData?.EngineInformation?.ServiceName === serviceName
     );
     if (!model) {
-      throw new WasmRunnerErrors.MissingModelError(`folder ${folderName} service ${serviceName}`);
+      throw new WasmRunnerErrors.MissingModelError(
+        `folder ${folderName} service ${serviceName}`
+      );
     }
     return model?.metaData?.VersionId || model?.versionId;
   }
@@ -273,7 +303,7 @@ class Spark {
           url: model?.binary || model?.binaryPath || "",
         });
       }
-
+     
       let result = await this._registry.execute(input, versionId);
 
       return result;
@@ -283,7 +313,7 @@ class Spark {
         InstanceId: this.instanceid,
         TextMessage: err.message,
       });
-      return err;
+      throw err;
     }
   }
 

package/src/resolver/externalResolver.js

@@ -1,6 +1,6 @@
 // const tenant = "%%tenant_to_replace%%";
-const Spark = require('../node')
-const logger = require('../logger')
+const Spark = require("../node");
+const logger = require("../logger");
 
 const CALL_TYPE = {
   0: "SparkService",
@@ -40,14 +40,16 @@ const XcallResBuilder = {
   },
 };
 
-let instance
+let instance;
 
 const sparkServiceVersionOne = async (requestData, context) => {
   const headers = context.headers;
   const folderName = requestData.folder_name;
   const serviceName = requestData.service_name;
   const upstreamVersionId = context.upstreamVersionId;
-  let requestBodyFromEngine
+
+  let requestBodyFromEngine;
+
   try {
     requestBodyFromEngine = JSON.parse(requestData.request_body);
   } catch (err) {
@@ -57,32 +59,59 @@ const sparkServiceVersionOne = async (requestData, context) => {
     // });
     // throw new error(`Downstream Request body is malform JSON ${requestData.request_body}`)
   }
-  const options = {}
+
+  const options = {};
 
   if (!instance) {
-    instance = new Spark({}, { serialize: true, configPath: "%%config_to_replace%%", instanceid: "%%instanceid%%" })
+    instance = new Spark(
+      {},
+      {
+        serialize: true,
+        configPath: "%%config_to_replace%%",
+        instanceid: "%%instanceid%%",
+      }
+    );
   }
+  try {
+    const modelId = instance._getModelByMeta(folderName, serviceName);
+
+    if (!requestBodyFromEngine?.request_meta) {
+      requestBodyFromEngine.request_meta = {};
+    }
+    requestBodyFromEngine.request_meta.version_id = modelId;
+    const results = await instance.execute(requestBodyFromEngine, modelId);
+    const response = XcallResBuilder.Json(
+      CALL_TYPE[0],
+      serviceName,
+      202,
+      "",
+      0,
+      results
+    );
+    return response;
+  } catch (err) {
+    const response = XcallResBuilder.Json(
+      CALL_TYPE[0],
+      serviceName,
+      err.StatusCode
+        ? err.StatusCode
+        : err.response
+        ? err.response.status
+        : 500,
+      err.errorCode ? err.errorCode : err.code ? err.code : err.name,
+      err.response && err.response.timings
+        ? err.response.timings.end - err.response.timings.start
+        : 0,
+      {}
+    );
 
-  const modelId = instance._getModelByMeta(folderName, serviceName)
-  if (!requestBodyFromEngine?.request_meta) {
-    requestBodyFromEngine.request_meta = {}
+    return response;
   }
-  requestBodyFromEngine.request_meta.version_id = modelId
-  const results = await instance.execute(requestBodyFromEngine, modelId)
-  const response = XcallResBuilder.Json(
-    CALL_TYPE[0],
-    serviceName,
-    202,
-    "",
-    0,
-    results
-  );
-  return response;
-}
+};
 
 module.exports = {
   sparkService: async (requestData, context) => {
-    const results = await sparkServiceVersionOne(requestData, context)
-    return results
-  }
-};
+    const results = await sparkServiceVersionOne(requestData, context);
+    return results;
+  },
+};

package/src/services/entityStore.js

@@ -28,7 +28,7 @@ const request = got.extend({
             extendError = "MODEL_NOT_FOUND";
           }
 
-          logger.info({
+          logger.error({
             EventType: "EntityStoreError",
             TextMessage: `EntityStoreError: ${JSON.stringify(response.body)}`,
           });
@@ -81,7 +81,8 @@ const getDocumentByVersionId = async (versionUuid, token) => {
   ).toString();
   logger.info({
     EventType: "GetVersionID",
-    TextMessage: `getDocumentByVersionId , ${url}`,
+    TextMessage: `getDocumentByVersionId`,
+    url
   });
   const options = {
     headers: {
@@ -104,7 +105,8 @@ const getParameterSetById = async (versionUuid, token, tenant = "coherent") => {
     ).toString();
     logger.info({
       EventType: "ParameterSet",
-      TextMessage: `getParameterSetById , ${url}`,
+      TextMessage: `getParameterSetById`,
+      url
     });
     const options = {
       headers: {
@@ -140,7 +142,9 @@ const downloadModelFile = async (url, versionUuid, headers) => {
 
   logger.info({
     EventType: "DownloadModelFile",
-    TextMessage: `downloadModelFile url:${url}, versionUuid:${versionUuid}`,
+    TextMessage: `downloadModelFile`,
+    url,
+    versionUuid
   });
   const tmpWasm = tmp.fileSync({
     dir: TMP_DIR,
@@ -151,7 +155,9 @@ const downloadModelFile = async (url, versionUuid, headers) => {
   wasmDestination.write(getWasmDocument);
   logger.info({
     EventType: "DownloadComplete",
-    TextMessage: `downloadModelFile complete url:${url}, versionUuid:${versionUuid}`,
+    TextMessage: `downloadModelFile complete`,
+    versionUuid,
+    url
   });
   return tmpWasm.name;
 };
@@ -164,7 +170,9 @@ const downloadJSON = async (url, versionUuid, headers) => {
     if (!fs.existsSync(filePath)) {
       logger.info({
         EventType: "DownloadJson",
-        TextMessage: `downloadJSON url:${url}, versionUuid:${versionUuid}`,
+        TextMessage: `downloadJSON`,
+        versionUuid,
+        url
       });
       const tmpWasm = tmp.fileSync({
         dir: TMP_DIR,
@@ -174,7 +182,9 @@ const downloadJSON = async (url, versionUuid, headers) => {
       wasmDestination.write(getDocument);
       logger.info({
         EventType: "JsonDownloaded",
-        TextMessage: `downloadJSON complete url:${url}, versionUuid:${versionUuid}`,
+        TextMessage: `downloadJSON complete`,
+        versionUuid,
+        url
       });
     }
 
@@ -194,7 +204,8 @@ const downloadModel = async (versionUuid, token) => {
   const modelFile = await downloadModelFile(downloadUrl, versionUuid);
   logger.info({
     EventType: "ModelDownloaded",
-    TextMessage: `downloadModel complete  versionUuid:${versionUuid}`,
+    TextMessage: `downloadModel complete`,
+    versionUuid
   });
   return modelFile;
 };
@@ -241,10 +252,10 @@ const getModelViaFolder = async (folder, model, headers) => {
   const output = await request.get(folderSparkUrl, options);
   const body = output.body ? JSON.parse(output.body) : {}
   let response = ""
-  if(body) {
+  if (body) {
     const documents = body.data.documents
-    const findModelFromDocuments = documents.find( name => name.name === `${model}.c1engine`)
-    if(findModelFromDocuments) response = findModelFromDocuments.latestVersionId
+    const findModelFromDocuments = documents.find(name => name.name === `${model}.c1engine`)
+    if (findModelFromDocuments) response = findModelFromDocuments.latestVersionId
   }
   return response
 }

package/types/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.js"],"names":[],"mappings":"AAoDA;IAII,UAAgB;CAInB;AArCD;IAII,aAAiC;IACjC,iBAAqB;CAExB;AAED;IACE,qDAOC;IAFC,aAAgB;IAChB,UAAkB;CAErB;AAqBD;IACE,uCAKC;IAHC,YAA2B;IAE3B,aAAgC;CAEnC;AAED;IACE,uCAKC;IAHC,YAA2B;IAE3B,aAAqC;CAExC;AAnCD;IAII,aAA+B;IAC/B,iBAAqB;CAExB;AAlDD;IACE,0BAGC;IADC,eAAiB;IAGnB;;;;;MAOC;IAED;;;MAKC;CACF"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.js"],"names":[],"mappings":"AAqDA;IAII,UAAgB;CAInB;AArCD;IAII,aAAiC;IACjC,iBAAqB;CAExB;AAED;IACE,qDAOC;IAFC,aAAgB;IAChB,UAAkB;CAErB;AAqBD;IACE,uCAKC;IAHC,YAA2B;IAE3B,aAAgC;CAEnC;AAED;IACE,uCAKC;IAHC,YAA2B;IAE3B,aAAqC;CAExC;AAnCD;IAII,aAA+B;IAC/B,iBAAqB;CAExB;AAlDD;IACE,0BAGC;IADC,eAAiB;IAGnB;;;;;MAOC;IAED;;;MAKC;CACF"}

package/types/node.d.ts

@@ -10,8 +10,8 @@ declare class Spark {
     private _registry;
     apm: any;
     /**
-    * @private
-    */
+     * @private
+     */
     private instanceid;
     config: object;
     /**
@@ -58,6 +58,7 @@ declare class Spark {
      * @returns {object}
      */
     validateConfig(config: object): object;
+    _isPriorityEnable(priority: any): boolean;
     /**
      * Execute model
      *
@@ -72,7 +73,7 @@ declare class Spark {
     /**
      * Remove Model
      */
-    offlineModel(input: any, versionID: any): Promise<unknown>;
+    offlineModel(input: any, versionID: any): Promise<import("@coherentglobal/wasm-runner/dist/types.js").ResponseObject>;
     onlineModelEndpoint(input: any, versionID: any): Promise<any>;
 }
 //# sourceMappingURL=node.d.ts.map

package/types/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAeA;IACE;;OAEG;IACH,oBAFW,MAAM,+CAoEhB;IAjEC;;OAEG;IACH,kBAA0B;IAGxB,SAAsB;IAGxB;;MAEE;IACF,mBAA4E;IAU1E,eAAsB;IAMxB;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAqD;IAErD;;OAEG;IACH,yBAAmD;IAEnD;;OAEG;IACH,iBAA2C;IAG7C;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAelB;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAqBlB;IAED,+BAkFC;IAED,wDAUC;IAED,uBAKC;IAED;;OAEG;IAGH,2DAkCC;IAED,8DA6CC;CACF"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAeA;IACE;;OAEG;IACH,oBAFW,MAAM,+CAqEhB;IAlEC;;OAEG;IACH,kBAA0B;IAGxB,SAAsB;IAGxB;;OAEG;IACH,mBAC4D;IAU1D,eAAsB;IAMxB;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAqD;IAErD;;OAEG;IACH,yBAAmD;IAEnD;;OAEG;IACH,iBAAkD;IAGpD;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAOlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAelB;IAED,0CASC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAsClB;IAED,+BA+EC;IAED,wDAYC;IAED,uBAKC;IAED;;OAEG;IAGH,sHAkCC;IAED,8DA6CC;CACF"}

package/types/resolver/externalResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"externalResolver.d.ts","sourceRoot":"","sources":["../../src/resolver/externalResolver.js"],"names":[],"mappings":"AAmFgB,8EAGb"}
+{"version":3,"file":"externalResolver.d.ts","sourceRoot":"","sources":["../../src/resolver/externalResolver.js"],"names":[],"mappings":"AAgHgB,8EAGb"}

package/types/services/entityStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entityStore.d.ts","sourceRoot":"","sources":["../../src/services/entityStore.js"],"names":[],"mappings":"AAgEA;;;;;;;;;;GAUG;AACH,yFAoBC;AAtDD;;;;;;;;;;GAUG;AACH,2DAFa,MAAM,CAYlB;AA6DD;;;;;;;;;;;;;GAaG;AACH,gGAmBC;AAiCD,6EAUC;AAMD,yFAeC;AA3HD,iGAsBC;AAuGD;;;;;;GAMG;AACH,0FAoBC"}
+{"version":3,"file":"entityStore.d.ts","sourceRoot":"","sources":["../../src/services/entityStore.js"],"names":[],"mappings":"AAgEA;;;;;;;;;;GAUG;AACH,yFAqBC;AAvDD;;;;;;;;;;GAUG;AACH,2DAFa,MAAM,CAYlB;AA+DD;;;;;;;;;;;;;GAaG;AACH,gGAuBC;AAqCD,6EAWC;AAMD,yFAeC;AArID,iGAuBC;AAgHD;;;;;;GAMG;AACH,0FAoBC"}