llm.rb 0.10.1 → 0.11.0

data/lib/llm/providers/ollama.rb

@@ -19,10 +19,11 @@ module LLM
   #   bot.chat "Describe the image"
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
   class Ollama < Provider
+    require_relative "ollama/response/embedding"
+    require_relative "ollama/response/completion"
     require_relative "ollama/error_handler"
     require_relative "ollama/format"
     require_relative "ollama/stream_parser"
-    require_relative "ollama/response_parser"
     require_relative "ollama/models"
 
     include Format
@@ -47,7 +48,7 @@ module LLM
       req      = Net::HTTP::Post.new("/v1/embeddings", headers)
       req.body = JSON.dump({input:}.merge!(params))
       res      = execute(request: req)
-      Response::Embedding.new(res).extend(response_parser)
+      LLM::Response.new(res).extend(LLM::Ollama::Response::Embedding)
     end
 
     ##
@@ -57,7 +58,7 @@ module LLM
     # @param params (see LLM::Provider#complete)
     # @example (see LLM::Provider#complete)
     # @raise (see LLM::Provider#request)
-    # @raise [LLM::Error::PromptError]
+    # @raise [LLM::PromptError]
     #  When given an object a provider does not understand
     # @return (see LLM::Provider#complete)
     def complete(prompt, params = {})
@@ -70,7 +71,7 @@ module LLM
       body = JSON.dump({messages: [format(messages)].flatten}.merge!(params))
       set_body_stream(req, StringIO.new(body))
       res = execute(request: req, stream:)
-      Response::Completion.new(res).extend(response_parser)
+      LLM::Response.new(res).extend(LLM::Ollama::Response::Completion)
     end
 
     ##
@@ -104,10 +105,6 @@ module LLM
       )
     end
 
-    def response_parser
-      LLM::Ollama::ResponseParser
-    end
-
     def stream_parser
       LLM::Ollama::StreamParser
     end

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

@@ -30,13 +30,13 @@ class LLM::OpenAI
     # @param [String] response_format The response format
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::Audio]
+    # @return [LLM::Response]
     def create_speech(input:, voice: "alloy", model: "gpt-4o-mini-tts", response_format: "mp3", **params)
       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 = execute(request: req) { _1.read_body { |chunk| io << chunk } }
-      LLM::Response::Audio.new(res).tap { _1.audio = io }
+      LLM::Response.new(res).tap { _1.define_singleton_method(:audio) { io } }
     end
 
     ##
@@ -50,14 +50,14 @@ class LLM::OpenAI
     # @param [String] model The model to use
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::AudioTranscription]
+    # @return [LLM::Response]
     def create_transcription(file:, model: "whisper-1", **params)
       multi = LLM::Multipart.new(params.merge!(file: LLM.File(file), model:))
       req = Net::HTTP::Post.new("/v1/audio/transcriptions", headers)
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
       res = execute(request: req)
-      LLM::Response::AudioTranscription.new(res).tap { _1.text = _1.body["text"] }
+      LLM::Response.new(res)
     end
 
     ##
@@ -72,14 +72,14 @@ class LLM::OpenAI
     # @param [String] model The model to use
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::AudioTranslation]
+    # @return [LLM::Response]
     def create_translation(file:, model: "whisper-1", **params)
       multi = LLM::Multipart.new(params.merge!(file: LLM.File(file), model:))
       req = Net::HTTP::Post.new("/v1/audio/translations", headers)
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
       res = execute(request: req)
-      LLM::Response::AudioTranslation.new(res).tap { _1.text = _1.body["text"] }
+      LLM::Response.new(res)
     end
 
     private

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

@@ -29,6 +29,8 @@ class LLM::OpenAI
   #   bot.chat(["Describe the document I sent to you", file])
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
   class Files
+    require_relative "response/file"
+
     ##
     # Returns a new Files object
     # @param provider [LLM::Provider]
@@ -48,15 +50,12 @@ class LLM::OpenAI
     # @see https://platform.openai.com/docs/api-reference/files/list OpenAI docs
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::FileList]
+    # @return [LLM::Response]
     def all(**params)
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/files?#{query}", headers)
       res = execute(request: req)
-      LLM::Response::FileList.new(res).tap { |filelist|
-        files = filelist.body["data"].map { LLM::Object.from_hash(_1) }
-        filelist.files = files
-      }
+      LLM::Response.new(res)
     end
 
     ##
@@ -65,18 +64,18 @@ class LLM::OpenAI
     #   llm = LLM.openai(ENV["KEY"])
     #   res = llm.files.create file: "/documents/haiku.txt"
     # @see https://platform.openai.com/docs/api-reference/files/create OpenAI docs
