lex-llm-bedrock 0.1.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61bd89194ee181746dc54c6b898bf31b4b8d599a01121bcec9a0dbd8b80d3b5c
-  data.tar.gz: 97ab9f39bec79114152b42d8fdf8f996a50b4b1ac94dcb1a230049ccd8d08398
+  metadata.gz: 2fdf5749de02e358b9458e391edfc790c954d252a29380e3ca2a6ba4c34e085b
+  data.tar.gz: 4662cd33fd1fa36622850662707ef618d936ab96b74ed8dc73680153b5e475c2
 SHA512:
-  metadata.gz: 441194151664025152b62567db2f84d9b406779502f560c9f8b0a41c891ec8f487624a8fd5bf3d6a7c86172b15a5f218bfa38c9f847d7a7bdec5db49e678ccca
-  data.tar.gz: 7676dff0e80cc6a3a0589a01acc723b7920c3d59193936c2f5a8bc89444957f1f43e9cf8b003ab19badd21720a74a26d8b3046d7e673c1333a1fca458b12af43
+  metadata.gz: 5117d3c2035ee76b7d3caa18079724b8246aa617765960b32c4b31ab7118171b55a599e87ffb6b712e77ab4bdf00e4fac29f70d0932bd1ea7436b18ea9c4e318
+  data.tar.gz: a0457d98e4da2489fce6c0ee0458b9567606a7cbe71cbe2e64d7b8d75030245cd5f11cbf601ed326eca903f5b5c0579a208f8ab7b5ac783f18421363768a5ad9

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.3.0 - 2026-05-01
+
+- Add auto-discovery via CredentialSources and AutoRegistration from lex-llm 0.3.0
+- Self-register discovered instances into Call::Registry at require-time
+- Require lex-llm >= 0.3.0
+
+
+## 0.2.0 - 2026-04-30
+
+- Adopt lex-llm 0.1.9 base contract: flat `default_settings`, base `RegistryPublisher`, base `RegistryEventBuilder`.
+- Replace `provider_settings` call with flat default_settings hash (default_model, region, credentials, whitelist/blacklist, TLS, instances).
+- Remove `Provider.register` call; register configuration options directly via `Configuration.register_provider_options`.
+- Delete local `RegistryPublisher`, `RegistryEventBuilder`, and `transport/` directory; use parameterized base classes from lex-llm.
+- Move `registry_publisher` from `Provider` class method to `Bedrock` module method using `Legion::Extensions::Llm::RegistryPublisher.new(provider_family: :bedrock)`.
+- Rewrite `list_models` to return `Model::Info` with `capabilities`, `modalities_input`, and `modalities_output` derived from Bedrock `inputModalities`/`outputModalities`.
+- Publish discovered models via `publish_models_async` (base contract) instead of `publish_offerings_async`.
+- Bump gemspec dependency to `lex-llm >= 0.1.9`.
+
 ## 0.1.5 - 2026-04-30
 
 - Audit logging, rescue blocks, and README for full observability.

data/lex-llm-bedrock.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'legion-json', '>= 1.2.1'
   spec.add_dependency 'legion-logging', '>= 1.3.2'
   spec.add_dependency 'legion-settings', '>= 1.3.14'
-  spec.add_dependency 'lex-llm', '>= 0.1.5'
+  spec.add_dependency 'lex-llm', '>= 0.3.0'
 end

data/lib/legion/extensions/llm/bedrock/provider.rb

@@ -27,8 +27,6 @@ module Legion
           ALIASES = STATIC_MODELS.to_h { |entry| [entry.fetch(:alias), entry.fetch(:model)] }.freeze
 
           class << self
-            attr_writer :registry_publisher
-
             def slug = 'bedrock'
 
             def configuration_options
@@ -47,7 +45,7 @@ module Legion
             def capabilities = Capabilities
 
             def registry_publisher
-              @registry_publisher ||= RegistryPublisher.new
+              Bedrock.registry_publisher
             end
 
             def resolve_model_id(model_id, config: nil) # rubocop:disable Lint/UnusedMethodArgument
@@ -96,7 +94,6 @@ module Legion
             response = bedrock_client.list_foundation_models(**filters)
             Array(value(response, :model_summaries)).map { |summary| offering_from_summary(summary) }.tap do |offerings|
               log.info { "bedrock.provider.discover_offerings: found #{offerings.size} models" }
-              self.class.registry_publisher.publish_offerings_async(offerings, readiness: readiness(live: false))
             end
           end
 
@@ -145,16 +142,11 @@ module Legion
 
           def list_models
             log.info { 'bedrock.provider.list_models: fetching live model list' }
-            discover_offerings(live: true).map do |offering|
-              Legion::Extensions::Llm::Model::Info.new(
-                id: offering.model,
-                name: offering.metadata[:alias] || offering.model,
-                provider: :bedrock,
-                family: offering.metadata[:model_family],
-                capabilities: offering.capabilities.map(&:to_s),
-                metadata: offering.to_h
-              )
-            end
+            response = bedrock_client.list_foundation_models
+            models = Array(value(response, :model_summaries)).filter_map { |summary| model_info_from_summary(summary) }
+            log.info { "bedrock.provider.list_models: found #{models.size} models" }
+            self.class.registry_publisher.publish_models_async(models, readiness: readiness(live: false))
+            models
           end
 
           def chat(messages, model:, temperature: nil, max_tokens: nil, tools: {}, tool_prefs: nil, params: {})
@@ -244,6 +236,23 @@ module Legion
             )
           end
 
+          def model_info_from_summary(summary)
+            model = value(summary, :model_id)
+            input_mods = Array(value(summary, :input_modalities)).map { |m| m.to_s.downcase }
+            output_mods = Array(value(summary, :output_modalities)).map { |m| m.to_s.downcase }
+
+            Legion::Extensions::Llm::Model::Info.new(
+              id: model,
+              name: alias_for(model) || model,
+              provider: :bedrock,
+              family: (normalize_provider(value(summary, :provider_name)) || model_family_for(model)).to_s,
+              capabilities: capabilities_from_modalities(input_mods, output_mods, summary),
+              modalities_input: input_mods,
+              modalities_output: output_mods,
+              metadata: normalize_response(summary)
+            )
+          end
+
           def build_offering(model:, model_family:, usage_type:, instance_id: :default, alias_name: nil,
                              capabilities: nil, metadata: {})
             Legion::Extensions::Llm::Routing::ModelOffering.new(
@@ -480,6 +489,18 @@ module Legion
             capabilities
           end
 
+          def capabilities_from_modalities(input_mods, output_mods, summary)
+            caps = []
+            caps << :embedding if output_mods.include?('embedding')
+            unless caps.include?(:embedding)
+              caps << :completion
+              caps << :streaming if value(summary, :response_streaming_supported)
+            end
+            caps << :vision if input_mods.include?('image')
+            caps << :tools if caps.include?(:completion)
+            caps
+          end
+
           def model_family_for(model)
             normalize_provider(model.to_s.split('.').first)
           end

data/lib/legion/extensions/llm/bedrock/version.rb

@@ -4,7 +4,7 @@ module Legion
   module Extensions
     module Llm
       module Bedrock
-        VERSION = '0.1.5'
+        VERSION = '0.3.0'
       end
     end
   end

data/lib/legion/extensions/llm/bedrock.rb

@@ -2,8 +2,6 @@
 
 require 'legion/extensions/llm'
 require 'legion/extensions/llm/bedrock/provider'
-require 'legion/extensions/llm/bedrock/registry_event_builder'
-require 'legion/extensions/llm/bedrock/registry_publisher'
 require 'legion/extensions/llm/bedrock/version'
 
 module Legion
@@ -12,38 +10,133 @@ module Legion
       # Amazon Bedrock provider extension namespace.
       module Bedrock
         extend ::Legion::Extensions::Core if ::Legion::Extensions.const_defined?(:Core, false)
+        extend Legion::Logging::Helper
+        extend Legion::Extensions::Llm::AutoRegistration
 
         PROVIDER_FAMILY = :bedrock
 
+        DEFAULT_REGION = 'us-east-2'
+
         def self.default_settings
-          ::Legion::Extensions::Llm.provider_settings(
-            family: PROVIDER_FAMILY,
-            discovery: { enabled: false, live: false, regions: %w[us-east-1 us-west-2] },
-            instance: {
-              endpoint: 'https://bedrock-runtime.us-east-1.amazonaws.com',
-              region: 'us-east-1',
-              tier: :frontier,
-              transport: :aws_sdk,
-              credentials: {
-                provider: 'aws-sdk-default-chain',
-                access_key_id: 'env://AWS_ACCESS_KEY_ID',
-                secret_access_key: 'env://AWS_SECRET_ACCESS_KEY',
-                session_token: 'env://AWS_SESSION_TOKEN',
-                profile: 'env://AWS_PROFILE'
-              },
-              usage: { inference: true, embedding: true, token_counting: true },
-              limits: { concurrency: 4 }
-            }
-          )
+          {
+            enabled: false,
+            default_model: 'us.anthropic.claude-sonnet-4-6',
+            region: DEFAULT_REGION,
+            bearer_token: nil,
+            api_key: nil,
+            secret_key: nil,
+            session_token: nil,
+            model_whitelist: [],
+            model_blacklist: [],
+            model_cache_ttl: 3600,
+            tls: { enabled: false, verify: :peer },
+            instances: {}
+          }
         end
 
         def self.provider_class
           Provider
         end
+
+        def self.registry_publisher
+          @registry_publisher ||= Legion::Extensions::Llm::RegistryPublisher.new(provider_family: PROVIDER_FAMILY)
+        end
+
+        def self.discover_instances
+          candidates = {}
+          discover_env_bearer(candidates)
+          discover_claude_bearer(candidates)
+          discover_env_sigv4(candidates)
+          discover_settings(candidates)
+          discover_broker(candidates)
+          CredentialSources.dedup_credentials(candidates)
+        end
+
+        def self.discover_env_bearer(candidates)
+          bearer = CredentialSources.env('AWS_BEARER_TOKEN_BEDROCK')
+          return unless bearer
+
+          candidates[:env_bearer] = {
+            bearer_token: bearer,
+            bedrock_region: CredentialSources.env('AWS_DEFAULT_REGION') || DEFAULT_REGION,
+            tier: :cloud
+          }
+        end
+
+        def self.discover_claude_bearer(candidates)
+          claude_bearer = CredentialSources.claude_env_value('AWS_BEARER_TOKEN_BEDROCK')
+          claude_bearer ||= claude_env_pattern_match
+          return unless claude_bearer
+
+          candidates[:claude] = {
+            bearer_token: claude_bearer,
+            bedrock_region: CredentialSources.claude_env_value('AWS_DEFAULT_REGION') || DEFAULT_REGION,
+            tier: :cloud
+          }
+        end
+
+        def self.discover_env_sigv4(candidates)
+          akid = CredentialSources.env('AWS_ACCESS_KEY_ID')
+          skey = CredentialSources.env('AWS_SECRET_ACCESS_KEY')
+          return unless akid && skey
+
+          candidates[:env_sigv4] = {
+            api_key: akid, bedrock_access_key_id: akid, bedrock_secret_access_key: skey,
+            bedrock_session_token: CredentialSources.env('AWS_SESSION_TOKEN'),
+            bedrock_region: CredentialSources.env('AWS_DEFAULT_REGION') || DEFAULT_REGION, tier: :cloud
+          }.compact
+        end
+
+        def self.discover_settings(candidates)
+          settings = CredentialSources.setting(:extensions, :llm, :bedrock)
+          candidates[:settings] = settings.merge(tier: :cloud) if settings.is_a?(Hash) && !settings.empty?
+        end
+
+        def self.discover_broker(candidates)
+          return unless defined?(Legion::Identity::Broker)
+
+          broker_creds = broker_aws_credentials
+          candidates[:broker] = broker_creds.merge(tier: :cloud) if broker_creds
+        end
+
+        # Scan Claude config env hash for any key containing all of
+        # AWS, BEARER, TOKEN, and BEDROCK fragments (case-insensitive).
+        def self.claude_env_pattern_match
+          env_hash = CredentialSources.claude_config_value(:env)
+          return nil unless env_hash.is_a?(Hash)
+
+          fragments = %w[AWS BEARER TOKEN BEDROCK]
+          _key, value = env_hash.find do |k, _v|
+            upper = k.to_s.upcase
+            fragments.all? { |frag| upper.include?(frag) }
+          end
+          value
+        end
+
+        # Fetch AWS credentials from the Legion Identity Broker.
+        def self.broker_aws_credentials
+          return nil unless defined?(Legion::Identity::Broker)
+
+          creds = Legion::Identity::Broker.credentials_for(:aws)
+          return nil unless creds.is_a?(Hash)
+
+          akid = creds[:access_key_id] || creds['access_key_id']
+          return nil unless akid
+
+          { api_key: akid, bedrock_access_key_id: akid,
+            bedrock_secret_access_key: creds[:secret_access_key] || creds['secret_access_key'],
+            bedrock_session_token: creds[:session_token] || creds['session_token'],
+            bedrock_region: creds[:region] || creds['region'] || DEFAULT_REGION }.compact
+        end
       end
     end
   end
 end
 
-Legion::Extensions::Llm::Provider.register(Legion::Extensions::Llm::Bedrock::PROVIDER_FAMILY,
-                                           Legion::Extensions::Llm::Bedrock::Provider)
+if Legion::Extensions::Llm::Configuration.respond_to?(:register_provider_options)
+  Legion::Extensions::Llm::Configuration.register_provider_options(
+    Legion::Extensions::Llm::Bedrock::Provider.configuration_options
+  )
+end
+
+Legion::Extensions::Llm::Bedrock.register_discovered_instances

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lex-llm-bedrock
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.3.0
 platform: ruby
 authors:
 - LegionIO
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.3.0
 description: Amazon Bedrock provider integration for the LegionIO LLM routing framework.
 email:
 - matthewdiverson@gmail.com
@@ -112,10 +112,6 @@ files:
 - lex-llm-bedrock.gemspec
 - lib/legion/extensions/llm/bedrock.rb
 - lib/legion/extensions/llm/bedrock/provider.rb
-- lib/legion/extensions/llm/bedrock/registry_event_builder.rb
-- lib/legion/extensions/llm/bedrock/registry_publisher.rb
-- lib/legion/extensions/llm/bedrock/transport/exchanges/llm_registry.rb
-- lib/legion/extensions/llm/bedrock/transport/messages/registry_event.rb
 - lib/legion/extensions/llm/bedrock/version.rb
 homepage: https://github.com/LegionIO/lex-llm-bedrock
 licenses:

data/lib/legion/extensions/llm/bedrock/registry_event_builder.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-module Legion
-  module Extensions
-    module Llm
-      module Bedrock
-        # Builds sanitized lex-llm registry envelopes for Bedrock provider state.
-        class RegistryEventBuilder
-          include Legion::Logging::Helper
-
-          def readiness(readiness)
-            registry_event_class.public_send(
-              readiness[:ready] ? :available : :unavailable,
-              provider_offering(readiness),
-              runtime: runtime_metadata,
-              health: readiness_health(readiness),
-              metadata: readiness_metadata(readiness)
-            )
-          end
-
-          def offering_available(offering, readiness:)
-            registry_event_class.available(
-              offering,
-              runtime: runtime_metadata,
-              health: offering_health(readiness),
-              metadata: offering_metadata
-            )
-          end
-
-          private
-
-          def provider_offering(readiness)
-            {
-              provider_family: :bedrock,
-              provider_instance: provider_instance,
-              transport: :aws_sdk,
-              model: 'provider-readiness',
-              usage_type: :inference,
-              capabilities: [],
-              health: readiness_health(readiness),
-              metadata: { lex: :llm_bedrock, provider_readiness: true }
-            }
-          end
-
-          def readiness_health(readiness)
-            health = {
-              ready: readiness[:ready] == true,
-              status: readiness[:ready] ? :available : :unavailable,
-              checked: readiness[:checked] != false
-            }
-            add_readiness_error(health, readiness)
-          end
-
-          def add_readiness_error(health, source)
-            error_class = source[:error] || source['error']
-            error_message = source[:message] || source['message']
-            health[:error_class] = error_class if error_class
-            health[:error] = error_message if error_message
-            health
-          end
-
-          def offering_health(readiness)
-            ready = readiness.fetch(:ready, true) == true
-            { ready:, status: ready ? :available : :degraded, checked: readiness[:checked] != false }
-          end
-
-          def readiness_metadata(readiness)
-            {
-              extension: :lex_llm_bedrock,
-              provider: :bedrock,
-              configured: readiness[:configured] == true,
-              live: readiness[:live] == true
-            }
-          end
-
-          def offering_metadata
-            { extension: :lex_llm_bedrock, provider: :bedrock }
-          end
-
-          def runtime_metadata
-            { node: provider_instance }
-          end
-
-          def provider_instance
-            :bedrock
-          end
-
-          def registry_event_class
-            ::Legion::Extensions::Llm::Routing::RegistryEvent
-          end
-        end
-      end
-    end
-  end
-end

data/lib/legion/extensions/llm/bedrock/registry_publisher.rb

@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-module Legion
-  module Extensions
-    module Llm
-      module Bedrock
-        # Best-effort publisher for Bedrock provider availability events.
-        class RegistryPublisher
-          include Legion::Logging::Helper
-
-          APP_ID = 'lex-llm-bedrock'
-
-          def initialize(builder: RegistryEventBuilder.new)
-            @builder = builder
-          end
-
-          def publish_readiness_async(readiness)
-            log.debug { 'bedrock.registry_publisher.publish_readiness_async: scheduling readiness event' }
-            schedule { publish_event(@builder.readiness(readiness)) }
-          end
-
-          def publish_offerings_async(offerings, readiness:)
-            log.debug do
-              "bedrock.registry_publisher.publish_offerings_async: scheduling #{Array(offerings).size} offerings"
-            end
-            schedule do
-              Array(offerings).each do |offering|
-                publish_event(@builder.offering_available(offering, readiness:))
-              end
-            end
-          end
-
-          private
-
-          def schedule(&)
-            return false unless publishing_available?
-
-            Thread.new do
-              Thread.current.abort_on_exception = false
-              yield
-            rescue StandardError => e
-              handle_exception(e, level: :debug, handled: true, operation: 'bedrock.registry_publisher.schedule')
-            end
-          rescue StandardError => e
-            handle_exception(e, level: :debug, handled: true, operation: 'bedrock.registry_publisher.schedule')
-            false
-          end
-
-          def publish_event(event)
-            return false unless publishing_available?
-
-            message_class.new(event:, app_id: APP_ID).publish(spool: false)
-          rescue StandardError => e
-            handle_exception(e, level: :warn, handled: true, operation: 'bedrock.registry_publisher.publish_event')
-            false
-          end
-
-          def publishing_available?
-            return false unless registry_event_available?
-            return false unless transport_message_available?
-            return true unless defined?(::Legion::Transport::Connection)
-            return true unless ::Legion::Transport::Connection.respond_to?(:session_open?)
-
-            ::Legion::Transport::Connection.session_open?
-          rescue StandardError => e
-            handle_exception(e, level: :debug, handled: true,
-                                operation: 'bedrock.registry_publisher.publishing_available?')
-            false
-          end
-
-          def registry_event_available?
-            defined?(::Legion::Extensions::Llm::Routing::RegistryEvent)
-          end
-
-          def transport_message_available?
-            return true if message_class_defined?
-            return false unless defined?(::Legion::Transport::Message) && defined?(::Legion::Transport::Exchange)
-
-            require 'legion/extensions/llm/bedrock/transport/messages/registry_event'
-            message_class_defined?
-          rescue LoadError => e
-            handle_exception(e, level: :debug, handled: true,
-                                operation: 'bedrock.registry_publisher.transport_message_available?')
-            false
-          end
-
-          def message_class_defined?
-            defined?(::Legion::Extensions::Llm::Bedrock::Transport::Messages::RegistryEvent)
-          end
-
-          def message_class
-            ::Legion::Extensions::Llm::Bedrock::Transport::Messages::RegistryEvent
-          end
-        end
-      end
-    end
-  end
-end

data/lib/legion/extensions/llm/bedrock/transport/exchanges/llm_registry.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Legion
-  module Extensions
-    module Llm
-      module Bedrock
-        module Transport
-          module Exchanges
-            # Topic exchange for Bedrock provider availability events.
-            class LlmRegistry < ::Legion::Transport::Exchange
-              def exchange_name
-                'llm.registry'
-              end
-
-              def default_type
-                'topic'
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/legion/extensions/llm/bedrock/transport/messages/registry_event.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'legion/extensions/llm/bedrock/transport/exchanges/llm_registry'
-
-module Legion
-  module Extensions
-    module Llm
-      module Bedrock
-        module Transport
-          module Messages
-            # Publishes lex-llm RegistryEvent envelopes to the llm.registry exchange.
-            class RegistryEvent < ::Legion::Transport::Message
-              def initialize(event:, **options)
-                super(**event.to_h.merge(options))
-              end
-
-              def exchange
-                Transport::Exchanges::LlmRegistry
-              end
-
-              def routing_key
-                @options[:routing_key] || "llm.registry.#{@options.fetch(:event_type)}"
-              end
-
-              def type
-                'llm.registry.event'
-              end
-
-              def app_id
-                @options[:app_id] || RegistryPublisher::APP_ID
-              end
-
-              def persistent # rubocop:disable Naming/PredicateMethod
-                false
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end