cpee-logging-xes-yaml 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a0520ca3fb6ff780ca51eebf84811e8c9fd4df9a111fed58b09ebe63ac747f
-  data.tar.gz: 4aa2bb2e70e7944cb41155983dc39651b599ee263c7e2c8d2176b1fa40586741
+  metadata.gz: 0ba8710880804c7803eea8c127abb88ad8a6ec3d7189b2731127b620c7eaf7fa
+  data.tar.gz: acc8a90a7c55119ba9ab9f2e81e170658e39b35aa9e456fc66b69060d43f107d
 SHA512:
-  metadata.gz: 7e403723fe26acf2b0588db4ecb18e7577cbb57572b2ca38224e0c8bdec7b753ef366142b1b9ae599921c15ab53e8d73cb36d822af2b112054249538cd3781b7
-  data.tar.gz: e681120976fbe6308dafbc824eb0fc5787219f071666fe10291d27f98318bed20c584aab4a408f4a23811f4411f08192f4a955ca0ca4f20ccc500628abb1afba
+  metadata.gz: 3aca1dfc7ea1fb6cf504d9ca6692da23e017f598b9fed424cfe8caa5e25ebbb7c70bd1e32ab339d704e53d77f187a19050e18df26c4eb8dbb27e267d3d807c1d
+  data.tar.gz: 68529513a92e2e3abb3c494ccbaa4965d7230c15fce74e1567f68a45f81c9122fd8730ffed3088d65a52f8f206aa5b2fd58926d985aa72ae79c305f483e0561f

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.0.4"
+  s.version          = "1.0.6"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"

data/lib/cpee-logging-xes-yaml/logging.rb

@@ -27,7 +27,8 @@ module CPEE
     SERVER = File.expand_path(File.join(__dir__,'logging.xml'))
 
     class Handler < Riddl::Implementation #{{{
-      def doc(topic,event_name,log_dir,template,notification)
+      def doc(topic,event_name,log_dir,template,payload)
+        notification = JSON.parse(payload)
         instance = notification['instance-uuid']
         return unless instance
 
@@ -45,7 +46,7 @@ module CPEE
         event = {}
         event["concept:instance"] = instancenr
         event["concept:name"] = content["label"] if content["label"]
-        if notification["endpoint"]
+        if content["endpoint"]
           event["concept:endpoint"] = content["endpoint"]
         end
         event["id:id"] = (activity.nil? || activity == "") ? 'external' : activity
@@ -63,28 +64,14 @@ module CPEE
         event["cpee:lifecycle:transition"] = "#{topic}/#{event_name}"
         event["cpee:state"] = content['state'] if content['state']
         event["cpee:description"] = content['dslx'] if content['dslx']
-        data_send = ((parameters["arguments"].nil? ? [] : parameters["arguments"]) rescue [])
-        event["data"] = {"data_send" => data_send} unless data_send.empty?
-        if content['changed']&.any?
-          if event.has_key? "data"
-            event["data"]["data_changed"] ||= content['changed']
-          else
-            event["data"] = {"data_changer" => content['changed']}
-          end
+        unless parameters["arguments"]&.nil?
+          event["data"] = parameters["arguments"]
         end
-        if content['values']&.any?
-          if event.has_key? "data"
-            event["data"]["data_values"] ||= content['values']
-          else
-            event["data"] = {"data_values" => content['values']}
-          end
+        if content['changed']&.any?
+          event["data"] = content['values']
         end
         if receiving && !receiving.empty?
-          if event.has_key? "data"
-            event["data"]["data_received"] ||= receiving
-          else
-            event["data"] = {"data_receiver" => receiving}
-          end
+          event["raw"] = receiving
         end
         event["time:timestamp"]= event['cpee:timestamp'] || Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
         File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
@@ -98,8 +85,11 @@ module CPEE
         event_name    = @p[2].value
         log_dir       = @a[0]
         template      = @a[1]
-        notification  = JSON.parse(@p[3].value.read)
-        doc topic, event_name, log_dir, template, notification
+        notification  = @p[3].value.read
+        EM.defer do
+          doc topic, event_name, log_dir, template, notification
+        end
+        nil
       end
     end #}}}
 

data/lib/cpee-logging-xes-yaml/template.xes_yaml

@@ -1,11 +1,19 @@
 ---
 log:
+  namespaces:
+    stream: https://cpee.org/sensorstream/
+    ssn: http://www.w3.org/ns/ssn/
+    sosa: http://www.w3.org/ns/sosa/
+  xes:
+    creator: cpee.org
+    features: nested-attributes
   extension:
     time: http://www.xes-standard.org/time.xesext
     concept: http://www.xes-standard.org/concept.xesext
-    organisational: http://www.xes-standard.org/org.xesext
+    id: http://www.xes-standard.org/identity.xesext
     lifecycle: http://www.xes-standard.org/lifecycle.xesext
     cpee: http://cpee.org/cpee.xesext
+    stream: https://cpee.org/sensorstream/sensorstream.xesext
   global:
     trace:
       concept:name: __INVALID__
@@ -19,10 +27,4 @@ log:
       lifecycle:transition: complete
       cpee:lifecycle:transition: activity/calling
       time:timestamp: ''
-  classifier:
-    Data: data_send data_received data_changed data_values
-    Data_Received: data_receiver
-    Data_Send: data_send
-    Data_Changed: data_changer
-    Data_Values: data_values
   trace: {}

data/tools/cpee-logging-xes-yaml

@@ -35,20 +35,16 @@ def follow(fname,io,copy,deep=0)
     if name = e.dig('log','trace','cpee:name')
       puts " " * deep + name + " (#{File.basename(fname,'.xes.yaml')}) - #{e.dig('log','trace','concept:name')}"
     end
-    if e.dig('event','concept:endpoint') == 'https://centurio.work/flow/start/url/' && e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
+    if e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
       base = e.dig('event','data','data_receiver')
       val = base.dig('CPEE-INSTANCE') rescue nil
       if val.nil?
         val = File.basename(base)
       end
       uuid = base.dig('CPEE-INSTANCE-UUID') rescue nil
-      unless uuid
-        res = Typhoeus.get(File.join('https://centurio.work/flow/engine/',val,'/properties/values/attributes/uuid/'))
-        if res.success?
-          uuid = XML::Smart.string(res.body).find('string(/*)')
-        end
+      if uuid
+        react File.dirname(fname) + "/#{uuid}.xes.yaml",copy,deep + 2
       end
-      react File.dirname(fname) + "/#{uuid}.xes.yaml",copy,deep + 2
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Logging for the cloud process execution engine (cpee.org)