llm.rb 0.12.0 → 0.14.0

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

@@ -60,6 +60,12 @@ module LLM::Anthropic::Format
                                   "is not an image or PDF, and therefore not supported by the " \
                                   "Anthropic API"
         end
+      when LLM::Response
+        if content.file?
+          [{type: content.file_type, source: {type: :file, file_id: content.id}}]
+        else
+          prompt_error!(content)
+        end
       when String
         [{type: :text, text: content}]
       when LLM::Message
@@ -67,11 +73,15 @@ module LLM::Anthropic::Format
       when LLM::Function::Return
         [{type: "tool_result", tool_use_id: content.id, content: [{type: :text, text: JSON.dump(content.value)}]}]
       else
-        raise LLM::PromptError, "The given object (an instance of #{content.class}) " \
-                                "is not supported by the Anthropic API"
+        prompt_error!(content)
       end
     end
 
+    def prompt_error!(content)
+      raise LLM::PromptError, "The given object (an instance of #{content.class}) " \
+                              "is not supported by the Anthropic API"
+    end
+
     def message = @message
     def content = message.content
   end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class LLM::Anthropic
+  require_relative "response/enumerable"
   ##
   # The {LLM::Anthropic::Models LLM::Anthropic::Models} class provides a model
   # object for interacting with [Anthropic's models API](https://platform.anthropic.com/docs/api-reference/models/list).
@@ -41,7 +42,7 @@ class LLM::Anthropic
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/models?#{query}", headers)
       res = execute(request: req)
-      LLM::Response.new(res)
+      LLM::Response.new(res).extend(LLM::Anthropic::Response::Enumerable)
     end
 
     private

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LLM::Anthropic::Response
+  module Enumerable
+    include ::Enumerable
+    def each(&)
+      return enum_for(:each) unless block_given?
+      data.each { yield(_1) }
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module LLM::Anthropic::Response
+  module File
+    ##
+    # Always return true
+    # @return [Boolean]
+    def file? = true
+
+    ##
+    # Returns the file type referenced by a prompt
+    # @return [Symbol]
+    def file_type
+      if mime_type.start_with?("image/")
+        :image
+      elsif mime_type == "text/plain" || mime_type == "application/pdf"
+        :document
+      else
+        :container_upload
+      end
+    end
+  end
+end

data/lib/llm/providers/anthropic.rb

@@ -18,6 +18,7 @@ module LLM
     require_relative "anthropic/format"
     require_relative "anthropic/error_handler"
     require_relative "anthropic/stream_parser"
+    require_relative "anthropic/files"
     require_relative "anthropic/models"
     include Format
 
@@ -60,6 +61,14 @@ module LLM
       LLM::Anthropic::Models.new(self)
     end
 
+    ##
+    # Provides an interface to Anthropic's files API
+    # @see https://docs.anthropic.com/en/docs/build-with-claude/files Anthropic docs
+    # @return [LLM::Anthropic::Files]
+    def files
+      LLM::Anthropic::Files.new(self)
+    end
+
     ##
     # @return (see LLM::Provider#assistant_role)
     def assistant_role
@@ -80,7 +89,8 @@ module LLM
       (@headers || {}).merge(
         "Content-Type" => "application/json",
         "x-api-key" => @key,
-        "anthropic-version" => "2023-06-01"
+        "anthropic-version" => "2023-06-01",
+        "anthropic-beta" => "files-api-2025-04-14"
       )
     end
 

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

@@ -22,6 +22,8 @@ class LLM::Gemini
     #  Raises a subclass of {LLM::Error LLM::Error}
     def raise_error!
       case res
+      when Net::HTTPServerError
+        raise LLM::ServerError.new { _1.response = res }, "Server error"
       when Net::HTTPBadRequest
         reason = body.dig("error", "details", 0, "reason")
         if reason == "API_KEY_INVALID"

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

@@ -24,6 +24,7 @@ class LLM::Gemini
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
   class Files
     require_relative "response/file"
+    require_relative "response/files"
 
     ##
     # Returns a new Files object
@@ -49,7 +50,7 @@ class LLM::Gemini
       query = URI.encode_www_form(params.merge!(key: key))
       req = Net::HTTP::Get.new("/v1beta/files?#{query}", headers)
       res = execute(request: req)
