cpee 2.1.136 → 2.1.139
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.
- checksums.yaml +4 -4
- data/cockpit/compliance-view.html +0 -7
- data/cockpit/compliance.html +0 -7
- data/cockpit/css/ui.css +1 -1
- data/cockpit/edit.html +0 -7
- data/cockpit/graph.html +0 -5
- data/cockpit/index.html +0 -7
- data/cockpit/js/instance.js +27 -4
- data/cockpit/js/llm.js +8 -5
- data/cockpit/js/wfadaptor.js +10 -4
- data/cockpit/llm.html +0 -7
- data/cockpit/llmmodel.html +0 -7
- data/cockpit/model.html +0 -7
- data/cockpit/only_llm.html +0 -7
- data/cockpit/themes/THEMES.MD +4 -0
- data/cockpit/themes/presetlr/symbols/loop_end_pre.svg +1 -1
- data/cockpit/track.html +0 -5
- data/cpee.gemspec +2 -2
- data/lib/cpee/implementation.rb +5 -0
- data/lib/cpee/implementation_callbacks.rb +2 -2
- data/lib/cpee/implementation_notifications.rb +4 -1
- data/lib/cpee/implementation_properties.rb +32 -8
- data/lib/cpee/json_pointer.rb +110 -0
- data/lib/cpee/message.rb +22 -2
- data/lib/cpee/persistence.rb +4 -0
- data/lib/cpee/redis.rb +8 -0
- data/lib/properties/t_dslx.rng +11 -1
- data/server/executionhandlers/eval/connection.rb +12 -3
- data/server/executionhandlers/ruby/connection.rb +12 -3
- data/server/executionhandlers/ruby/controller.rb +17 -2
- data/server/routing/end.pid +1 -1
- data/server/routing/forward-events-00.pid +1 -1
- data/server/routing/forward-events.rb +30 -19
- data/server/routing/forward-votes.pid +1 -1
- data/server/routing/forward-votes.rb +56 -43
- data/server/routing/persist.pid +1 -1
- data/server/routing/persist.rb +49 -28
- metadata +8 -2
- data/cockpit/js/build-bpmn2.js +0 -302
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4905b33a763847f17365d1c97a5484f442479fe8450f2d5a4aab82d6dd54dbc3
|
|
4
|
+
data.tar.gz: 9c47d46e1772354985c37ab76c0dc02a8f03258c9cbf6d9dca8cba38fa682c2c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d907853a27e7fbabece090f51d73d9af346207dd28a0296263d2aa1570153e1b38c39ea6221c2e4874d8931efcd585e2cba83bbe9aecf838e0a675ab0ee717d1
|
|
7
|
+
data.tar.gz: 1891663ab6c058606a44e3b65287f79ccfa0f43cbf37e96005ada06e3382ca59d27768df87bb0218a9bbae0f26c881a0c7f5600d293ecd86ad0165256ef3affc
|
|
@@ -24,16 +24,11 @@
|
|
|
24
24
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
35
31
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
36
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
37
32
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
38
33
|
|
|
39
34
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
@@ -41,8 +36,6 @@
|
|
|
41
36
|
<script type="text/javascript" src="/js_libs/uidash.js"></script>
|
|
42
37
|
<script type="text/javascript" src="/js_libs/uidash_custommenu.js"></script>
|
|
43
38
|
|
|
44
|
-
<script type="text/javascript" src="js/build-bpmn2.js"></script>
|
|
45
|
-
|
|
46
39
|
<link rel="stylesheet" href="/js_libs/uidash_custommenu.css" type="text/css"/>
|
|
47
40
|
<link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
|
|
48
41
|
|
data/cockpit/compliance.html
CHANGED
|
@@ -24,16 +24,11 @@
|
|
|
24
24
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
35
31
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
36
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
37
32
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
38
33
|
|
|
39
34
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
@@ -41,8 +36,6 @@
|
|
|
41
36
|
<script type="text/javascript" src="/js_libs/uidash.js"></script>
|
|
42
37
|
<script type="text/javascript" src="/js_libs/uidash_custommenu.js"></script>
|
|
43
38
|
|
|
44
|
-
<script type="text/javascript" src="js/build-bpmn2.js"></script>
|
|
45
|
-
|
|
46
39
|
<link rel="stylesheet" href="/js_libs/uidash_custommenu.css" type="text/css"/>
|
|
47
40
|
<link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
|
|
48
41
|
|
data/cockpit/css/ui.css
CHANGED
|
@@ -104,7 +104,7 @@ ui-tabbed ui-tabbar ui-behind button {
|
|
|
104
104
|
#areainstance div.section:nth-child(1) div { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
|
|
105
105
|
#areainstance div.section:nth-child(1) button { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
|
|
106
106
|
#areainstance div.section:nth-child(1) button[name=loadtestset] { white-space: normal; width: 7em; height: 3.5em; }
|
|
107
|
-
#areainstance div.section:nth-child(1) button[name=save] { white-space: normal; width:
|
|
107
|
+
#areainstance div.section:nth-child(1) button[name=save] { white-space: normal; width: 8.5em; height: 3.5em; margin-left: 0.2em; }
|
|
108
108
|
#areainstance div.section:nth-child(1) button[name=loadtestsetfile] { white-space: normal; width: 7em; height: 3.5em; margin-left: 0.2em; }
|
|
109
109
|
#areainstance div.section:nth-child(1) button[name=loadmodelfile] { white-space: normal; width: 7em; height: 2em; margin-top: 0.2em; }
|
|
110
110
|
|
data/cockpit/edit.html
CHANGED
|
@@ -24,16 +24,11 @@
|
|
|
24
24
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
35
31
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
36
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
37
32
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
38
33
|
|
|
39
34
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
@@ -41,8 +36,6 @@
|
|
|
41
36
|
<script type="text/javascript" src="/js_libs/uidash.js"></script>
|
|
42
37
|
<script type="text/javascript" src="/js_libs/uidash_custommenu.js"></script>
|
|
43
38
|
|
|
44
|
-
<script type="text/javascript" src="js/build-bpmn2.js"></script>
|
|
45
|
-
|
|
46
39
|
<link rel="stylesheet" href="/js_libs/uidash_custommenu.css" type="text/css"/>
|
|
47
40
|
<link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
|
|
48
41
|
|
data/cockpit/graph.html
CHANGED
|
@@ -23,16 +23,11 @@
|
|
|
23
23
|
|
|
24
24
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
25
25
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
26
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
30
26
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
35
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
36
31
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
37
32
|
|
|
38
33
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
data/cockpit/index.html
CHANGED
|
@@ -24,16 +24,11 @@
|
|
|
24
24
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
35
31
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
36
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
37
32
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
38
33
|
|
|
39
34
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
@@ -41,8 +36,6 @@
|
|
|
41
36
|
<script type="text/javascript" src="/js_libs/uidash.js"></script>
|
|
42
37
|
<script type="text/javascript" src="/js_libs/uidash_custommenu.js"></script>
|
|
43
38
|
|
|
44
|
-
<script type="text/javascript" src="js/build-bpmn2.js"></script>
|
|
45
|
-
|
|
46
39
|
<link rel="stylesheet" href="/js_libs/uidash_custommenu.css" type="text/css"/>
|
|
47
40
|
<link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
|
|
48
41
|
|
data/cockpit/js/instance.js
CHANGED
|
@@ -39,6 +39,8 @@ function global_init() {
|
|
|
39
39
|
save['states']= {};
|
|
40
40
|
save['state']= undefined;
|
|
41
41
|
save['dsl'] = undefined;
|
|
42
|
+
save['change_uuid'] = undefined; // of the last description/change
|
|
43
|
+
save['description'] = undefined; // description that belongs to change_uuid, undefined means get it from the server
|
|
42
44
|
save['activity_red_states'] = {}
|
|
43
45
|
save['graph'] = undefined;
|
|
44
46
|
save['graph_theme'] = undefined;
|
|
@@ -64,7 +66,7 @@ var sub_more = 'topic' + '=' + 'activity' + '&' +// {{{
|
|
|
64
66
|
'topic' + '=' + 'activity' + '&' +
|
|
65
67
|
'votes' + '=' + 'syncing_after' + '&' +
|
|
66
68
|
'topic' + '=' + 'description' + '&' +
|
|
67
|
-
'events' + '=' + 'change,error' + '&' +
|
|
69
|
+
'events' + '=' + 'change,error,sync' + '&' +
|
|
68
70
|
'topic' + '=' + 'position' + '&' +
|
|
69
71
|
'events' + '=' + 'change' + '&' +
|
|
70
72
|
'topic' + '=' + 'state' + '&' +
|
|
@@ -90,7 +92,7 @@ var sub_less = 'topic' + '=' + 'activity' + '&' +// {{{
|
|
|
90
92
|
'topic' + '=' + 'position' + '&' +
|
|
91
93
|
'events' + '=' + 'change' + '&' +
|
|
92
94
|
'topic' + '=' + 'description' + '&' +
|
|
93
|
-
'events' + '=' + 'change,error' + '&' +
|
|
95
|
+
'events' + '=' + 'change,error,sync' + '&' +
|
|
94
96
|
'topic' + '=' + 'state' + '&' +
|
|
95
97
|
'events' + '=' + 'change' + '&' +
|
|
96
98
|
'topic' + '=' + 'dataelements' + '&' +
|
|
@@ -391,10 +393,31 @@ async function sse() { //{{{
|
|
|
391
393
|
monitor_instance_values("documents",data.content.values);
|
|
392
394
|
break;
|
|
393
395
|
case 'description':
|
|
396
|
+
if (data['name'] == 'sync') {
|
|
397
|
+
if (data.content.change_uuid == save['change_uuid']) {
|
|
398
|
+
save['description'] = data.content.description;
|
|
399
|
+
$("button[name=savemodelfile]").prop('disabled',false);
|
|
400
|
+
}
|
|
401
|
+
break;
|
|
402
|
+
}
|
|
403
|
+
if (data['name'] == 'change') {
|
|
404
|
+
save['change_uuid'] = data.content.change_uuid;
|
|
405
|
+
save['description'] = data.content.change_pending ? undefined : data.content.description;
|
|
406
|
+
$("button[name=savemodelfile]").prop('disabled',data.content.change_pending == true);
|
|
407
|
+
} else if (data['name'] == 'error' && data.content.change_uuid && data.content.change_uuid == save['change_uuid']) {
|
|
408
|
+
$("button[name=savemodelfile]").prop('disabled',false);
|
|
409
|
+
}
|
|
394
410
|
monitor_instance_dsl();
|
|
395
411
|
monitor_graph_change(false);
|
|
396
412
|
document.dispatchEvent(graph_changed);
|
|
397
413
|
break;
|
|
414
|
+
case 'transformation':
|
|
415
|
+
if (data.content.change_pending) { // the description for the new model type follows with description/sync
|
|
416
|
+
save['change_uuid'] = data.content.change_uuid;
|
|
417
|
+
save['description'] = undefined;
|
|
418
|
+
$("button[name=savemodelfile]").prop('disabled',true);
|
|
419
|
+
}
|
|
420
|
+
break;
|
|
398
421
|
case 'endpoints':
|
|
399
422
|
monitor_instance_values("endpoints");
|
|
400
423
|
break;
|
|
@@ -1111,7 +1134,7 @@ function save_modelfile() {// {{{
|
|
|
1111
1134
|
|
|
1112
1135
|
let extensions = { 'Signavio': 'bpmn', 'ChatGPT_Mermaid': 'mmd', 'ChatGPT_Graphviz': 'dot' };
|
|
1113
1136
|
Promise.all([
|
|
1114
|
-
$.ajax({ type: "GET", url: url + "/properties/description/", dataType: 'text' }),
|
|
1137
|
+
save['description'] !== undefined ? save['description'] : $.ajax({ type: "GET", url: url + "/properties/description/", dataType: 'text' }), // from the events, persist.rb might not have stored it yet
|
|
1115
1138
|
$.ajax({ type: "GET", url: url + "/properties/attributes/info/" }),
|
|
1116
1139
|
$.ajax({ type: "GET", url: url + "/properties/attributes/modeltype/" }).catch(() => 'CPEE') // instances without modeltype
|
|
1117
1140
|
]).then(function([desc,info,modeltype]){
|
|
@@ -1582,7 +1605,7 @@ function append_to_log(what,type,message) {//{{{
|
|
|
1582
1605
|
message = message.replace(/>/g, '>');
|
|
1583
1606
|
message = message.replace(/"/g, '"');
|
|
1584
1607
|
message = message.replace(/'/g, ''');
|
|
1585
|
-
if (type == 'description/change') {
|
|
1608
|
+
if (type == 'description/change' || type == 'description/sync') {
|
|
1586
1609
|
$("#dat_log").prepend("<tr><td class='fixed'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'> - </td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'> - </td><td class='fixed'>" + type + "</td><td class='fixed'> - </td><td class='long'>... check in persistent log ...</td></tr>");
|
|
1587
1610
|
} else {
|
|
1588
1611
|
$("#dat_log").prepend("<tr><td class='fixed'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'> - </td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'> - </td><td class='fixed'>" + type + "</td><td class='fixed'> - </td><td class='long'>" + message + "</td></tr>");
|
data/cockpit/js/llm.js
CHANGED
|
@@ -152,12 +152,14 @@ function call_llm_service_model(dslx,input,llm,prompt_type) { //{{{
|
|
|
152
152
|
|
|
153
153
|
return def.promise();
|
|
154
154
|
} //}}}
|
|
155
|
-
function call_llm_service_dataflow(model,llm) { //{{{
|
|
155
|
+
function call_llm_service_dataflow(model,input,llm) { //{{{
|
|
156
156
|
const formData = new FormData();
|
|
157
157
|
const blob1 = new Blob([model], { type: "text/xml" });
|
|
158
158
|
formData.append("rpst_xml", blob1);
|
|
159
|
-
const blob2 = new Blob([
|
|
160
|
-
formData.append("
|
|
159
|
+
const blob2 = new Blob([input], { type: "text/plain" });
|
|
160
|
+
formData.append("user_input", blob2);
|
|
161
|
+
const blob3 = new Blob([llm], { type: "text/plain" });
|
|
162
|
+
formData.append("llm", blob3);
|
|
161
163
|
|
|
162
164
|
let def = new $.Deferred();
|
|
163
165
|
|
|
@@ -480,8 +482,9 @@ function set_cpee_model(cpee_xml,expositions=[]) { //{{{
|
|
|
480
482
|
let root = $X(cpee_xml).get(0);
|
|
481
483
|
if (root.childElementCount === 0) {
|
|
482
484
|
root.textContent = '';
|
|
483
|
-
cpee_xml = new XMLSerializer().serializeToString(root);
|
|
484
485
|
}
|
|
486
|
+
root.setAttribute('dir', save['graph_adaptor'] && save['graph_adaptor'].illustrator.lr ? 'lr' : 'td'); // layout direction of the theme
|
|
487
|
+
cpee_xml = new XMLSerializer().serializeToString(root);
|
|
485
488
|
|
|
486
489
|
const form_data = new FormData();
|
|
487
490
|
const blob = new Blob([cpee_xml], { type: "text/xml" });
|
|
@@ -589,7 +592,7 @@ function create(prompt,llms,generation,mode) {
|
|
|
589
592
|
} else {
|
|
590
593
|
if (gen == "dataflow") {
|
|
591
594
|
ui.querying(llms,'selects endpoints and calculates dataflow'); //{{{
|
|
592
|
-
call_llm_service_dataflow($X(data.output_cpee).serializePrettyXML(),myllm).done((data) => {
|
|
595
|
+
call_llm_service_dataflow($X(data.output_cpee).serializePrettyXML(),input,myllm).done((data) => {
|
|
593
596
|
let url = $('body').attr('current-instance');
|
|
594
597
|
$.ajax({
|
|
595
598
|
type: "PATCH",
|
data/cockpit/js/wfadaptor.js
CHANGED
|
@@ -239,6 +239,7 @@ function WfIllustrator(wf_adaptor) { // View {{{
|
|
|
239
239
|
this.width_shift_label = 7;
|
|
240
240
|
this.group_extend = 1;
|
|
241
241
|
this.structural_tighten = 3; // 'structural' borders are smaller in y
|
|
242
|
+
this.conn_center = 15; // connectors attach to the center of the symbols, i.e. half a symbol before the end of the cell
|
|
242
243
|
this.elements = {}; // the svgs
|
|
243
244
|
this.svg = {};
|
|
244
245
|
this.draw = {};
|
|
@@ -1050,8 +1051,12 @@ function WfIllustrator(wf_adaptor) { // View {{{
|
|
|
1050
1051
|
if(((end['row']-start['row']) == 0) && ((end['col']-start['col']) == 0)) return;
|
|
1051
1052
|
var line = $X('<path xmlns="http://www.w3.org/2000/svg" class="edge"/>');
|
|
1052
1053
|
let diag = false; // the arrow sits on a diagonal segment (into a gateway), so it has to be closer to the center
|
|
1053
|
-
let sy = get_row(start['row'],start['col']) + self.height -
|
|
1054
|
-
let
|
|
1054
|
+
let sy = get_row(start['row'],start['col']) + self.height - self.conn_center + start.yoffset; // center of the symbols
|
|
1055
|
+
let ssym = self.dim.symbols[start['row']] && self.dim.symbols[start['row']][start['col']];
|
|
1056
|
+
if (self.lr && self.inverted && ssym && self.elements[ssym.type] && self.elements[ssym.type].svg && $('.part-end',self.elements[ssym.type].svg).length > 0) { // inverted: the arrow points into the start from its end, not under the task template (tasks are the symbols with a part-end)
|
|
1057
|
+
sy = get_row_end(start['row'],start['col']) - self.conn_center + start.yoffset; // as far in from the end as other arrows are from the start
|
|
1058
|
+
}
|
|
1059
|
+
let ey = get_row(end['row'],end['col']) + self.height - self.conn_center + end.yoffset;
|
|
1055
1060
|
if (around) { // e.g. back in an empty loop: leave at 45 degrees to the right, go straight, enter at 45 degrees
|
|
1056
1061
|
diag = true;
|
|
1057
1062
|
let off = 7.5 + 7; // from the center to the corner of the gateway, then 7 further
|
|
@@ -1159,6 +1164,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
1159
1164
|
} // }}}
|
|
1160
1165
|
var gd = this.get_description = function() { // public {{{
|
|
1161
1166
|
var serxml = $(description.get(0).documentElement).clone(true);
|
|
1167
|
+
serxml.attr('dir', illustrator.lr ? 'lr' : 'td'); // layout direction of the theme, e.g. for the bpmn export
|
|
1162
1168
|
serxml.removeAttr('svg-id');
|
|
1163
1169
|
serxml.removeAttr('svg-type');
|
|
1164
1170
|
serxml.removeAttr('svg-subtype');
|
|
@@ -1469,7 +1475,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
1469
1475
|
// small y offset.
|
|
1470
1476
|
endnodes = endnodes.map(function(p) {
|
|
1471
1477
|
var np = JSON.parse(JSON.stringify(p));
|
|
1472
|
-
np.yoffset = illustrator.height_shift/2 + illustrator.group_extend +
|
|
1478
|
+
np.yoffset = illustrator.height_shift/2 + illustrator.group_extend + illustrator.conn_center - illustrator.structural_tighten;
|
|
1473
1479
|
return np;
|
|
1474
1480
|
});
|
|
1475
1481
|
}
|
|
@@ -1594,7 +1600,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
1594
1600
|
// structural border: incoming arrow stops at the group border instead of reaching into the icon
|
|
1595
1601
|
// (only a pixel-level yoffset, row/col stay integers so get_x() column lookups stay correct)
|
|
1596
1602
|
conn_target = JSON.parse(JSON.stringify(pos));
|
|
1597
|
-
conn_target.yoffset = -illustrator.height + illustrator.height_shift/2 - illustrator.group_extend +
|
|
1603
|
+
conn_target.yoffset = -illustrator.height + illustrator.height_shift/2 - illustrator.group_extend + illustrator.conn_center + illustrator.structural_tighten;
|
|
1598
1604
|
conn_target.structural = true;
|
|
1599
1605
|
}
|
|
1600
1606
|
if(illustrator.elements[sname] != undefined && illustrator.elements[sname].closeblock == true) { // Close Block if element e.g. loop
|
data/cockpit/llm.html
CHANGED
|
@@ -24,16 +24,11 @@
|
|
|
24
24
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
35
31
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
36
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
37
32
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
38
33
|
|
|
39
34
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
@@ -41,8 +36,6 @@
|
|
|
41
36
|
<script type="text/javascript" src="/js_libs/uidash.js"></script>
|
|
42
37
|
<script type="text/javascript" src="/js_libs/uidash_custommenu.js"></script>
|
|
43
38
|
|
|
44
|
-
<script type="text/javascript" src="js/build-bpmn2.js"></script>
|
|
45
|
-
|
|
46
39
|
<link rel="stylesheet" href="/js_libs/uidash_custommenu.css" type="text/css"/>
|
|
47
40
|
<link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
|
|
48
41
|
|
data/cockpit/llmmodel.html
CHANGED
|
@@ -24,16 +24,11 @@
|
|
|
24
24
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
35
31
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
36
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
37
32
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
38
33
|
|
|
39
34
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
@@ -41,8 +36,6 @@
|
|
|
41
36
|
<script type="text/javascript" src="/js_libs/uidash.js"></script>
|
|
42
37
|
<script type="text/javascript" src="/js_libs/uidash_custommenu.js"></script>
|
|
43
38
|
|
|
44
|
-
<script type="text/javascript" src="js/build-bpmn2.js"></script>
|
|
45
|
-
|
|
46
39
|
<link rel="stylesheet" href="/js_libs/uidash_custommenu.css" type="text/css"/>
|
|
47
40
|
<link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
|
|
48
41
|
|
data/cockpit/model.html
CHANGED
|
@@ -24,16 +24,11 @@
|
|
|
24
24
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
35
31
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
36
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
37
32
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
38
33
|
|
|
39
34
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
@@ -41,8 +36,6 @@
|
|
|
41
36
|
<script type="text/javascript" src="/js_libs/uidash.js"></script>
|
|
42
37
|
<script type="text/javascript" src="/js_libs/uidash_custommenu.js"></script>
|
|
43
38
|
|
|
44
|
-
<script type="text/javascript" src="js/build-bpmn2.js"></script>
|
|
45
|
-
|
|
46
39
|
<link rel="stylesheet" href="/js_libs/uidash_custommenu.css" type="text/css"/>
|
|
47
40
|
<link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
|
|
48
41
|
|
data/cockpit/only_llm.html
CHANGED
|
@@ -24,16 +24,11 @@
|
|
|
24
24
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
35
31
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
36
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
37
32
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
38
33
|
|
|
39
34
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
@@ -41,8 +36,6 @@
|
|
|
41
36
|
<script type="text/javascript" src="/js_libs/uidash.js"></script>
|
|
42
37
|
<script type="text/javascript" src="/js_libs/uidash_custommenu.js"></script>
|
|
43
38
|
|
|
44
|
-
<script type="text/javascript" src="js/build-bpmn2.js"></script>
|
|
45
|
-
|
|
46
39
|
<link rel="stylesheet" href="/js_libs/uidash_custommenu.css" type="text/css"/>
|
|
47
40
|
<link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
|
|
48
41
|
|
data/cockpit/themes/THEMES.MD
CHANGED
|
@@ -173,6 +173,9 @@ noted; unset booleans behave as `false`/absent.
|
|
|
173
173
|
| `info` | `function(node) → {attrName: value, ...}` | Extra HTML attributes stamped onto the drawn element (e.g. `element-endpoint`, `element-alt_id`), consumed later for lookups/menu icon rendering. |
|
|
174
174
|
| `final` | `true` | Marks this element as a true dead-end (used by `terminate`) — downstream connection logic skips drawing anything past a `final` endpoint. |
|
|
175
175
|
| `rotatelabels` | `true \| false` | Per-element opt-out/opt-in for the manifestation-level `rotated_labels` flag. |
|
|
176
|
+
| `mark_position` | `'left' \| 'right'` | Corner of the icon where the engine puts the hover/mark marker (the circle with the checkmark), top left by default. Use `'right'` when the icon's label is on its left, e.g. presetlr's `loop_finish`. |
|
|
177
|
+
| `implied` | `{ type, x, y }` | The icon also draws another symbol in a neighbouring cell, `x`/`y` cells away in the icon's own coordinates (lr mirrors the icon, the engine accounts for it). It changes nothing in the drawing, but `get_svg_metrics` records a symbol of that `type` (with the icon's `eid`) there, unless a real symbol is in that cell. E.g. `parallel_branch_event` draws the start circle of the branch: `{ type: 'event_start', x: 1 }`, presetlr below the signal with `y: 1`. |
|
|
178
|
+
| `hidelabel` | `true \| false` | The label is drawn invisible (`.label.invisible`), but still takes its space, e.g. presetlr's `loop_tail` uses the condition only to make the outgoing arrow as long as the label. It is not in the metrics (`get_svg_metrics`). |
|
|
176
179
|
| `noindent` | `true` | Per-element opt-out of the default indent-first-column behavior in horizontal expansions. |
|
|
177
180
|
|
|
178
181
|
`border: 'structural'` is the mechanism built for subprocesses. When an element's `border` is
|
|
@@ -348,6 +351,7 @@ one-off tweaks, e.g. `style="fill:none;"`).
|
|
|
348
351
|
| `.label` (on `<text>`) | The node label text style. Put this on the `<text>` inside `part-middle`; leave its content empty, it's filled in at render time. |
|
|
349
352
|
| `.label.standalone` | Adds a background-colored outline stroke behind the label text (for readability over busy backgrounds) — used e.g. on `loop.svg`'s inline label. |
|
|
350
353
|
| `.label.rotate` | Applied automatically when the manifestation's `rotated_labels`/an element's `rotatelabels` is active. |
|
|
354
|
+
| `.label.invisible` | Applied automatically when an element's `hidelabel` is set; `visibility: hidden`, so the label keeps its space. |
|
|
351
355
|
| `.duration` | Stroke color for duration-annotation strokes. |
|
|
352
356
|
| `.super` / `tspan.exec` / `.active` / `.vote` / `.colon` / `.necessary` | The small execution-count indicator (`▶ 0,0`) appended automatically above every icon unless `addition` is suppressed at draw time. |
|
|
353
357
|
| `.stripe.even` / `.stripe.odd` | Alternating row backgrounds, only drawn when the manifestation sets `this.striped = true`. |
|
data/cockpit/track.html
CHANGED
|
@@ -23,16 +23,11 @@
|
|
|
23
23
|
|
|
24
24
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
25
25
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
26
|
-
<script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
|
|
30
26
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
31
27
|
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
32
28
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
33
29
|
<script type="text/javascript" src="/js_libs/parsequery.js"></script>
|
|
34
30
|
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
35
|
-
<script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
|
|
36
31
|
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
37
32
|
|
|
38
33
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
data/cpee.gemspec
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = "cpee"
|
|
3
|
-
s.version = "2.1.
|
|
3
|
+
s.version = "2.1.139"
|
|
4
4
|
s.platform = Gem::Platform::RUBY
|
|
5
5
|
s.license = "LGPL-3.0-or-later"
|
|
6
6
|
s.summary = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
|
|
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
|
|
|
21
21
|
s.email = 'juergen.mangler@gmail.com'
|
|
22
22
|
s.homepage = 'http://cpee.org/'
|
|
23
23
|
|
|
24
|
-
s.add_runtime_dependency 'riddl', '~> 1.0'
|
|
24
|
+
s.add_runtime_dependency 'riddl', '~> 1.0', '>= 1.0.21'
|
|
25
25
|
s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.158'
|
|
26
26
|
s.add_runtime_dependency 'highline', '~> 2.0'
|
|
27
27
|
s.add_runtime_dependency 'redis', '~> 5.4'
|
data/lib/cpee/implementation.rb
CHANGED
|
@@ -466,6 +466,11 @@ module CPEE
|
|
|
466
466
|
@status = 404
|
|
467
467
|
return
|
|
468
468
|
end
|
|
469
|
+
# only ready, stopped, finished, abandoned; a running controller would keep writing into expiring keys
|
|
470
|
+
if opts[:statemachine].readonly? id
|
|
471
|
+
@status = 423
|
|
472
|
+
return
|
|
473
|
+
end
|
|
469
474
|
|
|
470
475
|
content = {
|
|
471
476
|
:state => 'purged',
|
|
@@ -160,7 +160,7 @@ module CPEE
|
|
|
160
160
|
opts[:redis]
|
|
161
161
|
)
|
|
162
162
|
elsif CPEE::Persistence::extract_item(id,opts,"callbacks/#{callback}/type") == 'vote'
|
|
163
|
-
if @p.length == 1 && @p[0].name == 'continue' && @p[0].class == Riddl::Parameter::
|
|
163
|
+
if @p.length == 1 && (@p[0].name == 'continue' || (@p[0].name == '' && @p[0].class == Riddl::Parameter::Complex))
|
|
164
164
|
CPEE::Message::send(
|
|
165
165
|
:'vote-response',
|
|
166
166
|
callback,
|
|
@@ -168,7 +168,7 @@ module CPEE
|
|
|
168
168
|
id,
|
|
169
169
|
{},
|
|
170
170
|
{},
|
|
171
|
-
@p[0].value,
|
|
171
|
+
@p[0].class == Riddl::Parameter::Simple ? @p[0].value : @p[0].value.read,
|
|
172
172
|
opts[:redis]
|
|
173
173
|
)
|
|
174
174
|
else
|
|
@@ -201,7 +201,10 @@ module CPEE
|
|
|
201
201
|
if pat == 'forward:*'
|
|
202
202
|
id, key = what.match(/forward:([^\/]+)\/(.+)/).captures
|
|
203
203
|
if sse = opts.dig(:sse_connections,id,key)
|
|
204
|
-
|
|
204
|
+
# message is "seq,sseq {json}"; numbers go into the standard SSE id field (lastEventId), data stays pure json
|
|
205
|
+
# riddl's send_with_id(field,value) writes "field: value\n\n", so id and data are combined into one event
|
|
206
|
+
index = message.index(' ')
|
|
207
|
+
sse.send_with_id 'id', message[0...index] + "\ndata: " + message[index+1..-1]
|
|
205
208
|
else
|
|
206
209
|
DeleteSubscription::set(id,opts,key)
|
|
207
210
|
end
|