@hestia-earth/api 0.9.32 → 0.9.35-0

package/dist/cycles/model/model.d.ts

@@ -0,0 +1,2 @@
+import { Product } from '@hestia-earth/schema';
+export declare const getPrimaryProduct: (products?: Product[]) => Product;

package/dist/cycles/model/model.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPrimaryProduct = void 0;
+exports.getPrimaryProduct = function (products) { return (products || []).find(function (product) { return product.primary === true; }); };

package/dist/files/model/model.d.ts

@@ -1,5 +1,6 @@
 import { BaseModel } from '../../db/model.base';
 import { User } from '../../users/model/model';
+export declare const mb = 1048576;
 export declare const MAX_SIZE = 2;
 export declare const MAX_SIZE_MB: number;
 export declare const sizeInMb: (size: number) => number;

package/dist/files/model/model.js

@@ -20,12 +20,12 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
     return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDraft = exports.isValidated = exports.isFolderUpload = exports.isAggregation = exports.aggregationFolder = exports.isGlossary = exports.glossaryFolder = exports.filenameFromPath = exports.rootFolderFromPath = exports.folderFromPath = exports.replaceInvalidChars = exports.validPathChars = exports.fileToExt = exports.filepathSearch = exports.filenameSearch = exports.File = exports.FilePipelineError = exports.FilePipelineProgress = exports.FilePipelineStatus = exports.FileError = exports.FileStatus = exports.FileProgress = exports.HestiaExtensions = exports.SupportedExtensions = exports.sizeInMb = exports.MAX_SIZE_MB = exports.MAX_SIZE = void 0;
+exports.isDraft = exports.isValidated = exports.isFolderUpload = exports.isAggregation = exports.aggregationFolder = exports.isGlossary = exports.glossaryFolder = exports.filenameFromPath = exports.rootFolderFromPath = exports.folderFromPath = exports.replaceInvalidChars = exports.validPathChars = exports.fileToExt = exports.filepathSearch = exports.filenameSearch = exports.File = exports.FilePipelineError = exports.FilePipelineProgress = exports.FilePipelineStatus = exports.FileError = exports.FileStatus = exports.FileProgress = exports.HestiaExtensions = exports.SupportedExtensions = exports.sizeInMb = exports.MAX_SIZE_MB = exports.MAX_SIZE = exports.mb = void 0;
 var model_base_1 = require("../../db/model.base");
-var mb = 1048576;
+exports.mb = 1048576;
 exports.MAX_SIZE = 2;
