rbbt-util 5.30.5 → 5.30.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa5b1545b1a92199d163bf398ca973c6aa3d78ab37cc724b988e007c87824b3b
-  data.tar.gz: 6cd3ce80ea589fb97a211ebe1d2973dd7c0d3f93b1ccefe10b9ecefbc77ff515
+  metadata.gz: 48bec783cd5a61ffb37cb7cd80379ed9c90bbcfd2cecdb756cff0f2efd6240ed
+  data.tar.gz: 9da9e93fc5c89be3ca8f57f87ca2808f298e6a300cd13dfff4dd602a2bf1b4b0
 SHA512:
-  metadata.gz: d8246d2a2686cc38086800fb6c30949bba93c8e78b7feac220b710a4e80f66858f979c5ea41de0beb67aeefd29de045e2315c3b50128f448bfef521ce3d52e15
-  data.tar.gz: 26559322cae3bfb736565e8da0c7e63c3b006c793ab5cda8ec37a04fabfa460001bae6d7da8164ccd310730b81553d1d3b5a1d14cee9e6929793329ce508ec59
+  metadata.gz: 23976e1fcc0a216a822fa19ec9f4510d87f5d19d334245f6cea87746d3b7b85cf3c41110ce2d36f3a793f6e5af1bd08ad2299ad0acb08f11efe711f3417da590
+  data.tar.gz: 2fe9f8dbea015d105076926f0407c1029a400f6eafce7f17edca075e4975ef5a4bd455f416cad4e2d4deadb2d7486988c00500687fc41352020ba71fa07a0f0c

data/lib/rbbt/hpc/orchestrate.rb

@@ -8,7 +8,7 @@ module HPC
       task_name = job.overriden.to_s if Symbol === job.overriden
 
       defaults = rules["defaults"] || {}
-      defaults.merge(rules[workflow]["defaults"] || {}) if rules[workflow]
+      defaults = defaults.merge(rules[workflow]["defaults"] || {}) if rules[workflow]
 
       job_rules = IndiferentHash.setup(defaults.dup)
 
@@ -53,62 +53,159 @@ module HPC
       job_rules
     end
 
-    def self.get_job_dependencies(job, job_rules)
+    def self.get_job_dependencies(job, job_rules = nil)
       deps = job.dependencies || []
       deps += job.input_dependencies || []
       deps
     end
 
-    def self.orchestrate_job(job, options, skip = false, seen = {})
-      return if job.done?
-      return unless job.path.split("/")[-4] == "jobs"
-      seen[:orchestration_target_job] ||= job
-
-      options.delete "recursive_clean"
-      options.delete "clean_task"
-      options.delete "clean"
-      options.delete "tail"
-      options.delete "printfile"
-      options.delete "detach"
+    def self.get_recursive_job_dependencies(job)
+      deps = get_job_dependencies(job) 
+      (deps + deps.collect{|dep| get_recursive_job_dependencies(dep) }).flatten
+    end
 
-      rules = YAML.load(Open.read(options[:orchestration_rules])) if options[:orchestration_rules]
-      rules ||= {}
-      IndiferentHash.setup(rules)
+    def self.piggyback(job, job_rules, job_deps)
+      return false unless job_rules["skip"]
+      final_deps = job_deps - job_deps.collect{|dep| get_recursive_job_dependencies(dep)}.flatten.uniq
+      final_deps = final_deps.reject{|dep| dep.done? && dep.status == :noinfo }
+      return final_deps.first if final_deps.length == 1
+      return false
+    end
 
+    def self.get_chains(job, rules, chains = {})
       job_rules = self.job_rules(rules, job)
+      job_deps = get_job_dependencies(job)
+
+      input_deps = []
+      job.rec_dependencies.each do |dep|
+        input_deps.concat dep.input_dependencies
+      end
 
-      deps = get_job_dependencies(job, job_rules)
+      job_deps.each do |dep|
+        input_deps.concat dep.input_dependencies
+        get_chains(dep, rules, chains)
+      end
 
