inferno_core 0.4.29 → 0.4.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71ffd4d8151e890a5a52cd087d5aeb222efcf27902c2ec01f78d898a08de7d9b
-  data.tar.gz: afe5c2b4cf3603e54e4b085dc609f061d6e78bd929e1b4ee915294dcb0f87de6
+  metadata.gz: 4439e9a6fff9fbd72efd09c4a14342206c509151fc0b6782089bf991b1849442
+  data.tar.gz: f386dba398dbf37c48fd3864fa4fe21e89732abccf155c5a2002530f802c7a34
 SHA512:
-  metadata.gz: e0caf2d09c500643311b393129a741a9bd8d3ee043d7b6e45c3cad5cd92eb50802642de5c3222bf62188d1ecbe48469c5b54cf2f3005f65548d544b8ac2f6d30
-  data.tar.gz: bb530410e8303d6fc82132c0f8c3da0fc63987ac6ba48b2be1023d8021ed7350a5158d3941e5bc7090136986248bae9134a64fbf8c6432352bb98ae839abff91
+  metadata.gz: 062e5019bcd5b1ca6cf67ac9fe94719e4a9e82fe2e8243f57a928ab28df35e8d517e0b180e48f6e7c1a5555ab691009399fc7f8d509d2d02cbbe0c4cbae8a3a3
+  data.tar.gz: 6105c47597428f29714650ea36492892bd399bac93323178144d2ad9b52dcbf27e643d514d18de533ec7c76d63dc9c53128fab9282b50d5cf91ea069ddf2760b

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

@@ -1,6 +1,7 @@
 require 'thor'
 require 'bundler'
 require_relative '../../utils/named_thor_actions'
+require_relative '../../utils/ig_downloader'
 require_relative '../../version'
 
 module Inferno
@@ -8,17 +9,27 @@ module Inferno
     class New < Thor::Group
       include Thor::Actions
       include Inferno::Utils::NamedThorActions
+      include Inferno::Utils::IgDownloader
 
       desc <<~HELP
         Generate a new Inferno test kit for FHIR software testing
 
         Examples:
 
-          `inferno new test_fhir_app`
-            => generates an Inferno app
+          `inferno new my_test_kit`
+            => generates an Inferno test kit
 
-          `inferno new test_my_ig -a MyName`
-            => generates Inferno app and specifies MyName as gemspec author
+          `inferno new test-us-core -i hl7.fhir.us.core@6.1.0`
+            => generates Inferno test kit with US Core 6.1.0 implementation guide
+
+          `inferno new TestMatching -i https://build.fhir.org/ig/HL7/fhir-identity-matching-ig/`
+            => generates Inferno test kit with an implementation guide from its continuous web build
+
+          `inferno new test-my-ig -a "My Name" -i file:///absolute/path/to/my/ig/package.tgz`
+            => generates Inferno test kit with a local IG and specifies My Name as gem author
+
+           `inferno new test_my_igs -a "My Name" -a "Another Name" -i file:///my/first/package.tgz -i hl7.fhir.us.core@6.1.0`
+            => generates Inferno test kit with multiple IGs and multiple authors
 
         https://inferno-framework.github.io/index.html
       HELP
@@ -45,15 +56,23 @@ module Inferno
                    type: :boolean,
                    aliases: '-b',
                    default: false,
-                   desc: 'Do not run bundle install'
+                   desc: 'Do not run bundle install or inferno migrate'
+      class_option :implementation_guide,
+                   type: :string,
+                   aliases: '-i',
+                   repeatable: true,
+                   desc: 'Load an Implementation Guide by FHIR Registry name, URL, or absolute path'
 
       add_runtime_options!
 
-      def create_app
+      def create_test_kit
         directory('.', root_name, { mode: :preserve, recursive: true, verbose: !options['quiet'] })
 
-        bundle_install
-        inferno_migrate
+        inside(root_name) do
+          bundle_install
+          inferno_migrate
+          load_igs
+        end
 
         say_unless_quiet "Created #{root_name} Inferno test kit!", :green
 
@@ -65,10 +84,6 @@ module Inferno
 
       private
 
-      def ig_path
-        File.join('lib', library_name, 'igs')
-      end
-
       def authors
         options['author'].presence || [default_author]
       end
@@ -80,18 +95,27 @@ module Inferno
       def bundle_install
         return if options['skip_bundle']
 
