llm.rb 0.4.2 → 0.6.0

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

@@ -4,33 +4,24 @@ class LLM::Gemini
   ##
   # @private
   module ResponseParser
+    require_relative "response_parser/completion_parser"
+
     ##
     # @param [Hash] body
     #  The response body from the LLM provider
     # @return [Hash]
-    def parse_embedding(body)
-      {
-        model: "text-embedding-004",
-        embeddings: body.dig("embedding", "values")
-      }
+    def parse_completion(body)
+      CompletionParser.new(body).format(self)
     end
 
     ##
     # @param [Hash] body
     #  The response body from the LLM provider
     # @return [Hash]
-    def parse_completion(body)
+    def parse_embedding(body)
       {
-        model: body["modelVersion"],
-        choices: body["candidates"].map do
-          LLM::Message.new(
-            _1.dig("content", "role"),
-            _1.dig("content", "parts", 0, "text"),
-            {response: self}
-          )
-        end,
-        prompt_tokens: body.dig("usageMetadata", "promptTokenCount"),
-        completion_tokens: body.dig("usageMetadata", "candidatesTokenCount")
+        model: "text-embedding-004",
+        embeddings: body.dig("embedding", "values")
       }
     end
 
@@ -41,10 +32,12 @@ class LLM::Gemini
     def parse_image(body)
       {
         urls: [],
-        images: body["candidates"].flat_map do |candidate|
-          candidate["content"]["parts"].filter_map do
-            next unless _1.dig("inlineData", "data")
-            StringIO.new(_1["inlineData"]["data"].unpack1("m0"))
+        images: body["candidates"].flat_map do |c|
+          parts = c["content"]["parts"]
+          parts.filter_map do
+            data = _1.dig("inlineData", "data")
+            next unless data
+            StringIO.new(data.unpack1("m0"))
           end
         end
       }

data/lib/llm/providers/gemini.rb

@@ -40,9 +40,9 @@ module LLM
     HOST = "generativelanguage.googleapis.com"
 
     ##
-    # @param secret (see LLM::Provider#initialize)
-    def initialize(secret, **)
-      super(secret, host: HOST, **)
+    # @param key (see LLM::Provider#initialize)
+    def initialize(**)
+      super(host: HOST, **)
     end
 
     ##
@@ -54,7 +54,7 @@ module LLM
     # @return (see LLM::Provider#embed)
     def embed(input, model: "text-embedding-004", **params)
       model = model.respond_to?(:id) ? model.id : model
-      path = ["/v1beta/models/#{model}", "embedContent?key=#{@secret}"].join(":")
+      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)
@@ -65,21 +65,21 @@ module LLM
     # Provides an interface to the chat completions API
     # @see https://ai.google.dev/api/generate-content#v1beta.models.generateContent Gemini docs
     # @param prompt (see LLM::Provider#complete)
-    # @param role (see LLM::Provider#complete)
-    # @param model (see LLM::Provider#complete)
-    # @param schema (see LLM::Provider#complete)
     # @param params (see LLM::Provider#complete)
     # @example (see LLM::Provider#complete)
     # @raise (see LLM::Provider#request)
     # @raise [LLM::Error::PromptError]
     #  When given an object a provider does not understand
     # @return (see LLM::Provider#complete)
-    def complete(prompt, role = :user, model: default_model, schema: nil, **params)
+    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) }
       model.respond_to?(:id) ? model.id : model
-      path = ["/v1beta/models/#{model}", "generateContent?key=#{@secret}"].join(":")
+      path = ["/v1beta/models/#{model}", "generateContent?key=#{@key}"].join(":")
       req  = Net::HTTP::Post.new(path, headers)
       messages = [*(params.delete(:messages) || []), LLM::Message.new(role, prompt)]
-      body = JSON.dump({contents: format(messages)}.merge!(expand_schema(schema)))
+      body = JSON.dump({contents: format(messages)}.merge!(params))
       set_body_stream(req, StringIO.new(body))
       res = request(@http, req)
       Response::Completion.new(res).extend(response_parser)
@@ -136,16 +136,6 @@ module LLM
       }
     end
 
-    def expand_schema(schema)
-      return {} unless schema
-      {
-        "generationConfig" => {
-          "response_mime_type" => "application/json",
-          "response_schema" => schema
-        }
-      }
-    end
-
     def response_parser
       LLM::Gemini::ResponseParser
     end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module LLM::Ollama::Format
