cpee-logging-xes-yaml 1.3.7 → 1.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aae51b9195c2048f4aa6bffe2e166ff929ff769060b17abd40fbe05e8c360f2
-  data.tar.gz: 9f1f40663b2f867e9d5663f1b1205c03af5357f072aaee202d46a3222e84591d
+  metadata.gz: 76b88a4c9745d8814402e6363cc334463ae162b38e005b93f524efcbf34553b6
+  data.tar.gz: 6e97d237e71d98b54f98e2e378f03f036dad8baf317a63b9913d221450eb1ce5
 SHA512:
-  metadata.gz: 204d3006b767ca4a40adf8076f63f6c176fbc054c22eb3599f1e929210f8e150f060aee7dda49853b5bd02fac5ae7f32f796037f0a2b2ba72ff5caed3f61ce0c
-  data.tar.gz: 5e6557309512c4e1ab3159ac79dc232308163f70a74b8693712da02edbfda67cc8294fc2a89f3b86c75fee4684c3f848bf165a12201bd67dad871c3cf44cad39
+  metadata.gz: 6d005ee24f4854122c4f9807caccd76916edda4c6c054fd900442c96a20f23770f1a765ea2d72cd9b55b07ab5f6661672469cc952f03e97c4f2687aec2576126
+  data.tar.gz: 0fde138a76c29754a22aabb1302bbdcd011e010bdc29a5297ffe89e343c26df5b4c23b9ac39f83e272f3806ce5e4102cd7c6cc4fb2ec7bd821df891ce09aacac

data/cpee-logging-xes-yaml.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.3.7"
+  s.version          = "1.3.19"
   s.platform         = Gem::Platform::RUBY
