rbbt-rest 1.8.13 → 1.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b04163cbc85792c0d0051c0db5a1d0fe660cccab
-  data.tar.gz: 1dbc02c47f8557a8cdc5344fda9cb1fd638591ea
+  metadata.gz: 0849239a178b0971b589cdd302a6f47ece9fe14f
+  data.tar.gz: 21e387a903f58bd462b2972c708a637b36ccf987
 SHA512:
-  metadata.gz: 2e4d467e0a73c5b785ffc323b82623ffaa483b8ac816caeaac349ff38b12098be3714952da97507d7a6ae3d107a5eafc82336e83baba21ddeb3ff1849f7a08da
-  data.tar.gz: e6d983292f0703baddc62e5279fea29f0077c49d2e485d056dce53769d2583980cf995cde5557f5355b8434d06156b559006cee5a22b6721fcbce65e38e21d3e
+  metadata.gz: dd81011658ccc8782697a636c85aca7c782dbffb3eccd74d7643ae379aa66e67e6e80018bc61609329b75bb9dbdf3b455e22337f996426c45c63ff4b181d35b3
+  data.tar.gz: 1d8eeb288a895e5c53b1beb10db68fa32b91a7d40abf3bfaa6173ee70359348cb92e2d0c360c5834245954369c11eeb2d4cf52b2c096b682d895b36003fc0959

data/lib/rbbt/rest/common/misc.rb

@@ -195,12 +195,18 @@ module RbbtRESTHelpers
     end
   end
 
-  def prepare_input(params, input, type)
+  def prepare_input(params, input, type, stream = false)
     value = consume_parameter(input, params)
     param_file = consume_parameter(input.to_s + '__param_file', params)
 
     param_file, value = value, nil if Hash === value and value.include? :tempfile
 
+    if stream and param_file
+      filename = param_file[:head].match(/filename="(.*?)"\r\n/)[1]
+      io = param_file[:tempfile].open
+      return ConcurrentStream.setup(io, :filename => filename)
+    end
+
     return nil if value.nil? and param_file.nil?
 
     fixed_value = fix_input(type, value, param_file)

data/lib/rbbt/rest/workflow/jobs.rb

@@ -52,10 +52,12 @@ module WorkflowRESTHelpers
   def prepare_job_inputs(workflow, task, params)
     inputs = workflow.task_info(task)[:inputs]
     input_types = workflow.task_info(task)[:input_types]
+    input_options = workflow.task_info(task)[:input_options]
 
     task_inputs = {}
     inputs.each do |input|
-      task_inputs[input] = prepare_input(params, input, input_types[input])
+      stream = input_options.include?(input) and input_options[input][:stream]
+      task_inputs[input] = prepare_input(params, input, input_types[input], stream)
     end
 
     task_inputs
@@ -149,7 +151,7 @@ module WorkflowRESTHelpers
     end
   end
 
-  def stream_job(job)
+  def stream_job(job, job_url = nil)
     unless job.started? or job.done?
       job.run(:stream) 
       job.soft_grace
@@ -163,6 +165,8 @@ module WorkflowRESTHelpers
 
     Misc.consume_stream(s, true, sin)
 
+    headers "RBBT-STREAMING-JOB-URL" =>  job_url if job_url
+
     halt 200, sout
   end
 
@@ -184,7 +188,9 @@ module WorkflowRESTHelpers
         job.clean 
       end
 
-      stream_job(job)
+      job_url = File.join("/", workflow.to_s, task, job.name)
+
+      stream_job(job, job_url)
 
     when :synchronous, :sync
       if update == :reload

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.13
+  version: 1.8.14
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake