cpee 2.0.24 → 2.0.25

data/cpee.gemspec

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

data/lib/callbacks.xml

@@ -20,11 +20,16 @@
       <xi:include href="callbacks/callbacks.rng"/>
     </parameter>
   </message>
+  <message name="callback">
+    <parameter name="callback" mimetype="application/json"/>
+  </message>
 
   <resource>
     <doc:documentation>xb</doc:documentation>
     <get in="*" out="callbacks"/>
     <resource>
+      <get out="callback"/>
+      <delete/>
       <put in="*"/>
     </resource>
   </resource>

data/lib/cpee/controller.rb

@@ -52,6 +52,34 @@ module CPEE
       @opts = opts
       @instance = nil
       @loop_guard = {}
+
+      @callback_keys = {}
+      @psredis = @opts[:redis_dyn].call
+
+      Thread.new do
+        @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
+          on.pmessage do |pat, what, message|
+            if pat == 'callback-response:*' && @callback_keys.has_key?(what[18..-1])
+              index = message.index(' ')
+              mess = message[index+1..-1]
+              instance = message[0...index]
+              m = JSON.parse(mess)
+              resp = []
+              m['content']['values'].each do |e|
+                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]))
+                end
+              end
+              @callback_keys[what[18..-1]].send(:callback,resp,m['content']['headers'])
+            end
+            if pat == 'callback-end:*'
+              @callback_keys.delete(what[13..-1])
+            end
+          end
+        end
+      end
     end
 
     attr_reader :id
@@ -160,33 +188,7 @@ module CPEE
 
     def callback(hw,key,content)
       CPEE::Message::send(:callback,'activity/content',base,@id,uuid,info,content.merge(:key => key),@redis)
-
-      psredis = @opts[:redis_dyn].call
-      response = nil
-      Thread.new do
-        psredis.subscribe('callback-response:' + key, 'callback-end:' + key) do |on|
-          on.message do |what, message|
-            if what == 'callback-response:' + key
-              index = message.index(' ')
-              mess = message[index+1..-1]
-              instance = message[0...index]
-              m = JSON.parse(mess)
-              resp = []
-              m['content']['values'].each do |e|
-                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]))
-                end
-              end
-              hw.send(:callback,resp,m['content']['headers'])
-            end
-            if what == 'callback-end:' + key
-              psredis.unsubscribe
-            end
-          end
-        end
-      end
+      @callback_keys[key] = hw
     end
 
     def cancel_callback(key)

data/lib/cpee/implementation_callbacks.rb

@@ -7,6 +7,8 @@ module CPEE
       Proc.new do
         run CPEE::Callbacks::Callbacks, id, opts if get
         on resource do
+          run CPEE::Callbacks::GetCallback, id, opts if get
+          run CPEE::Callbacks::DelCallback, id, opts if delete
           run CPEE::Callbacks::ExCallback, id, opts if put
         end
       end
@@ -26,6 +28,57 @@ module CPEE
           ret.to_s
         end
       end
+    end # }}}
+
+    class GetCallback < Riddl::Implementation #{{{
+      def response
+        id = @a[0]
+        opts = @a[1]
+        callback = @r[-1]
+
+        res = {}
+        res[:uuid] = opts[:redis].get("instance:#{id}/callback/#{callback}/uuid")
+        res[:type] = opts[:redis].get("instance:#{id}/callback/#{callback}/type")
+        res[:position] = opts[:redis].get("instance:#{id}/callback/#{callback}/position")
+        res[:label] = opts[:redis].get("instance:#{id}/callback/#{callback}/label")
+
+        Riddl::Parameter::Complex.new("callback","application/json",JSON.generate(res))
+      end
+    end #}}}
+
+    class DelCallback < Riddl::Implementation #{{{
+      def response
+        id = @a[0]
+        opts = @a[1]
+        callback = @r[-1]
+
+        if opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'callback'
+          CPEE::Message::send(
+            :'callback-end',
+            callback,
+            opts[:url],
+            id,
+            {},
+            {},
+            {},
+            opts[:redis]
+          )
+        elsif opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'vote'
+          CPEE::Message::send(
+            :'vote-response',
+            callback,
+            opts[:url],
+            id,
+            {},
+            {},
+            'true',
+            opts[:redis]
+          )
+        else
+          @status = 503
+        end
+        nil
+      end
     end #}}}
 
     class ExCallback < Riddl::Implementation #{{{

data/server/handlerwrappers/default.rb

@@ -50,6 +50,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @handler_returnOptions = nil
     @handler_activity_uuid = Digest::MD5.hexdigest(Kernel::rand().to_s)
     @label = ''
+    @guard_files = []
+    @guard_items = []
   end # }}}
 
   def prepare(readonly, endpoints, parameters, replay=false) #{{{
@@ -109,8 +111,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
     client = Riddl::Client.new(tendpoint)
 
-    @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
     @handler_passthrough = callback
+    @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
 
     status, result, headers = client.request type => params
     if status < 200 || status >= 300
@@ -261,8 +263,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
   def callback(result=nil,options={})
     @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
-    result = simplify_result(result)
-    @handler_returnValue = result
+    @guard_files += result
+    @handler_returnValue = simplify_result(result)
     @handler_returnOptions = options
     if options['CPEE_UPDATE']
       if options['CPEE_UPDATE_STATUS']
@@ -280,6 +282,16 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     end
   end
 
+  def mem_guard() #{{{
+    @guard_files.each do |p|
+      if p&.respond_to?(:close)
+        p.close
+      elsif  p&.value&.respond_to?(:close)
+        p.value.close
+      end
+    end
+  end #}}}
+
   def test_condition(mr,code)
     res = mr.instance_eval(code)
     @controller.notify("condition/eval", :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"))

data/server/resources/transformation_dslx.xsl

@@ -509,7 +509,7 @@
       <xsl:when test="child::node()[not(self::text())]">
         <!-- FUUUU, there is probably much more TODO. Updated Matthias und Juergen, we tested for ing-opcua/execute -->
         <xsl:choose>
-          <xsl:when test="child::* and name(child::*)=concat(name(.),'_item')  and count(child::*[not(name()=name(../child::*[1]))])=0">
+          <xsl:when test="child::* and name(child::*)=concat(name(.),'_item') and count(child::*[not(name()=name(../child::*[1]))])=0">
             <xsl:text>"[ </xsl:text>
             <xsl:apply-templates select="*" mode="JSONArrayItem"/>
             <xsl:text>]"</xsl:text>

data/server/routing/end.pid

@@ -1 +1 @@
-385086
+592867

data/server/routing/forward-events.pid

@@ -1 +1 @@
-385070
+592855

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-385078
+592859

data/server/routing/persist.pid

@@ -1 +1 @@
-385082
+592863

data/server/routing/persist.rb

@@ -99,11 +99,11 @@ Daemonite.new do |opts|
             end
           when 'event:transformation/change'
             opts[:redis].multi do |multi|
-              multi.set("instance:#{instance}/transformation/description/",mess.dig('content','description'))
+              multi.set("instance:#{instance}/transformation/description",mess.dig('content','description'))
               multi.set("instance:#{instance}/transformation/description/@type",mess.dig('content','description_type'))
-              multi.set("instance:#{instance}/transformation/dataelements/",mess.dig('content','dataelements'))
+              multi.set("instance:#{instance}/transformation/dataelements",mess.dig('content','dataelements'))
               multi.set("instance:#{instance}/transformation/dataelements/@type",mess.dig('content','dataelements_type'))
-              multi.set("instance:#{instance}/transformation/endpoints/",mess.dig('content','endpoints'))
+              multi.set("instance:#{instance}/transformation/endpoints",mess.dig('content','endpoints'))
               multi.set("instance:#{instance}/transformation/endpoints/@type",mess.dig('content','endpoints_type'))
             end
           when 'event:status/change'

data/server/server.pid

@@ -1 +1 @@
-385042
+592827

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.0.25
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -116,7 +116,9 @@ files:
 - INSTALL.md
 - README.md
 - Rakefile
+- cockpit/CPEE.xml
 - cockpit/README
+- cockpit/Signavio.xml
 - cockpit/config.json
 - cockpit/contrib/graph_example.svg
 - cockpit/contrib/legend.svg
@@ -133,6 +135,7 @@ files:
 - cockpit/graph.html
 - cockpit/index.html
 - cockpit/js/details.js
+- cockpit/js/edit.js
 - cockpit/js/instance.js
 - cockpit/js/model.js
 - cockpit/js/parameters.js
@@ -189,10 +192,6 @@ files:
 - cockpit/templates.legacy/convert_preset.rb
 - cockpit/templates.legacy/testsets.xml
 - cockpit/templates.legacy/transformations.xml
-- cockpit/templates/.CPEE.xml
-- cockpit/templates/.Signavio.xml
-- cockpit/templates/.templates.xml
-- cockpit/templates/.transformations.xml
 - cockpit/templates/Coopis 2010.xml
 - cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml
 - cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml
@@ -353,54 +352,6 @@ files:
 - cockpit/themes/default/symbols/stop.svg
 - cockpit/themes/default/symbols/terminate.svg
 - cockpit/themes/default/theme.js
-- cockpit/themes/diana/rngs/alternative.rng
-- cockpit/themes/diana/rngs/call.rng
-- cockpit/themes/diana/rngs/callmanipulate.rng
-- cockpit/themes/diana/rngs/choose.rng
-- cockpit/themes/diana/rngs/closed_loop.rng
-- cockpit/themes/diana/rngs/closed_loop_cancel.rng
-- cockpit/themes/diana/rngs/closed_loop_control.rng
-- cockpit/themes/diana/rngs/closed_loop_measuring.rng
-- cockpit/themes/diana/rngs/critical.rng
-- cockpit/themes/diana/rngs/escape.rng
-- cockpit/themes/diana/rngs/group.rng
-- cockpit/themes/diana/rngs/loop.rng
-- cockpit/themes/diana/rngs/manipulate.rng
-- cockpit/themes/diana/rngs/otherwise.rng
-- cockpit/themes/diana/rngs/parallel.rng
-- cockpit/themes/diana/rngs/parallel_branch.rng
-- cockpit/themes/diana/rngs/scripts.rng
-- cockpit/themes/diana/rngs/stop.rng
-- cockpit/themes/diana/rngs/terminate.rng
-- cockpit/themes/diana/symbols/alternative.svg
-- cockpit/themes/diana/symbols/arrow.svg
-- cockpit/themes/diana/symbols/call.svg
-- cockpit/themes/diana/symbols/callmanipulate.svg
-- cockpit/themes/diana/symbols/choose.svg
-- cockpit/themes/diana/symbols/choose_exclusive.svg
-- cockpit/themes/diana/symbols/choose_inclusive.svg
-- cockpit/themes/diana/symbols/closed_loop.svg
-- cockpit/themes/diana/symbols/closed_loop_cancel.svg
-- cockpit/themes/diana/symbols/closed_loop_control.svg
-- cockpit/themes/diana/symbols/closed_loop_measuring.svg
-- cockpit/themes/diana/symbols/complex.svg
-- cockpit/themes/diana/symbols/critical.svg
-- cockpit/themes/diana/symbols/end.svg
-- cockpit/themes/diana/symbols/escape.svg
-- cockpit/themes/diana/symbols/event_end.svg
-- cockpit/themes/diana/symbols/loop.svg
-- cockpit/themes/diana/symbols/manipulate.svg
-- cockpit/themes/diana/symbols/otherwise.svg
-- cockpit/themes/diana/symbols/parallel.svg
-- cockpit/themes/diana/symbols/parallel_branch.svg
-- cockpit/themes/diana/symbols/parallel_branch_compact.svg
-- cockpit/themes/diana/symbols/parallel_branch_event.svg
-- cockpit/themes/diana/symbols/parallel_branch_normal.svg
-- cockpit/themes/diana/symbols/scripts.svg
-- cockpit/themes/diana/symbols/start.svg
-- cockpit/themes/diana/symbols/stop.svg
-- cockpit/themes/diana/symbols/terminate.svg
-- cockpit/themes/diana/theme.js
 - cockpit/themes/extended/rngs/alternative.rng
 - cockpit/themes/extended/rngs/call.rng
 - cockpit/themes/extended/rngs/callmanipulate.rng
@@ -590,6 +541,7 @@ files:
 - cockpit/themes/preset/symbols/terminate.svg
 - cockpit/themes/preset/theme.js
 - cockpit/track.html
+- cockpit/transformations.xml
 - contrib/Screenshot at 2011-09-28 02:38:11.png
 - contrib/logo2-small.png
 - contrib/logo2.png

data/cockpit/edit.html

@@ -1 +0,0 @@
-./index.html

data/cockpit/templates/.templates.xml

@@ -1,13 +0,0 @@
-<testsets>
-  <testset>UR-VUE 2020</testset>
-  <testset>UR-VUE 2020 Solution View</testset>
-  <testset>UR-VUE 2020 Solution Baseline</testset>
-  <testset>UR-VUE 2020 Solution NN</testset>
-  <testset>Coopis 2010</testset>
-  <testset>IUPC arXiv:1104.3609 P34 1</testset>
-  <testset>IUPC arXiv:1104.3609 P34 2</testset>
-  <testset>IUPC arXiv:1104.3609 P34 3</testset>
-  <testset>Worklist</testset>
-  <testset>Track Test</testset>
-  <testset>Track Test Local</testset>
-</testsets>

data/cockpit/themes/diana/rngs/alternative.rng

@@ -1,25 +0,0 @@
-<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="condition" rngui:label="Condition">
-    <data type="string" rngui:label="Condition"/>
-  </attribute>
-  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
-    <element name="_probability_min" rngui:label="Min in %">
-      <data type="integer" rngui:label="Percent 0-100">
-        <param name="minInclusive">1</param>
-        <param name="maxInclusive">100</param>
-      </data>
-    </element>
-    <element name="_probability_max" rngui:label="Max in %">
-      <data type="integer" rngui:label="Percent 0-100">
-        <param name="minInclusive">1</param>
-        <param name="maxInclusive">100</param>
-      </data>
-    </element>
-    <element name="_probability_avg" rngui:label="Avg in %">
-      <data type="integer" rngui:label="Percent 0-100">
-        <param name="minInclusive">1</param>
-        <param name="maxInclusive">100</param>
-      </data>
-    </element>
-  </element>
-</element>

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

