cpee 2.1.71 → 2.1.73

data/cockpit/templates/Track Test Local.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
   <dataelements>
@@ -5,8 +6,24 @@
   </dataelements>
   <endpoints>
     <start_url>https://cpee.org/flow/start/url/</start_url>
+    <user>https-post://cpee.org/services/timeout-user.php</user>
+    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
+    <subprocess>https-post://cpee.org/flow/start/url/</subprocess>
+    <timeout>https-post://cpee.org/services/timeout.php</timeout>
+    <send>https-post://cpee.org/ing/correlators/message/send/</send>
+    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
   </endpoints>
-  <positions/>
+  <attributes>
+    <info>Track Test Local</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+    <creator>Christine Ashcreek</creator>
+    <author>Christine Ashcreek</author>
+    <design_stage>development</design_stage>
+    <design_dir>Templates.dir</design_dir>
+  </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <loop mode="pre_test" condition="true">
@@ -73,15 +90,4 @@
     <dataelements type="none"/>
     <endpoints type="none"/>
   </transformation>
-  <attributes>
-    <info>Track Test Local</info>
-    <modeltype>CPEE</modeltype>
-    <theme>default</theme>
-    <customer>pilotfabrik</customer>
-    <status>development</status>
-    <creator>Christine Ashcreek</creator>
-    <author>Christine Ashcreek</author>
-    <design_stage>development</design_stage>
-    <design_dir>Templates.dir</design_dir>
-  </attributes>
-</testset>
+</testset>

data/cockpit/themes/base.js

@@ -1248,14 +1248,22 @@ function WFAdaptorManifestationBase(adaptor) {
 
         var regassi =      /data\.([a-zA-Z_]+)\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-zA-Z_]+)\s*/g;
-        $.merge($('call > code > prepare',node), $('call > parameters > arguments > *, call > code > finalize, call > code > update, call > code > rescue, loop[condition], alternative[condition]',node)).each(function(i,n) {
-          let item;
+
+        $('call, loop[condition], alternative[condition]',node).each(function(i,n) {
+          let item = '';
           if (n.hasAttribute('condition')) {
             item = n.getAttribute('condition');
           } else {
-            item = n.textContent;
+            $('call > code > prepare',n).each(function(j,m){
+              item += m.textContent + '\n';
+            });
+            $('call > parameters > arguments > *, call > code > finalize, call > code > update, call > code > rescue',n).each(function(j,m){
+              let x = m.textContent;
+              if (m.parentNode.nodeName == 'arguments' && x.charAt(0) != '!' ) { return }
+              item += x + '\n';
+            });
           }
-          if (n.parentNode.nodeName == 'arguments' && item.charAt(0) != '!' ) { return }
+          if (item == '') { return; }
 
           let indices = [];
 
@@ -1263,11 +1271,12 @@ function WFAdaptorManifestationBase(adaptor) {
             indices.push(match.index);
             alist.push(match[1]);
           }
+
           for (const match of item.matchAll(reg_not_assi)) {
             const arg1 = match[1];
             if (indices.includes(match.index)) { continue; }
             if (!alist.includes(arg1)) {
-              if (match.index >= indices[0]) {
+              if (match.index >= indices[0] || indices.length == 0) {
                 plist.push(arg1);
               }
             }

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.71"
+  s.version          = "2.1.73"
   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."
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/templates/.templates.xml,cockpit/templates/.transformations.xml,cockpit/templates/.Signavio.xml,cockpit/templates/.CPEE.xml,cockpit/*.html,cockpit/themes/*/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,server/redis*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
+  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/templates/.templates.xml,cockpit/templates/.transformations.xml,cockpit/templates/.Signavio.xml,cockpit/templates/.CPEE.xml,cockpit/*.html,cockpit/themes/*/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,server/executionhandlers/rust/**/*,cockpit/js_libs/**/*,server/redis*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README.md']
   s.bindir           = 'tools'

data/lib/cpee/implementation_callbacks.rb

@@ -116,7 +116,21 @@ module CPEE
         if CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'callback'
           ret = {}
           ret['values'] = @p.map{ |e|
-            [e.name, e.class == Riddl::Parameter::Simple ? [:simple,e.value] : [:complex,e.mimetype,e.value.path] ]
+            # bei complex wenn kleiner 500KiB statt e.value.path e.value.read
+            # bei complex wenn groesser 500KiB das file ueber nginx in einem verzeichnis verfuegbar machen, mimetype auf cpee/externallink
+            #   aendert, link auf den server in den content. Der eval macht das dann direkt.
+            # Alt: [e.name, e.class == Riddl::Parameter::Simple ? [:simple,e.value] : [:complex,e.mimetype,e.value.path] ]
+            [
+              e.name,
+              if e.class == Riddl::Parameter::Simple
+                [:simple,e.value]
+              elsif e.class == Riddl::Parameter::Complex && e.value.size <= 512000
+                [:complex,e.mimetype,e.value.read]
+              else
+                # [:complex,'cpee-external-' + e.mimetype,e.value.read]
+                [:complex, e.mimetype,e.value.read]
+              end
+            ]
           }
           ret['headers'] =  @h
 

data/lib/cpee/implementation_properties.rb

@@ -332,6 +332,16 @@ module CPEE
     class PutExecutionHandler < Riddl::Implementation #{{{
       def self::set(id,opts,hw)
         CPEE::Persistence::set_item(id,opts,'executionhandler',:executionhandler => hw)
+        desc = CPEE::Persistence::extract_item(id,opts,'description')
+        dslx = CPEE::Persistence::extract_item(id,opts,'dslx')
+        xml = XML::Smart::string(dslx)
+        xml.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+        dsl = Object.const_get('CPEE::ExecutionHandler::' + hw.capitalize)::dslx_to_dsl(xml)
+        CPEE::Persistence::set_item(id,opts,'description',
+          :description => xml,
+          :dslx => dslx,
+          :dsl => dsl
+        )
       end
       def response
         id = @a[0]
@@ -768,7 +778,10 @@ module CPEE
         CPEE::Persistence::set_item(id,opts,'description',
           :description => xml,
           :dslx => dslx,
-          :dsl => dsl
+          :dsl => dsl,
+          :dataelements => CPEE::Persistence::extract_list(id,opts,'dataelements').to_h,
+          :endpoints => CPEE::Persistence::extract_list(id,opts,'endpoints').to_h,
+          :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
         )
         PatchItems::set_hash('dataelements',id,opts,de) unless de.empty?
         PatchItems::set_hash('dataelements',id,opts,ep) unless ep.empty?

data/lib/cpee/message.rb

@@ -50,7 +50,7 @@ module CPEE
         'topic' => topic,
         'type' => type,
         'name' => name,
-        'timestamp' =>  Time.now.xmlschema(3),
+        'timestamp' =>  Time.now.xmlschema(4),
         'content' => content
       }
       payload[@@type + '-uuid'] = instance_uuid if instance_uuid

data/server/executionhandlers/eval/controller.rb

@@ -70,7 +70,7 @@ class Controller
                 if e[1][0] == 'simple'
                   resp << Riddl::Parameter::Simple.new(e[0],e[1][1])
                 elsif e[1][0] == 'complex'
-                  resp << Riddl::Parameter::Complex.new(e[0],e[1][1],File.open(e[1][2]))
+                  resp << Riddl::Parameter::Complex.new(e[0],e[1][1],e[1][2])
                 end
               end
               @callback_keys[identifier].send(:callback,resp,m['content']['headers'])
@@ -136,6 +136,16 @@ class Controller
     end
   end
 
+  def sim
+    if vote("state/change", :state => 'simulating')
+      @thread = @instance.sim
+      @thread.join
+    else
+      @thread = @instance.stop
+      @thread.join
+    end
+  end
+
   def stop
     ### tell the instance to stop
     @instance.stop

data/server/executionhandlers/ruby/controller.rb

@@ -70,7 +70,7 @@ class Controller
                 if e[1][0] == 'simple'
                   resp << Riddl::Parameter::Simple.new(e[0],e[1][1])
                 elsif e[1][0] == 'complex'
-                  resp << Riddl::Parameter::Complex.new(e[0],e[1][1],File.open(e[1][2]))
+                  resp << Riddl::Parameter::Complex.new(e[0],e[1][1],e[1][2])
                 end
               end
               @callback_keys[identifier].send(:callback,resp,m['content']['headers'])

data/server/executionhandlers/ruby/execution.rb

@@ -40,7 +40,6 @@ module CPEE
           [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
         end
         iopts = YAML::load_file(ExecutionHandler::Ruby::BACKEND_OPTS)
-        pp iopts
         iopts[:host] = opts[:host]
         iopts[:url] = opts[:url]
         iopts[:redis_url] = opts[:redis_url]

data/server/routing/end.pid

@@ -1 +1 @@
-570906
+1174970

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

@@ -1 +1 @@
-570924
+1174988

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-570918
+1174982

data/server/routing/persist.pid

@@ -1 +1 @@
-570912
+1174976

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.71
+  version: 2.1.73
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -270,12 +270,12 @@ files:
 - cockpit/templates.legacy/convert_preset.rb
 - cockpit/templates.legacy/testsets.xml
 - cockpit/templates.legacy/transformations.xml
-- cockpit/templates/Coopis 2010 Eval.xml
 - cockpit/templates/Coopis 2010.xml
 - cockpit/templates/Frames.xml
 - cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml
 - cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml
 - cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml
+- cockpit/templates/ML-pipe-multi.xml
 - cockpit/templates/Subprocess.xml
 - cockpit/templates/Subprocess.xml.attrs
 - cockpit/templates/Track Test Local.xml
@@ -908,10 +908,6 @@ files:
 - server/executionhandlers/ruby/controller.rb
 - server/executionhandlers/ruby/dsl_to_dslx.xsl
 - server/executionhandlers/ruby/execution.rb
-- server/executionhandlers/rust/backend/README.md
-- server/executionhandlers/rust/backend/compile.sh
-- server/executionhandlers/rust/backend/opts.yaml
-- server/executionhandlers/rust/execution.rb
 - server/resources/empty_dslx.xml
 - server/resources/notifications/logging/subscription.xml
 - server/resources/properties.empty

data/cockpit/templates/Coopis 2010 Eval.xml

@@ -1,192 +0,0 @@
-<testset xmlns="http://cpee.org/ns/properties/2.0">
-  <executionhandler>eval</executionhandler>
-  <dataelements>
-    <persons>3</persons>
-    <card>Visa_12345</card>
-    <airline/>
-    <hotels>[]</hotels>
-    <from>Vienna</from>
-    <to>Prague</to>
-    <costs>0</costs>
-  </dataelements>
-  <endpoints>
-    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
-    <user>https-post://cpee.org/services/timeout-user.php</user>
-    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
-    <timeout>https://cpee.org/services/timeout.php</timeout>
-    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
-    <subprocess>https://cpee.org/flow/start/url/</subprocess>
-    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
-    <send>https-post://cpee.org/ing/correlators/message/send/</send>
-    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
-  </endpoints>
-  <attributes>
-    <theme>extended</theme>
-    <info>Coopis 2010 Eval</info>
-    <creator>Christine Ashcreek</creator>
-    <author>Christine Ashcreek</author>
-    <modeltype>CPEE</modeltype>
-    <design_stage>development</design_stage>
-    <guarded>none</guarded>
-    <design_dir>Templates.dir/</design_dir>
-    <guarded_id/>
-    <model_uuid>1cdc1bc1-6cf9-4f52-a227-8c87a7b9120a</model_uuid>
-  </attributes>
-  <description>
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <label>Book Airline 1</label>
-          <method>:post</method>
-          <arguments>
-            <from>!data.from</from>
-            <to>!data.to</to>
-            <persons>!data.persons</persons>
-          </arguments>
-        </parameters>
-        <code>
-          <prepare/>
-          <finalize output="result">data.airline = result.value('id')
-data.costs += result.value('costs').to_f
-status.update 1, 'Hotel'</finalize>
-          <update output="result"/>
-          <rescue output="result"/>
-        </code>
-        <annotations>
-          <_timing>
-            <_timing_weight/>
-            <_timing_avg/>
-            <explanations/>
-          </_timing>
-          <_shifting>
-            <_shifting_type>Duration</_shifting_type>
-          </_shifting>
-          <_context_data_analysis>
-            <probes/>
-            <ips/>
-          </_context_data_analysis>
-          <report>
-            <url/>
-          </report>
-          <_notes>
-            <_notes_general/>
-          </_notes>
-        </annotations>
-        <documentation>
-          <input/>
-          <output/>
-          <implementation>
-            <description/>
-          </implementation>
-          <code>
-            <description/>
-          </code>
-        </documentation>
-      </call>
-      <parallel wait="-1" cancel="last">
-        <loop mode="pre_test" condition="data.persons &gt; 0">
-          <parallel_branch>
-            <call id="a2" endpoint="bookHotel">
-              <parameters>
-                <label>Book Hotel</label>
-                <method>:post</method>
-                <arguments>
-                  <to>!data.to</to>
-                </arguments>
-              </parameters>
-              <code>
-                <prepare/>
-                <finalize output="result">data.hotels &lt;&lt; result.value('id')
-data.costs += result.value('costs').to_f</finalize>
-                <update output="result"/>
-                <rescue output="result"/>
-              </code>
-              <annotations>
-                <_timing>
-                  <_timing_weight/>
-                  <_timing_avg/>
-                  <explanations/>
-                </_timing>
-                <_shifting>
-                  <_shifting_type>Duration</_shifting_type>
-                </_shifting>
-                <_context_data_analysis>
-                  <probes/>
-                  <ips/>
-                </_context_data_analysis>
-                <report>
-                  <url/>
-                </report>
-                <_notes>
-                  <_notes_general/>
-                </_notes>
-              </annotations>
-              <documentation>
-                <input/>
-                <output/>
-                <implementation>
-                  <description/>
-                </implementation>
-                <code>
-                  <description/>
-                </code>
-              </documentation>
-            </call>
-          </parallel_branch>
-          <manipulate id="a3">data.persons -= 1</manipulate>
-        </loop>
-      </parallel>
-      <choose mode="exclusive">
-        <alternative condition="data.costs &gt; 700">
-          <_probability>
-            <_probability_min/>
-            <_probability_max/>
-            <_probability_avg/>
-          </_probability>
-          <call id="a4" endpoint="approve">
-            <parameters>
-              <label>Approve Hotel</label>
-              <method>:post</method>
-              <arguments>
-                <costs>!data.costs</costs>
-              </arguments>
-            </parameters>
-            <annotations>
-              <_timing>
-                <_timing_weight/>
-                <_timing_avg/>
-                <explanations/>
-              </_timing>
-              <_shifting>
-                <_shifting_type>Duration</_shifting_type>
-              </_shifting>
-              <_context_data_analysis>
-                <probes/>
-                <ips/>
-              </_context_data_analysis>
-              <report>
-                <url/>
-              </report>
-              <_notes>
-                <_notes_general/>
-              </_notes>
-            </annotations>
-            <documentation>
-              <input/>
-              <output/>
-              <implementation>
-                <description/>
-              </implementation>
-            </documentation>
-          </call>
-        </alternative>
-        <otherwise/>
-      </choose>
-    </description>
-  </description>
-  <transformation>
-    <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
-  </transformation>
-</testset>

data/server/executionhandlers/rust/backend/README.md

@@ -1,17 +0,0 @@
-* run is copied into every instance.
-* opts.yaml is written on each start.
-* instance.rb is written on each start.
-
-## What can you do to make it more robust?
-
-Replace run with a program that actually compiles and runs instance.rb.  Of
-courses the transformation_* xslts would have to be adapted to create suitable
-code. The compiled executable would just need to behave the same as the instance.rb,
-dispersing all the same events through redis.
-
-More suitable languages would be crystal and javascript, c++. Less suitable,
-but doable, would be python, C. I.e., all languages that do not support multi-line
-lambdas would produce much less readable code, thus the "Description" tab in
-the cockpit would be garbage.
-
-Definitely do tell me if you are interessted in doing something like this ;-)

data/server/executionhandlers/rust/backend/compile.sh

@@ -1,5 +0,0 @@
-CDIR=$(dirname "$0")
-cd $CDIR
-echo "echo i compile hard" > run
-chmod 700 run
-cargo instance.rs

data/server/executionhandlers/rust/backend/opts.yaml

@@ -1,6 +0,0 @@
-:host: localhost
-:url: http://localhost:8298/
-:redis_path: /tmp/redis.sock
-:redis_db: 3
-:executionhandlers: ../../executionhandlers/
-:executionhandler: ruby

data/server/executionhandlers/rust/execution.rb

@@ -1,84 +0,0 @@
-# This file is part of CPEE.
-#
-# CPEE is free software: you can redistribute it and/or modify it under the terms
-# of the GNU General Public License as published by the Free Software Foundation,
-# either version 3 of the License, or (at your option) any later version.
-#
-# CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# CPEE (file COPYING in the main directory).  If not, see
-# <http://www.gnu.org/licenses/>.
-
-module CPEE
-
-  module ExecutionHandler
-
-    module Rust
-      BACKEND_INSTANCE = 'instance.rs'
-      BACKEND_OPTS     = 'opts.yaml'
-      BACKEND_COMPILE  = File.expand_path(File.join(__dir__,'backend','compile.sh'))
-      BACKEND_RUN      = File.expand_path(File.join(__dir__,'backend','run'))
-
-      def self::dslx_to_dsl(dslx) # transpile
-        'hello world'
-      end
-
-      def self::prepare(id,opts) # write result to disk
-        Dir.mkdir(File.join(opts[:instances],id.to_s)) rescue nil
-        FileUtils.copy(ExecutionHandler::Rust::BACKEND_COMPILE,File.join(opts[:instances],id.to_s))
-        dsl = CPEE::Persistence::extract_item(id,opts,'dsl')
-        hw = CPEE::Persistence::extract_item(id,opts,'executionhandler')
-        endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints').to_h
-        dataelements = CPEE::Persistence::extract_list(id,opts,'dataelements').to_h
-        attributes = CPEE::Persistence::extract_list(id,opts,'attributes').to_h
-        positions = CPEE::Persistence::extract_set(id,opts,'positions')
-        positions.map! do |k, v|
-          [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
-        end
-        File.open(File.join(opts[:instances],id.to_s,ExecutionHandler::Rust::BACKEND_OPTS),'w') do |f|
-          YAML::dump({
-            :host => opts[:host],
-            :url => opts[:url],
-            :redis_url => opts[:redis_url],
-            :redis_path => File.join(opts[:basepath],opts[:redis_path]),
-            :redis_db => opts[:redis_db],
-            :workers => opts[:workers],
-            :global_executionhandlers => opts[:global_executionhandlers],
-            :executionhandlers => opts[:executionhandlers],
-            :executionhandler => hw,
-            :endpoints => endpoints,
-            :dataelements => dataelements,
-            :positions => positions,
-            :attributes => attributes
-          },f)
-        end
-        File.write(File.join(opts[:instances],id.to_s,ExecutionHandler::Rust::BACKEND_INSTANCE),dsl)
-        `#{File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Rust::BACKEND_COMPILE))}`
-      end
-
-      def self::run(id,opts)
-        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Rust::BACKEND_RUN))
-        pid = Kernel.spawn(exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
-        Process.detach pid
-        File.write(exe + '.pid',pid)
-      end
-
-      def self::stop(id,opts) ### return: bool to tell if manually changing redis is necessary
-        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Rust::BACKEND_RUN))
-        pid = File.read(exe + '.pid') rescue nil
-        if pid && (Process.kill(0, pid.to_i) rescue false)
-          Process.kill('HUP', pid.to_i) rescue nil
-          false
-        else # its not running, so clean up
-          File.unlink(exe + '.pid') rescue nil
-          true
-        end
-      end
-    end
-
-  end
-
-end