@coherentglobal/spark-execute-sdk 0.4.5 → 0.4.7

package/src/browser.js

@@ -3,6 +3,7 @@ const WasmRunnerErrors = require("./error.js");
 const { WasmRunner } = require("@coherentglobal/wasm-runner");
 const validate = require("./validate.js");
 const processModels = require("./models.js");
+const findModel = require("./findModels.js");
 
 let registry = {};
 
@@ -16,26 +17,25 @@ class Spark {
      */
     this.config = this.validateConfig(config);
 
-    const {
-      sparkEndpoint: { syntheticKey, bearerToken, authType, tenant, url },
-      nodeGenModels,
-    } = this.config;
     /**
      * @private
      */
-    this.tenant = tenant;
+    this.tenant = this.config?.sparkEndpoint?.tenant ?? "";
     /**
      * @private
      */
-    this.authType = authType;
+    this.authType = this.config?.sparkEndpoint?.authType ?? "";
     /**
      * @private
      */
-    this.token = syntheticKey || bearerToken;
+    this.token =
+      this.config?.sparkEndpoint?.syntheticKey ??
+      this.config?.sparkEndpoint?.bearerToken ??
+      "";
     /**
      * @private
      */
-    this.url = url;
+    this.url = this.config?.sparkEndpoint?.url ?? "";
     /**
      * @private
      */
@@ -43,12 +43,13 @@ class Spark {
     /**
      * @private
      */
-    this.model = this._models(nodeGenModels);
+    this.model = this._models(this.config?.nodeGenModels);
     /**
      * @private
      */
-    this.priority = ["model"];
+    this.priority = ["model", "onlineEndpoint"];
   }
+
   /**
    *
    * @param {object} nodegen
@@ -85,134 +86,6 @@ class Spark {
     return model;
   }
 
-  _findModel(requestMeta) {
-    let model = {};
-    if (requestMeta.version_id) {
-      model = this.model.filter(({ versionId }) => {
-        return versionId === requestMeta.version_id;
-      });
-    } else if (requestMeta.servicename && requestMeta.version) {
-      model = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ServiceName === requestMeta.servicename &&
-          metaData.EngineInformation.Revision === requestMeta.version
-      );
-    } else if (requestMeta.servicename && requestMeta.transaction_date) {
-      model = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ServiceName === requestMeta.servicename &&
-          new Date(requestMeta.transaction_date) >=
-            new Date(metaData.EffectiveStartDate) &&
-          new Date(requestMeta.transaction_date) <=
-            new Date(metaData.EffectiveEndDate)
-      );
-
-      if (model.length > 1) {
-        return model
-          .sort((versionA, versionB) =>
-            versionA.metaData.EngineInformation.Revision.replace(
-              /\d+/g,
-              (n) => +n + 100000
-            ).localCompare(
-              versionB.metaData.EngineInformation.Revision.replace(
-                /\d+/g,
-                (n) => +n + 100000
-              )
-            )
-          )
-          .reverse();
-      }
-    } else if (requestMeta.service_id && requestMeta.version) {
-      model = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ServiceGuid === requestMeta.service_id &&
-          metaData.EngineInformation.Revision === requestMeta.version
-      );
-    } else if (requestMeta.service_id && requestMeta.transaction_date) {
-      model = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ServiceGuid === requestMeta.service_id &&
-          new Date(requestMeta.transaction_date) >=
-            new Date(metaData.EffectiveStartDate) &&
-          new Date(requestMeta.transaction_date) <=
-            new Date(metaData.EffectiveEndDate)
-      );
-
-      if (model.length > 1) {
-        return model
-          .sort((versionA, versionB) =>
-            versionA.metaData.EngineInformation.Revision.replace(
-              /\d+/g,
-              (n) => +n + 100000
-            ).localCompare(
-              versionB.metaData.EngineInformation.Revision.replace(
-                /\d+/g,
-                (n) => +n + 100000
-              )
-            )
-          )
-          .reverse();
-      }
-    } else if (requestMeta.service_uri && requestMeta.transaction_date) {
-      const regex = /folders\/(.+)\/services\/(.+)/gi;
-      const parts = regex.exec(requestMeta.service_uri);
-      let folder, service;
-      if (parts) {
-        folder = decodeURI(parts[1]);
-        service = decodeURI(parts[2]);
-      }
-
-      model = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ProductName === folder &&
-          metaData.EngineInformation.ServiceName === service &&
-          new Date(requestMeta.transaction_date) >=
-            new Date(metaData.EffectiveStartDate) &&
-          new Date(requestMeta.transaction_date) <=
-            new Date(metaData.EffectiveEndDate)
-      );
-
-      if (model.length > 1) {
-        return model
-          .sort((versionA, versionB) =>
-            versionA.metaData.EngineInformation.Revision.replace(
-              /\d+/g,
-              (n) => +n + 100000
-            ).localCompare(
-              versionB.metaData.EngineInformation.Revision.replace(
-                /\d+/g,
-                (n) => +n + 100000
-              )
-            )
-          )
-          .reverse();
-      }
-    } else if (requestMeta.service_uri && requestMeta.version) {
-      const regex = /folders\/(.+)\/services\/(.+)/gi;
-      const parts = regex.exec(requestMeta.service_uri);
-      let folder, service;
-      if (parts) {
-        folder = decodeURI(parts[1]);
-        service = decodeURI(parts[2]);
-      }
-      model = this.model.filter(
-        ({ metaData }) =>
-          metaData.EngineInformation.ProductName === folder &&
-          metaData.EngineInformation.ServiceName === service &&
-          metaData.EngineInformation.Revision === requestMeta.version
-      );
-    } else {
-      throw new Error(
-        "Model not found. requestMeta: " +
-          JSON.stringify(requestMeta) +
-          " tenant: " +
-          this.tenant
-      );
-    }
-
-    return model[0];
-  }
-
   _getModelByMeta(folderName, serviceName) {
     const model = this.model.find(
       (m) =>
@@ -243,17 +116,17 @@ class Spark {
 
     let response;
     response = await lookup[this.priority[0]](input, versionID, this);
-    // if (response instanceof Error) {
-    //   response = await lookup[this.priority[1]](input, versionID, this);
-    // }
+    if (response instanceof Error && this.config.sparkEndpoint !== undefined) {
+      response = await lookup[this.priority[1]](input, versionID, this);
+    }
+
     return response;
   }
 
   async offlineModel(input, versionID, ds) {
-    const model = ds._findModel(input.request_meta);
-
+    const model = findModel(input.request_meta, ds.model);
     const modelVersionId = versionID || (model && model?.versionId);
-    // const modelVersionId = input?.request_meta?.version_id || versionID;
+
     if (!input?.request_meta) {
       input.request_meta = {};
     }
@@ -303,8 +176,10 @@ class Spark {
         };
         registry = new WasmRunner("", callback);
       }
+
       if (!registry.isExist(modelVersionId)) {
-        const model = ds._findModel(input.request_meta);
+        const model = findModel(input.request_meta, ds.model);
+
         await registry.append({
           id: modelVersionId,
           url: model.binary,
@@ -322,18 +197,28 @@ class Spark {
   }
 
   async onlineModelEndpoint(input, versionID, ds) {
+    const isPublic = ds.authType === "public";
+
     let token = "";
-    if (ds.token.constructor.name === "AsyncFunction") {
-      token = await ds.token();
-    } else {
-      token = ds.token;
-    }
 
-    if (utils.isEmpty(ds.token)) {
-      throw new WasmRunnerErrors.UnauthorizedError();
+    if (!isPublic) {
+      if (ds.token.constructor.name === "AsyncFunction") {
+        token = await ds.token();
+      } else if (typeof ds.token === "function") {
+        token = ds.token();
+      } else {
+        token = ds.token;
+      }
+
+      if (utils.isEmpty(ds.token)) {
+        throw new WasmRunnerErrors.UnauthorizedError();
+      }
     }
+
     try {
-      const header = utils.getAuthHeaders(token, ds.authType, ds.tenant);
+      const header = !isPublic
+        ? utils.getAuthHeaders(token, ds.authType, ds.tenant)
+        : {};
 
       const options = {
         method: "POST",
@@ -344,7 +229,10 @@ class Spark {
         headers: { ...{ "content-type": "application/json" }, ...header },
       };
 
-      const modelUrl = new URL(`/${ds.tenant}/api/v3/execute`, ds.url);
+      const modelUrl = new URL(
+        `/${ds.tenant}/api/v3/${!isPublic ? "execute" : "public"}`,
+        ds.url
+      );
 
       const response = await fetch(modelUrl, options);
 

package/src/findModels.js

@@ -0,0 +1,132 @@
+const WasmRunnerErrors = require("./error");
+
+const findModel = (requestMeta, nodegenModels) => {
+  let model = {};
+  if (requestMeta.version_id) {
+    model = nodegenModels.filter(({ versionId }) => {
+      return versionId === requestMeta.version_id;
+    });
+  } else if (requestMeta.servicename && requestMeta.version) {
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ServiceName === requestMeta.servicename &&
+        metaData.EngineInformation.Revision === requestMeta.version
+    );
+  } else if (requestMeta.servicename && requestMeta.transaction_date) {
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ServiceName === requestMeta.servicename &&
+        new Date(requestMeta.transaction_date) >=
+          new Date(metaData.EffectiveStartDate) &&
+        new Date(requestMeta.transaction_date) <=
+          new Date(metaData.EffectiveEndDate)
+    );
+
+    if (model.length > 1) {
+      return model
+        .sort((versionA, versionB) =>
+          versionA.metaData.EngineInformation.Revision.replace(
+            /\d+/g,
+            (n) => +n + 100000
+          ).localCompare(
+            versionB.metaData.EngineInformation.Revision.replace(
+              /\d+/g,
+              (n) => +n + 100000
+            )
+          )
+        )
+        .reverse();
+    }
+  } else if (requestMeta.service_id && requestMeta.version) {
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ServiceGuid === requestMeta.service_id &&
+        metaData.EngineInformation.Revision === requestMeta.version
+    );
+  } else if (requestMeta.service_id && requestMeta.transaction_date) {
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ServiceGuid === requestMeta.service_id &&
+        new Date(requestMeta.transaction_date) >=
+          new Date(metaData.EffectiveStartDate) &&
+        new Date(requestMeta.transaction_date) <=
+          new Date(metaData.EffectiveEndDate)
+    );
+
+    if (model.length > 1) {
+      return model
+        .sort((versionA, versionB) =>
+          versionA.metaData.EngineInformation.Revision.replace(
+            /\d+/g,
+            (n) => +n + 100000
+          ).localCompare(
+            versionB.metaData.EngineInformation.Revision.replace(
+              /\d+/g,
+              (n) => +n + 100000
+            )
+          )
+        )
+        .reverse();
+    }
+  } else if (requestMeta.service_uri && requestMeta.transaction_date) {
+    const regex = /folders\/(.+)\/services\/(.+)/gi;
+    const parts = regex.exec(requestMeta.service_uri);
+    let folder, service;
+    if (parts) {
+      folder = decodeURI(parts[1]);
+      service = decodeURI(parts[2]);
+    }
+
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ProductName === folder &&
+        metaData.EngineInformation.ServiceName === service &&
+        new Date(requestMeta.transaction_date) >=
+          new Date(metaData.EffectiveStartDate) &&
+        new Date(requestMeta.transaction_date) <=
+          new Date(metaData.EffectiveEndDate)
+    );
+
+    if (model.length > 1) {
+      return model
+        .sort((versionA, versionB) =>
+          versionA.metaData.EngineInformation.Revision.replace(
+            /\d+/g,
+            (n) => +n + 100000
+          ).localCompare(
+            versionB.metaData.EngineInformation.Revision.replace(
+              /\d+/g,
+              (n) => +n + 100000
+            )
+          )
+        )
+        .reverse();
+    }
+  } else if (requestMeta.service_uri && requestMeta.version) {
+    const regex = /folders\/(.+)\/services\/(.+)/gi;
+    const parts = regex.exec(requestMeta.service_uri);
+    let folder, service;
+    if (parts) {
+      folder = decodeURI(parts[1]);
+      service = decodeURI(parts[2]);
+    }
+    model = nodegenModels.filter(
+      ({ metaData }) =>
+        metaData.EngineInformation.ProductName === folder &&
+        metaData.EngineInformation.ServiceName === service &&
+        metaData.EngineInformation.Revision === requestMeta.version
+    );
+  } else {
+    throw new Error(
+      "Model not found. requestMeta: " + JSON.stringify(requestMeta)
+    );
+  }
+
+  if (model.length === 0) {
+    throw new WasmRunnerErrors.MissingModelError(requestMeta?.version_id);
+  }
+
+  return model[0];
+};
+
+module.exports = findModel;

package/src/models.js

@@ -4,8 +4,8 @@
  * @returns
  */
 const processModels = (nodegen) => {
-  const processedModels = {...nodegen}
-  // console.log('MODELS TO PROCESS: ', processedModels)
+  const processedModels = { ...nodegen };
+
   switch (nodegen.type) {
     case "binary":
     case "uint8array":
@@ -17,12 +17,10 @@ const processModels = (nodegen) => {
           js: Buffer.from(nodegen.binary.js, "base64"),
           data: Buffer.from(nodegen.binary.data, "base64"),
         };
-        processedModels.binary = model
-        // nodegen.binary = model;
+        processedModels.binary = model;
       } else {
         const model = Buffer.from(nodegen.binary, "base64");
-        processedModels.binary = model
-        // nodegen.binary = model;
+        processedModels.binary = model;
       }
       break;
     case "function":
@@ -31,16 +29,12 @@ const processModels = (nodegen) => {
       if (func.constructor.name === "AsyncFunction") {
         (async () => {
           processedModels.binary = await func();
-          // nodegen.binary = await func();
+
           const model = Buffer.from(nodegen.binary, "base64");
           processedModels.binary = model;
-          // nodegen.binary = model;
         })();
       } else {
-        // nodegen.binary = func();
-        const model = Buffer.from(nodegen.binary, "base64");
-        processedModels.binary = model;
-        // nodegen.binary = model;
+        processedModels.binary = func();
       }
     default:
       break;