inferno_core 0.1.1.pre → 0.1.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70e3295132f61902fb03d7dcfc6fd3f8593b9cdfb5dd5079a1ae7fe92d6c165c
-  data.tar.gz: a3d26fbdbb272907f5f244d90971a5496466419d4204201cc21762bf6939f7ff
+  metadata.gz: e77fe0b6b1077a64dce0244964847c57ed6c57aa6a388bae212658f300563486
+  data.tar.gz: 52259f5560f7838e1d9c3763cff3a7686b0be12601e3e2cd5f5b7e9e380d6050
 SHA512:
-  metadata.gz: 01cd288246ed891b29f77fd9cfeb57acd35e41fc894c164dba372e1317e3a2d3e8c0a59f3d1f5f62b528c457de0cde9aeb60b6c620387b42889121026570c803
-  data.tar.gz: dd3664cc7873ffc8a998a04409632a3a53424b964e189bd5b0918cc8d372a76cdc161e1b0515a54012b43b6f787b79f60b1d1d2b1511ee97187a28c66efcbd6f
+  metadata.gz: 38665e97697ea4bb570d7721197e05f16345e8e09b05fb2d573b10ed3b25cde28734433e9bf2be8cc874beaa9849c379e10acf70310e3aea7df00941fad8216f
+  data.tar.gz: fd44ae1fb46bac9358cc7b0b8a444bd1dcdf545fbd75588afc10d175f489601c6b2211d143f7387119bf6ac363644dfe9984b9e706efaf2fe4968b147ce479c2

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/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"
 }