@coherentglobal/spark-execute-sdk 0.3.14 → 0.3.16

package/dist/browser.js

@@ -6843,12 +6843,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  *
  * @param {object} nodegen
  * @returns
  */
 var processModels = function processModels(nodegen) {
+  var processedModels = _objectSpread({}, nodegen);
+  // console.log('MODELS TO PROCESS: ', processedModels)
   switch (nodegen.type) {
     case "binary":
     case "uint8array":
@@ -6860,11 +6865,14 @@ var processModels = function processModels(nodegen) {
           js: Buffer.from(nodegen.binary.js, "base64"),
           data: Buffer.from(nodegen.binary.data, "base64")
         };
-        nodegen.binary = model;
+        processedModels.binary = model;
+        // nodegen.binary = model;
       } else {
         var _model = Buffer.from(nodegen.binary, "base64");
-        nodegen.binary = _model;
+        processedModels.binary = _model;
+        // nodegen.binary = model;
       }
+
       break;
     case "function":
       var func = nodegen.binary;
@@ -6878,9 +6886,11 @@ var processModels = function processModels(nodegen) {
                   _context.next = 2;
                   return func();
                 case 2:
-                  nodegen.binary = _context.sent;
+                  processedModels.binary = _context.sent;
+                  // nodegen.binary = await func();
                   model = Buffer.from(nodegen.binary, "base64");
-                  nodegen.binary = model;
+                  processedModels.binary = model;
+                  // nodegen.binary = model;
                 case 5:
                 case "end":
                   return _context.stop();
@@ -6889,19 +6899,21 @@ var processModels = function processModels(nodegen) {
           }, _callee);
         }))();
       } else {
-        nodegen.binary = func();
+        // nodegen.binary = func();
         var _model2 = Buffer.from(nodegen.binary, "base64");
-        nodegen.binary = _model2;
+        processedModels.binary = _model2;
+        // nodegen.binary = model;
       }
+
     default:
       break;
   }
-  return nodegen;
+  return processedModels;
 };
 module.exports = processModels;
 
 }).call(this)}).call(this,require("buffer").Buffer)
-},{"@babel/runtime/helpers/asyncToGenerator":2,"@babel/runtime/helpers/interopRequireDefault":9,"@babel/runtime/helpers/typeof":15,"@babel/runtime/regenerator":17,"buffer":24}],46:[function(require,module,exports){
+},{"@babel/runtime/helpers/asyncToGenerator":2,"@babel/runtime/helpers/defineProperty":6,"@babel/runtime/helpers/interopRequireDefault":9,"@babel/runtime/helpers/typeof":15,"@babel/runtime/regenerator":17,"buffer":24}],46:[function(require,module,exports){
 "use strict";
 
 var Joi = require("joi");
@@ -6926,7 +6938,8 @@ var rules = Joi.object({
       data: Joi.string()
     })],
     metaData: Joi.object()
-  })).required()
+  })).required(),
+  externalUuid: Joi.string().allow()
   // xParameters: Joi.array().items(),
   // xCallCallback: Joi.func()
 }).required();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "description": "",
   "main": "src/node.js",
   "browser": "dist/browser.js",
@@ -29,7 +29,10 @@
     "http-status-codes": "^2.2.0",
     "joi": "^17.6.0",
     "jstify": "^0.14.0",
-    "pino": "^8.5.0"
+    "pino": "^8.5.0",
+    "prettier": "^2.7.1",
+    "serialize-anything": "^1.2.3",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "prettier": "^2.7.1",

package/src/models.js

@@ -4,6 +4,8 @@
  * @returns
  */
 const processModels = (nodegen) => {
+  const processedModels = {...nodegen}
+  // console.log('MODELS TO PROCESS: ', processedModels)
   switch (nodegen.type) {
     case "binary":
     case "uint8array":
@@ -15,11 +17,12 @@ const processModels = (nodegen) => {
           js: Buffer.from(nodegen.binary.js, "base64"),
           data: Buffer.from(nodegen.binary.data, "base64"),
         };
-
-        nodegen.binary = model;
+        processedModels.binary = model
+        // nodegen.binary = model;
       } else {
         const model = Buffer.from(nodegen.binary, "base64");
-        nodegen.binary = model;
+        processedModels.binary = model
+        // nodegen.binary = model;
       }
       break;
     case "function":
@@ -27,20 +30,23 @@ const processModels = (nodegen) => {
 
       if (func.constructor.name === "AsyncFunction") {
         (async () => {
-          nodegen.binary = await func();
+          processedModels.binary = await func();
+          // nodegen.binary = await func();
           const model = Buffer.from(nodegen.binary, "base64");
-          nodegen.binary = model;
+          processedModels.binary = model;
+          // nodegen.binary = model;
         })();
       } else {
-        nodegen.binary = func();
+        // nodegen.binary = func();
         const model = Buffer.from(nodegen.binary, "base64");
-        nodegen.binary = model;
+        processedModels.binary = model;
+        // nodegen.binary = model;
       }
     default:
       break;
   }
 
-  return nodegen;
+  return processedModels;
 };
 
 module.exports = processModels;

