@coherentglobal/spark-execute-sdk 0.8.1 → 0.8.3

package/README.md

@@ -94,7 +94,7 @@ const config = {
 Instantiate the Model Class.
 
 ```js
-const Spark = new Spark(config);
+const spark = new Spark(config);
 ```
 
 ### Execute
@@ -104,7 +104,7 @@ const Spark = new Spark(config);
 Perform the calculation. The sdk will use the request_meta.version_uuid of input argument to locate the model
 
 ```js
-const response = await Spark.execute(input).catch((err) => {
+const response = await spark.execute(input).catch((err) => {
   // Do something here
 });
 ```
@@ -112,7 +112,7 @@ const response = await Spark.execute(input).catch((err) => {
 or
 
 ```js
-const response = await Spark.execute(input, version_id).catch((err) => {
+const response = await spark.execute(input, version_id).catch((err) => {
   // Do something here
 });
 ```
@@ -122,7 +122,7 @@ const response = await Spark.execute(input, version_id).catch((err) => {
 Perform the calculation with cancellationToken. The sdk will use the request_meta.version_uuid of input argument to locate the model
 
 ```js
-const execute = Spark.executeWithCancellationToken(input)
+const execute = spark.executeWithCancellationToken(input)
 
 // Cancel the execution (best effort)
 execute.cancellationToken.cancel()
@@ -139,7 +139,7 @@ execute.response.then((result) => {
 or
 
 ```js
-const execute = Spark.executeWithCancellationToken(input)
+const execute = spark.executeWithCancellationToken(input)
 
 // Cancel the execution (best effort)
 execute.cancellationToken.cancel()

package/dist/browser.js

@@ -12022,7 +12022,7 @@ var Spark = /*#__PURE__*/function () {
    * @param {object} config
    */
   function Spark(config) {
-    var _this$config$sparkEnd, _this$config, _this$config$sparkEnd2, _this$config2, _ref, _this$config$sparkEnd3, _this$config3, _this$config4, _this$config$sparkEnd4, _this$config5, _this$config6, _this$config7, _this$config8;
+    var _this$config$sparkEnd, _this$config, _this$config$sparkEnd2, _this$config2, _ref, _this$config$sparkEnd3, _this$config3, _this$config4, _this$config$sparkEnd4, _this$config5, _this$config6, _this$config7, _this$config8, _this$config9;
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     (0, _classCallCheck2["default"])(this, Spark);
     /**
@@ -12071,13 +12071,13 @@ var Spark = /*#__PURE__*/function () {
     /**
      * @private
      */
-    this.model = this._models((_this$config6 = this.config) === null || _this$config6 === void 0 ? void 0 : _this$config6.nodeGenModels);
+    this.model = this._models(((_this$config6 = this.config) === null || _this$config6 === void 0 ? void 0 : _this$config6.nodegenModels) || ((_this$config7 = this.config) === null || _this$config7 === void 0 ? void 0 : _this$config7.nodeGenModels));
     this.modelCount = 0;
     this._offlinePreventCleanupModels = [];
     this._offlineLastExecution = {};
     this._offlineLastExecuting = {};
-    this.offlineMaxService = ((_this$config7 = this.config) === null || _this$config7 === void 0 ? void 0 : _this$config7.offlineMaxService) || parseInt(process.env.OFFLINE_MAX_SERVICE) || 20;
-    this.timeout = ((_this$config8 = this.config) === null || _this$config8 === void 0 ? void 0 : _this$config8.timeout) || parseInt(process.env.TIMEOUT_MS) || 60000;
+    this.offlineMaxService = ((_this$config8 = this.config) === null || _this$config8 === void 0 ? void 0 : _this$config8.offlineMaxService) || parseInt(process.env.OFFLINE_MAX_SERVICE) || 20;
+    this.timeout = ((_this$config9 = this.config) === null || _this$config9 === void 0 ? void 0 : _this$config9.timeout) || parseInt(process.env.TIMEOUT_MS) || 60000;
   }
   (0, _createClass2["default"])(Spark, [{
     key: "log",
@@ -12144,7 +12144,7 @@ var Spark = /*#__PURE__*/function () {
           eventType: "spark.validateconfig.startend.error",
           duration: _end - start
         });
-        throw new Error("ValidationError: ".concat(message));
+        throw new Error("SDK Setup ValidationError: ".concat(message));
       }
     }
     /**
@@ -12209,7 +12209,7 @@ var Spark = /*#__PURE__*/function () {
      */
   }, {
     key: "execute",
-    value: function () {
+    value: (function () {
       var _execute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(input, version_id, cancellationToken) {
         var _input$request_meta, _input$request_meta2;
         var versionID, lookup, response;
@@ -12251,7 +12251,7 @@ var Spark = /*#__PURE__*/function () {
         return _execute.apply(this, arguments);
       }
       return execute;
-    }()
+    }())
   }, {
     key: "offlineModel",
     value: function () {
@@ -12271,14 +12271,18 @@ var Spark = /*#__PURE__*/function () {
           MAX_RETRY,
           error,
           duration,
+          result,
           xcallChainId,
           appendedInput,
-          result,
           _model$metaData$Engin5,
           _model$metaData5,
           _model$metaData$Engin6,
           _model$metaData6,
           start,
+          _model$metaData$Engin7,
+          _model$metaData7,
+          _model$metaData$Engin8,
+          _model$metaData8,
           _args3 = arguments;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -12475,25 +12479,44 @@ var Spark = /*#__PURE__*/function () {
               _context3.next = 24;
               break;
             case 50:
-              _context3.next = 59;
+              if (!(retry > MAX_RETRY && result)) {
+                _context3.next = 57;
+                break;
+              }
+              this._registry.remove(versionId);
+              console.log('Reappend failed model');
+              _context3.next = 55;
+              return this._registry.append({
+                id: versionId,
+                url: model.binary,
+                meta: {
+                  folder_name: (_model$metaData$Engin7 = model === null || model === void 0 || (_model$metaData7 = model.metaData) === null || _model$metaData7 === void 0 || (_model$metaData7 = _model$metaData7.EngineInformation) === null || _model$metaData7 === void 0 ? void 0 : _model$metaData7.ProductName) !== null && _model$metaData$Engin7 !== void 0 ? _model$metaData$Engin7 : "",
+                  service_name: (_model$metaData$Engin8 = model === null || model === void 0 || (_model$metaData8 = model.metaData) === null || _model$metaData8 === void 0 || (_model$metaData8 = _model$metaData8.EngineInformation) === null || _model$metaData8 === void 0 ? void 0 : _model$metaData8.ServiceName) !== null && _model$metaData$Engin8 !== void 0 ? _model$metaData$Engin8 : ""
+                }
+              });
+            case 55:
+              this._offlineLastExecuting[versionId] = false;
+              return _context3.abrupt("return", result);
+            case 57:
+              _context3.next = 66;
               break;
-            case 52:
-              _context3.prev = 52;
+            case 59:
+              _context3.prev = 59;
               _context3.t0 = _context3["catch"](2);
               this._offlineLastExecution[versionId] = Date.now();
               this._offlineLastExecuting[versionId] = false;
               if (!(_context3.t0 instanceof ModelExecuteCancelled)) {
-                _context3.next = 58;
+                _context3.next = 65;
                 break;
               }
               throw new WasmRunnerErrors.ExecuteCancelled(versionId);
-            case 58:
+            case 65:
               return _context3.abrupt("return", _context3.t0);
-            case 59:
+            case 66:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 52]]);
+        }, _callee3, this, [[2, 59]]);
       }));
       function offlineModel(_x4, _x5, _x6) {
         return _offlineModel.apply(this, arguments);
@@ -12951,7 +12974,7 @@ var findModel = function findModel(requestMeta, nodegenModels) {
       }).reverse();
     }
   } else {
-    throw new Error("Model not found. requestMeta: " + JSON.stringify(requestMeta));
+    throw new Error("SDK Setup Error: Model not found. requestMeta: " + JSON.stringify(requestMeta));
   }
   if (model.length === 0) {
     throw new WasmRunnerErrors.MissingModelError(requestMeta === null || requestMeta === void 0 ? void 0 : requestMeta.version_id);
@@ -13016,7 +13039,7 @@ var getAuthHeaders = function getAuthHeaders(token, authType, tenant) {
   } else if (authType === "bearerToken") {
     authHeaders.authorization = "Bearer ".concat(token);
   } else {
-    throw new Error("Invalid auth type ".concat(authType));
+    throw new Error("Authentication Error: Invalid auth type ".concat(authType));
   }
   return authHeaders;
 };
@@ -13258,6 +13281,20 @@ module.exports = processModels;
 "use strict";
 
 var Joi = require("joi");
+modelConfig = Joi.array().items(Joi.object({
+  versionId: Joi.string(),
+  type: Joi.string(),
+  binary: [Joi.string().allow(""), Joi["function"]().allow(""), Joi.object({
+    servicename: Joi.string(),
+    wasm: Joi.string(),
+    js: Joi.string(),
+    data: Joi.string()
+  })],
+  binaryPath: Joi.string(),
+  metaData: Joi.object(),
+  replica: Joi.number().integer().min(1),
+  preventCleanup: Joi["boolean"]()
+}));
 var rules = Joi.object({
   replica: Joi.number().integer().min(1),
   sparkEndpoint: Joi.object({
@@ -13270,25 +13307,13 @@ var rules = Joi.object({
     // allow fns
     bearerToken: [Joi.string().allow(""), Joi["function"]().allow("")] // allow strings/fns
   }).and("url", "tenant", "authType"),
-  nodeGenModels: Joi.array().items(Joi.object({
-    versionId: Joi.string(),
-    type: Joi.string(),
-    binary: [Joi.string().allow(""), Joi["function"]().allow(""), Joi.object({
-      servicename: Joi.string(),
-      wasm: Joi.string(),
-      js: Joi.string(),
-      data: Joi.string()
-    })],
-    binaryPath: Joi.string(),
-    metaData: Joi.object(),
-    replica: Joi.number().integer().min(1),
-    preventCleanup: Joi["boolean"]()
-  })).required(),
+  nodegenModels: modelConfig,
+  nodeGenModels: modelConfig,
   // externalUuid: Joi.string().allow(),
   // xParameters: Joi.array().items(),
   // xCallCallback: Joi.func()
   timeout: Joi.number().integer().min(1) // in ms
-}).required();
+}).xor('nodeGenModels', 'nodegenModels').required();
 var validate = function validate(config) {
   var isValidConfig = rules.validate(config);
   return isValidConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Coherent Spark Execute SDK for Node.js and Browser",
   "main": "src/node.js",
   "browser": "dist/browser.js",
@@ -8,8 +8,8 @@
   "scripts": {
     "build": "npm run build:types && npm run bundle:full && npm run bundle:min",
     "build:types": "tsc --declaration",
-    "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",
+    "bundle:full": "mkdir -p dist && browserify src/browser.js  --standalone Spark > dist/browser.js",
+    "bundle:min": "mkdir -p lib && 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 65 mocha --bail --exit --recursive --timeout 100000"
   },
@@ -19,13 +19,17 @@
   "directories": {
     "test": "test"
   },
+  "files": [
+    "types/",
+    "src/"
+  ],
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
     "@coherentglobal/wasm-runner": "^0.0.102",
     "@types/node": "^18.7.18",
-    "axios": "^0.27.2",
+    "axios": "^1.6.7",
     "fs": "^0.0.1-security",
     "got": "^11.8.6",
     "http-status-codes": "^2.2.0",

package/src/browser.js

@@ -61,7 +61,7 @@ class Spark {
     /**
      * @private
      */
-    this.model = this._models(this.config?.nodeGenModels);
+    this.model = this._models(this.config?.nodegenModels || this.config?.nodeGenModels);
 
     this.modelCount = 0;
     this._offlinePreventCleanupModels = [];
@@ -126,7 +126,7 @@ class Spark {
         eventType: "spark.validateconfig.startend.error",
         duration: end - start,
       });
-      throw new Error(`ValidationError: ${message}`);
+      throw new Error(`SDK Setup ValidationError: ${message}`);
     }
   }
   /**
@@ -216,6 +216,7 @@ class Spark {
       if (!input?.request_meta) {
         input.request_meta = {};
       }
+
       if (versionID) {
         input.request_meta.version_id = versionId;
       }
@@ -302,7 +303,7 @@ class Spark {
         this._registry = new WasmRunner(undefined, callback, "");
       }
 
-      while(this._offlineLastExecuting[versionId]) {
+      while (this._offlineLastExecuting[versionId]) {
         await utils.sleep(10);
       }
 
@@ -319,10 +320,10 @@ class Spark {
             service_name: model?.metaData?.EngineInformation?.ServiceName ?? "",
           },
         });
-        
+
         this.modelCount = this.modelCount + 1;
 
-        if(model && model.preventCleanup) {
+        if (model && model.preventCleanup) {
           this._offlinePreventCleanupModels.push(model?.versionId)
         }
       }
@@ -332,10 +333,11 @@ class Spark {
       let error = true;
       let duration = 0;
 
+      let result;
       while (error && retry <= MAX_RETRY) {
         const xcallChainId = xcallTracker.issueXcallChainId();
         const appendedInput = utils.appendingContext(tenant, input, null, null, xcallChainId, true);
-        const result = await this._registry.execute(
+        result = await this._registry.execute(
           appendedInput,
           versionId,
           () => { },
@@ -384,17 +386,34 @@ class Spark {
           return result;
         }
       }
+
+      if (retry > MAX_RETRY && result) {
+        this._registry.remove(versionId);
+        console.log('Reappend failed model');
+        await this._registry.append({
+          id: versionId,
+          url: model.binary,
+          meta: {
+            folder_name:
+              model?.metaData?.EngineInformation?.ProductName ?? "",
+            service_name:
+              model?.metaData?.EngineInformation?.ServiceName ?? "",
+          },
+        });
+        this._offlineLastExecuting[versionId] = false;
+        return result
+      }
     } catch (err) {
       this._offlineLastExecution[versionId] = Date.now();
       this._offlineLastExecuting[versionId] = false;
-      if(err instanceof ModelExecuteCancelled) {
+      if (err instanceof ModelExecuteCancelled) {
         throw new WasmRunnerErrors.ExecuteCancelled(versionId);
       }
       return err;
     }
   }
 
-  async _cleanUp () {
+  async _cleanUp() {
     let nonExecuteModel = [];
     Object.keys(this._offlineLastExecuting).forEach((key) => {
       if (this._offlineLastExecuting[key] === false && this._offlinePreventCleanupModels.find(m => m === key) === undefined) { // key !== 'cf3c7e5a-2f3b-4c79-81b9-7e4b174258cd' && key !== 'a167da91-afa6-4579-bd22-09752a30b57b') {

package/src/findModels.js

@@ -188,7 +188,7 @@ const findModel = (requestMeta, nodegenModels) => {
     }
   } else {
     throw new Error(
-      "Model not found. requestMeta: " + JSON.stringify(requestMeta)
+      "SDK Setup Error: Model not found. requestMeta: " + JSON.stringify(requestMeta)
     );
   }
 

package/src/helpers/utils.js

@@ -60,7 +60,7 @@ const getAuthHeaders = (token, authType, tenant) => {
   } else if (authType === "bearerToken") {
     authHeaders.authorization = `Bearer ${token}`;
   } else {
-    throw new Error(`Invalid auth type ${authType}`);
+    throw new Error(`Authentication Error: Invalid auth type ${authType}`);
   }
 
   return authHeaders;

package/src/node.js

@@ -89,7 +89,12 @@ class Spark {
     /**
      * @private
      */
-    this.model = this._models(this.config?.nodeGenModels);
+    this.model = this._models(this.config?.nodegenModels || this.config?.nodeGenModels);
+    
+    /**
+     * @private
+     */
+    this.nodegenModel = this.config?.nodegenModels || this.config?.nodeGenModels
 
     /**
      * @private
@@ -130,11 +135,11 @@ class Spark {
     } else {
       const message = JSON.stringify(error.details);
       logger.error({
-        EventType: 'ValidationError',
+        EventType: 'SDK.ValidationError',
         InstanceId: this.instanceid,
-        TextMessage: message,
+        TextMessage: `SDK Validation Error: ${message}`,
       });
-      throw new Error(`ValidationError: ${message}`);
+      throw new Error(`SDK Setup Error: ValidationError: ${message}`);
     }
   }
 
@@ -184,10 +189,10 @@ class Spark {
           break;
         }
       } catch (err) {
-        logger.info({
-          EventType: 'ExecuteModel.ERROR',
+        logger.error({
+          EventType: 'SDK.ExecuteModel.ERROR',
           InstanceId: this.instanceid,
-          TextMessage: `Error while executing uuid: ${versionID} using priority:${this.priority[i]}`,
+          TextMessage: `SDK Execution Error: Error while executing uuid: ${versionID} using priority:${this.priority[i]}`,
         });
         error = err;
       }
@@ -261,8 +266,8 @@ class Spark {
     if (!this.isSerializedConfig) {
       const config = { ...this.config };
 
-      if (config.nodeGenModels) {
-        config.nodeGenModels.forEach((m) => {
+      if (this.nodegenModel) {
+        this.nodegenModel.forEach((m) => {
           if (m.binary) {
             const filePath = path.join(
               __dirname,
@@ -322,7 +327,7 @@ class Spark {
 
   _storeConfig() {
     fs.writeFileSync('config.json', JSON.stringify(this.config), () =>
-      console.err(err)
+      logger.error(err)
     );
     return require.resolve('config.json');
   }
@@ -369,6 +374,7 @@ class Spark {
   // async remove(versionId) {}
 
   async offlineModel(input, versionID, tenant = 'default', cancellationToken) {
+    console.log('offlineModel', versionID, tenant)
     let versionId;
     try {
       const start = Date.now();
@@ -382,6 +388,15 @@ class Spark {
         Input: input,
       });
       input.callid = callid;
+
+      if(versionID) {
+        if(!input.request_meta) {
+          input.request_meta = {}
+        }
+
+        input.request_meta.version_id = versionID
+      }
+
       const model = findModel(input.request_meta, this.model);
 
       versionId = versionID || (model && model?.versionId);
@@ -446,6 +461,7 @@ class Spark {
         TextMessage: `Execute uuid: ${versionId}`,
       });
       this._offlineLastExecuting[versionId] = true;
+
       let result = await this._registry.execute(
         input,
         versionId,
@@ -476,7 +492,7 @@ class Spark {
         TimeStamp: Date.now(),
         EventType: 'SDK.OfflineModelExecutionError',
         InstanceId: this.instanceid,
-        TextMessage: err.message,
+        TextMessage: `SDK Offline Model Execution Error: ${err.message}`,
       });
       if (err instanceof ModelExecuteCancelled) {
         throw new WasmRunnerErrors.ExecuteCancelled(versionId);

package/src/resolver/externalResolver.js

@@ -217,9 +217,9 @@ const sparkServiceVersionOne = async (requestData, context) => {
   } catch (err) {
     logger.error({
       eventType: "SDK.XCall.SparkService",
-      msg: `WASMSERVER:DISPATCH_TYPE.SPARK_SERVICE ERROR: Request body is malform JSON ${JSON.stringify(requestData.request_body)}`,
+      msg: `Model Error: WASMSERVER:DISPATCH_TYPE.SPARK_SERVICE ERROR: Request body is malform JSON ${JSON.stringify(requestData.request_body)}`,
     });
-    throw new Error(`Downstream Request body is malform JSON ${JSON.stringify(requestData.request_body)}`)
+    throw new Error(`Model Error: Downstream Request body is malform JSON ${JSON.stringify(requestData.request_body)}`)
   }
 
   const options = {};

package/src/validate.js

@@ -1,5 +1,27 @@
 const Joi = require("joi");
 
+modelConfig = Joi.array()
+.items(
+  Joi.object({
+    versionId: Joi.string(),
+    type: Joi.string(),
+    binary: [
+      Joi.string().allow(""),
+      Joi.function().allow(""),
+      Joi.object({
+        servicename: Joi.string(),
+        wasm: Joi.string(),
+        js: Joi.string(),
+        data: Joi.string(),
+      }),
+    ],
+    binaryPath: Joi.string(),
+    metaData: Joi.object(),
+    replica: Joi.number().integer().min(1),
+    preventCleanup: Joi.boolean(),
+  })
+)
+
 const rules = Joi.object({
   replica: Joi.number().integer().min(1),
   sparkEndpoint: Joi.object({
@@ -17,33 +39,13 @@ const rules = Joi.object({
     syntheticKey: [Joi.string().allow(""), Joi.function().allow("")], // allow fns
     bearerToken: [Joi.string().allow(""), Joi.function().allow("")], // allow strings/fns
   }).and("url", "tenant", "authType"),
-  nodeGenModels: Joi.array()
-    .items(
-      Joi.object({
-        versionId: Joi.string(),
-        type: Joi.string(),
-        binary: [
-          Joi.string().allow(""),
-          Joi.function().allow(""),
-          Joi.object({
-            servicename: Joi.string(),
-            wasm: Joi.string(),
-            js: Joi.string(),
-            data: Joi.string(),
-          }),
-        ],
-        binaryPath: Joi.string(),
-        metaData: Joi.object(),
-        replica: Joi.number().integer().min(1),
-        preventCleanup: Joi.boolean(),
-      })
-    )
-    .required(),
+  nodegenModels: modelConfig,
+    nodeGenModels: modelConfig,
   // externalUuid: Joi.string().allow(),
   // xParameters: Joi.array().items(),
   // xCallCallback: Joi.func()
   timeout: Joi.number().integer().min(1), // in ms
-}).required();
+}).xor('nodeGenModels', 'nodegenModels').required();
 
 const validate = (config) => {
   const isValidConfig = rules.validate(config);

package/types/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.js"],"names":[],"mappings":";AAOA;IACE,iDAA2C;IAE3C;;OAEG;IACH,oBAFW,MAAM,gBA6DhB;IA1DC;;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;IAErD,mBAAmB;IACnB,oCAAsC;IACtC,0BAA+B;IAC/B,0BAA+B;IAE/B,uBAA0G;IAC1G,aAAgF;IAGlF,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,oCAJW,MAAM,sDAiBhB;IAED;;;;;;;OAOG;IACH,eALW,MAAM,4DAGJ,MAAM,CA0BlB;IAED,0HAwLC;IAED,0BA0BC;IAED,8DA6DC;CACF"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.js"],"names":[],"mappings":";AAOA;IACE,iDAA2C;IAE3C;;OAEG;IACH,oBAFW,MAAM,gBA6DhB;IA1DC;;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,cAAmF;IAEnF,mBAAmB;IACnB,oCAAsC;IACtC,0BAA+B;IAC/B,0BAA+B;IAE/B,uBAA0G;IAC1G,aAAgF;IAGlF,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,oCAJW,MAAM,sDAiBhB;IAED;;;;;;;OAOG;IACH,eALW,MAAM,4DAGJ,MAAM,CA0BlB;IAED,0HA2MC;IAED,0BA0BC;IAED,8DA6DC;CACF"}

package/types/node.d.ts

@@ -42,6 +42,10 @@ declare class Spark {
      * @private
      */
     private model;
+    /**
+     * @private
+     */
+    private nodegenModel;
     /**
      * @private
      */

package/types/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAiBA;IACE,iDAA2C;IAE3C;;OAEG;IACH,oBAFW,MAAM,+CA+EhB;IA5EC;;OAEG;IACH,kBAA0B;IAGxB,SAAsB;IAGxB;;OAEG;IACH,mBAC4D;IAU1D,eAAsB;IAMxB,aAAwC;IAExC,uBAA0G;IAE1G,aAAgF;IAEhF;;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;IAClD,mBAAmB;IACnB,0BAA+B;IAC/B,0BAA+B;IAC/B,oCAAsC;IAGxC;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAOlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAelB;IAED,0CASC;IAED;;;;;;;OAOG;IACH,eALW,MAAM,uFAGJ,MAAM,CAsClB;IAED;;;;;;OAMG;IACH,oCAJW,MAAM,sDAiBhB;IAED,+BAiFC;IAED,wDAYC;IAED,uBAKC;IAED,0BA0BC;IAED;;OAEG;IAGH,0KAyGC;IAGD;;;;;;;OAOG;IACH,2BANW,MAAM,aACN,MAAM,iDAEN,iBAAiB,gBAiF3B;CACF"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAmBA;IACE,iDAA2C;IAE3C;;OAEG;IACH,oBAFW,MAAM,+CAwFhB;IArFC;;OAEG;IACH,kBAA0B;IAGxB,SAAsB;IAGxB;;OAEG;IACH,mBAC4D;IAU1D,eAAsB;IAMxB,aAAwC;IAExC,uBAGI;IAEJ,aACmE;IAEnE;;OAEG;IACH,eAAsD;IACtD;;OAEG;IACH,iBAA0D;IAC1D;;OAEG;IACH,cAGI;IACJ;;OAEG;IACH,YAAgD;IAChD;;OAEG;IACH,qBAA2C;IAC3C;;OAEG;IACH,cAAmF;IAEnF;;OAEG;IACH,qBAA4E;IAE5E;;OAEG;IACH,yBAAmD;IAEnD;;OAEG;IACH,iBAAkD;IAClD,mBAAmB;IACnB,0BAA+B;IAC/B,0BAA+B;IAC/B,oCAAsC;IAGxC;;;;OAIG;IACH,iBAHW,MAAM,GACJ,MAAM,CAOlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACJ,MAAM,CAelB;IAED,0CASC;IAED;;;;;;;OAOG;IACH,eALW,MAAM,uFAGJ,MAAM,CA2ClB;IAED;;;;;;OAMG;IACH,oCAJW,MAAM,sDAiBhB;IAED,+BAkFC;IAED,wDAYC;IAED,uBAKC;IAED,0BAkCC;IAED;;OAEG;IAGH,0KA8HC;IAED;;;;;;;OAOG;IACH,2BANW,MAAM,aACN,MAAM,iDAEN,iBAAiB,gBAsF3B;CACF"}