-      dep_ids = deps.collect do |dep|
-        skip_dep = job_rules["chain_tasks"] &&
+      job_deps.select do |dep|
+        chained = job_rules["chain_tasks"] &&
           job_rules["chain_tasks"][job.workflow.to_s] && job_rules["chain_tasks"][job.workflow.to_s].include?(job.task_name.to_s)  &&
           job_rules["chain_tasks"][dep.workflow.to_s] && job_rules["chain_tasks"][dep.workflow.to_s].include?(dep.task_name.to_s) 
 
-        deps = seen[dep.path] ||= self.orchestrate_job(dep, options, skip_dep, seen)
-        if job.canfail_paths.include? dep.path
-          [deps].flatten.compact.collect{|id| ['canfail', id] * ":"}
+        dep_skip = dep.done? && ! input_deps.include?(dep) && self.job_rules(rules, dep)["skip"] 
+        chained || dep_skip
+      end.each do |dep|
+        chains[job] ||= [] 
+        chains[job] << dep 
+        chains[job].concat chains[dep] if chains[dep]
+      end
+
+      chains
+    end
+
+    def self.workload(job, rules, chains, options, seen = nil)
+      return [] if job.done?
+      if seen.nil?
+        seen = {}
+        target_job = true
+      end
+
+      job_rules = self.job_rules(rules, job)
+      job_deps = get_job_dependencies(job)
+
+      chain = chains[job]
+      chain = chain.reject{|j| seen.include? j.path} if chain
+      chain = chain.reject{|dep| dep.done? } if chain
+      piggyback = piggyback(job, job_rules, job_deps)
+      dep_ids = job_deps.collect do |dep|
+        seen[dep.path] ||= nil if chain && chain.include?(dep) #&& ! job.input_dependencies.include?(dep) 
+        next_options = IndiferentHash.setup(options.dup)
+        if piggyback and piggyback == dep
+          next_options[:piggyback] ||= []
+          next_options[:piggyback].push job
+          ids = workload(dep, rules, chains, next_options, seen)
         else
-          deps
+          next_options.delete :piggyback
+          ids = workload(dep, rules, chains, next_options, seen)
         end
-      end.flatten.compact.uniq
 
-      skip = true if job_rules[:skip]
-      return dep_ids if skip and seen[:orchestration_target_job] != job
+        ids = [ids].flatten.compact.collect{|id| ['canfail', id] * ":"} if job.canfail_paths.include? dep.path
+
+        seen[dep.path] = ids
+        ids
+      end.compact.flatten.uniq
+
+      return seen[job.path] || dep_ids if seen.include?(job.path)
+
+      if piggyback and seen[piggyback.path]
+        return seen[job.path] = seen[piggyback.path] 
+      end
 
       job_rules.delete :chain_tasks
       job_rules.delete :tasks
       job_rules.delete :workflow
       
-      config_keys = job_rules.delete(:config_keys)
 
       job_options = IndiferentHash.setup(options.merge(job_rules).merge(:slurm_dependencies => dep_ids))
       job_options.delete :orchestration_rules
+
+      config_keys = job_rules.delete(:config_keys)
       if config_keys
         config_keys.gsub!(/,\s+/,',') 
         job_options[:config_keys] = job_options[:config_keys] ? config_keys + "," + job_options[:config_keys] : config_keys
       end
 
-      run_job(job, job_options)
+      if options[:piggyback]
+        manifest = options[:piggyback].uniq
+        manifest += [job]
+        manifest.concat chain if chain
+
+        job = options[:piggyback].first
+
+        job_rules = self.job_rules(rules, job)
+        new_config_keys = self.job_rules(rules, job)[:config_keys]
+        if new_config_keys
+          new_config_keys = new_config_keys.gsub(/,\s+/,',') 
+          job_options[:config_keys] = job_options[:config_keys] ? new_config_keys + "," + job_options[:config_keys] : new_config_keys
+        end
+
+        job_options.delete :piggyback
+      else
+        manifest = [job]
+        manifest.concat chain if chain
+      end
+
+      manifest.uniq!
+
+      job_options[:manifest] = manifest.collect{|j| j.task_signature }
+
+      job_options[:config_keys] = job_options[:config_keys].split(",").uniq * "," if job_options[:config_keys]
+
+      if options[:dry_run]
+        puts Log.color(:magenta, "Manifest: ") + Log.color(:blue, job_options[:manifest] * ", ") + " - tasks: #{job_options[:task_cpus] || 1} - time: #{job_options[:time]} - config: #{job_options[:config_keys]}"
+        puts Log.color(:yellow, "Deps: ") + Log.color(:blue, job_options[:slurm_dependencies]*", ")
+        job_options[:manifest].first
+      else
+        run_job(job, job_options)
+      end
     end
+
+
+    def self.orchestrate_job(job, options)
+      options.delete "recursive_clean"
+      options.delete "clean_task"
+      options.delete "clean"
+      options.delete "tail"
+      options.delete "printfile"
+      options.delete "detach"
+
+      rules = YAML.load(Open.read(options[:orchestration_rules])) if options[:orchestration_rules]
+      rules ||= {}
+      IndiferentHash.setup(rules)
+
+      chains = get_chains(job, rules)
+
+      workload(job, rules, chains, options)
+    end
+
   end
 end

data/lib/rbbt/hpc/slurm.rb

@@ -21,6 +21,8 @@ module HPC
       exclusive        = options.delete :exclusive
       highmem          = options.delete :highmem
 
+      manifest         = options.delete :manifest
+
       queue            = options.delete(:queue) || Rbbt::Config.get('queue', :slurm_queue, :slurm, :SLURM, :default => 'bsc_ls')
       task_cpus        = options.delete(:task_cpus) || 1
       nodes            = options.delete(:nodes) || 1
@@ -258,6 +260,10 @@ EOF
 workflow write_info --recursive --force=false --check_pid "$step_path" slurm_job $SLURM_JOB_ID 
 EOF
 
+      header +=<<-EOF if manifest
+#MANIFEST: #{manifest * ", "}
+      EOF
+
       header +=<<-EOF
 #CMD: #{rbbt_cmd}
       EOF

data/lib/rbbt/persist.rb

@@ -349,7 +349,7 @@ module Persist
 
         Open.notify_write(path)
 
-        return path if persist_options[:no_load]
+        return path if persist_options[:no_load] || type == :path
 
         res
       end

data/lib/rbbt/resource/path.rb

@@ -218,7 +218,14 @@ module Path
 
                      else
                        where = where.to_sym
-                       raise "Did not recognize the 'where' tag: #{where}. Options: #{paths.keys}" unless paths.include? where
+
+                       if paths.include? where
+                         path = paths[where]
+                       elsif where.to_s.include?("/")
+                         path = where.to_s
+                       else
+                         raise "Did not recognize the 'where' tag: #{where}. Options: #{paths.keys}" unless paths.include? where
+                       end
 
                        if where == :lib 
                          libdir = @libdir || Path.caller_lib_dir(caller_lib) || "NOLIBDIR" 
@@ -227,7 +234,6 @@ module Path
                        end
 
                        pwd = FileUtils.pwd
-                       path = paths[where]
                        path = File.join(path, "{PATH}") unless path.include? "PATH}" or path.include? "{BASENAME}"
                        path = path.
                          sub('{PKGDIR}', pkgdir).

data/lib/rbbt/tsv/manipulate.rb

@@ -717,7 +717,7 @@ module TSV
   def transpose(key_field = "Unkown ID")
     case type
     when :single, :flat
-      transpose_list self.to_list, key_field
+      self.to_list.transpose_list key_field
     when :list
       transpose_list key_field
     when :double

data/lib/rbbt/util/config.rb

