cpee 2.1.98 → 2.1.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5380db38e15ecc1a9e3d52fa912f498c6a07e071e685370402719257154dc768
-  data.tar.gz: 228deb7bd244630dfb4dc47618fc628cc23630e95822f7bf6a517824a6c2f9b4
+  metadata.gz: 143c4d716cd14f4f7c309470f1e9fe0f8dea633da3533135e122a105a05137af
+  data.tar.gz: 52524d9062b8c54f1d0d26b5d09301765be4246cc5439b238805eaa86a9de5e8
 SHA512:
-  metadata.gz: 856b90b8753e9984e4c7cbdcea0914873987c6ecf68297afca3309b8dda9e8ca1e72a68be0b85e9147b5378bc2f734b3c0c8b9da08827670a8b853acde7a2681
-  data.tar.gz: ba100bf2a332013b03c005493cadae226b85407e7e9846f5e24cd694b73095a8a1041c569c4455ceede9dd33cf6e4f6fabb3b97b96aa4ab36397e2930428e560
+  metadata.gz: 1760d39d1fe15bed9a548fec3deb386d5752497a6ebc2591efda7b861f5cf810a193a8e8086ccf02f659e9148b0719136b3f9eb9b32bb011bed7fdef53af472c
+  data.tar.gz: '0619d08bf29f3a46c522860eadc6e118b474fcf49a369c36cf9f05df36aaaffa53de3481f00322d98cbafd1a24e4c21364fa4f90ddebac20d1250e30ddfe4c95'

data/cockpit/js/instance.js

@@ -120,6 +120,13 @@ function cockpit() { //{{{
     $('#dat_details').empty();
     e.stopImmediatePropagation();
   });
+  document.addEventListener('uidash:activate_tab', function (e) {
+    if (!$('#tabdetails').hasClass('inactive')) {
+      if (save['graph_adaptor']) {
+        save['graph_adaptor'].redraw();
+      }
+    }
+  });
 
   $.ajax({
     url: $('body').attr('current-templates'),

data/cockpit/js/wfadaptor.js

@@ -59,13 +59,7 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
     illustrator.set_label_container(container);
   } // }}}
 
-  // initialize
-  this.illustrator = illustrator = new WfIllustrator(this);
-  this.description = description = new WfDescription(this, this.illustrator);
-
-  this.update = function(doit){ doit(self); };
-
-  $.getScript(theme_base, function() { //{{{
+  function loadTheme(doit) { //{{{
     manifestation = new WFAdaptorManifestation(self);
     illustrator.compact = manifestation.compact == true ? true : false;
     illustrator.rotated_labels = manifestation.rotated_labels == true ? true : false;
@@ -191,8 +185,29 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
     }
     $.when.apply($, deferreds).then(function(x) {
       doit(self);
+    })
+  } //}}}
+
+  // initialize
+  this.illustrator = illustrator = new WfIllustrator(this);
+  this.description = description = new WfDescription(this, this.illustrator);
+
+  this.update = function(doit){ doit(self); };
+
+  this.redraw = function(){
+    description.redraw();
+  }
+
+  $.getScript(self.theme_base).done(function() {
+    loadTheme(doit);
+  }).fail(function(){
+    // default theme
+    self.theme_base = 'themes/preset/theme.js';
+    self.theme_dir = self.theme_base.replace(/theme.js/,'');
+    $.getScript(self.theme_base,function() {
+      loadTheme(doit);
     });
-  }); //}}}
+  });
 } // }}}
 
 // WfIllustrator:
@@ -912,6 +927,16 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     illustrator.set_duration(start);
     doit(self);
   }
+  var redraw = this.redraw = function(){
+    id_counter = {};
+    labels = [];
+    let start = performance.now();
+    illustrator.clear();
+    var graph = parse(description.children('description').get(0), {'row':0,'col':0,final:false,wide:false});
+    illustrator.set_svg(graph);
+    self.set_labels(graph);
+    illustrator.set_duration(start);
+  }
   var update = this.update = function(svgid) { // {{{
     id_counter = {};
     if(update_illustrator){

data/cockpit/only_llm.html

@@ -222,8 +222,9 @@
             <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-preview-05-20">gemini 2.5 Flash</option>
-              <option value="gemini-2.5-pro-preview-05-06">gemini 2.5 Pro</option>
+              <option value="gemini-2.5-flash-lite">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>
               <option value="gpt-4o">gpt 4o</option>
               <option value="gpt-4o-mini">gpt 4o mini</option>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.98"
+  s.version          = "2.1.100"
   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.126'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.146'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'

data/lib/cpee/implementation.rb

@@ -117,7 +117,7 @@ module CPEE
       Dir[File.join(opts[:global_executionhandlers],'*','execution.rb')].each do |h|
         require h
       end unless opts[:global_executionhandlers].nil? || opts[:global_executionhandlers].strip == ''
-      Dir[File.join(opts[:executionhandlers],'**','execution.rb')].each do |h|
+      Dir[File.join(opts[:executionhandlers],'*','execution.rb')].each do |h|
         require h
       end unless opts[:executionhandlers].nil? || opts[:executionhandlers].strip == ''
       CPEE::Message::set_workers(opts[:workers])

data/server/executionhandlers/eval/connection.rb

@@ -69,8 +69,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @handler_continue = continue
     @handler_position = position
     @handler_passthrough = nil
-    @handler_returnValue = nil
-    @handler_returnOptions = nil
     @handler_activity_uuid = Digest::MD5.hexdigest(Kernel::rand().to_s)
     @label = ''
     @guard_files = []
@@ -236,13 +234,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
   end #}}}
 
-  def activity_result_value # {{{
-    @handler_returnValue
-  end # }}}
-  def activity_result_options # {{{
-    @handler_returnOptions
-  end # }}}
-
   def activity_stop # {{{
     unless @handler_passthrough.nil?
       @controller.cancel_callback(@handler_passthrough)
@@ -307,24 +298,24 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
 
     if options['CPEE_STATUS'] || options['CPEE_EVENT']
-      @handler_returnValue = nil
-      @handler_returnOptions = nil
+      returnValue = nil
+      returnOptions = nil
     else
-      @handler_returnValue = recv
-      @handler_returnOptions = options
+      returnValue = recv
+      returnOptions = options
     end
 
     if options['CPEE_UPDATE']
-      @handler_continue.continue WEEL::Signal::UpdateAgain
+      @handler_continue.continue WEEL::Signal::UpdateAgain, returnValue, returnOptions
     else
       @controller.cancel_callback(@handler_passthrough)
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
-        @handler_continue.continue WEEL::Signal::Salvage
+        @handler_continue.continue WEEL::Signal::Salvage, returnValue, returnOptions
       elsif options['CPEE_STOP']
-        @handler_continue.continue WEEL::Signal::Stop
+        @handler_continue.continue WEEL::Signal::Stop, returnValue, returnOptions
       else
-        @handler_continue.continue
+        @handler_continue.continue WEEL::Signal::Proceed, returnValue, returnOptions
       end
     end
   end #}}}

data/server/executionhandlers/eval/dsl_to_dslx.xsl

@@ -215,7 +215,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:if>
-      <xsl:for-each select="@*[not(name()='language' or name()='mode' or name()='condition' or name()='svg-label')]">
+      <xsl:for-each select="@*[not(name()='language' or name()='mode' or (local-name()='alt_id' and namespace-uri()='http://cpee.org/ns/annotation/1.0') or name()='condition' or name()='svg-label')]">
         <xsl:text>, :</xsl:text>
         <xsl:value-of select="name(.)"/>
         <xsl:text> => "</xsl:text>

data/server/executionhandlers/ruby/connection.rb

@@ -69,8 +69,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @handler_continue = continue
     @handler_position = position
     @handler_passthrough = nil
-    @handler_returnValue = nil
-    @handler_returnOptions = nil
     @handler_activity_uuid = Digest::MD5.hexdigest(Kernel::rand().to_s)
     @label = ''
     @guard_files = []
@@ -236,13 +234,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
   end #}}}
 
-  def activity_result_value # {{{
-    @handler_returnValue
-  end # }}}
-  def activity_result_options # {{{
-    @handler_returnOptions
-  end # }}}
-
   def activity_stop # {{{
     unless @handler_passthrough.nil?
       @controller.cancel_callback(@handler_passthrough)
@@ -314,24 +305,24 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
 
     if options['CPEE_STATUS'] || options['CPEE_EVENT']
-      @handler_returnValue = nil
-      @handler_returnOptions = nil
+      returnValue = nil
+      returnOptions = nil
     else
-      @handler_returnValue = recv
-      @handler_returnOptions = options
+      returnValue = recv
+      returnOptions = options
     end
 
     if options['CPEE_UPDATE']
-      @handler_continue.continue WEEL::Signal::UpdateAgain
+      @handler_continue.continue WEEL::Signal::UpdateAgain, returnValue, returnOptions
     else
       @controller.cancel_callback(@handler_passthrough)
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
-        @handler_continue.continue WEEL::Signal::Salvage
+        @handler_continue.continue WEEL::Signal::Salvage, returnValue, returnOptions
       elsif options['CPEE_STOP']
-        @handler_continue.continue WEEL::Signal::Stop
+        @handler_continue.continue WEEL::Signal::Stop, returnValue, returnOptions
       else
-        @handler_continue.continue
+        @handler_continue.continue WEEL::Signal::Proceed, returnValue, returnOptions
       end
     end
   end #}}}

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -215,7 +215,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:if>
-      <xsl:for-each select="@*[not(name()='language' or name()='mode' or name()='condition' or name()='svg-label')]">
+      <xsl:for-each select="@*[not(name()='language' or (local-name()='alt_id' and namespace-uri()='http://cpee.org/ns/annotation/1.0') or name()='mode' or name()='condition' or name()='svg-label')]">
         <xsl:text>, :</xsl:text>
         <xsl:value-of select="name(.)"/>
         <xsl:text> => "</xsl:text>
@@ -468,7 +468,21 @@
     <xsl:text>end</xsl:text>
     <xsl:call-template name="print-newline"/>
   </xsl:template>
+  <xsl:template name="genPath">
+    <xsl:param name="prevPath"/>
+    <xsl:variable name="currPath" select="concat('/',name(),'[',
+      count(preceding-sibling::*[name() = name(current())])+1,']',$prevPath)"/>
+    <xsl:for-each select="parent::*">
+      <xsl:call-template name="genPath">
+        <xsl:with-param name="prevPath" select="$currPath"/>
+      </xsl:call-template>
+    </xsl:for-each>
+    <xsl:if test="not(parent::*)">
+      <xsl:value-of select="$currPath"/>
+    </xsl:if>
+  </xsl:template>
   <xsl:template match="d:parameters">
+    <!--xsl:text>:path =&gt; "</xsl:text><xsl:call-template name="genPath"/><xsl:text>", </xsl:text-->
     <xsl:apply-templates select="d:label" mode="parameter"/>
     <xsl:apply-templates select="d:*[not(name()='label') and not(name()='color')]" mode="parameter"/>
     <xsl:if test="count(*) &gt; 0">, </xsl:if>

data/server/routing/end.pid

@@ -1 +1 @@
-2372948
+2332765

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

@@ -1 +1 @@
-2372966
+2332784

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

@@ -1 +1 @@
-2372972
+2332790

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

@@ -1 +1 @@
-2372978
+2332796

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

@@ -1 +1 @@
-2372984
+2332802

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

@@ -1 +1 @@
-2372990
+2332808

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

@@ -1 +1 @@
-2372996
+2332814

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

@@ -1 +1 @@
-2373002
+2332820

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-2372960
+2332778

data/server/routing/persist.pid

@@ -1 +1 @@
-2372954
+2332771

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.98
+  version: 2.1.100
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -34,7 +34,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.126
+        version: 1.99.146
   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.126
+        version: 1.99.146
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement