ruby_llm 1.5.0 → 1.6.0

data/lib/ruby_llm/providers/deepseek.rb

@@ -3,32 +3,27 @@
 module RubyLLM
   module Providers
     # DeepSeek API integration.
-    module DeepSeek
-      extend OpenAI
-      extend DeepSeek::Chat
+    class DeepSeek < OpenAI
+      include DeepSeek::Chat
 
-      module_function
-
-      def api_base(_config)
+      def api_base
         'https://api.deepseek.com'
       end
 
-      def headers(config)
+      def headers
         {
-          'Authorization' => "Bearer #{config.deepseek_api_key}"
+          'Authorization' => "Bearer #{@config.deepseek_api_key}"
         }
       end
 
-      def capabilities
-        DeepSeek::Capabilities
-      end
-
-      def slug
-        'deepseek'
-      end
+      class << self
+        def capabilities
+          DeepSeek::Capabilities
+        end
 
-      def configuration_requirements
-        %i[deepseek_api_key]
+        def configuration_requirements
+          %i[deepseek_api_key]
+        end
       end
     end
   end

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

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Determines capabilities and pricing for Google Gemini models
       module Capabilities
         module_function
@@ -280,6 +280,9 @@ module RubyLLM
           # Embedding output
           modalities[:output] << 'embeddings' if model_id.match?(/embedding|gemini-embedding/)
 
+          # Image output for imagen models
+          modalities[:output] = ['image'] if model_id.match?(/imagen/)
+
           modalities
         end
 

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

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

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

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

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

@@ -2,7 +2,7 @@
 
 module RubyLLM
   module Providers
-    module Gemini
+    class Gemini
       # Image generation methods for the Gemini API implementation
       module Images
         def images_url

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,25 +2,29 @@
 
 module RubyLLM
   module Providers
-    module Mistral
+    class Mistral
       # Determines capabilities for Mistral models
       module Capabilities
         module_function
 
-        def supports_streaming?(_model_id)
-          true
+        def supports_streaming?(model_id)
+          # All chat models support streaming, but not embedding/moderation/OCR/transcription
+          !model_id.match?(/embed|moderation|ocr|transcriptions/)
         end
 
-        def supports_tools?(_model_id)
-          true
+        def supports_tools?(model_id)
+          # Most chat models support tools except embedding/moderation/OCR/voxtral/transcription
+          !model_id.match?(/embed|moderation|ocr|voxtral|transcriptions|mistral-(tiny|small)-(2312|2402)/)
         end
 
         def supports_vision?(model_id)
-          model_id.include?('pixtral')
+          # Models with vision capabilities
+          model_id.match?(/pixtral|mistral-small-(2503|2506)|mistral-medium/)
         end
 
-        def supports_json_mode?(_model_id)
-          true
+        def supports_json_mode?(model_id)
+          # Most chat models support JSON mode (structured output)
+          !model_id.match?(/embed|moderation|ocr|voxtral|transcriptions/) && supports_tools?(model_id)
         end
 
         def format_display_name(model_id)
@@ -71,7 +75,7 @@ module RubyLLM
           when /embed/
             {
               input: ['text'],
-              output: ['embedding']
+              output: ['embeddings']
             }
           else
             {
@@ -81,18 +85,26 @@ module RubyLLM
           end
         end
 
-        def capabilities_for(model_id)
+        def capabilities_for(model_id) # rubocop:disable Metrics/PerceivedComplexity
           case model_id
-          when /embed/ then { embeddings: true }
-          when /moderation/ then { moderation: true }
+          when /moderation/ then ['moderation']
+          when /voxtral.*transcribe/ then ['transcription']
+          when /ocr/ then ['vision']
           else
-            {
-              chat: true,
-              streaming: supports_streaming?(model_id),
-              tools: supports_tools?(model_id),
-              vision: supports_vision?(model_id),
-              json_mode: supports_json_mode?(model_id)
-            }
+            capabilities = []
+            capabilities << 'streaming' if supports_streaming?(model_id)
+            capabilities << 'function_calling' if supports_tools?(model_id)
+            capabilities << 'structured_output' if supports_json_mode?(model_id)
+            capabilities << 'vision' if supports_vision?(model_id)
+
+            # Model-specific capabilities
+            capabilities << 'reasoning' if model_id.match?(/magistral/)
+            capabilities << 'batch' unless model_id.match?(/voxtral|ocr|embed|moderation/)
+            capabilities << 'fine_tuning' if model_id.match?(/mistral-(small|medium|large)|devstral/)
+            capabilities << 'distillation' if model_id.match?(/ministral/)
+            capabilities << 'predicted_outputs' if model_id.match?(/codestral/)
+
+            capabilities.uniq
           end
         end
 

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
@@ -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
@@ -78,7 +78,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