@@ -90,6 +90,8 @@ module Rbbt::Config
     options = tokens.pop if Hash === tokens.last
     default = options.nil? ? nil : options[:default]
 
+    tokens = ["key:" + key] if tokens.empty?
+
     tokens = tokens.flatten
     file, _sep, line = caller.reject{|l| 
       l =~ /rbbt\/(?:resource\.rb|workflow\.rb)/ or
@@ -106,7 +108,6 @@ module Rbbt::Config
 
     entries = CACHE[key.to_s]
     priorities = {}
-    tokens = tokens + ["key:" << key.to_s]
     tokens.each do |token|
       token_prio = match entries, token.to_s
       token_prio.each do |prio, values|
@@ -145,7 +146,6 @@ module Rbbt::Config
       Rbbt::Config.load_file(Rbbt.etc.config_profile[config].find)
     else
       key, value, *tokens = config.split(/\s/)
-      tokens = ['key:' << key << '::0'] if tokens.empty?
       tokens = tokens.collect do |tok|
         tok, _sep, prio = tok.partition("::")
         prio = "0" if prio.nil? or prio.empty?

data/lib/rbbt/workflow.rb

@@ -379,7 +379,7 @@ module Workflow
     has_overriden_inputs = false
 
     inputs.each do |k,v|
-      has_overriden_inputs = true if String === k and k.include? "#"
+      #has_overriden_inputs = true if String === k and k.include? "#"
       next unless (task_inputs.include?(k.to_sym) or task_inputs.include?(k.to_s))
       default = all_defaults[k]
       next if default == v 

data/lib/rbbt/workflow/accessor.rb

@@ -382,8 +382,8 @@ module Workflow
                              else
                                task_info = d[:workflow].task_info(d[:task])
 
-                               inputs = assign_dep_inputs({}, options.merge(d[:inputs] || {}), real_dependencies, task_info) 
-                               d[:workflow]._job(d[:task], d[:jobname], inputs) 
+                               _inputs = assign_dep_inputs({}, options.merge(d[:inputs] || {}), real_dependencies, task_info) 
+                               d[:workflow]._job(d[:task], d[:jobname], _inputs) 
                              end
                        end
                        ComputeDependency.setup(d, compute) if compute
@@ -400,8 +400,8 @@ module Workflow
                          setup_override_dependency(value, dep[:workflow], dep[:task])
                        else
                          task_info = (dep[:task] && dep[:workflow]) ? dep[:workflow].task_info(dep[:task]) : nil
-                         inputs = assign_dep_inputs({}, dep[:inputs], real_dependencies, task_info)
-                         dep = dep[:workflow]._job(dep[:task], dep[:jobname], inputs)
+                         _inputs = assign_dep_inputs({}, dep[:inputs], real_dependencies, task_info)
+                         dep = dep[:workflow]._job(dep[:task], dep[:jobname], _inputs)
                        end
                      end
                    end

data/lib/rbbt/workflow/definition.rb

@@ -79,9 +79,10 @@ module Workflow
       dep = dependencies.last.join
       raise dep.get_exception if dep.error?
       set_info :result_type, dep.info[:result_type]
-      forget = config :forget_dep_tasks, :forget_dep_tasks, :default => FORGET_DEP_TASKS
+      forget = config :forget_dep_tasks, "key:forget_dep_tasks", :default => FORGET_DEP_TASKS
       if forget
-        remove = config :remove_dep_tasks, :remove_dep_tasks, :default => REMOVE_DEP_TASKS
+        remove = config :remove_dep_tasks, "key:remove_dep_tasks", :default => REMOVE_DEP_TASKS
+
         self.archive_deps
         self.copy_files_dir
         self.dependencies = self.dependencies - [dep]
@@ -92,7 +93,10 @@ module Workflow
         when 'true'
           dep.clean
         when 'recursive'
-          dep.recursive_clean
+          dep.rec_dependencies.each do |d|
+            d.clean unless config(:remove_dep, d.task_signature, d.task_name, d.workflow.to_s, :default => true).to_s == 'false'
+          end
+          dep.clean unless config(:remove_dep, dep.task_signature, dep.task_name, dep.workflow.to_s, :default => true).to_s == 'false'
         end
       else
         if Open.exists?(dep.files_dir)

data/lib/rbbt/workflow/remote_workflow/remote_step.rb

@@ -315,6 +315,11 @@ class RemoteStep < Step
     end
   end
 
+  def workflow_short_path
+    init_job unless @url
+    [@base_url, @task, @name] * "/"
+  end
+
   def short_path
     init_job unless @url
     [@task, @name] * "/"

data/lib/rbbt/workflow/step.rb

@@ -114,9 +114,13 @@ class Step
 
   def copy_files_dir
     if File.symlink?(self.files_dir)
-      realpath = Open.realpath(self.files_dir)
-      Open.rm self.files_dir
-      Open.cp realpath, self.files_dir
+      begin
+        realpath = Open.realpath(self.files_dir)
+        Open.rm self.files_dir
+        Open.cp realpath, self.files_dir
+      rescue
+        Log.warn "Copy files_dir for #{self.workflow_short_path}: " + $!.message
+      end
     end
   end
 
@@ -465,7 +469,10 @@ class Step
     self
   end
 
-  def rec_dependencies(need_run = false, seen = [])
+  #connected = true means that dependency searching ends when a result is done
+  #but dependencies are absent, meanining that the file could have been dropped
+  #in
+  def rec_dependencies(connected = false, seen = [])
 
     # A step result with no info_file means that it was manually
     # placed. In that case, do not consider its dependencies
@@ -480,9 +487,9 @@ class Step
       #next if self.done? && Open.exists?(info_file) && info[:dependencies] && info[:dependencies].select{|task,name,path| path == step.path }.empty?
       next if archived_deps.include? step.path
       next if seen.include? step.path
-      next if self.done? && need_run && ! updatable?
+      next if self.done? && connected && ! updatable?
 
-      r = step.rec_dependencies(need_run, new_dependencies.collect{|d| d.path})
+      r = step.rec_dependencies(connected, new_dependencies.collect{|d| d.path})
       new_dependencies.concat r
       new_dependencies << step
     }

data/lib/rbbt/workflow/step/accessor.rb

@@ -154,14 +154,24 @@ class Step
     @name ||= path.sub(/.*\/#{Regexp.quote task_name.to_s}\/(.*)/, '\1')
   end
 
+
   def short_path
     [task_name, name] * "/"
   end
 
+  def workflow_short_path
+    return short_path unless workflow
+    workflow.to_s + "#" + short_path
+  end
+
   def task_name
     @task_name ||= task.name
   end
 
+  def task_signature
+    [workflow.to_s, task_name] * "#"
+  end
+
   # {{{ INFO
 
   def info_file
@@ -456,7 +466,7 @@ class Step
   end
 
   def dirty_files
-    rec_dependencies = self.rec_dependencies
+    rec_dependencies = self.rec_dependencies(true)
     return [] if rec_dependencies.empty?
     canfail_paths = self.canfail_paths
 

data/lib/rbbt/workflow/step/run.rb

@@ -112,23 +112,27 @@ class Step
   end
 
   def updatable?
-    (ENV["RBBT_UPDATE_ALL_JOBS"] == 'true' || ( ENV["RBBT_UPDATE"] == "true" && Open.exists?(info_file)) && status != :noinfo && ! (relocated? && done?)) || (ENV["RBBT_UPDATE"] && ! (done? && ! Open.exists?(info_file)))
+    return true if ENV["RBBT_UPDATE_ALL_JOBS"] == 'true'
+    return false unless ENV["RBBT_UPDATE"] == "true"
+    return false unless Open.exists?(info_file)
+    return true if status != :noinfo && ! (relocated? && done?)
+    false
   end
 
   def dependency_checks
     return [] if ENV["RBBT_UPDATE"] != "true"
 
-    rec_dependencies.
+    rec_dependencies(true).
       reject{|dependency| (defined?(WorkflowRemoteClient) && WorkflowRemoteClient::RemoteStep === dependency) || Open.remote?(dependency.path) }.
       reject{|dependency| dependency.error? }.
       #select{|dependency| Open.exists?(dependency.path) || ((Open.exists?(dependency.info_file) && (dependency.status == :cleaned) || dependency.status == :waiting)) }.
-      select{|dependency| dependency.updatable? }.
+      #select{|dependency| dependency.updatable? }.
       collect{|dependency| Workflow.relocate_dependency(self, dependency)}
   end
 
   def input_checks
-    (inputs.select{|i| Step === i } + inputs.select{|i| Path === i && Step === i.resource}.collect{|i| i.resource}).
-      select{|dependency| dependency.updatable? }
+    (inputs.select{|i| Step === i } + inputs.select{|i| Path === i && Step === i.resource}.collect{|i| i.resource})
+      #select{|dependency| dependency.updatable? }
   end
 
   def checks
@@ -153,7 +157,8 @@ class Step
     canfail_paths = self.canfail_paths
     this_mtime = Open.mtime(self.path) if Open.exists?(self.path)
 
-    outdated_time = checks.select{|dep| dep.updatable? && dep.done? && Persist.newer?(path, dep.path) }
+    #outdated_time = checks.select{|dep| dep.updatable? && dep.done? && Persist.newer?(path, dep.path) }
+    outdated_time = checks.select{|dep| dep.done? && Persist.newer?(path, dep.path) }
     outdated_dep = checks.reject{|dep| dep.done? || (dep.error? && ! dep.recoverable_error? && canfail_paths.include?(dep.path)) }
 
     #checks.each do |dep| 

data/lib/rbbt/workflow/usage.rb

@@ -21,7 +21,7 @@ module Task
 
     selects = []
     if inputs.any?
-      inputs.zip(input_types.values_at(*inputs)).select{|i,t| t.to_sym == :select and input_options[i][:select_options] }.each{|i,t| selects << [i, input_options[i][:select_options]]  }
+      inputs.zip(input_types.values_at(*inputs)).select{|i,t| t.to_sym == :select && input_options[i] && input_options[i][:select_options] }.each{|i,t| selects << [i, input_options[i][:select_options]]  }
       puts SOPT.input_doc(inputs, input_types, input_descriptions, input_defaults, true)
       puts
     end

data/lib/rbbt/workflow/util/archive.rb

@@ -51,7 +51,7 @@ class Step
     end
   end
 
-  def self.job_files_for_archive(files, recursive = false)
+  def self.job_files_for_archive(files, recursive = false, skip_overriden = false)
     job_files = Set.new
 
     jobs = files.collect do |file|  
@@ -65,6 +65,8 @@ class Step
 
     jobs.each do |step|
       next unless File.exists?(step.path)
+      next if skip_overriden && step.overriden
+
       job_files << step.path
       job_files << step.info_file if File.exists?(step.info_file)
       job_files << Step.md5_file(step.path) if File.exists?(Step.md5_file step.path)
@@ -258,9 +260,9 @@ puts resource[path].find(search_path)
     end
   end
 
-  def self.purge(path, recursive = false)
+  def self.purge(path, recursive = false, skip_overriden = true)
     path = [path] if String === path
-    job_files = job_files_for_archive path, recursive
+    job_files = job_files_for_archive path, recursive, skip_overriden
 
     job_files.each do |file|
       begin

data/lib/rbbt/workflow/util/provenance.rb

@@ -91,7 +91,14 @@ class Step
         if expand_repeats
           str << Log.color(:green, Log.uncolor(prov_report(dep, offset+1, task)))
         else
-          str << Log.color(:green, " " * (offset + 1) + Log.uncolor(prov_report_msg(dep.status, dep.info[:name], dep.path, dep.info)))
+          info = dep.info  || {}
+          status = info[:status] || :missing
+          status = "remote" if Open.remote?(path) || Open.ssh?(path)
+          name = info[:name] || File.basename(path)
+          status = :unsync if status == :done and not Open.exist?(path)
+          status = :notfound if status == :noinfo and not Open.exist?(path)
+
+          str << Log.color(status == :notfound ? :blue : :green, " " * (offset + 1) + Log.uncolor(prov_report_msg(status, name, path, info)))
         end
       end
     end if step.dependencies

data/share/Rlib/util.R

@@ -484,7 +484,7 @@ rbbt.model.inpute <- function(data, formula, ...){
     data
 }
 
-rbbt.tsv.melt <- function(tsv, variable = NULL, value = NULL, key.field = NULL){
+rbbt.tsv.melt <- function(tsv, variable = NULL, value = NULL, key.field = NULL, ...){
     rbbt.require('reshape2')
     if (is.null(key.field)){ key.field = attributes(data)$key.field;}
     if (is.null(key.field)){ key.field = "ID" }
@@ -494,7 +494,7 @@ rbbt.tsv.melt <- function(tsv, variable = NULL, value = NULL, key.field = NULL){
 
     tsv[key.field] = rownames(tsv)
 
-    m <- melt(tsv)
+    m <- melt(tsv, id.vars=c(key.field), ...)
 
     names(m) <- c(key.field, variable, value)
 
@@ -784,6 +784,12 @@ rbbt.plot.venn <- function(data, a=NULL, category=NULL, fill=NULL, ...) {
     return(out)
 }
 
+rbbt.plot.upset <- function(data, variable = NULL, ...){
+  rbbt.require('UpSetR')
+  data[data == TRUE] = 1
+  return(upset(data, ...))
+}
+
 rbbt.plot.pca <- function(data, center = TRUE, scale. = TRUE, ...) {
   rbbt.require('vqv/ggbiplot')
   data <- rbbt.impute(data)

data/share/rbbt_commands/slurm/list

@@ -70,6 +70,13 @@ workdir.glob("**/command.slurm").sort_by{|f| File.mtime(f)}.each do |fcmd|
   cmd = nil
  end
 
+ if m = Open.read(fcmd).match(/#MANIFEST: (.*)/)
+  manifest = m[1]
+ else
+  manifest = nil
+ end
+
+
  if m = Open.read(fcmd).match(/# Run command\n(.*?)\n/im)
   exe = m[1].sub('step_path=$(','')
  else
@@ -145,6 +152,7 @@ workdir.glob("**/command.slurm").sort_by{|f| File.mtime(f)}.each do |fcmd|
  puts Log.color :blue, dir
  puts Log.color(:magenta, "Creation: ") << File.mtime(File.join(dir, 'command.slurm')).to_s
  puts Log.color(:magenta, "Started: ") << File.ctime(File.join(dir, 'std.err')).to_s if File.exist?(File.join(dir, 'std.err'))
+ puts Log.color(:magenta, "Manifest: ") << Log.color(:yellow, manifest) 
  puts Log.color(:magenta, "Done: ") << File.mtime(File.join(dir, 'exit.status')).to_s if File.exist?(File.join(dir, 'exit.status'))
  puts Log.color(:magenta, "Exec: ") << (exe || "Missing")
  puts Log.color(:magenta, "CMD: ") << (Log.color(:yellow, cmd) || "Missing")

data/share/rbbt_commands/workflow/server

@@ -16,6 +16,8 @@ $ rbbt workflow server [options] <Workflow>
 -B--Bind* Bind IP
 -p--port* TCP port
 -s--server* Server type:  thin, webrick, unicorn, etc
+-w--workers* Number of workers for cluster mode (puma)
+-so--server_options* Additional options for server (e.g. option1=value1;option2=value2)
 -f--finder Start server with finder functionality
 -RS--Rserve_session* Rserve session to use, otherwise start new one
 -wd--workdir* Change the working directory of the workflow
@@ -32,7 +34,6 @@ $ rbbt workflow server [options] <Workflow>
 --export_synchronous* Export workflow tasks as synchronous
 --export_exec* Export workflow tasks as exec
 --export_stream* Export workflow tasks as stream
---options* Additional options for server (e.g. option1=value1;option2=value2)
 EOF
 
 if options[:help]
@@ -108,20 +109,24 @@ TmpFile.with_file do |app_dir|
     config_ru_file = File.exist?('./workflow_config.ru') ? './workflow_config.ru' : Rbbt.share['workflow_config.ru'].find
 
 
-    if options[:options]
-      options[:options].split(";").each do |pair|
+    if options[:server_options]
+      options[:server_options].split(";").each do |pair|
         name, _sep, value = pair.partition("=")
         name = name[1..-1].to_sym if name[0] == ':'
+        value = value.to_i if value =~ /^\d+$/
+        value = true if value == "true"
+        value = false if value == "false"
         options[name] = value
       end
+      options.delete :server_options
     end
 
     case server
     when 'unicorn'
       `env RBBT_LOG=#{Log.severity.to_s} unicorn -c #{ Rbbt.share['unicorn.rb'].find } '#{config_ru_file}' -p #{options[:Port] || "2887"}`
-    when 'puma_alt'
+    when 'puma_production'
       #`puma '#{config_ru_file}' -p #{options[:Port] || "2887"} -w 3 -t 8:32 --preload`
-      `env RBBT_LOG=#{Log.severity.to_s} puma '#{config_ru_file}' -p #{options[:Port] || "2887"} -w 20 -t 10:160 --preload`
+      CMD.cmd_log("env RBBT_LOG=#{Log.severity.to_s} puma '#{config_ru_file}' -p #{options[:Port] || "2887"} -w 20 -t 10:160 --preload")
     else
       options[:config] = config_ru_file
 

data/test/rbbt/util/test_config.rb

@@ -5,8 +5,9 @@ class TestConfig < Test::Unit::TestCase
   def setup
     Rbbt::Config.set({:cpus => 30}, :test_config, :test)
     Rbbt::Config.set(:cpus, 5, "slow::2", :test)
-    Rbbt::Config.set({:token => "token"}, "token", "key:token")
+    Rbbt::Config.set({:token => "token"}, "token")
     Rbbt::Config.set(:notoken, "no_token")
+    Rbbt::Config.set({:emptytoken => "empty"})
   end
 
   def test_simple
@@ -19,8 +20,12 @@ class TestConfig < Test::Unit::TestCase
 
   def test_simple_no_token
     assert_equal "token", Rbbt::Config.get("token", "token")
-    assert_equal "token", Rbbt::Config.get("token")
-    assert_equal "no_token", Rbbt::Config.get("notoken")
+    assert_equal "no_token", Rbbt::Config.get("notoken", "key:notoken")
+    assert_equal 'token', Rbbt::Config.get("token", "key:token")
+    assert_equal 'token', Rbbt::Config.get("token")
+    assert_equal nil, Rbbt::Config.get("token", "someotherthing")
+    assert_equal "default_token", Rbbt::Config.get("token", 'unknown', :default => 'default_token')
+    assert_equal 'empty', Rbbt::Config.get("emptytoken", 'key:emptytoken')
   end
 
   def test_prio
@@ -54,6 +59,11 @@ class TestConfig < Test::Unit::TestCase
     assert_equal "V1", Rbbt::Config.get('key', 'token1', 'token2')
   end
 
+  def test_default
+    Rbbt::Config.add_entry 'key', 'V1', 'token1'
+    assert_equal "V3", Rbbt::Config.get('key', 'token2', :default => 'V3')
+  end
+
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.30.5
+  version: 5.30.10
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-07 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake