Skip to content

SOF-7926: add subworkflow error unit #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k0stik merged 5 commits into from
Jun 16, 2026
Merged

SOF-7926: add subworkflow error unit #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
906c4bc
update: add subworkflow error unit
k0stik Jun 5, 2026
52c9a1a
update: add subworkflow error unit
k0stik Jun 6, 2026
6cd64a1
update: add error unit to workflow schema
k0stik Jun 8, 2026
7b8fd3c
chore: cleanup error unit
k0stik Jun 12, 2026
1ef6804
chore: merge dev
k0stik Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/js/esse/JSONSchemasInterface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ class JSONSchemasInterface {
return patchedSchema;
}
}
JSONSchemasInterface.schemasCache = new Map();
exports.default = JSONSchemasInterface;
JSONSchemasInterface.schemasCache = new Map();
5 changes: 3 additions & 2 deletions dist/js/esse/JSONSchemasInterfaceServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.readSchemaFolderSync = readSchemaFolderSync;
exports.readSchemaFolderSync = void 0;
const fs_1 = __importDefault(require("fs"));
const path_1 = __importDefault(require("path"));
const filesystem_1 = require("../utils/filesystem");
Expand All @@ -19,6 +19,7 @@ function readSchemaFolderSync(folderPath) {
});
return schemas;
}
exports.readSchemaFolderSync = readSchemaFolderSync;
class JSONSchemasInterfaceServer extends JSONSchemasInterface_1.default {
static setSchemaFolder(schemaFolder) {
if (this.schemaFolder !== schemaFolder) {
Expand All @@ -41,5 +42,5 @@ class JSONSchemasInterfaceServer extends JSONSchemasInterface_1.default {
return super.getSchemaById(schemaId);
}
}
JSONSchemasInterfaceServer.schemaFolder = path_1.default.resolve(__dirname, "./../schema");
exports.default = JSONSchemasInterfaceServer;
JSONSchemasInterfaceServer.schemaFolder = path_1.default.resolve(__dirname, "./../schema");
3 changes: 2 additions & 1 deletion dist/js/esse/schemaUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.mapObjectDeep = mapObjectDeep;
exports.mapObjectDeep = void 0;
function mapObjectDeep(object, mapValue) {
if (typeof object !== "object" || object === null) {
return object;
Expand All @@ -14,3 +14,4 @@ function mapObjectDeep(object, mapValue) {
});
return Object.fromEntries(entries);
}
exports.mapObjectDeep = mapObjectDeep;
5 changes: 3 additions & 2 deletions dist/js/esse/server/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.parseIncludeReferenceStatements = parseIncludeReferenceStatements;
exports.parseIncludeReferenceStatementsByDir = parseIncludeReferenceStatementsByDir;
exports.parseIncludeReferenceStatementsByDir = exports.parseIncludeReferenceStatements = void 0;
/**
* Server-side schema parsing utilities.
*
Expand Down Expand Up @@ -38,6 +37,7 @@ function parseIncludeReferenceStatements(filePath) {
}
return dereferenced;
}
exports.parseIncludeReferenceStatements = parseIncludeReferenceStatements;
/**
* Resolves `include` and `$ref` statements for all the JSON files inside a given directory.
* @param dirPath directory to parse.
Expand Down Expand Up @@ -65,3 +65,4 @@ function parseIncludeReferenceStatementsByDir(dirPath, wrapInDataAndPath = false
});
return wrapInDataAndPath ? schemasWithPath : schemas;
}
exports.parseIncludeReferenceStatementsByDir = parseIncludeReferenceStatementsByDir;
5 changes: 3 additions & 2 deletions dist/js/esse/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.applyPatchWithDotNotation = applyPatchWithDotNotation;
exports.applyPatchTree = applyPatchTree;
exports.applyPatchTree = exports.applyPatchWithDotNotation = void 0;
function isPlainObject(value) {
return value !== null && typeof value === "object" && !Array.isArray(value);
}
Expand Down Expand Up @@ -29,6 +28,7 @@ function applyPatchWithDotNotation(target, path, patchValue) {
}
// If existingValue is undefined, we skip;
}
exports.applyPatchWithDotNotation = applyPatchWithDotNotation;
function applyPatchTree(schema, patchNode, pathPrefix) {
Object.entries(patchNode).forEach(([key, value]) => {
if (key.includes(".")) {
Expand All @@ -49,3 +49,4 @@ function applyPatchTree(schema, patchNode, pathPrefix) {
}
});
}
exports.applyPatchTree = applyPatchTree;
378 changes: 378 additions & 0 deletions dist/js/schema/job.json
View file
Open in desktop

Large diffs are not rendered by default.

378 changes: 378 additions & 0 deletions dist/js/schema/properties_directory/non_scalar/workflow.json
View file
Open in desktop

Large diffs are not rendered by default.

378 changes: 378 additions & 0 deletions dist/js/schema/property/holder.json
View file
Open in desktop

Large diffs are not rendered by default.

378 changes: 378 additions & 0 deletions dist/js/schema/workflow.json
View file
Open in desktop

Large diffs are not rendered by default.

378 changes: 378 additions & 0 deletions dist/js/schema/workflow/base.json
View file
Open in desktop

Large diffs are not rendered by default.

189 changes: 189 additions & 0 deletions dist/js/schema/workflow/subworkflow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3329,6 +3329,195 @@
]
}
}
},
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "error unit schema",
"type": "object",
"required": [
"flowchartId",
"monitors",
"name",
"postProcessors",
"preProcessors",
"reason",
"results",
"type"
],
"properties": {
"_id": {
"description": "entity identity",
"type": "string"
},
"slug": {
"description": "entity slug",
"type": "string"
},
"systemName": {
"type": "string"
},
"schemaVersion": {
"description": "entity's schema version. Used to distinct between different schemas.",
"type": "string",
"default": "2022.8.16"
},
"name": {
"description": "entity name",
"type": "string"
},
"isDefault": {
"description": "Identifies that entity is defaultable",
"type": "boolean",
"default": false
},
"preProcessors": {
"description": "names of the pre-processors for this calculation",
"type": "array",
"items": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "runtime item name object schema",
"description": "A runtime item is a name of a pre-processor, post-processor, monitor, or result for a calculation. Can contain additional properties basename, filetype etc.",
"type": "object",
"required": [
"name"
],
"additionalProperties": true,
"properties": {
"name": {
"description": "The name of this item. e.g. scf_accuracy",
"type": "string"
}
}
}
},
"postProcessors": {
"description": "names of the post-processors for this calculation",
"type": "array",
"items": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "runtime item name object schema",
"description": "A runtime item is a name of a pre-processor, post-processor, monitor, or result for a calculation. Can contain additional properties basename, filetype etc.",
"type": "object",
"required": [
"name"
],
"additionalProperties": true,
"properties": {
"name": {
"description": "The name of this item. e.g. scf_accuracy",
"type": "string"
}
}
}
},
"monitors": {
"description": "names of the monitors for this calculation",
"type": "array",
"items": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "runtime item name object schema",
"description": "A runtime item is a name of a pre-processor, post-processor, monitor, or result for a calculation. Can contain additional properties basename, filetype etc.",
"type": "object",
"required": [
"name"
],
"additionalProperties": true,
"properties": {
"name": {
"description": "The name of this item. e.g. scf_accuracy",
"type": "string"
}
}
}
},
"results": {
"description": "names of the results for this calculation",
"type": "array",
"items": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "runtime item name object schema",
"description": "A runtime item is a name of a pre-processor, post-processor, monitor, or result for a calculation. Can contain additional properties basename, filetype etc.",
"type": "object",
"required": [
"name"
],
"additionalProperties": true,
"properties": {
"name": {
"description": "The name of this item. e.g. scf_accuracy",
"type": "string"
}
}
}
},
"tags": {
"description": "entity tags",
"type": "array",
"items": {
"type": "string"
}
},
"status": {
"type": "string",
"description": "Status of the unit.",
"enum": [
"idle",
"active",
"warning",
"error",
"finished"
]
},
"statusTrack": {
"type": "array",
"items": {
"type": "object",
"required": [
"trackedAt",
"status"
],
"properties": {
"trackedAt": {
"type": "number"
},
"status": {
"type": "string"
},
"repetition": {
"type": "number"
}
}
}
},
"isDraft": {
"type": "boolean"
},
"type": {
"description": "type of the unit",
"type": "string",
"const": "error"
},
"head": {
"description": "Whether this unit is the first one to be executed.",
"type": "boolean"
},
"flowchartId": {
"description": "Identity of the unit in the workflow. Used to trace the execution flow of the workflow.",
"type": "string"
},
"next": {
"description": "Next unit's flowchartId. If empty, the current unit is the last.",
"type": "string"
},
"enableRender": {
"description": "Whether Rupy should attempt to use Jinja templating to add context variables into the unit",
"type": "boolean"
},
"reason": {
"type": "string",
"description": "JSON string with validation/hydration details: { error, json, schema }"
}
}
}
],
"discriminator": {
Expand Down
Loading
Loading