+  ##
+  # @private
+  class CompletionFormat
+    ##
+    # @param [LLM::Message] message
+    #  The message to format
+    def initialize(message)
+      @message = message
+    end
+
+    ##
+    # Returns the message for the Ollama chat completions API
+    # @return [Hash]
+    def format
+      catch(:abort) do
+        if Hash === message
+          {role: message[:role]}.merge(format_content(message[:content]))
+        else
+          format_message
+        end
+      end
+    end
+
+    private
+
+    def format_content(content)
+      case content
+      when LLM::File
+        if content.image?
+          {content: "This message has an image associated with it", images: [content.to_b64]}
+        else
+          raise LLM::Error::PromptError, "The given object (an instance of #{content.class}) " \
+                                         "is not an image, and therefore not supported by the " \
+                                         "Ollama API"
+        end
+      when String
+        {content:}
+      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 Ollama API"
+      end
+    end
+
+    def format_message
+      case content
+      when Array
+        format_array
+      else
+        {role: message.role}.merge(format_content(content))
+      end
+    end
+
+    def format_array
+      if content.empty?
+        nil
+      elsif returns.any?
+        returns.map { {role: "tool", tool_call_id: _1.id, content: JSON.dump(_1.value)} }
+      else
+        [{role: message.role, content: content.flat_map { format_content(_1) }}]
+      end
+    end
+
+    def message = @message
+    def content = message.content
+    def returns = content.grep(LLM::Function::Return)
+  end
+end

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

@@ -4,47 +4,28 @@ class LLM::Ollama
   ##
   # @private
   module Format
+    require_relative "format/completion_format"
+
     ##
     # @param [Array<LLM::Message>] messages
     #  The messages to format
     # @return [Array<Hash>]
     def format(messages)
-      messages.map do
-        if Hash === _1
-          {role: _1[:role]}
-            .merge!(_1)
-            .merge!(format_content(_1[:content]))
-        else
-          {role: _1.role}.merge! format_content(_1.content)
-        end
+      messages.filter_map do |message|
+        CompletionFormat.new(message).format
       end
     end
 
     private
 
     ##
-    # @param [String, URI] content
-    #  The content to format
-    # @return [String, Hash]
-    #  The formatted content
-    def format_content(content)
-      case content
-      when LLM::File
-        if content.image?
-          {content: "This message has an image associated with it", images: [content.to_b64]}
-        else
-          raise LLM::Error::PromptError, "The given object (an instance of #{content.class}) " \
-                                         "is not an image, and therefore not supported by the " \
-                                         "Ollama API"
-        end
-      when String
-        {content:}
-      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 Ollama API"
-      end
+    # @param [Array<LLM::Function>] tools
+    #  The tools to format
+    # @return [Hash]
+    def format_tools(params)
+      return {} unless params and params[:tools]&.any?
+      tools = params[:tools]
+      {tools: tools.map { _1.format(self) }}
     end
   end
 end

data/lib/llm/providers/ollama/response_parser/completion_parser.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module LLM::Ollama::ResponseParser
+  ##
+  # @private
+  class CompletionParser
+    def initialize(body)
+      @body = OpenStruct.from_hash(body)
+    end
+
+    def format(response)
+      {
+        model:,
+        choices: [format_choices(response)],
+        prompt_tokens:,
+        completion_tokens:
+      }
+    end
+
+    private
+
+    def format_choices(response)
+      role, content, calls = message.to_h.values_at(:role, :content, :tool_calls)
+      extra = {response:, tool_calls: format_tool_calls(calls)}
+      LLM::Message.new(role, content, extra)
+    end
+
+    def format_tool_calls(tools)
+      return [] unless tools
+      tools.filter_map do |tool|
+        next unless tool["function"]
+        OpenStruct.new(tool["function"])
+      end
+    end
+
+    def body = @body
+    def model = body.model
+    def prompt_tokens = body.prompt_eval_count
+    def completion_tokens = body.eval_count
+    def message = body.message
+  end
+end

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

@@ -4,29 +4,26 @@ class LLM::Ollama
   ##
   # @private
   module ResponseParser
+    require_relative "response_parser/completion_parser"
+
     ##
     # @param [Hash] body
     #  The response body from the LLM provider
     # @return [Hash]
-    def parse_embedding(body)
-      {
-        model: body["model"],
-        embeddings: body["data"].map { _1["embedding"] },
-        prompt_tokens: body.dig("usage", "prompt_tokens"),
-        total_tokens: body.dig("usage", "total_tokens")
-      }
+    def parse_completion(body)
+      CompletionParser.new(body).format(self)
     end
 
     ##
     # @param [Hash] body
     #  The response body from the LLM provider
     # @return [Hash]
-    def parse_completion(body)
+    def parse_embedding(body)
       {
         model: body["model"],
-        choices: [LLM::Message.new(*body["message"].values_at("role", "content"), {response: self})],
-        prompt_tokens: body.dig("prompt_eval_count"),
-        completion_tokens: body.dig("eval_count")
+        embeddings: body["data"].map { _1["embedding"] },
+        prompt_tokens: body.dig("usage", "prompt_tokens"),
+        total_tokens: body.dig("usage", "total_tokens")
       }
     end
   end

data/lib/llm/providers/ollama.rb

@@ -28,9 +28,9 @@ module LLM
     HOST = "localhost"
 
     ##
-    # @param secret (see LLM::Provider#initialize)
-    def initialize(secret, **)
-      super(secret, host: HOST, port: 11434, ssl: false, **)
+    # @param key (see LLM::Provider#initialize)
+    def initialize(**)
+      super(host: HOST, port: 11434, ssl: false, **)
     end
 
     ##
@@ -52,22 +52,19 @@ module LLM
     # Provides an interface to the chat completions API
     # @see https://github.com/ollama/ollama/blob/main/docs/api.md#generate-a-chat-completion Ollama docs
     # @param prompt (see LLM::Provider#complete)
-    # @param role (see LLM::Provider#complete)
-    # @param model (see LLM::Provider#complete)
     # @param params (see LLM::Provider#complete)
     # @example (see LLM::Provider#complete)
     # @raise (see LLM::Provider#request)
     # @raise [LLM::Error::PromptError]
     #  When given an object a provider does not understand
     # @return (see LLM::Provider#complete)
-    def complete(prompt, role = :user, model: default_model, schema: nil, **params)
-      params = {model:, stream: false}
-                 .merge!(expand_schema(schema))
-                 .merge!(params)
-                 .compact
+    def complete(prompt, params = {})
+      params = {role: :user, model: default_model, stream: false}.merge!(params)
+      params = [params, {format: params[:schema]}, format_tools(params)].inject({}, &:merge!).compact
+      role = params.delete(:role)
       req = Net::HTTP::Post.new("/api/chat", headers)
       messages = [*(params.delete(:messages) || []), LLM::Message.new(role, prompt)]
-      body = JSON.dump({messages: format(messages)}.merge!(params))
+      body = JSON.dump({messages: [format(messages)].flatten}.merge!(params))
       set_body_stream(req, StringIO.new(body))
       res = request(@http, req)
       Response::Completion.new(res).extend(response_parser)
@@ -100,15 +97,10 @@ module LLM
     def headers
       {
         "Content-Type" => "application/json",
-        "Authorization" => "Bearer #{@secret}"
+        "Authorization" => "Bearer #{@key}"
       }
     end
 
-    def expand_schema(schema)
-      return {} unless schema
-      {format: schema}
-    end
-
     def response_parser
       LLM::Ollama::ResponseParser
     end

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

@@ -7,7 +7,7 @@ class LLM::OpenAI
   # @example
   #   llm = LLM.openai(ENV["KEY"])
   #   res = llm.audio.create_speech(input: "A dog on a rocket to the moon")
-  #   File.binwrite("rocket.mp3", res.audio.string)
+  #   IO.copy_stream res.audio, "rocket.mp3"
   class Audio
     ##
     # Returns a new Audio object
@@ -43,16 +43,16 @@ class LLM::OpenAI
     # Create an audio transcription
     # @example
     #   llm = LLM.openai(ENV["KEY"])
-    #   res = llm.audio.create_transcription(file: LLM::File("/rocket.mp3"))
+    #   res = llm.audio.create_transcription(file: "/audio/rocket.mp3")
     #   res.text # => "A dog on a rocket to the moon"
     # @see https://platform.openai.com/docs/api-reference/audio/createTranscription OpenAI docs
-    # @param [LLM::File] file The input audio
+    # @param [String, LLM::File] file The input audio
     # @param [String] model The model to use
     # @param [Hash] params Other parameters (see OpenAI docs)
     # @raise (see LLM::Provider#request)
     # @return [LLM::Response::AudioTranscription]
     def create_transcription(file:, model: "whisper-1", **params)
-      multi = LLM::Multipart.new(params.merge!(file:, model:))
+      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)
@@ -65,7 +65,7 @@ class LLM::OpenAI
     # @example
     #   # Arabic => English
     #   llm = LLM.openai(ENV["KEY"])
-    #   res = llm.audio.create_translation(file: LLM::File("/bismillah.mp3"))
+    #   res = llm.audio.create_translation(file: "/audio/bismillah.mp3")
     #   res.text # => "In the name of Allah, the Beneficent, the Merciful."
     # @see https://platform.openai.com/docs/api-reference/audio/createTranslation OpenAI docs
     # @param [LLM::File] file The input audio
@@ -74,7 +74,7 @@ class LLM::OpenAI
     # @raise (see LLM::Provider#request)
     # @return [LLM::Response::AudioTranslation]
     def create_translation(file:, model: "whisper-1", **params)
-      multi = LLM::Multipart.new(params.merge!(file:, model:))
+      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)

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

@@ -14,7 +14,7 @@ class LLM::OpenAI
   #
   #   llm = LLM.openai(ENV["KEY"])
   #   bot = LLM::Chat.new(llm).lazy
-  #   file = llm.files.create file: LLM::File("/documents/freebsd.pdf")
+  #   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" }
@@ -24,7 +24,7 @@ class LLM::OpenAI
   #
   #   llm = LLM.openai(ENV["KEY"])
   #   bot = LLM::Chat.new(llm).lazy
-  #   file = llm.files.create file: LLM::File("/documents/openbsd.pdf")
+  #   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" }
   class Files
@@ -62,7 +62,7 @@ class LLM::OpenAI
     # Create a file
     # @example
     #   llm = LLM.openai(ENV["KEY"])
-    #   res = llm.files.create file: LLM::File("/documents/haiku.txt"),
+    #   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 [String] purpose The purpose of the file (see OpenAI docs)

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

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module LLM::OpenAI::Format
+  ##
+  # @private
+  class CompletionFormat
+    ##
+    # @param [LLM::Message, Hash] message
+    #  The message to format
+    def initialize(message)
+      @message = message
+    end
+
+    ##
+    # Formats the message for the OpenAI chat completions API
+    # @return [Hash]
+    def format
+      catch(:abort) do
+        if Hash === message
+          {role: message[:role], content: format_content(message[:content])}
+        elsif message.tool_call?
+          {role: message.role, content: nil, tool_calls: message.extra[:original_tool_calls]}
+        else
+          format_message
+        end
+      end
+    end
+
+    private
+
+    def format_content(content)
+      case content
+      when URI
+        [{type: :image_url, image_url: {url: content.to_s}}]
+      when LLM::File
+        format_file(content)
+      when LLM::Response::File
+        [{type: :file, file: {file_id: content.id}}]
+      when String
+        [{type: :text, text: content.to_s}]
+      when LLM::Message
+        format_content(content.content)
+      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"
+      end
+    end
+
+    def format_file(content)
+      file = content
+      if file.image?
+        [{type: :image_url, image_url: {url: file.to_data_uri}}]
+      else
+        [{type: :file, file: {filename: file.basename, file_data: file.to_data_uri}}]
+      end
+    end
+
+    def format_message
+      case content
+      when Array
+        format_array
+      else
+        {role: message.role, content: format_content(content)}
+      end
+    end
+
+    def format_array
+      if content.empty?
+        nil
+      elsif returns.any?
+        returns.map { {role: "tool", tool_call_id: _1.id, content: JSON.dump(_1.value)} }
+      else
+        {role: message.role, content: content.flat_map { format_content(_1) }}
+      end
+    end
+
+    def message = @message
+    def content = message.content
+    def returns = content.grep(LLM::Function::Return)
+  end
+end

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module LLM::OpenAI::Format
+  ##
+  # @private
+  class RespondFormat
+    def initialize(message)
+      @message = message
+    end
+
+    def format
+      catch(:abort) do
+        if Hash === message
+          {role: message[:role], content: format_content(message[:content])}
+        else
+          format_message
+        end
+      end
+    end
+
+    private
+
+    def format_content(content)
+      case content
+      when LLM::Response::File
+        format_file(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"
+      end
+    end
+
+    def format_message
+      case content
+      when Array
+        format_array
+      else
+        {role: message.role, content: format_content(content)}
+      end
+    end
+
+    def format_array
+      if content.empty?
+        nil
+      elsif returns.any?
+        returns.map { {type: "function_call_output", call_id: _1.id, output: JSON.dump(_1.value)} }
+      else
+        {role: message.role, content: content.flat_map { format_content(_1) }}
+      end
+    end
+
+    def format_file(content)
+      file = LLM::File(content.filename)
+      if file.image?
+        [{type: :input_image, file_id: content.id}]
+      else
+        [{type: :input_file, file_id: content.id}]
+      end
+    end
+
+    def message = @message
+    def content = message.content
+    def returns = content.grep(LLM::Function::Return)
+  end
+end