cpee 2.1.112 → 2.1.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c7c3e12a766f8a89c5808641e922d0eb568ce186a2c0a8a0d262fd58d8b09f2
-  data.tar.gz: d4e650cc550e9df8df018eb560f77fe6a9d0a3c29df39d2e5e3aa3f2fc848feb
+  metadata.gz: 18b1d4bf1374bd11d7f886e70bffe237833a6dcd92755cb2d3ce6d89069eb7a9
+  data.tar.gz: 97320261f72f9aa36765cecb38612e3a51b551a303587b6938ea5451c8fde4f6
 SHA512:
-  metadata.gz: f91f1b2362eba08c63f62d205de68dc535a184949a141740c4b2f337ddb05675e3c93848a4521147ca1f8c1fa295fe9f85f8db271c53737b9dd91c33273f2143
-  data.tar.gz: 4c6d57597a2c37e0c5d50376b1770c93582dd3d960d495e250253eab0c1ae1588c6f69dce9092fe8143863888a0859ba5feaec61bf25a05eec3055a7c7ceb37b
+  metadata.gz: 6820d708a92fa15143439aebac23f4b4952bd68feed314e171d57d75c863a386a6064299a035da5673510993c479dfb8bb0ab6731bbaee9806cea9a1ba86cf02
+  data.tar.gz: 48f750879f5da583f61894044c7ae329fe81afa7a13298b57cd1a7a0f6efd69237c863df98e214ee927ca1147110afffa363c3a5370c26ef2f2eb2aa2de78586

data/cockpit/js/instance.js

@@ -451,7 +451,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
 }// }}}
 
 function translate_endpoint(ep) {
-  return ep.replace(/\{[^\/\}]+\}/,'*');
+  return ep.replace(/\{[^\/\}]+\}/g,'*');
 }
 
 function get_resource(base, key, loc, cache) {

data/cockpit/js/wfadaptor.js

@@ -14,8 +14,6 @@
   <http://www.gnu.org/licenses/>.
 */
 
-var high;
-
 // TODO: changes in svg-script:
 // 1) drawing functions
 // 2) creation of svg-container (Bug: arrows on lines)
@@ -195,6 +193,13 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
 
   this.update = function(doit){ doit(self); };
 
+  this.draw_element = function(type,id,label) {
+    let pos = {'row': 1,'col': 0};
+    let block = { 'max': {'row': pos.row, 'col': pos.col}, 'endnodes': [], 'svg': $X('<g class="group" xmlns="http://www.w3.org/2000/svg"/>') };
+    illustrator.draw.draw_symbol(type, id, label, pos.row, pos.row, pos.row, pos.col, block.svg, false, {}, {})
+    self.illustrator.set_svg(block);
+  }
+
   this.redraw = function(){
     description.redraw();
   }
@@ -282,8 +287,13 @@ function WfIllustrator(wf_adaptor) { // View  {{{
   this.set_svg = function(graph) { // {{{
     self.svg.container.append(graph.svg);
     let bb = graph.svg[0].getBBox();
+
+    let w = self.dim.get_x_plus(0,graph.max.row,graph.max.col);
+    if (w == 0) { w = bb.x + bb.width + self.width_shift; }
+    // the alternative is bb.x + bb.width + self.width_shift, but this is bad when clipped elements
+
     self.svg.container.attr('height', bb.y + bb.height + self.height_shift); // small border on the bottom
-    self.svg.container.attr('width',  bb.x + bb.width + self.width_shift);  // small border on the right
+    self.svg.container.attr('width', w);  // small border on the right
     self.svg.container.attr('data-pos-matrix', JSON.stringify(self.dim.symbols));
     self.svg.container.attr('data-con-list', JSON.stringify(self.dim.connections));
   } // }}}

data/cockpit/only_llm.html

@@ -221,8 +221,8 @@
           <div id='llm_params' class="multi">
             <label id="llmlabel" for="llms">Choose LLM:</label>
             <select name="llms" id="llms">
-              <option value="gemini-2.0-flash" selected>gemini 2 Flash</option>
-              <option value="gemini-2.5-flash-lite">gemini 2.5 Flash Lite</option>
+              <!--<option value="gemini-2.0-flash" selected>gemini 2 Flash</option>-->
+              <option value="gemini-2.5-flash-lite" selected>gemini 2.5 Flash Lite</option>
               <option value="gemini-2.5-flash">gemini 2.5 Flash</option>
               <option value="gemini-2.5-pro">gemini 2.5 Pro</option>
               <option value="gpt-4">gpt 4</option>

data/cockpit/themes/control/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/control/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/dataflow/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/dataflow/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/dataflow/theme.js

@@ -5,7 +5,7 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
     this.striped = true;
     var dataflowExtract = function(subject,mixed,extract) { //{{{
       let dict = {};
-      var regassi =      /data\.([a-z_][a-zA-Z0-9_]*)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>|\|\|=)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+      var regassi =      /data\.([a-z_][a-zA-Z0-9_]*)[a-zA-Z0-9_\]\["']*\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>|\|\|=)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
       var reg_not_assi = /data\.([a-z_][a-zA-Z0-9_]*)\s*/g;
 
       $(subject).each(function(_,ele){

data/cockpit/themes/default/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/default/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/extended/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/extended/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/felix/rngs/call.rng

@@ -186,6 +186,11 @@
         <text rngui:wrap="true" rngui:label="Notes"/>
       </element>
     </element>
+    <element name="_resources" rngui:header="Resources" rngui:fold="closed">
+      <element name="_notes_general" rngui:label="General">
+          <text rngui:wrap="true" rngui:label="Notes"/>
+      </element>
+    </element>
   </element>
 
   <element name="documentation" rngui:header="Documentation">
@@ -215,23 +220,4 @@
       </element>
     </element>
   </element>
-  <element name="resources" rngui:header="Resources">
-    <zeroOrMore rngui:label="Create Resources">
-      <element name='resource' rngui:label="Resource" rngui:labeltype="xml">
-        <data type="string" rngui:label="Name"/>
-      </element>
-    </zeroOrMore>
-     <attribute name="allocated_to" rngui:label="allocated_to" rngui:default="not_allocated">
-        <data type="string" rngui:readonly="true"/>
-      </attribute>
-  </element>
-  <element name="expectedready" rngui:label="Expected Ready">
-    <data name="expectedready" type="decimal" rngui:readonly="true"/>
-  </element>
-  <element name="plannedstart" rngui:label="Planned Start Time">
-    <data name="plannedstart" type="decimal" rngui:readonly="true"/>
-  </element>
-  <element name="plannedend" rngui:label="Planned End Time">
-    <data name="plannedend" type="decimal" rngui:readonly="true"/>
-  </element>
 </element>

data/cockpit/themes/packed/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/packed/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/preset/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/preset/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/presetaltid/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/presetaltid/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/presetid/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/presetid/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cockpit/themes/reduced/rngs/loop.rng

@@ -23,6 +23,14 @@
     </element>
   </element>
   <element name="_annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
       <element name="_iteration" rngui:label="Log per iteration">
         <data type="boolean" rngui:label="Log per iteration"/>

data/cockpit/themes/reduced/rngs/terminate.rng

@@ -2,4 +2,7 @@
   <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
     <data type="string" rngui:readonly="true"/>
   </attribute>
+  <attribute name="abandon" rngui:label="Abandon instance">
+    <data type="boolean" rngui:label="Abandon instance instead of finishing it"/>
+  </attribute>
 </element>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.112"
+  s.version          = "2.1.114"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.148'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.149'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.4'
   s.add_runtime_dependency 'net-ssh', '~> 7.3'

data/server/executionhandlers/ruby/connection.rb

@@ -44,6 +44,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end# }}}
   def self::inform_connectionwrapper_error(arguments,err) # {{{
     controller = arguments[0]
+    p err.message
+    puts err.backtrace
     begin
       if err.backtrace[0] !~ /, Line/
         controller.notify("executionhandler/error", :message => err.backtrace[0].gsub(/(Activity a\d+)/,'\1:'), :line => -1, :where => err.backtrace[0].match(/Activity a\d+/)[0])
@@ -348,6 +350,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       else
         raise 'something bad happened, but we dont know what.'
     end
+  rescue
+    raise 'external script handler probably not running'
   end #}}}
 
   def argument_transform_value(obj, struct)

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -123,6 +123,10 @@
           </xsl:for-each>
         </xsl:otherwise>
       </xsl:choose>
+      <xsl:if test="@abandon">
+        <xsl:text>, </xsl:text>
+        <xsl:value-of select="@abandon"/>
+      </xsl:if>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='stop'">

data/server/routing/end.pid

@@ -1 +1 @@
-1764907
+169210

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-1764950
+169252

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-1764935
+169238

data/server/routing/persist.pid

@@ -1 +1 @@
-1764921
+169224

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.112
+  version: 2.1.114
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -34,7 +34,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.148
+        version: 1.99.149
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.148
+        version: 1.99.149
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement