langchainrb 0.17.1 → 0.18.0

data/lib/langchain/llm/aws_bedrock.rb

@@ -7,12 +7,13 @@ module Langchain::LLM
   #    gem 'aws-sdk-bedrockruntime', '~> 1.1'
   #
   # Usage:
-  #    bedrock = Langchain::LLM::AwsBedrock.new(llm_options: {})
+  #    llm = Langchain::LLM::AwsBedrock.new(llm_options: {})
   #
   class AwsBedrock < Base
     DEFAULTS = {
+      chat_completion_model_name: "anthropic.claude-v2",
       completion_model_name: "anthropic.claude-v2",
-      embedding_model_name: "amazon.titan-embed-text-v1",
+      embeddings_model_name: "amazon.titan-embed-text-v1",
       max_tokens_to_sample: 300,
       temperature: 1,
       top_k: 250,
@@ -52,13 +53,11 @@ module Langchain::LLM
     SUPPORTED_CHAT_COMPLETION_PROVIDERS = %i[anthropic].freeze
     SUPPORTED_EMBEDDING_PROVIDERS = %i[amazon cohere].freeze
 
-    def initialize(completion_model: DEFAULTS[:completion_model_name], embedding_model: DEFAULTS[:embedding_model_name], aws_client_options: {}, default_options: {})
+    def initialize(aws_client_options: {}, default_options: {})
       depends_on "aws-sdk-bedrockruntime", req: "aws-sdk-bedrockruntime"
 
       @client = ::Aws::BedrockRuntime::Client.new(**aws_client_options)
       @defaults = DEFAULTS.merge(default_options)
-        .merge(completion_model_name: completion_model)
-        .merge(embedding_model_name: embedding_model)
 
       chat_parameters.update(
         model: {default: @defaults[:chat_completion_model_name]},
@@ -85,7 +84,7 @@ module Langchain::LLM
       parameters = compose_embedding_parameters params.merge(text:)
 
       response = client.invoke_model({
-        model_id: @defaults[:embedding_model_name],
+        model_id: @defaults[:embeddings_model_name],
         body: parameters.to_json,
         content_type: "application/json",
         accept: "application/json"
@@ -180,7 +179,7 @@ module Langchain::LLM
     end
 
     def embedding_provider
-      @defaults[:embedding_model_name].split(".").first.to_sym
+      @defaults[:embeddings_model_name].split(".").first.to_sym
     end
 
     def wrap_prompt(prompt)

data/lib/langchain/llm/azure.rb

@@ -7,7 +7,7 @@ module Langchain::LLM
   #    gem "ruby-openai", "~> 6.3.0"
   #
   # Usage:
-  #    openai = Langchain::LLM::Azure.new(api_key:, llm_options: {}, embedding_deployment_url: chat_deployment_url:)
+  #    llm = Langchain::LLM::Azure.new(api_key:, llm_options: {}, embedding_deployment_url: chat_deployment_url:)
   #
   class Azure < OpenAI
     attr_reader :embed_client

data/lib/langchain/llm/hugging_face.rb

@@ -8,7 +8,7 @@ module Langchain::LLM
   #     gem "hugging-face", "~> 0.3.4"
   #
   # Usage:
-  #     hf = Langchain::LLM::HuggingFace.new(api_key: ENV["HUGGING_FACE_API_KEY"])
+  #     llm = Langchain::LLM::HuggingFace.new(api_key: ENV["HUGGING_FACE_API_KEY"])
   #
   class HuggingFace < Base
     DEFAULTS = {

data/lib/langchain/llm/ollama.rb

@@ -5,7 +5,6 @@ module Langchain::LLM
   # Available models: https://ollama.ai/library
   #
   # Usage:
-  #    llm = Langchain::LLM::Ollama.new
   #    llm = Langchain::LLM::Ollama.new(url: ENV["OLLAMA_URL"], default_options: {})
   #
   class Ollama < Base

data/lib/langchain/llm/openai.rb

@@ -7,7 +7,7 @@ module Langchain::LLM
   #    gem "ruby-openai", "~> 6.3.0"
   #
   # Usage:
-  #    openai = Langchain::LLM::OpenAI.new(
+  #    llm = Langchain::LLM::OpenAI.new(
   #      api_key: ENV["OPENAI_API_KEY"],
   #      llm_options: {}, # Available options: https://github.com/alexrudall/ruby-openai/blob/main/lib/openai/client.rb#L5-L13
   #      default_options: {}
@@ -100,7 +100,7 @@ module Langchain::LLM
     # @param params [Hash] The parameters to pass to the `chat()` method
     # @return [Langchain::LLM::OpenAIResponse] Response object
     def complete(prompt:, **params)
-      warn "DEPRECATED: `Langchain::LLM::OpenAI#complete` is deprecated, and will be removed in the next major version. Use `Langchain::LLM::OpenAI#chat` instead."
+      Langchain.logger.warn "DEPRECATED: `Langchain::LLM::OpenAI#complete` is deprecated, and will be removed in the next major version. Use `Langchain::LLM::OpenAI#chat` instead."
 
       if params[:stop_sequences]
         params[:stop] = params.delete(:stop_sequences)

data/lib/langchain/llm/parameters/chat.rb

@@ -34,6 +34,7 @@ module Langchain::LLM::Parameters
       # Function-calling
       tools: {default: []},
       tool_choice: {},
+      parallel_tool_calls: {},
 
       # Additional optional parameters
       logit_bias: {}

data/lib/langchain/llm/replicate.rb

@@ -7,16 +7,8 @@ module Langchain::LLM
   # Gem requirements:
   #     gem "replicate-ruby", "~> 0.2.2"
   #
-  # Use it directly:
-  #     replicate = Langchain::LLM::Replicate.new(api_key: ENV["REPLICATE_API_KEY"])
-  #
-  # Or pass it to be used by a vector search DB:
-  #     chroma = Langchain::Vectorsearch::Chroma.new(
-  #       url: ENV["CHROMA_URL"],
-  #       index_name: "...",
-  #       llm: replicate
-  #     )
-  #
+  # Usage:
+  #     llm = Langchain::LLM::Replicate.new(api_key: ENV["REPLICATE_API_KEY"])
   class Replicate < Base
     DEFAULTS = {
       # TODO: Figure out how to send the temperature to the API

data/lib/langchain/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Langchain
-  VERSION = "0.17.1"
+  VERSION = "0.18.0"
 end

data/lib/langchain.rb

@@ -22,25 +22,12 @@ loader.inflector.inflect(
   "mistral_ai_response" => "MistralAIResponse",
   "mistral_ai_message" => "MistralAIMessage",
   "openai" => "OpenAI",
-  "openai_validator" => "OpenAIValidator",
   "openai_response" => "OpenAIResponse",
   "openai_message" => "OpenAIMessage",
   "pdf" => "PDF"
 )
+
 loader.collapse("#{__dir__}/langchain/llm/response")
-loader.collapse("#{__dir__}/langchain/assistants")
-
-loader.collapse("#{__dir__}/langchain/tool/calculator")
-loader.collapse("#{__dir__}/langchain/tool/database")
-loader.collapse("#{__dir__}/langchain/tool/docs_tool")
-loader.collapse("#{__dir__}/langchain/tool/file_system")
-loader.collapse("#{__dir__}/langchain/tool/google_search")
-loader.collapse("#{__dir__}/langchain/tool/ruby_code_interpreter")
-loader.collapse("#{__dir__}/langchain/tool/news_retriever")
-loader.collapse("#{__dir__}/langchain/tool/tavily")
-loader.collapse("#{__dir__}/langchain/tool/vectorsearch")
-loader.collapse("#{__dir__}/langchain/tool/weather")
-loader.collapse("#{__dir__}/langchain/tool/wikipedia")
 
 # RubyCodeInterpreter does not work with Ruby 3.3;
 # https://github.com/ukutaht/safe_ruby/issues/4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: langchainrb
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baran
@@ -637,20 +637,20 @@ files:
 - LICENSE.txt
 - README.md
 - lib/langchain.rb
-- lib/langchain/assistants/assistant.rb
-- lib/langchain/assistants/llm/adapter.rb
-- lib/langchain/assistants/llm/adapters/_base.rb
-- lib/langchain/assistants/llm/adapters/anthropic.rb
-- lib/langchain/assistants/llm/adapters/google_gemini.rb
-- lib/langchain/assistants/llm/adapters/mistral_ai.rb
-- lib/langchain/assistants/llm/adapters/ollama.rb
-- lib/langchain/assistants/llm/adapters/openai.rb
-- lib/langchain/assistants/messages/anthropic_message.rb
-- lib/langchain/assistants/messages/base.rb
-- lib/langchain/assistants/messages/google_gemini_message.rb
-- lib/langchain/assistants/messages/mistral_ai_message.rb
-- lib/langchain/assistants/messages/ollama_message.rb
-- lib/langchain/assistants/messages/openai_message.rb
+- lib/langchain/assistant.rb
+- lib/langchain/assistant/llm/adapter.rb
+- lib/langchain/assistant/llm/adapters/anthropic.rb
+- lib/langchain/assistant/llm/adapters/base.rb
+- lib/langchain/assistant/llm/adapters/google_gemini.rb
+- lib/langchain/assistant/llm/adapters/mistral_ai.rb
+- lib/langchain/assistant/llm/adapters/ollama.rb
+- lib/langchain/assistant/llm/adapters/openai.rb
+- lib/langchain/assistant/messages/anthropic_message.rb
+- lib/langchain/assistant/messages/base.rb
+- lib/langchain/assistant/messages/google_gemini_message.rb
+- lib/langchain/assistant/messages/mistral_ai_message.rb
+- lib/langchain/assistant/messages/ollama_message.rb
+- lib/langchain/assistant/messages/openai_message.rb
 - lib/langchain/chunk.rb
 - lib/langchain/chunker/base.rb
 - lib/langchain/chunker/markdown.rb

data/lib/langchain/assistants/llm/adapters/_base.rb

@@ -1,21 +0,0 @@
-module Langchain
-  class Assistant
-    module LLM
-      module Adapters
-        class Base
-          def build_chat_params(tools:, instructions:, messages:, tool_choice:)
-            raise NotImplementedError, "Subclasses must implement build_chat_params"
-          end
-
-          def extract_tool_call_args(tool_call:)
-            raise NotImplementedError, "Subclasses must implement extract_tool_call_args"
-          end
-
-          def build_message(role:, content: nil, image_url: nil, tool_calls: [], tool_call_id: nil)
-            raise NotImplementedError, "Subclasses must implement build_message"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/langchain/assistants/llm/adapters/anthropic.rb

@@ -1,62 +0,0 @@
-module Langchain
-  class Assistant
-    module LLM
-      module Adapters
-        class Anthropic < Base
-          def build_chat_params(tools:, instructions:, messages:, tool_choice:)
-            params = {messages: messages}
-            if tools.any?
-              params[:tools] = build_tools(tools)
-              params[:tool_choice] = build_tool_choice(tool_choice)
-            end
-            params[:system] = instructions if instructions
-            params
-          end
-
-          def build_message(role:, content: nil, image_url: nil, tool_calls: [], tool_call_id: nil)
-            warn "Image URL is not supported by Anthropic currently" if image_url
-
-            Langchain::Messages::AnthropicMessage.new(role: role, content: content, tool_calls: tool_calls, tool_call_id: tool_call_id)
-          end
-
-          # Extract the tool call information from the Anthropic tool call hash
-          #
-          # @param tool_call [Hash] The tool call hash, format: {"type"=>"tool_use", "id"=>"toolu_01TjusbFApEbwKPRWTRwzadR", "name"=>"news_retriever__get_top_headlines", "input"=>{"country"=>"us", "page_size"=>10}}], "stop_reason"=>"tool_use"}
-          # @return [Array] The tool call information
-          def extract_tool_call_args(tool_call:)
-            tool_call_id = tool_call.dig("id")
-            function_name = tool_call.dig("name")
-            tool_name, method_name = function_name.split("__")
-            tool_arguments = tool_call.dig("input").transform_keys(&:to_sym)
-            [tool_call_id, tool_name, method_name, tool_arguments]
-          end
-
-          def build_tools(tools)
-            tools.map { |tool| tool.class.function_schemas.to_anthropic_format }.flatten
-          end
-
-          def allowed_tool_choices
-            ["auto", "any"]
-          end
-
-          def available_tool_names(tools)
-            build_tools(tools).map { |tool| tool.dig(:name) }
-          end
-
-          private
-
-          def build_tool_choice(choice)
-            case choice
-            when "auto"
-              {type: "auto"}
-            when "any"
-              {type: "any"}
-            else
-              {type: "tool", name: choice}
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/langchain/assistants/llm/adapters/ollama.rb

@@ -1,57 +0,0 @@
-module Langchain
-  class Assistant
-    module LLM
-      module Adapters
-        class Ollama < Base
-          def build_chat_params(tools:, instructions:, messages:, tool_choice:)
-            params = {messages: messages}
-            if tools.any?
-              params[:tools] = build_tools(tools)
-            end
-            params
-          end
-
-          def build_message(role:, content: nil, image_url: nil, tool_calls: [], tool_call_id: nil)
-            warn "Image URL is not supported by Ollama currently" if image_url
-
-            Langchain::Messages::OllamaMessage.new(role: role, content: content, tool_calls: tool_calls, tool_call_id: tool_call_id)
-          end
-
-          # Extract the tool call information from the OpenAI tool call hash
-          #
-          # @param tool_call [Hash] The tool call hash
-          # @return [Array] The tool call information
-          def extract_tool_call_args(tool_call:)
-            tool_call_id = tool_call.dig("id")
-
-            function_name = tool_call.dig("function", "name")
-            tool_name, method_name = function_name.split("__")
-
-            tool_arguments = tool_call.dig("function", "arguments")
-            tool_arguments = if tool_arguments.is_a?(Hash)
-              Langchain::Utils::HashTransformer.symbolize_keys(tool_arguments)
-            else
-              JSON.parse(tool_arguments, symbolize_names: true)
-            end
-
-            [tool_call_id, tool_name, method_name, tool_arguments]
-          end
-
-          def available_tool_names(tools)
-            build_tools(tools).map { |tool| tool.dig(:function, :name) }
-          end
-
-          def allowed_tool_choices
-            ["auto", "none"]
-          end
-
-          private
-
-          def build_tools(tools)
-            tools.map { |tool| tool.class.function_schemas.to_openai_format }.flatten
-          end
-        end
-      end
-    end
-  end
-end

data/lib/langchain/assistants/messages/anthropic_message.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module Langchain
-  module Messages
-    class AnthropicMessage < Base
-      ROLES = [
-        "assistant",
-        "user",
-        "tool_result"
-      ].freeze
-
-      TOOL_ROLE = "tool_result"
-
-      def initialize(role:, content: nil, tool_calls: [], tool_call_id: nil)
-        raise ArgumentError, "Role must be one of #{ROLES.join(", ")}" unless ROLES.include?(role)
-        raise ArgumentError, "Tool calls must be an array of hashes" unless tool_calls.is_a?(Array) && tool_calls.all? { |tool_call| tool_call.is_a?(Hash) }
-
-        @role = role
-        # Some Tools return content as a JSON hence `.to_s`
-        @content = content.to_s
-        @tool_calls = tool_calls
-        @tool_call_id = tool_call_id
-      end
-
-      # Convert the message to an Anthropic API-compatible hash
-      #
-      # @return [Hash] The message as an Anthropic API-compatible hash
-      def to_hash
-        {}.tap do |h|
-          h[:role] = tool? ? "user" : role
-
-          h[:content] = if tool?
-            [
-              {
-                type: "tool_result",
-                tool_use_id: tool_call_id,
-                content: content
-              }
-            ]
-          elsif tool_calls.any?
-            tool_calls
-          else
-            content
-          end
-        end
-      end
-
-      # Check if the message is a tool call
-      #
-      # @return [Boolean] true/false whether this message is a tool call
-      def tool?
-        role == "tool_result"
-      end
-
-      # Anthropic does not implement system prompts
-      def system?
-        false
-      end
-
-      # Check if the message came from an LLM
-      #
-      # @return [Boolean] true/false whether this message was produced by an LLM
-      def assistant?
-        role == "assistant"
-      end
-
-      # Check if the message came from an LLM
-      #
-      # @return [Boolean] true/false whether this message was produced by an LLM
-      def llm?
-        assistant?
-      end
-    end
-  end
-end

data/lib/langchain/assistants/messages/base.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Langchain
-  module Messages
-    class Base
-      attr_reader :role,
-        :content,
-        :image_url,
-        :tool_calls,
-        :tool_call_id
-
-      # Check if the message came from a user
-      #
-      # @return [Boolean] true/false whether the message came from a user
-      def user?
-        role == "user"
-      end
-
-      # Check if the message came from an LLM
-      #
-      # @raise NotImplementedError if the subclass does not implement this method
-      def llm?
-        raise NotImplementedError, "Class #{self.class.name} must implement the method 'llm?'"
-      end
-
-      # Check if the message is a tool call
-      #
-      # @raise NotImplementedError if the subclass does not implement this method
-      def tool?
-        raise NotImplementedError, "Class #{self.class.name} must implement the method 'tool?'"
-      end
-
-      # Check if the message is a system prompt
-      #
-      # @raise NotImplementedError if the subclass does not implement this method
-      def system?
-        raise NotImplementedError, "Class #{self.class.name} must implement the method 'system?'"
-      end
-
-      # Returns the standardized role symbol based on the specific role methods
-      #
-      # @return [Symbol] the standardized role symbol (:system, :llm, :tool, :user, or :unknown)
-      def standard_role
-        return :user if user?
-        return :llm if llm?
-        return :tool if tool?
-        return :system if system?
-
-        # TODO: Should we return :unknown or raise an error?
-        :unknown
-      end
-    end
-  end
-end

data/lib/langchain/assistants/messages/google_gemini_message.rb

@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-module Langchain
-  module Messages
-    class GoogleGeminiMessage < Base
-      # Google Gemini uses the following roles:
-      ROLES = [
-        "user",
-        "model",
-        "function"
-      ].freeze
-
-      TOOL_ROLE = "function"
-
-      # Initialize a new Google Gemini message
-      #
-      # @param [String] The role of the message
-      # @param [String] The content of the message
-      # @param [Array<Hash>] The tool calls made in the message
-      # @param [String] The ID of the tool call
-      def initialize(role:, content: nil, tool_calls: [], tool_call_id: nil)
-        raise ArgumentError, "Role must be one of #{ROLES.join(", ")}" unless ROLES.include?(role)
-        raise ArgumentError, "Tool calls must be an array of hashes" unless tool_calls.is_a?(Array) && tool_calls.all? { |tool_call| tool_call.is_a?(Hash) }
-
-        @role = role
-        # Some Tools return content as a JSON hence `.to_s`
-        @content = content.to_s
-        @tool_calls = tool_calls
-        @tool_call_id = tool_call_id
-      end
-
-      # Check if the message came from an LLM
-      #
-      # @return [Boolean] true/false whether this message was produced by an LLM
-      def llm?
-        model?
-      end
-
-      # Convert the message to a Google Gemini API-compatible hash
-      #
-      # @return [Hash] The message as a Google Gemini API-compatible hash
-      def to_hash
-        {}.tap do |h|
-          h[:role] = role
-          h[:parts] = if function?
-            [{
-              functionResponse: {
-                name: tool_call_id,
-                response: {
-                  name: tool_call_id,
-                  content: content
-                }
-              }
-            }]
-          elsif tool_calls.any?
-            tool_calls
-          else
-            [{text: content}]
-          end
-        end
-      end
-
-      # Google Gemini does not implement system prompts
-      def system?
-        false
-      end
-
-      # Check if the message is a tool call
-      #
-      # @return [Boolean] true/false whether this message is a tool call
-      def tool?
-        function?
-      end
-
-      # Check if the message is a tool call
-      #
-      # @return [Boolean] true/false whether this message is a tool call
-      def function?
-        role == "function"
-      end
-
-      # Check if the message came from an LLM
-      #
-      # @return [Boolean] true/false whether this message was produced by an LLM
-      def model?
-        role == "model"
-      end
-    end
-  end
-end

data/lib/langchain/assistants/messages/mistral_ai_message.rb

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-module Langchain
-  module Messages
-    class MistralAIMessage < Base
-      # MistralAI uses the following roles:
-      ROLES = [
-        "system",
-        "assistant",
-        "user",
-        "tool"
-      ].freeze
-
-      TOOL_ROLE = "tool"
-
-      # Initialize a new MistralAI message
-      #
-      # @param role [String] The role of the message
-      # @param content [String] The content of the message
-      # @param image_url [String] The URL of the image
-      # @param tool_calls [Array<Hash>] The tool calls made in the message
-      # @param tool_call_id [String] The ID of the tool call
-      def initialize(role:, content: nil, image_url: nil, tool_calls: [], tool_call_id: nil) # TODO: Implement image_file: reference (https://platform.openai.com/docs/api-reference/messages/object#messages/object-content)
-        raise ArgumentError, "Role must be one of #{ROLES.join(", ")}" unless ROLES.include?(role)
-        raise ArgumentError, "Tool calls must be an array of hashes" unless tool_calls.is_a?(Array) && tool_calls.all? { |tool_call| tool_call.is_a?(Hash) }
-
-        @role = role
-        # Some Tools return content as a JSON hence `.to_s`
-        @content = content.to_s
-        # Make sure you're using the Pixtral model if you want to send image_url
-        @image_url = image_url
-        @tool_calls = tool_calls
-        @tool_call_id = tool_call_id
-      end
-
-      # Check if the message came from an LLM
-      #
-      # @return [Boolean] true/false whether this message was produced by an LLM
-      def llm?
-        assistant?
-      end
-
-      # Convert the message to an MistralAI API-compatible hash
-      #
-      # @return [Hash] The message as an MistralAI API-compatible hash
-      def to_hash
-        {}.tap do |h|
-          h[:role] = role
-
-          if tool_calls.any?
-            h[:tool_calls] = tool_calls
-          else
-            h[:tool_call_id] = tool_call_id if tool_call_id
-
-            h[:content] = []
-
-            if content && !content.empty?
-              h[:content] << {
-                type: "text",
-                text: content
-              }
-            end
-
-            if image_url
-              h[:content] << {
-                type: "image_url",
-                image_url: image_url
-              }
-            end
-          end
-        end
-      end
-
-      # Check if the message came from an LLM
-      #
-      # @return [Boolean] true/false whether this message was produced by an LLM
-      def assistant?
-        role == "assistant"
-      end
-
-      # Check if the message are system instructions
-      #
-      # @return [Boolean] true/false whether this message are system instructions
-      def system?
-        role == "system"
-      end
-
-      # Check if the message is a tool call
-      #
-      # @return [Boolean] true/false whether this message is a tool call
-      def tool?
-        role == "tool"
-      end
-    end
-  end
-end