inferno_core 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8655cec1d50119f35eb0072e3d65375a78d9233d60ea8ffe3f745c400b941d5
-  data.tar.gz: c7f163bd24c8a5272c803587d9c87680b5b108a9b7f5cd777344ff15d762d4fb
+  metadata.gz: 86c8b0374d22ea35f07944360943d2a1240f8ef7365b97d625b32facde4a2eaa
+  data.tar.gz: '0258752a8738b7e9c1da7d9112d0ee4f15bac0a8c7b2acac5f9973bb35d8146c'
 SHA512:
-  metadata.gz: 12573879f154dfd74c005aeb334c2dec65539345411bb3acfd959d0403fab4481cc5379c1ed28e9639bb09825ce8f2793883d6398da09a98fb8d00f145e11489
-  data.tar.gz: cbf9464a7e571dcef1d6f8c304c3ceadd545eeb7a54be18ded1f58280b77e34a449242f21672bdd8fa400347f425821dfb6fb096be82147537c480dd9e15a7fe
+  metadata.gz: 76cd8133722b109ed66f9b79eea46279c177fdac68cfe9abea4d0e9caaa76b861e533909923a94121d17e15483be5254f8e36e67cf6abb6121bc12f1e37f5fd7
+  data.tar.gz: 9be9f363e78e653b33818a8e8eee7fc74474ec2ca019b715054b7926d7e5675c46b290e138c0ee020e586d91eecef2759ead3272b6087461af89afeb8fdd7e94

data/bin/inferno

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'pry'
+require_relative '../lib/inferno/config/application'
+require_relative '../lib/inferno/apps/cli'
+
+Inferno::CLI::Main.start

data/lib/inferno/apps/cli/console.rb

@@ -0,0 +1,12 @@
+module Inferno
+  module CLI
+    class Console
+      def run
+        require_relative '../../../inferno'
+
+        Inferno::Application.finalize!
+        Pry.start
+      end
+    end
+  end
+end

data/lib/inferno/apps/cli/main.rb

@@ -0,0 +1,18 @@
+require_relative 'console'
+require_relative 'migration'
+
+module Inferno
+  module CLI
+    class Main < Thor
+      desc 'console', 'Start an interactive console session with Inferno'
+      def console
+        Console.new.run
+      end
+
+      desc 'migrate', 'Run database migrations'
+      def migrate
+        Migration.new.run
+      end
+    end
+  end
+end

data/lib/inferno/apps/cli/migration.rb

@@ -0,0 +1,14 @@
+require_relative '../../utils/migration'
+
+module Inferno
+  module CLI
+    class Migration
+      def run
+        Inferno::Application.start(:logging)
+        Inferno::Application['logger'].level = Logger::DEBUG
+
+        Utils::Migration.new.run
+      end
+    end
+  end
+end

data/lib/inferno/apps/cli.rb

@@ -0,0 +1,8 @@
+require 'thor'
+
+require_relative 'cli/main'
+
+module Inferno
+  module CLI
+  end
+end

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

@@ -3,28 +3,48 @@ 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',
+                    test_runs_repo: 'repositories.test_runs'
+                  ]
 
           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?
+            if test_runs_repo.active_test_run_for_session?(test_session.id)
+              self.status = 409
+              self.body = { error: 'Cannot run new test while another test run is in progress' }.to_json
+              return
+            end
+
+            test_run = repo.create(create_params(params).merge(status: 'queued'))
+            missing_inputs = test_run.runnable.missing_inputs(params[:inputs])
 
-            TestRunner
-              .new(test_session: test_session, test_run: test_run)
-              .run(test_run.runnable, inputs)
+            raise Inferno::Exceptions::RequiredInputsNotFound, missing_inputs if missing_inputs.any?
+            raise Inferno::Exceptions::NotUserRunnableException unless test_run.runnable.user_runnable?
 
             self.body = serialize(test_run)
-          rescue Sequel::ValidationFailed, Sequel::ForeignKeyConstraintViolation => e
+
+            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,
+                 Inferno::Exceptions::RequiredInputsNotFound,
+                 Inferno::Exceptions::NotUserRunnableException => 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/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/hash_value_extractor.rb

@@ -0,0 +1,11 @@
+module Inferno
+  module Web
+    module Serializers
+      class HashValueExtractor < Blueprinter::Extractor
+        def extract(field_name, object, _local_options, _options)
+          object.send(field_name).values
+        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,13 +4,10 @@ module Inferno
       class Test < Serializer
         identifier :id
         field :title
-        field :inputs do |test, _options|
-          test.inputs.map { |input| { name: input } }
-        end
-        field :outputs do |test, _options|
-          test.outputs.map { |output| { name: output } }
-        end
+        field :input_definitions, name: :inputs, extractor: HashValueExtractor, blueprint: Input
+        field :output_definitions, name: :outputs, extractor: HashValueExtractor
         field :description
+        field :user_runnable?, name: :user_runnable
       end
     end
   end

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

@@ -4,19 +4,16 @@ module Inferno
       class TestGroup < Serializer
         identifier :id
 
-        # TODO: fill out test group
         field :title
         field :description
-        # field :run_as_group
+        field :test_count
+        field :run_as_group?, name: :run_as_group
+        field :user_runnable?, name: :user_runnable
 
         association :groups, name: :test_groups, blueprint: TestGroup
         association :tests, blueprint: Test
-        field :inputs do |group, _options|
-          group.inputs.map { |input| { name: input } }
-        end
-        field :outputs do |group, _options|
-          group.outputs.map { |input| { name: input } }
-        end
+        field :input_definitions, name: :inputs, extractor: HashValueExtractor, blueprint: Input
+        field :output_definitions, name: :outputs, extractor: HashValueExtractor
       end
     end
   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,7 @@
+require 'active_support/all'
+require 'dotenv'
+require 'dry/system/container'
+require 'sequel'
 require_relative 'boot'
 
 module Inferno
@@ -6,6 +10,10 @@ 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')
+    Application.register('inferno_host', ENV.fetch('INFERNO_HOST', 'http://localhost:4567'))
+
     configure do |config|
       config.root = File.expand_path('../../..', __dir__)
       config.default_namespace = 'inferno'
@@ -15,8 +23,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/db.rb

@@ -1,3 +1,5 @@
+require 'sequel'
+
 Inferno::Application.boot(:db) do
   init do
     use :logging
@@ -10,6 +12,7 @@ Inferno::Application.boot(:db) do
     config = YAML.load_file(config_path)[ENV['APP_ENV']]
       .merge(logger: Inferno::Application['logger'])
     connection = Sequel.connect(config)
+    connection.sql_log_level = :debug
 
     register('db.config', config)
     register('db.connection', connection)
@@ -17,7 +20,5 @@ Inferno::Application.boot(:db) do
 
   start do
     Sequel.extension :migration
-    migration_path = File.join(Inferno::Application.root, 'lib', 'inferno', 'db', 'migrations')
-    Sequel::Migrator.run(Inferno::Application['db.connection'], migration_path)
   end
 end

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

@@ -11,6 +11,8 @@ Inferno::Application.boot(:logging) do
         Logger.new($stdout)
       end
 
+    logger.level = Logger::INFO
+
     register('logger', logger)
   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/config/boot/suites.rb

@@ -4,12 +4,10 @@ Inferno::Application.boot(:suites) do
 
     files_to_load = Dir.glob(File.join(Dir.pwd, 'lib', '*.rb'))
 
-    if ENV['LOAD_DEV_SUITES'] == 'true'
-      files_to_load.concat Dir.glob(File.join(Inferno::Application.root, 'dev_suites', '**', '*.rb'))
-    end
-
-    if ENV['LOAD_UI_SUITES'] == 'true'
-      files_to_load.concat Dir.glob(File.join(Inferno::Application.root, 'ui_suites', '**', '*.rb'))
+    if ENV['LOAD_DEV_SUITES'].present?
+      ENV['LOAD_DEV_SUITES'].split(',').map(&:strip).reject(&:empty?).each do |suite|
+        files_to_load.concat Dir.glob(File.join(Inferno::Application.root, 'dev_suites', suite, '**', '*.rb'))
+      end
     end
 
     if ENV['APP_ENV'] == 'test'

data/lib/inferno/config/boot.rb

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

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

data/lib/inferno/db/migrations/004_add_request_results_table.rb

@@ -0,0 +1,9 @@
+Sequel.migration do
+  change do
+    create_table :requests_results do
+      # using results_id instead of result_id to avoid ambiguous column error
+      foreign_key :results_id, :results, index: true, type: String, null: false
+      foreign_key :requests_id, :requests, index: true, type: String, null: false
+    end
+  end
+end

data/lib/inferno/db/migrations/005_add_updated_at_index_to_results.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  change do
+    add_index :results, [:test_run_id, :updated_at], concurrently: true
+  end
+end