inferno_core 0.1.1 → 0.1.3.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe39c8c3dfc7f0f12192e065746ab203836ebf93a9f2f6a22a847d0d95fe0a2
-  data.tar.gz: 9b10445ccde6d340c35b39450f2cebef2b589b4473b4fe9a9c36ced3c7b20630
+  metadata.gz: e9600a6e94a1bcd029d0bbce4f3640cae2d277cee01faf89545d3ffcd3906393
+  data.tar.gz: 8f9904f1c6580f1767924392e29c05388c6283204fe057cbc8600f929b3a8f57
 SHA512:
-  metadata.gz: a64d50d36b4269fe2449b2e6a25947cd04a1fc963c7fb4ffdfb0bd417d304ec5a5149bdb5cd69bd761ab4471378d13b1dc60d8c961ba6f1729d739c3ad553337
-  data.tar.gz: 18a78ac99ac8fe75f6d1715272d6be64c51ae930c1a40cf5453c8aaefcd460739b4b6d817a776576898ffba02df449f07fbd1c7fc3468302b5d7b62f3f64e766
+  metadata.gz: 4bedf3e5026184977b81b8986da99b6a8d3b6c8f835543dc4783bd8f9d2e0f413b7ae1b1309062e5f57e97778c31242732aa30725faac9c5de46209e8c0ee161
+  data.tar.gz: 177a0b5f06d5a8dd6d636d496a74766f5f186047d10e79361c96d3be237fb45c2cc05065ca41d5dc739919d594ad094fb910b1b3a89d02bf074cfc227259399c

data/lib/inferno/apps/web/controllers/test_runs/create.rb

@@ -21,6 +21,8 @@ module Inferno
               return
             end
 
+            # TODO: This test run shouldn't be created until after the inputs
+            # and runnable are validated
             test_run = repo.create(create_params(params).merge(status: 'queued'))
             missing_inputs = test_run.runnable.missing_inputs(params[:inputs])
 

data/lib/inferno/apps/web/controllers/test_runs/destroy.rb

@@ -0,0 +1,39 @@
+module Inferno
+  module Web
+    module Controllers
+      module TestRuns
+        class Destroy < Controller
+          include Import[
+                    test_runs_repo: 'repositories.test_runs',
+                    results_repo: 'repositories.results'
+                  ]
+
+          def call(params)
+            test_run = test_runs_repo.find(params[:id])
+
+            if test_run.nil? || ['done', 'cancelling'].include?(test_run.status)
+              # If it doesn't exist, already finished, or currently being cancelled
+              self.status = 204
+              return
+            end
+
+            test_run_is_waiting = (test_run.status == 'waiting')
+            test_runs_repo.mark_as_cancelling(params[:id])
+
+            if test_run_is_waiting
+              waiting_result = results_repo.find_waiting_result(test_run_id: test_run.id)
+              results_repo.cancel_waiting_result(waiting_result.id, 'Test cancelled by user')
+              Jobs.perform(Jobs::ResumeTestRun, test_run.id)
+            end
+
+            self.status = 204
+          rescue StandardError => e
+            Application['logger'].error(e.full_message)
+            self.body = { errors: e.message }.to_json
+            self.status = 500
+          end
+        end
+      end
+    end
+  end
+end

data/lib/inferno/apps/web/router.rb

@@ -7,7 +7,7 @@ module Inferno
 
     Router = Hanami::Router.new(namespace: Inferno::Web::Controllers) do
       namespace 'api' do
-        resources 'test_runs', only: [:create, :show] do
+        resources 'test_runs', only: [:create, :show, :destroy] do
           resources 'results', only: [:index]
         end
 

data/lib/inferno/dsl/configurable.rb

@@ -13,6 +13,10 @@ module Inferno
         return @config if new_configuration.blank?
 
         @config.apply(new_configuration)
+
+        children.each { |child| child.config(new_configuration) }
+
+        @config
       end
 
       # @private

data/lib/inferno/dsl/fhir_validation.rb

@@ -53,7 +53,7 @@ module Inferno
 
         # Set the url of the validator service
         #
-        # @param url [String]
+        # @param validator_url [String]
         def url(validator_url = nil)
           @url = validator_url if validator_url
 

data/lib/inferno/dsl/oauth_credentials.rb

@@ -31,7 +31,7 @@ module Inferno
           instance_variable_set(:"@#{name}", value)
         end
 
-        self.token_retrieval_time = DateTime.now if token_retrieval_time.blank?
+        self.token_retrieval_time = DateTime.now if access_token.present? && token_retrieval_time.blank?
       end
 
       # @api private

data/lib/inferno/dsl/runnable.rb

@@ -456,12 +456,13 @@ module Inferno
 
       # @private
       def required_inputs(prior_outputs = [])
-        required_inputs = inputs.select do |input|
-          !input_definitions[input][:optional] && !prior_outputs.include?(input)
-        end
-        required_inputs.map! { |input_identifier| input_definitions[input_identifier][:name] }
+        required_inputs =
+          inputs
+            .reject { |input| input_definitions[input][:optional] }
+            .map { |input| config.input_name(input) }
+            .reject { |input| prior_outputs.include?(input) }
         children_required_inputs = children.flat_map { |child| child.required_inputs(prior_outputs) }
-        prior_outputs.concat(outputs)
+        prior_outputs.concat(outputs.map { |output| config.output_name(output) })
         (required_inputs + children_required_inputs).flatten.uniq
       end
 

data/lib/inferno/entities/test_run.rb

@@ -32,7 +32,7 @@ module Inferno
     #   @return [String, nil] identfier for a waiting `TestRun`
     # @!attribute wait_timeout
     class TestRun < Entity
-      STATUS_OPTIONS = ['queued', 'running', 'waiting', 'done'].freeze
+      STATUS_OPTIONS = ['queued', 'running', 'waiting', 'cancelling', 'done'].freeze
       ATTRIBUTES = [
         :id,
         :test_session_id,

data/lib/inferno/public/assets.json

@@ -1,6 +1,6 @@
 {
   "main.js": "/public/bundle.js",
-  "main.png": "/public/e09b16f5cb645eb05f90c8f38f3409fb.png",
   "217.bundle.js": "/public/217.bundle.js",
-  "inferno_logo.png": "/public/e09b16f5cb645eb05f90c8f38f3409fb.png"
+  "inferno_logo.png": "/public/e09b16f5cb645eb05f90c8f38f3409fb.png",
+  "inferno_icon.png": "/public/72a5cd989e6aea904540824ec865a0f8.png"
 }