htm 0.0.30 → 0.0.32

data/lib/htm/config.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require 'anyway_config'
+require 'myway_config'
 require 'logger'
-require 'yaml'
 
 # Define Config class first to establish superclass
 class HTM
-  class Config < Anyway::Config
+  class Config < MywayConfig::Base
   end
 end
 
-require_relative 'config/section'
 require_relative 'config/validator'
 require_relative 'config/database'
 require_relative 'config/builder'
@@ -61,35 +59,11 @@ class HTM
 
     config_name :htm
     env_prefix :htm
+    defaults_path File.expand_path('config/defaults.yml', __dir__)
 
-    # ==========================================================================
-    # Schema Definition (loaded from defaults.yml - single source of truth)
-    # ==========================================================================
-
-    # Path to bundled defaults file (defines both schema and default values)
-    DEFAULTS_PATH = File.expand_path('config/defaults.yml', __dir__).freeze
-
-    # Load schema from defaults.yml at class definition time
-    begin
-      defaults_content = File.read(DEFAULTS_PATH)
-      raw_yaml = YAML.safe_load(
-        defaults_content,
-        permitted_classes: [Symbol],
-        symbolize_names: true,
-        aliases: true
-      ) || {}
-      SCHEMA = raw_yaml[:defaults] || {}
-    rescue StandardError => e
-      warn "HTM: Could not load schema from #{DEFAULTS_PATH}: #{e.message}"
-      SCHEMA = {}
-    end
-
-    # Nested section attributes (defined as hashes, converted to ConfigSection)
-    attr_config :database, :service, :embedding, :tag, :proposition,
-                :chunking, :circuit_breaker, :relevance, :job, :providers
-
-    # Top-level scalar attributes
-    attr_config :week_start, :connection_timeout, :telemetry_enabled, :log_level
+    # Auto-configure attributes and coercions from defaults.yml schema
+    # This replaces manual attr_config and coerce_types declarations
+    auto_configure!
 
     # Custom environment detection: HTM_ENV > RAILS_ENV > RACK_ENV > 'development'
     class << self
@@ -102,60 +76,6 @@ class HTM
       end
     end
 
-    # ==========================================================================
-    # Type Coercion
-    # ==========================================================================
-
-    TO_SYMBOL = ->(v) { v.nil? ? nil : v.to_s.to_sym }
-
-    # Create a coercion that merges incoming value with SCHEMA defaults for a section.
-    # This ensures env vars like HTM_DATABASE__URL don't lose other defaults.
-    def self.config_section_with_defaults(section_key)
-      defaults = SCHEMA[section_key] || {}
-      ->(v) {
-        return v if v.is_a?(ConfigSection)
-        incoming = v || {}
-        # Deep merge: defaults first, then overlay incoming values
-        merged = deep_merge_hashes(defaults.dup, incoming)
-        ConfigSection.new(merged)
-      }
-    end
-
-    # Deep merge helper for coercion
-    def self.deep_merge_hashes(base, overlay)
-      base.merge(overlay) do |_key, old_val, new_val|
-        if old_val.is_a?(Hash) && new_val.is_a?(Hash)
-          deep_merge_hashes(old_val, new_val)
-        else
-          new_val.nil? ? old_val : new_val
-        end
-      end
-    end
-
-    coerce_types(
-      # Nested sections -> ConfigSection objects (with SCHEMA defaults merged)
-      database: config_section_with_defaults(:database),
-      service: config_section_with_defaults(:service),
-      embedding: config_section_with_defaults(:embedding),
-      tag: config_section_with_defaults(:tag),
-      proposition: config_section_with_defaults(:proposition),
-      chunking: config_section_with_defaults(:chunking),
-      circuit_breaker: config_section_with_defaults(:circuit_breaker),
-      relevance: config_section_with_defaults(:relevance),
-      job: config_section_with_defaults(:job),
-      providers: config_section_with_defaults(:providers),
-
-      # Top-level symbols
-      week_start: TO_SYMBOL,
-      log_level: TO_SYMBOL,
-
-      # Top-level integers
-      connection_timeout: :integer,
-
-      # Top-level booleans
-      telemetry_enabled: :boolean
-    )
-
     # ==========================================================================
     # Validation
     # ==========================================================================
@@ -179,8 +99,7 @@ class HTM
     # Callable Accessors (not loaded from config sources)
     # ==========================================================================
 
-    attr_accessor :embedding_generator, :tag_extractor, :proposition_extractor
-    attr_accessor :token_counter, :logger
+    attr_accessor :embedding_generator, :tag_extractor, :proposition_extractor, :token_counter, :logger
 
     # ==========================================================================
     # Instance Methods
@@ -256,11 +175,11 @@ class HTM
 
     # Chunking convenience accessors
     def chunk_size
-      chunking.size.to_i
+      chunking.chunk_size.to_i
     end
 
     def chunk_overlap
-      chunking.overlap.to_i
+      chunking.chunk_overlap.to_i
     end
 
     # Circuit breaker convenience accessors
@@ -375,17 +294,8 @@ class HTM
     # Environment Helpers
     # ==========================================================================
 
