@coherentglobal/spark-execute-sdk 0.4.15 → 0.4.16

package/dist/browser.js

@@ -1056,15 +1056,30 @@ var WasmRunner = /*#__PURE__*/function () {
    *
    * @param {RunnerConfig} wasmRunnerConfig
    */
-  function WasmRunner() {
-    var license = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+  function WasmRunner(wasmRunnerConfig) {
     var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultCallback;
+    var license = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
     (0, _classCallCheck2["default"])(this, WasmRunner);
     utils.isCompatible();
     this.license = license;
     this.callback = callback;
     this.models = [];
     this._logger = new logger_1["default"]();
+    if (!utils.isEmpty(wasmRunnerConfig)) {
+      if (Array.isArray(wasmRunnerConfig)) {
+        this.models = wasmRunnerConfig.map(function (wsconfig) {
+          return {
+            id: wsconfig.id,
+            url: wsconfig.url
+          };
+        });
+      } else if ((0, _typeof2["default"])(wasmRunnerConfig) === "object") {
+        this.models = [{
+          id: wasmRunnerConfig.id,
+          url: wasmRunnerConfig.url
+        }];
+      }
+    }
   }
   (0, _createClass2["default"])(WasmRunner, [{
     key: "setLogLevel",
@@ -7399,13 +7414,13 @@ var Spark = /*#__PURE__*/function () {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     (0, _classCallCheck2["default"])(this, Spark);
     /**
-    * @private
-    */
+     * @private
+     */
     this._registry = undefined;
 
     /**
-    * @private
-    */
+     * @private
+     */
     if (options !== null && options !== void 0 && options.log) {
       this.logger = options.log;
     }
@@ -7442,8 +7457,8 @@ var Spark = /*#__PURE__*/function () {
     this.priority = ["model", "onlineEndpoint"];
 
     /**
-    * @private
-    */
+     * @private
+     */
     this.model = this._models((_this$config6 = this.config) === null || _this$config6 === void 0 ? void 0 : _this$config6.nodeGenModels);
   }
   (0, _createClass2["default"])(Spark, [{
@@ -7462,7 +7477,7 @@ var Spark = /*#__PURE__*/function () {
     value: function _models(nodegen) {
       this.log({
         eventType: "spark._models",
-        msg: 'Parse models'
+        msg: "Parse models"
       });
       var models = [];
       for (var i = 0; i < nodegen.length; i++) {
@@ -7492,7 +7507,7 @@ var Spark = /*#__PURE__*/function () {
     value: function validateConfig(config) {
       var start = Date.now();
       this.log({
-        eventType: 'spark.validateconfig.start'
+        eventType: "spark.validateconfig.start"
       });
       var _validate = validate(config),
         value = _validate.value,
@@ -7500,7 +7515,7 @@ var Spark = /*#__PURE__*/function () {
       if (!error) {
         var end = Date.now();
         this.log({
-          eventType: 'spark.validateconfig.startend',
+          eventType: "spark.validateconfig.startend",
           duration: end - start
         });
         return value;
@@ -7508,7 +7523,7 @@ var Spark = /*#__PURE__*/function () {
         var message = JSON.stringify(error.details);
         var _end = Date.now();
         this.log({
-          eventType: 'spark.validateconfig.startend.error',
+          eventType: "spark.validateconfig.startend.error",
           duration: _end - start
         });
         throw new Error("ValidationError: ".concat(message));
@@ -7560,7 +7575,7 @@ var Spark = /*#__PURE__*/function () {
                   _context.next = 2;
                   break;
                 }
-                throw new WasmRunnerErrors.BadRequestError('Spark initialize is required. Please call initialize method');
+                throw new WasmRunnerErrors.BadRequestError("Spark initialize is required. Please call initialize method");
               case 2:
                 versionID = version_id || (input === null || input === void 0 ? void 0 : (_input$request_meta = input.request_meta) === null || _input$request_meta === void 0 ? void 0 : _input$request_meta.version_id) || (input === null || input === void 0 ? void 0 : (_input$request_meta2 = input.request_meta) === null || _input$request_meta2 === void 0 ? void 0 : _input$request_meta2.version_uuid);
                 lookup = {
@@ -7598,7 +7613,7 @@ var Spark = /*#__PURE__*/function () {
     value: function () {
       var _offlineModel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(input, versionID) {
         var _this = this;
-        var model, modelVersionId, callback, _model2$metaData$Engi, _model2$metaData, _model2$metaData$Engi2, _model2$metaData$Engi3, _model2$metaData2, _model2$metaData2$Eng, _model2, result;
+        var model, modelVersionId, callback, _model2$metaData$Engi, _model2$metaData, _model2$metaData$Engi2, _model2$metaData$Engi3, _model2$metaData2, _model2$metaData2$Eng, _model2, retry, MAX_RETRY, error, duration, result, _model$metaData$Engin6, _model$metaData5, _model$metaData5$Engi, _model$metaData$Engin7, _model$metaData6, _model$metaData6$Engi, start;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -7670,7 +7685,7 @@ var Spark = /*#__PURE__*/function () {
                       return _ref2.apply(this, arguments);
                     };
                   }();
-                  this._registry = new WasmRunner("", callback);
+                  this._registry = new WasmRunner(undefined, callback, "");
                 }
                 if (this._registry.isExist(modelVersionId)) {
                   _context3.next = 10;
@@ -7687,21 +7702,61 @@ var Spark = /*#__PURE__*/function () {
                   }
                 });
               case 10:
-                _context3.next = 12;
+                retry = 0;
+                MAX_RETRY = 3;
+                error = true;
+                duration = 0;
+              case 14:
+                if (!(error && retry <= MAX_RETRY)) {
+                  _context3.next = 32;
+                  break;
+                }
+                _context3.next = 17;
                 return this._registry.execute(input, modelVersionId, function () {});
-              case 12:
+              case 17:
                 result = _context3.sent;
+                if (!result.executeError) {
+                  _context3.next = 27;
+                  break;
+                }
+                retry++;
+                start = Date.now(); // this.log({ eventType: "spark.execute", msg: 'Retry Execute' });
+                this._registry.remove(modelVersionId);
+                _context3.next = 24;
+                return this._registry.append({
+                  id: modelVersionId,
+                  url: model.binary,
+                  meta: {
+                    folder_name: (_model$metaData$Engin6 = model === null || model === void 0 ? void 0 : (_model$metaData5 = model.metaData) === null || _model$metaData5 === void 0 ? void 0 : (_model$metaData5$Engi = _model$metaData5.EngineInformation) === null || _model$metaData5$Engi === void 0 ? void 0 : _model$metaData5$Engi.ProductName) !== null && _model$metaData$Engin6 !== void 0 ? _model$metaData$Engin6 : "",
+                    service_name: (_model$metaData$Engin7 = model === null || model === void 0 ? void 0 : (_model$metaData6 = model.metaData) === null || _model$metaData6 === void 0 ? void 0 : (_model$metaData6$Engi = _model$metaData6.EngineInformation) === null || _model$metaData6$Engi === void 0 ? void 0 : _model$metaData6$Engi.ServiceName) !== null && _model$metaData$Engin7 !== void 0 ? _model$metaData$Engin7 : ""
+                  }
+                });
+              case 24:
+                duration = duration + (Date.now() - start);
+                _context3.next = 30;
+                break;
+              case 27:
+                error = false;
+                if (retry > 0 && result.response_meta && result.response_meta.process_time !== undefined) {
+                  result.response_meta.process_time = result.response_meta.process_time + duration;
+                }
                 return _context3.abrupt("return", result);
-              case 16:
-                _context3.prev = 16;
+              case 30:
+                _context3.next = 14;
+                break;
+              case 32:
+                _context3.next = 37;
+                break;
+              case 34:
+                _context3.prev = 34;
                 _context3.t0 = _context3["catch"](4);
                 return _context3.abrupt("return", _context3.t0);
-              case 19:
+              case 37:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee3, this, [[4, 16]]);
+        }, _callee3, this, [[4, 34]]);
       }));
       function offlineModel(_x3, _x4) {
         return _offlineModel.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "description": "",
   "main": "src/node.js",
   "browser": "dist/browser.js",
@@ -23,7 +23,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@coherentglobal/wasm-runner": "^0.0.80",
+    "@coherentglobal/wasm-runner": "^0.0.82",
     "@types/node": "^18.7.18",
     "axios": "^0.27.2",
     "fs": "^0.0.1-security",

package/src/browser.js

@@ -5,23 +5,21 @@ const validate = require("./validate.js");
 const processModels = require("./models.js");
 const findModel = require("./findModels.js");
 
-
-
 class Spark {
   /**
    * @param {object} config
    */
   constructor(config, options = {}) {
     /**
-    * @private
-    */
+     * @private
+     */
     this._registry = undefined;
 
     /**
-    * @private
-    */
+     * @private
+     */
     if (options?.log) {
-      this.logger = options.log
+      this.logger = options.log;
     }
 
     /**
@@ -59,13 +57,13 @@ class Spark {
     this.priority = ["model", "onlineEndpoint"];
 
     /**
-    * @private
-    */
+     * @private
+     */
     this.model = this._models(this.config?.nodeGenModels);
   }
 
   log(msg) {
-    this.logger && this.logger(msg)
+    this.logger && this.logger(msg);
   }
 
   /**
@@ -74,16 +72,23 @@ class Spark {
    * @returns {object}
    */
   _models(nodegen) {
-    this.log({ eventType: "spark._models", msg: 'Parse models' })
+    this.log({ eventType: "spark._models", msg: "Parse models" });
     const models = [];
 
     for (let i = 0; i < nodegen.length; i++) {
       const startDate = Date.now();
-      this.log({ eventType: "spark._models.processModels.start", msg: `Start process model ${i}` });
+      this.log({
+        eventType: "spark._models.processModels.start",
+        msg: `Start process model ${i}`,
+      });
       const model = processModels(nodegen[i], i, this.log.bind(this));
       const endDate = Date.now();
-      this.log({ eventType: "spark._models.processModels.end", msg: `End process model ${i}`, duration: endDate - startDate });
-      models.push(model)
+      this.log({
+        eventType: "spark._models.processModels.end",
+        msg: `End process model ${i}`,
+        duration: endDate - startDate,
+      });
+      models.push(model);
     }
 
     return models;
@@ -95,16 +100,22 @@ class Spark {
    */
   validateConfig(config) {
     const start = Date.now();
-    this.log({ eventType: 'spark.validateconfig.start' })
+    this.log({ eventType: "spark.validateconfig.start" });
     const { value, error } = validate(config);
     if (!error) {
       const end = Date.now();
-      this.log({ eventType: 'spark.validateconfig.startend', duration: end - start })
+      this.log({
+        eventType: "spark.validateconfig.startend",
+        duration: end - start,
+      });
       return value;
     } else {
       const message = JSON.stringify(error.details);
       const end = Date.now();
-      this.log({ eventType: 'spark.validateconfig.startend.error', duration: end - start })
+      this.log({
+        eventType: "spark.validateconfig.startend.error",
+        duration: end - start,
+      });
       throw new Error(`ValidationError: ${message}`);
     }
   }
@@ -140,7 +151,9 @@ class Spark {
    */
   async execute(input, version_id) {
     if (this.model == undefined) {
-      throw new WasmRunnerErrors.BadRequestError('Spark initialize is required. Please call initialize method')
+      throw new WasmRunnerErrors.BadRequestError(
+        "Spark initialize is required. Please call initialize method"
+      );
     }
 
     const versionID =
@@ -211,7 +224,7 @@ class Spark {
           }
           return hasVersionId;
         };
-        this._registry = new WasmRunner("", callback);
+        this._registry = new WasmRunner(undefined, callback, "");
       }
 
       if (!this._registry.isExist(modelVersionId)) {
@@ -226,8 +239,35 @@ class Spark {
           },
         });
       }
-      const result = await this._registry.execute(input, modelVersionId, () => { });
-      return result;
+      let retry = 0;
+      const MAX_RETRY = 3;
+      let error = true;
+      let duration = 0
+      while (error && retry <= MAX_RETRY) {
+        const result = await this._registry.execute(input, modelVersionId, () => { });
+
+        if (result.executeError) {
+          retry++;
+          const start = Date.now()
+          // this.log({ eventType: "spark.execute", msg: 'Retry Execute' });
+          this._registry.remove(modelVersionId);
+          await this._registry.append({
+            id: modelVersionId,
+            url: model.binary,
+            meta: {
+              folder_name: model?.metaData?.EngineInformation?.ProductName ?? "",
+              service_name: model?.metaData?.EngineInformation?.ServiceName ?? "",
+            },
+          });
+          duration = duration + (Date.now() - start);
+        } else {
+          error = false;
+          if (retry > 0 && result.response_meta && result.response_meta.process_time !== undefined) {
+            result.response_meta.process_time = result.response_meta.process_time + duration;
+          }
+          return result;
+        }
+      }
     } catch (err) {
       return err;
     }

package/types/browser.d.ts

@@ -5,8 +5,8 @@ declare class Spark {
      */
     constructor(config: object, options?: {});
     /**
-    * @private
-    */
+     * @private
+     */
     private _registry;
     logger: any;
     /**
@@ -38,8 +38,8 @@ declare class Spark {
      */
     private priority;
     /**
-    * @private
-    */
+     * @private
+     */
     private model;
     log(msg: any): void;
     /**
@@ -69,7 +69,7 @@ declare class Spark {
      * @returns {object}
      */
     execute(input: object, version_id?: string | undefined): object;
-    offlineModel(input: any, versionID: any): Promise<unknown>;
+    offlineModel(input: any, versionID: any): Promise<any>;
     onlineModelEndpoint(input: any, versionID: any): Promise<any>;
 }
 //# sourceMappingURL=browser.d.ts.map

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,gBAqDhB;IAlDC;;MAEE;IACF,kBAA0B;IAMxB,YAAyB;IAG3B;;OAEG;IACH,eAAyC;IAEzC;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAE3C;;OAEG;IACH,iBAA2C;IAE3C;;MAEE;IACF,cAAqD;IAGvD,oBAEC;IAED;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAgBlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAgBlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,wDASC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAuBlB;IAED,2DAsEC;IAED,8DA6CC;CACF"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.js"],"names":[],"mappings":";AAOA;IACE;;OAEG;IACH,oBAFW,MAAM,gBAqDhB;IAlDC;;OAEG;IACH,kBAA0B;IAMxB,YAAyB;IAG3B;;OAEG;IACH,eAAyC;IAEzC;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAE3C;;OAEG;IACH,iBAA2C;IAE3C;;OAEG;IACH,cAAqD;IAGvD,oBAEC;IAED;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAuBlB;IACD;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAsBlB;IACD;;;;OAIG;IACH,cAHW,MAAM,GACJ,OAAO,CAOnB;IAED,wDASC;IAED;;;;;;OAMG;IACH,eAJW,MAAM,oCAEJ,MAAM,CAyBlB;IAED,uDAiGC;IAED,8DA6CC;CACF"}