langchainrb 0.13.5 → 0.15.0

data/lib/langchain/llm/base.rb

@@ -8,6 +8,7 @@ module Langchain::LLM
   # Langchain.rb provides a common interface to interact with all supported LLMs:
   #
   # - {Langchain::LLM::AI21}
+  # - {Langchain::LLM::Anthropic}
   # - {Langchain::LLM::Azure}
   # - {Langchain::LLM::Cohere}
   # - {Langchain::LLM::GooglePalm}

data/lib/langchain/llm/cohere.rb

@@ -74,8 +74,6 @@ module Langchain::LLM
 
       default_params.merge!(params)
 
-      default_params[:max_tokens] = Langchain::Utils::TokenLength::CohereValidator.validate_max_tokens!(prompt, default_params[:model], llm: client)
-
       response = client.generate(**default_params)
       Langchain::LLM::CohereResponse.new response, model: @defaults[:completion_model_name]
     end

data/lib/langchain/llm/google_gemini.rb

@@ -62,7 +62,7 @@ module Langchain::LLM
 
       request = Net::HTTP::Post.new(uri)
       request.content_type = "application/json"
-      request.body = Langchain::Utils::HashTransformer.deep_transform_keys(parameters) { |key| Langchain::Utils::HashTransformer.camelize_lower(key.to_s).to_sym }.to_json
+      request.body = parameters.to_json
 
       response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
         http.request(request)

data/lib/langchain/llm/google_palm.rb

@@ -18,7 +18,7 @@ module Langchain::LLM
       chat_completion_model_name: "chat-bison-001",
       embeddings_model_name: "embedding-gecko-001"
     }.freeze
-    LENGTH_VALIDATOR = Langchain::Utils::TokenLength::GooglePalmValidator
+
     ROLE_MAPPING = {
       "assistant" => "ai"
     }
@@ -96,9 +96,6 @@ module Langchain::LLM
         examples: compose_examples(examples)
       }
 
-      # chat-bison-001 is the only model that currently supports countMessageTokens functions
-      LENGTH_VALIDATOR.validate_max_tokens!(default_params[:messages], "chat-bison-001", llm: self)
-
       if options[:stop_sequences]
         default_params[:stop] = options.delete(:stop_sequences)
       end

data/lib/langchain/llm/ollama.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/hash"
-
 module Langchain::LLM
   # Interface to Ollama API.
   # Available models: https://ollama.ai/library
@@ -14,10 +12,10 @@ module Langchain::LLM
     attr_reader :url, :defaults
 
     DEFAULTS = {
-      temperature: 0.8,
-      completion_model_name: "llama3",
-      embeddings_model_name: "llama3",
-      chat_completion_model_name: "llama3"
+      temperature: 0.0,
+      completion_model_name: "llama3.1",
+      embeddings_model_name: "llama3.1",
+      chat_completion_model_name: "llama3.1"
     }.freeze
 
     EMBEDDING_SIZES = {
@@ -25,20 +23,24 @@ module Langchain::LLM
       "dolphin-mixtral": 4_096,
       llama2: 4_096,
       llama3: 4_096,
+      "llama3.1": 4_096,
       llava: 4_096,
       mistral: 4_096,
       "mistral-openorca": 4_096,
-      mixtral: 4_096
+      mixtral: 4_096,
+      tinydolphin: 2_048
     }.freeze
 
     # Initialize the Ollama client
     # @param url [String] The URL of the Ollama instance
+    # @param api_key [String] The API key to use. This is optional and used when you expose Ollama API using Open WebUI
     # @param default_options [Hash] The default options to use
     #
-    def initialize(url: "http://localhost:11434", default_options: {})
+    def initialize(url: "http://localhost:11434", api_key: nil, default_options: {})
       depends_on "faraday"
       @url = url
-      @defaults = DEFAULTS.deep_merge(default_options)
+      @api_key = api_key
+      @defaults = DEFAULTS.merge(default_options)
       chat_parameters.update(
         model: {default: @defaults[:chat_completion_model_name]},
         temperature: {default: @defaults[:temperature]},
@@ -113,7 +115,7 @@ module Langchain::LLM
         system: system,
         template: template,
         context: context,
-        stream: block.present?,
+        stream: block_given?, # rubocop:disable Performance/BlockGivenWithExplicitBlock
         raw: raw
       }.compact
 
@@ -173,7 +175,7 @@ module Langchain::LLM
     #   content: the content of the message
     #   images (optional): a list of images to include in the message (for multimodal models such as llava)
     def chat(messages:, model: nil, **params, &block)
-      parameters = chat_parameters.to_params(params.merge(messages:, model:, stream: block.present?))
+      parameters = chat_parameters.to_params(params.merge(messages:, model:, stream: block_given?)) # rubocop:disable Performance/BlockGivenWithExplicitBlock
       responses_stream = []
 
       client.post("api/chat", parameters) do |req|
@@ -264,13 +266,20 @@ module Langchain::LLM
     private
 
     def client
-      @client ||= Faraday.new(url: url) do |conn|
+      @client ||= Faraday.new(url: url, headers: auth_headers) do |conn|
         conn.request :json
         conn.response :json
         conn.response :raise_error
+        conn.response :logger, nil, {headers: true, bodies: true, errors: true}
       end
     end
 
+    def auth_headers
+      return unless @api_key
+
+      {"Authorization" => "Bearer #{@api_key}"}
+    end
+
     def json_responses_chunk_handler(&block)
       proc do |chunk, _size|
         chunk.split("\n").each do |chunk_line|
@@ -288,13 +297,10 @@ module Langchain::LLM
       OllamaResponse.new(final_response, model: parameters[:model])
     end
 
+    # BUG: If streamed, this method does not currently return the tool_calls response.
     def generate_final_chat_completion_response(responses_stream, parameters)
-      final_response = responses_stream.last.merge(
-        "message" => {
-          "role" => "assistant",
-          "content" => responses_stream.map { |resp| resp.dig("message", "content") }.join
-        }
-      )
+      final_response = responses_stream.last
+      final_response["message"]["content"] = responses_stream.map { |resp| resp.dig("message", "content") }.join
 
       OllamaResponse.new(final_response, model: parameters[:model])
     end

data/lib/langchain/llm/openai.rb

@@ -16,7 +16,7 @@ module Langchain::LLM
     DEFAULTS = {
       n: 1,
       temperature: 0.0,
-      chat_completion_model_name: "gpt-3.5-turbo",
+      chat_completion_model_name: "gpt-4o-mini",
       embeddings_model_name: "text-embedding-3-small"
     }.freeze
 

data/lib/langchain/llm/response/google_gemini_response.rb

@@ -3,7 +3,7 @@
 module Langchain::LLM
   class GoogleGeminiResponse < BaseResponse
     def initialize(raw_response, model: nil)
-      super(raw_response, model: model)
+      super
     end
 
     def chat_completion

data/lib/langchain/llm/response/ollama_response.rb

@@ -36,7 +36,7 @@ module Langchain::LLM
     end
 
     def prompt_tokens
-      raw_response.dig("prompt_eval_count") if done?
+      raw_response.fetch("prompt_eval_count", 0) if done?
     end
 
     def completion_tokens
@@ -47,6 +47,10 @@ module Langchain::LLM
       prompt_tokens + completion_tokens if done?
     end
 
+    def tool_calls
+      Array(raw_response.dig("message", "tool_calls"))
+    end
+
     private
 
     def done?

data/lib/langchain/llm/unified_parameters.rb

@@ -77,8 +77,8 @@ module Langchain::LLM
       @parameters.to_h
     end
 
-    def each(&)
-      to_params.each(&)
+    def each(&block)
+      to_params.each(&block)
     end
 
     def <=>(other)

data/lib/langchain/tool/calculator.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Langchain::Tool
+  #
+  # A calculator tool that falls back to the Google calculator widget
+  #
+  # Gem requirements:
+  #     gem "eqn", "~> 1.6.5"
+  #     gem "google_search_results", "~> 2.0.0"
+  #
+  # Usage:
+  #     calculator = Langchain::Tool::Calculator.new
+  #
+  class Calculator
+    extend Langchain::ToolDefinition
+    include Langchain::DependencyHelper
+
+    define_function :execute, description: "Evaluates a pure math expression or if equation contains non-math characters (e.g.: \"12F in Celsius\") then it uses the google search calculator to evaluate the expression" do
+      property :input, type: "string", description: "Math expression", required: true
+    end
+
+    def initialize
+      depends_on "eqn"
+    end
+
+    # Evaluates a pure math expression or if equation contains non-math characters (e.g.: "12F in Celsius") then it uses the google search calculator to evaluate the expression
+    #
+    # @param input [String] math expression
+    # @return [String] Answer
+    def execute(input:)
+      Langchain.logger.info("Executing \"#{input}\"", for: self.class)
+
+      Eqn::Calculator.calc(input)
+    rescue Eqn::ParseError, Eqn::NoVariableValueError
+      "\"#{input}\" is an invalid mathematical expression"
+    end
+  end
+end

data/lib/langchain/tool/{database/database.rb → database.rb}

@@ -1,16 +1,28 @@
 module Langchain::Tool
-  class Database < Base
-    #
-    # Connects to a database, executes SQL queries, and outputs DB schema for Agents to use
-    #
-    # Gem requirements:
-    #     gem "sequel", "~> 5.68.0"
-    #
-    # Usage:
-    #     database = Langchain::Tool::Database.new(connection_string: "postgres://user:password@localhost:5432/db_name")
-    #
-    NAME = "database"
-    ANNOTATIONS_PATH = Langchain.root.join("./langchain/tool/#{NAME}/#{NAME}.json").to_path
+  #
+  # Connects to a database, executes SQL queries, and outputs DB schema for Agents to use
+  #
+  # Gem requirements:
+  #     gem "sequel", "~> 5.68.0"
+  #
+  # Usage:
+  #     database = Langchain::Tool::Database.new(connection_string: "postgres://user:password@localhost:5432/db_name")
+  #
+  class Database
+    extend Langchain::ToolDefinition
+    include Langchain::DependencyHelper
+
+    define_function :list_tables, description: "Database Tool: Returns a list of tables in the database"
+
+    define_function :describe_tables, description: "Database Tool: Returns the schema for a list of tables" do
+      property :tables, type: "string", description: "The tables to describe", required: true
+    end
+
+    define_function :dump_schema, description: "Database Tool: Returns the database schema"
+
+    define_function :execute, description: "Database Tool: Executes a SQL query and returns the results" do
+      property :input, type: "string", description: "SQL query to be executed", required: true
+    end
 
     attr_reader :db, :requested_tables, :excluded_tables
 

data/lib/langchain/tool/file_system.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Langchain::Tool
+  #
+  # A tool that wraps the Ruby file system classes.
+  #
+  # Usage:
+  #    file_system = Langchain::Tool::FileSystem.new
+  #
+  class FileSystem
+    extend Langchain::ToolDefinition
+
+    define_function :list_directory, description: "File System Tool: Lists out the content of a specified directory" do
+      property :directory_path, type: "string", description: "Directory path to list", required: true
+    end
+
+    define_function :read_file, description: "File System Tool: Reads the contents of a file" do
+      property :file_path, type: "string", description: "Path to the file to read from", required: true
+    end
+
+    define_function :write_to_file, description: "File System Tool: Write content to a file" do
+      property :file_path, type: "string", description: "Path to the file to write", required: true
+      property :content, type: "string", description: "Content to write to the file", required: true
+    end
+
+    def list_directory(directory_path:)
+      Dir.entries(directory_path)
+    rescue Errno::ENOENT
+      "No such directory: #{directory_path}"
+    end
+
+    def read_file(file_path:)
+      File.read(file_path)
+    rescue Errno::ENOENT
+      "No such file: #{file_path}"
+    end
+
+    def write_to_file(file_path:, content:)
+      File.write(file_path, content)
+    rescue Errno::EACCES
+      "Permission denied: #{file_path}"
+    end
+  end
+end

data/lib/langchain/tool/{google_search/google_search.rb → google_search.rb}

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 module Langchain::Tool
-  class GoogleSearch < Base
-    #
-    # Wrapper around SerpApi's Google Search API
-    #
-    # Gem requirements:
-    #     gem "google_search_results", "~> 2.0.0"
-    #
-    # Usage:
-    #     search = Langchain::Tool::GoogleSearch.new(api_key: "YOUR_API_KEY")
-    #     search.execute(input: "What is the capital of France?")
-    #
-    NAME = "google_search"
-    ANNOTATIONS_PATH = Langchain.root.join("./langchain/tool/#{NAME}/#{NAME}.json").to_path
+  #
+  # Wrapper around SerpApi's Google Search API
+  #
+  # Gem requirements:
+  #     gem "google_search_results", "~> 2.0.0"
+  #
+  # Usage:
+  #     search = Langchain::Tool::GoogleSearch.new(api_key: "YOUR_API_KEY")
+  #     search.execute(input: "What is the capital of France?")
+  #
+  class GoogleSearch
+    extend Langchain::ToolDefinition
+    include Langchain::DependencyHelper
+
+    define_function :execute, description: "Executes Google Search and returns the result" do
+      property :input, type: "string", description: "Search query", required: true
+    end
 
     attr_reader :api_key
 
@@ -29,16 +33,6 @@ module Langchain::Tool
       @api_key = api_key
     end
 
-    #
-    # Executes Google Search and returns hash_results JSON
-    #
-    # @param input [String] search query
-    # @return [Hash] hash_results JSON
-    #
-    def self.execute_search(input:)
-      new.execute_search(input: input)
-    end
-
     # Executes Google Search and returns the result
     #
     # @param input [String] search query

data/lib/langchain/tool/{news_retriever/news_retriever.rb → news_retriever.rb}

@@ -1,16 +1,43 @@
 # frozen_string_literal: true
 
 module Langchain::Tool