-      LLM::Response.new(res)
+      LLM::Response.new(res).extend(LLM::Gemini::Response::Files)
     end
 
     ##

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

@@ -17,6 +17,7 @@ class LLM::Gemini
   #     print "id: ", model.id, "\n"
   #   end
   class Models
+    require_relative "response/models"
     include LLM::Utils
 
     ##
@@ -43,7 +44,7 @@ class LLM::Gemini
       query = URI.encode_www_form(params.merge!(key: key))
       req = Net::HTTP::Get.new("/v1beta/models?#{query}", headers)
       res = execute(request: req)
-      LLM::Response.new(res)
+      LLM::Response.new(res).extend(LLM::Gemini::Response::Models)
     end
 
     private

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

@@ -28,5 +28,7 @@ module LLM::Gemini::Response
         LLM::Object.new(function)
       end
     end
+
+    def candidates = body.candidates || []
   end
 end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module LLM::Gemini::Response
+  module Files
+    include ::Enumerable
+    def each(&)
+      return enum_for(:each) unless block_given?
+      files.each { yield(_1) }
+    end
+
+    def files
+      body.files || []
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module LLM::Gemini::Response
+  module Models
+    include ::Enumerable
+    def each(&)
+      return enum_for(:each) unless block_given?
+      models.each { yield(_1) }
+    end
+
+    def models
+      body.models || []
+    end
+  end
+end

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

@@ -22,6 +22,8 @@ class LLM::Ollama
     #  Raises a subclass of {LLM::Error LLM::Error}
     def raise_error!
       case res
+      when Net::HTTPServerError
+        raise LLM::ServerError.new { _1.response = res }, "Server error"
       when Net::HTTPUnauthorized
         raise LLM::UnauthorizedError.new { _1.response = res }, "Authentication error"
       when Net::HTTPTooManyRequests

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

@@ -22,13 +22,25 @@ class LLM::OpenAI
     #  Raises a subclass of {LLM::Error LLM::Error}
     def raise_error!
       case res
+      when Net::HTTPServerError
+        raise LLM::ServerError.new { _1.response = res }, "Server error"
       when Net::HTTPUnauthorized
         raise LLM::UnauthorizedError.new { _1.response = res }, "Authentication error"
       when Net::HTTPTooManyRequests
         raise LLM::RateLimitError.new { _1.response = res }, "Too many requests"
       else
-        raise LLM::ResponseError.new { _1.response = res }, "Unexpected response"
+        error = body["error"] || {}
+        case error["type"]
+        when "server_error" then raise LLM::ServerError.new { _1.response = res }, error["message"]
+        else raise LLM::ResponseError.new { _1.response = res }, error["message"] || "Unexpected response"
+        end
       end
     end
+
+    private
+
+    def body
+      @body ||= JSON.parse(res.body)
+    end
   end
 end

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

@@ -18,6 +18,7 @@ class LLM::OpenAI
   #   bot.chat ["Tell me about this PDF", file]
   #   bot.messages.select(&:assistant?).each { print "[#{_1.role}]", _1.content, "\n" }
   class Files
+    require_relative "response/enumerable"
     require_relative "response/file"
 
     ##
@@ -44,7 +45,7 @@ class LLM::OpenAI
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/files?#{query}", headers)
       res = execute(request: req)
-      LLM::Response.new(res)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Enumerable)
     end
 
     ##

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

@@ -17,6 +17,8 @@ class LLM::OpenAI
   #     print "id: ", model.id, "\n"
   #   end
   class Models
+    require_relative "response/enumerable"
+
     ##
     # Returns a new Models object
     # @param provider [LLM::Provider]
@@ -41,7 +43,7 @@ class LLM::OpenAI
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/models?#{query}", headers)
       res = execute(request: req)
-      LLM::Response.new(res)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Enumerable)
     end
 
     private

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LLM::OpenAI::Response
+  module Enumerable
+    include ::Enumerable
+    def each(&)
+      return enum_for(:each) unless block_given?
+      data.each { yield(_1) }
+    end
+  end
+end

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

@@ -5,6 +5,8 @@ class LLM::OpenAI
   # The {LLM::OpenAI::VectorStores LLM::OpenAI::VectorStores} class provides
   # an interface for [OpenAI's vector stores API](https://platform.openai.com/docs/api-reference/vector_stores/create)
   class VectorStores
