flor 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89a3c4accc6ee1eca033031352f4c6d20c9b42ffbcb44aebe3cca04b59bc128
-  data.tar.gz: 30914f85dfb1f76de1877cdb60e977eff73cb1ee31d9dfa7b893160799b4c162
+  metadata.gz: 298a6b2c9d3752b561ee8933ae00ed7a3f63682fb758dbe899097c6f7f56c00d
+  data.tar.gz: 3e2602737b9de7a452549d0f8ed34752618b1322a5508d178abe6559d549c045
 SHA512:
-  metadata.gz: 91cbcbbebccc7209554f49645a43876bf7f2743a77eac4a64ab3daf7f5fbfb8f2e7d566f6ffc03c932222aa2daf82e5674fd52a653bddd8b390b27cbb4714e1c
-  data.tar.gz: 174730b60ab5366c9cae335644ace73722ff52dc34477754020817c630dfabe1f6710846e437bbb936cb76fb4922f04d1dc2ffd2fde64f4c80924bd3dd7a629f
+  metadata.gz: 28ae10c78676391537dde7cd7e0082338650c6aeba60fbcffa2ca5a4cb2dd2f168d7ff61019472c5f6f3d2216cabfe6e9bccb7cdae4856b513e0663f4d4ec362
+  data.tar.gz: 6379738cddfc5b74d37a30fa23260924649866b49dc670f37a0540a47a5079062288851ce07306350e227d73d0fd873f2199c3ea01b3399bce61572b8cebe497

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 # CHANGELOG.md
 
 
+## flor 1.4.0  released 2021-11-10
+
+* Add :tree to Execution#to_h
+* Scaffold bin/flotojson
+
+
+## flor 1.3.1  released 2021-04-19
+
+* Fix flor_pointers var deletion mechanism (type = ' var ')
+
+
+## flor 1.3.0  released 2021-04-13
+
+* Insert a row flor_pointers for 'failure'
+
+
+## flor 1.2.2  released 2021-03-29
+
+* Include data in flor_pointers
+* Ensure flor_pointers name is a string
+
+
 ## flor 1.2.1  released 2021-03-22
 
 * If conf sto_db_logger is false, do not attach a logger to the db connection

data/lib/flor/core/node.rb

@@ -149,7 +149,7 @@ class Flor::Node
     tree = lookup_tree(Flor.parent_nid(nid))
     return tree[1][cid] if tree
 
-    #tree = lookup_tree(Flor.parent_nid(nid, true))
+    #tree = lookup_tree(Flor.parent_nid(nid, remove_subnid=true))
     #return tree[1][cid] if tree
       #
       # might become necessary at some point

data/lib/flor/core/procedure.rb

@@ -5,7 +5,7 @@ class Flor::Procedure < Flor::Node
   # "Returning vars" variables to pass back to pass upon reply.
   # In the 'receive' messages, it's a hash under the key 'rvars'.
   #
-  RVARS = %w[ idx ]
+  RVARS = %w[ idx ].freeze
 
   # Attributes that when given alone are turned to "true" attributes.
   #
@@ -13,7 +13,7 @@ class Flor::Procedure < Flor::Node
   #
   # The transformation occurs in Flor::Pro::Att ("_att").
   #
-  TRUE_ATTS = %w[ flank off disabled ]
+  TRUE_ATTS = %w[ flank off disabled ].freeze
 
   class << self
 
@@ -550,6 +550,8 @@ class Flor::Procedure < Flor::Node
     wrap_reply
   end
 
+  IF_UNLESS = %w[ _if _unless ].freeze
+
   # Grab on_error proc from incoming payload and stores it into parent node.
   #
   # Has no effect if there is no parent node.
@@ -562,7 +564,7 @@ class Flor::Procedure < Flor::Node
       @node; loop do
         pnode = parent_node(pnode)
         return unless pnode
-        break unless %w[ _if _unless ].include?(pnode['heap'])
+        break unless IF_UNLESS.include?(pnode['heap'])
       end
 
     flavour = "on_#{key}"
@@ -598,6 +600,8 @@ class Flor::Procedure < Flor::Node
     wrap('point' => 'entered', 'nid' => nid, 'tags' => ret)
   end
 
+  WRAP_KEYS = %w[ error cancel timeout ].freeze
+
   def wrap(h={})
 
     m = {}
@@ -642,7 +646,7 @@ class Flor::Procedure < Flor::Node
       # was considering passing the whole vars back (as 'varz'), but
       # it got in the way... and it might be heavy
 
-    %w[ error cancel timeout ]
+    WRAP_KEYS
       .each { |k|
         co = @node["child_on_#{k}"]
         next unless co

data/lib/flor/log.rb

@@ -343,7 +343,7 @@ module Flor
       o.puts(tree_to_s(node.lookup_tree(nid), nid, out: o)) if node
 
       o.puts "#{_c.dg}node:#{_c.yl}"
-      o.puts YAML.dump(n.merge('tree' => '(above)'))
+      o.puts n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil'
 
       o.puts "#{_c.dg}nodes:#{_c.yl}"
       o.puts nods_to_s(executor, m, opts)

data/lib/flor/parser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Flor
 
   def self.parse(input, fname=nil, opts={})
@@ -727,3 +728,4 @@ fail "don't know how to invert #{operation.inspect}" # FIXME
     sio.string
   end
 end
+

data/lib/flor/tools/flotojson.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+# flotojson.rb
+
+require 'flor'
+
+FLAGS_WITH_VALUE = []
+
+flags = {}
+files = []
+
+if (ARGV & [ '-h', '--help']).any?
+  puts
+  puts "bin/flotojson [flags] filename"
+  puts
+  puts "  turns a flor .flo process definition to its tree representation"
+  puts
+  puts "  flags:"
+  puts "    --pp   pretty prints instead of dumping as JSON"
+  puts
+  exit 0
+end
+
+args = ARGV.dup
+
+loop do
+
+  a = args.shift; break unless a
+
+  if a.size > 1 && a[0, 1] == '-'
+    flags[a] = FLAGS_WITH_VALUE.include?(a) ? a.shift : true
+  else
+    files << a
+  end
+end
+
+#STDERR.puts flags.inspect
+#STDERR.puts files.inspect
+
+#    t =
+#      tree.is_a?(String) ?
+#      Flor.parse(tree, opts[:fname] || opts[:path], opts) :
+#      tree
+#
+#    unless t
+#
+#      #h = opts.merge(prune: false, rewrite: false, debug: 0)
+#      #Raabro.pp(Flor.parse(tree, h[:fname], h))
+#        # TODO re-parse and indicate what went wrong...
+#
+#      fail ArgumentError.new(
+#        "flow parsing failed: " + tree.inspect[0, 35] + '...')
+#    end
+
+fname = files.first
+content = File.read(fname)
+tree = Flor.parse(content, fname, {})
+
+if flags['--pp']
+  pp tree
+else
+  puts JSON.dump(tree)
+end
+

data/lib/flor/unit/models/execution.rb

@@ -20,7 +20,29 @@ module Flor
     #end
 
     def nodes; data['nodes']; end
+
     def zero_node; nodes['0']; end
+
+    # Returns the nids, the lower in the tree, the earlier in the returned
+    # array.
+    #
+    def sorted_nids
+
+      nodes.keys
+        .inject([]) { |a, nid|
+          l = nid.split('_').length
+          (a[l] ||= []) << nid
+          a }
+        .compact
+        .collect(&:sort)
+        .flatten(1)
+    end
+
+    def lowest_node
+
+      nodes[sorted_nids.first]
+    end
+
     def closing_messages; data['closing_messages']; end
 
     def execution(reload=false); self; end
@@ -47,14 +69,16 @@ module Flor
 
     def full_tree
 
-      tree = nodes['0']['tree']
+      nids = sorted_nids
+      nid0 = nids.shift
 
-      #nodes.each do |nid, n|
-      #  next if nid == '0'
-      #  t = n['tree']; next unless t
-      #end
-        #
-        # FIXME
+      return nil unless nid0
+
+      tree = Flor.dup(nodes[nid0]['tree'])
+
+      nids.each { |nid|
+        next unless nid.split('_', 2).first == nid0
+        replace_sub_tree(tree, nid, nodes[nid]['tree']) }
 
       tree
     end
@@ -80,21 +104,22 @@ module Flor
       cs = m[:counts] = {}
       is = m[:nids] = { tasks: [], failures: [] }
 
-      fs = 0
-      ts = 0
+      cs[:failures] = 0
+      cs[:tasks] = 0
+      cs[:nodes] = nodes.count
+        #
       nodes.each do |k, v|
         if v['task']
-          ts += 1
+          cs[:tasks] += 1
           is[:tasks] << k
         end
         if v['failure']
-          fs += 1
+          cs[:failures] += 1
           is[:failures] << k
         end
       end
-      cs[:nodes] = nodes.count
-      cs[:failures] = fs
-      cs[:tasks] = ts
+
+      h[:tree] = full_tree
 
       h
     end
@@ -149,6 +174,30 @@ module Flor
       lookup_node(query, opts)['nid']
     end
 
+    protected
+
+    def replace_sub_tree(tree, nid, t)
+
+      return unless t
+      return if nid.index('-') # stay vanilla
+
+      snid = nid.split('_').collect(&:to_i)[1..-1]
+      a = get_child_array(tree, snid)
+
+      return unless a # shouldn't we fail?
+
+      a[snid.first] = Flor.dup(t)
+    end
+
+    def get_child_array(tree, snid)
+
+      return nil if tree.nil?
+      return nil if snid.length < 1
+      return nil unless tree[1].is_a?(Array)
+      return tree[1] if snid.length == 1
+      n = snid.shift; get_child_array(tree[1][n], snid)
+    end
+
     class << self
 
       def by_status(s)

data/lib/flor/unit/scheduler.rb

@@ -242,18 +242,18 @@ module Flor
       end
     end
 
+    RETURN_KEYS = %w[ exid nid payload tasker cause ].freeze
+
     def return(message)
 
-      m =
+      queue(
         if message['point'] == 'failed'
           message
         else
           message
-            .select { |k, _| %w[ exid nid payload tasker cause ].include?(k) }
+            .select { |k, _| RETURN_KEYS.include?(k) }
             .merge!('point' => 'return')
-        end
-
-      queue(m)
+        end)
 
       nil
     end
@@ -432,7 +432,7 @@ module Flor
       ex ? ex.execution : nil
     end
 
-    DUMP_KEYS = %w[ timestamp executions timers traps pointers ]
+    DUMP_KEYS = %w[ timestamp executions timers traps pointers ].freeze
 
     # Dumps all or some of the executions to a JSON string.
     # See Scheduler#load for importing.
@@ -598,6 +598,8 @@ module Flor
       puts(on_start_exc(ex))
     end
 
+    PREP_KEYS = %w[ exid name nid payload on_receive_last ].freeze
+
     def prepare_message(point, args)
 
       h = args
@@ -612,7 +614,7 @@ module Flor
       opts = {}
 
       h.each do |k, v|
-        if %w[ exid name nid payload on_receive_last ].include?(k)
+        if PREP_KEYS.include?(k)
           msg[k] = v
         else
           opts[k.to_sym] = v

data/lib/flor/unit/storage.rb

@@ -12,8 +12,9 @@ module Flor
       :status, :ctime, :mtime, :cunit, :munit
         ].freeze
     POINTER_COLUMNS = [
-      :domain, :exid, :nid, :type, :name, :value, :ctime, :cunit
-        ].freeze
+      :domain, :exid, :nid, :type, :name, :value, :ctime, :cunit,
+        :content
+          ].freeze
 
     attr_reader :unit, :db, :models
 