-    def test?
-      self.class.env == 'test'
-    end
-
-    def development?
-      self.class.env == 'development'
-    end
-
-    def production?
-      self.class.env == 'production'
-    end
+    # NOTE: test?, development?, production? are auto-generated by MywayConfig::Base
+    # based on environment keys in defaults.yml
 
     def environment
       self.class.env
@@ -396,17 +306,16 @@ class HTM
     # ==========================================================================
 
     # Returns list of valid environment names from bundled defaults
+    # Inherited from MywayConfig::Base - delegates to DefaultsLoader
     #
     # @return [Array<Symbol>] valid environment names (e.g., [:development, :production, :test])
-    def self.valid_environments
-      HTM::Loaders::DefaultsLoader.valid_environments
-    end
+    # Note: valid_environments is inherited from MywayConfig::Base
 
     # Check if current environment is valid (defined in config)
     #
     # @return [Boolean] true if environment has a config section
     def self.valid_environment?
-      HTM::Loaders::DefaultsLoader.valid_environment?(env)
+      MywayConfig::Loaders::DefaultsLoader.valid_environment?(config_name, env)
     end
 
     # Validate that the current environment is configured
@@ -415,13 +324,13 @@ class HTM
     # @return [true] if environment is valid
     def self.validate_environment!
       current = env
-      return true if HTM::Loaders::DefaultsLoader.valid_environment?(current)
+      return true if valid_environment?
 
-      valid = valid_environments.map(&:to_s).join(', ')
+      valid = valid_environments.join(', ')
       raise HTM::ConfigurationError,
-        "Invalid environment '#{current}'. " \
-        "Valid environments are: #{valid}. " \
-        "Set HTM_ENV to a valid environment or add a '#{current}:' section to your config."
+            "Invalid environment '#{current}'. " \
+            "Valid environments are: #{valid}. " \
+            "Set HTM_ENV to a valid environment or add a '#{current}:' section to your config."
     end
 
     # Instance method delegates
@@ -438,21 +347,21 @@ class HTM
     # ==========================================================================
 
     def self.xdg_config_paths
-      HTM::Loaders::XdgConfigLoader.config_paths
+      MywayConfig::Loaders::XdgConfigLoader.config_paths(config_name)
     end
 
     def self.xdg_config_file
-      xdg_home = ENV['XDG_CONFIG_HOME']
+      xdg_home = ENV.fetch('XDG_CONFIG_HOME', nil)
       base = if xdg_home && !xdg_home.empty?
-        xdg_home
-      else
-        File.expand_path('~/.config')
-      end
+               xdg_home
+             else
+               File.expand_path('~/.config')
+             end
       File.join(base, 'htm', 'htm.yml')
     end
 
     def self.active_xdg_config_file
-      HTM::Loaders::XdgConfigLoader.find_config_file('htm')
+      MywayConfig::Loaders::XdgConfigLoader.find_config_file(config_name)
     end
 
     # ==========================================================================
@@ -468,42 +377,8 @@ class HTM
 
     def configure_ruby_llm(provider = nil)
       require 'ruby_llm'
-
       provider ||= embedding_provider
-
-      RubyLLM.configure do |config|
-        case provider
-        when :openai
-          config.openai_api_key = openai_api_key if openai_api_key
-          config.openai_organization = openai_organization if openai_organization && config.respond_to?(:openai_organization=)
-          config.openai_project = openai_project if openai_project && config.respond_to?(:openai_project=)
-        when :anthropic
-          config.anthropic_api_key = anthropic_api_key if anthropic_api_key
-        when :gemini
-          config.gemini_api_key = gemini_api_key if gemini_api_key
-        when :azure
-          config.azure_api_key = azure_api_key if azure_api_key && config.respond_to?(:azure_api_key=)
-          config.azure_endpoint = azure_endpoint if azure_endpoint && config.respond_to?(:azure_endpoint=)
-          config.azure_api_version = azure_api_version if azure_api_version && config.respond_to?(:azure_api_version=)
-        when :ollama
-          ollama_api_base = if ollama_url.end_with?('/v1') || ollama_url.end_with?('/v1/')
-            ollama_url.sub(%r{/+$}, '')
-          else
-            "#{ollama_url.sub(%r{/+$}, '')}/v1"
-          end
-          config.ollama_api_base = ollama_api_base
-        when :huggingface
-          config.huggingface_api_key = huggingface_api_key if huggingface_api_key && config.respond_to?(:huggingface_api_key=)
-        when :openrouter
-          config.openrouter_api_key = openrouter_api_key if openrouter_api_key && config.respond_to?(:openrouter_api_key=)
-        when :bedrock
-          config.bedrock_api_key = bedrock_access_key if bedrock_access_key && config.respond_to?(:bedrock_api_key=)
-          config.bedrock_secret_key = bedrock_secret_key if bedrock_secret_key && config.respond_to?(:bedrock_secret_key=)
-          config.bedrock_region = bedrock_region if bedrock_region && config.respond_to?(:bedrock_region=)
-        when :deepseek
-          config.deepseek_api_key = deepseek_api_key if deepseek_api_key && config.respond_to?(:deepseek_api_key=)
-        end
-      end
+      RubyLLM.configure { |config| apply_provider_config(config, provider) }
     end
 
     def refresh_ollama_models!
@@ -543,26 +418,73 @@ class HTM
     # ==========================================================================
 
     def coerce_nested_types
-      # Ensure nested provider sections are ConfigSections
-      if providers.is_a?(ConfigSection)
-        %i[openai anthropic gemini azure ollama huggingface openrouter bedrock deepseek].each do |provider|
-          value = providers[provider]
-          providers[provider] = ConfigSection.new(value) if value.is_a?(Hash)
-        end
-      end
+      coerce_provider_sections
+      coerce_database_integers
+    end
 
-      # Coerce database numeric fields to integers (env vars are always strings)
-      if database&.port && !database.port.is_a?(Integer)
-        database.port = database.port.to_i
-      end
-      if database&.pool_size && !database.pool_size.is_a?(Integer)
-        database.pool_size = database.pool_size.to_i
-      end
-      if database&.timeout && !database.timeout.is_a?(Integer)
-        database.timeout = database.timeout.to_i
+    def coerce_provider_sections
+      return unless providers.is_a?(MywayConfig::ConfigSection)
+      %i[openai anthropic gemini azure ollama huggingface openrouter bedrock deepseek].each do |provider|
+        value = providers[provider]
+        providers[provider] = MywayConfig::ConfigSection.new(value) if value.is_a?(Hash)
       end
     end
 
+    def coerce_database_integers
+      return unless database
+      database.port      = database.port.to_i      if database.port && !database.port.is_a?(Integer)
+      database.pool_size = database.pool_size.to_i if database.pool_size && !database.pool_size.is_a?(Integer)
+      database.timeout   = database.timeout.to_i   if database.timeout && !database.timeout.is_a?(Integer)
+    end
+
+    def apply_provider_config(config, provider)
+      handler = :"apply_#{provider}_provider_config"
+      send(handler, config) if respond_to?(handler, true)
+    end
+
+    def apply_openai_provider_config(config)
+      config.openai_api_key      = openai_api_key     if openai_api_key
+      config.openai_organization = openai_organization if openai_organization && config.respond_to?(:openai_organization=)
+      config.openai_project      = openai_project      if openai_project && config.respond_to?(:openai_project=)
+    end
+
+    def apply_anthropic_provider_config(config)
+      config.anthropic_api_key = anthropic_api_key if anthropic_api_key
+    end
+
+    def apply_gemini_provider_config(config)
+      config.gemini_api_key = gemini_api_key if gemini_api_key
+    end
+
+    def apply_azure_provider_config(config)
+      config.azure_api_key     = azure_api_key     if azure_api_key && config.respond_to?(:azure_api_key=)
+      config.azure_endpoint    = azure_endpoint    if azure_endpoint && config.respond_to?(:azure_endpoint=)
+      config.azure_api_version = azure_api_version if azure_api_version && config.respond_to?(:azure_api_version=)
+    end
+
+    def apply_ollama_provider_config(config)
+      base = ollama_url.sub(%r{/+$}, '')
+      config.ollama_api_base = base.end_with?('/v1') ? base : "#{base}/v1"
+    end
+
+    def apply_huggingface_provider_config(config)
+      config.huggingface_api_key = huggingface_api_key if huggingface_api_key && config.respond_to?(:huggingface_api_key=)
+    end
+
+    def apply_openrouter_provider_config(config)
+      config.openrouter_api_key = openrouter_api_key if openrouter_api_key && config.respond_to?(:openrouter_api_key=)
+    end
+
+    def apply_bedrock_provider_config(config)
+      config.bedrock_api_key    = bedrock_access_key if bedrock_access_key && config.respond_to?(:bedrock_api_key=)
+      config.bedrock_secret_key = bedrock_secret_key if bedrock_secret_key && config.respond_to?(:bedrock_secret_key=)
+      config.bedrock_region     = bedrock_region     if bedrock_region && config.respond_to?(:bedrock_region=)
+    end
+
+    def apply_deepseek_provider_config(config)
+      config.deepseek_api_key = deepseek_api_key if deepseek_api_key && config.respond_to?(:deepseek_api_key=)
+    end
+
     # ==========================================================================
     # Setup Defaults Callback
     # ==========================================================================
@@ -573,7 +495,7 @@ class HTM
       @embedding_generator ||= build_default_embedding_generator
       @tag_extractor ||= build_default_tag_extractor
       @proposition_extractor ||= build_default_proposition_extractor
-      @token_counter ||= build_default_token_counter
+      @token_counter = build_default_token_counter if @token_counter.nil?
     end
 
     def detect_job_backend
@@ -586,7 +508,5 @@ class HTM
   end
 end
 
-# Register custom loaders after Config class is defined
-# Order matters: defaults (lowest priority) -> XDG -> project config -> ENV (highest)
-require_relative 'loaders/defaults_loader'
-require_relative 'loaders/xdg_config_loader'
+# myway_config provides DefaultsLoader and XdgConfigLoader automatically
+# Loaders are registered when MywayConfig.setup! is called (happens on require)