llm.rb 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4facfaa664a93ec948639191915c027613ed7bd407f38acb79182d4ca10c31
-  data.tar.gz: 5974b17ea6f4c1317ee3eca9dd7ba9f6e342423cb954fdcf5a7474b53b660e88
+  metadata.gz: 696d0be686c58d66ce0904d0ed0aff879906511060704c61adc945b458ed1f37
+  data.tar.gz: 7d03d786ff1fdbaa24e470f87d6e0c3c6b5acfc8e6b73c1cda88fdb9c1a4db58
 SHA512:
-  metadata.gz: e5b10736981b4bc2b2c0e06e45c6174ba78c869f7d4666da924e893d5582eb133ac6900d46cf0429cc4936d1f4090e58ba4b3f4cf862604e6f1bea3b86c95d2e
-  data.tar.gz: 7a1ea1a6c30999f595139381c788aa4876d569ac03dde0cbfa9b1f302c7b5c6c0a7bc2c394ce754041d2aa417587b2d05f90092161cc974aa5fae5d332469002
+  metadata.gz: aeb39e7a8b7a9826be90f3f4739ae0fae40df6bc6c7053e77110ccf1ebe9c5f44316b0edf0e2de3782d0fa93dce110ac8cc0328623056b6c71e55be3abf792c3
+  data.tar.gz: c665f150d6c12cbe27541ea743a0fbea4eb107eb5bc93d4e9af480460108430a3057852458f9c5bd1fa5d17ed67633462513ff098c02f0fef43de9dc5ab44224

data/README.md

@@ -4,7 +4,7 @@
 <p align="center">
   <a href="https://0x1eef.github.io/x/llm.rb?rebuild=1"><img src="https://img.shields.io/badge/docs-0x1eef.github.io-blue.svg" alt="RubyDoc"></a>
   <a href="https://opensource.org/license/0bsd"><img src="https://img.shields.io/badge/License-0BSD-orange.svg?" alt="License"></a>
-  <a href="https://github.com/llmrb/llm.rb/tags"><img src="https://img.shields.io/badge/version-4.6.0-green.svg?" alt="Version"></a>
+  <a href="https://github.com/llmrb/llm.rb/tags"><img src="https://img.shields.io/badge/version-4.8.0-green.svg?" alt="Version"></a>
 </p>
 
 ## About
@@ -181,18 +181,27 @@ ses.talk(prompt)
 
 llm.rb is designed for threaded environments with throughput in mind.
 Locks are used selectively, and localized state is preferred wherever
-possible. Blanket locking across every class would help guarantee
-correctness but it would also add contention, reduce throughput,
+possible. Blanket locking across every class could help guarantee
+correctness but it could also add contention, reduce throughput,
 and increase complexity.
 
 That's why we decided to optimize for both correctness and throughput
 instead. An important part of that design is guaranteeing that
 [LLM::Provider](https://0x1eef.github.io/x/llm.rb/LLM/Provider.html)
-is safe to share across threads. [LLM::Session](https://0x1eef.github.io/x/llm.rb/LLM/Session.html) and
+is safe to share and use across threads. [LLM::Session](https://0x1eef.github.io/x/llm.rb/LLM/Session.html) and
 [LLM::Agent](https://0x1eef.github.io/x/llm.rb/LLM/Agent.html) are
-stateful objects that should be kept local to a single thread. So the
-recommended pattern is to keep one session or agent per thread,
-and share a provider across multiple threads:
+stateful objects that should be kept local to a single thread.
+
+[LLM::Tracer](https://0x1eef.github.io/x/llm.rb/LLM/Tracer.html) and its
+subclasses are also designed to be thread-local, which means that
+`llm.tracer = ...` only impacts the current thread and must be set
+again in each thread where a tracer is desired. This avoids contention
+on tracer state, keeps tracing isolated per thread, and allows different
+tracers to be used in different threads simultaneously.
+
+So the recommended pattern is to keep one session, tracer or agent per
+thread, and share a provider across multiple threads:
+
 
 ```ruby
 #!/usr/bin/env ruby
@@ -203,6 +212,7 @@ schema = llm.schema.object(answer: llm.schema.integer.required)
 
 vals = 10.times.map do |x|
   Thread.new do
+    llm.tracer = LLM::Tracer::Logger.new(llm, path: "thread#{x}.log")
     ses = LLM::Session.new(llm, schema:)
     res = ses.talk "#{x} + 5 = ?"
     res.content!
@@ -349,6 +359,11 @@ can be used to trace LLM requests. It can be useful for debugging, monitoring,
 and observability. The primary use case in mind is integration with tools like
 [LangSmith](https://www.langsmith.com/).
 
+It is worth mentioning that tracers are local to a thread, and they
+should be configured per thread. That means that `llm.tracer = LLM::Tracer::Telemetry.new(llm)`
+only impacts the current thread, and it should be repeated in each thread where
+tracing is required.
+
 The telemetry implementation uses the [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-ruby)
 and is based on the [gen-ai telemetry spec(s)](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/gen-ai/).
 This feature is optional, disabled by default, and the [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-ruby)
@@ -406,7 +421,8 @@ The llm.rb library includes simple logging support through its
 tracer API, and Ruby's standard library ([ruby/logger](https://github.com/ruby/logger)).
 This feature is optional, disabled by default, and it can be useful for debugging and/or
 monitoring requests to LLM providers. The `path` or `io` options can be used to choose
-where logs are written to, and by default it is set to `$stdout`:
+where logs are written, and by default it is set to `$stdout`. Like other tracers,
+the logger tracer is local to a thread:
 
 ```ruby
 #!/usr/bin/env ruby
@@ -675,68 +691,53 @@ puts res.text # => "Good morning."
 Some but not all LLM providers implement image generation capabilities that
 can create new images from a prompt, or edit an existing image with a
 prompt. The following example uses the OpenAI provider to create an
-image of a dog on a rocket to the moon. The image is then moved to
+image of a dog on a rocket to the moon. The image is then written to
 `${HOME}/dogonrocket.png` as the final step:
 
 ```ruby
 #!/usr/bin/env ruby
 require "llm"
-require "open-uri"
-require "fileutils"
-
 llm = LLM.openai(key: ENV["KEY"])
 res = llm.images.create(prompt: "a dog on a rocket to the moon")
-res.urls.each do |url|
-  FileUtils.mv OpenURI.open_uri(url).path,
-               File.join(Dir.home, "dogonrocket.png")
-end
+IO.copy_stream res.images[0], File.join(Dir.home, "dogonrocket.png")
 ```
 
 #### Edit
 
 The following example is focused on editing a local image with the aid
 of a prompt. The image (`/tmp/llm-logo.png`) is returned to us with a hat.
-The image is then moved to `${HOME}/logo-with-hat.png` as
+The image is then written to `${HOME}/logo-with-hat.png` as
 the final step:
 
 ```ruby
 #!/usr/bin/env ruby
 require "llm"
-require "open-uri"
-require "fileutils"
-
 llm = LLM.openai(key: ENV["KEY"])
 res = llm.images.edit(
   image: "/tmp/llm-logo.png",
   prompt: "add a hat to the logo",
 )
-res.urls.each do |url|
-  FileUtils.mv OpenURI.open_uri(url).path,
-               File.join(Dir.home, "logo-with-hat.png")
-end
+IO.copy_stream res.images[0], File.join(Dir.home, "logo-with-hat.png")
 ```
 
 #### Variations
 
 The following example is focused on creating variations of a local image.
 The image (`/tmp/llm-logo.png`) is returned to us with five different variations.
-The images are then moved to `${HOME}/logo-variation0.png`, `${HOME}/logo-variation1.png`
+The images are then written to `${HOME}/logo-variation0.png`, `${HOME}/logo-variation1.png`
 and so on as the final step:
 
 ```ruby
 #!/usr/bin/env ruby
 require "llm"
-require "open-uri"
-require "fileutils"
-
 llm = LLM.openai(key: ENV["KEY"])
 res = llm.images.create_variation(
   image: "/tmp/llm-logo.png",
   n: 5
 )
-res.urls.each.with_index do |url, index|
-  FileUtils.mv OpenURI.open_uri(url).path,
-               File.join(Dir.home, "logo-variation#{index}.png")
+res.images.each.with_index do |image, index|
+  IO.copy_stream image,
+                 File.join(Dir.home, "logo-variation#{index}.png")
 end
 ```
 

data/lib/llm/eventstream/parser.rb

@@ -80,11 +80,6 @@ module LLM::EventStream
         @cursor = newline + 1
         yield(line)
       end
-      if @cursor < @buffer.length
-        line = @buffer[@cursor..]
-        @cursor = @buffer.length
-        yield(line)
-      end
       return if @cursor.zero?
       @buffer = @buffer[@cursor..] || +""
       @cursor = 0

data/lib/llm/model.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+##
+# The {LLM::Model LLM::Model} class provides a normalized view of
+# a provider model record returned by the models API.
+class LLM::Model
+  ##
+  # The provider-specific model payload.
+  # @return [LLM::Object]
+  attr_reader :raw
+
+  ##
+  # @param [LLM::Object, Hash] raw
+  def initialize(raw)
+    @raw = raw
+  end
+
+  ##
+  # Returns a normalized identifier suitable for API calls.
+  # @return [String, nil]
+  def id
+    normalize_id(raw.id || raw.model || raw.name)
+  end
+
+  ##
+  # Returns a display-friendly model name.
+  # @return [String, nil]
+  def name
+    raw.display_name || raw.displayName || id
+  end
+
+  ##
+  # Best-effort predicate for chat support.
+  # @return [Boolean]
+  def chat?
+    return true if anthropic?
+    return [*(raw.supportedGenerationMethods || [])].include?("generateContent") if gemini?
+    openai_compatible_chat?
+  end
+
+  ##
+  # Returns a Hash representation of the normalized model.
+  # @return [Hash]
+  def to_h
+    {id:, name:, chat?: chat?}.compact
+  end
+
+  ##
+  # @private
+  module Collection
+    include ::Enumerable
+
+    ##
+    # @yield [model]
+    # @yieldparam [LLM::Model] model
+    # @return [Enumerator, void]
+    def each(&)
+      return enum_for(:each) unless block_given?
+      models.each(&)
+    end
+
+    ##
+    # Returns an element, or a slice, or nil.
+    # @return [Object, Array<Object>, nil]
+    def [](*pos, **kw)
+      models[*pos, **kw]
+    end
+
+    ##
+    # @return [Boolean]
+    def empty?
+      models.empty?
+    end
+
+    ##
+    # @return [Integer]
+    def size
+      models.size
+    end
+
+    ##
+    # Returns normalized models.
+    # @return [Array<LLM::Model>]
+    def models
+      @models ||= raw_models.map { LLM::Model.new(_1) }
+    end
+  end
+
+  private
+
+  def normalize_id(value)
+    value&.sub(%r{\Amodels/}, "")
+  end
+
+  def anthropic?
+    raw.type == "model" && raw.key?(:display_name) && raw.key?(:created_at)
+  end
+
+  def gemini?
+    raw.key?(:supportedGenerationMethods)
+  end
+
+  def openai_compatible_chat?
+    value = [id, raw.name, raw.model].compact.join(" ").downcase
+    return false if value.include?("embedding")
+    return false if value.include?("moderation")
+    return false if value.include?("tts")
+    return false if value.include?("transcrib")
+    return false if value.include?("image")
+    return false if value.include?("whisper")
+    return false if value.include?("dall")
+    return false if value.include?("omni-moderation")
+    true
+  end
+end

data/lib/llm/provider.rb

@@ -37,7 +37,6 @@ class LLM::Provider
     @timeout = timeout
     @ssl = ssl
     @client = persistent ? persistent_client : nil
-    @tracer = LLM::Tracer::Null.new(self)
     @base_uri = URI("#{ssl ? "https" : "http"}://#{host}:#{port}/")
     @headers = {"User-Agent" => "llm.rb v#{LLM::VERSION}"}
     @monitor = Monitor.new
@@ -48,7 +47,7 @@ class LLM::Provider
   # @return [String]
   # @note The secret key is redacted in inspect for security reasons
   def inspect
-    "#<#{self.class.name}:0x#{object_id.to_s(16)} @key=[REDACTED] @client=#{@client.inspect} @tracer=#{@tracer.inspect}>"
+    "#<#{self.class.name}:0x#{object_id.to_s(16)} @key=[REDACTED] @client=#{@client.inspect} @tracer=#{tracer.inspect}>"
   end
 
   ##
@@ -265,27 +264,34 @@ class LLM::Provider
 
   ##
   # @return [LLM::Tracer]
-  #  Returns an LLM tracer
+  #  Returns a thread-local tracer
   def tracer
-    @tracer
+    weakmap[self] || LLM::Tracer::Null.new(self)
   end
 
   ##
-  # Set the tracer
+  # Set a thread-local tracer
   # @example
   #   llm = LLM.openai(key: ENV["KEY"])
-  #   llm.tracer = LLM::Tracer::Logger.new(llm, path: "/path/to/log.txt")
+  #   Thread.new do
+  #     llm.tracer = LLM::Tracer::Logger.new(llm, path: "/path/to/log/1.txt")
+  #   end
+  #   Thread.new do
+  #     llm.tracer = LLM::Tracer::Logger.new(llm, path: "/path/to/log/2.txt")
+  #   end
   #   # ...
   # @param [LLM::Tracer] tracer
   #  A tracer
   # @return [void]
   def tracer=(tracer)
-    lock do
-      @tracer = if tracer.nil?
-        LLM::Tracer::Null.new(self)
+    if tracer.nil?
+      if weakmap.respond_to?(:delete)
+        weakmap.delete(self)
       else
-        tracer
+        weakmap[self] = nil
       end
+    else
+      weakmap[self] = tracer
     end
   end
 
@@ -354,9 +360,9 @@ class LLM::Provider
   # @raise [SystemCallError]
   #  When there is a network error at the operating system level
   # @return [Net::HTTPResponse]
-  def execute(request:, operation:, stream: nil, stream_parser: self.stream_parser, model: nil, &b)
-    tracer = @tracer
-    span = tracer.on_request_start(operation:, model:)
+  def execute(request:, operation:, stream: nil, stream_parser: self.stream_parser, model: nil, inputs: nil, &b)
+    tracer = self.tracer
+    span = tracer.on_request_start(operation:, model:, inputs:)
     http = client || transient_client
     args = (Net::HTTP === http) ? [request] : [URI.join(base_uri, request.path), request]
     res = if stream
@@ -365,11 +371,12 @@ class LLM::Provider
         parser = LLM::EventStream::Parser.new
         parser.register(handler)
         res.read_body(parser)
-        # If the handler body is empty, it means the
-        # response was most likely not streamed or
-        # parsing has failed. In that case, we fallback
-        # on the original response body.
-        res.body = LLM::Object.from(handler.body.empty? ? parser.body : handler.body)
+        # If the handler body is empty, the response was
+        # most likely not streamed or parsing failed.
+        # Preserve the raw body in that case so standard
+        # JSON/error handling can parse it later.
+        body = handler.body.empty? ? parser.body : handler.body
+        res.body = Hash === body || Array === body ? LLM::Object.from(body) : body
       ensure
         parser&.free
       end
@@ -437,14 +444,20 @@ class LLM::Provider
   end
 
   ##
-  # @return [Hash<Symbol, LLM::Tracer>]
-  def tracers
-    self.class.tracers
+  # @api private
+  def lock(&)
+    @monitor.synchronize(&)
   end
 
   ##
   # @api private
-  def lock(&)
-    @monitor.synchronize(&)
+  def thread
+    Thread.current
+  end
+
+  ##
+  # @api private
+  def weakmap
+    thread[:"llm.provider.weakmap"] ||= ObjectSpace::WeakMap.new
   end
 end

data/lib/llm/providers/anthropic/error_handler.rb

@@ -35,7 +35,7 @@ class LLM::Anthropic
       ex = error
       @tracer.on_request_error(ex:, span:)
     ensure
-      raise(ex)
+      raise(ex) if ex
     end
 
     private

data/lib/llm/providers/anthropic/models.rb

@@ -41,7 +41,7 @@ class LLM::Anthropic
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/models?#{query}", headers)
       res, span, tracer = execute(request: req, operation: "request")
-      res = ResponseAdapter.adapt(res, type: :enumerable)
+      res = ResponseAdapter.adapt(res, type: :models)
       tracer.on_request_finish(operation: "request", res:, span:)
       res
     end

data/lib/llm/providers/anthropic/request_adapter.rb

@@ -9,11 +9,20 @@ class LLM::Anthropic
     ##
     # @param [Array<LLM::Message>] messages
     #  The messages to adapt
-    # @return [Array<Hash>]
+    # @return [Hash]
     def adapt(messages, mode: nil)
-      messages.filter_map do
-        Completion.new(_1).adapt
+      payload = {messages: [], system: []}
+      messages.each do |message|
+        adapted = Completion.new(message).adapt
+        next if adapted.nil?
+        if system?(message)
+          payload[:system].concat Array(adapted[:content])
+        else
+          payload[:messages] << adapted
+        end
       end
+      payload.delete(:system) if payload[:system].empty?
+      payload
     end
 
     private
@@ -25,5 +34,13 @@ class LLM::Anthropic
       return {} unless tools&.any?
       {tools: tools.map { _1.respond_to?(:adapt) ? _1.adapt(self) : _1 }}
     end
+
+    def system?(message)
+      if message.respond_to?(:system?)
+        message.system?
+      else
+        Hash === message and message[:role].to_s == "system"
+      end
+    end
   end
 end

data/lib/llm/providers/anthropic/response_adapter/models.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module LLM::Anthropic::ResponseAdapter
+  module Models
+    include LLM::Model::Collection
+
+    private
+
+    def raw_models
+      data || []
+    end
+  end
+end

data/lib/llm/providers/anthropic/response_adapter.rb

@@ -7,6 +7,7 @@ class LLM::Anthropic
     require_relative "response_adapter/completion"
     require_relative "response_adapter/enumerable"
     require_relative "response_adapter/file"
+    require_relative "response_adapter/models"
     require_relative "response_adapter/web_search"
 
     module_function
@@ -27,6 +28,7 @@ class LLM::Anthropic
       when :completion then LLM::Anthropic::ResponseAdapter::Completion
       when :enumerable then LLM::Anthropic::ResponseAdapter::Enumerable
       when :file then LLM::Anthropic::ResponseAdapter::File
+      when :models then LLM::Anthropic::ResponseAdapter::Models
       when :web_search then LLM::Anthropic::ResponseAdapter::WebSearch
       else
         raise ArgumentError, "Unknown response adapter type: #{type.inspect}"

data/lib/llm/providers/anthropic.rb

@@ -140,7 +140,8 @@ module LLM
 
     def build_complete_request(prompt, params, role)
       messages = [*(params.delete(:messages) || []), Message.new(role, prompt)]
-      body = LLM.json.dump({messages: [adapt(messages)].flatten}.merge!(params))
+      payload = adapt(messages)
+      body = LLM.json.dump(payload.merge!(params))
       req = Net::HTTP::Post.new("/v1/messages", headers)
       set_body_stream(req, StringIO.new(body))
       req

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

@@ -35,15 +35,15 @@ class LLM::Gemini
       ex = error
       @tracer.on_request_error(ex:, span:)
     ensure
-      raise(ex)
+      raise(ex) if ex
     end
 
     private
 
     ##
-    # @return [LLM::Object]
+    # @return [String, LLM::Object]
     def body
-      @body ||= LLM.json.load(res.body)
+      @body ||= parse_body!
     end
 
     ##
@@ -65,5 +65,20 @@ class LLM::Gemini
         LLM::Error.new("Unexpected response").tap { _1.response = res }
       end
     end
+
+    ##
+    # Tries to parse the response body as a LLM::Object
+    # @return [String, LLM::Object]
+    def parse_body!
+      if String === res.body
+        LLM::Object.from LLM.json.load(res.body)
+      elsif Hash === res.body
+        LLM::Object.from(res.body)
+      else
+        res.body
+      end
+    rescue
+      res.body
+    end
   end
 end

data/lib/llm/providers/gemini/response_adapter/models.rb

@@ -2,13 +2,11 @@
 
 module LLM::Gemini::ResponseAdapter
   module Models
-    include ::Enumerable
-    def each(&)
-      return enum_for(:each) unless block_given?
-      models.each { yield(_1) }
-    end
+    include LLM::Model::Collection
+
+    private
 
-    def models
+    def raw_models
       body.models || []
     end
   end

data/lib/llm/providers/ollama/error_handler.rb

@@ -35,7 +35,7 @@ class LLM::Ollama
       ex = error
       @tracer.on_request_error(ex:, span:)
     ensure
-      raise(ex)
+      raise(ex) if ex
     end
 
     private

data/lib/llm/providers/ollama/models.rb

@@ -44,7 +44,7 @@ class LLM::Ollama
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/api/tags?#{query}", headers)
       res, span, tracer = execute(request: req, operation: "request")
-      res = LLM::Response.new(res)
+      res = ResponseAdapter.adapt(res, type: :models)
       tracer.on_request_finish(operation: "request", res:, span:)
       res
     end

data/lib/llm/providers/ollama/response_adapter/models.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module LLM::Ollama::ResponseAdapter
+  module Models
+    include LLM::Model::Collection
+
+    private
+
+    def raw_models
+      body.models || []
+    end
+  end
+end

data/lib/llm/providers/ollama/response_adapter.rb

@@ -6,6 +6,7 @@ class LLM::Ollama
   module ResponseAdapter
     require_relative "response_adapter/completion"
     require_relative "response_adapter/embedding"
+    require_relative "response_adapter/models"
 
     module_function
 
@@ -24,6 +25,7 @@ class LLM::Ollama
       case type
       when :completion then LLM::Ollama::ResponseAdapter::Completion
       when :embedding then LLM::Ollama::ResponseAdapter::Embedding
+      when :models then LLM::Ollama::ResponseAdapter::Models
       else
         raise ArgumentError, "Unknown response adapter type: #{type.inspect}"
       end

data/lib/llm/providers/openai/error_handler.rb

@@ -35,15 +35,15 @@ class LLM::OpenAI
       ex = error
       @tracer.on_request_error(ex:, span:)
     ensure
-      raise(ex)
+      raise(ex) if ex
     end
 
     private
 
     ##
-    # @return [LLM::Object]
+    # @return [String, LLM::Object]
     def body
-      @body ||= LLM.json.load(res.body)
+      @body ||= parse_body!
     end
 
     ##
@@ -79,5 +79,20 @@ class LLM::OpenAI
         LLM::InvalidRequestError.new(error["message"]).tap { _1.response = res }
       end
     end
+
+    ##
+    # Tries to parse the response body as a LLM::Object
+    # @return [String, LLM::Object]
+    def parse_body!
+      if String === res.body
+        LLM::Object.from LLM.json.load(res.body)
+      elsif Hash === res.body
+        LLM::Object.from(res.body)
+      else
+        res.body
+      end
+    rescue
+      res.body
+    end
   end
 end