-  class NewsRetriever < Base
-    #
-    # A tool that retrieves latest news from various sources via https://newsapi.org/.
-    # An API key needs to be obtained from https://newsapi.org/ to use this tool.
-    #
-    # Usage:
-    #    news_retriever = Langchain::Tool::NewsRetriever.new(api_key: ENV["NEWS_API_KEY"])
-    #
-    NAME = "news_retriever"
-    ANNOTATIONS_PATH = Langchain.root.join("./langchain/tool/#{NAME}/#{NAME}.json").to_path
+  #
+  # A tool that retrieves latest news from various sources via https://newsapi.org/.
+  # An API key needs to be obtained from https://newsapi.org/ to use this tool.
+  #
+  # Usage:
+  #    news_retriever = Langchain::Tool::NewsRetriever.new(api_key: ENV["NEWS_API_KEY"])
+  #
+  class NewsRetriever
+    extend Langchain::ToolDefinition
+
+    define_function :get_everything, description: "News Retriever: Search through millions of articles from over 150,000 large and small news sources and blogs" do
+      property :q, type: "string", description: 'Keywords or phrases to search for in the article title and body. Surround phrases with quotes (") for exact match. Alternatively you can use the AND / OR / NOT keywords, and optionally group these with parenthesis. Must be URL-encoded'
+      property :search_in, type: "string", description: "The fields to restrict your q search to", enum: ["title", "description", "content"]
+      property :sources, type: "string", description: "A comma-separated string of identifiers (maximum 20) for the news sources or blogs you want headlines from. Use the /sources endpoint to locate these programmatically or look at the sources index"
+      property :domains, type: "string", description: "A comma-separated string of domains (eg bbc.co.uk, techcrunch.com, engadget.com) to restrict the search to"
+      property :exclude_domains, type: "string", description: "A comma-separated string of domains (eg bbc.co.uk, techcrunch.com, engadget.com) to remove from the results"
+      property :from, type: "string", description: "A date and optional time for the oldest article allowed. This should be in ISO 8601 format"
+      property :to, type: "string", description: "A date and optional time for the newest article allowed. This should be in ISO 8601 format"
+      property :language, type: "string", description: "The 2-letter ISO-639-1 code of the language you want to get headlines for", enum: ["ar", "de", "en", "es", "fr", "he", "it", "nl", "no", "pt", "ru", "sv", "ud", "zh"]
+      property :sort_by, type: "string", description: "The order to sort the articles in", enum: ["relevancy", "popularity", "publishedAt"]
+      property :page_size, type: "integer", description: "The number of results to return per page (request). 5 is the default, 100 is the maximum"
+      property :page, type: "integer", description: "Use this to page through the results if the total results found is greater than the page size"
+    end
+
+    define_function :get_top_headlines, description: "News Retriever: Provides live top and breaking headlines for a country, specific category in a country, single source, or multiple sources. You can also search with keywords. Articles are sorted by the earliest date published first" do
+      property :country, type: "string", description: "The 2-letter ISO 3166-1 code of the country you want to get headlines for", enum: ["ae", "ar", "at", "au", "be", "bg", "br", "ca", "ch", "cn", "co", "cu", "cz", "de", "eg", "fr", "gb", "gr", "hk", "hu", "id", "ie", "il", "in", "it", "jp", "kr", "lt", "lv", "ma", "mx", "my", "ng", "nl", "no", "nz", "ph", "pl", "pt", "ro", "rs", "ru", "sa", "se", "sg", "si", "sk", "th", "tr", "tw", "ua", "us", "ve", "za"]
+      property :category, type: "string", description: "The category you want to get headlines for", enum: ["business", "entertainment", "general", "health", "science", "sports", "technology"]
+      property :q, type: "string", description: "Keywords or a phrase to search for"
+      property :page_size, type: "integer", description: "The number of results to return per page (request). 5 is the default, 100 is the maximum"
+      property :page, type: "integer", description: "Use this to page through the results if the total results found is greater than the page size"
+    end
+
+    define_function :get_sources, description: "News Retriever: This endpoint returns the subset of news publishers that top headlines (/v2/top-headlines) are available from. It's mainly a convenience endpoint that you can use to keep track of the publishers available on the API, and you can pipe it straight through to your users" do
+      property :country, type: "string", description: "The 2-letter ISO 3166-1 code of the country you want to get headlines for. Default: all countries", enum: ["ae", "ar", "at", "au", "be", "bg", "br", "ca", "ch", "cn", "co", "cu", "cz", "de", "eg", "fr", "gb", "gr", "hk", "hu", "id", "ie", "il", "in", "it", "jp", "kr", "lt", "lv", "ma", "mx", "my", "ng", "nl", "no", "nz", "ph", "pl", "pt", "ro", "rs", "ru", "sa", "se", "sg", "si", "sk", "th", "tr", "tw", "ua", "us", "ve", "za"]
+      property :category, type: "string", description: "The category you want to get headlines for. Default: all categories", enum: ["business", "entertainment", "general", "health", "science", "sports", "technology"]
+      property :language, type: "string", description: "The 2-letter ISO-639-1 code of the language you want to get headlines for", enum: ["ar", "de", "en", "es", "fr", "he", "it", "nl", "no", "pt", "ru", "sv", "ud", "zh"]
+    end
 
     def initialize(api_key: ENV["NEWS_API_KEY"])
       @api_key = api_key
@@ -20,9 +47,9 @@ module Langchain::Tool
     #
     # @param q [String] Keywords or phrases to search for in the article title and body.
     # @param search_in [String] The fields to restrict your q search to. The possible options are: title, description, content.
-    # @param sources [String] A comma-seperated string of identifiers (maximum 20) for the news sources or blogs you want headlines from. Use the /sources endpoint to locate these programmatically or look at the sources index.
-    # @param domains [String] A comma-seperated string of domains (eg bbc.co.uk, techcrunch.com, engadget.com) to restrict the search to.
-    # @param exclude_domains [String] A comma-seperated string of domains (eg bbc.co.uk, techcrunch.com, engadget.com) to remove from the results.
+    # @param sources [String] A comma-separated string of identifiers (maximum 20) for the news sources or blogs you want headlines from. Use the /sources endpoint to locate these programmatically or look at the sources index.
+    # @param domains [String] A comma-separated string of domains (eg bbc.co.uk, techcrunch.com, engadget.com) to restrict the search to.
+    # @param exclude_domains [String] A comma-separated string of domains (eg bbc.co.uk, techcrunch.com, engadget.com) to remove from the results.
     # @param from [String] A date and optional time for the oldest article allowed. This should be in ISO 8601 format.
     # @param to [String] A date and optional time for the newest article allowed. This should be in ISO 8601 format.
     # @param language [String] The 2-letter ISO-639-1 code of the language you want to get headlines for. Possible options: ar, de, en, es, fr, he, it, nl, no, pt, ru, se, ud, zh.
