inferno_core 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8655cec1d50119f35eb0072e3d65375a78d9233d60ea8ffe3f745c400b941d5
-  data.tar.gz: c7f163bd24c8a5272c803587d9c87680b5b108a9b7f5cd777344ff15d762d4fb
+  metadata.gz: 9cb5242ae380d8cbec854482b0c91497f22180b770729bd0c7a12e135669b03a
+  data.tar.gz: b56d498246e148d5f850c8bc411f90b270dcfb3ab12c59002bcf60c8d56ba526
 SHA512:
-  metadata.gz: 12573879f154dfd74c005aeb334c2dec65539345411bb3acfd959d0403fab4481cc5379c1ed28e9639bb09825ce8f2793883d6398da09a98fb8d00f145e11489
-  data.tar.gz: cbf9464a7e571dcef1d6f8c304c3ceadd545eeb7a54be18ded1f58280b77e34a449242f21672bdd8fa400347f425821dfb6fb096be82147537c480dd9e15a7fe
+  metadata.gz: 51284afddfe06b44c144ec9ab20f0aacff605c8bc66f13dc89d02a58c941716cac28896903a82cb7ad3784b1e4287900da98421fea7d9df7af7e2d04ead7e97a
+  data.tar.gz: f8b3e900410909fdbb5bb8cc2513a152580a84b1a5dbafa571838d24d051d167698be30cce1fb5b41bb8b66c09f3b1b6c405dff1a81e31466e490983265b12f3

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

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

data/lib/inferno/db/schema.rb

@@ -0,0 +1,154 @@
+Sequel.migration do
+  change do
+    create_table(:schema_info) do
+      Integer :version, :default=>0, :null=>false
+    end
+    
+    create_table(:test_sessions) do
+      String :id, :size=>255, :null=>false
+      String :test_suite_id, :size=>255
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      
+      primary_key [:id]
+    end
+    
+    create_table(:session_data, :ignore_index_errors=>true) do
+      String :id, :size=>255, :null=>false
+      foreign_key :test_session_id, :test_sessions, :type=>String, :size=>255
+      String :name, :size=>255
+      String :value, :text=>true
+      
+      index [:id], :unique=>true
+      index [:test_session_id]
+      index [:test_session_id, :name], :unique=>true
+    end
+    
+    create_table(:test_runs, :ignore_index_errors=>true) do
+      String :id, :size=>255, :null=>false
+      String :status, :size=>255
+      foreign_key :test_session_id, :test_sessions, :type=>String, :size=>255
+      String :test_suite_id, :size=>255
+      String :test_group_id, :size=>255
+      String :test_id, :size=>255
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      String :identifier, :text=>true
+      DateTime :wait_timeout
+      
+      primary_key [:id]
+      
+      index [:status, :identifier, :wait_timeout, :updated_at]
+      index [:test_group_id]
+      index [:test_id]
+      index [:test_session_id]
+      index [:test_session_id, :status]
+      index [:test_suite_id]
+    end
+    
+    create_table(:results, :ignore_index_errors=>true) do
+      String :id, :size=>255, :null=>false
+      foreign_key :test_run_id, :test_runs, :type=>String, :size=>255
+      foreign_key :test_session_id, :test_sessions, :type=>String, :size=>255
+      String :result, :size=>255
+      String :result_message, :size=>255
+      String :test_suite_id, :size=>255
+      String :test_group_id, :size=>255
+      String :test_id, :size=>255
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      String :input_json, :text=>true
+      String :output_json, :text=>true
+      
+      primary_key [:id]
+      
+      index [:test_run_id]
+      index [:test_run_id, :updated_at]
+      index [:test_session_id]
+      index [:test_session_id, :test_group_id]
+      index [:test_session_id, :test_id]
+      index [:test_session_id, :test_suite_id]
+    end
+    
+    create_table(:messages, :ignore_index_errors=>true) do
+      primary_key :index
+      String :id, :size=>255, :null=>false
+      foreign_key :result_id, :results, :type=>String, :size=>255
+      String :type, :size=>255
+      String :message, :size=>255
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      
+      index [:id]
+      index [:result_id]
+    end
+    
+    create_table(:requests, :ignore_index_errors=>true) do
+      primary_key :index
+      String :id, :size=>255, :null=>false
+      String :verb, :size=>255
+      String :url, :size=>255
+      String :direction, :size=>255
+      Integer :status
+      String :name, :size=>255
+      String :request_body, :text=>true
+      String :response_body, :text=>true
+      foreign_key :result_id, :results, :type=>String, :size=>255
+      foreign_key :test_session_id, :test_sessions, :type=>String, :size=>255
+      String :"[:test_session_id, :name]"
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      
+      index [:id]
+      index [:result_id]
+      index [:test_session_id]
+    end
+    
+    create_table(:result_outputs, :ignore_index_errors=>true) do
+      String :id, :size=>255, :null=>false
+      foreign_key :result_id, :results, :type=>String, :size=>255
+      String :test_output_id, :size=>255
+      String :value, :size=>255
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      
+      primary_key [:id]
+      
+      index [:result_id]
+    end
+    
+    create_table(:result_prompt_values, :ignore_index_errors=>true) do
+      String :id, :size=>255, :null=>false
+      foreign_key :result_id, :results, :type=>String, :size=>255
+      String :test_prompt_id, :size=>255, :null=>false
+      String :value, :size=>255, :null=>false
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      
+      primary_key [:id]
+      
+      index [:result_id]
+    end
+    
+    create_table(:headers, :ignore_index_errors=>true) do
+      String :id, :size=>255, :null=>false
+      foreign_key :request_id, :requests, :type=>String, :size=>255
+      String :type, :size=>255
+      String :name, :size=>255
+      String :value, :size=>255
+      DateTime :created_at, :null=>false
+      DateTime :updated_at, :null=>false
+      
+      index [:id]
+      index [:request_id]
+    end
+    
+    create_table(:requests_results, :ignore_index_errors=>true) do
+      foreign_key :results_id, :results, :type=>String, :size=>255, :null=>false
+      foreign_key :requests_id, :requests, :type=>String, :size=>255, :null=>false
+      
+      index [:requests_id]
+      index [:results_id]
+    end
+  end
+end