cpee 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3450e319d9c6145ba438d79946c73b63f5999b0dc48f0b31337445f138b4bf57
-  data.tar.gz: 71b3a1fd7cd4c52aa8f0f17bc69f7a0d3a92ba41670dbb7a8c3890e89f33ec5c
+  metadata.gz: e90f25cd35d31ccd0b61aad184473dffa96f6a2e0fa7c986ce533c1d1338f9d3
+  data.tar.gz: 432f503b20812d156b31130a93fcddd3feedecc712c2590abc403a119d2554a2
 SHA512:
-  metadata.gz: 5a965cee9e6eba28932a6b30363b3b5cf8cbe1411d14d558f52b672c4bd771ead3fefa9dc38e162c6025260560d3ff5bc7590ac18e84136cc29ce7e6482cf42d
-  data.tar.gz: cd860d46c52d5e9892f1a9131f143f9fd351e8f7a4f806d3f63b508d864c4214b9b4dcbf1f12b8768332a9d31d06be5ea23f39dc80fe78a7f50e5aa7c7a94d18
+  metadata.gz: 3ff0adbb47bf043234b024f63b78209655d6676be80f9f0407e6f7e44e722ef680910a7286a792ec81d663c378208b409238f2c684b02c8152d9bf6c68f81cf9
+  data.tar.gz: 5d1dd6bc94d93a6c41aa3c355e6eb812f6004e3f8f978610210266b24d13ec805b130d37f4f119faa45e64e4d581f7f5b27a02560163a62af3fcd76eaf1c7063

data/cockpit/css/track.css

@@ -51,3 +51,10 @@
   white-space: nowrap;
   margin-bottom: 0.1em;
 }
+
+#current-log[href]:before {
+  content: "[";
+}
+#current-log[href]:after {
+  content: "]";
+}

data/cockpit/css/ui.css

@@ -105,9 +105,6 @@ ui-tabbed ui-tabbar ui-behind button {
 #current-graph[href]:before {
   content: "|";
 }
-#current-log[href]:before {
-  content: "|";
-}
 
 #parameters ui-content { height: 8.5em; min-height: 1.7em; }
 
@@ -146,6 +143,8 @@ ui-tabbed ui-tabbar ui-behind button {
 
 #areaexecution table.x-ui-compact tbody.exe td { height: 2.2em; }
 
+#arealog > div {  padding-left: 1em; padding-top: 1em; }
+
 #dat_endpoints {
   border-collapse:collapse;
   border-spacing:0;

data/cockpit/index.html

@@ -234,7 +234,7 @@
         <ui-tab class=""         data-tab="details" id="tabdetails">Graph</ui-tab>
         <ui-tab class="inactive" data-tab="dsl"     id="tabdsl"    >Description</ui-tab>
         <ui-tab class="inactive" data-tab="log"     id="tablog"    >Log</ui-tab>
-        <ui-behind                                                 ><a style='display:none' target='_blank' id='current-track'>T</a><a style='display:none' target='_blank' id='current-graph'>G</a><a style='display:none' target='_blank' id='current-log'>L</a></ui-behind>
+        <ui-behind                                                 ><a style='display:none' target='_blank' id='current-track'>T</a><a style='display:none' target='_blank' id='current-graph'>G</a></ui-behind>
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="details" id='graphcolumn'>
@@ -248,6 +248,7 @@
         </ui-area>
         <ui-area data-belongs-to-tab="dsl" id="areadsl" class="inactive"></ui-area>
         <ui-area data-belongs-to-tab="log" id="arealog" class="inactive"> <!--{{{-->
+          <div>Persistent Log: <a style='display:none' target='_blank' id='current-log'></a></div>
           <table id="dat_log" class="x-ui-layout"></table>
         </ui-area> <!--}}}-->
       </ui-content>

data/cockpit/js/instance.js

@@ -353,10 +353,6 @@ function monitor_instance(cin,rep,load,exec) {// {{{
       $("#current-graph").attr('href','graph.html?monitor=' + url);
       $("#current-track").show();
       $("#current-track").attr('href','track.html?monitor=' + url);
-      if ($('body').attr('current-logs')) {
-        $("#current-log").show();
-        $("#current-log").attr('href','edit.html?monitor=' + url);
-      }
       var q = $.parseQuerySimple();
       history.replaceState({}, '', '?' + (q.min || q.min=="" ? "min&" : "") + 'monitor='+url);
 
@@ -446,6 +442,14 @@ function monitor_instance_values(val) {// {{{
         var text = $(" > attributes > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
         $('#title').text(text);
         document.title = text;
+        if ($('body').attr('current-logs')) {
+          var uuid = $(" > attributes > uuid",res).text();
+          $("#current-log").show();
+          $("#current-log").attr('href',$('body').attr('current-logs') + uuid + '.xes.yaml');
+          if ($("#current-log").text() == '') {
+            $("#current-log").text(uuid + '.xes.yaml');
+          }
+        }
       }
     }
   });

data/cockpit/templates/{BPM 2020 Manual Adjust.xml → UR-VUE 2020 Manual Adjust.xml }

@@ -174,7 +174,7 @@ data.item['adjust_y'] = (data.direction_first['y'] + data.direction_second['y'])
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>BPM 2020 Manual Adjust</info>
+    <info>UR-VUE 2020 Manual Adjust</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <resource>ur51</resource>

data/cockpit/templates/{BPM 2020 Solution Baseline.xml → UR-VUE 2020 Solution Baseline.xml }

@@ -3,6 +3,13 @@
     <places>[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2],[0,3],[1,3],[0,4],[1,4],[0,5],[1,5]]</places>
   </dataelements>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <handlers>
+    <handler url="http://tango.wst.univie.ac.at:9332">
+      <votes topic='state'>change</votes>
+      <events topic='state'>change</events>
+      <events topic='task'>instantiation</events>
+    </handler>
+  </handlers>
   <endpoints>
     <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
     <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
@@ -12,7 +19,7 @@
     <get_offset_base>http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
     <get_offset_neural>http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
     <grip_and_place>http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
-    <subprocess>http://localhost:9296/url/</subprocess>
+    <subprocess>https://cpee.org/flow/start/url/</subprocess>
   </endpoints>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
@@ -108,7 +115,7 @@
                 <method>:post</method>
                 <arguments>
                   <behavior>wait_running</behavior>
-                  <url>http://localhost/flow/templates/BPM%202020%20Manual%20Adjust.xml</url>
+                  <url>https://cpee.org/flow/templates/UR-VUE%202020%20Manual%20Adjust.xml</url>
                   <init/>
                   <endpoints/>
                   <stream/>
@@ -188,7 +195,7 @@ data.item['y'] = data.items.first['y'] + data.item['adjust_y']</finalize>
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>BPM 2020 Solution Baseline</info>
+    <info>UR-VUE 2020 Solution Baseline</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <resource>ur51</resource>

data/cockpit/templates/{BPM 2020 Solution NN.xml → UR-VUE 2020 Solution NN.xml }

@@ -189,7 +189,7 @@ data.item = result[0]</finalize>
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>BPM 2020 Solution NN</info>
+    <info>UR-VUE 2020 Solution NN</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <resource>ur51</resource>

data/cockpit/templates/{BPM 2020 Solution View.xml → UR-VUE 2020 Solution View.xml }

@@ -1,6 +1,13 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <dataelements/>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <handlers>
+    <handler url="http://tango.wst.univie.ac.at:9332">
+      <votes topic='state'>change</votes>
+      <events topic='state'>change</events>
+      <events topic='task'>instantiation</events>
+    </handler>
+  </handlers>
   <endpoints>
     <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
     <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
@@ -136,7 +143,7 @@ data.item = result[0]</finalize>
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>BPM 2020 Solution View</info>
+    <info>UR-VUE 2020 Solution View</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <resource>ur51</resource>

data/cockpit/templates/UR-VUE 2020.xml

@@ -0,0 +1,26 @@
+<testset>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <handlers>
+    <handler url="http://tango.wst.univie.ac.at:9332">
+      <votes topic='state'>change</votes>
+      <events topic='state'>change</events>
+      <events topic='task'>instantiation</events>
+    </handler>
+  </handlers>
+  <endpoints>
+    <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
+    <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
+    <move_camera>http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
+    <get_items_base>http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
+    <get_items_neural>http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
+    <get_offset_base>http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
+    <get_offset_neural>http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
+    <grip_and_place>http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
+    <subprocess>https://cpee.org/flow/start/url/</subprocess>
+    <wait>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
+    <adjust>http://cpee.org/~demo/cpee-cockpit/templates/UR-VUE%202020%20Manual%20Adjust.xml</adjust>
+  </endpoints>
+  <attributes>
+    <resource>ur51</resource>
+  </attributes>
+</testset>

data/cockpit/themes/compact/rngs/closed_loop.rng

@@ -2,12 +2,18 @@
   <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
     <data type="float" rngui:label="Hz"/>
   </attribute>
-  <attribute name="behaviour" rngui:label="Interval duration overrun">
+  <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
       <value>cancel</value>
     </choice>
   </attribute>
+  <attribute name="execution" rngui:label="Measure-control cycle execution">
+    <choice>
+      <value>sequential</value>
+      <value>parallel</value>
+    </choice>
+  </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
     <element name="_probability_min" rngui:label="Min times">
       <data type="nonNegativeInteger" rngui:label="Times"/>

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

@@ -2,12 +2,18 @@
   <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
     <data type="float" rngui:label="Hz"/>
   </attribute>
-  <attribute name="behaviour" rngui:label="Interval duration overrun">
+  <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
       <value>cancel</value>
     </choice>
   </attribute>
+  <attribute name="execution" rngui:label="Measure-control cycle execution">
+    <choice>
+      <value>sequential</value>
+      <value>parallel</value>
+    </choice>
+  </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
     <element name="_probability_min" rngui:label="Min times">
       <data type="nonNegativeInteger" rngui:label="Times"/>

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

@@ -2,12 +2,18 @@
   <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
     <data type="float" rngui:label="Hz"/>
   </attribute>
-  <attribute name="behaviour" rngui:label="Interval duration overrun">
+  <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
       <value>cancel</value>
     </choice>
   </attribute>
+  <attribute name="execution" rngui:label="Measure-control cycle execution">
+    <choice>
+      <value>sequential</value>
+      <value>parallel</value>
+    </choice>
+  </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
     <element name="_probability_min" rngui:label="Min times">
       <data type="nonNegativeInteger" rngui:label="Times"/>

data/cockpit/themes/diana/theme.js

@@ -866,7 +866,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'label': function(node){
         var avg = $('> _probability_avg',$(node).children('_probability')).text();
-        var ret = [ { column: 'Label', value: 'f = ' + $(node).attr('frequency') + ' Hz (' + $(node).attr('behaviour') + ')' } ];
+        var ret = [ { column: 'Label', value: 'f = ' + $(node).attr('frequency') + ' Hz (' + $(node).attr('overrun') + ')' } ];
         if (avg != '') {
           ret.push({ column: 'Average', value: avg + '%' });
         }

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

@@ -2,12 +2,18 @@
   <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
     <data type="float" rngui:label="Hz"/>
   </attribute>
-  <attribute name="behaviour" rngui:label="Interval duration overrun">
+  <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
       <value>cancel</value>
     </choice>
   </attribute>
+  <attribute name="execution" rngui:label="Measure-control cycle execution">
+    <choice>
+      <value>sequential</value>
+      <value>parallel</value>
+    </choice>
+  </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
     <element name="_probability_min" rngui:label="Min times">
       <data type="nonNegativeInteger" rngui:label="Times"/>

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

@@ -2,12 +2,18 @@
   <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
     <data type="float" rngui:label="Hz"/>
   </attribute>
-  <attribute name="behaviour" rngui:label="Interval duration overrun">
+  <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
       <value>cancel</value>
     </choice>
   </attribute>
+  <attribute name="execution" rngui:label="Measure-control cycle execution">
+    <choice>
+      <value>sequential</value>
+      <value>parallel</value>
+    </choice>
+  </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
     <element name="_probability_min" rngui:label="Min times">
       <data type="nonNegativeInteger" rngui:label="Times"/>

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

@@ -2,12 +2,18 @@
   <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
     <data type="float" rngui:label="Hz"/>
   </attribute>
-  <attribute name="behaviour" rngui:label="Interval duration overrun">
+  <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
       <value>cancel</value>
     </choice>
   </attribute>
+  <attribute name="execution" rngui:label="Measure-control cycle execution">
+    <choice>
+      <value>sequential</value>
+      <value>parallel</value>
+    </choice>
+  </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
     <element name="_probability_min" rngui:label="Min times">
       <data type="nonNegativeInteger" rngui:label="Times"/>

data/cockpit/track.html

@@ -92,7 +92,7 @@
               </a>
             </span>
             <span> - </span>
-            <span id="title">Loading ...</span>
+            <span id="title">Loading ...</span><span> <a style='display:none' target='_blank' id='current-log'>L</a></span>
           </div>
           <div id='state'>
             <span id="state_any">

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.14"
+  s.version          = "2.0.15"
   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/cpee/controller.rb

@@ -89,7 +89,7 @@ module CPEE
     end
 
     def start
-      if vote("state/change")
+      if vote("state/change", :state => 'running')
         @thread = @instance.start
         @thread.join
       else
@@ -126,6 +126,7 @@ module CPEE
       @redis.smembers("instance:#{id}/handlers/#{handler}").each do |client|
         voteid = Digest::MD5.hexdigest(Kernel::rand().to_s)
         content[:key] = voteid
+        content[:attributes] = attributes_translated
         content[:subscription] = client
         votes << voteid
         CPEE::Message::send(:vote,what,base,@id,uuid,info,content,@redis)
@@ -140,7 +141,7 @@ module CPEE
             index = message.index(' ')
             mess = message[index+1..-1]
             m = JSON.parse(mess)
-            collect << (m['content'] == 'true' || false)
+            collect << ((m['content'] == true || m['content'] == 'true') || false)
             @votes.delete m['name']
             cancel_callback m['name']
             if collect.length >= votes.length

data/server/handlerwrappers/default.rb

@@ -24,11 +24,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
   def self::inform_state_change(arguments,newstate) # {{{
     controller = arguments[0]
-		controller.notify("state/change", :state => newstate, :timestamp => Time.now.xmlschema(3))
-  end # }}}
-  def self::inform_state_change(arguments,newstate) # {{{
-    controller = arguments[0]
-		controller.notify("state/change", :state => newstate, :timestamp => Time.now.xmlschema(3))
+		controller.notify("state/change", :state => newstate)
   end # }}}
   def self::inform_syntax_error(arguments,err,code)# {{{
     controller = arguments[0]

data/server/routing/forward-votes.rb

@@ -86,7 +86,11 @@ Daemonite.new do |opts|
                 Riddl::Parameter::Complex::new('notification','application/json',mess)
               ] rescue [ 0, [], []])
               if status >= 200 && status < 300
-                val = result[0].value.read
+                val = if result[0].class == Riddl::Parameter::Simple
+                  result[0].value
+                else
+                  result[0].value.read
+                end
                 if (headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true') || val == 'callback'
                   persist_handler instance, callback_key, m, redis
                 else # they may send true or false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -185,17 +185,17 @@ files:
 - cockpit/templates.legacy/convert_preset.rb
 - cockpit/templates.legacy/testsets.xml
 - cockpit/templates.legacy/transformations.xml
-- cockpit/templates/BPM 2020 Manual Adjust.xml
-- cockpit/templates/BPM 2020 Solution Baseline.xml
-- cockpit/templates/BPM 2020 Solution NN.xml
-- cockpit/templates/BPM 2020 Solution View.xml
-- cockpit/templates/BPM 2020.xml
 - cockpit/templates/Coopis 2010.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/Track Test Local.xml
 - cockpit/templates/Track Test.xml
+- cockpit/templates/UR-VUE 2020 Manual Adjust.xml
+- cockpit/templates/UR-VUE 2020 Solution Baseline.xml
+- cockpit/templates/UR-VUE 2020 Solution NN.xml
+- cockpit/templates/UR-VUE 2020 Solution View.xml
+- cockpit/templates/UR-VUE 2020.xml
 - cockpit/templates/Worklist.xml
 - cockpit/templates/instantiate.local/Take_Sub.xml
 - cockpit/templates/instantiate/Take_Perf.xml

data/cockpit/templates/BPM 2020.xml

@@ -1,26 +0,0 @@
-<testset>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <handlers>
-    <handler url="http://tango.wst.univie.ac.at:9332">
-      <votes topic='state'>change</votes>
-      <events topic='state'>change</events>
-      <events topic='task'>instantiation</events>
-    </handler>
-  </handlers>
-  <endpoints>
-    <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
-    <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
-    <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
-    <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
-    <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
-    <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
-    <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
-    <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
-    <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
-    <subprocess xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9296/url/</subprocess>
-    <adjust xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/cpee-cockpit/templates/BPM%202020%20Manual%20Adjust.xml</adjust>
-  </endpoints>
-  <attributes>
-    <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
-  </attributes>
-</testset>