rbbt-rest 1.8.71 → 1.8.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8414a3fe54af9c718109a0d9721eeaa9e2ba4a5
-  data.tar.gz: ddb1b9f145f9609c7334830c933668c3b7ba8833
+  metadata.gz: 01b41fc4829f3daa31e56ccab431a410a8e25161
+  data.tar.gz: 9f0c0bae34075dadd5aee70f1df6f4392e8511f2
 SHA512:
-  metadata.gz: 85b6145e42a9c0a61fc4f28174e187fd86fc087910febabfbd7230e2d5e1815cde612b8f7626458b4f77e3f33aa732069d2d2aade68b281e9297fc2d06f10c94
-  data.tar.gz: b2c14d4eb9dcf749a11ec1216b1cb33c1e2099358ff7516891501d82cc2fc93ff94921e428e647fcc96db522a3d2cd00c760add2cdff26a83e8a568ce3d72540
+  metadata.gz: 680d163eae5da9a05db563a86b4f8ac7d28ac235a61d09112784872d9f1a940d513762e7521e296428e00cbe61781039d048cabdf625ab06351bf68aa9538f80
+  data.tar.gz: d66b91da1027832844597f946efcaab93b3b616c325c8bb8b8f14c5f4fea6a1ce788bcf94fdb85c3dcedaec01925e96bd1e5a0fadfd09cdcc8a15d99b557e64f

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

@@ -15,7 +15,7 @@ module Sinatra
         target_url = request.env["REQUEST_URI"]
         Log.warn{ "Unauthorized access to #{target_url}" }
         session[:target_url] = target_url
-        redirect '/login' 
+        redirect to('/login')
       end
 
       def logout!
@@ -59,20 +59,20 @@ module Sinatra
           session[:user] = user
           if session[:target_url]
             url = session.delete :target_url
-            redirect url
+            redirect to(url)
           else
-            redirect '/'
+            redirect to('/')
           end
         else
           Log.warn{ "Failed login attempt #{[user, pass] * ": "}" }
           session[:user] = nil
-          redirect '/login'
+          redirect to('/login')
         end
       end
       
       app.get '/logout' do
         session[:user] = nil
-        redirect '/'
+        redirect to('/')
       end
     end
   end

data/lib/rbbt/rest/graph.rb

@@ -11,7 +11,7 @@ class RbbtGraph
   def add_associations(associations, type = :edge)
     @associations[type] ||= []
     @associations[type].concat associations.collect{|i| i }
-    @associations[type].uniq
+    @associations[type].uniq!
     if AssociationItem === associations
       add_entities associations.target, associations.target_entity_type
       add_entities associations.source, associations.source_entity_type

data/lib/rbbt/rest/workflow.rb

@@ -46,15 +46,13 @@ module Sinatra
 
       get "/#{workflow.to_s}" do
         case format
-        when :html
-          workflow_render('tasks', workflow, nil, @clean_params)
         when :json
           content_type "application/json"
 
           @can_stream = ENV["RBBT_WORKFLOW_TASK_STREAM"]  == 'true'
           {: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 }"
+          workflow_render('tasks', workflow, nil, @clean_params)
         end
       end
 

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

@@ -62,7 +62,7 @@ class StreamWorkflowTask
       sout.write last_line
       last_line = line
     end
-    sout.write last_line.strip unless last_line == EOL
+    sout.write last_line.strip unless last_line.nil? or last_line == EOL
   end
 
   def get_inputs(content_type, stream)
@@ -103,34 +103,24 @@ class StreamWorkflowTask
     job.clean if job.aborted?
 
     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'
 
     begin
-      case execution_type
+      case execution_type.to_s
       when "exec", nil
         job.exec(:stream)
       when "sync", "synchronous", "async", "asynchronous"
         if job.done? or job.started?
           done_consumer = Thread.new do
-            Misc.consume_stream(stream)
+            Misc.consume_stream(clean_stream)
           end
           job.join unless job.done?
         else
-          job.fork(:stream)
+          job.run(:stream)
         end
       else
-        raise "Unknown execution_type: #{execution_type}"
+        raise "Unknown execution_type: #{Misc.inspect execution_type}"
       end
 
     rescue Aborted, Interrupt
@@ -168,18 +158,18 @@ class StreamWorkflowTask
       end
     rescue Aborted
       raise $!
-    rescue Exception
+    rescue StandardError
       Log.exception $!
       raise $!
     ensure
-      if sin.respond_to? :close_read
-        sin.close_read 
-      else
-        sin.close unless sin.closed?
-      end
-      if sin.respond_to? :threads
-        sin.threads.each do |th| th.raise Aborted end
-      end
+      #if sin.respond_to? :close_read
+      #  sin.close_read 
+      #else
+      #  sin.close unless sin.closed?
+      #end
+      #if sin.respond_to? :threads
+      #  sin.threads.each do |th| th.raise Aborted end
+      #end
 
     end
   end
@@ -197,7 +187,6 @@ class StreamWorkflowTask
         rescue Aborted, IOError
         rescue Exception
         ensure
-          sin.close_read
           s.close
         end
       end
@@ -218,7 +207,7 @@ class StreamWorkflowTask
     return false unless content_type and content_type.include? "Rbbt_Param_Stream"
 
     encoding = env["HTTP_TRANSFER_ENCODING"] 
-    return false unless encoding == "chunked"
+    return false unless encoding.nil? or encoding == "chunked"
 
     true
   end
@@ -228,14 +217,43 @@ class StreamWorkflowTask
     if do_stream(env)
       begin
 
+
         client = env["rack.hijack"]
         buffer = client.instance_variable_get('@buffer')
         tcp_io = client.call
-        Log.low "Hijacking post data #{tcp_io}"
 
+        Log.low "Hijacking post data #{tcp_io}"
         content_type = env["CONTENT_TYPE"]
+        encoding = env["HTTP_TRANSFER_ENCODING"] 
+
+        if env["rack.input"]
+          tcp_merged_io = Misc.open_pipe do |sin|
+            rinput = env["rack.input"]
+            sin << rinput.instance_variable_get("@rbuf")
+            while c = rinput.gets
+              sin.puts c
+            end
+          end
+        else
+          if encoding == "chunked"
+            Log.low "Merging chunks #{tcp_io}"
+            tcp_merged_io = Misc.open_pipe do |sin|
+              begin
+                merge_chunks(tcp_io, sin, buffer); 
+              rescue StandardError
+              ensure
+                begin
+                  tcp_io.close_read;
+                rescue
+                end
+              end
+            end
+          else
+            tcp_merged_io = tcp_io
+          end
+        end
 
-        tcp_merged_io = Misc.open_pipe do |sin| merge_chunks(tcp_io, sin, buffer) end
+        #tcp_merged_io = Misc.log_stream(tcp_merged_io)
 
         inputs, stream_input, filename, stream, boundary = get_inputs(content_type, tcp_merged_io)
 
@@ -257,19 +275,27 @@ class StreamWorkflowTask
           tcp_io.write "RBBT-STREAMING-JOB-URL: #{ job_url }\r\n"
           tcp_io.write "\r\n"
           Log.high "Comsuming response #{Misc.fingerprint tcp_io}"
-          Misc.consume_stream(out_stream, false, tcp_io)
+          begin
+            while l = out_stream.readpartial(2048)
+              tcp_io.write l
+            end
+          rescue EOFError
+          end
           Log.high "Comsumed response #{Misc.fingerprint tcp_io}"
+          out_stream.join if out_stream.respond_to? :join
         rescue Exception
           Log.exception $!
+          raise $!
         end if out_stream
 
-        tcp_io.close unless tcp_io.closed?
+        tcp_io.close_write unless tcp_io.closed?
         Log.high "Closed io #{tcp_io}"
 
         [-1, {}, []]
       rescue Exception
         Log.exception $!
-        tcp_io.write "HTTP/1.1 515\r\n"
+        job.exception $! if job
+        tcp_io.write "HTTP/1.1 500\r\n"
         tcp_io.write "Connection: close\r\n"
         tcp_io.write "\r\n"
         tcp_io.close_write

data/share/views/compass/layout.sass

@@ -27,7 +27,7 @@ body
     display: inline-block !important
 
   .dropdown.item
-    height: 100%
+    max-height: 100%
     &:before
       background: none
 

data/share/views/job_result/binary.haml

@@ -1 +1,7 @@
-%a(href="#{@path}?_format=binary") Download
+%a(href="?_format=binary") Download
+
+- if job
+  - extension = job.path.split(".").last
+  - if extension == 'png' or extension == 'jpg'
+    .figure
+      %img(src="?_format=binary" style="max-width:100%")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.71
+  version: 1.8.72
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake