@coherentglobal/spark-execute-sdk 0.4.2 → 0.4.3
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.
- package/dist/browser.js +84 -91
- package/package.json +2 -2
- package/src/browser.js +19 -17
package/dist/browser.js
CHANGED
|
@@ -754,10 +754,9 @@ var unzipBuffer = function unzipBuffer(model) {
|
|
|
754
754
|
while (1) {
|
|
755
755
|
switch (_context5.prev = _context5.next) {
|
|
756
756
|
case 0:
|
|
757
|
-
console.log("ENTERED UNZIP");
|
|
758
757
|
modelToBlob = new Blob([new Uint8Array(model)]);
|
|
759
758
|
new_zip = new jszip_1["default"]();
|
|
760
|
-
_context5.next =
|
|
759
|
+
_context5.next = 4;
|
|
761
760
|
return new_zip.loadAsync(modelToBlob).then(function (zipped) {
|
|
762
761
|
return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
|
|
763
762
|
var response;
|
|
@@ -765,7 +764,6 @@ var unzipBuffer = function unzipBuffer(model) {
|
|
|
765
764
|
while (1) {
|
|
766
765
|
switch (_context4.prev = _context4.next) {
|
|
767
766
|
case 0:
|
|
768
|
-
console.log("ZIPPED: ", zipped);
|
|
769
767
|
Object.keys(zipped.files).forEach(function (entry) {
|
|
770
768
|
if (entry.indexOf("__MACOSX") === -1) {
|
|
771
769
|
if (path_1["default"].extname(entry) === ".js") {
|
|
@@ -781,19 +779,14 @@ var unzipBuffer = function unzipBuffer(model) {
|
|
|
781
779
|
});
|
|
782
780
|
// if (!jsPath) return reject(new Error("Missing runtime file"));
|
|
783
781
|
// if (!wasmPath) return reject(new Error("Missing engine file"));
|
|
784
|
-
_context4.next =
|
|
782
|
+
_context4.next = 3;
|
|
785
783
|
return zipped.file(jsPath).async("text");
|
|
786
|
-
case
|
|
784
|
+
case 3:
|
|
787
785
|
js = _context4.sent;
|
|
788
|
-
_context4.next =
|
|
786
|
+
_context4.next = 6;
|
|
789
787
|
return zipped.file(wasmPath).async("arraybuffer");
|
|
790
|
-
case
|
|
788
|
+
case 6:
|
|
791
789
|
wasm = _context4.sent;
|
|
792
|
-
console.log("ZIPP INFO: ", {
|
|
793
|
-
wasm: wasm,
|
|
794
|
-
js: js,
|
|
795
|
-
data: data
|
|
796
|
-
});
|
|
797
790
|
response = {
|
|
798
791
|
wasm: {
|
|
799
792
|
url: URL.createObjectURL(new Blob([wasm], {
|
|
@@ -809,12 +802,12 @@ var unzipBuffer = function unzipBuffer(model) {
|
|
|
809
802
|
}
|
|
810
803
|
};
|
|
811
804
|
if (!dataPath) {
|
|
812
|
-
_context4.next =
|
|
805
|
+
_context4.next = 13;
|
|
813
806
|
break;
|
|
814
807
|
}
|
|
815
|
-
_context4.next =
|
|
808
|
+
_context4.next = 11;
|
|
816
809
|
return zipped.file(dataPath).async("arraybuffer");
|
|
817
|
-
case
|
|
810
|
+
case 11:
|
|
818
811
|
data = _context4.sent;
|
|
819
812
|
response.data = {
|
|
820
813
|
url: URL.createObjectURL(new Blob([data], {
|
|
@@ -822,9 +815,9 @@ var unzipBuffer = function unzipBuffer(model) {
|
|
|
822
815
|
})),
|
|
823
816
|
path: dataPath
|
|
824
817
|
};
|
|
825
|
-
case
|
|
818
|
+
case 13:
|
|
826
819
|
return _context4.abrupt("return", response);
|
|
827
|
-
case
|
|
820
|
+
case 14:
|
|
828
821
|
case "end":
|
|
829
822
|
return _context4.stop();
|
|
830
823
|
}
|
|
@@ -832,10 +825,10 @@ var unzipBuffer = function unzipBuffer(model) {
|
|
|
832
825
|
}, _callee4);
|
|
833
826
|
}));
|
|
834
827
|
});
|
|
835
|
-
case
|
|
828
|
+
case 4:
|
|
836
829
|
loadZip = _context5.sent;
|
|
837
830
|
return _context5.abrupt("return", loadZip);
|
|
838
|
-
case
|
|
831
|
+
case 6:
|
|
839
832
|
case "end":
|
|
840
833
|
return _context5.stop();
|
|
841
834
|
}
|
|
@@ -850,7 +843,6 @@ var unzipppedModel = function unzipppedModel(model) {
|
|
|
850
843
|
while (1) {
|
|
851
844
|
switch (_context6.prev = _context6.next) {
|
|
852
845
|
case 0:
|
|
853
|
-
console.log("Entered UNZIPPED MODEL");
|
|
854
846
|
servicename = model.servicename, wasm = model.wasm, js = model.js, data = model.data;
|
|
855
847
|
response = {
|
|
856
848
|
wasm: {
|
|
@@ -875,7 +867,7 @@ var unzipppedModel = function unzipppedModel(model) {
|
|
|
875
867
|
};
|
|
876
868
|
}
|
|
877
869
|
return _context6.abrupt("return", response);
|
|
878
|
-
case
|
|
870
|
+
case 4:
|
|
879
871
|
case "end":
|
|
880
872
|
return _context6.stop();
|
|
881
873
|
}
|
|
@@ -891,12 +883,11 @@ var getRuntimeContent = function getRuntimeContent(js, wasm) {
|
|
|
891
883
|
while (1) {
|
|
892
884
|
switch (_context9.prev = _context9.next) {
|
|
893
885
|
case 0:
|
|
894
|
-
console.log("RUNTIME DATA: ", data);
|
|
895
886
|
if (!data) {
|
|
896
|
-
_context9.next =
|
|
887
|
+
_context9.next = 5;
|
|
897
888
|
break;
|
|
898
889
|
}
|
|
899
|
-
_context9.next =
|
|
890
|
+
_context9.next = 3;
|
|
900
891
|
return fetch(js.url).then(function (res) {
|
|
901
892
|
return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
|
|
902
893
|
return _regenerator["default"].wrap(function _callee7$(_context7) {
|
|
@@ -914,11 +905,11 @@ var getRuntimeContent = function getRuntimeContent(js, wasm) {
|
|
|
914
905
|
}).then(function (text) {
|
|
915
906
|
return text.replace(wasm.path, wasm.url).replace(data.path, data.url).replace(data.path, data.url);
|
|
916
907
|
});
|
|
917
|
-
case
|
|
908
|
+
case 3:
|
|
918
909
|
_runtime = _context9.sent;
|
|
919
910
|
return _context9.abrupt("return", _runtime);
|
|
920
|
-
case
|
|
921
|
-
_context9.next =
|
|
911
|
+
case 5:
|
|
912
|
+
_context9.next = 7;
|
|
922
913
|
return fetch(js.url).then(function (res) {
|
|
923
914
|
return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
|
|
924
915
|
return _regenerator["default"].wrap(function _callee8$(_context8) {
|
|
@@ -936,10 +927,10 @@ var getRuntimeContent = function getRuntimeContent(js, wasm) {
|
|
|
936
927
|
}).then(function (text) {
|
|
937
928
|
return text.replace(wasm.path, wasm.url);
|
|
938
929
|
});
|
|
939
|
-
case
|
|
930
|
+
case 7:
|
|
940
931
|
runtime = _context9.sent;
|
|
941
932
|
return _context9.abrupt("return", runtime);
|
|
942
|
-
case
|
|
933
|
+
case 9:
|
|
943
934
|
case "end":
|
|
944
935
|
return _context9.stop();
|
|
945
936
|
}
|
|
@@ -1000,7 +991,6 @@ var WasmRunner = /*#__PURE__*/function () {
|
|
|
1000
991
|
var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultCallback;
|
|
1001
992
|
(0, _classCallCheck2["default"])(this, WasmRunner);
|
|
1002
993
|
utils.isCompatible();
|
|
1003
|
-
console.log('CALLBACK: ', callback);
|
|
1004
994
|
this.license = license;
|
|
1005
995
|
this.callback = callback;
|
|
1006
996
|
this.models = [];
|
|
@@ -1060,47 +1050,45 @@ var WasmRunner = /*#__PURE__*/function () {
|
|
|
1060
1050
|
modelUrl = m.url;
|
|
1061
1051
|
isDataBuffer = (0, is_buffer_1["default"])(modelUrl);
|
|
1062
1052
|
isObject = (0, _typeof2["default"])(modelUrl) === "object";
|
|
1063
|
-
console.log("IS BUFFER: ", isDataBuffer);
|
|
1064
1053
|
if (!isDataBuffer) {
|
|
1065
|
-
_context14.next =
|
|
1054
|
+
_context14.next = 12;
|
|
1066
1055
|
break;
|
|
1067
1056
|
}
|
|
1068
|
-
_context14.next =
|
|
1057
|
+
_context14.next = 6;
|
|
1069
1058
|
return unzipBuffer(modelUrl);
|
|
1070
|
-
case
|
|
1059
|
+
case 6:
|
|
1071
1060
|
bufferModel = _context14.sent;
|
|
1072
1061
|
js = bufferModel.js;
|
|
1073
1062
|
wasm = bufferModel.wasm;
|
|
1074
1063
|
data = bufferModel.data;
|
|
1075
|
-
_context14.next =
|
|
1064
|
+
_context14.next = 27;
|
|
1076
1065
|
break;
|
|
1077
|
-
case
|
|
1066
|
+
case 12:
|
|
1078
1067
|
if (!isObject) {
|
|
1079
|
-
_context14.next =
|
|
1068
|
+
_context14.next = 21;
|
|
1080
1069
|
break;
|
|
1081
1070
|
}
|
|
1082
|
-
_context14.next =
|
|
1071
|
+
_context14.next = 15;
|
|
1083
1072
|
return unzipppedModel(modelUrl);
|
|
1084
|
-
case
|
|
1073
|
+
case 15:
|
|
1085
1074
|
unzipModelFile = _context14.sent;
|
|
1086
1075
|
js = unzipModelFile.js;
|
|
1087
1076
|
wasm = unzipModelFile.wasm;
|
|
1088
1077
|
data = unzipModelFile.data;
|
|
1089
|
-
|
|
1090
|
-
_context14.next = 29;
|
|
1078
|
+
_context14.next = 27;
|
|
1091
1079
|
break;
|
|
1092
|
-
case
|
|
1093
|
-
_context14.next =
|
|
1080
|
+
case 21:
|
|
1081
|
+
_context14.next = 23;
|
|
1094
1082
|
return unzipFile(modelUrl);
|
|
1095
|
-
case
|
|
1083
|
+
case 23:
|
|
1096
1084
|
unzipped = _context14.sent;
|
|
1097
1085
|
js = unzipped.js;
|
|
1098
1086
|
wasm = unzipped.wasm;
|
|
1099
1087
|
data = unzipped.data;
|
|
1100
|
-
case
|
|
1101
|
-
_context14.next =
|
|
1088
|
+
case 27:
|
|
1089
|
+
_context14.next = 29;
|
|
1102
1090
|
return getRuntimeContent(js, wasm, data);
|
|
1103
|
-
case
|
|
1091
|
+
case 29:
|
|
1104
1092
|
runtime = _context14.sent;
|
|
1105
1093
|
m.parents = this;
|
|
1106
1094
|
m.worker = new Worker(utils.jsString2workerURL((0, template_1["default"])(runtime, license)));
|
|
@@ -1121,7 +1109,6 @@ var WasmRunner = /*#__PURE__*/function () {
|
|
|
1121
1109
|
switch (_context13.prev = _context13.next) {
|
|
1122
1110
|
case 0:
|
|
1123
1111
|
_context13.prev = 0;
|
|
1124
|
-
// const modelVersionId = "d18c6f24-92ac-454e-a4db-02233389fe7e"
|
|
1125
1112
|
option = {
|
|
1126
1113
|
folder_name: folderName,
|
|
1127
1114
|
service_name: serviceName
|
|
@@ -1131,28 +1118,29 @@ var WasmRunner = /*#__PURE__*/function () {
|
|
|
1131
1118
|
return m.parents.callback(option);
|
|
1132
1119
|
case 4:
|
|
1133
1120
|
modelVersionId = _context13.sent;
|
|
1134
|
-
|
|
1121
|
+
requestData.request_meta.version_id = modelVersionId;
|
|
1122
|
+
_context13.next = 8;
|
|
1135
1123
|
return m.parents.execute(requestData, modelVersionId);
|
|
1136
|
-
case
|
|
1124
|
+
case 8:
|
|
1137
1125
|
results = _context13.sent;
|
|
1138
1126
|
m.worker.postMessage([{
|
|
1139
1127
|
request: oEvent.data.requestData,
|
|
1140
1128
|
response: results
|
|
1141
1129
|
}, "", "dispatch"]);
|
|
1142
1130
|
resolve(results);
|
|
1143
|
-
_context13.next =
|
|
1131
|
+
_context13.next = 17;
|
|
1144
1132
|
break;
|
|
1145
|
-
case
|
|
1146
|
-
_context13.prev =
|
|
1133
|
+
case 13:
|
|
1134
|
+
_context13.prev = 13;
|
|
1147
1135
|
_context13.t0 = _context13["catch"](0);
|
|
1148
1136
|
console.log('CHILD MODEL ERROR:', _context13.t0);
|
|
1149
1137
|
reject(_context13.t0);
|
|
1150
|
-
case
|
|
1138
|
+
case 17:
|
|
1151
1139
|
case "end":
|
|
1152
1140
|
return _context13.stop();
|
|
1153
1141
|
}
|
|
1154
1142
|
}
|
|
1155
|
-
}, _callee13, null, [[0,
|
|
1143
|
+
}, _callee13, null, [[0, 13]]);
|
|
1156
1144
|
}));
|
|
1157
1145
|
});
|
|
1158
1146
|
} else if (Array.isArray(oEvent.data)) {
|
|
@@ -1174,7 +1162,7 @@ var WasmRunner = /*#__PURE__*/function () {
|
|
|
1174
1162
|
};
|
|
1175
1163
|
checkModelStatus();
|
|
1176
1164
|
}));
|
|
1177
|
-
case
|
|
1165
|
+
case 34:
|
|
1178
1166
|
case "end":
|
|
1179
1167
|
return _context14.stop();
|
|
1180
1168
|
}
|
|
@@ -1334,10 +1322,16 @@ var WasmRunner = /*#__PURE__*/function () {
|
|
|
1334
1322
|
while (1) {
|
|
1335
1323
|
switch (_context17.prev = _context17.next) {
|
|
1336
1324
|
case 0:
|
|
1325
|
+
version_uuid = id || ((_a = input === null || input === void 0 ? void 0 : input.request_meta) === null || _a === void 0 ? void 0 : _a.version_id) || ((_b = input.request_meta) === null || _b === void 0 ? void 0 : _b.version_uuid);
|
|
1326
|
+
if (!(input === null || input === void 0 ? void 0 : input.request_meta)) {
|
|
1327
|
+
input.request_meta = {};
|
|
1328
|
+
}
|
|
1329
|
+
if (id) {
|
|
1330
|
+
input.request_meta.version_id = version_uuid;
|
|
1331
|
+
}
|
|
1337
1332
|
console.log("EXECUTING: ".concat(id, ", input: ").concat(JSON.stringify(input)));
|
|
1338
|
-
version_uuid = id || ((_a = input.request_meta) === null || _a === void 0 ? void 0 : _a.version_id) || ((_b = input.request_meta) === null || _b === void 0 ? void 0 : _b.version_uuid);
|
|
1339
1333
|
if (!version_uuid) {
|
|
1340
|
-
_context17.next =
|
|
1334
|
+
_context17.next = 9;
|
|
1341
1335
|
break;
|
|
1342
1336
|
}
|
|
1343
1337
|
model = this._getModel(version_uuid);
|
|
@@ -1379,9 +1373,9 @@ var WasmRunner = /*#__PURE__*/function () {
|
|
|
1379
1373
|
};
|
|
1380
1374
|
getResult();
|
|
1381
1375
|
}));
|
|
1382
|
-
case
|
|
1376
|
+
case 9:
|
|
1383
1377
|
throw new error_1["default"].ParameterRequiredError("request_meta.version_id", input);
|
|
1384
|
-
case
|
|
1378
|
+
case 10:
|
|
1385
1379
|
case "end":
|
|
1386
1380
|
return _context17.stop();
|
|
1387
1381
|
}
|
|
@@ -1402,7 +1396,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
1402
1396
|
});
|
|
1403
1397
|
function buildWorkerFN(runtime) {
|
|
1404
1398
|
var license = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
|
|
1405
|
-
return "\n ".concat(runtime, "\n\n const license = '").concat(license, "';\n class MyEventEmitter{constructor(){this._events={}}on(e,t){this._events[e]||(this._events[e]=[]),this._events[e].push(t)}removeListener(e,t){if(!this._events[e]){throw new Error(\"Can't emit an event. Event doesn't exits.\"+e)}this._events[e]=this._events[e].filter((e=>e!==t))}emit(e,t){if(!this._events[e]){throw new Error(\"Can't emit an event. Event doesn't exits.\"+e)}this._events[e].forEach((e=>{e(t)}))}}const workerEventEmitter=new MyEventEmitter;let wasm,wb;const CALL_TYPE={0:\"SparkService\",1:\"ExternalApi\"},XcallResBuilder={Json:function(e,t,s,a,n,r){return JSON.stringify({metadata:{calltype:e,name:t,status:s,error_code:a,response_time:n},data:r||{}})},XML:()=>{}};function moduleInitialize(){Module().then((e=>{wasm=e,wb=e._construct()
|
|
1399
|
+
return "\n ".concat(runtime, "\n\n const license = '").concat(license, "';\n class MyEventEmitter{constructor(){this._events={}}on(e,t){this._events[e]||(this._events[e]=[]),this._events[e].push(t)}removeListener(e,t){if(!this._events[e]){throw new Error(\"Can't emit an event. Event doesn't exits.\"+e)}this._events[e]=this._events[e].filter((e=>e!==t))}emit(e,t){if(!this._events[e]){throw new Error(\"Can't emit an event. Event doesn't exits.\"+e)}this._events[e].forEach((e=>{e(t)}))}}const workerEventEmitter=new MyEventEmitter;let wasm,wb;const CALL_TYPE={0:\"SparkService\",1:\"ExternalApi\"},XcallResBuilder={Json:function(e,t,s,a,n,r){return JSON.stringify({metadata:{calltype:e,name:t,status:s,error_code:a,response_time:n},data:r||{}})},XML:()=>{}};function moduleInitialize(){Module().then((e=>{wasm=e,wb=e._construct();var t=new TextDecoder(\"utf-8\");new TextEncoder;const s=0;e.dispatch=async(a,n,r)=>{const c=new Uint8Array(e.HEAPU8.subarray(n,n+r)),i=t.decode(c).slice(),o=JSON.parse(i),m=(o.folder_name,o.service_name);if(a===s){return await new Promise((async(e,t)=>{postMessage({requestData:o,type:\"stall\"});const s=\"xcall-loopback-result-\"+m;workerEventEmitter.on(s,(async t=>{const s=XcallResBuilder.Json(CALL_TYPE[0],m,202,\"\",0,t);e(s)}))}))}},postMessage(\"Initialized\")}))}moduleInitialize(),onmessage=async function(e){const t=e.data[0];e.data[1];if(\"dispatch\"===e.data[2]){t.request.folder_name;const e=t.request.service_name,s=t.response,a=\"xcall-loopback-result-\"+e;workerEventEmitter.emit(a,s)}else{const t=await runComputation(e);postMessage(t)}};const runComputation=async e=>{const t=e.data[0],s=e.data[1];if(void 0===wasm||void 0===wb)return new Error(\"WASM is not ready\");t?.request_meta?._ctx?.authorization&&(ctx.headers.authorization=t?.request_meta?._ctx?.authorization,delete t?.request_meta?._ctx?.authorization),t?.request_meta?._ctx?.secretkey&&(ctx.headers.secretkey=t?.request_meta?._ctx.secretkey,delete t?.request_meta?._ctx?.secretkey),t?.request_meta?._ctx?.[\"x-synthetic-key\"]&&(ctx.headers[\"x-synthetic-key\"]=t?.request_meta?._ctx?.[\"x-synthetic-key\"],delete t?.request_meta?._ctx?.[\"x-synthetic-key\"]),t?.request_meta?._ctx?.tenant&&(ctx.headers.tenant=t?.request_meta?._ctx?.tenant,delete t?.request_meta?._ctx?.tenant),t?.request_meta?._ctx?.servicemap&&(ctx.servicemap=t?.request_meta?._ctx?.servicemap,delete t?.request_meta?._ctx.servicemap);const a=(new TextEncoder).encode(t),n=wasm._malloc(a.length),r=a.BYTES_PER_ELEMENT;wasm.HEAP8.set(a,n/r);const c=wasm._malloc(8),i=await wasm.ccall(\"node_calc_v3\",\"number\",[\"number\",\"number\",\"number\",\"number\"],[wb,n,a.length,c],{async:!0});var o=wasm.getValue(c,\"i64\");const m=new Uint8Array(wasm.HEAPU8.subarray(i,i+o));const _=new TextDecoder(\"utf-8\").decode(m).slice();return wasm._free(n),wasm._free(c),wasm._free(i),[_,s]};\n\n");
|
|
1406
1400
|
}
|
|
1407
1401
|
exports["default"] = buildWorkerFN;
|
|
1408
1402
|
|
|
@@ -6260,7 +6254,7 @@ var Spark = /*#__PURE__*/function () {
|
|
|
6260
6254
|
/**
|
|
6261
6255
|
* @private
|
|
6262
6256
|
*/
|
|
6263
|
-
this.priority = ["model"
|
|
6257
|
+
this.priority = ["model"];
|
|
6264
6258
|
}
|
|
6265
6259
|
/**
|
|
6266
6260
|
*
|
|
@@ -6412,12 +6406,13 @@ var Spark = /*#__PURE__*/function () {
|
|
|
6412
6406
|
key: "execute",
|
|
6413
6407
|
value: function () {
|
|
6414
6408
|
var _execute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(input, version_id) {
|
|
6409
|
+
var _input$request_meta, _input$request_meta2;
|
|
6415
6410
|
var versionID, lookup, response;
|
|
6416
6411
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
6417
6412
|
while (1) {
|
|
6418
6413
|
switch (_context.prev = _context.next) {
|
|
6419
6414
|
case 0:
|
|
6420
|
-
versionID = version_id || input.request_meta.version_id || input.request_meta.version_uuid;
|
|
6415
|
+
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);
|
|
6421
6416
|
lookup = {
|
|
6422
6417
|
model: this.offlineModel,
|
|
6423
6418
|
onlineEndpoint: this.onlineModelEndpoint
|
|
@@ -6426,17 +6421,8 @@ var Spark = /*#__PURE__*/function () {
|
|
|
6426
6421
|
return lookup[this.priority[0]](input, versionID, this);
|
|
6427
6422
|
case 4:
|
|
6428
6423
|
response = _context.sent;
|
|
6429
|
-
if (!(response instanceof Error)) {
|
|
6430
|
-
_context.next = 9;
|
|
6431
|
-
break;
|
|
6432
|
-
}
|
|
6433
|
-
_context.next = 8;
|
|
6434
|
-
return lookup[this.priority[1]](input, versionID, this);
|
|
6435
|
-
case 8:
|
|
6436
|
-
response = _context.sent;
|
|
6437
|
-
case 9:
|
|
6438
6424
|
return _context.abrupt("return", response);
|
|
6439
|
-
case
|
|
6425
|
+
case 6:
|
|
6440
6426
|
case "end":
|
|
6441
6427
|
return _context.stop();
|
|
6442
6428
|
}
|
|
@@ -6452,13 +6438,20 @@ var Spark = /*#__PURE__*/function () {
|
|
|
6452
6438
|
key: "offlineModel",
|
|
6453
6439
|
value: function () {
|
|
6454
6440
|
var _offlineModel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(input, versionID, ds) {
|
|
6455
|
-
var
|
|
6441
|
+
var _input$request_meta3;
|
|
6442
|
+
var modelVersionId, callback, _model4$metaData$Engi, _model4$metaData, _model4$metaData$Engi2, _model4$metaData$Engi3, _model4$metaData2, _model4$metaData2$Eng, _model4, result;
|
|
6456
6443
|
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
|
6457
6444
|
while (1) {
|
|
6458
6445
|
switch (_context3.prev = _context3.next) {
|
|
6459
6446
|
case 0:
|
|
6460
|
-
|
|
6461
|
-
|
|
6447
|
+
modelVersionId = (input === null || input === void 0 ? void 0 : (_input$request_meta3 = input.request_meta) === null || _input$request_meta3 === void 0 ? void 0 : _input$request_meta3.version_id) || versionID;
|
|
6448
|
+
if (!(input !== null && input !== void 0 && input.request_meta)) {
|
|
6449
|
+
input.request_meta = {};
|
|
6450
|
+
}
|
|
6451
|
+
if (versionID) {
|
|
6452
|
+
input.request_meta.version_id = modelVersionId;
|
|
6453
|
+
}
|
|
6454
|
+
_context3.prev = 3;
|
|
6462
6455
|
if (!(registry instanceof WasmRunner)) {
|
|
6463
6456
|
/**
|
|
6464
6457
|
* Options is the request data the the runner dispatch
|
|
@@ -6519,36 +6512,36 @@ var Spark = /*#__PURE__*/function () {
|
|
|
6519
6512
|
}();
|
|
6520
6513
|
registry = new WasmRunner("", callback);
|
|
6521
6514
|
}
|
|
6522
|
-
if (registry.isExist(
|
|
6523
|
-
_context3.next =
|
|
6515
|
+
if (registry.isExist(modelVersionId)) {
|
|
6516
|
+
_context3.next = 9;
|
|
6524
6517
|
break;
|
|
6525
6518
|
}
|
|
6526
|
-
_model4 = ds._findModel(
|
|
6527
|
-
_context3.next =
|
|
6519
|
+
_model4 = ds._findModel(input.request_meta);
|
|
6520
|
+
_context3.next = 9;
|
|
6528
6521
|
return registry.append({
|
|
6529
|
-
id:
|
|
6522
|
+
id: modelVersionId,
|
|
6530
6523
|
url: _model4.binary,
|
|
6531
6524
|
meta: {
|
|
6532
|
-
folder_name: (_model4$
|
|
6533
|
-
service_name: (_model4$
|
|
6525
|
+
folder_name: (_model4$metaData$Engi = _model4 === null || _model4 === void 0 ? void 0 : (_model4$metaData = _model4.metaData) === null || _model4$metaData === void 0 ? void 0 : (_model4$metaData$Engi2 = _model4$metaData.EngineInformation) === null || _model4$metaData$Engi2 === void 0 ? void 0 : _model4$metaData$Engi2.ProductName) !== null && _model4$metaData$Engi !== void 0 ? _model4$metaData$Engi : "",
|
|
6526
|
+
service_name: (_model4$metaData$Engi3 = _model4 === null || _model4 === void 0 ? void 0 : (_model4$metaData2 = _model4.metaData) === null || _model4$metaData2 === void 0 ? void 0 : (_model4$metaData2$Eng = _model4$metaData2.EngineInformation) === null || _model4$metaData2$Eng === void 0 ? void 0 : _model4$metaData2$Eng.ServiceName) !== null && _model4$metaData$Engi3 !== void 0 ? _model4$metaData$Engi3 : ""
|
|
6534
6527
|
}
|
|
6535
6528
|
});
|
|
6536
|
-
case 7:
|
|
6537
|
-
_context3.next = 9;
|
|
6538
|
-
return registry.execute(input, versionID, function () {});
|
|
6539
6529
|
case 9:
|
|
6530
|
+
_context3.next = 11;
|
|
6531
|
+
return registry.execute(input, modelVersionId, function () {});
|
|
6532
|
+
case 11:
|
|
6540
6533
|
result = _context3.sent;
|
|
6541
6534
|
return _context3.abrupt("return", result);
|
|
6542
|
-
case
|
|
6543
|
-
_context3.prev =
|
|
6544
|
-
_context3.t0 = _context3["catch"](
|
|
6535
|
+
case 15:
|
|
6536
|
+
_context3.prev = 15;
|
|
6537
|
+
_context3.t0 = _context3["catch"](3);
|
|
6545
6538
|
return _context3.abrupt("return", _context3.t0);
|
|
6546
|
-
case
|
|
6539
|
+
case 18:
|
|
6547
6540
|
case "end":
|
|
6548
6541
|
return _context3.stop();
|
|
6549
6542
|
}
|
|
6550
6543
|
}
|
|
6551
|
-
}, _callee3, null, [[
|
|
6544
|
+
}, _callee3, null, [[3, 15]]);
|
|
6552
6545
|
}));
|
|
6553
6546
|
function offlineModel(_x3, _x4, _x5) {
|
|
6554
6547
|
return _offlineModel.apply(this, arguments);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@coherentglobal/spark-execute-sdk",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "src/node.js",
|
|
6
6
|
"browser": "dist/browser.js",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"author": "",
|
|
22
22
|
"license": "ISC",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@coherentglobal/wasm-runner": "^0.0.
|
|
24
|
+
"@coherentglobal/wasm-runner": "^0.0.56",
|
|
25
25
|
"@types/node": "^18.7.18",
|
|
26
26
|
"axios": "^0.27.2",
|
|
27
27
|
"chai": "^4.3.6",
|
package/src/browser.js
CHANGED
|
@@ -47,7 +47,7 @@ class Spark {
|
|
|
47
47
|
/**
|
|
48
48
|
* @private
|
|
49
49
|
*/
|
|
50
|
-
this.priority = ["model"
|
|
50
|
+
this.priority = ["model"];
|
|
51
51
|
}
|
|
52
52
|
/**
|
|
53
53
|
*
|
|
@@ -234,26 +234,29 @@ class Spark {
|
|
|
234
234
|
async execute(input, version_id) {
|
|
235
235
|
const versionID =
|
|
236
236
|
version_id ||
|
|
237
|
-
input
|
|
238
|
-
input
|
|
239
|
-
|
|
237
|
+
input?.request_meta?.version_id ||
|
|
238
|
+
input?.request_meta?.version_uuid;
|
|
240
239
|
let lookup = {
|
|
241
240
|
model: this.offlineModel,
|
|
242
241
|
onlineEndpoint: this.onlineModelEndpoint,
|
|
243
242
|
};
|
|
244
243
|
|
|
245
244
|
let response;
|
|
246
|
-
|
|
247
245
|
response = await lookup[this.priority[0]](input, versionID, this);
|
|
248
|
-
if (response instanceof Error) {
|
|
249
|
-
|
|
250
|
-
}
|
|
251
|
-
|
|
246
|
+
// if (response instanceof Error) {
|
|
247
|
+
// response = await lookup[this.priority[1]](input, versionID, this);
|
|
248
|
+
// }
|
|
252
249
|
return response;
|
|
253
250
|
}
|
|
254
251
|
|
|
255
252
|
async offlineModel(input, versionID, ds) {
|
|
256
|
-
|
|
253
|
+
const modelVersionId = input?.request_meta?.version_id || versionID
|
|
254
|
+
if(!input?.request_meta){
|
|
255
|
+
input.request_meta = {}
|
|
256
|
+
}
|
|
257
|
+
if(versionID) {
|
|
258
|
+
input.request_meta.version_id = modelVersionId
|
|
259
|
+
}
|
|
257
260
|
try {
|
|
258
261
|
if (!(registry instanceof WasmRunner)) {
|
|
259
262
|
/**
|
|
@@ -295,19 +298,18 @@ class Spark {
|
|
|
295
298
|
};
|
|
296
299
|
registry = new WasmRunner("", callback);
|
|
297
300
|
}
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
const model = ds._findModel(versionID);
|
|
301
|
+
if (!registry.isExist(modelVersionId)) {
|
|
302
|
+
const model = ds._findModel(input.request_meta);
|
|
301
303
|
await registry.append({
|
|
302
|
-
id:
|
|
304
|
+
id: modelVersionId,
|
|
303
305
|
url: model.binary,
|
|
304
306
|
meta: {
|
|
305
|
-
folder_name: model?.
|
|
306
|
-
service_name: model?.
|
|
307
|
+
folder_name: model?.metaData?.EngineInformation?.ProductName ?? "",
|
|
308
|
+
service_name: model?.metaData?.EngineInformation?.ServiceName ?? "",
|
|
307
309
|
},
|
|
308
310
|
});
|
|
309
311
|
}
|
|
310
|
-
const result = await registry.execute(input,
|
|
312
|
+
const result = await registry.execute(input, modelVersionId, () => {});
|
|
311
313
|
return result;
|
|
312
314
|
} catch (err) {
|
|
313
315
|
return err;
|