llm.rb 0.16.1 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46802e2152430f164990a91499be669e928201e7793b162f8f62152349078af
-  data.tar.gz: 58269b584d08e9d236a3d85ac5728f4e4453a845ace9ebbf8c1ac22890609a1f
+  metadata.gz: 696893f9ef5355ed4433b265dc7771e76aa9c96c78036a70e698615a0c4d7bdd
+  data.tar.gz: 02f48b464173823d0696ea8d2d21ab5a147cdf946f1c3287dedddc1760a93c38
 SHA512:
-  metadata.gz: 9003c9cac451081ce0589f54acb2d72813e53a8708426e320e30732aa5842d99187af14f1c54bab69cfcc3bcc401529375377547a090f530aa1da140fd0a4b3f
-  data.tar.gz: 691e4ebfd80fcfa7af22f1ca26393256a69ddf6957be8960590eebddc5e20a1a30db3ba8cfc1ae65dba10491df6f2844fd72d3ca2444420cb23db357a0225e25
+  metadata.gz: 15c5549e9165a854814c853c381b36d3de6409a9260acb7a4bd2adddffd08520e3ea8f3dea999b111c6bd7706d9f241eddbcd2d103122ea64482a12ca8fa6879
+  data.tar.gz: 971c404ada0cf5ac1af10ffbd4aabd8654fa11fe69beceb6ef3e3fd8ae68ed3f9426ebc4af829beff2610aded2a77224ebe2b4f3e4c3ec4e7dfd5fe21e0fb90b

data/lib/llm/bot.rb

@@ -135,5 +135,16 @@ module LLM
       messages.drain
     end
     alias_method :flush, :drain
+
+    ##
+    # Returns token usage for the conversation
+    # @note
+    # This method returns token usage for the latest
+    # assistant message, and it returns an empty object
+    # if there are no assistant messages
+    # @return [LLM::Object]
+    def usage
+      messages.find(&:assistant?)&.usage || LLM::Object.from_hash({})
+    end
   end
 end

data/lib/llm/buffer.rb

@@ -65,12 +65,20 @@ module LLM
     alias_method :push, :<<
 
     ##
-    # @param [Integer, #to_i] index
+    # @param [Integer, Range, #to_i] index
     #  The message index
     # @return [LLM::Message, nil]
     #  Returns a message, or nil
     def [](index)
-      @completed[index.to_i] || to_a[index.to_i]
+      if index.respond_to?(:to_i)
+        @completed[index.to_i] || to_a[index.to_i]
+      elsif Range === index
+        slice = @completed[index]
+        invalidate = slice.nil? || slice.size < index.size
+        invalidate ? to_a[index] : slice
+      else
+        raise TypeError, "index must be an Integer or Range"
+      end
     end
 
     ##

data/lib/llm/error.rb

@@ -35,6 +35,10 @@ module LLM
   # HTTPServerError
   ServerError = Class.new(ResponseError)
 
+  ##
+  # When no images are found in a response
+  NoImageError = Class.new(ResponseError)
+
   ##
   # When an given an input object that is not understood
   FormatError = Class.new(Error)

data/lib/llm/providers/anthropic/response/completion.rb

@@ -5,8 +5,8 @@ module LLM::Anthropic::Response
     def choices = format_choices
     def role = body.role
     def model = body.model
-    def prompt_tokens = body.usage&.input_tokens || 0
-    def completion_tokens = body.usage&.output_tokens || 0
+    def prompt_tokens = body.usage["input_tokens"] || 0
+    def completion_tokens = body.usage["output_tokens"] || 0
     def total_tokens = prompt_tokens + completion_tokens
 
     private

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

@@ -36,12 +36,13 @@ class LLM::Gemini
     # @param [String] prompt The prompt
     # @param [Hash] params Other parameters (see Gemini docs)
     # @raise (see LLM::Provider#request)
+    # @raise [LLM::NoImageError] when no images are returned
     # @note
     #  The prompt should make it clear you want to generate an image, or you
     #  might unexpectedly receive a purely textual response. This is due to how
     #  Gemini implements image generation under the hood.
     # @return [LLM::Response]
-    def create(prompt:, model: "gemini-2.0-flash-exp-image-generation", **params)
+    def create(prompt:, model: "gemini-2.5-flash-image-preview", **params)
       req  = Net::HTTP::Post.new("/v1beta/models/#{model}:generateContent?key=#{key}", headers)
       body = JSON.dump({
         contents: [{parts: [{text: create_prompt}, {text: prompt}]}],
@@ -49,7 +50,7 @@ class LLM::Gemini
       }.merge!(params))
       req.body = body
       res = execute(request: req)
-      LLM::Response.new(res).extend(LLM::Gemini::Response::Image)
+      validate LLM::Response.new(res).extend(LLM::Gemini::Response::Image)
     end
 
     ##
@@ -63,9 +64,10 @@ class LLM::Gemini
     # @param [String] prompt The prompt
     # @param [Hash] params Other parameters (see Gemini docs)
     # @raise (see LLM::Provider#request)
+    # @raise [LLM::NoImageError] when no images are returned
     # @note (see LLM::Gemini::Images#create)
     # @return [LLM::Response]
-    def edit(image:, prompt:, model: "gemini-2.0-flash-exp-image-generation", **params)
+    def edit(image:, prompt:, model: "gemini-2.5-flash-image-preview", **params)
       req   = Net::HTTP::Post.new("/v1beta/models/#{model}:generateContent?key=#{key}", headers)
       image = LLM.File(image)
       body  = JSON.dump({
@@ -74,7 +76,7 @@ class LLM::Gemini
       }.merge!(params)).b
       set_body_stream(req, StringIO.new(body))
       res = execute(request: req)
-      LLM::Response.new(res).extend(LLM::Gemini::Response::Image)
+      validate LLM::Response.new(res).extend(LLM::Gemini::Response::Image)
     end
 
     ##
@@ -119,6 +121,11 @@ class LLM::Gemini
       PROMPT
     end
 
+    def validate(res)
+      return res unless res.images.empty?
+      raise LLM::NoImageError.new { _1.response = res.res }, "no images found in response"
+    end
+
     [:headers, :execute, :set_body_stream].each do |m|
       define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end

data/lib/llm/providers/gemini/response/image.rb

@@ -6,7 +6,7 @@ module LLM::Gemini::Response
     # @return [Array<StringIO>]
     def images
       candidates.flat_map do |candidate|
-        parts = candidate["content"]["parts"]
+        parts = candidate&.dig(:content, :parts) || []
         parts.filter_map do
           data = _1.dig(:inlineData, :data)
           next unless data
@@ -22,5 +22,10 @@ module LLM::Gemini::Response
     #  will always return an empty array.
     # @return [Array<String>]
     def urls = []
+
+    ##
+    # Returns one or more candidates, or an empty array
+    # @return [Array<Hash>]
+    def candidates = body.candidates || []
   end
 end

data/lib/llm/providers/openai/response/completion.rb

@@ -18,9 +18,9 @@ module LLM::OpenAI::Response
     alias_method :messages, :choices
 
     def model = body.model
-    def prompt_tokens = body.usage&.prompt_tokens
-    def completion_tokens = body.usage&.completion_tokens
-    def total_tokens = body.usage&.total_tokens
+    def prompt_tokens = body.usage["prompt_tokens"]
+    def completion_tokens = body.usage["completion_tokens"]
+    def total_tokens = body.usage["total_tokens"]
 
     private
 

data/lib/llm/providers/openai.rb

@@ -68,6 +68,7 @@ module LLM
       params = [params, format_schema(params), format_tools(params)].inject({}, &:merge!).compact
       role, stream = params.delete(:role), params.delete(:stream)
       params[:stream] = true if stream.respond_to?(:<<) || stream == true
+      params[:stream_options] = {include_usage: true}.merge!(params[:stream_options] || {}) if params[:stream]
       req = Net::HTTP::Post.new("/v1/chat/completions", headers)
       messages = [*(params.delete(:messages) || []), Message.new(role, prompt)]
       body = JSON.dump({messages: format(messages, :complete).flatten}.merge!(params))

data/lib/llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LLM
-  VERSION = "0.16.1"
+  VERSION = "0.16.3"
 end

data/lib/llm.rb

@@ -20,13 +20,15 @@ module LLM
   require_relative "llm/eventhandler"
   require_relative "llm/tool"
 
+  @mutex = Mutex.new
+
   module_function
 
   ##
   # @param (see LLM::Provider#initialize)
   # @return (see LLM::Anthropic#initialize)
   def anthropic(**)
-    require_relative "llm/providers/anthropic" unless defined?(LLM::Anthropic)
+    @mutex.synchronize { require_relative "llm/providers/anthropic" unless defined?(LLM::Anthropic) }
     LLM::Anthropic.new(**)
   end
 
@@ -34,7 +36,7 @@ module LLM
   # @param (see LLM::Provider#initialize)
   # @return (see LLM::Gemini#initialize)
   def gemini(**)
-    require_relative "llm/providers/gemini" unless defined?(LLM::Gemini)
+    @mutex.synchronize { require_relative "llm/providers/gemini" unless defined?(LLM::Gemini) }
     LLM::Gemini.new(**)
   end
 
@@ -42,7 +44,7 @@ module LLM
   # @param key (see LLM::Provider#initialize)
   # @return (see LLM::Ollama#initialize)
   def ollama(key: nil, **)
-    require_relative "llm/providers/ollama" unless defined?(LLM::Ollama)
+    @mutex.synchronize { require_relative "llm/providers/ollama" unless defined?(LLM::Ollama) }
     LLM::Ollama.new(key:, **)
   end
 
@@ -50,7 +52,7 @@ module LLM
   # @param key (see LLM::Provider#initialize)
   # @return (see LLM::LlamaCpp#initialize)
   def llamacpp(key: nil, **)
-    require_relative "llm/providers/llamacpp" unless defined?(LLM::LlamaCpp)
+    @mutex.synchronize { require_relative "llm/providers/llamacpp" unless defined?(LLM::LlamaCpp) }
     LLM::LlamaCpp.new(key:, **)
   end
 
@@ -58,7 +60,7 @@ module LLM
   # @param key (see LLM::Provider#initialize)
   # @return (see LLM::DeepSeek#initialize)
   def deepseek(**)
-    require_relative "llm/providers/deepseek" unless defined?(LLM::DeepSeek)
+    @mutex.synchronize { require_relative "llm/providers/deepseek" unless defined?(LLM::DeepSeek) }
     LLM::DeepSeek.new(**)
   end
 
@@ -66,7 +68,7 @@ module LLM
   # @param key (see LLM::Provider#initialize)
   # @return (see LLM::OpenAI#initialize)
   def openai(**)
-    require_relative "llm/providers/openai" unless defined?(LLM::OpenAI)
+    @mutex.synchronize { require_relative "llm/providers/openai" unless defined?(LLM::OpenAI) }
     LLM::OpenAI.new(**)
   end
 
@@ -75,7 +77,7 @@ module LLM
   # @param host (see LLM::XAI#initialize)
   # @return (see LLM::XAI#initialize)
   def xai(**)
-    require_relative "llm/providers/xai" unless defined?(LLM::XAI)
+    @mutex.synchronize { require_relative "llm/providers/xai" unless defined?(LLM::XAI) }
     LLM::XAI.new(**)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm.rb
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Antar Azri