-exports.MAX_SIZE_MB = 2 * mb;
-exports.sizeInMb = function (size) { return Math.round((size / mb) * 1000) / 1000; };
+exports.MAX_SIZE_MB = 2 * exports.mb;
+exports.sizeInMb = function (size) { return Math.round((size / exports.mb) * 1000) / 1000; };
 var SupportedExtensions;
 (function (SupportedExtensions) {
     SupportedExtensions["xlsx"] = "xlsx";

package/dist/models.d.ts

@@ -5,3 +5,4 @@ export * from './migrations/model/model';
 export * from './nodes/model/model';
 export * from './reconciliations/model/model';
 export * from './users/model/model';
+export * from './cycles/model/model';

package/dist/models.js

@@ -17,3 +17,4 @@ __exportStar(require("./migrations/model/model"), exports);
 __exportStar(require("./nodes/model/model"), exports);
 __exportStar(require("./reconciliations/model/model"), exports);
 __exportStar(require("./users/model/model"), exports);
+__exportStar(require("./cycles/model/model"), exports);

package/dist/nodes/model/model.d.ts

@@ -16,4 +16,4 @@ export declare const parseLogMissingLookups: (data: string) => {
     termId: any;
     column: any;
 }[];
-export declare const groupLogsByModel: (data: string) => any;
+export declare const groupLogsByModel: (type: NodeType, data: string) => any;

package/dist/nodes/model/model.js

@@ -65,12 +65,13 @@ exports.paramToNodeType = function (type) { return Object.values(schema_1.NodeTy
 var csvValue = function (value) { return (value || '').replace('[', '').replace(']', ''); };
 var parseMessage = function (message) {
     try {
-        return JSON.parse(message).message.split(',').reduce(function (prev, parts) {
+        var data = JSON.parse(message);
+        return data.message.split(',').reduce(function (prev, parts) {
             var _a;
             var _b = parts.split('='), key = _b[0], value = _b[1];
             var val = csvValue(value);
             return __assign(__assign({}, prev), (key && val ? (_a = {}, _a[key.trim()] = val, _a) : {}));
-        }, {});
+        }, { logger: data.logger });
     }
     catch (err) {
         return {};
@@ -95,15 +96,21 @@ exports.parseLogMissingLookups = function (data) {
     var messages = lines.map(parseMessage).filter(function (v) { return Object.keys(v).length > 1; });
     return utils_1.unique(messages.map(parseLookup));
 };
-exports.groupLogsByModel = function (data) {
+var filterByType = function (expectedType, _a) {
+    var type = _a.type;
+    return !type ||
+        type === expectedType ||
+        Object.values(schema_1.SchemaType).filter(function (t) { return !schema_1.isTypeNode(t); }).includes(type);
+};
+exports.groupLogsByModel = function (type, data) {
     return data.split('\n')
-        .filter(function (log) { return log.includes('hestia_earth.models'); })
         .map(parseMessage)
-        .filter(function (v) { return !!(v === null || v === void 0 ? void 0 : v.term) && !!(v === null || v === void 0 ? void 0 : v.model); })
+        .filter(function (v) { return !!(v === null || v === void 0 ? void 0 : v.term) && !!(v === null || v === void 0 ? void 0 : v.model) && filterByType(type, v); })
         .reduce(function (group, _a) {
-        var term = _a.term, model = _a.model, key = _a.key, should_run = _a.should_run, input = _a.input, property = _a.property, log = __rest(_a, ["term", "model", "key", "should_run", "input", "property"]);
-        var modelKey = key || model;
-        var isKey = !!key;
+        var logger = _a.logger, term = _a.term, model = _a.model, key = _a.key, should_run = _a.should_run, input = _a.input, property = _a.property, log = __rest(_a, ["logger", "term", "model", "key", "should_run", "input", "property"]);
+        var isOrchestrator = logger.includes('orchestrator');
+        var modelKey = isOrchestrator ? model : key || model;
+        var isKey = !isOrchestrator && !!key;
         group[term] = group[term] || {};
         group[term][modelKey] = group[term][modelKey] || __assign({ isKey: isKey }, (isKey ? { model: model } : {}));
         if (typeof input !== 'undefined') {
@@ -117,7 +124,11 @@ exports.groupLogsByModel = function (data) {
             ]));
         }
         if (typeof should_run !== 'undefined') {
-            group[term][modelKey] = __assign(__assign(__assign({}, group[term][modelKey]), log), { shouldRun: should_run === 'True' });
+            var shouldRun = should_run === 'True';
+            group[term][modelKey] = isOrchestrator ?
+                {
+                    shouldRunOrchestrator: shouldRun
+                } : __assign(__assign(__assign({}, group[term][modelKey]), log), { shouldRun: shouldRun });
         }
         else if ('requirements' in log) {
             var requirements = log.requirements, logData = __rest(log, ["requirements"]);
@@ -128,7 +139,7 @@ exports.groupLogsByModel = function (data) {
                 parseLookup(log)
             ]));
         }
-        else {
+        else if (!isOrchestrator) {
             group[term][modelKey].logs = __assign(__assign({}, (group[term][modelKey].logs || {})), log);
         }
         return group;

package/dist/reconciliations/model/model.d.ts

@@ -1,6 +1,17 @@
 import { BaseModel } from '../../db/model.base';
+export declare enum ReconciliationLevel {
+    success = "success",
+    warning = "warning",
+    danger = "danger"
+}
 export declare class Reconciliation extends BaseModel {
     idExpected: string;
     idRecalculated: string;
     name: string;
+    level?: ReconciliationLevel;
+    details?: any;
+    error?: {
+        message: string;
+        subMessages: string[];
+    };
 }

package/dist/reconciliations/model/model.js

@@ -13,8 +13,14 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Reconciliation = void 0;
+exports.Reconciliation = exports.ReconciliationLevel = void 0;
 var model_base_1 = require("../../db/model.base");
+var ReconciliationLevel;
+(function (ReconciliationLevel) {
+    ReconciliationLevel["success"] = "success";
+    ReconciliationLevel["warning"] = "warning";
+    ReconciliationLevel["danger"] = "danger";
+})(ReconciliationLevel = exports.ReconciliationLevel || (exports.ReconciliationLevel = {}));
 var Reconciliation = (function (_super) {
     __extends(Reconciliation, _super);
     function Reconciliation() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.9.32",
+  "version": "0.9.35-0",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -33,9 +33,10 @@
     "@hestia-earth/schema": "^7.6.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^12.1.4",
-    "@commitlint/config-conventional": "^12.1.4",
+    "@commitlint/cli": "^16.2.4",
+    "@commitlint/config-conventional": "^16.2.4",
     "@elastic/elasticsearch": "7.13.0",
+    "@hestia-earth/eslint-config": "0.0.3",
     "@hestia-earth/json-schema": "^7.6.1",
     "@hestia-earth/schema-convert": "^7.6.1",
     "@hestia-earth/schema-validation": "^7.6.1",
@@ -62,8 +63,8 @@
     "@types/request": "^2.48.8",
     "@types/request-promise-native": "^1.0.18",
     "@types/winston": "^2.4.4",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
+    "@typescript-eslint/eslint-plugin": "^5.23.0",
+    "@typescript-eslint/parser": "^5.23.0",
     "aws-sdk": "^2.1092.0",
     "axios": "^0.21.4",
     "body-parser": "^1.19.2",