[WIP] Refactor Providers

Author: sirwolfgang

lib/active_agent/generation_provider/ollama_provider.rb

@@ -8,7 +8,6 @@
 module ActiveAgent
   module GenerationProvider
     class OllamaProvider < OpenAIProvider
-
       def initialize(config)
         @api_version     = config.delete("api_version") || "v1"
         @embedding_model = config.delete("embedding_model")

lib/active_agent/generation_provider/open_ai_provider.rb

@@ -86,7 +86,7 @@ def format_image_content(message)
 
       # Override from ParameterBuilder to add web_search_options for Chat API
       def build_provider_parameters
-        params = {}
+        params = super
 
         # Check if we're using a model that supports web_search_options in Chat API
         if chat_api_web_search_model? && @prompt.options[:web_search]

lib/active_agent/generation_provider/open_router/max_price.rb

@@ -7,7 +7,6 @@ module OpenRouter
       # Specifies USD price per million tokens for different operations
       # See: https://openrouter.ai/docs/provider-routing
       class MaxPrice < Common::Options
-
         attribute :prompt,     :float # Price per million prompt tokens (input)
         attribute :completion, :float # Price per million completion tokens (output)
         attribute :image,      :float # Price per image

lib/active_agent/generation_provider/open_router/prediction.rb

@@ -4,7 +4,6 @@ module ActiveAgent
   module GenerationProvider
     module OpenRouter
       class Prediction < Common::Options
-
         attribute :type, :string
         attribute :content, :string
 

lib/active_agent/generation_provider/open_router/provider_preferences.rb

@@ -9,7 +9,6 @@ module OpenRouter
       # Provider preferences for routing requests to specific providers
       # See: https://openrouter.ai/docs/provider-routing
       class ProviderPreferences < Common::Options
-
         # Whether to allow backup providers to serve requests
         # - true: (default) when primary provider is unavailable, use next best provider
         # - false: use only primary/custom provider, return upstream error if unavailable
@@ -52,7 +51,7 @@ class ProviderPreferences < Common::Options
         validates :data_collection, inclusion: { in: %w[deny allow] }, allow_nil: true
         validates :sort, inclusion: { in: %w[price throughput latency] }, allow_nil: true
         validates :quantizations, inclusion: {
-          in: [%w[int4 int8 fp4 fp6 fp8 fp16 bf16 fp32 unknown].freeze],
+          in: [ %w[int4 int8 fp4 fp6 fp8 fp16 bf16 fp32 unknown].freeze ],
           message: "must contain valid quantization levels"
         }, allow_nil: true, if: -> { quantizations.is_a?(Array) && quantizations.any? }
 

lib/active_agent/generation_provider/open_router/response_format.rb

@@ -4,7 +4,6 @@ module ActiveAgent
   module GenerationProvider
     module OpenRouter
       class ResponseFormat < Common::Options
-
         attribute :type, :string
 
         validates :type, inclusion: { in: %w[json_object] }, allow_nil: true

lib/active_agent/generation_provider/open_router_provider.rb

@@ -29,12 +29,9 @@ def generate(prompt)
 
       def namespace = OpenRouter
 
+      # OpenAI + OpenRouter
       def build_provider_parameters
-        # Start with base OpenAI parameters
-        params = super
-
-        # Add OpenRouter-specific parameters
-        add_openrouter_params(params)
+        super.merge(options.chat_parameters)
       end
 
       def format_content_item(item)
@@ -82,37 +79,6 @@ def build_provider_preferences
         end
       end
 
-      def add_openrouter_params(params)
-        # Add OpenRouter-specific routing parameters
-        if @fallback_models.present?
-          params[:models] = @fallback_models
-          params[:route] = @route
-        end
-
-        # Add transforms
-        params[:transforms] = @transforms if @transforms.present?
-
-        # Add provider configuration (always include if we have data_collection or other settings)
-        # Check both configured and runtime data_collection/require_parameters values
-        runtime_data_collection = prompt&.options&.key?(:data_collection)
-        runtime_require_parameters = prompt&.options&.key?(:require_parameters)
-        runtime_provider_options = prompt&.options&.keys&.any? { |k| [ :only, :ignore, :quantizations, :sort, :max_price ].include?(k) }
-
-        if options.provider.present? || @data_collection != "allow" || @require_parameters != false ||
-           @only_providers.present? || @ignore_providers.present? || @quantizations.present? ||
-           @sort_preference.present? || @max_price.present? ||
-           runtime_data_collection || runtime_require_parameters || runtime_provider_options
-          params[:provider] = build_provider_preferences
-        end
-
-        # Add plugins (e.g., for PDF processing)
-        if prompt.options[:plugins].present?
-          params[:plugins] = prompt.options[:plugins]
-        end
-
-        params
-      end
-
       def execute_with_fallback(parameters)
         parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]