-    # @param [File] file The file
+    # @param [File, LLM::File, String] file The file
     # @param [String] purpose The purpose of the file (see OpenAI docs)
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::File]
+    # @return [LLM::Response]
     def create(file:, purpose: "assistants", **params)
-      multi = LLM::Multipart.new(params.merge!(file:, purpose:))
+      multi = LLM::Multipart.new(params.merge!(file: LLM.File(file), purpose:))
       req = Net::HTTP::Post.new("/v1/files", headers)
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
       res = execute(request: req)
-      LLM::Response::File.new(res)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::File)
     end
 
     ##
@@ -89,13 +88,13 @@ class LLM::OpenAI
     # @param [#id, #to_s] file The file ID
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::File]
+    # @return [LLM::Response]
     def get(file:, **params)
       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 = execute(request: req)
-      LLM::Response::File.new(res)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::File)
     end
 
     ##
@@ -109,14 +108,14 @@ class LLM::OpenAI
     # @param [#id, #to_s] file The file ID
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::DownloadFile]
+    # @return [LLM::Response]
     def download(file:, **params)
       query = URI.encode_www_form(params)
       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 = execute(request: req) { |res| res.read_body { |chunk| io << chunk } }
-      LLM::Response::DownloadFile.new(res).tap { _1.file = io }
+      LLM::Response.new(res).tap { _1.define_singleton_method(:file) { io } }
     end
 
     ##
@@ -128,12 +127,12 @@ class LLM::OpenAI
     # @see https://platform.openai.com/docs/api-reference/files/delete OpenAI docs
     # @param [#id, #to_s] file The file ID
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Object] Response body
+    # @return [LLM::Response]
     def delete(file:)
       file_id = file.respond_to?(:id) ? file.id : file
       req = Net::HTTP::Delete.new("/v1/files/#{file_id}", headers)
       res = execute(request: req)
-      LLM::Object.from_hash JSON.parse(res.body)
+      LLM::Response.new(res)
     end
 
     private

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

@@ -32,10 +32,13 @@ module LLM::OpenAI::Format
       case content
       when URI
         [{type: :image_url, image_url: {url: content.to_s}}]
+      when File
+        content.close unless content.closed?
+        format_content(LLM.File(content.path))
       when LLM::File
         format_file(content)
-      when LLM::Response::File
-        [{type: :file, file: {file_id: content.id}}]
+      when LLM::Response
+        content.file? ? [{type: :file, file: {file_id: content.id}}] : prompt_error!(content)
       when String
         [{type: :text, text: content.to_s}]
       when LLM::Message
@@ -43,8 +46,7 @@ module LLM::OpenAI::Format
       when LLM::Function::Return
         throw(:abort, {role: "tool", tool_call_id: content.id, content: JSON.dump(content.value)})
       else
-        raise LLM::Error::PromptError, "The given object (an instance of #{content.class}) " \
-                                       "is not supported by the OpenAI chat completions API"
+        prompt_error!(content)
       end
     end
 
@@ -76,6 +78,11 @@ module LLM::OpenAI::Format
       end
     end
 
+    def prompt_error!(content)
+      raise LLM::PromptError, "The given object (an instance of #{content.class}) " \
+                              "is not supported by the OpenAI chat completions API"
+    end
+
     def message = @message
     def content = message.content
     def returns = content.grep(LLM::Function::Return)

data/lib/llm/providers/openai/format/moderation_format.rb

@@ -22,8 +22,8 @@ module LLM::OpenAI::Format
         elsif URI === input
           {type: :image_url, url: input.to_s}
         else
-          raise LLM::Error::FormatError, "The given object (an instance of #{input.class}) " \
-                                         "is not supported by OpenAI moderations API"
+          raise LLM::FormatError, "The given object (an instance of #{input.class}) " \
+                                  "is not supported by OpenAI moderations API"
         end
       end
     end

data/lib/llm/providers/openai/format/respond_format.rb

@@ -22,15 +22,14 @@ module LLM::OpenAI::Format
 
     def format_content(content)
       case content
-      when LLM::Response::File
-        format_file(content)
+      when LLM::Response
+        content.file? ? format_file(content) : prompt_error!(content)
       when String
         [{type: :input_text, text: content.to_s}]
       when LLM::Message
         format_content(content.content)
       else
-        raise LLM::Error::PromptError, "The given object (an instance of #{content.class}) " \
-                                       "is not supported by the OpenAI responses API"
+        prompt_error!(content)
       end
     end
 
@@ -62,6 +61,10 @@ module LLM::OpenAI::Format
       end
     end
 
+    def prompt_error!(content)
+      raise LLM::PromptError, "The given object (an instance of #{content.class}) " \
+                              "is not supported by the OpenAI responses API"
+    end
     def message = @message
     def content = message.content
     def returns = content.grep(LLM::Function::Return)

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