package/src/node.js

@@ -1,10 +1,14 @@
 const utils = require("./helpers/utils.js");
 const WasmRunnerErrors = require("./error.js");
 const { WasmRunner } = require("@coherentglobal/wasm-runner");
-const logger = require("./logger");
+const logger = require("./logger.js");
 const validate = require("./validate.js");
 const processModels = require("./models.js");
 const got = require("got");
+const fs = require('fs');
+const serializeObject = require('serialize-anything');
+const path = require('path')
+const { v4: uuidv4 } = require('uuid')
 const { object } = require("joi");
 
 let registry = [];
@@ -13,11 +17,21 @@ class Spark {
   /**
    * @param {object} config
    */
-  constructor(config) {
+  constructor(config, option={}) {
+    this.externalUuid = config.externalUuid ? config.externalUuid : uuidv4()
     /**
      * @private
      */
-    this.config = this.validateConfig(config);
+    if(option.serialize){
+      const toBase = Buffer.from(config, 'base64').toString('utf8')
+      const deserialize = serializeObject.deserialize(toBase)
+      const validate = this.validateConfig(deserialize)
+      this.config = validate
+      this.externalUuid = validate.externalUuid ? validate.externalUuid : uuidv4()
+      logger.info({message: "DESERIALIZE: ", value: this.externalUuid})
+    } else {
+      this.config = this.validateConfig(config)
+    }
     const {
       sparkEndpoint: { syntheticKey, bearerToken, authType, tenant, url },
       nodeGenModels,
@@ -50,6 +64,18 @@ class Spark {
     /**
      * @private
      */
+    this.fallbackEnabled = false;
+
+    /**
+     * @private
+     */
+    this.externalResolver = this._addExternalResolver()
+    console.log('EX: ', this.externalResolver)
+
+     /**
+     * @private
+     */
+    //  this.storedConfig = this._storeConfig()
     this.priority = ["model", "onlineEndpoint"];
   }
 
@@ -241,7 +267,6 @@ 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);
@@ -250,6 +275,45 @@ class Spark {
     return response;
   }
 
+  _addExternalResolver() {
+    const folder = path.join(__dirname, `resolver_temp`)
+    try {
+      fs.accessSync(folder)
+    } catch (err) {
+      fs.mkdirSync(folder)
+    }
+    const filePath = path.join(__dirname, `resolver_temp/resolver-${this.externalUuid}.js`)
+    if(fs.existsSync(filePath)) {
+      return require.resolve(filePath)
+    }
+    let template = fs.readFileSync(
+      require.resolve("./resolver/externalResolver.js"),
+      {
+        encoding: "utf8"
+      }
+    )
+    const data = serializeObject.serialize({...this.config, externalUuid: this.externalUuid})
+    template = template.replace("%%config_to_replace%%", new Buffer(data).toString('base64'))
+    fs.writeFileSync(filePath, template)
+    return require.resolve(filePath)
+  }
+
+  _getModelByMeta(folderName, serviceName) {
+    const model = this.model.find(
+      (m) =>
+        m?.metaData?.EngineInformation?.ProductName === folderName &&
+        m?.metaData?.EngineInformation?.ServiceName === serviceName
+    );
+    if (!model) throw new WasmRunnerErrors.MissingModelError(serviceName);
+    return model?.metaData?.VersionId || model?.versionId;
+  }
+
+  _storeConfig() {
+    fs.writeFileSync('config.json',JSON.stringify(this.config), () => console.err(err))
+    return require.resolve('config.json')
+    // return JSON.stringify(this.config)
+  }
+
   /**
    * Remove Model
    */
@@ -264,7 +328,7 @@ class Spark {
         TextMessage: `Execute uuid: ${model && model?.versionId}`,
       });
       if (!(registry instanceof WasmRunner)) {
-        registry = new WasmRunner();
+        registry = new WasmRunner(undefined, ds.externalResolver, "");
       }
 
       if (!registry.isExist(versionID)) {

package/src/resolver/externalResolver.js

@@ -1,13 +1,8 @@
-const { StatusCodes } = require("http-status-codes");
-const { logger } = require("@coherentglobal/node-sdk");
-// const config = require("../config"); env vars
-const {
-  handleDirectRequest,
-  modelServiceValidation,
-  getLatestVersionFromServiceMapTable,
-} = require("../logic/runnerLogic");
-const { getModelViaFolder } = require("../services/entityStore");
-const tenant = "%%tenant_to_replace%%";
+// const tenant = "%%tenant_to_replace%%";
+const Spark = require('../node')
+const logger = require('../logger')
+
+const instance = new Spark("%%config_to_replace%%", {serialize: true})
 
 const CALL_TYPE = {
   0: "SparkService",
@@ -47,72 +42,46 @@ const XcallResBuilder = {
   },
 };
 
+const sparkServiceVersionOne = async (requestData, context) => {
+  // const modelLocation = config().modelLocation;
+  const headers = context.headers;
+  const folderName = requestData.folder_name;
+  const serviceName = requestData.service_name;
+  const upstreamVersionId = context.upstreamVersionId;
+  let requestBodyFromEngine
+  // logger.info({
+  //   eventType: "SparkService",
+  //   msg: `EXTERNALSDK:DISPATCH_TYPE.SPARK_SERVICE ${tenant}`,
+  // });
+  // logger.info({ eventType: "RequestData", msg: requestData });
+  try {
+    requestBodyFromEngine = JSON.parse(requestData.request_body);
+  } catch (err) {
+    // logger.error({
+    //   eventType: "SparkService",
+    //   msg: `WASMSERVER:DISPATCH_TYPE.SPARK_SERVICE ERROR: Request body is malform JSON ${requestData.request_body}`,
+    // });
+    // throw new error(`Downstream Request body is malform JSON ${requestData.request_body}`)
+  }
+  const options = {}
+  const modelId = instance._getModelByMeta(folderName, serviceName)
+  const results = await instance.execute(requestBodyFromEngine, modelId)
+  // console.log('RES: ', results)
+  const response = XcallResBuilder.Json(
+    CALL_TYPE[0],
+    serviceName,
+    // StatusCodes.ACCEPTED,
+    202,
+    "",
+    0,
+    results
+  );
+  return response;
+}
+
 module.exports = {
   sparkService: async (requestData, context) => {
-    const modelLocation = config().modelLocation;
-    const headers = context.headers;
-    const folderName = requestData.folder_name;
-    const serviceName = requestData.service_name;
-
-    logger.info({
-      eventType: "SparkService",
-      msg: `WASMSERVER:DISPATCH_TYPE.SPARK_SERVICE ${tenant}`,
-    });
-    logger.info({ eventType: "RequestData", msg: requestData });
-    const requestBodyFromEngine = JSON.parse(requestData.request_body);
-    const requestMetaFromEngine = requestBodyFromEngine.request_meta;
-    const findAvailableLatestModelFromLocal =
-      getLatestVersionFromServiceMapTable(
-        context.servicemap,
-        headers.tenant,
-        decodeURI(folderName),
-        decodeURI(serviceName)
-      );
-    requestMetaFromEngine.version_id = findAvailableLatestModelFromLocal;
-    const serviceMap = modelServiceValidation(
-      context.servicemap,
-      headers.tenant,
-      requestMetaFromEngine
-    );
-    // const modelVersion = modelLocation
-    // ? // ? await resolveOffline(requestMetaFromEngine, headers.tenant, headers, serviceMap)
-    // findAvailableLatestModelFromLocal
-    // : await getModelViaFolder(folderName, serviceName, headers);
-
-    const modelVersion = await getModelViaFolder(
-      folderName,
-      serviceName,
-      headers
-    );
-    const params = {
-      tenant: headers.tenant,
-    };
-    const body = {
-      ...requestBodyFromEngine,
-      request_meta: {
-        ...requestBodyFromEngine.request_meta,
-        version_id: modelVersion,
-        call_purpose: "Spark - API Tester",
-        source_system: "SPARK",
-        correlation_id: "",
-        requested_output: null,
-        service_category: "",
-      },
-    };
-    const payload = {
-      body,
-      headers,
-      params,
-    };
-    const results = await handleDirectRequest(payload);
-    const response = XcallResBuilder.Json(
-      CALL_TYPE[0],
-      serviceName,
-      StatusCodes.ACCEPTED,
-      "",
-      0,
-      results
-    );
-    return response;
-  },
-};
+    const results = await sparkServiceVersionOne(requestData, context)
+    return results
+  }
+};

package/src/services/entityStore.js

@@ -3,9 +3,9 @@ const cuid = require("cuid");
 const fs = require("fs");
 const got = require("got");
 const path = require("path");
-const { logger } = require("@coherentglobal/node-sdk");
+const { logger } = require("../logger.js");
 const { EntityStoreError } = require("../error");
-const config = require("../config");
+// const config = require("../config");
 
 const request = got.extend({
   throwHttpErrors: false, // allows us to throw our own error based off got response

package/src/validate.js

@@ -39,6 +39,7 @@ const rules = Joi.object({
       })
     )
     .required(),
+    externalUuid: Joi.string().allow()
   // xParameters: Joi.array().items(),
   // xCallCallback: Joi.func()
 }).required();

package/examples/UsingBearerTokenFNAsync/bearerTokenExample.js

@@ -1,22 +0,0 @@
-const Spark = require("../../src/node.js");
-const config = require("./config.js");
-const modelC = require("./modelCInput.json");
-
-const spark = new Spark(config);
-
-const dataInput = modelC;
-const modelVersionId = "0211e8f0-9988-4514-a761-9782db6700ce";
-
-async function execute() {
-  console.log("Reached");
-  try {
-    let result = await spark.execute(dataInput);
-
-    console.log("Final Result", result);
-    return result;
-  } catch (err) {
-    console.log("No model found", err);
-  }
-}
-
-(async () => await execute())();