npm - @coherentglobal/spark-execute-sdk - Versions diffs - 0.3.7 → 0.3.8 - Mend

@coherentglobal/spark-execute-sdk 0.3.7 → 0.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/browser.js +28 -4
package/examples/UsingBearerTokenFNAsync/index.html +1 -0
package/examples/functionModel/index.html +217 -0
package/examples/functionModel/models/{Model_C.zip → 0211e8f0-9988-4514-a761-9782db6700ce.zip} +0 -0
package/examples/functionModel/node.js +2 -2
package/package.json +3 -2
package/src/models.js +12 -3
package/tsconfig.json +3 -1
package/types/models.d.ts.map +1 -1

package/dist/browser.js CHANGED Viewed

@@ -6544,6 +6544,8 @@ module.exports = {
 "use strict";
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 /**
  *
@@ -6563,16 +6565,38 @@ var processModels = function processModels(nodegen) {
           data: Buffer.from(nodegen.binary.data, "base64")
         };
         nodegen.binary = model;
-        console.log("NODE: ", nodegen.binary);
       } else {
         var _model = Buffer.from(nodegen.binary, "base64");
         nodegen.binary = _model;
-        console.log("NODE: ", nodegen.binary);
       }
       break;
     case "function":
       var func = nodegen.binary;
-      nodegen.binary = func();
+      if (func.constructor.name === "AsyncFunction") {
+        (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+          var model;
+          return _regenerator["default"].wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return func();
+                case 2:
+                  nodegen.binary = _context.sent;
+                  model = Buffer.from(nodegen.binary, "base64");
+                  nodegen.binary = model;
+                case 5:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }))();
+      } else {
+        nodegen.binary = func();
+        var _model2 = Buffer.from(nodegen.binary, "base64");
+        nodegen.binary = _model2;
+      }
     default:
       break;
   }
@@ -6581,7 +6605,7 @@ var processModels = function processModels(nodegen) {
 module.exports = processModels;
 }).call(this)}).call(this,require("buffer").Buffer)
-},{"@babel/runtime/helpers/interopRequireDefault":9,"@babel/runtime/helpers/typeof":15,"buffer":24}],46:[function(require,module,exports){
+},{"@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){
 "use strict";
 var Joi = require("joi");

package/examples/UsingBearerTokenFNAsync/index.html CHANGED Viewed

@@ -51,6 +51,7 @@
           return access_token;
         } catch (err) {}
       };
         const config = {
         sparkEndpoint: {
             url: "https://excel.dev.coherent.global",

package/examples/functionModel/index.html ADDED Viewed

@@ -0,0 +1,217 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta name="Demo" content="Demo App" />
+    <title>Spark Execute SDK Demo App</title>
+  </head>
+  <body>
+    <h1>Spark Execute SDK Demo</h1>
+    <br /><br />
+    <label>Payload:</label><br />
+    <textarea
+      id="myTextarea"
+      rows="20"
+      cols="100"
+      type="text"
+      onChange="handleChange()"
+    ></textarea>
+    <br /><br />
+    <button id="calcButton" onClick="handleSubmit()" >Run Calc</button
+    ><br /><br />
+    <label>Logs:</label><br /><br />
+    <p id="logsP"></p>
+    <br /><br />
+    <label>Response Data:</label><br /><br />
+    <textarea
+      disabled
+      rows="20"
+      cols="100"
+      type="text"
+      id="responseP"
+    ></textarea>
+    <script src="../../dist/browser.js"></script>
+    <script>
+      const modelpath = "./models/0211e8f0-9988-4514-a761-9782db6700ce.zip"
+      const getModel = async () => {
+           const result = await fetch(modelpath)
+           .then(response => response.blob())
+           .then( blob => {
+             return blobToBase64(blob)
+                .then((base64String) => {
+                  return base64String.split(",")[1];
+                });
+            })
+          return result;
+      }
+        const blobToBase64 = (blob) => {
+          return new Promise((resolve, _) => {
+            const reader = new FileReader();
+            reader.onloadend = () => resolve(reader.result);
+            reader.readAsDataURL(blob);
+          });
+        }
+        const config = {
+        sparkEndpoint: {
+            url: "https://spark.dev.coherent.global",
+            tenant: "coherent",
+            authType: "bearerToken",
+            bearerToken: ""
+        },
+        nodeGenModels: [
+            {
+                versionId: "0211e8f0-9988-4514-a761-9782db6700ce",
+                type: "function",
+                binary: getModel,
+                metaData:{
+                    "id": "7156c7a4-8a81-4d83-ac7f-a54ce02009da",
+                    "url": "/docstore/api/v1/documents/versions/tokens/ItHPu2LY%2F626xeFbg%2BlSskCRy0%2FKjVp0H4uIcJmX%2BH0ehoZgRGXefIcHwR9PuX7kKHk3ywjoy6hVqkIDPWn4jAcsDN07VXdys0%2Fi4LdSxmtKGKF8IT9f%2FZZWRGWTmNWQ9SweGfiT7xc5N2%2BC9aTmlySAtACZkcdYDpsKtSuhvSJrRrSkzlt9Ra4TPBXTaokPfGR6VzK%2FMKM%2B3y3aXt3sT0P5EIRF%2BtMrVmpwmTTGva8%3D/Model_C.c1engine",
+                        "EngineInformation": {
+                            "FileSize": 4885,
+                            "Author": "francisc.camillo@coherent.global",
+                            "ProductName": "ExecuteSDK",
+                            "Revision": "1.0.0",
+                            "Description": null,
+                            "FileMD5Hash": "3E9395DB32F0E8430BD8865DDA53753C",
+                            "UniversalFileHash": null,
+                            "ReleaseDate": "2022-08-23T13:06:52.786Z",
+                            "ServiceName": "Model_C",
+                            "NoOfInstance": 1,
+                            "UploaderEmail": "francisc.camillo@coherent.global",
+                            "DefaultEngineType": "NodeGen",
+                            "OriginalFileName": "Model_C.xlsx",
+                            "SizeOfUploadedFile": 4885,
+                            "ReleaseNote": null,
+                            "IsTypeScriptFile": false,
+                            "IsJsSheetEngineGenerated": false,
+                            "EngineUpgradeType": "minor",
+                            "PublicAPI": true,
+                            "FileGuid": "42efc880-91f1-4928-88cc-b29b68327f26",
+                            "ServiceGuid": "bcc2f47d-0682-4d2b-9174-5b01f903ee6b",
+                            "ServiceVersionGuid": "0211e8f0-9988-4514-a761-9782db6700ce",
+                            "BaseUrl": "https://excel.dev.coherent.global",
+                            "Tenant": "coherent",
+                            "AllowToStoreHistory": true,
+                            "CalcMode": "AUTO",
+                            "ForceInputsWriteBeforeCalcModeChanges": true,
+                            "Provenance": null,
+                            "VersionLabel": "Model_C",
+                            "ExplainerType": "",
+                            "IsXParameter": false,
+                            "XParameterSetVersionId": "",
+                            "VersionUpgradeAssert": "OFF"
+                        },
+                        "XInputTable": [
+                            {
+                                "Input Name": "Input",
+                                "Description": null,
+                                "Address": "C2"
+                            }
+                        ],
+                        "XOutputTable": [
+                            {
+                                "Output Name": "Output1",
+                                "Description": null,
+                                "Address": "C3"
+                            }
+                        ],
+                        "FormsService": null,
+                        "StaticService": null,
+                        "VersionId": "0211e8f0-9988-4514-a761-9782db6700ce"
+                    ,
+                    "created": "2022-08-23T13:06:55.017422Z",
+                    "effectiveStartDate": "2009-12-31T16:00:00Z",
+                    "effectiveEndDate": "2119-12-31T16:00:00Z",
+                    "path": "/products/ExecuteSDK/productfactory/engines/Model_C/Model_C.c1engine",
+                    "privacyLevel": "Private",
+                    "dateTime1": "2009-12-31T16:00:00Z",
+                    "dateTime2": "2119-12-31T16:00:00Z",
+                    "status1": "nodegen",
+                    "status2": "Model_C.xlsx",
+                    "email1": null,
+                    "email2": null,
+                    "amount1": 4885,
+                    "amount2": 9184,
+                    "amount3": null,
+                    "type": "EngineDocument",
+                    "policyNumber": "francisc.camillo@coherent.global",
+                    "name1": "Model_C",
+                    "name2": "Model_C.c1engine",
+                    "otherString1": "1.0.0",
+                    "otherString2": "EngineFile",
+                    "referenceId": "ExecuteSDK~Model_C.c1engine",
+                    "disposition": null,
+                    "productName": "ExecuteSDK",
+                    "content": null,
+                    "latestVersionId": "0211e8f0-9988-4514-a761-9782db6700ce"
+                }
+            }
+        ]
+        }
+      const dataInput2 = {
+            "request_data": {
+                "inputs": {
+                    "Input": 1
+                }
+            },
+            "request_meta": {
+                "version_id": "0211e8f0-9988-4514-a761-9782db6700ce",
+                "call_purpose": "Spark - API Tester",
+                "source_system": "SPARK",
+                "correlation_id": "",
+                "requested_output": null,
+                "service_category": ""
+            }
+        }
+        document.getElementById("myTextarea").value = JSON.stringify(dataInput2);
+       var spark = new Spark(config);
+        console.log("INITIALIZE SPARK", spark)
+       async function handleSubmit() {
+        const input = document.getElementById("myTextarea").value
+        const payload = JSON.parse(input);
+        const start = new Date();
+        try {
+            let res = await execute(payload);
+            const consumed = new Date - start;
+            document.getElementById(
+                "logsP"
+              ).innerHTML = `\nComputation Time Consumed: ${consumed} ms\n`;
+            document.getElementById("responseP").innerHTML = `\n${JSON.stringify(
+                res,
+                null,
+                2
+              )}\n`;
+            console.log("RES", res)
+        } catch (err) {
+            console.log("ERROR", err)
+        }
+       }
+      // load();
+       async function execute(input) {
+        let result = await spark.execute(input);
+        return result;
+      }
+      function handleChange() {
+        return;
+      }
+    </script>
+  </body>
+  </html>

package/examples/functionModel/models/{Model_C.zip → 0211e8f0-9988-4514-a761-9782db6700ce.zip} RENAMED Viewed

File without changes

package/examples/functionModel/node.js CHANGED Viewed

@@ -4,7 +4,7 @@ const Spark = require("../../src/node.js");
 const modelC = require("./modelCInput.json");
 const fs = require("fs");
-const location = "./models/Model_C.zip";
+const location = "./models/0211e8f0-9988-4514-a761-9782db6700ce.zip";
 const file = fs.readFileSync(location);
@@ -13,7 +13,7 @@ const data = file.toString("base64");
 const buffer = Buffer.from(data, "base64");
 const getModel = () => {
-  return buffer;
+  return data;
 };
 const config = {

package/package.json CHANGED Viewed

@@ -1,9 +1,10 @@
 {
   "name": "@coherentglobal/spark-execute-sdk",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "",
-  "mains": "index.js",
+  "main": "src/node.js",
   "browser": "dist/browser.js",
+  "types": "types/node.d.ts",
   "scripts": {
     "build:types": "tsc --declaration",
     "bundle:full": "browserify src/browser.js  --standalone Spark > dist/browser.js",

package/src/models.js CHANGED Viewed

@@ -17,16 +17,25 @@ const processModels = (nodegen) => {
         };
         nodegen.binary = model;
-        console.log("NODE: ", nodegen.binary);
       } else {
         const model = Buffer.from(nodegen.binary, "base64");
         nodegen.binary = model;
-        console.log("NODE: ", nodegen.binary);
       }
       break;
     case "function":
       const func = nodegen.binary;
-      nodegen.binary = func();
+      if (func.constructor.name === "AsyncFunction") {
+        (async () => {
+          nodegen.binary = await func();
+          const model = Buffer.from(nodegen.binary, "base64");
+          nodegen.binary = model;
+        })();
+      } else {
+        nodegen.binary = func();
+        const model = Buffer.from(nodegen.binary, "base64");
+        nodegen.binary = model;
+      }
     default:
       break;
   }

package/tsconfig.json CHANGED Viewed

@@ -31,7 +31,9 @@
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
+    "typeRoots": [
+      "./types/**/*"
+    ] /* Specify multiple folders that act like './node_modules/@types'. */,
     // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */

package/types/models.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.js"],"names":[],"mappings":";~~AACA~~;;;;GAIG;AACH,wCAHW,MAAM,~~UAkChB~~"}
1	+ {"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.js"],"names":[],"mappings":";AAAA;;;;GAIG;AACH,wCAHW,MAAM,UAyChB"}