rbbt-rest 1.8.25 → 1.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d94205be99dfeac0ffe678e45b23cc1f6e592f
-  data.tar.gz: e1e590b519a84abfcd467daf4573705fa6a3ca0f
+  metadata.gz: 660ca19306712d0233b9fc9caeb67fb166c16f69
+  data.tar.gz: 6c37c87f3333c8bb538fd14fa6a72ea0a1a821ef
 SHA512:
-  metadata.gz: 1986918134ca39a2224950aec966d85e1bba14ab6799e4bdc189441fa2c6b9ec59092d82ff27918ccfff0d144e358585b9766f426c6bfc8a28fd65c459df403a
-  data.tar.gz: 92da3b162bc8329fbc45857674cef69de8f48e64e2f52856ef826a95363a5e6395f13b0bc95253f00c804f28e3628fc1e19b4a708495c868e4395f25312fee89
+  metadata.gz: fdba8983cc51c120f21c8a486564fcd5c8605f420d724cf050f2c3c670fa50fe46e6ed86f83f80a0e2da1dd1cef09fc0167089815d056273e53adecf882452f1
+  data.tar.gz: b5ba98578091a76aa2814d8fe1b3d73116c74ae4dfea51266dbb5478089542d45917ed83a04f8ad3eb8ef96d84f11e77084b6c04b1b61c32d0e858e0167666fd

data/lib/rbbt/rest/entity/render.rb

@@ -17,6 +17,8 @@ module EntityRESTHelpers
 
     raise "Unknown entity type: #{ type }" if entity_class.nil?
 
+    raise "Entity type not supported in REST: #{ type }" unless entity_class.include? Entity::REST
+
     entity_annotations = {}
     entity_class.annotations.each do |annotation|
       value = consume_parameter annotation, params

data/lib/rbbt/rest/workflow.rb

@@ -48,7 +48,7 @@ module Sinatra
           content_type "application/json"
 
           @can_stream = ENV["RBBT_WORKFLOW_TASK_STREAM"]  == 'true'
-          {:exec => workflow.exec_exports, :synchronous => workflow.synchronous_exports, :asynchronous => workflow.asynchronous_exports, :can_stream => !!@can_stream}.to_json
+          {:stream => workflow.stream_exports, :exec => workflow.exec_exports, :synchronous => workflow.synchronous_exports, :asynchronous => workflow.asynchronous_exports, :can_stream => !!@can_stream}.to_json
         else
           raise "Unsupported format specified: #{ format }"
         end
@@ -145,6 +145,7 @@ module Sinatra
 
         job = workflow.load_id(File.join(task, job))
 
+        abort_job(workflow, job) and halt 200 if update.to_s == "abort"
         clean_job(workflow, job) and halt 200 if update.to_s == "clean"
         recursive_clean_job(workflow, job) and halt 200 if update.to_s == "recursive_clean"
 
@@ -162,7 +163,11 @@ module Sinatra
               when error
                 error_for job
               when (exec_type == :asynchronous or exec_type == :async)
-                wait_on job
+                if @format == 'html'
+                  wait_on job
+                else
+                  halt 202
+                end
               else
                 job.join
                 raise RbbtRESTHelpers::Retry

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

@@ -34,7 +34,7 @@ module WorkflowRESTHelpers
       :exec
     when workflow.synchronous_exports.include?(task)
       :synchronous
-    when workflow.asynchronous_exports.include?(task)
+    when (workflow.asynchronous_exports.include?(task) or workflow.stream_exports.include?(task))
       :asynchronous
     else
       raise "Access denied: no known export type for #{ workflow }##{ task }."
@@ -152,12 +152,14 @@ module WorkflowRESTHelpers
   end
 
   def stream_job(job, job_url = nil)
+    job.clean if job.recoverable_error?
+
     unless job.started? or job.done?
-      job.run(:stream) 
+      job.fork(:stream) 
       job.soft_grace
     end
 
-    raise job.messages.last if job.error?
+    raise "Error in #{job.path}: " + job.messages.last if job.error?
 
     s = TSV.get_stream job
 
@@ -259,10 +261,15 @@ module WorkflowRESTHelpers
     end
   end
 
+  def abort_job(workflow, job)
+    job.abort
+    halt 200, "Aborted #{ job.path }"
+  end
+
+
   def clean_job(workflow, job)
     job.clean
 
-
     if format == :jobname
       halt 200, job.name
     elsif ajax

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

@@ -87,6 +87,7 @@ class StreamWorkflowTask
       begin
         copy_until_boundary(stream, sin, boundary)
       rescue
+        Log.exception $!
       end
     end
 
@@ -101,16 +102,17 @@ class StreamWorkflowTask
     
     job.clean if job.aborted?
 
-    execution_type = case
-                     when workflow.exec_exports.include?(task)
-                       "exec"
-                     when workflow.synchronous_exports.include?(task)
-                       "synchronous"
-                     when workflow.asynchronous_exports.include?(task)
-                       "asynchronous"
-                     else
-                       raise "No known export type for #{ workflow } #{ task }. Accesses denied"
-                     end 
+    execution_type = type_of_export(workflow, task)
+    #execution_type = case
+    #                 when workflow.exec_exports.include?(task)
+    #                   "exec"
+    #                 when workflow.synchronous_exports.include?(task)
+    #                   "synchronous"
+    #                 when workflow.asynchronous_exports.include?(task)
+    #                   "asynchronous"
+    #                 else
+    #                   raise "No known export type for #{ workflow } #{ task }. Accesses denied"
+    #                 end 
 
     execution_type = "exec" if inputs["_cache_type"] == 'exec'
 
@@ -121,11 +123,11 @@ class StreamWorkflowTask
       when "sync", "synchronous", "async", "asynchronous"
         if job.done? or job.started?
           done_consumer = Thread.new do
-            Misc.consume_stream(stream, false)
+            Misc.consume_stream(stream)
           end
           job.join unless job.done?
         else
-          job.run(:stream)
+          job.fork(:stream)
         end
       else
         raise "Unknown execution_type: #{execution_type}"

metadata

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