inferno_core 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e46c84421bcf3279ee20f3dcd6a9e390473233a95db1ad889c16cd823f2d879
-  data.tar.gz: '08fd84f83d463edf9e5822c38084a379da6089bb92e8552e7bd79caa285ec3e7'
+  metadata.gz: 9b643b7c720a9c79df5f329a9947110971076db80fe29f0b57928230cf348d1b
+  data.tar.gz: e03d93994e7ad33e6e131969af5e31449390d36670d256a7d4bf43c1a9f80e4d
 SHA512:
-  metadata.gz: 3f8f32c53c9e1946ea9bd986df6c423d4877b39865887a2abe316ba973dba23979b2638684b290041507a4ce5f40f3e6d3c013b89d3207762461817124ed7f9c
-  data.tar.gz: f2f2c2886be27e7d76e84cb1fe8cd67402890488aa46aa1db41de8b5a20fdffc67f4e566aa43199975a43166ce244e0de3c847f3d926ca303c97e15960f6d481
+  metadata.gz: 4767e5dfd7f469a6eb70892fb9e5402f2a46708655810b91be0b3d1d9d1dfa839c3502678156f763f5e9a7999948a31013fb68e3a1d1605306d5297639f3b3c3
+  data.tar.gz: 3adbce3ebb0786095826a114e4c6bc6a3ced2f9e560e2eaa6f6e6f6784bbf44c10ef25734f67bb097ee384b4cd6ab3296dc156e2c14cd5085bc64cb4fb27f575

data/lib/inferno.rb

@@ -6,10 +6,14 @@ require_relative 'inferno/config/application'
 require_relative 'inferno/dsl'
 require_relative 'inferno/entities'
 require_relative 'inferno/exceptions'
+require_relative 'inferno/jobs'
 require_relative 'inferno/repositories'
 require_relative 'inferno/spec_support'
 require_relative 'inferno/test_runner'
 require_relative 'inferno/version'
 
 module Inferno
+  def self.routes
+    @routes ||= []
+  end
 end

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

@@ -3,28 +3,35 @@ module Inferno
     module Controllers
       module TestRuns
         class Create < Controller
-          include Import[test_sessions_repo: 'repositories.test_sessions']
+          include Import[
+                    test_sessions_repo: 'repositories.test_sessions',
+                    session_data_repo: 'repositories.session_data'
+                  ]
 
           PARAMS = [:test_session_id, :test_suite_id, :test_group_id, :test_id].freeze
 
           def call(params)
-            test_run = repo.create(create_params(params))
-            inputs = (params[:inputs] || {}).each_with_object({}) do |input, new_inputs|
-              new_inputs[input[:name].to_sym] = input[:value]
-            end
+            test_session = test_sessions_repo.find(params[:test_session_id])
 
-            test_session = test_sessions_repo.find(test_run.test_session_id)
             # if testsession.nil?
 
-            TestRunner
-              .new(test_session: test_session, test_run: test_run)
-              .run(test_run.runnable, inputs)
-
+            test_run = repo.create(create_params(params).merge(status: 'queued'))
             self.body = serialize(test_run)
+
+            params[:inputs]&.each do |input|
+              session_data_repo.save(
+                test_session_id: test_session.id,
+                name: input[:name],
+                value: input[:value]
+              )
+            end
+
+            Jobs.perform(Jobs::ExecuteTestRun, test_run.id)
           rescue Sequel::ValidationFailed, Sequel::ForeignKeyConstraintViolation => e
             self.body = { errors: e.message }.to_json
             self.status = 422
           rescue StandardError => e
+            Application['logger'].error(e.full_message)
             self.body = { errors: e.message }.to_json
             self.status = 500
           end

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

@@ -7,6 +7,16 @@ module Inferno
             test_run = repo.find(params[:id])
             halt 404 if test_run.nil?
 
+            if params[:include_results] == 'true'
+              results_repo = Inferno::Repositories::Results.new
+              test_run.results =
+                if params[:after].present?
+                  results_repo.test_run_results_after(test_run_id: test_run.id, after: Time.parse(params[:after]))
+                else
+                  repo.results_for_test_run(test_run.id)
+                end
+            end
+
             self.body = serialize(test_run)
           end
         end

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

@@ -12,6 +12,7 @@ module Inferno
             self.body = { errors: e.message }.to_json
             self.status = 422
           rescue StandardError => e
+            Application['logger'].error(e.full_message)
             self.body = { errors: e.message }.to_json
             self.status = 500
           end

data/lib/inferno/apps/web/controllers/test_sessions/last_test_run.rb

@@ -0,0 +1,22 @@
+module Inferno
+  module Web
+    module Controllers
+      module TestSessions
+        class LastTestRun < Controller
+          include Import[test_runs_repo: 'repositories.test_runs']
+
+          def call(params)
+            test_run = test_runs_repo.last_test_run(params[:test_session_id])
+
+            self.body =
+              if test_run.nil?
+                nil
+              else
+                Inferno::Web::Serializers::TestRun.render(test_run)
+              end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/inferno/apps/web/controllers/test_sessions/results/index.rb

@@ -7,7 +7,12 @@ module Inferno
             include Import[test_sessions_repo: 'repositories.test_sessions']
 
             def call(params)
-              self.body = serialize(test_sessions_repo.results_for_test_session(params[:test_session_id]))
+              self.body =
+                if params[:all] == 'true'
+                  serialize(test_sessions_repo.results_for_test_session(params[:test_session_id]))
+                else
+                  serialize(repo.current_results_for_test_session(params[:test_session_id]))
+                end
             end
           end
         end

data/lib/inferno/apps/web/controllers/test_sessions/session_data/index.rb

@@ -0,0 +1,21 @@
+module Inferno
+  module Web
+    module Controllers
+      module TestSessions
+        module SessionData
+          class Index < Controller
+            include Import[session_data_repo: 'repositories.session_data']
+
+            def self.resource_class
+              'SessionData'
+            end
+
+            def call(params)
+              self.body = serialize(session_data_repo.get_all_from_session(params[:test_session_id]))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/inferno/apps/web/index.html.erb

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="/public/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="FHIR Testing"
+    />
+    <link rel="apple-touch-icon" href="/public/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="/public/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>Inferno</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+    <script src='<%= Inferno::Application['js_host'] %>/public/bundle.js'></script>
+  </body>
+</html>

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

@@ -13,7 +13,11 @@ module Inferno
 
         resources 'test_sessions', only: [:create, :show] do
           resources 'results', only: [:index]
+          resources 'session_data', only: [:index]
         end
+        get 'test_sessions/:test_session_id/last_test_run',
+            to: Inferno::Web::Controllers::TestSessions::LastTestRun,
+            as: :last_test_run
 
         resources 'test_suites', only: [:index, :show]
 
@@ -22,6 +26,17 @@ module Inferno
 
       get '/', to: ->(_env) { [200, {}, [client_page]] }
       get '/test_sessions/:id', to: ->(_env) { [200, {}, [client_page]] }
+
+      Inferno.routes.each do |route|
+        cleaned_id = route[:suite].id.gsub(/[^a-zA-Z\d\-._~]/, '_')
+        path = "/custom/#{cleaned_id}#{route[:path]}"
+        Application['logger'].info("Registering custom route: #{path}")
+        if route[:method] == :all
+          mount route[:handler], at: path
+        else
+          send(route[:method], path, to: route[:handler])
+        end
+      end
     end
   end
 end

data/lib/inferno/apps/web/serializers/request.rb

@@ -9,6 +9,7 @@ module Inferno
           field :url
           field :direction
           field :status
+          field :result_id
         end
 
         view :full do

data/lib/inferno/apps/web/serializers/result.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Inferno
   module Web
     module Serializers
@@ -12,6 +14,12 @@ module Inferno
         field :test_session_id
         field :result
         field :result_message, if: :field_present?
+        field :created_at
+        field :updated_at
+
+        field :outputs do |result, _options|
+          result.output_json.present? ? JSON.parse(result.output_json) : []
+        end
 
         association :messages, blueprint: Message, if: :field_present?
         association :requests, blueprint: Request, view: :summary, if: :field_present?

data/lib/inferno/apps/web/serializers/session_data.rb

@@ -0,0 +1,10 @@
+module Inferno
+  module Web
+    module Serializers
+      class SessionData < Serializer
+        field :name
+        field :value
+      end
+    end
+  end
+end

data/lib/inferno/apps/web/serializers/test.rb

@@ -4,9 +4,7 @@ module Inferno
       class Test < Serializer
         identifier :id
         field :title
-        field :inputs do |test, _options|
-          test.inputs.map { |input| { name: input } }
-        end
+        field :inputs
         field :outputs do |test, _options|
           test.outputs.map { |output| { name: output } }
         end

data/lib/inferno/apps/web/serializers/test_group.rb

@@ -7,13 +7,12 @@ module Inferno
         # TODO: fill out test group
         field :title
         field :description
+        field :test_count
         # field :run_as_group
 
         association :groups, name: :test_groups, blueprint: TestGroup
         association :tests, blueprint: Test
-        field :inputs do |group, _options|
-          group.inputs.map { |input| { name: input } }
-        end
+        field :inputs
         field :outputs do |group, _options|
           group.outputs.map { |input| { name: input } }
         end

data/lib/inferno/apps/web/serializers/test_run.rb

@@ -6,6 +6,7 @@ module Inferno
         field :test_session_id
 
         field :status
+        field :test_count
 
         field :test_group_id, if: :field_present?
         field :test_suite_id, if: :field_present?

data/lib/inferno/apps/web/serializers/test_session.rb

@@ -9,7 +9,7 @@ module Inferno
         field :test_suite_id
 
         association :test_suite, blueprint: TestSuite, view: :full
-        # association :test_run, blueprint: TestRun
+        # association :test_runs, blueprint: TestRun
         # association :results, blueprint: Result
       end
     end

data/lib/inferno/apps/web/serializers/test_suite.rb

@@ -6,6 +6,7 @@ module Inferno
           identifier :id
           field :title
           field :description
+          field :test_count
         end
 
         view :full do

data/lib/inferno/config/application.rb

@@ -1,3 +1,4 @@
+require 'dry/system/container'
 require_relative 'boot'
 
 module Inferno
@@ -6,6 +7,9 @@ module Inferno
 
     use :env, inferrer: -> { ENV.fetch('APP_ENV', :development).to_sym }
 
+    Application.register('js_host', ENV.fetch('JS_HOST', ''))
+    Application.register('async_jobs', ENV['ASYNC_JOBS'] != 'false')
+
     configure do |config|
       config.root = File.expand_path('../../..', __dir__)
       config.default_namespace = 'inferno'
@@ -15,8 +19,6 @@ module Inferno
       config.auto_register = 'lib'
     end
 
-    Application.register('js_host', ENV.fetch('JS_HOST', ''))
-
     load_paths!('lib')
   end
 end

data/lib/inferno/config/boot.rb

@@ -1,3 +1,5 @@
+require 'dotenv'
+
 ENV['APP_ENV'] ||= 'development'
 
 root_path = Dir.pwd

data/lib/inferno/config/boot/db.rb

@@ -1,3 +1,5 @@
+require 'sequel'
+
 Inferno::Application.boot(:db) do
   init do
     use :logging
@@ -17,7 +19,14 @@ Inferno::Application.boot(:db) do
 
   start do
     Sequel.extension :migration
+    db = Inferno::Application['db.connection']
     migration_path = File.join(Inferno::Application.root, 'lib', 'inferno', 'db', 'migrations')
-    Sequel::Migrator.run(Inferno::Application['db.connection'], migration_path)
+    Sequel::Migrator.run(db, migration_path)
+
+    if ENV['APP_ENV'] == 'development'
+      schema_path = File.join(Inferno::Application.root, 'lib', 'inferno', 'db', 'schema.rb')
+      db.extension :schema_dumper
+      File.open(schema_path, 'w') { |f| f.print(db.dump_schema_migration) }
+    end
   end
 end

data/lib/inferno/config/boot/sidekiq.rb

@@ -0,0 +1,11 @@
+require 'sidekiq'
+
+Inferno::Application.boot(:sidekiq) do
+  init do
+    if Inferno::Application['async_jobs']
+      Sidekiq.configure_server do |config|
+        config.redis = { url: ENV.fetch('REDIS_URL', 'redis://127.0.0.1:6379/0') }
+      end
+    end
+  end
+end

data/lib/inferno/db/migrations/001_create_initial_structure.rb

@@ -1,26 +1,5 @@
 Sequel.migration do
   change do
-    #
-    # NOT NEEDED BECUASE THEY ARE DEFINED WITHIN TEST SUITE.
-    # MUST BE REFERENCED USING SOME KIND OF GLOBALLY UNIQUE KEY
-    # THAT IS REPRESENTED AS A STRING
-    #
-
-    # create_table :test_suites do
-    # end
-
-    # create_table :test_groups do
-    # end
-
-    # create_table :tests do
-    # end
-
-    # create_table :test_inputs do
-    # end
-
-    # create_table :test_outputs do
-    # end
-
     # A way for the test to signal that it requires some kind of action by the
     # app that is invoking the test (e.g. SMART Launch, perhaps mid-test manual verification)
     # create_table :test_prompts do

data/lib/inferno/db/migrations/002_add_wait_support.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    add_column :test_runs, :identifier, String, text: true
+    add_column :test_runs, :wait_timeout, DateTime
+    add_index :test_runs, [:status, :identifier, :wait_timeout, :updated_at], concurrently: true
+  end
+end

data/lib/inferno/db/migrations/003_update_session_data.rb

@@ -0,0 +1,18 @@
+Sequel.migration do
+  change do
+    drop_table :test_run_inputs
+    drop_table :result_inputs
+
+    set_column_type :session_data, :value, String, text: true
+    drop_index :session_data, [:test_session_id, :name], concurrently: true
+    add_index :session_data, [:test_session_id, :name], unique: true, concurrently: true
+    drop_index :session_data, :id, concurrently: true
+    add_index :session_data, :id, unique: true, concurrently: true
+
+    add_column :results, :input_json, String, text: true
+    add_column :results, :output_json, String, text: true
+    add_index :results, [:test_session_id, :test_id], concurrently: true
+    add_index :results, [:test_session_id, :test_group_id], concurrently: true
+    add_index :results, [:test_session_id, :test_suite_id], concurrently: true
+  end
+end