+    require_relative "response/enumerable"
+
     ##
     # @param [LLM::Provider] provider
     #  An OpenAI provider
@@ -20,7 +22,7 @@ class LLM::OpenAI
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/vector_stores?#{query}", headers)
       res = execute(request: req)
-      LLM::Response.new(res)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Enumerable)
     end
 
     ##
@@ -93,7 +95,7 @@ class LLM::OpenAI
       req = Net::HTTP::Post.new("/v1/vector_stores/#{vector_id}/search", headers)
       req.body = JSON.dump(params.merge({query:}).compact)
       res = execute(request: req)
-      LLM::Response.new(res)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Enumerable)
     end
 
     ##
@@ -108,7 +110,7 @@ class LLM::OpenAI
       query = URI.encode_www_form(params)
       req = Net::HTTP::Get.new("/v1/vector_stores/#{vector_id}/files?#{query}", headers)
       res = execute(request: req)
-      LLM::Response.new(res)
+      LLM::Response.new(res).extend(LLM::OpenAI::Response::Enumerable)
     end
 
     ##

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

@@ -39,7 +39,7 @@ class LLM::XAI
     # @param [Hash] params Other parameters (see xAI docs)
     # @raise (see LLM::Provider#request)
     # @return [LLM::Response]
-    def create(model: "grok-2-image-1212", **)
+    def create(prompt:, model: "grok-2-image-1212", **params)
       super
     end
 

data/lib/llm/{json/schema → schema}/array.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-class JSON::Schema
+class LLM::Schema
   ##
-  # The {JSON::Schema::Array JSON::Schema::Array} class represents an
+  # The {LLM::Schema::Array LLM::Schema::Array} class represents an
   # array value in a JSON schema. It is a subclass of
-  # {JSON::Schema::Leaf JSON::Schema::Leaf} and provides methods that
+  # {LLM::Schema::Leaf LLM::Schema::Leaf} and provides methods that
   # can act as constraints.
   class Array < Leaf
     def initialize(items)

data/lib/llm/{json/schema → schema}/boolean.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-class JSON::Schema
+class LLM::Schema
   ##
-  # The {JSON::Schema::Boolean JSON::Schema::Boolean} class represents a
+  # The {LLM::Schema::Boolean LLM::Schema::Boolean} class represents a
   # boolean value in a JSON schema. It is a subclass of
-  # {JSON::Schema::Leaf JSON::Schema::Leaf}.
+  # {LLM::Schema::Leaf LLM::Schema::Leaf}.
   class Boolean < Leaf
     def to_h
       super.merge!({type: "boolean"})

data/lib/llm/{json/schema → schema}/integer.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-class JSON::Schema
+class LLM::Schema
   ##
-  # The {JSON::Schema::Integer JSON::Schema::Integer} class represents a
+  # The {LLM::Schema::Integer LLM::Schema::Integer} class represents a
   # whole number value in a JSON schema. It is a subclass of
-  # {JSON::Schema::Leaf JSON::Schema::Leaf} and provides methods that
+  # {LLM::Schema::Leaf LLM::Schema::Leaf} and provides methods that
   # can act as constraints.
   class Integer < Leaf
     ##
     # Constrain the number to a minimum value
     # @param [Integer] i The minimum value
-    # @return [JSON::Schema::Number] Returns self
+    # @return [LLM::Schema::Number] Returns self
     def min(i)
       tap { @minimum = i }
     end
@@ -18,7 +18,7 @@ class JSON::Schema
     ##
     # Constrain the number to a maximum value
     # @param [Integer] i The maximum value
-    # @return [JSON::Schema::Number] Returns self
+    # @return [LLM::Schema::Number] Returns self
     def max(i)
       tap { @maximum = i }
     end
@@ -26,7 +26,7 @@ class JSON::Schema
     ##
     # Constrain the number to a multiple of a given value
     # @param [Integer] i The multiple
-    # @return [JSON::Schema::Number] Returns self
+    # @return [LLM::Schema::Number] Returns self
     def multiple_of(i)
       tap { @multiple_of = i }
     end

data/lib/llm/{json/schema → schema}/leaf.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-class JSON::Schema
+class LLM::Schema
   ##
-  # The {JSON::Schema::Leaf JSON::Schema::Leaf} class is the
+  # The {LLM::Schema::Leaf LLM::Schema::Leaf} class is the
   # superclass of all values that can appear in a JSON schema.
-  # See the instance methods of {JSON::Schema JSON::Schema} for
-  # an example of how to create instances of {JSON::Schema::Leaf JSON::Schema::Leaf}
+  # See the instance methods of {LLM::Schema LLM::Schema} for
+  # an example of how to create instances of {LLM::Schema::Leaf LLM::Schema::Leaf}
   # through its subclasses.
   class Leaf
     def initialize
@@ -19,7 +19,7 @@ class JSON::Schema
     ##
     # Set the description of a leaf
     # @param [String] str The description
-    # @return [JSON::Schema::Leaf]
+    # @return [LLM::Schema::Leaf]
     def description(str)
       tap { @description = str }
     end
@@ -27,7 +27,7 @@ class JSON::Schema
     ##
     # Set the default value of a leaf
     # @param [Object] value The default value
-    # @return [JSON::Schema::Leaf]
+    # @return [LLM::Schema::Leaf]
     def default(value)
       tap { @default = value }
     end
@@ -36,7 +36,7 @@ class JSON::Schema
     # Set the allowed values of a leaf
     # @see https://tour.json-schema.org/content/02-Primitive-Types/07-Enumerated-Values-II Enumerated Values
     # @param [Array] values The allowed values
-    # @return [JSON::Schema::Leaf]
+    # @return [LLM::Schema::Leaf]
     def enum(*values)
       tap { @enum = values }
     end
@@ -45,14 +45,14 @@ class JSON::Schema
     # Set the value of a leaf to be a constant value
     # @see https://tour.json-schema.org/content/02-Primitive-Types/08-Defining-Constant-Values Constant Values
     # @param [Object] value The constant value
-    # @return [JSON::Schema::Leaf]
+    # @return [LLM::Schema::Leaf]
     def const(value)
       tap { @const = value }
     end
 
     ##
     # Denote a leaf as required
-    # @return [JSON::Schema::Leaf]
+    # @return [LLM::Schema::Leaf]
     def required
       tap { @required = true }
     end

data/lib/llm/{json/schema → schema}/null.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-class JSON::Schema
+class LLM::Schema
   ##
-  # The {JSON::Schema::Null JSON::Schema::Null} class represents a
+  # The {LLM::Schema::Null LLM::Schema::Null} class represents a
   # null value in a JSON schema. It is a subclass of
-  # {JSON::Schema::Leaf JSON::Schema::Leaf}.
+  # {LLM::Schema::Leaf LLM::Schema::Leaf}.
   class Null < Leaf
     def to_h
       super.merge!({type: "null"})

data/lib/llm/{json/schema → schema}/number.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-class JSON::Schema
+class LLM::Schema
   ##
-  # The {JSON::Schema::Number JSON::Schema::Number} class represents a
+  # The {LLM::Schema::Number LLM::Schema::Number} class represents a
   # a number (either whole or decimal) value in a JSON schema. It is a
-  # subclass of {JSON::Schema::Leaf JSON::Schema::Leaf} and provides
+  # subclass of {LLM::Schema::Leaf LLM::Schema::Leaf} and provides
   # methods that can act as constraints.
   class Number < Leaf
     ##
     # Constrain the number to a minimum value
     # @param [Integer, Float] i The minimum value
-    # @return [JSON::Schema::Number] Returns self
+    # @return [LLM::Schema::Number] Returns self
     def min(i)
       tap { @minimum = i }
     end
@@ -18,7 +18,7 @@ class JSON::Schema
     ##
     # Constrain the number to a maximum value
     # @param [Integer, Float] i The maximum value
-    # @return [JSON::Schema::Number] Returns self
+    # @return [LLM::Schema::Number] Returns self
     def max(i)
       tap { @maximum = i }
     end
@@ -26,7 +26,7 @@ class JSON::Schema
     ##
     # Constrain the number to a multiple of a given value
     # @param [Integer, Float] i The multiple
-    # @return [JSON::Schema::Number] Returns self
+    # @return [LLM::Schema::Number] Returns self
     def multiple_of(i)
       tap { @multiple_of = i }
     end

data/lib/llm/{json/schema → schema}/object.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-class JSON::Schema
+class LLM::Schema
   ##
-  # The {JSON::Schema::Object JSON::Schema::Object} class represents an
+  # The {LLM::Schema::Object LLM::Schema::Object} class represents an
   # object value in a JSON schema. It is a subclass of
-  # {JSON::Schema::Leaf JSON::Schema::Leaf} and provides methods that
+  # {LLM::Schema::Leaf LLM::Schema::Leaf} and provides methods that
   # can act as constraints.
   class Object < Leaf
     def initialize(properties)

data/lib/llm/{json/schema → schema}/string.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-class JSON::Schema
+class LLM::Schema
   ##
-  # The {JSON::Schema::String JSON::Schema::String} class represents a
+  # The {LLM::Schema::String LLM::Schema::String} class represents a
   # string value in a JSON schema. It is a subclass of
-  # {JSON::Schema::Leaf JSON::Schema::Leaf} and provides methods that
+  # {LLM::Schema::Leaf LLM::Schema::Leaf} and provides methods that
   # can act as constraints.
   class String < Leaf
     ##
     # Constrain the string to a minimum length
     # @param [Integer] i The minimum length
-    # @return [JSON::Schema::String] Returns self
+    # @return [LLM::Schema::String] Returns self
     def min(i)
       tap { @minimum = i }
     end
@@ -18,7 +18,7 @@ class JSON::Schema
     ##
     # Constrain the string to a maximum length
     # @param [Integer] i The maximum length
-    # @return [JSON::Schema::String] Returns self
+    # @return [LLM::Schema::String] Returns self
     def max(i)
       tap { @maximum = i }
     end

data/lib/llm/{json/schema → schema}/version.rb

@@ -3,6 +3,6 @@
 module JSON
 end unless defined?(JSON)
 
-class JSON::Schema
+class LLM::Schema
   VERSION = "0.1.0"
 end

data/lib/llm/{json/schema.rb → schema.rb}

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-module JSON
-end unless defined?(JSON)
-
 ##
-# The {JSON::Schema JSON::Schema} class represents a JSON schema,
+# The {LLM::Schema LLM::Schema} class represents a JSON schema,
 # and provides methods that let you describe and produce a schema
 # that can be used in various contexts that include the validation
 # and generation of JSON data.
@@ -13,14 +10,14 @@ end unless defined?(JSON)
 # @see https://tour.json-schema.org/ JSON Schema Tour
 #
 # @example
-#  schema = JSON::Schema.new
+#  schema = LLM::Schema.new
 #  schema.object({
 #    name: schema.string.enum("John", "Jane").required,
 #    age: schema.integer.required,
 #    hobbies: schema.array(schema.string, schema.null).required,
 #    address: schema.object({street: schema.string}).required,
 #  })
-class JSON::Schema
+class LLM::Schema
   require_relative "schema/version"
   require_relative "schema/leaf"
   require_relative "schema/object"
@@ -34,7 +31,7 @@ class JSON::Schema
   ##
   # Returns an object
   # @param [Hash] properties A hash of properties
-  # @return [JSON::Schema::Object]
+  # @return [LLM::Schema::Object]
   def object(properties)
     Object.new(properties)
   end
@@ -42,42 +39,42 @@ class JSON::Schema
   ##
   # Returns an array
   # @param [Array] items An array of items
-  # @return [JSON::Schema::Array]
+  # @return [LLM::Schema::Array]
   def array(*items)
     Array.new(*items)
   end
 
   ##
   # Returns a string
-  # @return [JSON::Schema::String]
+  # @return [LLM::Schema::String]
   def string
     String.new
   end
 
   ##
   # Returns a number
-  # @return [JSON::Schema::Number] a number
+  # @return [LLM::Schema::Number] a number
   def number
     Number.new
   end
 
   ##
   # Returns an integer
-  # @return [JSON::Schema::Integer]
+  # @return [LLM::Schema::Integer]
   def integer
     Integer.new
   end
 
   ##
   # Returns a boolean
-  # @return [JSON::Schema::Boolean]
+  # @return [LLM::Schema::Boolean]
   def boolean
     Boolean.new
   end
 
   ##
   # Returns null
-  # @return [JSON::Schema::Null]
+  # @return [LLM::Schema::Null]
   def null
     Null.new
   end

data/lib/llm/version.rb

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