-        inside(root_name) do
-          Bundler.with_unbundled_env do
-            run 'bundle install', verbose: !options['quiet'], capture: options['quiet']
-          end
+        Bundler.with_unbundled_env do
+          run 'bundle install', verbose: !options['quiet'], capture: options['quiet']
         end
       end
 
       def inferno_migrate
         return if options['skip_bundle']
 
-        inside(root_name) do
-          run 'bundle exec inferno migrate', verbose: !options['quiet'], capture: options['quiet']
+        run 'bundle exec inferno migrate', verbose: !options['quiet'], capture: options['quiet']
+      end
+
+      def load_igs
+        config = { verbose: !options['quiet'] }
+        options['implementation_guide']&.each_with_index do |ig, idx|
+          uri = options['implementation_guide'].length == 1 ? load_ig(ig, nil, config) : load_ig(ig, idx, config)
+          say_unless_quiet "Downloaded IG from #{uri}"
+        rescue OpenURI::HTTPError => e
+          say_unless_quiet "Failed to install implementation guide #{ig}", :red
+          say_unless_quiet e.message, :red
+        rescue StandardError => e
+          say_unless_quiet e.message, :red
         end
       end
 

data/lib/inferno/db/migrations/010_add_validator_sessions.rb

@@ -0,0 +1,14 @@
+Sequel.migration do
+  change do
+    create_table :validator_sessions do
+      column :id, String, primary_key: true, null: false, size: 36
+      column :validator_session_id,  String, null: false, size: 255
+      column :test_suite_id, String, null: false, size: 255
+      column :validator_name, String, null: false, size: 255
+      column :suite_options, String, text: true
+      column :last_accessed, DateTime, null: false
+      index [:validator_session_id], unique: true
+      index [:test_suite_id, :validator_name, :suite_options], unique: true
+    end
+  end
+end

data/lib/inferno/db/schema.rb

@@ -23,6 +23,20 @@ Sequel.migration do
       primary_key [:id]
     end
     
+    create_table(:validator_sessions, :ignore_index_errors=>true) do
+      String :id, :size=>36, :null=>false
+      String :validator_session_id, :size=>255, :null=>false
+      String :test_suite_id, :size=>255, :null=>false
+      String :validator_name, :size=>255, :null=>false
+      String :suite_options, :text=>true
+      DateTime :last_accessed, :null=>false
+      
+      primary_key [:id]
+      
+      index [:test_suite_id, :validator_name, :suite_options], :unique=>true
+      index [:validator_session_id], :unique=>true
+    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=>36, :null=>false, :key=>[:id]

data/lib/inferno/dsl/fhir_client_builder.rb

@@ -90,7 +90,7 @@ module Inferno
 
       # @private
       def method_missing(name, *args, &)
-        return runnable.call(name, *args, &) if runnable.respond_to? name
+        return runnable.send(name, *args, &) if runnable.respond_to? name
 
         super
       end

data/lib/inferno/dsl/fhir_resource_validation.rb

@@ -27,10 +27,12 @@ module Inferno
 
       class Validator
         attr_reader :requirements
-        attr_accessor :session_id
+        attr_accessor :session_id, :name, :test_suite_id
 
         # @private
-        def initialize(requirements = nil, &)
+        def initialize(name = nil, test_suite_id = nil, requirements = nil, &)
+          @name = name
+          @test_suite_id = test_suite_id
           instance_eval(&)
           @requirements = requirements
         end
@@ -40,6 +42,10 @@ module Inferno
           ENV.fetch('FHIR_RESOURCE_VALIDATOR_URL')
         end
 
+        def validator_session_repo
+          @validator_session_repo ||= Inferno::Repositories::ValidatorSessions.new
+        end
+
         # Set the url of the validator service
         #
         # @param validator_url [String]
@@ -231,6 +237,10 @@ module Inferno
 
         # @private
         def wrap_resource_for_hl7_wrapper(resource, profile_url)
+          validator_session_id =
+            validator_session_repo.find_validator_session_id(test_suite_id,
+                                                             name.to_s, requirements)
+          @session_id = validator_session_id if validator_session_id
           wrapped_resource = {
             cliContext: {
               **cli_context.definition,
@@ -269,8 +279,11 @@ module Inferno
         # @private
         def operation_outcome_from_hl7_wrapped_response(response)
           res = JSON.parse(response)
-
-          @session_id = res['sessionId']
+          if res['sessionId'] != @session_id
+            validator_session_repo.save(test_suite_id:, validator_session_id: res['sessionId'],
+                                        validator_name: name.to_s, suite_options: requirements)
+            @session_id = res['sessionId']
+          end
 
           # assume for now that one resource -> one request
           issues = res['outcomes'][0]['issues']&.map do |i|
@@ -287,7 +300,7 @@ module Inferno
           else
             runnable.add_message('error', "Validator Response: HTTP #{response.status}\n#{response.body}")
             raise Inferno::Exceptions::ErrorInValidatorException,
-                  'Validator response was an unexpected format. '\
+                  'Validator response was an unexpected format. ' \
                   'Review Messages tab or validator service logs for more information.'
           end
         end
@@ -300,7 +313,8 @@ module Inferno
         CLICONTEXT_DEFAULTS = {
           sv: '4.0.1',
           doNative: false,
-          extensions: ['any']
+          extensions: ['any'],
+          disableDefaultResourceFetcher: true
         }.freeze
 
         # @private
@@ -353,7 +367,7 @@ module Inferno
         def fhir_resource_validator(name = :default, required_suite_options: nil, &block)
           current_validators = fhir_validators[name] || []
 
-          new_validator = Inferno::DSL::FHIRResourceValidation::Validator.new(required_suite_options, &block)
+          new_validator = Inferno::DSL::FHIRResourceValidation::Validator.new(name, id, required_suite_options, &block)
 
           current_validators.reject! { |validator| validator.requirements == required_suite_options }
           current_validators << new_validator

data/lib/inferno/dsl/http_client_builder.rb

@@ -45,7 +45,7 @@ module Inferno
 
       # @private
       def method_missing(name, *args, &)
-        return runnable.call(name, *args, &) if runnable.respond_to? name
+        return runnable.send(name, *args, &) if runnable.respond_to? name
 
         super
       end

data/lib/inferno/entities/validator_session.rb

@@ -0,0 +1,22 @@
+module Inferno
+  module Entities
+    class ValidatorSession < Entity
+      ATTRIBUTES = [
+        :id,
+        :created_at,
+        :updated_at,
+        :validator_session_id,
+        :test_suite_id,
+        :validator_name,
+        :suite_options,
+        :validator_index
+      ].freeze
+
+      include Inferno::Entities::Attributes
+
+      def initialize(params)
+        super(params, ATTRIBUTES)
+      end
+    end
+  end
+end

data/lib/inferno/entities.rb

@@ -11,6 +11,7 @@ require_relative 'entities/test_group'
 require_relative 'entities/test_run'
 require_relative 'entities/test_session'
 require_relative 'entities/test_suite'
+require_relative 'entities/validator_session'
 
 module Inferno
   # Entities are domain objects whose identity is based on an `id`. Entities

data/lib/inferno/jobs/invoke_validator_session.rb

@@ -6,13 +6,13 @@ module Inferno
       def perform(suite_id, validator_name, validator_index)
         suite = Inferno::Repositories::TestSuites.new.find suite_id
         validator = suite.fhir_validators[validator_name.to_sym][validator_index]
-
         response_body = validator.validate(FHIR::Patient.new, 'http://hl7.org/fhir/StructureDefinition/Patient')
-
         if response_body.start_with? '{'
           res = JSON.parse(response_body)
           session_id = res['sessionId']
-          # TODO: (FI-2311) store this session ID so it can be referenced as needed
+          session_repo = Inferno::Repositories::ValidatorSessions.new
+          session_repo.save(test_suite_id: suite_id, validator_session_id: session_id,
+                            validator_name:, suite_options: validator.requirements)
           validator.session_id = session_id
         else
           Inferno::Application['logger'].error("InvokeValidatorSession - error from validator: #{response_body}")

data/lib/inferno/public/175.bundle.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkinferno_web_app=self.webpackChunkinferno_web_app||[]).push([[175],{9175:(t,e,n)=>{n.r(e),n.d(e,{getCLS:()=>d,getFCP:()=>m,getFID:()=>v,getLCP:()=>h,getTTFB:()=>S});var i,a,r=function(t){return{name:t,value:arguments.length>1&&void 0!==arguments[1]?arguments[1]:-1,delta:0,entries:[],id:"".concat(Date.now(),"-").concat(Math.floor(8999999999999*Math.random())+1e12),isFinal:!1}},o=function(t,e){try{if(PerformanceObserver.supportedEntryTypes.includes(t)){var n=new PerformanceObserver((function(t){return t.getEntries().map(e)}));return n.observe({type:t,buffered:!0}),n}}catch(t){}},s=!1,u=!1,c=function(t){s=!t.persisted},p=function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1];u||(addEventListener("pagehide",c),addEventListener("beforeunload",(function(){})),u=!0),addEventListener("visibilitychange",(function(e){var n=e.timeStamp;"hidden"===document.visibilityState&&t({timeStamp:n,isUnloading:s})}),{capture:!0,once:e})},l=function(t,e,n,i){var a;return function(){n&&e.isFinal&&n.disconnect(),e.value>=0&&(i||e.isFinal||"hidden"===document.visibilityState)&&(e.delta=e.value-(a||0),(e.delta||e.isFinal||void 0===a)&&(t(e),a=e.value))}},d=function(t){var e,n=arguments.length>1&&void 0!==arguments[1]&&arguments[1],i=r("CLS",0),a=function(t){t.hadRecentInput||(i.value+=t.value,i.entries.push(t),e())},s=o("layout-shift",a);s&&(e=l(t,i,s,n),p((function(t){var n=t.isUnloading;s.takeRecords().map(a),n&&(i.isFinal=!0),e()})))},f=function(){return void 0===i&&(i="hidden"===document.visibilityState?0:1/0,p((function(t){var e=t.timeStamp;return i=e}),!0)),{get timeStamp(){return i}}},m=function(t){var e,n=r("FCP"),i=f(),a=o("paint",(function(t){"first-contentful-paint"===t.name&&t.startTime<i.timeStamp&&(n.value=t.startTime,n.isFinal=!0,n.entries.push(t),e())}));a&&(e=l(t,n,a))},v=function(t){var e=r("FID"),n=f(),i=function(t){t.startTime<n.timeStamp&&(e.value=t.processingStart-t.startTime,e.entries.push(t),e.isFinal=!0,s())},a=o("first-input",i),s=l(t,e,a);a?p((function(){a.takeRecords().map(i),a.disconnect()}),!0):window.perfMetrics&&window.perfMetrics.onFirstInputDelay&&window.perfMetrics.onFirstInputDelay((function(t,i){i.timeStamp<n.timeStamp&&(e.value=t,e.isFinal=!0,e.entries=[{entryType:"first-input",name:i.type,target:i.target,cancelable:i.cancelable,startTime:i.timeStamp,processingStart:i.timeStamp+t}],s())}))},g=function(){return a||(a=new Promise((function(t){return["scroll","keydown","pointerdown"].map((function(e){addEventListener(e,t,{once:!0,passive:!0,capture:!0})}))}))),a},h=function(t){var e,n=arguments.length>1&&void 0!==arguments[1]&&arguments[1],i=r("LCP"),a=f(),s=function(t){var n=t.startTime;n<a.timeStamp?(i.value=n,i.entries.push(t)):i.isFinal=!0,e()},u=o("largest-contentful-paint",s);if(u){e=l(t,i,u,n);var c=function(){i.isFinal||(u.takeRecords().map(s),i.isFinal=!0,e())};g().then(c),p(c,!0)}},S=function(t){var e,n=r("TTFB");e=function(){try{var e=performance.getEntriesByType("navigation")[0]||function(){var t=performance.timing,e={entryType:"navigation",startTime:0};for(var n in t)"navigationStart"!==n&&"toJSON"!==n&&(e[n]=Math.max(t[n]-t.navigationStart,0));return e}();n.value=n.delta=e.responseStart,n.entries=[e],n.isFinal=!0,t(n)}catch(t){}},"complete"===document.readyState?setTimeout(e,0):addEventListener("pageshow",e)}}}]);

data/lib/inferno/public/assets.json

@@ -1,6 +1,6 @@
 {
   "main.js": "/public/bundle.js",
-  "217.bundle.js": "/public/217.bundle.js",
+  "175.bundle.js": "/public/175.bundle.js",
   "inferno_logo.png": "/public/0e0b993fd6ff351f435ff1c2938daf2d.png",
   "inferno_icon.png": "/public/a5cd39450ab0336db73c5e57228b649d.png"
 }