@@ -27,6 +27,7 @@ class LLM::OpenAI
   #                           response_format: "b64_json"
   #   IO.copy_stream res.images[0], "rocket.png"
   class Images
+    require_relative "response/image"
     ##
     # Returns a new Images object
     # @param provider [LLM::Provider]
@@ -46,12 +47,12 @@ class LLM::OpenAI
     # @param [String] model The model to use
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::Image]
+    # @return [LLM::Response]
     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 = execute(request: req)
-      LLM::Response::Image.new(res).extend(response_parser)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Image)
     end
 
     ##
@@ -65,7 +66,7 @@ class LLM::OpenAI
     # @param [String] model The model to use
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::Image]
+    # @return [LLM::Response]
     def create_variation(image:, model: "dall-e-2", **params)
       image = LLM.File(image)
       multi = LLM::Multipart.new(params.merge!(image:, model:))
@@ -73,7 +74,7 @@ class LLM::OpenAI
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
       res = execute(request: req)
-      LLM::Response::Image.new(res).extend(response_parser)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Image)
     end
 
     ##
@@ -88,7 +89,7 @@ class LLM::OpenAI
     # @param [String] model The model to use
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::Image]
+    # @return [LLM::Response]
     def edit(image:, prompt:, model: "dall-e-2", **params)
       image = LLM.File(image)
       multi = LLM::Multipart.new(params.merge!(image:, prompt:, model:))
@@ -96,12 +97,12 @@ class LLM::OpenAI
       req["content-type"] = multi.content_type
       set_body_stream(req, multi.body)
       res = execute(request: req)
-      LLM::Response::Image.new(res).extend(response_parser)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Image)
     end
 
     private
 
-    [:response_parser, :headers, :execute, :set_body_stream].each do |m|
+    [:headers, :execute, :set_body_stream].each do |m|
       define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end

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

@@ -36,17 +36,12 @@ class LLM::OpenAI
     # @see https://platform.openai.com/docs/api-reference/models/list OpenAI docs
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
-    # @return [LLM::Response::FileList]
+    # @return [LLM::Response]
     def all(**params)
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/models?#{query}", headers)
       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 }
-        end
-        modellist.models = models
-      }
+      LLM::Response.new(res)
     end
 
     private

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

@@ -13,7 +13,8 @@ class LLM::OpenAI
   #   require "llm"
   #
   #   llm = LLM.openai(key: ENV["KEY"])
-  #   mod = llm.moderations.create input: "I hate you"
+  #   res = llm.moderations.create input: "I hate you"
+  #   mod = res.moderations[0]
   #   print "categories: #{mod.categories}", "\n"
   #   print "scores: #{mod.scores}", "\n"
   #
@@ -22,13 +23,16 @@ class LLM::OpenAI
   #   require "llm"
   #
   #   llm = LLM.openai(key: ENV["KEY"])
-  #   mod = llm.moderations.create input: URI.parse("https://example.com/image.png")
+  #   res = llm.moderations.create input: URI.parse("https://example.com/image.png")
+  #   mod = res.moderations[0]
   #   print "categories: #{mod.categories}", "\n"
   #   print "scores: #{mod.scores}", "\n"
   #
   # @see https://platform.openai.com/docs/api-reference/moderations/create OpenAI docs
   # @see https://platform.openai.com/docs/models#moderation OpenAI moderation models
   class Moderations
+    require_relative "response/moderations"
+
     ##
     # Returns a new Moderations object
     # @param [LLM::Provider] provider
@@ -41,26 +45,20 @@ class LLM::OpenAI
     # Create a moderation
     # @see https://platform.openai.com/docs/api-reference/moderations/create OpenAI docs
     # @see https://platform.openai.com/docs/models#moderation OpenAI moderation models
-    # @note
-    # Although OpenAI mentions an array as a valid input, and that it can return one
-    # or more moderations, in practice the API only returns one moderation object. We
-    # recommend using a single input string or URI, and to keep in mind that llm.rb
-    # returns a Moderation object but has code in place to return multiple objects in
-    # the future (in case OpenAI documentation ever matches the actual API).
     # @param [String, URI, Array<String, URI>] input
     # @param [String, LLM::Model] model The model to use
-    # @return [LLM::Response::ModerationList::Moderation]
+    # @return [LLM::Response]
     def create(input:, model: "omni-moderation-latest", **params)
       req = Net::HTTP::Post.new("/v1/moderations", headers)
       input = Format::ModerationFormat.new(input).format
       req.body = JSON.dump({input:, model:}.merge!(params))
       res = execute(request: req)
-      LLM::Response::ModerationList.new(res).extend(response_parser).first
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Moderations)
     end
 
     private
 