@@ -219,6 +220,9 @@ module Flor
       raise err
     end
 
+    CRECON_STATUSES = %w[ created consumed ].freeze
+    RESCON_STATUSES = %w[ reserved consumed ].freeze
+
     def load_messages(exe_count)
 
       exe_count += 2
@@ -229,12 +233,12 @@ module Flor
         _exids_being_processed =
           @db[:flor_messages]
             .select(:exid)
-            .exclude(status: %w[ created consumed ])
+            .exclude(status: CRECON_STATUSES)
         _exids =
           @db[:flor_messages]
             .select(:exid)
             .exclude(exid: _exids_being_processed)
-            .exclude(status: %w[ reserved consumed ])
+            .exclude(status: RESCON_STATUSES)
             .limit(exe_count)
         @db[:flor_messages]
           .where(exid: _exids, status: 'created')
@@ -317,7 +321,7 @@ module Flor
       []
     end
 
-    POINTS_TO_ARCHIVE = %w[ terminated failed ceased ]
+    POINTS_TO_ARCHIVE = %w[ terminated failed ceased ].freeze
 
     def consume(messages)
 
@@ -685,6 +689,8 @@ module Flor
         # done in update_pointers
     end
 
+    FP_TYPES = %w[ var ].freeze
+
     def update_pointers(exe, status, now)
 
 # Q  Should we archive old pointers?
@@ -700,7 +706,7 @@ module Flor
 
       @db[:flor_pointers]
         .where(exid: exid)
-        .where(Sequel.|({ type: %w[ var ] }, Sequel.~(nid: exe['nodes'].keys)))
+        .where(Sequel.|({ type: FP_TYPES }, Sequel.~(nid: exe['nodes'].keys)))
         .delete
           #
           # Delete all pointer to vars, their value might have changed,
@@ -713,28 +719,57 @@ module Flor
       pointers = exe['nodes']
         .inject([]) { |a, (nid, node)|
 
+          # add a pointer for each tag
+
           ts = node['tags']
           ts.each { |t|
             a << [ dom, exid, nid, 'tag', t, nil, now, u, nil ] } if ts
 
+          # add a pointer for each var (if nid == '0')
+
           vs = nid == '0' ? node['vars'] : nil
           vs.each { |k, v|
             case v; when Numeric, String, TrueClass, FalseClass, NilClass
-              a << [ dom, exid, '0', 'var', k, v.to_s, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, v.to_s, now, u, v ]
             when Array, Hash
               s = '(array)'; s = '(object)' if v.is_a?(Hash)
-              a << [ dom, exid, '0', 'var', k, s, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, s, now, u, v ]
             else
-              a << [ dom, exid, '0', 'var', k, nil, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, nil, now, u, v ]
             end } if vs
 
+          # add a pointer for the task if any
+
           if ta = node['task']
             tasker = ta['tasker']
-            name = ta['name']
+            n = ta['name']; name = n.is_a?(String) ? n : JSON.dump(n)
             content = { message: node['message'], atts: node['atts'] }
             a << [ dom, exid, nid, 'tasker', tasker, name, now, u, content ]
           end
 
+          # add a pointer for the error if any
+
+          if fa = node['failure']
+
+#puts "-" * 80; pp node; puts "-" * 80
+            a <<
+              if er = fa['error']
+                ni = fa['from'] || nid # not nid /!\
+                nam = "#{er['kla']} l#{er['lin']}"
+                val = er['msg']
+                con = { error: fa, nid: ni }
+                [ dom, exid, ni, 'failure', nam, val, now, u, con ]
+              else
+                nam = fa['tasker'] || 'failure'
+                val = [ fa['attl'] || [], fa['attd'] || {} ]
+                  .collect(&:inspect).join(' ')
+                con = { error: fa, nid: nid }
+                [ dom, exid, nid, 'failure', nam, val, now, u, con ]
+              end
+          end
+
+          # done
+
           a }
 
       cps = @db[:flor_pointers] # current pointers
@@ -746,29 +781,22 @@ module Flor
           #
           # don't insert when already inserted
 
-      if pointer_columns.include?(:content)
-        pointers.each { |ptr|
-          c = ptr[8]; ptr[8] = to_blob(c) if c }
-      else
-        pointers.each { |ptr|
-          ptr.pop }
-      end
+      pointers.each { |ptr| c = ptr[8]; ptr[8] = to_blob(c) if c }
 
       @db[:flor_pointers]
         .import(
-          pointer_columns,
+          POINTER_COLUMNS,
           pointers)
     end
 
-    def pointer_columns
-
-      @pointer_columns ||=
-        if @db[:flor_pointers].columns.include?(:content)
-          POINTER_COLUMNS + [ :content ]
-        else
-          POINTER_COLUMNS
-        end
-    end
+    #def pointer_columns
+    #  @pointer_columns ||=
+    #    if @db[:flor_pointers].columns.include?(:content)
+    #      POINTER_COLUMNS + [ :content ]
+    #    else
+    #      POINTER_COLUMNS
+    #    end
+    #end
 
     def determine_type_and_schedule(message)
 

data/lib/flor.rb

@@ -16,7 +16,7 @@ require 'dense'
 
 module Flor
 
-  VERSION = '1.2.1'
+  VERSION = '1.4.0'
 end
 
 require 'flor/colours'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -249,6 +249,7 @@ files:
 - lib/flor/to_string.rb
 - lib/flor/tools/env.rb
 - lib/flor/tools/firb.rb
+- lib/flor/tools/flotojson.rb
 - lib/flor/tools/shell.rb
 - lib/flor/tools/shell_out.rb
 - lib/flor/tt.rb