ruby_llm 0.1.0.pre2 → 0.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 210659964d16b741d71f9abf6eed197ed2caea0a76a036542cdac736ea1c433b
-  data.tar.gz: 7836e9182e7a978492e8060222d490e7a7be2cbf2a266668fd69c6068e4d103e
+  metadata.gz: d1e5d243e58cd5fc884ef6a8ed5078df18e7659523296f175c55dff24c116079
+  data.tar.gz: 9a0cebfd7392a92e05b4f98974735ffab608e96a9af2caa2c5886af92584e0e7
 SHA512:
-  metadata.gz: 901b4c602deff87cfaa3a1fe2b03b01e00165c68e7b15a5ebe942855f7d8c136f4a6e1e27c78d7584a07fd036c0c014f8f9a28c3555a516de68c565f405448c5
-  data.tar.gz: 534807760c3dfdadc18df7c4cfc435831352961550782b897aa99c63b911f5e2eef50b5bd1ecf32e591fbc77eb1c5fe2d7d6820b9250b58f5ccff93b84e16070
+  metadata.gz: 3df37307db5c36064502f476c714c893717a38fb73136e57c9e395386e8354cce62b47ad12da7cd6fe1c666a8c6e55faf333cd2808cfc280ae775bb96c181d23
+  data.tar.gz: df0f1a5cff449264a3868ac463ada43a94eddc712ed1b3de23802b5188ae217e86b8b48314cb99b24468bbdf2cb9970886908156e3a72642d7967b9a4088db40

data/lib/ruby_llm/message.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
 module RubyLLM
-  # Represents a message in an LLM conversation
   class Message
     VALID_ROLES = %i[system user assistant tool].freeze
 
-    attr_reader :role, :content, :tool_calls, :tool_results
+    attr_reader :role, :content, :tool_calls, :tool_results, :token_usage, :model_id
 
-    def initialize(role:, content: nil, tool_calls: nil, tool_results: nil)
+    def initialize(role:, content: nil, tool_calls: nil, tool_results: nil, token_usage: nil, model_id: nil)
       @role = role.to_sym
       @content = content
       @tool_calls = tool_calls
       @tool_results = tool_results
+      @token_usage = token_usage
+      @model_id = model_id
       validate!
     end
 
@@ -20,16 +21,21 @@ module RubyLLM
         role: role,
         content: content,
         tool_calls: tool_calls,
-        tool_results: tool_results
+        tool_results: tool_results,
+        token_usage: token_usage,
+        model_id: model_id
       }.compact
     end
 
     private
 
     def validate!
-      return if VALID_ROLES.include?(role)
-
-      raise ArgumentError, "Invalid role: #{role}. Must be one of: #{VALID_ROLES.join(', ')}"
+      unless VALID_ROLES.include?(role)
+        raise ArgumentError,
+              "Invalid role: #{role}. Must be one of: #{VALID_ROLES.join(', ')}"
+      end
+      raise ArgumentError, 'Content cannot be nil' if content.nil?
+      raise ArgumentError, 'Content cannot be empty' if content.empty?
     end
   end
 end

data/lib/ruby_llm/providers/anthropic.rb

@@ -186,9 +186,20 @@ module RubyLLM
           return create_chat_completion(payload.merge(messages: new_messages), tools)
         end
 
+        # Extract token usage from response
+        token_usage = if data['usage']
+                        {
+                          input_tokens: data['usage']['input_tokens'],
+                          output_tokens: data['usage']['output_tokens'],
+                          total_tokens: data['usage']['input_tokens'] + data['usage']['output_tokens']
+                        }
+                      end
+
         Message.new(
           role: :assistant,
-          content: text_content
+          content: text_content,
+          token_usage: token_usage,
+          model_id: data['model']
         )
       end
 
@@ -218,6 +229,23 @@ module RubyLLM
         end.compact
       end
 
+      def handle_api_error(error)
+        response_body = error.response[:body]
+        if response_body.is_a?(String)
+          begin
+            error_data = JSON.parse(response_body)
+            message = error_data.dig('error', 'message')
+            raise RubyLLM::Error, "API error: #{message}" if message
+          rescue JSON::ParserError
+            raise RubyLLM::Error, "API error: #{error.response[:status]}"
+          end
+        elsif response_body.dig('error', 'type') == 'invalid_request_error'
+          raise RubyLLM::Error, "API error: #{response_body['error']['message']}"
+        else
+          raise RubyLLM::Error, "API error: #{error.response[:status]}"
+        end
+      end
+
       def api_base
         'https://api.anthropic.com'
       end

data/lib/ruby_llm/providers/openai.rb

@@ -116,9 +116,20 @@ module RubyLLM
           return create_chat_completion(payload.merge(messages: new_messages), tools)
         end
 
+        # Extract token usage from response
+        token_usage = if data['usage']
+                        {
+                          input_tokens: data['usage']['prompt_tokens'],
+                          output_tokens: data['usage']['completion_tokens'],
+                          total_tokens: data['usage']['total_tokens']
+                        }
+                      end
+
         Message.new(
           role: :assistant,
-          content: message_data['content']
+          content: message_data['content'],
+          token_usage: token_usage,
+          model_id: data['model']
         )
       end
 
@@ -153,6 +164,23 @@ module RubyLLM
         end
       end
 
+      def handle_api_error(error)
+        response_body = error.response[:body]
+        if response_body.is_a?(String)
+          begin
+            error_data = JSON.parse(response_body)
+            message = error_data.dig('error', 'message')
+            raise RubyLLM::Error, "API error: #{message}" if message
+          rescue JSON::ParserError
+            raise RubyLLM::Error, "API error: #{error.response[:status]}"
+          end
+        elsif response_body['error']
+          raise RubyLLM::Error, "API error: #{response_body['error']['message']}"
+        else
+          raise RubyLLM::Error, "API error: #{error.response[:status]}"
+        end
+      end
+
       def api_base
         'https://api.openai.com'
       end

data/lib/ruby_llm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.1.0.pre3
 platform: ruby
 authors:
 - Carmine Paolino