rbbt-rest 1.8.102 → 1.8.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f16494209da8fb67e9c50d88a83c7c7dbe43fa5e
-  data.tar.gz: 45f99f411f935649369407f20f5bcb2beecfd94e
+  metadata.gz: 72db9cac8d95433bd7eaa8ceaa4751642898af76
+  data.tar.gz: 5749497c739b60c8f07517009b46a45824736e05
 SHA512:
-  metadata.gz: 3bd350989880dd42ebf31be8918f21501330c1fa8810fced0517b3b3e06b4fc6edaac954b740b31f346661f795aaee70183469e60432eafc33c5169a1e119f5c
-  data.tar.gz: e6a20d51c05a748fbe047bbd2bdf304dbc9a285f19cebcc2646994f0f8fa6ffb771f6bc24538c7e540ff8cc86bfa6d17388d5619ee23c73d10d6020efe68fe61
+  metadata.gz: 6c7de30acecf251bb220d557f67f5b81cdc91db7c11a74e17518823918b3788a96d17c8d46ea7b6b560a9a49dc126089f97f038515ab9fb903dbd658763f1a94
+  data.tar.gz: 0f6da7889bcd4095811b4a66b478b5cd5f8fd8c44099ab52f4b3322ff3a7ba482b3a16a275fe62b933277ffcb83bcb7479b6a6856578a943ee74967bf491bf57

data/lib/rbbt/rest/workflow.rb

@@ -153,7 +153,7 @@ module Sinatra
 
         execution_type = execution_type(workflow, task)
 
-        job = workflow.load_id(File.join(task, job))
+        job = workflow.fast_load_id(File.join(task, job))
 
         halt 404, "Job not found: #{job.path} (#{job.status})" if job.status == :noinfo and not job.done?
 
@@ -230,6 +230,28 @@ module Sinatra
         case format
         when :html
           workflow_render('job_info', workflow, task, :job => job, :info => job.info)
+        when :input_bundle
+          task_info = workflow.task_info(task)
+          input_types = task_info[:input_types]
+          task_inputs = task_info[:inputs]
+          TmpFile.with_file do |basedir|
+            dir = File.join(basedir, 'inputs')
+            job.recursive_inputs.zip(job.recursive_inputs.fields).each do |value,name|
+              next unless task_inputs.include? name
+              next if value.nil?
+              path = File.join(dir, name.to_s)
+              type = input_types[name]
+              if type == :array
+                Open.write(path, value * "\n")
+              else
+                Open.write(path, value.to_s)
+              end
+            end
+            filename = File.join(basedir, job.clean_name + '.input_bundle.tar.gz')
+            content_type "application/tar+gzip"
+            Misc.consume_stream(Misc.tarize(dir), false, filename)
+            send_file filename, :filename => File.basename(filename)
+          end
         when :json
           halt 200, {}.to_json if not_started
           content_type "application/json"
@@ -263,7 +285,7 @@ module Sinatra
 
         execution_type = execution_type(workflow, task)
 
-        job = workflow.load_id(File.join(task, job))
+        job = workflow.fast_load_id(File.join(task, job))
 
         case format
         when :html
@@ -285,7 +307,7 @@ module Sinatra
 
         execution_type = execution_type(workflow, task)
 
-        job = workflow.load_id(File.join(task, job))
+        job = workflow.fast_load_id(File.join(task, job))
 
         path = job.file(filename)
         #require 'mimemagic'
@@ -313,7 +335,7 @@ module Sinatra
       delete "/#{workflow.to_s}/:task/:job" do
         task = consume_parameter(:task)
         job  = consume_parameter(:job)
-        job  = workflow.load_id(File.join(task, job))
+        job = workflow.fast_load_id(File.join(task, job))
 
         raise Workflow::TaskNotFoundException.new workflow, task unless workflow.tasks.include? task.to_sym
 

data/share/views/error.haml

@@ -1,3 +1,4 @@
+- done = job.done? || job.status == :done
 .error.ui.segment.error.message
   %h5.ui.header Error on #{format_name File.basename(job.name)}
   - if job.status == :error
@@ -5,7 +6,7 @@
       %pre.error_message.ui.basic.segment.content
         = CGI.escapeHTML(job.messages[-1] || "")
   - else
-    - if (dirty_files = job.dirty_files).any?
+    - if done && (dirty_files = job.dirty_files).any?
       %pre.error_message.ui.basic.segment.content
         Job dirty. Dependencies: #{dirty_files.collect{|d| d.path} * ", "}
 
@@ -15,7 +16,7 @@
           Job out of date. Dependencies: #{job.out_of_date.collect{|d| d.path} * ", "}
       - else
         %pre.error_message.ui.basic.segment.content
-          Unknown Error    
+          Unknown Error (status: #{job.status})
     
 
 

data/share/views/job_info.haml

@@ -19,9 +19,13 @@
       .ui.header
         %h3 Inputs (recursive)
       .ui.content
+        - task_info = workflow.task_info(job.task_name)
+        - task_inputs = task_info[:inputs]
         - inputs = job.recursive_inputs
         - autofill_id = "autofill_" << Misc.digest(job.name)
         .ui.button.autofill(id=autofill_id) Auto-fill form with inputs
+        .ui.button.autofill(id=autofill_id)
+          %a(href="#{@ajax_path}?_format=input_bundle") Download input bundle
         :deferjs
           $('##{autofill_id}').click(function(){
             var inputs = #{inputs.to_hash.to_json};
@@ -38,6 +42,7 @@
           })
         %dl
           - inputs.zip(inputs.fields).each do |i,f|
+            - next unless task_inputs.include?(f)
             %dt= f
             %dd
               - case i

data/share/views/wait.haml

@@ -7,6 +7,7 @@
     overflow: auto
     text-overflow: ellipsis
 
+- progress = false
 .wait.ui.segment.info.message
   %h3.ui.header Waiting on #{format_name File.basename(job.name)}
 
@@ -80,6 +81,17 @@
     - files_url = request.env["REQUEST_URI"].sub(/\?.*/,'') + '/files'
     %a.ui.blue.button.reload(href=files_url) Files
 
+- if ! progress
+  :deferjs
+    var title = $('head title');
+    var current = title.text();
+    var newtext;
+    var pos = current.indexOf('%');
+    if (pos != -1){
+      newtext = current.slice(pos+1)
+      title.text(newtext)
+    }
+
 
 .ui.segment
   %h3.ui.header Log

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.102
+  version: 1.8.103
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake