@coherentglobal/spark-execute-sdk 0.4.10 → 0.4.11

package/dist/browser.js

@@ -7157,7 +7157,6 @@ var _require = require("@coherentglobal/wasm-runner"),
 var validate = require("./validate.js");
 var processModels = require("./models.js");
 var findModel = require("./findModels.js");
-var registry = {};
 var Spark = /*#__PURE__*/function () {
   /**
    * @param {object} config
@@ -7166,6 +7165,11 @@ var Spark = /*#__PURE__*/function () {
     var _this$config$sparkEnd, _this$config, _this$config$sparkEnd2, _this$config$sparkEnd3, _this$config2, _this$config2$sparkEn, _ref, _this$config$sparkEnd4, _this$config3, _this$config3$sparkEn, _this$config4, _this$config4$sparkEn, _this$config$sparkEnd5, _this$config5, _this$config5$sparkEn, _this$config6;
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     (0, _classCallCheck2["default"])(this, Spark);
+    /**
+    * @private
+    */
+    this._registry = undefined;
+
     /**
     * @private
     */
@@ -7327,8 +7331,8 @@ var Spark = /*#__PURE__*/function () {
               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 = {
-                  model: this.offlineModel,
-                  onlineEndpoint: this.onlineModelEndpoint
+                  model: this.offlineModel.bind(this),
+                  onlineEndpoint: this.onlineModelEndpoint.bind(this)
                 };
                 _context.next = 6;
                 return lookup[this.priority[0]](input, versionID, this);
@@ -7359,13 +7363,14 @@ var Spark = /*#__PURE__*/function () {
   }, {
     key: "offlineModel",
     value: function () {
-      var _offlineModel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(input, versionID, ds) {
+      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;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                model = findModel(input.request_meta, ds.model);
+                model = findModel(input.request_meta, this.model);
                 modelVersionId = versionID || model && (model === null || model === void 0 ? void 0 : model.versionId);
                 if (!(input !== null && input !== void 0 && input.request_meta)) {
                   input.request_meta = {};
@@ -7374,7 +7379,7 @@ var Spark = /*#__PURE__*/function () {
                   input.request_meta.version_id = modelVersionId;
                 }
                 _context3.prev = 4;
-                if (!(registry instanceof WasmRunner)) {
+                if (this._registry === undefined) {
                   /**
                    * Options is the request data the the runner dispatch
                    * receives from the wasm model
@@ -7391,12 +7396,12 @@ var Spark = /*#__PURE__*/function () {
                               hasFolderName = options === null || options === void 0 ? void 0 : options.folder_name;
                               hasServiceName = options === null || options === void 0 ? void 0 : options.service_name;
                               hasVersionId = options === null || options === void 0 ? void 0 : options.version_id;
-                              if (!(hasVersionId && !registry.isExist(hasVersionId))) {
+                              if (!(hasVersionId && !_this._registry.isExist(hasVersionId))) {
                                 _context2.next = 8;
                                 break;
                               }
                               _context2.next = 6;
-                              return registry.append({
+                              return _this._registry.append({
                                 id: hasVersionId,
                                 url: model.binary,
                                 meta: {
@@ -7408,10 +7413,10 @@ var Spark = /*#__PURE__*/function () {
                               _context2.next = 12;
                               break;
                             case 8:
-                              _model = ds._getModelByMeta(hasFolderName, hasServiceName);
+                              _model = _this._getModelByMeta(hasFolderName, hasServiceName);
                               hasVersionId = _model === null || _model === void 0 ? void 0 : _model.versionId;
                               _context2.next = 12;
-                              return registry.append({
+                              return _this._registry.append({
                                 id: hasVersionId,
                                 url: _model.binary,
                                 meta: {
@@ -7428,19 +7433,19 @@ var Spark = /*#__PURE__*/function () {
                         }
                       }, _callee2);
                     }));
-                    return function callback(_x6) {
+                    return function callback(_x5) {
                       return _ref2.apply(this, arguments);
                     };
                   }();
-                  registry = new WasmRunner("", callback);
+                  this._registry = new WasmRunner("", callback);
                 }
-                if (registry.isExist(modelVersionId)) {
+                if (this._registry.isExist(modelVersionId)) {
                   _context3.next = 10;
                   break;
                 }
-                _model2 = findModel(input.request_meta, ds.model);
+                _model2 = findModel(input.request_meta, this.model);
                 _context3.next = 10;
-                return registry.append({
+                return this._registry.append({
                   id: modelVersionId,
                   url: _model2.binary,
                   meta: {
@@ -7450,7 +7455,7 @@ var Spark = /*#__PURE__*/function () {
                 });
               case 10:
                 _context3.next = 12;
-                return registry.execute(input, modelVersionId, function () {});
+                return this._registry.execute(input, modelVersionId, function () {});
               case 12:
                 result = _context3.sent;
                 return _context3.abrupt("return", result);
@@ -7463,9 +7468,9 @@ var Spark = /*#__PURE__*/function () {
                 return _context3.stop();
             }
           }
-        }, _callee3, null, [[4, 16]]);
+        }, _callee3, this, [[4, 16]]);
       }));
-      function offlineModel(_x3, _x4, _x5) {
+      function offlineModel(_x3, _x4) {
         return _offlineModel.apply(this, arguments);
       }
       return offlineModel;
@@ -7473,43 +7478,43 @@ var Spark = /*#__PURE__*/function () {
   }, {
     key: "onlineModelEndpoint",
     value: function () {
-      var _onlineModelEndpoint = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(input, versionID, ds) {
+      var _onlineModelEndpoint = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(input, versionID) {
         var isPublic, token, header, options, modelUrl, response, result;
         return _regenerator["default"].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                isPublic = ds.authType === "public";
+                isPublic = this.authType === "public";
                 token = "";
                 if (isPublic) {
                   _context4.next = 12;
                   break;
                 }
-                if (!(ds.token.constructor.name === "AsyncFunction")) {
+                if (!(this.token.constructor.name === "AsyncFunction")) {
                   _context4.next = 9;
                   break;
                 }
                 _context4.next = 6;
-                return ds.token();
+                return this.token();
               case 6:
                 token = _context4.sent;
                 _context4.next = 10;
                 break;
               case 9:
-                if (typeof ds.token === "function") {
-                  token = ds.token();
+                if (typeof this.token === "function") {
+                  token = this.token();
                 } else {
-                  token = ds.token;
+                  token = this.token;
                 }
               case 10:
-                if (!utils.isEmpty(ds.token)) {
+                if (!utils.isEmpty(this.token)) {
                   _context4.next = 12;
                   break;
                 }
                 throw new WasmRunnerErrors.UnauthorizedError();
               case 12:
                 _context4.prev = 12;
-                header = !isPublic ? utils.getAuthHeaders(token, ds.authType, ds.tenant) : {};
+                header = !isPublic ? utils.getAuthHeaders(token, this.authType, this.tenant) : {};
                 options = {
                   method: "POST",
                   body: JSON.stringify({
@@ -7520,7 +7525,7 @@ var Spark = /*#__PURE__*/function () {
                     "content-type": "application/json"
                   }), header)
                 };
-                modelUrl = new URL("/".concat(ds.tenant, "/api/v3/").concat(!isPublic ? "execute" : "public"), ds.url);
+                modelUrl = new URL("/".concat(this.tenant, "/api/v3/").concat(!isPublic ? "execute" : "public"), this.url);
                 _context4.next = 18;
                 return fetch(modelUrl, options);
               case 18:
@@ -7539,9 +7544,9 @@ var Spark = /*#__PURE__*/function () {
                 return _context4.stop();
             }
           }
-        }, _callee4, null, [[12, 25]]);
+        }, _callee4, this, [[12, 25]]);
       }));
-      function onlineModelEndpoint(_x7, _x8, _x9) {
+      function onlineModelEndpoint(_x6, _x7) {
         return _onlineModelEndpoint.apply(this, arguments);
       }
       return onlineModelEndpoint;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "description": "",
   "main": "src/node.js",
   "browser": "dist/browser.js",

package/src/browser.js

@@ -5,13 +5,18 @@ const validate = require("./validate.js");
 const processModels = require("./models.js");
 const findModel = require("./findModels.js");
 
-let registry = {};
+
 
 class Spark {
   /**
    * @param {object} config
    */
   constructor(config, options = {}) {
+    /**
+    * @private
+    */
+    this._registry = undefined;
+
     /**
     * @private
     */
@@ -143,8 +148,8 @@ class Spark {
       input?.request_meta?.version_id ||
       input?.request_meta?.version_uuid;
     let lookup = {
-      model: this.offlineModel,
-      onlineEndpoint: this.onlineModelEndpoint,
+      model: this.offlineModel.bind(this),
+      onlineEndpoint: this.onlineModelEndpoint.bind(this),
     };
 
     let response;
@@ -156,8 +161,8 @@ class Spark {
     return response;
   }
 
-  async offlineModel(input, versionID, ds) {
-    const model = findModel(input.request_meta, ds.model);
+  async offlineModel(input, versionID) {
+    const model = findModel(input.request_meta, this.model);
     const modelVersionId = versionID || (model && model?.versionId);
 
     if (!input?.request_meta) {
@@ -168,7 +173,7 @@ class Spark {
     }
 
     try {
-      if (!(registry instanceof WasmRunner)) {
+      if (this._registry === undefined) {
         /**
          * Options is the request data the the runner dispatch
          * receives from the wasm model
@@ -180,8 +185,8 @@ class Spark {
           const hasServiceName = options?.service_name;
           let hasVersionId = options?.version_id;
 
-          if (hasVersionId && !registry.isExist(hasVersionId)) {
-            await registry.append({
+          if (hasVersionId && !this._registry.isExist(hasVersionId)) {
+            await this._registry.append({
               id: hasVersionId,
               url: model.binary,
               meta: {
@@ -192,9 +197,9 @@ class Spark {
               },
             });
           } else {
-            const model = ds._getModelByMeta(hasFolderName, hasServiceName);
+            const model = this._getModelByMeta(hasFolderName, hasServiceName);
             hasVersionId = model?.versionId;
-            await registry.append({
+            await this._registry.append({
               id: hasVersionId,
               url: model.binary,
               meta: {
@@ -207,13 +212,13 @@ class Spark {
           }
           return hasVersionId;
         };
-        registry = new WasmRunner("", callback);
+        this._registry = new WasmRunner("", callback);
       }
 
-      if (!registry.isExist(modelVersionId)) {
-        const model = findModel(input.request_meta, ds.model);
+      if (!this._registry.isExist(modelVersionId)) {
+        const model = findModel(input.request_meta, this.model);
 
-        await registry.append({
+        await this._registry.append({
           id: modelVersionId,
           url: model.binary,
           meta: {
@@ -222,35 +227,35 @@ class Spark {
           },
         });
       }
-      const result = await registry.execute(input, modelVersionId, () => { });
+      const result = await this._registry.execute(input, modelVersionId, () => { });
       return result;
     } catch (err) {
       return err;
     }
   }
 
-  async onlineModelEndpoint(input, versionID, ds) {
-    const isPublic = ds.authType === "public";
+  async onlineModelEndpoint(input, versionID) {
+    const isPublic = this.authType === "public";
 
     let token = "";
 
     if (!isPublic) {
-      if (ds.token.constructor.name === "AsyncFunction") {
-        token = await ds.token();
-      } else if (typeof ds.token === "function") {
-        token = ds.token();
+      if (this.token.constructor.name === "AsyncFunction") {
+        token = await this.token();
+      } else if (typeof this.token === "function") {
+        token = this.token();
       } else {
-        token = ds.token;
+        token = this.token;
       }
 
-      if (utils.isEmpty(ds.token)) {
+      if (utils.isEmpty(this.token)) {
         throw new WasmRunnerErrors.UnauthorizedError();
       }
     }
 
     try {
       const header = !isPublic
-        ? utils.getAuthHeaders(token, ds.authType, ds.tenant)
+        ? utils.getAuthHeaders(token, this.authType, this.tenant)
         : {};
 
       const options = {
@@ -263,8 +268,8 @@ class Spark {
       };
 
       const modelUrl = new URL(
-        `/${ds.tenant}/api/v3/${!isPublic ? "execute" : "public"}`,
-        ds.url
+        `/${this.tenant}/api/v3/${!isPublic ? "execute" : "public"}`,
+        this.url
       );
 
       const response = await fetch(modelUrl, options);