-    [:response_parser, :headers, :execute].each do |m|
+    [:headers, :execute].each do |m|
       define_method(m) { |*args, **kwargs, &b| @provider.send(m, *args, **kwargs, &b) }
     end
   end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module LLM::OpenAI::Response
+  module Audio
+    def audio = body.audio
+  end
+end

data/lib/llm/providers/openai/{response_parser/completion_parser.rb → response/completion.rb}

@@ -1,30 +1,13 @@
 # frozen_string_literal: true
 
-module LLM::OpenAI::ResponseParser
-  ##
-  # @private
-  class CompletionParser
-    def initialize(body)
-      @body = LLM::Object.from_hash(body)
-    end
-
-    def format(response)
-      {
-        model:,
-        prompt_tokens:,
-        completion_tokens:,
-        total_tokens:,
-        choices: format_choices(response)
-      }
-    end
-
-    private
-
-    def format_choices(response)
-      choices.map.with_index do |choice, index|
+module LLM::OpenAI::Response
+  module Completion
+    def choices
+      body.choices.map.with_index do |choice, index|
+        choice = LLM::Object.from_hash(choice)
         message = choice.message
         extra = {
-          index:, response:,
+          index:, response: self,
           logprobs: choice.logprobs,
           tool_calls: format_tool_calls(message.tool_calls),
           original_tool_calls: message.tool_calls
@@ -32,6 +15,14 @@ module LLM::OpenAI::ResponseParser
         LLM::Message.new(message.role, message.content, extra)
       end
     end
+    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
+
+    private
 
     def format_tool_calls(tools)
       (tools || []).filter_map do |tool|
@@ -44,12 +35,5 @@ module LLM::OpenAI::ResponseParser
         LLM::Object.new(tool)
       end
     end
-
-    def body = @body
-    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 choices = body.choices
   end
-end
+end

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

@@ -0,0 +1,9 @@
+ # frozen_string_literal: true
+
+ module LLM::OpenAI::Response
+  module Embedding
+    def embeddings = data.map { _1["embedding"] }
+    def prompt_tokens = data.dig(0, "usage", "prompt_tokens")
+    def total_tokens = data.dig(0, "usage", "total_tokens")
+  end
+end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module LLM::OpenAI::Response
+  module File
+    def file? = true
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module LLM::OpenAI::Response
+  module Image
+    def urls
+      data.filter_map { _1["url"] }
+    end
+
+    def images
+      data.filter_map do
+        next unless _1["b64_json"]
+        StringIO.new(_1["b64_json"].unpack1("m0"))
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module LLM::OpenAI::Response
+  module Moderations
+    ##
+    # @return [Array<LLM::Response]
+    def moderations
+      @moderations ||= body.results.map { _1.extend(Moderation) }
+    end
+  end
+
+  module Moderation
+    ##
+    # Returns true if the moderation is flagged
+    # @return [Boolean]
+    def flagged?
+      body.flagged
+    end
+
+    ##
+    # Returns the moderation categories
+    # @return [Array<String>]
+    def categories
+      self["categories"].filter_map { _2 ? _1 : nil }
+    end
+
+    ##
+    # Returns the moderation scores
+    # @return [Hash]
+    def scores
+      self["category_scores"].select { |(key, _)| categories.include?(key) }.to_h
+    end
+  end
+end

data/lib/llm/providers/openai/{response_parser/respond_parser.rb → response/responds.rb}

@@ -1,28 +1,16 @@
 # frozen_string_literal: true
 
-module LLM::OpenAI::ResponseParser
-  ##
-  # @private
-  class RespondParser
-    def initialize(body)
-      @body = LLM::Object.from_hash(body)
-    end
+module LLM::OpenAI::Response
+  module Responds
 
-    def format(response)
-      {
-        id:,
-        model:,
-        input_tokens:,
-        output_tokens:,
-        total_tokens:,
-        outputs: [format_message(response)]
-      }
-    end
+    def outputs = [format_message]
+    def choices = body.output
+    def tools = output.select { _1.type == "function_call" }
 
     private
 
-    def format_message(response)
-      message = LLM::Message.new("assistant", +"", {response:, tool_calls: []})
+    def format_message
+      message = LLM::Message.new("assistant", +"", {response: self, tool_calls: []})
       choices.each.with_index do |choice, index|
         if choice.type == "function_call"
           message.extra[:tool_calls] << format_tool(choice)
@@ -43,14 +31,5 @@ module LLM::OpenAI::ResponseParser
         arguments: JSON.parse(tool.arguments)
       )
     end
-
-    def body = @body
-    def id = body.id
-    def model = body.model
-    def input_tokens = body.usage.input_tokens
-    def output_tokens = body.usage.output_tokens
-    def total_tokens = body.usage.total_tokens
-    def choices = body.output
-    def tools = output.select { _1.type == "function_call" }
   end
 end