@@ -66,7 +93,7 @@ module Langchain::Tool
     #
     # @param country [String] The 2-letter ISO 3166-1 code of the country you want to get headlines for. Possible options: ae, ar, at, au, be, bg, br, ca, ch, cn, co, cu, cz, de, eg, fr, gb, gr, hk, hu, id, ie, il, in, it, jp, kr, lt, lv, ma, mx, my, ng, nl, no, nz, ph, pl, pt, ro, rs, ru, sa, se, sg, si, sk, th, tr, tw, ua, us, ve, za.
     # @param category [String] The category you want to get headlines for. Possible options: business, entertainment, general, health, science, sports, technology.
-    # @param sources [String] A comma-seperated string of identifiers for the news sources or blogs you want headlines from. Use the /sources endpoint to locate these programmatically.
+    # @param sources [String] A comma-separated string of identifiers for the news sources or blogs you want headlines from. Use the /sources endpoint to locate these programmatically.
     # @param q [String] Keywords or a phrase to search for.
     # @param page_size [Integer] The number of results to return per page. 20 is the API's default, 100 is the maximum. Our default is 5.
     # @param page [Integer] Use this to page through the results.

data/lib/langchain/tool/ruby_code_interpreter.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Langchain::Tool
+  #
+  # A tool that execute Ruby code in a sandboxed environment.
+  #
+  # Gem requirements:
+  #     gem "safe_ruby", "~> 1.0.4"
+  #
+  # Usage:
+  #    interpreter = Langchain::Tool::RubyCodeInterpreter.new
+  #
+  class RubyCodeInterpreter
+    extend Langchain::ToolDefinition
+    include Langchain::DependencyHelper
+
+    define_function :execute, description: "Executes Ruby code in a sandboxes environment" do
+      property :input, type: "string", description: "Ruby code expression", required: true
+    end
+
+    def initialize(timeout: 30)
+      depends_on "safe_ruby"
+
+      @timeout = timeout
+    end
+
+    # Executes Ruby code in a sandboxes environment.
+    #
+    # @param input [String] ruby code expression
+    # @return [String] Answer
+    def execute(input:)
+      Langchain.logger.info("Executing \"#{input}\"", for: self.class)
+
+      safe_eval(input)
+    end
+
+    def safe_eval(code)
+      SafeRuby.eval(code, timeout: @timeout)
+    end
+  end
+end

data/lib/langchain/tool/{tavily/tavily.rb → tavily.rb}

@@ -1,16 +1,30 @@
 # frozen_string_literal: true
 
 module Langchain::Tool
-  class Tavily < Base
-    #
-    # Tavily Search is a robust search API tailored specifically for LLM Agents.
-    # It seamlessly integrates with diverse data sources to ensure a superior, relevant search experience.
-    #
-    # Usage:
-    #    tavily = Langchain::Tool::Tavily.new(api_key: ENV["TAVILY_API_KEY"])
-    #
-    NAME = "tavily"
-    ANNOTATIONS_PATH = Langchain.root.join("./langchain/tool/#{NAME}/#{NAME}.json").to_path
+  #
+  # Tavily Search is a robust search API tailored specifically for LLM Agents.
+  # It seamlessly integrates with diverse data sources to ensure a superior, relevant search experience.
+  #
+  # Usage:
+  #    tavily = Langchain::Tool::Tavily.new(api_key: ENV["TAVILY_API_KEY"])
+  #
+  class Tavily
+    extend Langchain::ToolDefinition
+
+    define_function :search, description: "Tavily Tool: Robust search API" do
+      property :query, type: "string", description: "The search query string", required: true
+      property :search_depth, type: "string", description: "The depth of the search: basic for quick results and advanced for indepth high quality results but longer response time", enum: ["basic", "advanced"]
+      property :include_images, type: "boolean", description: "Include a list of query related images in the response"
+      property :include_answer, type: "boolean", description: "Include answers in the search results"
+      property :include_raw_content, type: "boolean", description: "Include raw content in the search results"
+      property :max_results, type: "integer", description: "The number of maximum search results to return"
+      property :include_domains, type: "array", description: "A list of domains to specifically include in the search results" do
+        item type: "string"
+      end
+      property :exclude_domains, type: "array", description: "A list of domains to specifically exclude from the search results" do
+        item type: "string"
+      end
+    end
 
     def initialize(api_key:)
       @api_key = api_key

