ruby_llm 1.5.1 → 1.6.1

data/lib/ruby_llm/providers/gemini/media.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Media handling methods for the Gemini API integration
       module Media
         module_function

data/lib/ruby_llm/providers/gemini/models.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Models methods for the Gemini API integration
       module Models
         module_function

data/lib/ruby_llm/providers/gemini/streaming.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Streaming methods for the Gemini API implementation
       module Streaming
         def stream_url

data/lib/ruby_llm/providers/gemini/tools.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Tools methods for the Gemini API implementation
       module Tools
         # Format tools for Gemini API
@@ -18,26 +18,20 @@ module RubyLLM
         def extract_tool_calls(data)
           return nil unless data
 
-          # Get the first candidate
           candidate = data.is_a?(Hash) ? data.dig('candidates', 0) : nil
           return nil unless candidate
 
-          # Get the parts array from content
           parts = candidate.dig('content', 'parts')
           return nil unless parts.is_a?(Array)
 
-          # Find the function call part
           function_call_part = parts.find { |p| p['functionCall'] }
           return nil unless function_call_part
 
-          # Get the function call data
           function_data = function_call_part['functionCall']
           return nil unless function_data
 
-          # Create a unique ID for the tool call
           id = SecureRandom.uuid
 
-          # Return the tool call in the expected format
           {
             id => ToolCall.new(
               id: id,

data/lib/ruby_llm/providers/gemini.rb

@@ -3,38 +3,33 @@
 module RubyLLM
   module Providers
     # Native Gemini API implementation
-    module Gemini
-      extend Provider
-      extend Gemini::Chat
-      extend Gemini::Embeddings
-      extend Gemini::Images
-      extend Gemini::Models
-      extend Gemini::Streaming
-      extend Gemini::Tools
-      extend Gemini::Media
+    class Gemini < Provider
+      include Gemini::Chat
+      include Gemini::Embeddings
+      include Gemini::Images
+      include Gemini::Models
+      include Gemini::Streaming
+      include Gemini::Tools
+      include Gemini::Media
 
-      module_function
-
-      def api_base(_config)
+      def api_base
         'https://generativelanguage.googleapis.com/v1beta'
       end
 
-      def headers(config)
+      def headers
         {
-          'x-goog-api-key' => config.gemini_api_key
+          'x-goog-api-key' => @config.gemini_api_key
         }
       end
 
-      def capabilities
-        Gemini::Capabilities
-      end
-
-      def slug
-        'gemini'
-      end
+      class << self
+        def capabilities
+          Gemini::Capabilities
+        end
 
-      def configuration_requirements
-        %i[gemini_api_key]
+        def configuration_requirements
+          %i[gemini_api_key]
+        end
       end
     end
   end

data/lib/ruby_llm/providers/gpustack/chat.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module GPUStack
+    class GPUStack
       # Chat methods of the GPUStack API integration
       module Chat
         module_function

data/lib/ruby_llm/providers/gpustack/models.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module GPUStack
+    class GPUStack
       # Models methods of the GPUStack API integration
       module Models
         module_function

data/lib/ruby_llm/providers/gpustack.rb

@@ -3,33 +3,30 @@
 module RubyLLM
   module Providers
     # GPUStack API integration based on Ollama.
-    module GPUStack
-      extend OpenAI
-      extend GPUStack::Chat
-      extend GPUStack::Models
+    class GPUStack < OpenAI
+      include GPUStack::Chat
+      include GPUStack::Models
 
-      module_function
-
-      def api_base(config)
-        config.gpustack_api_base
+      def api_base
+        @config.gpustack_api_base
       end
 
-      def headers(config)
+      def headers
+        return {} unless @config.gpustack_api_key
+
         {
-          'Authorization' => "Bearer #{config.gpustack_api_key}"
+          'Authorization' => "Bearer #{@config.gpustack_api_key}"
         }
       end
 
-      def slug
-        'gpustack'
-      end
-
-      def local?
-        true
-      end
+      class << self
+        def local?
+          true
+        end
 
-      def configuration_requirements
-        %i[gpustack_api_base gpustack_api_key]
+        def configuration_requirements
+          %i[gpustack_api_base]
+        end
       end
     end
   end

data/lib/ruby_llm/providers/mistral/capabilities.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Mistral
+    class Mistral
       # Determines capabilities for Mistral models
       module Capabilities
         module_function

data/lib/ruby_llm/providers/mistral/chat.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Mistral
+    class Mistral
       # Chat methods for Mistral API
       module Chat
         module_function

data/lib/ruby_llm/providers/mistral/embeddings.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Mistral
+    class Mistral
       # Embeddings methods for Mistral API
       module Embeddings
         module_function

data/lib/ruby_llm/providers/mistral/models.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Mistral
+    class Mistral
       # Model information for Mistral
       module Models
         module_function

data/lib/ruby_llm/providers/mistral.rb

@@ -3,34 +3,29 @@
 module RubyLLM
   module Providers
     # Mistral API integration.
-    module Mistral
-      extend OpenAI
-      extend Mistral::Chat
-      extend Mistral::Models
-      extend Mistral::Embeddings
+    class Mistral < OpenAI
+      include Mistral::Chat
+      include Mistral::Models
+      include Mistral::Embeddings
 
-      module_function
-
-      def api_base(_config)
+      def api_base
         'https://api.mistral.ai/v1'
       end
 
-      def headers(config)
+      def headers
         {
-          'Authorization' => "Bearer #{config.mistral_api_key}"
+          'Authorization' => "Bearer #{@config.mistral_api_key}"
         }
       end
 
-      def capabilities
-        Mistral::Capabilities
-      end
-
-      def slug
-        'mistral'
-      end
+      class << self
+        def capabilities
+          Mistral::Capabilities
+        end
 
-      def configuration_requirements
-        %i[mistral_api_key]
+        def configuration_requirements
+          %i[mistral_api_key]
+        end
       end
     end
   end

data/lib/ruby_llm/providers/ollama/chat.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Ollama
+    class Ollama
       # Chat methods of the Ollama API integration
       module Chat
         module_function

data/lib/ruby_llm/providers/ollama/media.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Ollama
+    class Ollama
       # Handles formatting of media content (images, audio) for OpenAI APIs
       module Media
         extend OpenAI::Media

data/lib/ruby_llm/providers/ollama.rb

@@ -3,31 +3,26 @@
 module RubyLLM
   module Providers
     # Ollama API integration.
-    module Ollama
-      extend OpenAI
-      extend Ollama::Chat
-      extend Ollama::Media
+    class Ollama < OpenAI
+      include Ollama::Chat
+      include Ollama::Media
 
-      module_function
-
-      def api_base(config)
-        config.ollama_api_base
+      def api_base
+        @config.ollama_api_base
       end
 
-      def headers(_config)
+      def headers
         {}
       end
 
-      def slug
-        'ollama'
-      end
-
-      def configuration_requirements
-        %i[ollama_api_base]
-      end
+      class << self
+        def configuration_requirements
+          %i[ollama_api_base]
+        end
 
-      def local?
-        true
+        def local?
+          true
+        end
       end
     end
   end

data/lib/ruby_llm/providers/openai/capabilities.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenAI
+    class OpenAI
       # Determines capabilities and pricing for OpenAI models
       module Capabilities
         module_function
@@ -216,7 +216,7 @@ module RubyLLM
         end
 
         def self.normalize_temperature(temperature, model_id)
-          if model_id.match?(/^o\d/)
+          if model_id.match?(/^(o\d|gpt-5)/)
             RubyLLM.logger.debug "Model #{model_id} requires temperature=1.0, ignoring provided value"
             1.0
           elsif model_id.match?(/-search/)
@@ -264,7 +264,7 @@ module RubyLLM
           capabilities << 'batch' if model_id.match?(/embedding|batch/)
 
           # Advanced capabilities
-          capabilities << 'reasoning' if model_id.match?(/o1/)
+          capabilities << 'reasoning' if model_id.match?(/o\d|gpt-5|codex/)
 
           if model_id.match?(/gpt-4-turbo|gpt-4o/)
             capabilities << 'image_generation' if model_id.match?(/vision/)

data/lib/ruby_llm/providers/openai/chat.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenAI
+    class OpenAI
       # Chat methods of the OpenAI API integration
       module Chat
         def completion_url
@@ -21,10 +21,7 @@ module RubyLLM
           # Only include temperature if it's not nil (some models don't accept it)
           payload[:temperature] = temperature unless temperature.nil?
 
-          if tools.any?
-            payload[:tools] = tools.map { |_, tool| tool_for(tool) }
-            payload[:tool_choice] = 'auto'
-          end
+          payload[:tools] = tools.map { |_, tool| tool_for(tool) } if tools.any?
 
           if schema
             # Use strict mode from schema if specified, default to true
@@ -78,7 +75,7 @@ module RubyLLM
         def format_role(role)
           case role
           when :system
-            'developer'
+            @config.openai_use_system_role ? 'system' : 'developer'
           else
             role.to_s
           end

data/lib/ruby_llm/providers/openai/embeddings.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenAI
+    class OpenAI
       # Embeddings methods of the OpenAI API integration
       module Embeddings
         module_function

data/lib/ruby_llm/providers/openai/images.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenAI
+    class OpenAI
       # Image generation methods for the OpenAI API integration
       module Images
         module_function

data/lib/ruby_llm/providers/openai/media.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenAI
+    class OpenAI
       # Handles formatting of media content (images, audio) for OpenAI APIs
       module Media
         module_function

data/lib/ruby_llm/providers/openai/models.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenAI
+    class OpenAI
       # Models methods of the OpenAI API integration
       module Models
         module_function

data/lib/ruby_llm/providers/openai/streaming.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenAI
+    class OpenAI
       # Streaming methods of the OpenAI API integration
       module Streaming
         module_function

data/lib/ruby_llm/providers/openai/tools.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenAI
+    class OpenAI
       # Tools methods of the OpenAI API integration
       module Tools
         module_function

data/lib/ruby_llm/providers/openai.rb

@@ -5,51 +5,39 @@ module RubyLLM
     # OpenAI API integration. Handles chat completion, function calling,
     # and OpenAI's unique streaming format. Supports GPT-4, GPT-3.5,
     # and other OpenAI models.
-    module OpenAI
-      extend Provider
-      extend OpenAI::Chat
-      extend OpenAI::Embeddings
-      extend OpenAI::Models
-      extend OpenAI::Streaming
-      extend OpenAI::Tools
-      extend OpenAI::Images
-      extend OpenAI::Media
-
-      def self.extended(base)
-        base.extend(Provider)
-        base.extend(OpenAI::Chat)
-        base.extend(OpenAI::Embeddings)
-        base.extend(OpenAI::Models)
-        base.extend(OpenAI::Streaming)
-        base.extend(OpenAI::Tools)
-        base.extend(OpenAI::Images)
-        base.extend(OpenAI::Media)
+    class OpenAI < Provider
+      include OpenAI::Chat
+      include OpenAI::Embeddings
+      include OpenAI::Models
+      include OpenAI::Streaming
+      include OpenAI::Tools
+      include OpenAI::Images
+      include OpenAI::Media
+
+      def api_base
+        @config.openai_api_base || 'https://api.openai.com/v1'
       end
 
-      module_function
-
-      def api_base(config)
-        config.openai_api_base || 'https://api.openai.com/v1'
-      end
-
-      def headers(config)
+      def headers
         {
-          'Authorization' => "Bearer #{config.openai_api_key}",
-          'OpenAI-Organization' => config.openai_organization_id,
-          'OpenAI-Project' => config.openai_project_id
+          'Authorization' => "Bearer #{@config.openai_api_key}",
+          'OpenAI-Organization' => @config.openai_organization_id,
+          'OpenAI-Project' => @config.openai_project_id
         }.compact
       end
 
-      def capabilities
-        OpenAI::Capabilities
+      def maybe_normalize_temperature(temperature, model_id)
+        OpenAI::Capabilities.normalize_temperature(temperature, model_id)
       end
 
-      def slug
-        'openai'
-      end
+      class << self
+        def capabilities
+          OpenAI::Capabilities
+        end
 
-      def configuration_requirements
-        %i[openai_api_key]
+        def configuration_requirements
+          %i[openai_api_key]
+        end
       end
     end
   end

data/lib/ruby_llm/providers/openrouter/models.rb

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module OpenRouter
+    class OpenRouter
       # Models methods of the OpenRouter API integration
       module Models
         module_function

data/lib/ruby_llm/providers/openrouter.rb

@@ -3,28 +3,23 @@
 module RubyLLM
   module Providers
     # OpenRouter API integration.
-    module OpenRouter
-      extend OpenAI
-      extend OpenRouter::Models
+    class OpenRouter < OpenAI
+      include OpenRouter::Models
 
-      module_function
-
-      def api_base(_config)
+      def api_base
         'https://openrouter.ai/api/v1'
       end
 
-      def headers(config)
+      def headers
         {
-          'Authorization' => "Bearer #{config.openrouter_api_key}"
+          'Authorization' => "Bearer #{@config.openrouter_api_key}"
         }
       end
 
-      def slug
-        'openrouter'
-      end
-
-      def configuration_requirements
-        %i[openrouter_api_key]
+      class << self
+        def configuration_requirements
+          %i[openrouter_api_key]
+        end
       end
     end
   end