ruby_llm 0.1.0.pre25 → 0.1.0.pre26

data/lib/ruby_llm/models.rb

@@ -18,7 +18,7 @@ module RubyLLM
     def all
       @all ||= begin
         data = JSON.parse(File.read(File.expand_path('models.json', __dir__)))
-        data['models'].map { |model| ModelInfo.new(model.transform_keys(&:to_sym)) }
+        data.map { |model| ModelInfo.new(model.transform_keys(&:to_sym)) }
       end
     rescue Errno::ENOENT
       [] # Return empty array if file doesn't exist yet
@@ -53,7 +53,9 @@ module RubyLLM
     end
 
     def refresh!
-      @all = nil
+      @all = RubyLLM.providers.flat_map do |provider|
+        provider.new.list_models
+      end
     end
   end
 end

data/lib/ruby_llm/provider.rb

@@ -46,7 +46,7 @@ module RubyLLM
       def stream_response(payload, &block)
         accumulator = StreamAccumulator.new
 
-        post completion_url, payload do |req|
+        post stream_url, payload do |req|
           req.options.on_data = handle_stream do |chunk|
             accumulator.add chunk
             block.call chunk
@@ -104,13 +104,22 @@ module RubyLLM
     end
 
     def try_parse_json(maybe_json)
-      return maybe_json if maybe_json.is_a?(Hash)
+      return maybe_json unless maybe_json.is_a?(String)
 
       JSON.parse(maybe_json)
     rescue JSON::ParserError
       maybe_json
     end
 
+    def capabilities
+      provider_name = self.class.name.split('::').last
+      RubyLLM.const_get "ModelCapabilities::#{provider_name}"
+    end
+
+    def slug
+      self.class.name.split('::').last.downcase
+    end
+
     class << self
       def register(name, provider_class)
         providers[name.to_sym] = provider_class
@@ -123,8 +132,6 @@ module RubyLLM
         provider_class.new
       end
 
-      private
-
       def providers
         @providers ||= {}
       end

data/lib/ruby_llm/providers/anthropic.rb

@@ -31,6 +31,10 @@ module RubyLLM
         '/v1/messages'
       end
 
+      def stream_url
+        completion_url
+      end
+
       def models_url
         '/v1/models'
       end
@@ -77,16 +81,15 @@ module RubyLLM
         )
       end
 
-      def parse_models_response(response) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        capabilities = ModelCapabilities::Anthropic.new
-
+      def parse_list_models_response(response) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         (response.body['data'] || []).map do |model|
           ModelInfo.new(
             id: model['id'],
             created_at: Time.parse(model['created_at']),
             display_name: model['display_name'],
-            provider: 'anthropic',
-            metadata: { type: model['type'] },
+            provider: slug,
+            type: model['type'],
+            family: capabilities.model_family(model['id']),
             context_window: capabilities.determine_context_window(model['id']),
             max_tokens: capabilities.determine_max_tokens(model['id']),
             supports_vision: capabilities.supports_vision?(model['id']),

data/lib/ruby_llm/providers/deepseek.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    # DeepSeek API integration.
+    class DeepSeek < OpenAI
+      private
+
+      def api_base
+        'https://api.deepseek.com'
+      end
+
+      def headers
+        {
+          'Authorization' => "Bearer #{RubyLLM.config.deepseek_api_key}"
+        }
+      end
+    end
+  end
+end

data/lib/ruby_llm/providers/gemini.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module Providers
+    # Gemini API integration.
+    class Gemini < OpenAI
+      private
+
+      def api_base
+        'https://generativelanguage.googleapis.com/v1beta/openai'
+      end
+
+      def headers
+        {
+          'Authorization' => "Bearer #{RubyLLM.config.gemini_api_key}"
+        }
+      end
+
+      def parse_list_models_response(response)
+        response.body['data']&.each do |model|
+          model['id'] = model['id'].delete_prefix('models/')
+        end
+
+        super(response)
+      end
+    end
+  end
+end

data/lib/ruby_llm/providers/openai.rb

@@ -18,7 +18,7 @@ module RubyLLM
       private
 
       def api_base
-        'https://api.openai.com'
+        'https://api.openai.com/v1'
       end
 
       def headers
@@ -28,15 +28,19 @@ module RubyLLM
       end
 
       def completion_url
-        '/v1/chat/completions'
+        'chat/completions'
+      end
+
+      def stream_url
+        completion_url
       end
 
       def models_url
-        '/v1/models'
+        'models'
       end
 
       def embedding_url
-        '/v1/embeddings'
+        'embeddings'
       end
 
       def build_payload(messages, tools:, temperature:, model:, stream: false) # rubocop:disable Metrics/MethodLength
@@ -189,13 +193,14 @@ module RubyLLM
       end
 
       def parse_list_models_response(response) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        capabilities = ModelCapabilities::OpenAI
         (response.body['data'] || []).map do |model|
           ModelInfo.new(
             id: model['id'],
-            created_at: Time.at(model['created']),
+            created_at: model['created'] ? Time.at(model['created']) : nil,
             display_name: capabilities.format_display_name(model['id']),
-            provider: 'openai',
+            provider: slug,
+            type: capabilities.model_type(model['id']),
+            family: capabilities.model_family(model['id']),
             metadata: {
               object: model['object'],
               owned_by: model['owned_by']

data/lib/ruby_llm/stream_accumulator.rb

@@ -32,7 +32,7 @@ module RubyLLM
     def to_message
       Message.new(
         role: :assistant,
-        content: content,
+        content: content.empty? ? nil : content,
         model_id: model_id,
         tool_calls: tool_calls_from_stream,
         input_tokens: @input_tokens.positive? ? @input_tokens : nil,
@@ -52,13 +52,16 @@ module RubyLLM
       end
     end
 
-    def accumulate_tool_calls(new_tool_calls) # rubocop:disable Metrics/MethodLength
+    def accumulate_tool_calls(new_tool_calls) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      RubyLLM.logger.debug "Accumulating tool calls: #{new_tool_calls}"
       new_tool_calls.each_value do |tool_call|
         if tool_call.id
+          tool_call_id = tool_call.id.empty? ? SecureRandom.uuid : tool_call.id
+          tool_call_arguments = tool_call.arguments.empty? ? String.new : tool_call.arguments
           @tool_calls[tool_call.id] = ToolCall.new(
-            id: tool_call.id,
+            id: tool_call_id,
             name: tool_call.name,
-            arguments: String.new
+            arguments: tool_call_arguments
           )
           @latest_tool_call_id = tool_call.id
         else

data/lib/ruby_llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLLM
-  VERSION = '0.1.0.pre25'
+  VERSION = '0.1.0.pre26'
 end

data/lib/ruby_llm.rb

@@ -12,7 +12,8 @@ loader.inflector.inflect(
   'ruby_llm' => 'RubyLLM',
   'llm' => 'LLM',
   'openai' => 'OpenAI',
-  'api' => 'API'
+  'api' => 'API',
+  'deepseek' => 'DeepSeek'
 )
 loader.setup
 
@@ -35,6 +36,10 @@ module RubyLLM
       Models
     end
 
+    def providers
+      Provider.providers.values
+    end
+
     def configure
       yield config
     end
@@ -55,6 +60,8 @@ end
 
 RubyLLM::Provider.register :openai, RubyLLM::Providers::OpenAI
 RubyLLM::Provider.register :anthropic, RubyLLM::Providers::Anthropic
+RubyLLM::Provider.register :gemini, RubyLLM::Providers::Gemini
+RubyLLM::Provider.register :deepseek, RubyLLM::Providers::DeepSeek
 
 if defined?(Rails::Railtie)
   require 'ruby_llm/railtie'

data/lib/tasks/models.rake

@@ -9,17 +9,21 @@ namespace :ruby_llm do
     RubyLLM.configure do |config|
       config.openai_api_key = ENV.fetch('OPENAI_API_KEY')
       config.anthropic_api_key = ENV.fetch('ANTHROPIC_API_KEY')
+      config.gemini_api_key = ENV['GEMINI_API_KEY']
+      config.deepseek_api_key = ENV['DEEPSEEK_API_KEY']
     end
 
     # Get all models
-    models = RubyLLM.models.refresh
+    models = RubyLLM.models.refresh!
 
     # Write to models.json
     models_file = File.expand_path('../../lib/ruby_llm/models.json', __dir__)
     File.write(models_file, JSON.pretty_generate(models.map(&:to_h)))
 
     puts "Updated models.json with #{models.size} models:"
-    puts "OpenAI models: #{models.count { |m| m.provider == 'openai' }}"
-    puts "Anthropic models: #{models.count { |m| m.provider == 'anthropic' }}"
+    RubyLLM::Provider.providers.each do |provider_sym, provider_module|
+      provider_name = provider_module.to_s.split('::').last
+      puts "#{provider_name} models: #{models.count { |m| m.provider == provider_sym.to_s }}"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre25
+  version: 0.1.0.pre26
 platform: ruby
 authors:
 - Carmine Paolino
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 2025-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -353,12 +353,16 @@ files:
 - lib/ruby_llm/error.rb
 - lib/ruby_llm/message.rb
 - lib/ruby_llm/model_capabilities/anthropic.rb
+- lib/ruby_llm/model_capabilities/deepseek.rb
+- lib/ruby_llm/model_capabilities/gemini.rb
 - lib/ruby_llm/model_capabilities/openai.rb
 - lib/ruby_llm/model_info.rb
 - lib/ruby_llm/models.json
 - lib/ruby_llm/models.rb
 - lib/ruby_llm/provider.rb
 - lib/ruby_llm/providers/anthropic.rb
+- lib/ruby_llm/providers/deepseek.rb
+- lib/ruby_llm/providers/gemini.rb
 - lib/ruby_llm/providers/openai.rb
 - lib/ruby_llm/railtie.rb
 - lib/ruby_llm/stream_accumulator.rb