package/types/services/entityStore.d.ts

@@ -36,8 +36,8 @@ export function getFromTempUrl(url: string, headers: any): Buffer;
  *
  * @returns
  */
-export function downloadModelFile(url: any, versionUuid: string, headers: any): Promise<any>;
-export function downloadModel(versionUuid: any, token: any): Promise<any>;
+export function downloadModelFile(url: any, versionUuid: string, headers: any): Promise<string>;
+export function downloadModel(versionUuid: any, token: any): Promise<string>;
 export function getParameterSet(versionUuid: any, tenant: any, token: any): Promise<any>;
 export function getParameterSetById(versionUuid: any, token: any, tenant?: string): Promise<any>;
 /**

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,yFAqBC;AAvDD;;;;;;;;;;GAUG;AACH,2DAFa,MAAM,CAYlB;AA+DD;;;;;;;;;;;;;GAaG;AACH,6FAuBC;AAqCD,0EAWC;AAMD,yFAeC;AArID,iGAuBC;AAgHD;;;;;;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"}

package/types/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.js"],"names":[],"mappings":";AA+CA,kEAGC"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.js"],"names":[],"mappings":";AAiDA,kEAGC"}

package/.babelrc

@@ -1,12 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "targets": {
-          "esmodules": true
-        }
-      }
-    ]
-  ]
-}

package/.eslintrc.json

@@ -1,21 +0,0 @@
-{
-  "extends": [
-    "airbnb/base",
-    "prettier",
-    "plugin:node/recommended",
-    "plugin:mocha/recommended"
-  ],
-  "parserOptions": {
-    "ecmaVersion": 2020
-  },
-  "plugins": ["prettier", "mocha"],
-  "rules": {
-    "prettier/prettier": "error",
-    "no-unused-vars": "warn",
-    "no-console": "off",
-    "func-names": "off",
-    "no-process-exit": "off",
-    "object-shorthand": "off",
-    "class-methods-use-this": "off"
-  }
-}

package/types/tenant_resolver/externalResolver_coherent.d.ts

@@ -1,2 +0,0 @@
-export function sparkService(requestData: any, context: any): Promise<string>;
-//# sourceMappingURL=externalResolver_coherent.d.ts.map

package/types/tenant_resolver/externalResolver_coherent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"externalResolver_coherent.d.ts","sourceRoot":"","sources":["../../src/tenant_resolver/externalResolver_coherent.js"],"names":[],"mappings":"AAkDgB,8EAkEb"}

package/types/tenant_resolver/externalResolver_test.d.ts

@@ -1,2 +0,0 @@
-export function sparkService(requestData: any, context: any): Promise<string>;
-//# sourceMappingURL=externalResolver_test.d.ts.map

package/types/tenant_resolver/externalResolver_test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"externalResolver_test.d.ts","sourceRoot":"","sources":["../../src/tenant_resolver/externalResolver_test.js"],"names":[],"mappings":"AAkDgB,8EAkEb"}