data/lib/langchain/tool/vectorsearch.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Langchain::Tool
+  #
+  # A tool wraps vectorsearch classes
+  #
+  # Usage:
+  #    # Initialize the LLM that will be used to generate embeddings
+  #    ollama = Langchain::LLM::Ollama.new(url: ENV["OLLAMA_URL"]
+  #    chroma = Langchain::Vectorsearch::Chroma.new(url: ENV["CHROMA_URL"], index_name: "my_index", llm: ollama)
+  #
+  #    # This tool can now be used by the Assistant
+  #    vectorsearch_tool = Langchain::Tool::Vectorsearch.new(vectorsearch: chroma)
+  #
+  class Vectorsearch
+    extend Langchain::ToolDefinition
+
+    define_function :similarity_search, description: "Vectorsearch: Retrieves relevant document for the query" do
+      property :query, type: "string", description: "Query to find similar documents for", required: true
+      property :k, type: "integer", description: "Number of similar documents to retrieve. Default value: 4"
+    end
+
+    attr_reader :vectorsearch
+
+    # Initializes the Vectorsearch tool
+    #
+    # @param vectorsearch [Langchain::Vectorsearch::Base] Vectorsearch instance to use
+    def initialize(vectorsearch:)
+      @vectorsearch = vectorsearch
+    end
+
+    # Executes the vector search and returns the results
+    #
+    # @param query [String] The query to search for
+    # @param k [Integer] The number of results to return
+    def similarity_search(query:, k: 4)
+      vectorsearch.similarity_search(query:, k: 4)
+    end
+  end
+end

data/lib/langchain/tool/{weather/weather.rb → weather.rb}

@@ -1,23 +1,27 @@
 # frozen_string_literal: true
 
 module Langchain::Tool
-  class Weather < Base
-    #
-    # A weather tool that gets current weather data
-    #
-    # Current weather data is free for 1000 calls per day (https://home.openweathermap.org/api_keys)
-    # Forecast and historical data require registration with credit card, so not supported yet.
-    #
-    # Gem requirements:
-    #     gem "open-weather-ruby-client", "~> 0.3.0"
-    #     api_key: https://home.openweathermap.org/api_keys
-    #
-    # Usage:
-    #     weather = Langchain::Tool::Weather.new(api_key: ENV["OPEN_WEATHER_API_KEY"])
-    #     weather.execute(input: "Boston, MA; imperial")
-    #
-    NAME = "weather"
-    ANNOTATIONS_PATH = Langchain.root.join("./langchain/tool/#{NAME}/#{NAME}.json").to_path
+  #
+  # A weather tool that gets current weather data
+  #
+  # Current weather data is free for 1000 calls per day (https://home.openweathermap.org/api_keys)
+  # Forecast and historical data require registration with credit card, so not supported yet.
+  #
+  # Gem requirements:
+  #     gem "open-weather-ruby-client", "~> 0.3.0"
+  #     api_key: https://home.openweathermap.org/api_keys
+  #
+  # Usage:
+  #     weather = Langchain::Tool::Weather.new(api_key: ENV["OPEN_WEATHER_API_KEY"])
+  #     weather.execute(input: "Boston, MA; imperial")
+  #
+  class Weather
+    extend Langchain::ToolDefinition
+    include Langchain::DependencyHelper
+
+    define_function :execute, description: "Returns current weather for a city" do
+      property :input, type: "string", description: "Comma separated city and unit (optional: imperial, metric, or standard)", required: true
+    end
 
     attr_reader :client, :units