rbbt-util 5.20.16 → 5.20.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ff80d80e35fa0ba2bbdc6fb626a00ae0097973
-  data.tar.gz: eae7437a6901578f908d32bdadf109c339be8794
+  metadata.gz: 4c41cee8649e66a887dc5fbdab8f2a6a123a7c18
+  data.tar.gz: 5e74310b2dbca57f155c6a302a18f5753df9f901
 SHA512:
-  metadata.gz: caf52df7da1aac95ec53d5883c1a49f26170bdb95f09b039321e435078b74969abdcbecb594b12e736d9a9640aebf0eb73d902a308242fc734dd537c650a0a42
-  data.tar.gz: 76592f03fe4bcfe0881a8c8e0e2e943829cda0ae03116b8c4410ee350119c9499dd829c6f407a6d2d461d33e921d650bed2b5eb68129d7784deaf54583410f39
+  metadata.gz: 97b0fe64074065c291c3db7b77cd3e27337c5e9728333001c014e0bc4fa3e344b9a07c502187d8255e565fc7b85dce915fcf2bc8a89b8437138f356b3bad7b0b
+  data.tar.gz: f5e5cdcbea2b6193d7eb1208d363a326d5d7ace4e7bc0a712b9ce2f9bd5ff2deb6411019a95274c4d871d424674329bd2318388544edb00fc52a254ea64ac510

data/lib/rbbt/rest/client/get.rb

@@ -90,7 +90,7 @@ class WorkflowRESTClient
     params = params.merge({ :_format => 'jobname' })
     params = fix_params params
 
-    params = WorkflowRESTClient.__prepare_inputs_for_restclient(params)
+    WorkflowRESTClient.__prepare_inputs_for_restclient(params)
     name = capture_exception do
       RestClient.post(URI.encode(url), params)
     end

data/lib/rbbt/rest/client/step.rb

@@ -1,8 +1,6 @@
 class WorkflowRESTClient
 
   def self.__prepare_inputs_for_restclient(inputs)
-
-    new = IndiferentHash.setup({})
     inputs.each do |k,v|
       if v.respond_to? :path and not v.respond_to? :original_filename
         class << v
@@ -13,13 +11,9 @@ class WorkflowRESTClient
       end
 
       if Array === v and v.empty?
-        new[k] = "EMPTY_ARRAY"
-      else
-        new[k] = v
+        inputs[k] = "EMPTY_ARRAY"
       end
     end
-
-    new
   end
 
   class RemoteStep < Step
@@ -57,7 +51,7 @@ class WorkflowRESTClient
       inputs.each do |k,v|
         stream = stream_input.to_s == k.to_s
         if Step === v 
-          unless (v.done? or v.streaming? or RestClient::Step === v)
+          unless (v.done? or v.streaming?) # or RestClient::Step === v)
             v.run(true) and v.grace 
           end
 
@@ -113,6 +107,7 @@ class WorkflowRESTClient
 
     def status
       return :done if @done
+      return nil unless url or started?
       return :streaming if @streaming
       begin
         status = info[:status]
@@ -201,6 +196,7 @@ class WorkflowRESTClient
         @result = nil
         Misc.consume_stream(res, true) 
       end
+      self.info unless self.done?
       sleep 0.2 unless self.done?
       sleep 1 unless self.done?
       while not self.done?
@@ -260,7 +256,7 @@ class WorkflowRESTClient
       get_streams
       if cache_type == :stream or cache_type == :exec and stream_input and inputs[stream_input]
         task_url = URI.encode(File.join(base_url, task.to_s))
-        inputs = WorkflowRESTClient.__prepare_inputs_for_restclient(inputs)
+        WorkflowRESTClient.__prepare_inputs_for_restclient(inputs)
         task_params = inputs.merge(:_cache_type => cache_type, :jobname => base_name, :_format => [:string, :boolean, :tsv, :annotations].include?(result_type) ? :raw : :json)
         @streaming = true
         io =  WorkflowRESTClient.stream_job(task_url, task_params, stream_input, cache_type) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.20.16
+  version: 5.20.17
 platform: ruby
 authors:
 - Miguel Vazquez