cpee 1.5.16 → 1.5.17

data/cockpit/themes/preset/theme.js

@@ -152,7 +152,7 @@ function WFAdaptorManifestation(adaptor) {
           'params': [null, xml_node]
         }];
       }
-      if($('> finalize, > update', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
+      if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
         var icon =  self.elements.callmanipulate.illustrator.svg.clone();
         icon.children('.rfill:last').addClass('menu');
         menu['Delete'].push({
@@ -160,7 +160,7 @@ function WFAdaptorManifestation(adaptor) {
           'function_call': self.adaptor.description.remove,
           'menu_icon': icon,
           'type': undefined,
-          'params': ['> finalize, > update', xml_node]
+          'params': ['> code', xml_node]
         });
       }
       if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
@@ -253,7 +253,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('finalize,update', node).length > 0) {
+        if($('code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';
@@ -263,7 +263,7 @@ function WFAdaptorManifestation(adaptor) {
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/call.rng',
     'permissible_children': function(node,mode) { //{{{
-      if(node.children('finalize,update').length < 1)
+      if(node.children('code').length < 1)
         return [
          {'label': 'Scripts',
           'function_call': self.adaptor.description.insert_last_into,
@@ -538,7 +538,7 @@ function WFAdaptorManifestation(adaptor) {
       var childs = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -578,13 +578,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -625,7 +630,7 @@ function WFAdaptorManifestation(adaptor) {
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}];
       }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -665,13 +670,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -717,7 +727,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Manipulate',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -741,13 +751,17 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
       if(node.parent('parallel').length > node.parent('parallel_branch').length) {
         childs.push({'label': 'Parallel Branch',
                      'function_call': func,
@@ -807,7 +821,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Manipulate',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -826,7 +840,12 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
          'type': 'parallel_branch',
-         'params': [self.adaptor.description.elements.parallel_branch, node]}
+         'params': [self.adaptor.description.elements.parallel_branch, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
       if(node.get(0).tagName != 'parallel')
         childs.push({'label': 'Parallel',
@@ -872,10 +891,9 @@ function WFAdaptorManifestation(adaptor) {
     'description': self.adaptor.theme_dir + 'rngs/parallel_branch.rng',
     'permissible_children': function(node,mode) { //{{{
       var func = null;
-      var childs = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      childs =  [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -920,7 +938,7 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
          'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]},
+         'params': [self.adaptor.description.elements.critical, node]}
       ];
       if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
         return [{'label': 'Alternative',
@@ -965,7 +983,7 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1005,13 +1023,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]},
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -1075,7 +1098,7 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1086,7 +1109,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Script Task',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -1115,13 +1138,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.16"
+  s.version          = "1.5.17"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/instantiation.rb

@@ -27,7 +27,7 @@ module CPEE
     SERVER = File.expand_path(__dir__ + '/../instantiation.xml')
 
     module Helpers #{{{
-      def load_testset(tdoc,cpee,name=nil) #{{{
+      def load_testset(tdoc,cpee,name=nil,stream=nil) #{{{
         ins = -1
         uuid = nil
         XML::Smart.string(tdoc) do |doc|
@@ -41,6 +41,23 @@ module CPEE
               e.text = name
             end
           end
+          if stream && !stream.empty?
+            JSON.parse(stream).each do |e|
+              begin
+                stream = Typhoeus.get e['url']
+                if stream.success?
+                  XML::Smart::string(stream.response_body) do |str|
+                    doc.find("//desc:call[@id=\"#{e['id']}\"]/desc:parameters/desc:stream").each do |ele|
+                      ele.replace_by str.root
+                    end
+                  end
+                end
+              rescue => e
+                puts e.message
+                puts e.backtrace
+              end
+            end
+          end
 
           status, response, headers = res.post Riddl::Parameter::Simple.new("info",doc.find("string(/testset/attributes/prop:info)"))
 
@@ -160,8 +177,8 @@ module CPEE
         else
           (@status = 500) && return
         end
-
-        if (instance, uuid = load_testset(tdoc,cpee)).first == -1
+        stream = @p.find{ |e| e.name == 'stream' }&.value
+        if (instance, uuid = load_testset(tdoc,cpee,nil,stream)).first == -1
           @status = 500
         else
           handle_data cpee, instance, @p[4]&.value if @p[4]&.name == 'init'
@@ -198,8 +215,8 @@ module CPEE
         else
           (@status = 500) && return
         end
-
-        if (instance, uuid = load_testset(tdoc,cpee,name)).first == -1
+        stream = @p.find{ |e| e.name == 'stream' }&.value
+        if (instance, uuid = load_testset(tdoc,cpee,name,stream)).first == -1
           @status = 500
         else
           handle_data cpee, instance, @p[2]&.value if @p[2]&.name == 'init'

data/lib/instantiation.xml

@@ -33,6 +33,9 @@
     <optional>
       <parameter name="endpoints" type="string"/>
     </optional>
+    <optional>
+      <parameter name="stream" type="string"/>
+    </optional>
   </message>
   <message name="url">
     <parameter name="behavior" type="string">
@@ -50,6 +53,9 @@
     <optional>
       <parameter name="endpoints" type="string"/>
     </optional>
+    <optional>
+      <parameter name="stream" type="string"/>
+    </optional>
   </message>
   <message name="git">
     <parameter name="behavior" type="string">
@@ -69,6 +75,9 @@
     <optional>
       <parameter name="endpoints" type="string"/>
     </optional>
+    <optional>
+      <parameter name="stream" type="string"/>
+    </optional>
   </message>
   <message name="instance">
     <parameter name="behavior" type="string">

data/log/azure.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/ruby
+require_relative 'azure_logger'
+
+Riddl::Server.new(File.join(__dir__,'/log.xml'), :host => 'localhost', :port => 9313) do
+  accessible_description true
+  cross_site_xhr true
+  interface 'events' do
+	  run Logging if post 'event'
+  end
+end.loop!

data/log/azure_logger.rb

@@ -0,0 +1,136 @@
+require 'pp'
+require 'time'
+require 'digest'
+
+require 'json'
+require 'riddl/server'
+require 'typhoeus'
+
+EP_ARTEFACTS = "https://api.powerbi.com/beta/7ba47c6d-039d-44e5-8834-ee103ea08c19/datasets/2fb85c30-2e66-42d3-ac16-18c1fe76f501/rows?key=qpnTPKsn4ekXasNFs9he4afwAb%2Bj8DndJ6mGAomCGkkAdKsIDifRDK9hsQd0mk3X94KCzqGrNCYN%2Fs7T7STQjg%3D%3D"
+EP_INSTANCES = "https://api.powerbi.com/beta/7ba47c6d-039d-44e5-8834-ee103ea08c19/datasets/25c94fa0-f6f3-4547-9815-f772e1abc92f/rows?key=vWSGqHeQp6BQ8IPt4RBMLAbDPhVsyTW2NVcXfqQBCMx17cAZXfVejyAW72MeMGSbEk3fguhhqLoR3nYmopLIow%3D%3D"
+EP_SPAWNED   = "https://api.powerbi.com/beta/7ba47c6d-039d-44e5-8834-ee103ea08c19/datasets/79620e3f-a65c-4e34-b859-5aa43074f086/rows?key=dFS4XmqxI8iauMKucZenHQOi6mNcPhBslYo%2B8NwlzMYgiDYN%2FGDv6hX%2BwHMRIJwvQDyCxgd614KDihPw1Q%2BGSA%3D%3D"
+EP_SENSORS   = "https://api.powerbi.com/beta/7ba47c6d-039d-44e5-8834-ee103ea08c19/datasets/b62aada9-fe26-43e6-9e18-4bd3978e651d/rows?key=QWKNhGe3glUuWMOkCmJPytVQjaCn1Wyf8NboH3RXJTdA2ryiY%2Fk5%2Fz2lXDpgfguAa1xq%2BO%2Fw3lDhuXLYx4CyFA%3D%3D"
+EP_VALUES    = "https://api.powerbi.com/beta/7ba47c6d-039d-44e5-8834-ee103ea08c19/datasets/fc53f106-0299-458d-aa33-a04a00d68571/rows?key=mp9Om5wrPLG5hDA4efGzpfEGG5uHRUTtnUGlzNrfHJ5qaub2fG2FpwS5gq3g4IYRKMWG7mlCK5pgwm48XxtItw%3D%3D"
+
+class Logging < Riddl::Implementation
+
+  def doc(topic,event_name,instancenr,notification)
+    uuid = notification['instance_uuid']
+    return unless uuid
+
+    uuid = notification.dig('instance_uuid')
+
+    if notification.dig('attributes','artefacts') #{{{
+      artefacts = JSON.parse(notification.dig('attributes','artefacts'))
+
+      artefacts.each do |a|
+        aid = Digest::MD5.hexdigest(a['group'] + '_' + a['name'])
+        iid = Digest::MD5.hexdigest(a['group'] + '_' + a['name'] + '_' + uuid)
+        Typhoeus.post(EP_ARTEFACTS,
+          headers: {'Content-Type'=> "application/json"},
+          body: JSON.generate([a])
+        )
+        Typhoeus.post(EP_INSTANCES,
+          headers: {'Content-Type'=> "application/json"},
+          body: [
+            {
+              'uuid':  uuid,
+              'group': a['group'],
+              'name':  a['name'],
+              'date':  Time.now.iso8601,
+              'info':  notification.dig('attributes','info')
+            }
+          ]
+        )
+      end
+    end #}}}
+
+    case "#{topic}/#{event_name}"
+      when "dataelements/change", "endpoints/change"
+        sensors = JSON.parse(notification.dig('attributes','sensors') || '[]')
+        sensors.each do |s|
+          sid = Digest::MD5.hexdigest(uuid + '_' + s['name'])
+          Typhoeus.post(EP_SENSORS,
+            headers: {'Content-Type'=> "application/json"},
+            body: [
+              {
+                'uuid': uuid,
+                'sensor': s['name'],
+                'visualizer_url': s['visualizer_url'],
+                'visualizer_params': [s['visualizer_params']]
+              }
+            ]
+          )
+          Typhoeus.post(EP_VALUES,
+            headers: {'Content-Type'=> "application/json"},
+            body: [
+              {
+                'uuid': uuid,
+                'sensor': s['name'],
+                'timestamp': notification.dig('timestamp'),
+                'value': s['value']
+              }
+            ]
+          )
+        end
+      when "activity/receiving"
+        sensors = JSON.parse(notification.dig('sensors') || '[]')
+        tdoc = notification.dig('received')
+        sensors.each do |s|
+          sid = Digest::MD5.hexdigest(uuid + '_' + s['name'])
+          Typhoeus.post(EP_SENSORS,
+            headers: {'Content-Type'=> "application/json"},
+            body: [
+              {
+                'uuid': uuid,
+                'sensor': s['name'],
+                'task': notification.dig('activity'),
+                'visualizer_url': s['visualizer_url'],
+                'visualizer_params': (s['visualizer_params'].nil? || s['visualizer_params'].empty? ? [] : [s['visualizer_params']])
+              }
+            ]
+          )
+          status, result = Riddl::Client.new(s['extractor_url']).post [
+            Riddl::Parameter::Simple.new('data',JSON.pretty_generate(tdoc)),
+            Riddl::Parameter::Simple.new('what',s['extractor_arg'])
+          ]
+          if status >= 200 && status < 300
+            ret = JSON::parse(result[0]&.value.read) rescue []
+            ret.each do |v,t|
+              Typhoeus.post(EP_VALUES,
+                headers: {'Content-Type'=> "application/json"},
+                body: [
+                  {
+                    'uuid': uuid,
+                    'sensor': s['name'],
+                    'timestamp': t,
+                    'value': v
+                  }
+                ]
+              )
+            end
+          end
+
+        end
+    end
+    nil
+  end
+
+  def response #{{{
+    ### save events for later replay
+    # a = {
+    #   :topic        => @p[1].value,
+    #   :event_name   => @p[2].value,
+    #   :instancenr   => @h['CPEE_INSTANCE'].split('/').last,
+    #   :notification => JSON.parse(@p[3].value)
+    # }.to_yaml
+    # File.open('events.yaml','a') do |f|
+    #   f << a
+    # end
+    topic        = @p[1].value
+    event_name   = @p[2].value
+    instancenr   = @h['CPEE_INSTANCE'].split('/').last
+    notification = JSON.parse(@p[3].value)
+    doc topic, event_name, instancenr, notification
+  end #}}}
+end