-  s.license          = "LGPL-3.0"
+  s.license          = "LGPL-3.0-or-later"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{server/**/*,tools/**/*,lib/**/*}'] + %w(LICENSE Rakefile cpee-logging-xes-yaml.gemspec README.md AUTHORS)
+  s.files            = Dir['{server/**/*,tools/*,lib/**/*}'] + %w(LICENSE Rakefile cpee-logging-xes-yaml.gemspec README.md AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README.md']
   s.bindir           = 'tools'
@@ -22,5 +22,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
   s.add_runtime_dependency 'json', '~> 2.1'
-  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'
+  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.86'
+  s.add_runtime_dependency 'msgpack', '~> 1.7', '>= 1.7.2'
 end

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

@@ -35,6 +35,21 @@ module CPEE
         topic      = @p[1].value
         event_name = @p[2].value
         payload    = @p[3].value.read
+
+        unless File.exist? File.join(opts[:log_dir],@h['CPEE_INSTANCE_UUID'] + '.xes.yaml')
+          notification = JSON.parse(payload)
+          log = YAML::load(File.read(opts[:template]))
+          log['log']['trace']['concept:name']                    ||= notification['instance']
+          log['log']['trace']['cpee:name']                       ||= notification['instance-name'] if notification['instance-name']
+          log['log']['trace']['cpee:instance']                   ||= notification['instance-uuid']
+          log['log']['trace']['cpee:parent_instance']            ||= notification.dig('content','attributes','parent_instance').to_i       if notification.dig('content','attributes','parent_instance')
+          log['log']['trace']['cpee:parent_instance_uuid']       ||= notification.dig('content','attributes','parent_instance_uuid')       if notification.dig('content','attributes','parent_instance_uuid')
+          log['log']['trace']['cpee:parent_instance_model']      ||= notification.dig('content','attributes','parent_instance_model')      if notification.dig('content','attributes','parent_instance_model')
+          log['log']['trace']['cpee:parent_instance_task_id']    ||= notification.dig('content','attributes','parent_instance_task_id')    if notification.dig('content','attributes','parent_instance_task_id')
+          log['log']['trace']['cpee:parent_instance_task_label'] ||= notification.dig('content','attributes','parent_instance_task_label') if notification.dig('content','attributes','parent_instance_task_label')
+          File.open(File.join(opts[:log_dir],@h['CPEE_INSTANCE_UUID']+'.xes.yaml'),'w'){|f| f.puts log.to_yaml}
+        end
+
         EM.defer do
           CPEE::Logging::forward opts, topic, event_name, payload
         end if type == 'event'
@@ -47,7 +62,7 @@ module CPEE
 
     class Overview < Riddl::Implementation #{{{
       def response
-        Riddl::Parameter::Complex.new("overview","text/xml") do
+        Riddl::Parameter::Complex.new('overview','text/xml') do
           <<-END
             <overview xmlns='http://riddl.org/ns/common-patterns/notifications-producer/2.0'>
               <topics/>

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

@@ -16,14 +16,14 @@ log:
     stream: https://cpee.org/datastream/datastream.xesext
   global:
     trace:
-      concept:name: __INVALID__
-      cpee:name: __INVALID__
+      concept:name: __NOTSPECIFIED__
+      cpee:name: __NOTSPECIFIED__
     event:
       concept:instance: -1
-      concept:name: __INVALID__
-      concept:endpoint: ''
-      id:id: ''
-      cpee:uuid: ''
+      concept:name: __NOTSPECIFIED__
+      concept:endpoint: __NOTSPECIFIED__
+      id:id: __NOTSPECIFIED__
+      cpee:uuid: __NOTSPECIFIED__
       lifecycle:transition: complete
       cpee:lifecycle:transition: activity/calling
       time:timestamp: ''

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

@@ -227,6 +227,7 @@ module CPEE
       template = opts[:template]
 
       instancenr = notification['instance']
+
       content = notification['content']
       activity = content['activity']
       parameters = content['parameters']
@@ -255,11 +256,6 @@ module CPEE
         end
       end
 
-      log = YAML::load(File.read(template))
-      log["log"]["trace"]["concept:name"] ||= instancenr
-      log["log"]["trace"]["cpee:name"] ||= notification['instance-name'] if notification['instance-name']
-      log["log"]["trace"]["cpee:instance"] ||= instance
-      File.open(File.join(log_dir,instance+'.xes.yaml'),'w'){|f| f.puts log.to_yaml} unless File.exist? File.join(log_dir,instance+'.xes.yaml')
       event = {}
       event["concept:instance"] = instancenr
       event["concept:name"] = content["label"] if content["label"]
@@ -271,16 +267,18 @@ module CPEE
       event["cpee:activity_uuid"] = content['activity-uuid'] if content['activity-uuid']
       event["cpee:instance"] = instance
       case event_name
-        when 'receiving', 'change', 'instantiation'
-          event["lifecycle:transition"] = "unknown"
+        when 'calling'
+          event["lifecycle:transition"] = "start"
         when 'done'
           event["lifecycle:transition"] = "complete"
         else
-          event["lifecycle:transition"] = "start"
+          event["lifecycle:transition"] = "unknown"
       end
       event["cpee:lifecycle:transition"] = "#{topic}/#{event_name}"
       event["cpee:state"] = content['state'] if content['state']
       event["cpee:description"] = content['dslx'] if content['dslx']
+      event["cpee:change_uuid"] = content['change_uuid'] if content['change_uuid']
+      event["cpee:exposition"] = content['exposition'] if content['exposition']
       unless parameters["arguments"]&.nil?
         event["data"] = parameters["arguments"]
       end if parameters
@@ -346,9 +344,9 @@ module CPEE
         end
       end
       if receiving && !receiving.empty?
-        event["raw"] = receiving
+        event["data"] = receiving
       end
-      event["time:timestamp"]= notification['timestamp'] || Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
+      event["time:timestamp"]= notification['timestamp'] || Time.now.xmlschema(4)
       File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
         f << {'event' => event}.to_yaml
       end

data/tools/cpee-logging-xes-yaml

@@ -58,24 +58,24 @@ TEMPLATE_XES_XML = <<-END
     <extension name="CPEE" prefix="cpee" uri="http://cpee.org/cpee.xesext"/>
     <extension name="stream" prefix="stream" uri="https://cpee.org/datastream/datastream.xesext"/>
     <global scope="trace">
-      <string key="concept:name" value="__INVALID__"/>
-      <string key="cpee:name" value="__INVALID__"/>
+      <string key="concept:name" value="__NOTSPECIFIED__"/>
+      <string key="cpee:name" value="__NOTSPECIFIED__"/>
     </global>
     <global scope="event">
-      <string key="concept:name" value="__INVALID__"/>
+      <string key="concept:name" value="__NOTSPECIFIED__"/>
       <string key="concept:instance" value="-1"/>
-      <string key="concept:endpoint" value=""/>
-      <string key="id:id" value=""/>
+      <string key="concept:endpoint" value="__NOTSPECIFIED__"/>
+      <string key="id:id" value="__NOTSPECIFIED__"/>
       <string key="lifecycle:transition" value="complete" />
       <string key="cpee:lifecycle:transition" value="activity/calling"/>
-      <date key="time:timestamp" value=""/>
+      <date key="time:timestamp" value="__NOTSPECIFIED__"/>
     </global>
     <trace/>
   </log>
 END
 
 def rec_type(it)
-  if (Time.parse(it) rescue nil)
+  if it.is_a?(String) && it =~ /^[\dT:+.-]+$/ && (Time.parse(it) rescue nil)
     'x:date'
   elsif it.is_a? Float
     'x:float'
@@ -89,14 +89,13 @@ end
 def rec_a_insert(event,node,level=0)
   event.each do |i|
     tnode = node
-    # tnode = node.add('x:string', 'key' => 'item')
     case i
       when Hash
         rec_insert(i,tnode,level+1)
       when Array
         rec_a_insert(i,tnode,level+1)
       when String
-        node.add(rec_type(i), 'key' => i, 'value' => i)
+        node.add(rec_type(i), 'key' => i, 'value' => (i.empty? ? "__UNSPECIFIED__" : i))
     end
   end
 end
@@ -105,12 +104,16 @@ def rec_insert(event,node,level=0)
   event.each do |k,v|
     case v
       when String
+        node.add(rec_type(v), 'key' => k, 'value' => (v.empty? ? "__UNSPECIFIED__" : v))
+      when Integer
+        node.add(rec_type(v), 'key' => k, 'value' => v)
+      when Float
         node.add(rec_type(v), 'key' => k, 'value' => v)
       when Array
         tnode = node.add('x:list', 'key' => k)
         rec_a_insert(v,tnode,level+1)
       when Hash
-        tnode = node.add('x:string', 'key' => k)
+        tnode = node.add('x:list', 'key' => k)
         rec_insert(v,tnode)
     end
   end
@@ -131,7 +134,7 @@ def follow(fname,io,copy,deep=0,index=nil)
       index.write " " * deep + name + " (#{tname}) - #{e.dig('log','trace','concept:name')}\n"
     end
     if e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
-      base = e.dig('event','raw')
+      base = e.dig('event','data')
       val = base.dig('CPEE-INSTANCE') rescue nil
       if val.nil?
         val = File.basename(base)
@@ -145,7 +148,7 @@ def follow(fname,io,copy,deep=0,index=nil)
 end
 
 def react(name,copy=false,deep=0,index=nil)
-  index ||= File.open('index.txt','w')
+  index ||= File.open('index.txt','a')
   if name.nil?
     help
   elsif name =~ /^https?:\/\//
@@ -170,7 +173,7 @@ def extract(path)
   if path =~ /^http.*/
     unlink = true
     text = Tempfile.new('extract-model-download')
-    request = Typhoeus::Request.new("www.example.com/huge.iso")
+    request = Typhoeus::Request.new(path)
     request.on_headers do |response|
       if response.code != 200
         raise "Request failed"
@@ -192,14 +195,14 @@ def extract(path)
   info = yaml.shift
   uuid = info.dig('log','trace','cpee:instance')
   yaml.each do |el|
-    if el['event']['id:id'] == 'external' && (el.dig('event','cpee:lifecycle:transition') == 'endpoints/change' || el.dig('event','cpee:lifecycle:transition') == 'dataelements/change'|| el.dig('event','cpee:lifecycle:transition') == 'description/change')
+    if el['event']['id:id'] == 'external' && (el.dig('event','cpee:lifecycle:transition') == 'endpoints/change' || el.dig('event','cpee:lifecycle:transition') == 'attributes/change' || el.dig('event','cpee:lifecycle:transition') == 'dataelements/change'|| el.dig('event','cpee:lifecycle:transition') == 'description/change')
       changes.push(el)
     end
   end
 
   changes.sort! { |a,b| DateTime.strptime(a.dig('event','time:timestamp'),'%Y-%m-%dT%H:%M:%S.%L%:z') <=> DateTime.strptime(b.dig('event','time:timestamp'),'%Y-%m-%dT%H:%M:%S.%L%:z') }
 
-  de = ep = desc = nil
+  de = ep = desc = at = nil
   counter = 0
   changes.each do |change|
     if change.dig('event','cpee:lifecycle:transition') == 'dataelements/change'
@@ -208,11 +211,14 @@ def extract(path)
     if change.dig('event','cpee:lifecycle:transition') == 'endpoints/change'
       ep = change.dig('event','data')
     end
+    if change.dig('event','cpee:lifecycle:transition') == 'attributes/change'
+      at = change.dig('event','data')
+    end
     if change.dig('event','cpee:lifecycle:transition') == 'description/change'
       desc = change.dig('event','cpee:description')
     end
     if change.dig('event','cpee:lifecycle:transition') == 'description/change' || change.dig('event','cpee:lifecycle:transition') == 'endpoints/change'
-      yield uuid, de, ep, desc, counter if block_given?
+      yield uuid, de, ep, desc, at, counter if block_given?
       counter += 1
     end
   end
@@ -220,10 +226,11 @@ def extract(path)
   text.close
   text.unlink if unlink
 
-  [de, ep, desc]
+  [de, ep, desc, at]
 end
 
 exname = File.basename($0)
+attr = {}
 
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
@@ -231,6 +238,7 @@ ARGV.options { |opt|
   opt.banner = "Usage:\n#{opt.summary_indent}#{exname} new [DIR] | view [URI] | copy [URI]\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
+  opt.on("--add [STRING]", "-a [STRING]", "Add attribute for extract-all and extract-last. Example: -a 'filter=me'") { |a| x,y = a.split('='); attr[x] = y }
 	opt.on("")
   opt.on(wrap("\"#{exname}\" will be call \"c\" in the examples for each command."))
   exname = 'c'
@@ -257,7 +265,7 @@ if (ARGV.length < 1 || ARGV.length > 2)
 elsif ARGV.length == 2
   command = ARGV[0]
   path = ARGV[1]
-elsif ARGV.length == 1 && %w{index extract-last to-xes-xml}.include?(ARGV[0])
+elsif (ARGV.length == 1 || ARGV.length == 2) && %w{index extract-last to-xes-xml}.include?(ARGV[0])
   command = ARGV[0]
 end
 
@@ -273,11 +281,12 @@ elsif command == 'view'
 elsif command == 'copy'
   react path, true
 elsif command == 'extract-all'
-  extract(path) do |uuid, de, ep, desc, version|
+  extract(path) do |uuid, de, ep, desc, at, version|
     xml = XML::Smart.string('<testset xmlns="http://cpee.org/ns/properties/2.0"><executionhandler>ruby</executionhandler></testset>')
     dataelements = xml.root().add('dataelements')
     endpoints = xml.root().add('endpoints')
     description = xml.root().add('description').add(XML::Smart.string('<description xmlns="http://cpee.org/ns/description/1.0"/>').root())
+    attributes = xml.root().add('attributes')
     unless de.nil?
       de.each do |d|
         dataelements.add(d['name'],d['value'])
@@ -288,6 +297,11 @@ elsif command == 'extract-all'
         endpoints.add(e['name'],e['value'])
       end
     end
+    unless at.nil?
+      at.each do |e|
+        attributes.add(e['name'],e['value'])
+      end
+    end
     unless desc.nil?
       description.replace_by(XML::Smart.string(desc).root())
     end
@@ -304,12 +318,13 @@ elsif command == 'extract-last'
   end
 
   path.each do |f|
-    de, ep, desc = extract(f)
+    de, ep, desc, at = extract(f)
 
     xml = XML::Smart.string('<testset xmlns="http://cpee.org/ns/properties/2.0"><executionhandler>ruby</executionhandler></testset>')
     dataelements = xml.root().add('dataelements')
     endpoints = xml.root().add('endpoints')
     description = xml.root().add('description').add(XML::Smart.string('<description xmlns="http://cpee.org/ns/description/1.0"/>').root())
+    attributes = xml.root().add('attributes')
     unless de.nil?
       de.each do |d|
         dataelements.add(d['name'],d['value'])
@@ -323,8 +338,18 @@ elsif command == 'extract-last'
     unless desc.nil?
       description.replace_by(XML::Smart.string(desc).root())
     end
+    unless at.nil?
+      attr.each do |k,v|
+        attributes.add(k,v)
+      end
+      at.each do |e|
+        unless attr.keys.include? e['name']
+          attributes.add(e['name'],e['value'])
+        end
+      end
+    end
 
-    File.write(f + '.model', xml.to_s)
+    File.write(File.basename(f) + '.model', xml.to_s)
   end
 elsif command == 'index'
   path = if path

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.19
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Florian Stertz
-autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -48,7 +47,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.86
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +57,27 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.86
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -81,9 +100,8 @@ files:
 - tools/cpee-logging-xes-yaml
 homepage: http://cpee.org/
 licenses:
-- LGPL-3.0
+- LGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Logging for the cloud process execution engine (cpee.org)
 test_files: []