@@ -1,149 +0,0 @@
-<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
-    <data type="string" rngui:readonly="true"/>
-  </attribute>
-  <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
-  </attribute>
-  <element name="parameters" rngui:header="Properties">
-    <element name="label" rngui:label="Label">
-      <data type="string" rngui:label="Short description of the task"/>
-    </element>
-    <element name="method" rngui:label="Method">
-      <choice>
-        <value>:post</value>
-        <value>:get</value>
-        <value>:put</value>
-        <value>:delete</value>
-      </choice>
-    </element>
-    <element name="arguments" rngui:header="Arguments">
-      <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label="Name" rngui:labeltype="xml">
-          <anyName/>
-          <data type="string" rngui:label="Value"/>
-        </element>
-      </zeroOrMore>
-    </element>
-    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
-
-      <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Sensor">
-          <element name="sensor">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="extractor_url" rngui:label="Extractor Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="extractor_params" rngui:label="Extractor Arguments:">
-              <zeroOrMore rngui:label="Create Extractor Argument Pairs">
-                <element rngui:label="Name">
-                  <anyName/>
-                  <data type="string" rngui:label="Value / Json"/>
-                </element>
-              </zeroOrMore>
-            </element>
-            <element name="visualizer_url" rngui:label="Visualizer Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="visualizer_params" rngui:label="Visualizer Arguments">
-              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
-                <element rngui:label="Name">
-                  <anyName/>
-                  <data type="string" rngui:label="Value / Json"/>
-                </element>
-              </zeroOrMore>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-
-      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Impact Profile">
-          <element name="ip">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="target" rngui:label="Target Value">
-              <data type="string" rngui:label="Value"/>
-            </element>
-            <element name="ifs" rngui:header="Impact Factors">
-              <zeroOrMore rngui:label="Add Impact Factor">
-                <element name="if">
-                  <element name="ivs" rngui:header="Impact Values">
-                    <zeroOrMore rngui:label="Add Impact Value ">
-                      <element name="iv">
-                        <element name="extractor_url" rngui:label="Extractor Url">
-                          <data type="string" rngui:label="Service Url + Parameters"/>
-                        </element>
-                        <element name="aggregator_url" rngui:label="Aggregator Url">
-                          <data type="string" rngui:label="Service Url + Parameters"/>
-                        </element>
-                      </element>
-                    </zeroOrMore>
-                  </element>
-                  <element name="aggregator_url" rngui:label="Impact Function Url">
-                    <data type="string" rngui:label="Service Url + Parameters"/>
-                  </element>
-                </element>
-              </zeroOrMore>
-            </element>
-            <element name="vfunc_url" rngui:label="Violation Function Url">
-              <data type="string" rngui:label="Service Url + Parameters"/>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-
-    </element>
-    <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
-      <element name="url" rngui:label='HTML Snippet'>
-        <data type="string" rngui:label="url to report snippet"/>
-      </element>
-    </element>
-  </element>
-  <element name="annotations" rngui:header="Annotations">
-    <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
-        <data type="float" rngui:label="[0,1]"/>
-      </element>
-      <element name="_timing_avg" rngui:label="Avg in min">
-        <data type="float" rngui:label="Minutes"/>
-      </element>
-      <element name="explanations" rngui:header="Explanations">
-        <zeroOrMore rngui:label="Add Explanation">
-          <element name="explanation">
-            <element name="type" rngui:label="Type">
-              <choice>
-                <value>&gt;</value>
-                <value>&lt;</value>
-              </choice>
-            </element>
-            <element name="deviation" rngui:label="Deviation">
-              <data type="float" rngui:label="Minutes"/>
-            </element>
-            <element name="behaviour" rngui:label="Behaviour">
-              <choice>
-                <value>Immediately</value>
-                <value>Wait until next</value>
-                <value>Use grace period value</value>
-              </choice>
-            </element>
-            <element name="grace" rngui:label="Grace Period" rngui:default="0.0">
-              <data type="float" rngui:label="Minutes"/>
-            </element>
-            <element name="text" rngui:label="Explanation">
-              <data type="string" rngui:label="Patterns"/>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-    </element>
-    <element name="_notes" rngui:header="Notes" rngui:fold="closed">
-      <element name="_notes_general" rngui:label="General">
-        <text rngui:wrap="true" rngui:label="Notes"/>
-      </element>
-    </element>
-  </element>
-</element>