llm.rb 0.8.0 → 0.9.0

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

@@ -13,23 +13,24 @@ class LLM::Gemini
   # in the prompt over and over again (which could be the case in a
   # multi-turn conversation).
   #
-  # @example
+  # @example example #1
   #   #!/usr/bin/env ruby
   #   require "llm"
   #
   #   llm = LLM.gemini(ENV["KEY"])
-  #   bot = LLM::Chat.new(llm).lazy
+  #   bot = LLM::Bot.new(llm)
   #   file = llm.files.create file: "/audio/haiku.mp3"
   #   bot.chat(file)
   #   bot.chat("Describe the audio file I sent to you")
   #   bot.chat("The audio file is the first message I sent to you.")
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
-  # @example
+  #
+  # @example example #2
   #   #!/usr/bin/env ruby
   #   require "llm"
   #
   #   llm = LLM.gemini(ENV["KEY"])
-  #   bot = LLM::Chat.new(llm).lazy
+  #   bot = LLM::Bot.new(llm)
   #   file = llm.files.create file: "/audio/haiku.mp3"
   #   bot.chat(["Describe the audio file I sent to you", file])
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
@@ -57,7 +58,7 @@ class LLM::Gemini
     def all(**params)
       query = URI.encode_www_form(params.merge!(key: key))
       req = Net::HTTP::Get.new("/v1beta/files?#{query}", headers)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::FileList.new(res).tap { |filelist|
         files = filelist.body["files"]&.map do |file|
           file = file.transform_keys { snakecase(_1) }
@@ -85,7 +86,7 @@ class LLM::Gemini
       req["X-Goog-Upload-Command"] = "upload, finalize"
       file.with_io do |io|
         set_body_stream(req, io)
-        res = request(http, req)
+        res = execute(request: req)
         LLM::Response::File.new(res)
       end
     end
@@ -105,7 +106,7 @@ class LLM::Gemini
       file_id = file.respond_to?(:name) ? file.name : file.to_s
       query = URI.encode_www_form(params.merge!(key: key))
       req = Net::HTTP::Get.new("/v1beta/#{file_id}?#{query}", headers)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::File.new(res)
     end
 
@@ -123,7 +124,7 @@ class LLM::Gemini
       file_id = file.respond_to?(:name) ? file.name : file.to_s
       query = URI.encode_www_form(params.merge!(key: key))
       req = Net::HTTP::Delete.new("/v1beta/#{file_id}?#{query}", headers)
-      request(http, req)
+      execute(request: req)
     end
 
     ##
@@ -144,20 +145,16 @@ class LLM::Gemini
       req["X-Goog-Upload-Header-Content-Length"] = file.bytesize
       req["X-Goog-Upload-Header-Content-Type"] = file.mime_type
       req.body = JSON.dump(file: {display_name: File.basename(file.path)})
-      res = request(http, req)
+      res = execute(request: req)
       res["x-goog-upload-url"]
     end
 
-    def http
-      @provider.instance_variable_get(:@http)
-    end
-
     def key
       @provider.instance_variable_get(:@key)
     end
 
-    [:headers, :request, :set_body_stream].each do |m|
-      define_method(m) { |*args, &b| @provider.send(m, *args, &b) }
+    [:headers, :execute, :set_body_stream].each do |m|
+      define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end
 end

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

@@ -47,7 +47,7 @@ class LLM::Gemini
         generationConfig: {responseModalities: ["TEXT", "IMAGE"]}
       }.merge!(params))
       req.body = body
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::Image.new(res).extend(response_parser)
     end
 
@@ -72,7 +72,7 @@ class LLM::Gemini
         generationConfig: {responseModalities: ["TEXT", "IMAGE"]}
       }.merge!(params)).b
       set_body_stream(req, StringIO.new(body))
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::Image.new(res).extend(response_parser)
     end
 
@@ -93,12 +93,8 @@ class LLM::Gemini
       @provider.instance_variable_get(:@key)
     end
 
-    def http
-      @provider.instance_variable_get(:@http)
-    end
-
-    [:response_parser, :headers, :request, :set_body_stream].each do |m|
-      define_method(m) { |*args, &b| @provider.send(m, *args, &b) }
+    [:response_parser, :headers, :execute, :set_body_stream].each do |m|
+      define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end
 end

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

@@ -42,7 +42,7 @@ class LLM::Gemini
     def all(**params)
       query = URI.encode_www_form(params.merge!(key: key))
       req = Net::HTTP::Get.new("/v1beta/models?#{query}", headers)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::ModelList.new(res).tap { |modellist|
         models = modellist.body["models"].map do |model|
           model = model.transform_keys { snakecase(_1) }
@@ -54,16 +54,12 @@ class LLM::Gemini
 
     private
 
-    def http
-      @provider.instance_variable_get(:@http)
-    end
-
     def key
       @provider.instance_variable_get(:@key)
     end
 
-    [:headers, :request].each do |m|
-      define_method(m) { |*args, &b| @provider.send(m, *args, &b) }
+    [:headers, :execute].each do |m|
+      define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end
 end

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class LLM::Gemini
+  ##
+  # @private
+  class StreamParser
+    ##
+    # Returns the fully constructed response body
+    # @return [LLM::Object]
+    attr_reader :body
+
+    ##
+    # @param [#<<] io An IO-like object
+    # @return [LLM::Gemini::StreamParser]
+    def initialize(io)
+      @body = LLM::Object.new
+      @io = io
+    end
+
+    ##
+    # @param [Hash] chunk
+    # @return [LLM::Gemini::StreamParser]
+    def parse!(chunk)
+      tap { merge!(chunk) }
+    end
+
+    private
+
+    def merge!(chunk)
+      chunk.each do |key, value|
+        if key == "candidates"
+          @body.candidates ||= []
+          merge_candidates!(value)
+        else
+          @body[key] = value
+        end
+      end
+    end
+
+    def merge_candidates!(candidates)
+      candidates.each.with_index do |candidate, i|
+        if @body.candidates[i].nil?
+          merge_one(@body.candidates, candidate, i)
+        else
+          merge_two(@body.candidates, candidate, i)
+        end
+      end
+    end
+
+    def merge_one(candidates, candidate, i)
+      candidate
+        .dig("content", "parts")
+        &.filter_map { _1["text"] }
+        &.each { @io << _1 if @io.respond_to?(:<<) }
+      candidates[i] = candidate
+    end
+
+    def merge_two(candidates, candidate, i)
+      parts = candidates[i].dig("content", "parts")
+      parts&.each&.with_index do |part, j|
+        if part["text"]
+          target = candidate["content"]["parts"][j]
+          part["text"] << target["text"]
+          @io << target["text"] if @io.respond_to?(:<<)
+        end
+      end
+    end
+  end
+end

data/lib/llm/providers/gemini.rb

@@ -10,31 +10,34 @@ module LLM
   # prompt for files under 20MB or via the Gemini Files API for
   # files that are over 20MB
   #
-  # @example
+  # @example example #1
   #   #!/usr/bin/env ruby
   #   require "llm"
   #
   #   llm = LLM.gemini(ENV["KEY"])
-  #   bot = LLM::Chat.new(llm).lazy
-  #   bot.chat LLM::File("/images/capybara.png")
+  #   bot = LLM::Bot.new(llm)
+  #   bot.chat LLM.File("/images/capybara.png")
   #   bot.chat "Describe the image"
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
-  # @example
+  #
+  # @example example #2
   #   #!/usr/bin/env ruby
   #   require "llm"
   #
   #   llm = LLM.gemini(ENV["KEY"])
-  #   bot = LLM::Chat.new(llm).lazy
+  #   bot = LLM::Bot.new(llm)
   #   bot.chat ["Describe the image", LLM::File("/images/capybara.png")]
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
   class Gemini < Provider
     require_relative "gemini/error_handler"
-    require_relative "gemini/response_parser"
     require_relative "gemini/format"
+    require_relative "gemini/stream_parser"
+    require_relative "gemini/response_parser"
+    require_relative "gemini/models"
     require_relative "gemini/images"
     require_relative "gemini/files"
     require_relative "gemini/audio"
-    require_relative "gemini/models"
+
     include Format
 
     HOST = "generativelanguage.googleapis.com"
@@ -57,7 +60,7 @@ module LLM
       path = ["/v1beta/models/#{model}", "embedContent?key=#{@key}"].join(":")
       req = Net::HTTP::Post.new(path, headers)
       req.body = JSON.dump({content: {parts: [{text: input}]}})
-      res = request(@http, req)
+      res = execute(request: req)
       Response::Embedding.new(res).extend(response_parser)
     end
 
@@ -74,14 +77,15 @@ module LLM
     def complete(prompt, params = {})
       params = {role: :user, model: default_model}.merge!(params)
       params = [params, format_schema(params), format_tools(params)].inject({}, &:merge!).compact
-      role, model = [:role, :model].map { params.delete(_1) }
+      role, model, stream = [:role, :model, :stream].map { params.delete(_1) }
+      action = stream ? "streamGenerateContent?key=#{@key}&alt=sse" : "generateContent?key=#{@key}"
       model.respond_to?(:id) ? model.id : model
-      path = ["/v1beta/models/#{model}", "generateContent?key=#{@key}"].join(":")
+      path = ["/v1beta/models/#{model}", action].join(":")
       req  = Net::HTTP::Post.new(path, headers)
       messages = [*(params.delete(:messages) || []), LLM::Message.new(role, prompt)]
       body = JSON.dump({contents: format(messages)}.merge!(params))
       set_body_stream(req, StringIO.new(body))
-      res = request(@http, req)
+      res = execute(request: req, stream:)
       Response::Completion.new(res).extend(response_parser)
     end
 
@@ -140,6 +144,10 @@ module LLM
       LLM::Gemini::ResponseParser
     end
 
+    def stream_parser
+      LLM::Gemini::StreamParser
+    end
+
     def error_handler
       LLM::Gemini::ErrorHandler
     end

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

@@ -23,11 +23,11 @@ class LLM::Ollama
     def raise_error!
       case res
       when Net::HTTPUnauthorized
-        raise LLM::Error::Unauthorized.new { _1.response = res }, "Authentication error"
+        raise LLM::UnauthorizedError.new { _1.response = res }, "Authentication error"
       when Net::HTTPTooManyRequests
-        raise LLM::Error::RateLimit.new { _1.response = res }, "Too many requests"
+        raise LLM::RateLimitError.new { _1.response = res }, "Too many requests"
       else
-        raise LLM::Error::ResponseError.new { _1.response = res }, "Unexpected response"
+        raise LLM::ResponseError.new { _1.response = res }, "Unexpected response"
       end
     end
   end

data/lib/llm/providers/ollama/format/completion_format.rb

@@ -63,7 +63,7 @@ module LLM::Ollama::Format
       elsif returns.any?
         returns.map { {role: "tool", tool_call_id: _1.id, content: JSON.dump(_1.value)} }
       else
-        content.flat_map { {role: message.role }.merge(format_content(_1)) }
+        content.flat_map { {role: message.role}.merge(format_content(_1)) }
       end
     end
 

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

@@ -43,7 +43,7 @@ class LLM::Ollama
     def all(**params)
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/api/tags?#{query}", headers)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::ModelList.new(res).tap { |modellist|
         models = modellist.body["models"].map do |model|
           model = model.transform_keys { snakecase(_1) }
@@ -55,12 +55,8 @@ class LLM::Ollama
 
     private
 
-    def http
-      @provider.instance_variable_get(:@http)
-    end
-
-    [:headers, :request].each do |m|
-      define_method(m) { |*args, &b| @provider.send(m, *args, &b) }
+    [:headers, :execute].each do |m|
+      define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end
 end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class LLM::Ollama
+  ##
+  # @private
+  class StreamParser
+    ##
+    # Returns the fully constructed response body
+    # @return [LLM::Object]
+    attr_reader :body
+
+    ##
+    # @return [LLM::OpenAI::Chunk]
+    def initialize(io)
+      @body = LLM::Object.new
+      @io = io
+    end
+
+    ##
+    # @param [Hash] chunk
+    # @return [LLM::OpenAI::Chunk]
+    def parse!(chunk)
+      tap { merge!(chunk) }
+    end
+
+    private
+
+    def merge!(chunk)
+      chunk.each do |key, value|
+        if key == "message"
+          if @body[key]
+            @body[key]["content"] << value["content"]
+            @io << value["content"] if @io.respond_to?(:<<)
+          else
+            @body[key] = value
+            @io << value["content"] if @io.respond_to?(:<<)
+          end
+        else
+          @body[key] = value
+        end
+      end
+    end
+  end
+end

data/lib/llm/providers/ollama.rb

@@ -14,15 +14,17 @@ module LLM
   #   require "llm"
   #
   #   llm = LLM.ollama(nil)
-  #   bot = LLM::Chat.new(llm, model: "llava").lazy
+  #   bot = LLM::Bot.new(llm, model: "llava")
   #   bot.chat LLM::File("/images/capybara.png")
   #   bot.chat "Describe the image"
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
   class Ollama < Provider
     require_relative "ollama/error_handler"
-    require_relative "ollama/response_parser"
     require_relative "ollama/format"
+    require_relative "ollama/stream_parser"
+    require_relative "ollama/response_parser"
     require_relative "ollama/models"
+
     include Format
 
     HOST = "localhost"
@@ -44,7 +46,7 @@ module LLM
       params   = {model:}.merge!(params)
       req      = Net::HTTP::Post.new("/v1/embeddings", headers)
       req.body = JSON.dump({input:}.merge!(params))
-      res      = request(@http, req)
+      res      = execute(request: req)
       Response::Embedding.new(res).extend(response_parser)
     end
 
@@ -59,14 +61,15 @@ module LLM
     #  When given an object a provider does not understand
     # @return (see LLM::Provider#complete)
     def complete(prompt, params = {})
-      params = {role: :user, model: default_model, stream: false}.merge!(params)
+      params = {role: :user, model: default_model, stream: true}.merge!(params)
       params = [params, {format: params[:schema]}, format_tools(params)].inject({}, &:merge!).compact
-      role = params.delete(:role)
+      role, stream = params.delete(:role), params.delete(:stream)
+      params[:stream] = true if stream.respond_to?(:<<) || stream == true
       req = Net::HTTP::Post.new("/api/chat", headers)
       messages = [*(params.delete(:messages) || []), LLM::Message.new(role, prompt)]
       body = JSON.dump({messages: [format(messages)].flatten}.merge!(params))
       set_body_stream(req, StringIO.new(body))
-      res = request(@http, req)
+      res = execute(request: req, stream:)
       Response::Completion.new(res).extend(response_parser)
     end
 
@@ -105,6 +108,10 @@ module LLM
       LLM::Ollama::ResponseParser
     end
 
+    def stream_parser
+      LLM::Ollama::StreamParser
+    end
+
     def error_handler
       LLM::Ollama::ErrorHandler
     end

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

@@ -35,7 +35,7 @@ class LLM::OpenAI
       req = Net::HTTP::Post.new("/v1/audio/speech", headers)
       req.body = JSON.dump({input:, voice:, model:, response_format:}.merge!(params))
       io = StringIO.new("".b)
-      res = request(http, req) { _1.read_body { |chunk| io << chunk } }
+      res = execute(request: req) { _1.read_body { |chunk| io << chunk } }
       LLM::Response::Audio.new(res).tap { _1.audio = io }
     end
 
@@ -56,7 +56,7 @@ class LLM::OpenAI
       req = Net::HTTP::Post.new("/v1/audio/transcriptions", headers)
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::AudioTranscription.new(res).tap { _1.text = _1.body["text"] }
     end
 
@@ -78,18 +78,14 @@ class LLM::OpenAI
       req = Net::HTTP::Post.new("/v1/audio/translations", headers)
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::AudioTranslation.new(res).tap { _1.text = _1.body["text"] }
     end
 
     private
 
-    def http
-      @provider.instance_variable_get(:@http)
-    end
-
-    [:headers, :request, :set_body_stream].each do |m|
-      define_method(m) { |*args, &b| @provider.send(m, *args, &b) }
+    [:headers, :execute, :set_body_stream].each do |m|
+      define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end
 end

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

@@ -23,11 +23,11 @@ class LLM::OpenAI
     def raise_error!
       case res
       when Net::HTTPUnauthorized
-        raise LLM::Error::Unauthorized.new { _1.response = res }, "Authentication error"
+        raise LLM::UnauthorizedError.new { _1.response = res }, "Authentication error"
       when Net::HTTPTooManyRequests
-        raise LLM::Error::RateLimit.new { _1.response = res }, "Too many requests"
+        raise LLM::RateLimitError.new { _1.response = res }, "Too many requests"
       else
-        raise LLM::Error::ResponseError.new { _1.response = res }, "Unexpected response"
+        raise LLM::ResponseError.new { _1.response = res }, "Unexpected response"
       end
     end
   end

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

@@ -8,22 +8,23 @@ class LLM::OpenAI
   # and API endpoints. OpenAI supports multiple file formats, including text
   # files, CSV files, JSON files, and more.
   #
-  # @example
+  # @example example #1
   #   #!/usr/bin/env ruby
   #   require "llm"
   #
   #   llm = LLM.openai(ENV["KEY"])
-  #   bot = LLM::Chat.new(llm).lazy
+  #   bot = LLM::Bot.new(llm)
   #   file = llm.files.create file: "/documents/freebsd.pdf"
   #   bot.chat(file)
   #   bot.chat("Describe the document")
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
-  # @example
+  #
+  # @example example #2
   #   #!/usr/bin/env ruby
   #   require "llm"
   #
   #   llm = LLM.openai(ENV["KEY"])
-  #   bot = LLM::Chat.new(llm).lazy
+  #   bot = LLM::Bot.new(llm)
   #   file = llm.files.create file: "/documents/openbsd.pdf"
   #   bot.chat(["Describe the document I sent to you", file])
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
@@ -51,7 +52,7 @@ class LLM::OpenAI
     def all(**params)
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/files?#{query}", headers)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::FileList.new(res).tap { |filelist|
         files = filelist.body["data"].map { LLM::Object.from_hash(_1) }
         filelist.files = files
@@ -74,7 +75,7 @@ class LLM::OpenAI
       req = Net::HTTP::Post.new("/v1/files", headers)
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::File.new(res)
     end
 
@@ -93,7 +94,7 @@ class LLM::OpenAI
       file_id = file.respond_to?(:id) ? file.id : file
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/files/#{file_id}?#{query}", headers)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::File.new(res)
     end
 
@@ -114,7 +115,7 @@ class LLM::OpenAI
       file_id = file.respond_to?(:id) ? file.id : file
       req = Net::HTTP::Get.new("/v1/files/#{file_id}/content?#{query}", headers)
       io = StringIO.new("".b)
-      res = request(http, req) { |res| res.read_body { |chunk| io << chunk } }
+      res = execute(request: req) { |res| res.read_body { |chunk| io << chunk } }
       LLM::Response::DownloadFile.new(res).tap { _1.file = io }
     end
 
@@ -131,18 +132,14 @@ class LLM::OpenAI
     def delete(file:)
       file_id = file.respond_to?(:id) ? file.id : file
       req = Net::HTTP::Delete.new("/v1/files/#{file_id}", headers)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Object.from_hash JSON.parse(res.body)
     end
 
     private
 
-    def http
-      @provider.instance_variable_get(:@http)
-    end
-
-    [:headers, :request, :set_body_stream].each do |m|
-      define_method(m) { |*args, &b| @provider.send(m, *args, &b) }
+    [:headers, :execute, :set_body_stream].each do |m|
+      define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end
 end

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

@@ -7,7 +7,7 @@ class LLM::OpenAI
   # OpenAI supports multiple response formats: temporary URLs, or binary strings
   # encoded in base64. The default is to return temporary URLs.
   #
-  # @example
+  # @example example #1
   #   #!/usr/bin/env ruby
   #   require "llm"
   #   require "open-uri"
@@ -17,7 +17,8 @@ class LLM::OpenAI
   #   res = llm.images.create prompt: "A dog on a rocket to the moon"
   #   FileUtils.mv OpenURI.open_uri(res.urls[0]).path,
   #                "rocket.png"
-  # @example
+  #
+  # @example example #2
   #   #!/usr/bin/env ruby
   #   require "llm"
   #
@@ -49,7 +50,7 @@ class LLM::OpenAI
     def create(prompt:, model: "dall-e-3", **params)
       req = Net::HTTP::Post.new("/v1/images/generations", headers)
       req.body = JSON.dump({prompt:, n: 1, model:}.merge!(params))
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::Image.new(res).extend(response_parser)
     end
 
@@ -71,7 +72,7 @@ class LLM::OpenAI
       req = Net::HTTP::Post.new("/v1/images/variations", headers)
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::Image.new(res).extend(response_parser)
     end
 
@@ -94,18 +95,14 @@ class LLM::OpenAI
       req = Net::HTTP::Post.new("/v1/images/edits", headers)
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::Image.new(res).extend(response_parser)
     end
 
     private
 
-    def http
-      @provider.instance_variable_get(:@http)
-    end
-
-    [:response_parser, :headers, :request, :set_body_stream].each do |m|
-      define_method(m) { |*args, &b| @provider.send(m, *args, &b) }
+    [:response_parser, :headers, :execute, :set_body_stream].each do |m|
+      define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end
 end

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

@@ -40,7 +40,7 @@ class LLM::OpenAI
     def all(**params)
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/models?#{query}", headers)
-      res = request(http, req)
+      res = execute(request: req)
       LLM::Response::ModelList.new(res).tap { |modellist|
         models = modellist.body["data"].map do |model|
           LLM::Model.from_hash(model).tap { _1.provider = @provider }
@@ -51,12 +51,8 @@ class LLM::OpenAI
 
     private
 
-    def http
-      @provider.instance_variable_get(:@http)
-    end
-
-    [:headers, :request, :set_body_stream].each do |m|
-      define_method(m) { |*args, &b| @provider.send(m, *args, &b) }
+    [:headers, :execute, :set_body_stream].each do |m|
+      define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end
 end