cpee 1.3.214 → 1.3.215

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.214"
+  s.version          = "1.3.215"
   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/log/logoverlay.xml

@@ -4,7 +4,7 @@
   </message>
 
   <resource>
-    <get out="logresponse"/>
+    <get in='*' out="logresponse"/>
   </resource>
 
 </description>

data/log/server.rb

@@ -23,24 +23,29 @@ class Logging < Riddl::Implementation #{{{
       </global>
       <global scope="event">
         <string key="concept:name" value="__INVALID__"/>
-        <string key="concept:endpoint" value=""/>
-        <string key="id:id" value=""/>
+        <string key="concept:endpoint" value="__ENDPOINT__"/>
+        <string key="id:id" value="__ID__"/>
         <string key="lifecycle:transition" value="complete" />
-        <date key="time:timestamp" value=""/>
+        <date key="time:timestamp" value="1990-02-17T09:45:00.000+01:00"/>
       </global>
 			<classifier name="Data" keys="data_send data_received"/>
 			<classifier name="Data_Received" keys="data_received"/>
-			<classifier name="Data_Send" keys="data_send"/>
+			<classifier name="Name" keys="concept:name"/>
+			<classifier name="Endpoint" keys="concept:endpoint"/>
+			<classifier name="ID" keys="id:id"/>
+			<classifier name="Lifecycle" keys="lifecycle:transition"/>
       <trace/>
     </log>
   END
   def doc(event_name,log_dir,instancenr,notification)
+    start_x = Time.now
     uuid = notification['instance_uuid']
     activity = notification["activity"]
     parameters = notification['parameters']
     receiving = notification['received']
     Dir.mkdir(log_dir+'/'+uuid) unless Dir.exist?(log_dir+'/'+uuid)
     time_added=false
+    cpee_time =  notification['time']
     XML::Smart.modify(log_dir+'/'+uuid+'/log.xes',LOGTEMPLATE) do |xml|
       begin
         trace = xml.find("/xmlns:log/xmlns:trace").first
@@ -76,9 +81,12 @@ class Logging < Riddl::Implementation #{{{
                     node.add XML::Smart.string(v['content']).root
                   when /\/json$/
                     rec_unjson(JSON.parse(v['content']),event,"data_received")
-                  else
+                  when /\/html$/
           					list = event.add 'list', :key => "data_received"
                     list.add 'string', :key => k, :value => v['content']
+                  else 
+          					list = event.add 'list', :key => "data_received"
+                    list.add 'string', :key => k, :value => v
                 end    
               end
             end
@@ -86,12 +94,17 @@ class Logging < Riddl::Implementation #{{{
             pp receiving
           end
         end
-        event.add 'date', :key => "time:timestamp", :value => Time.now.iso8601 unless time_added
+        event.add 'date', :key => "time:timestamp", :value => cpee_time unless time_added
+        pid, size = `ps ax -o pid,rss | grep -E "^[[:space:]]*#{$$}"`.strip.split.map(&:to_i)
+        File.open(log_dir+'/'+uuid+'/memory.file',"a+"){ |f| f<< size << "\n" }
       rescue => e
         puts e.message
         puts e.backtrace
       end
     end
+    end_x = Time.now
+    x = end_x - start_x
+    File.open(log_dir+'/'+uuid+'/time.file',"a+"){ |f| f<< x << "\n" }
   end
   
 	def rec_unjson(value,list,key)
@@ -127,12 +140,12 @@ Riddl::Server.new(::File.dirname(__FILE__) + '/log.xml', :host => "coruscant.wst
   cross_site_xhr true
   log_path = "/home/demo/Projects/cpee-helpers/log/logs"
 
-  interface 'events' do
+  interface 'events' do 
 	    run Logging if post 'event'
 	    #run CB if post 'vote'
   end
   interface 'logoverlay' do |r|
-    run Riddl::Utils::FileServe, log_path + r[:h]["RIDDL_DECLARATION_PATH"]+ ".xes","text/xml" if get
+    run Riddl::Utils::FileServe, "#{log_path}#{r[:h]["RIDDL_DECLARATION_PATH"]}.xes","text/xml" if get '*'
   end
 
 

data/log/yaml/server.rb

@@ -40,6 +40,7 @@ class Logging < Riddl::Implementation #{{{
     }
   }
   def doc(event_name,log_dir,instancenr,notification)
+    x = Time.now
     log = LOGTEMPLATE
     uuid = notification['instance_uuid']
     activity = notification["activity"]
@@ -75,7 +76,12 @@ class Logging < Riddl::Implementation #{{{
     event["time:timestamp"]= Time.now.iso8601 unless time_added
     File.open(log_dir+'/'+uuid+'/log.xes',"a") do |f|
       f << {'event' => event}.to_yaml
+      pid, size = `ps ax -o pid,rss | grep -E "^[[:space:]]*#{$$}"`.strip.split.map(&:to_i)
+      File.open(log_dir+'/'+uuid+'/memory.file',"a+"){ |fl| fl<< size << "\n" }
     end
+    y = Time.now
+    z = y-x
+    File.open(log_dir+'/'+uuid+'/time.file',"a+"){ |f| f<< z << "\n" }
   end
   
 	def rec_unjson(value,list,key)

data/log/yaml/yaml.rb

@@ -4,16 +4,16 @@ require 'pp'
 
 def pbuf(buf)
   unless buf.empty?
-    pp YAML.load(buf)
-    pp '---'
+    x = YAML.load(buf)
   end
   buf.clear
+  x
 end
 
+result = []
 buf = ""
 File.open('log.xes').each do |line|
-  pbuf(buf) if line == "---\n"
+  result << pbuf(buf) if line == "---\n"
   buf += line
 end
-
-pbuf(buf)
+result << pbuf(buf)

data/server/instances/21/properties.xml

@@ -0,0 +1,156 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>6e375218-ed2b-4f53-9b8a-f4cef916d3de</uuid>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+    <theme>labels</theme>
+  </attributes>
+  <state>finished</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline>null</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>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+  </endpoints>
+  <dsl>call :a1, :bookAir, parameters: { :label =&gt; "Book Airline":method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :from, :value =&gt; data.from), ⭐(:name =&gt; :to, :value =&gt; data.to), ⭐(:name =&gt; :persons, :value =&gt; data.persons)] }, finalize: &lt;&lt;-END
+  data.airline = result.value('id')
+  data.costs += result.value('costs').to_f
+  status.update 1, 'Hotel'
+END
+parallel do
+  loop pre_test{data.persons &gt; 0}  do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, parameters: { :label =&gt; "Book Hotel":method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :to, :value =&gt; data.to)] }, finalize: &lt;&lt;-END
+        data.hotels &lt;&lt; result.value('id')
+        data.costs += result.value('costs').to_f
+      END
+    end
+    manipulate :a3, &lt;&lt;-END
+      data.persons -= 1
+    END
+  end
+end
+choose :inclusive do
+  alternative "data.costs &gt; 700" do
+    call :a4, :approve, parameters: { :label =&gt; "Approve Hotel":method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :costs, :value =&gt; data.costs)] }
+  end
+end
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <method>:post</method>
+          <label>Book Airline</label>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <label>Book Hotel</label>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose mode="inclusive">
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <label>Approve Hotel</label>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <method>:post</method>
+          <label>Book Airline</label>
+          <arguments>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
+      </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <method>:post</method>
+                <label>Book Hotel</label>
+                <arguments>
+                  <to>data.to</to>
+                </arguments>
+              </parameters>
+              <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3">data.persons -= 1</manipulate>
+        </loop>
+      </parallel>
+      <choose mode="inclusive">
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <method>:post</method>
+              <label>Approve Hotel</label>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/instances/22/properties.xml

@@ -0,0 +1,118 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>8f912edc-d4a7-4793-8499-073860043452</uuid>
+    <info>Linear</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>finished</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <x/>
+  </dataelements>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl>call :a1, :timeout, parameters: { :label =&gt; "Step 1", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }, finalize: &lt;&lt;-END
+  data.x += "a1,"
+END
+call :a2, :timeout, parameters: { :label =&gt; "Step 2", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a2,"
+END
+call :a3, :timeout, parameters: { :label =&gt; "Step 3", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a3,"
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 1</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 2</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 3</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 1</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 2</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 3</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/instances/23/properties.xml

@@ -0,0 +1,118 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>9b7b1c9c-f895-4780-aae0-43e15654f400</uuid>
+    <info>Linear</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>finished</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <x>a2,a3,</x>
+  </dataelements>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl>call :a1, :timeout, parameters: { :label =&gt; "Step 1", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }, finalize: &lt;&lt;-END
+  data.x += "a1,"
+END
+call :a2, :timeout, parameters: { :label =&gt; "Step 2", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a2,"
+END
+call :a3, :timeout, parameters: { :label =&gt; "Step 3", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a3,"
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 1</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 2</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 3</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 1</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 2</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <label>Step 3</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>