inferno_core 0.4.39 → 0.4.40

data/lib/inferno/result_collection.rb

@@ -0,0 +1,72 @@
+module Inferno
+  # The ResultCollection class is used to manage a collection of Inferno::Entities::Result objects.
+  # It provides methods to filter required and optional results, access results
+  # by index or by their runnable IDs, and iterate over the collection.
+  #
+  # @example
+  #
+  #   results = [
+  #     Result.new(test_group_id: 'group_id1', result: 'pass'),
+  #     Result.new(test_group_id: 'group_id2', result: 'fail'),
+  #     Result.new(test_group_id: 'group_id3', result: 'pass')
+  #   ]
+  #
+  #   result_collection = Inferno::ResultCollection.new(results)
+  #
+  #   # Access by index
+  #   result = result_collection[0]
+  #
+  #   # Access by runnable ID (partial)
+  #   result = result_collection['group_id2']
+  #
+  #   # Iterate over results
+  #   result_collection.each do |result|
+  #     puts result.result
+  #   end
+  #
+  #   # Get required results
+  #   required_results = result_collection.required_results
+  #
+  #   # Get optional results
+  #   optional_results = result_collection.optional_results
+  # @private
+  class ResultCollection
+    include Enumerable
+
+    attr_reader :results
+
+    def initialize(results = [])
+      @results = results
+    end
+
+    def [](key)
+      key.is_a?(Integer) ? results[key] : lookup_by_runnable_id(key)
+    end
+
+    def <<(result)
+      (results << result).flatten!
+      self
+    end
+
+    def each(&)
+      return to_enum(:each) unless block_given?
+
+      results.each(&)
+      self
+    end
+
+    def required_results
+      results.select(&:required?)
+    end
+
+    def optional_results
+      results.select(&:optional?)
+    end
+
+    private
+
+    def lookup_by_runnable_id(key)
+      results.find { |result| result.runnable&.id == key.to_s || result.runnable&.id&.end_with?("-#{key}") }
+    end
+  end
+end

data/lib/inferno/result_summarizer.rb

@@ -1,3 +1,4 @@
+require_relative './result_collection'
 module Inferno
   # @private
   # This class takes an array of results and determines the overall result. This
@@ -7,13 +8,11 @@ module Inferno
     attr_reader :results
 
     def initialize(results)
-      @results = results
+      @results = results.is_a?(ResultCollection) ? results : ResultCollection.new(results)
     end
 
     def summarize
-      return 'pass' if all_optional_results? &&
-                       unique_result_strings.any?('pass') &&
-                       unique_result_strings.none? { |result| %w[wait running].include? result }
+      return 'pass' if optional_results_passing_criteria_met?
 
       prioritized_result_strings.find { |result_string| unique_result_strings.include? result_string }
     end
@@ -24,21 +23,21 @@ module Inferno
       Entities::Result::RESULT_OPTIONS
     end
 
-    def required_results
-      @required_results ||= results.select(&:required?)
+    def optional_results_passing_criteria_met?
+      all_optional_results? && unique_result_strings.any?('pass') &&
+        unique_result_strings.none? { |result| %w[wait running].include? result }
     end
 
     def all_optional_results?
-      required_results.blank?
+      results.required_results.blank?
     end
 
     def results_for_summary
-      all_optional_results? ? results : required_results
+      all_optional_results? ? results : results.required_results
     end
 
     def unique_result_strings
-      @unique_result_strings ||=
-        results_for_summary.map(&:result).uniq
+      @unique_result_strings ||= results_for_summary.map(&:result).uniq
     end
   end
 end

data/lib/inferno/test_runner.rb

@@ -70,22 +70,7 @@ module Inferno
           suite_options: test_session.suite_options_hash
         )
 
-      result = begin
-        raise Exceptions::CancelException, 'Test cancelled by user' if test_run_is_cancelling
-
-        check_inputs(test, test_instance, inputs)
-
-        test_instance.load_named_requests
-        test_instance.instance_eval(&test.block)
-        'pass'
-      rescue Exceptions::TestResultException => e
-        test_instance.result_message = format_markdown(e.message)
-        e.result
-      rescue StandardError => e
-        Application['logger'].error(e.full_message)
-        test_instance.result_message = format_markdown("Error: #{e.message}\n\n#{e.backtrace.first}")
-        'error'
-      end
+      result = evaluate_runnable_result(test, test_instance, inputs)
 
       outputs = save_outputs(test_instance)
       output_json_string = JSON.generate(outputs)
@@ -144,17 +129,22 @@ module Inferno
         return group_result
       end
 
-      results = []
+      group_instance = group.new
+
       group.children(test_session.suite_options).each do |child|
         result = run(child, scratch)
-        results << result
-        break if results.last.waiting?
+        group_instance.results << result
+        break if result.waiting?
       end
 
-      results.flatten!
+      result = evaluate_runnable_result(group, group_instance) || roll_up_result(group_instance.results)
 
-      group_result = persist_result(group.reference_hash.merge(result: roll_up_result(results),
-                                                               input_json: JSON.generate(group_inputs_with_values)))
+      group_result = persist_result(group.reference_hash.merge(
+                                      messages: group_instance.messages,
+                                      result:,
+                                      result_message: group_instance.result_message,
+                                      input_json: JSON.generate(group_inputs_with_values)
+                                    ))
 
       update_parent_result(group.parent)
 
@@ -166,15 +156,19 @@ module Inferno
 
       children = parent.children(test_session.suite_options)
       child_results = results_repo.current_results_for_test_session_and_runnables(test_session.id, children)
-      required_children = children.select(&:required?)
-      required_results = child_results.select(&:required?)
-      return if required_children.length != required_results.length
+      return unless need_to_update_parent_result?(children, child_results, &parent.block)
 
+      parent_instance = parent.new
+      parent_instance.results << child_results
       old_result = results_repo.current_result_for_test_session(test_session.id, parent.reference_hash)&.result
-      new_result = roll_up_result(child_results)
+      new_result = evaluate_runnable_result(parent, parent_instance) || roll_up_result(child_results)
 
       if new_result != old_result
-        persist_result(parent.reference_hash.merge(result: new_result))
+        persist_result(parent.reference_hash.merge(
+                         result: new_result,
+                         result_message: parent_instance.result_message,
+                         messages: parent_instance.messages
+                       ))
 
         update_parent_result(parent.parent)
       end
@@ -182,6 +176,40 @@ module Inferno
       new_result
     end
 
+    def evaluate_runnable_result(runnable, runnable_instance, inputs = nil)
+      return if !(runnable < Entities::Test) && !runnable.block
+
+      if runnable < Entities::Test
+        raise Exceptions::CancelException, 'Test cancelled by user' if test_run_is_cancelling
+
+        check_inputs(runnable, runnable_instance, inputs)
+
+        runnable_instance.load_named_requests
+      end
+      runnable_instance.instance_eval(&runnable.block)
+      'pass'
+    rescue Exceptions::TestResultException => e
+      runnable_instance.result_message = format_markdown(e.message)
+      e.result
+    rescue StandardError => e
+      Application['logger'].error(e.full_message)
+      runnable_instance.result_message = format_markdown("Error: #{e.message}\n\n#{e.backtrace.first}")
+      'error'
+    end
+
+    # Determines if the parent result needs to be updated based on the results of its children.
+    #
+    # The parent result needs to be updated if:
+    # - No custom result block is provided and all required children have corresponding required results.
+    # - A custom result block is provided and all children have corresponding results.
+    def need_to_update_parent_result?(children, child_results, &)
+      required_children = children.select(&:required?)
+      required_results = child_results.select(&:required?)
+
+      (!block_given? && required_children.length == required_results.length) ||
+        (block_given? && children.length == child_results.length)
+    end
+
     def load_inputs(runnable)
       runnable.inputs.each_with_object({}) do |input_identifier, input_hash|
         input_alias = runnable.config.input_name(input_identifier)

data/lib/inferno/version.rb

@@ -1,4 +1,4 @@
 module Inferno
   # Standard patterns for gem versions: https://guides.rubygems.org/patterns/
-  VERSION = '0.4.39'.freeze
+  VERSION = '0.4.40'.freeze
 end

data/spec/fixtures/auth_info_constants.rb

@@ -0,0 +1,71 @@
+module AuthInfoConstants
+  AUTH_URL = 'http://example.com/authorization'.freeze
+  TOKEN_URL = 'http://example.com/token'.freeze
+  REQUESTED_SCOPES = 'launch/patient openid fhirUser patient/*.*'.freeze
+  ENCRYPTION_ALGORITHM = 'ES384'.freeze
+  KID = '4b49a739d1eb115b3225f4cf9beb6d1b'.freeze
+  JWKS = File.read(File.join('lib', 'inferno', 'dsl', 'jwks.json')).freeze
+  class << self
+    def token_info
+      {
+        access_token: 'SAMPLE_TOKEN',
+        refresh_token: 'SAMPLE_REFRESH_TOKEN',
+        expires_in: '3600',
+        issue_time: Time.now.iso8601
+      }
+    end
+
+    def public_access_default
+      {
+        auth_type: 'public',
+        token_url: TOKEN_URL,
+        client_id: 'SAMPLE_PUBLIC_CLIENT_ID',
+        requested_scopes: REQUESTED_SCOPES,
+        pkce_support: 'enabled',
+        pkce_code_challenge_method: 'S256',
+        auth_request_method: 'GET'
+      }.merge(token_info)
+    end
+
+    def symmetric_confidential_access_default
+      {
+        auth_type: 'symmetric',
+        token_url: TOKEN_URL,
+        client_id: 'SAMPLE_CONFIDENTIAL_CLIENT_ID',
+        client_secret: 'SAMPLE_CONFIDENTIAL_CLIENT_SECRET',
+        auth_url: AUTH_URL,
+        requested_scopes: REQUESTED_SCOPES,
+        pkce_support: 'enabled',
+        pkce_code_challenge_method: 'S256',
+        auth_request_method: 'post',
+        use_discovery: 'false'
+      }.merge(token_info)
+    end
+
+    def asymmetric_confidential_access_default
+      {
+        auth_type: 'asymmetric',
+        token_url: TOKEN_URL,
+        client_id: 'SAMPLE_CONFIDENTIAL_CLIENT_ID',
+        requested_scopes: REQUESTED_SCOPES,
+        pkce_support: 'disabled',
+        auth_request_method: 'post',
+        encryption_algorithm: ENCRYPTION_ALGORITHM,
+        jwks: JWKS,
+        kid: KID
+      }.merge(token_info)
+    end
+
+    def backend_services_access_default
+      {
+        auth_type: 'backend_services',
+        token_url: TOKEN_URL,
+        client_id: 'SAMPLE_CONFIDENTIAL_CLIENT_ID',
+        requested_scopes: REQUESTED_SCOPES,
+        encryption_algorithm: ENCRYPTION_ALGORITHM,
+        jwks: JWKS,
+        kid: KID
+      }.merge(token_info)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.4.39
+  version: 0.4.40
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -649,9 +649,12 @@ files:
 - lib/inferno/dsl/fhir_client_builder.rb
 - lib/inferno/dsl/fhir_resource_validation.rb
 - lib/inferno/dsl/fhir_validation.rb
+- lib/inferno/dsl/fhirpath_evaluation.rb
 - lib/inferno/dsl/http_client.rb
 - lib/inferno/dsl/http_client_builder.rb
 - lib/inferno/dsl/input_output_handling.rb
+- lib/inferno/dsl/jwks.rb
+- lib/inferno/dsl/messages.rb
 - lib/inferno/dsl/oauth_credentials.rb
 - lib/inferno/dsl/request_storage.rb
 - lib/inferno/dsl/results.rb
@@ -713,6 +716,7 @@ files:
 - lib/inferno/repositories/tests.rb
 - lib/inferno/repositories/validate_runnable_reference.rb
 - lib/inferno/repositories/validator_sessions.rb
+- lib/inferno/result_collection.rb
 - lib/inferno/result_summarizer.rb
 - lib/inferno/spec_support.rb
 - lib/inferno/test_runner.rb
@@ -731,6 +735,7 @@ files:
 - spec/factories/result.rb
 - spec/factories/test_run.rb
 - spec/factories/test_session.rb
+- spec/fixtures/auth_info_constants.rb
 - spec/fixtures/basic_test_group.rb
 - spec/fixtures/basic_test_suite.rb
 - spec/support/factory_bot.rb