ruby_llm 0.1.0.pre22 → 0.1.0.pre24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd4ad1e43337ca5d8af417b3cebc3ba8ce9cb29d7136342955c7f9669bb0ff6b
-  data.tar.gz: ea5bdad3ece2f0198fa10f36f50e91876f4b402f6f0cc2c717e3a4cfdcbc103e
+  metadata.gz: a8bd50f20230190ef4d162a93d782718b77809cf08a69a5c937e04b1371dcb4c
+  data.tar.gz: af2fd4748779981144cabb58ed8156804dbf95fc49fcaee29883e8473a3715d0
 SHA512:
-  metadata.gz: d8674edc3b37547e00831aabf777ceb6bc757b067545a33980d4a741af81a39673edf1d26693772ae3ca38579674288c9f345a87b9d2c6c1d7f173e16e79255c
-  data.tar.gz: 5f3217f2e87794c6c5782765c8f9aa78047ed1d1ce3e4faa4d99f8ef3b0bf03bf03ed001db38d26b76d3e4a98a7a9bff2741f0ba1f18386ff6a9455d27cbf47b
+  metadata.gz: c51d06260e839452c179c79ff3e993b1aadaf57d61263b925735502f19221779c5310c2b80fdf82cdeb0bbc8cc1cedf0e69a9cce20aa5c5dced9229b4c4d5814
+  data.tar.gz: 1d10277144d9168ced74e80e22664e95ba3df57dafc3a836588b49e58b6d31e46b46290bd64a16902ae32dd7f654911530d7e5b09f2f0963cb12130610725a14

data/lib/ruby_llm/chat.rb

@@ -16,7 +16,7 @@ module RubyLLM
     def initialize(model: nil)
       model_id = model || RubyLLM.config.default_model
       self.model = model_id
-      @temperature = 0.7
+      @temperature = @model.metadata['family'] == 'o1' ? 1 : 0.7
       @messages = []
       @tools = {}
       @on = {
@@ -33,7 +33,9 @@ module RubyLLM
     alias say ask
 
     def with_tool(tool)
-      raise Error, "Model #{@model.id} doesn't support function calling" unless @model.supports_functions
+      unless @model.supports_functions
+        raise UnsupportedFunctionsError, "Model #{@model.id} doesn't support function calling"
+      end
 
       tool_instance = tool.is_a?(Class) ? tool.new : tool
       @tools[tool_instance.name.to_sym] = tool_instance

data/lib/ruby_llm/error.rb

@@ -19,6 +19,9 @@ module RubyLLM
     end
   end
 
+  class ModelNotFoundError < StandardError; end
+  class InvalidRoleError < StandardError; end
+  class UnsupportedFunctionsError < StandardError; end
   class UnauthorizedError < Error; end
   class BadRequestError < Error; end
   class RateLimitError < Error; end
@@ -27,24 +30,30 @@ module RubyLLM
   # Faraday middleware that maps provider-specific API errors to RubyLLM errors.
   # Uses provider's parse_error method to extract meaningful error messages.
   class ErrorMiddleware < Faraday::Middleware
-    def initialize(app, provider: nil)
+    def initialize(app, provider:)
       super(app)
       @provider = provider
     end
 
-    def call(env) # rubocop:disable Metrics/MethodLength
+    def call(env)
       @app.call(env).on_complete do |response|
-        message = @provider&.parse_error(response)
+        self.class.parse_error(provider: @provider, response: response)
+      end
+    end
+
+    class << self
+      def parse_error(provider:, response:) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
+        message = provider&.parse_error(response)
 
         case response.status
         when 400
-          raise BadRequestError.new(response, message)
+          raise BadRequestError.new(response, message || 'Invalid request - please check your input')
         when 401
-          raise UnauthorizedError.new(response, 'Invalid API key - check your credentials')
+          raise UnauthorizedError.new(response, message || 'Invalid API key - check your credentials')
         when 429
-          raise RateLimitError.new(response, 'Rate limit exceeded - please wait a moment')
+          raise RateLimitError.new(response, message || 'Rate limit exceeded - please wait a moment')
         when 500..599
-          raise ServerError.new(response, 'API server error - please try again')
+          raise ServerError.new(response, message || 'API server error - please try again')
         end
       end
     end

data/lib/ruby_llm/message.rb

@@ -48,7 +48,7 @@ module RubyLLM
     private
 
     def ensure_valid_role
-      raise Error, "Expected role to be one of: #{ROLES.join(', ')}" unless ROLES.include?(role)
+      raise InvalidRoleError, "Expected role to be one of: #{ROLES.join(', ')}" unless ROLES.include?(role)
     end
   end
 end

data/lib/ruby_llm/models.rb

@@ -25,7 +25,7 @@ module RubyLLM
     end
 
     def find(model_id)
-      all.find { |m| m.id == model_id } or raise Error, "Unknown model: #{model_id}"
+      all.find { |m| m.id == model_id } or raise ModelNotFoundError, "Unknown model: #{model_id}"
     end
 
     def chat_models

data/lib/ruby_llm/provider.rb

@@ -74,20 +74,43 @@ module RubyLLM
         end
       end
 
-      def to_json_stream(&block)
+      def to_json_stream(&block) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        buffer = String.new
         parser = EventStreamParser::Parser.new
-        proc do |chunk, _bytes, _|
-          parser.feed(chunk) do |_type, data|
-            unless data == '[DONE]'
-              parsed_data = JSON.parse(data)
-              RubyLLM.logger.debug "chunk: #{parsed_data}"
-              block.call(parsed_data)
+
+        proc do |chunk, _bytes, env|
+          if env && env.status != 200
+            # Accumulate error chunks
+            buffer << chunk
+            begin
+              error_data = JSON.parse(buffer)
+              error_response = env.merge(body: error_data)
+              ErrorMiddleware.parse_error(provider: self, response: error_response)
+            rescue JSON::ParserError
+              # Keep accumulating if we don't have complete JSON yet
+              RubyLLM.logger.debug "Accumulating error chunk: #{chunk}"
+            end
+          else
+            parser.feed(chunk) do |_type, data|
+              unless data == '[DONE]'
+                parsed_data = JSON.parse(data)
+                RubyLLM.logger.debug "chunk: #{parsed_data}"
+                block.call(parsed_data)
+              end
             end
           end
         end
       end
     end
 
+    def try_parse_json(maybe_json)
+      return maybe_json if maybe_json.is_a?(Hash)
+
+      JSON.parse(maybe_json)
+    rescue JSON::ParserError
+      maybe_json
+    end
+
     class << self
       def register(name, provider_class)
         providers[name.to_sym] = provider_class
@@ -95,8 +118,7 @@ module RubyLLM
 
       def for(model)
         model_info = Models.find(model)
-        provider_class = providers[model_info.provider.to_sym] or
-          raise Error, "No provider registered for #{model_info.provider}"
+        provider_class = providers[model_info.provider.to_sym]
 
         provider_class.new
       end

data/lib/ruby_llm/providers/anthropic.rb

@@ -10,7 +10,8 @@ module RubyLLM
       def parse_error(response)
         return if response.body.empty?
 
-        JSON.parse(response.body).dig('error', 'message')
+        body = try_parse_json(response.body)
+        body.is_a?(Hash) ? body.dig('error', 'message') : body
       end
 
       private

data/lib/ruby_llm/providers/openai.rb

@@ -11,7 +11,8 @@ module RubyLLM
       def parse_error(response)
         return if response.body.empty?
 
-        JSON.parse(response.body).dig('error', 'message')
+        body = try_parse_json(response.body)
+        body.is_a?(Hash) ? body.dig('error', 'message') : body
       end
 
       private

data/lib/ruby_llm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre22
+  version: 0.1.0.pre24
 platform: ruby
 authors:
 - Carmine Paolino
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser