langchainrb 0.6.11 → 0.6.13

data/lib/langchain/prompt/loading.rb

@@ -11,82 +11,88 @@ module Langchain::Prompt
     "few_shot" => ->(config) { load_few_shot_prompt(config) }
   }
 
-  class << self
-    #
-    # Load prompt from file.
-    #
-    # @param file_path [String, Pathname] The path of the file to read the configuration data from.
-    #
-    # @return [Object] The loaded prompt loaded.
-    #
-    # @raise [ArgumentError] If the file type of the specified file path is not supported.
-    #
-    def load_from_path(file_path:)
-      file_path = file_path.is_a?(String) ? Pathname.new(file_path) : file_path
-
-      case file_path.extname
-      when ".json"
-        config = JSON.parse(File.read(file_path))
-      when ".yaml", ".yml"
-        config = YAML.safe_load(File.read(file_path))
-      else
-        raise ArgumentError, "Got unsupported file type #{file_path.extname}"
-      end
-
-      load_from_config(config)
+  module Loading
+    def self.included(base)
+      base.extend ClassMethods
     end
 
-    #
-    # Loads a prompt template with the given configuration.
-    #
-    # @param config [Hash] A hash containing the configuration for the prompt.
-    #
-    # @return [PromptTemplate] The loaded prompt loaded.
-    #
-    def load_prompt(config)
-      template, input_variables = config.values_at("template", "input_variables")
-      PromptTemplate.new(template: template, input_variables: input_variables)
-    end
+    module ClassMethods
+      #
+      # Load prompt from file.
+      #
+      # @param file_path [String, Pathname] The path of the file to read the configuration data from.
+      #
+      # @return [Object] The loaded prompt loaded.
+      #
+      # @raise [ArgumentError] If the file type of the specified file path is not supported.
+      #
+      def load_from_path(file_path:)
+        file_path = file_path.is_a?(String) ? Pathname.new(file_path) : file_path
 
-    #
-    # Loads a prompt template with the given configuration.
-    #
-    # @param config [Hash] A hash containing the configuration for the prompt.
-    #
-    # @return [FewShotPromptTemplate] The loaded prompt loaded.
-    #
-    def load_few_shot_prompt(config)
-      prefix, suffix, example_prompt, examples, input_variables = config.values_at("prefix", "suffix", "example_prompt", "examples", "input_variables")
-      example_prompt = load_prompt(example_prompt)
-      FewShotPromptTemplate.new(prefix: prefix, suffix: suffix, example_prompt: example_prompt, examples: examples, input_variables: input_variables)
-    end
+        case file_path.extname
+        when ".json"
+          config = JSON.parse(File.read(file_path))
+        when ".yaml", ".yml"
+          config = YAML.safe_load(File.read(file_path))
+        else
+          raise ArgumentError, "Got unsupported file type #{file_path.extname}"
+        end
 
-    private
+        load_from_config(config)
+      end
 
-    #
-    # Loads the prompt from the given configuration hash
-    #
-    # @param config [Hash] the configuration hash to load from
-    #
-    # @return [Object] the loaded prompt
-    #
-    # @raise [ArgumentError] if the prompt type specified in the config is not supported
-    #
-    def load_from_config(config)
-      # If `_type` key is not present in the configuration hash, add it with a default value of `prompt`
-      unless config.key?("_type")
-        Langchain.logger.warn "No `_type` key found, defaulting to `prompt`"
-        config["_type"] = "prompt"
+      #
+      # Loads a prompt template with the given configuration.
+      #
+      # @param config [Hash] A hash containing the configuration for the prompt.
+      #
+      # @return [PromptTemplate] The loaded prompt loaded.
+      #
+      def load_prompt(config)
+        template, input_variables = config.values_at("template", "input_variables")
+        PromptTemplate.new(template: template, input_variables: input_variables)
       end
 
-      # If the prompt type specified in the configuration hash is not supported, raise an exception
-      unless TYPE_TO_LOADER.key?(config["_type"])
-        raise ArgumentError, "Loading #{config["_type"]} prompt not supported"
+      #
+      # Loads a prompt template with the given configuration.
+      #
+      # @param config [Hash] A hash containing the configuration for the prompt.
+      #
+      # @return [FewShotPromptTemplate] The loaded prompt loaded.
+      #
+      def load_few_shot_prompt(config)
+        prefix, suffix, example_prompt, examples, input_variables = config.values_at("prefix", "suffix", "example_prompt", "examples", "input_variables")
+        example_prompt = load_prompt(example_prompt)
+        FewShotPromptTemplate.new(prefix: prefix, suffix: suffix, example_prompt: example_prompt, examples: examples, input_variables: input_variables)
       end
 
-      # Load the prompt using the corresponding loader function from the `TYPE_TO_LOADER` hash
-      prompt_loader = TYPE_TO_LOADER[config["_type"]]
-      prompt_loader.call(config)
+      private
+
+      #
+      # Loads the prompt from the given configuration hash
+      #
+      # @param config [Hash] the configuration hash to load from
+      #
+      # @return [Object] the loaded prompt
+      #
+      # @raise [ArgumentError] if the prompt type specified in the config is not supported
+      #
+      def load_from_config(config)
+        # If `_type` key is not present in the configuration hash, add it with a default value of `prompt`
+        unless config.key?("_type")
+          Langchain.logger.warn "No `_type` key found, defaulting to `prompt`"
+          config["_type"] = "prompt"
+        end
+
+        # If the prompt type specified in the configuration hash is not supported, raise an exception
+        unless TYPE_TO_LOADER.key?(config["_type"])
+          raise ArgumentError, "Loading #{config["_type"]} prompt not supported"
+        end
+
+        # Load the prompt using the corresponding loader function from the `TYPE_TO_LOADER` hash
+        prompt_loader = TYPE_TO_LOADER[config["_type"]]
+        prompt_loader.call(config)
+      end
     end
   end
 end

data/lib/langchain/prompt.rb

@@ -0,0 +1,5 @@
+module Langchain
+  module Prompt
+    include Loading
+  end
+end

data/lib/langchain/system_message.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Langchain
+  class SystemMessage < Message
+    def type
+      "system"
+    end
+  end
+end

data/lib/langchain/tool/base.rb

@@ -7,16 +7,18 @@ module Langchain::Tool
   #
   # == Available Tools
   #
-  # - {Langchain::Tool::Calculator}: Calculate the result of a math expression
-  # - {Langchain::Tool::RubyCodeInterpretor}: Runs ruby code
+  # - {Langchain::Tool::Calculator}: calculate the result of a math expression
+  # - {Langchain::Tool::Database}: executes SQL queries
   # - {Langchain::Tool::GoogleSearch}: search on Google (via SerpAPI)
+  # - {Langchain::Tool::RubyCodeInterpreter}: runs ruby code
+  # - {Langchain::Tool::Weather}: gets current weather data
   # - {Langchain::Tool::Wikipedia}: search on Wikipedia
   #
   # == Usage
   #
   # 1. Pick the tools you'd like to pass to an Agent and install the gems listed under **Gem Requirements**
   #
-  #     # To use all 3 tools:
+  #     # For example to use the Calculator, GoogleSearch, and Wikipedia:
   #     gem install eqn
   #     gem install google_search_results
   #     gem install wikipedia-client
@@ -28,16 +30,14 @@ module Langchain::Tool
   # 3. Pass the tools when Agent is instantiated.
   #
   #     agent = Langchain::Agent::ReActAgent.new(
-  #       llm: :openai, # or :cohere, :hugging_face, :google_palm or :replicate
-  #       llm_api_key: ENV["OPENAI_API_KEY"],
-  #       tools: ["google_search", "calculator", "wikipedia"]
+  #       llm: Langchain::LLM::OpenAI.new(api_key: "YOUR_API_KEY"), # or other like Cohere, Hugging Face, Google Palm or Replicate
+  #       tools: [
+  #         Langchain::Tool::GoogleSearch.new(api_key: "YOUR_API_KEY"),
+  #         Langchain::Tool::Calculator.new,
+  #         Langchain::Tool::Wikipedia.new
+  #       ]
   #     )
   #
-  # 4. Confirm that the Agent is using the Tools you passed in:
-  #
-  #     agent.tools
-  #     # => ["google_search", "calculator", "wikipedia"]
-  #
   # == Adding Tools
   #
   # 1. Create a new file in lib/langchain/tool/your_tool_name.rb
@@ -53,7 +53,7 @@ module Langchain::Tool
     #
     # @return [String] tool name
     #
-    def tool_name
+    def name
       self.class.const_get(:NAME)
     end
 
@@ -68,7 +68,7 @@ module Langchain::Tool
     #
     # @return [String] tool description
     #
-    def tool_description
+    def description
       self.class.const_get(:DESCRIPTION)
     end
 
@@ -109,7 +109,7 @@ module Langchain::Tool
     #
     def self.validate_tools!(tools:)
       # Check if the tool count is equal to unique tool count
-      if tools.count != tools.map(&:tool_name).uniq.count
+      if tools.count != tools.map(&:name).uniq.count
         raise ArgumentError, "Either tools are not unique or are conflicting with each other"
       end
     end

data/lib/langchain/vectorsearch/chroma.rb

@@ -113,10 +113,11 @@ module Langchain::Vectorsearch
 
     # Ask a question and return the answer
     # @param question [String] The question to ask
+    # @param k [Integer] The number of results to have in context
     # @yield [String] Stream responses back one String at a time
     # @return [String] The answer to the question
-    def ask(question:, &block)
-      search_results = similarity_search(query: question)
+    def ask(question:, k: 4, &block)
+      search_results = similarity_search(query: question, k: k)
 
       context = search_results.map do |result|
         result.document

data/lib/langchain/vectorsearch/milvus.rb

@@ -5,7 +5,7 @@ module Langchain::Vectorsearch
     #
     # Wrapper around Milvus REST APIs.
     #
-    # Gem requirements: gem "milvus", "~> 0.9.0"
+    # Gem requirements: gem "milvus", "~> 0.9.2"
     #
     # Usage:
     # milvus = Langchain::Vectorsearch::Milvus.new(url:, index_name:, llm:, api_key:)
@@ -138,10 +138,11 @@ module Langchain::Vectorsearch
 
     # Ask a question and return the answer
     # @param question [String] The question to ask
+    # @param k [Integer] The number of results to have in context
     # @yield [String] Stream responses back one String at a time
     # @return [String] The answer to the question
-    def ask(question:, &block)
-      search_results = similarity_search(query: question)
+    def ask(question:, k: 4, &block)
+      search_results = similarity_search(query: question, k: k)
 
       content_field = search_results.dig("results", "fields_data").select { |field| field.dig("field_name") == "content" }
       content_data = content_field.first.dig("Field", "Scalars", "Data", "StringData", "data")

data/lib/langchain/vectorsearch/pgvector.rb

@@ -8,7 +8,7 @@ module Langchain::Vectorsearch
     # Gem requirements: gem "pgvector", "~> 0.2"
     #
     # Usage:
-    # pgvector = Langchain::Vectorsearch::Pgvector.new(url:, index_name:, llm:, namespace_column: nil, namespace: nil)
+    # pgvector = Langchain::Vectorsearch::Pgvector.new(url:, index_name:, llm:, namespace: nil)
     #
 
     # The operators supported by the PostgreSQL vector search adapter
@@ -90,20 +90,22 @@ module Langchain::Vectorsearch
     end
 
     # Create default schema
-    # @return [PG::Result] The response from the database
     def create_default_schema
       db.run "CREATE EXTENSION IF NOT EXISTS vector"
-      namespace = namespace_column
+      namespace_column = @namespace_column
       vector_dimension = default_dimension
       db.create_table? table_name.to_sym do
         primary_key :id
         text :content
         column :vectors, "vector(#{vector_dimension})"
-        text namespace.to_sym, default: nil
+        text namespace_column.to_sym, default: nil
       end
     end
 
-    # TODO: Add destroy_default_schema method
+    # Destroy default schema
+    def destroy_default_schema
+      db.drop_table? table_name.to_sym
+    end
 
     # Search for similar texts in the index
     # @param query [String] The text to search for
@@ -133,10 +135,11 @@ module Langchain::Vectorsearch
 
     # Ask a question and return the answer
     # @param question [String] The question to ask
+    # @param k [Integer] The number of results to have in context
     # @yield [String] Stream responses back one String at a time
     # @return [String] The answer to the question
-    def ask(question:, &block)
-      search_results = similarity_search(query: question)
+    def ask(question:, k: 4, &block)
+      search_results = similarity_search(query: question, k: k)
 
       context = search_results.map do |result|
         result.content.to_s

data/lib/langchain/vectorsearch/pinecone.rb

@@ -51,6 +51,21 @@ module Langchain::Vectorsearch
       index.upsert(vectors: vectors, namespace: namespace)
     end
 
+    def add_data(paths:, namespace: "")
+      raise ArgumentError, "Paths must be provided" if Array(paths).empty?
+
+      texts = Array(paths)
+        .flatten
+        .map do |path|
+          data = Langchain::Loader.new(path)&.load&.chunks
+          data.map { |chunk| chunk[:text] }
+        end
+
+      texts.flatten!
+
+      add_texts(texts: texts, namespace: namespace)
+    end
+
     # Update a list of texts in the index
     # @param texts [Array] The list of texts to update
     # @param ids [Array] The list of IDs to update
@@ -138,11 +153,12 @@ module Langchain::Vectorsearch
     # Ask a question and return the answer
     # @param question [String] The question to ask
     # @param namespace [String] The namespace to search in
+    # @param k [Integer] The number of results to have in context
     # @param filter [String] The filter to use
     # @yield [String] Stream responses back one String at a time
     # @return [String] The answer to the question
-    def ask(question:, namespace: "", filter: nil, &block)
-      search_results = similarity_search(query: question, namespace: namespace, filter: filter)
+    def ask(question:, namespace: "", filter: nil, k: 4, &block)
+      search_results = similarity_search(query: question, namespace: namespace, filter: filter, k: k)
 
       context = search_results.map do |result|
         result.dig("metadata").to_s

data/lib/langchain/vectorsearch/qdrant.rb

@@ -5,7 +5,7 @@ module Langchain::Vectorsearch
     #
     # Wrapper around Qdrant
     #
-    # Gem requirements: gem "qdrant-ruby", "~> 0.9.0"
+    # Gem requirements: gem "qdrant-ruby", "~> 0.9.3"
     #
     # Usage:
     # qdrant = Langchain::Vectorsearch::Qdrant.new(url:, api_key:, index_name:, llm:, llm_api_key:)
@@ -112,10 +112,11 @@ module Langchain::Vectorsearch
 
     # Ask a question and return the answer
     # @param question [String] The question to ask
+    # @param k [Integer] The number of results to have in context
     # @yield [String] Stream responses back one String at a time
     # @return [String] The answer to the question
-    def ask(question:, &block)
-      search_results = similarity_search(query: question)
+    def ask(question:, k: 4, &block)
+      search_results = similarity_search(query: question, k: k)
 
       context = search_results.map do |result|
         result.dig("payload").to_s

data/lib/langchain/vectorsearch/weaviate.rb

@@ -124,10 +124,11 @@ module Langchain::Vectorsearch
 
     # Ask a question and return the answer
     # @param question [String] The question to ask
+    # @param k [Integer] The number of results to have in context
     # @yield [String] Stream responses back one String at a time
     # @return [Hash] The answer
-    def ask(question:, &block)
-      search_results = similarity_search(query: question)
+    def ask(question:, k: 4, &block)
+      search_results = similarity_search(query: question, k: k)
 
       context = search_results.map do |result|
         result.dig("content").to_s

data/lib/langchain/version.rb

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

data/lib/langchain.rb

@@ -3,8 +3,25 @@
 require "logger"
 require "pathname"
 require "colorize"
-
-require_relative "./langchain/version"
+require "zeitwerk"
+loader = Zeitwerk::Loader.for_gem
+loader.ignore("#{__dir__}/langchainrb.rb")
+loader.inflector.inflect(
+  "ai_message" => "AIMessage",
+  "ai21" => "AI21",
+  "ai21_validator" => "AI21Validator",
+  "csv" => "CSV",
+  "html" => "HTML",
+  "json" => "JSON",
+  "jsonl" => "JSONL",
+  "llm" => "LLM",
+  "openai" => "OpenAI",
+  "openai_validator" => "OpenAIValidator",
+  "pdf" => "PDF",
+  "react_agent" => "ReActAgent",
+  "sql_query_agent" => "SQLQueryAgent"
+)
+loader.setup
 
 # Langchain.rb a is library for building LLM-backed Ruby applications. It is an abstraction layer that sits on top of the emerging AI-related tools that makes it easy for developers to consume and string those services together.
 #
@@ -48,13 +65,6 @@ require_relative "./langchain/version"
 #
 # Langchain.logger.level = :info
 module Langchain
-  autoload :Loader, "langchain/loader"
-  autoload :Data, "langchain/data"
-  autoload :Conversation, "langchain/conversation"
-  autoload :ConversationMemory, "langchain/conversation_memory"
-  autoload :DependencyHelper, "langchain/dependency_helper"
-  autoload :ContextualLogger, "langchain/contextual_logger"
-
   class << self
     # @return [ContextualLogger]
     attr_reader :logger
@@ -73,95 +83,7 @@ module Langchain
 
   @root = Pathname.new(__dir__)
 
-  module Agent
-    autoload :Base, "langchain/agent/base"
-    autoload :ReActAgent, "langchain/agent/react_agent/react_agent.rb"
-    autoload :SQLQueryAgent, "langchain/agent/sql_query_agent/sql_query_agent.rb"
-  end
-
-  module Chunker
-    autoload :Base, "langchain/chunker/base"
-    autoload :Text, "langchain/chunker/text"
-    autoload :RecursiveText, "langchain/chunker/recursive_text"
-  end
-
-  module Tool
-    autoload :Base, "langchain/tool/base"
-    autoload :Calculator, "langchain/tool/calculator"
-    autoload :RubyCodeInterpreter, "langchain/tool/ruby_code_interpreter"
-    autoload :GoogleSearch, "langchain/tool/google_search"
-    autoload :Weather, "langchain/tool/weather"
-    autoload :Wikipedia, "langchain/tool/wikipedia"
-    autoload :Database, "langchain/tool/database"
-  end
-
-  module Processors
-    autoload :Base, "langchain/processors/base"
-    autoload :CSV, "langchain/processors/csv"
-    autoload :Docx, "langchain/processors/docx"
-    autoload :HTML, "langchain/processors/html"
-    autoload :JSON, "langchain/processors/json"
-    autoload :JSONL, "langchain/processors/jsonl"
-    autoload :PDF, "langchain/processors/pdf"
-    autoload :Text, "langchain/processors/text"
-    autoload :Xlsx, "langchain/processors/xlsx"
-  end
-
-  module Utils
-    module TokenLength
-      autoload :BaseValidator, "langchain/utils/token_length/base_validator"
-      autoload :AI21Validator, "langchain/utils/token_length/ai21_validator"
-      autoload :CohereValidator, "langchain/utils/token_length/cohere_validator"
-      autoload :GooglePalmValidator, "langchain/utils/token_length/google_palm_validator"
-      autoload :OpenAIValidator, "langchain/utils/token_length/openai_validator"
-      autoload :TokenLimitExceeded, "langchain/utils/token_length/token_limit_exceeded"
-    end
-  end
-
-  module Vectorsearch
-    autoload :Base, "langchain/vectorsearch/base"
-    autoload :Chroma, "langchain/vectorsearch/chroma"
-    autoload :Hnswlib, "langchain/vectorsearch/hnswlib"
-    autoload :Milvus, "langchain/vectorsearch/milvus"
-    autoload :Pinecone, "langchain/vectorsearch/pinecone"
-    autoload :Pgvector, "langchain/vectorsearch/pgvector"
-    autoload :Qdrant, "langchain/vectorsearch/qdrant"
-    autoload :Weaviate, "langchain/vectorsearch/weaviate"
-  end
-
-  module LLM
-    autoload :AI21, "langchain/llm/ai21"
-    autoload :Anthropic, "langchain/llm/anthropic"
-    autoload :Base, "langchain/llm/base"
-    autoload :Cohere, "langchain/llm/cohere"
-    autoload :GooglePalm, "langchain/llm/google_palm"
-    autoload :HuggingFace, "langchain/llm/hugging_face"
-    autoload :LlamaCpp, "langchain/llm/llama_cpp"
-    autoload :OpenAI, "langchain/llm/openai"
-    autoload :Replicate, "langchain/llm/replicate"
-  end
-
-  module Prompt
-    require_relative "langchain/prompt/loading"
-
-    autoload :Base, "langchain/prompt/base"
-    autoload :PromptTemplate, "langchain/prompt/prompt_template"
-    autoload :FewShotPromptTemplate, "langchain/prompt/few_shot_prompt_template"
-  end
-
-  module ActiveRecord
-    autoload :Hooks, "langchain/active_record/hooks"
-  end
-
-  module OutputParsers
-    autoload :Base, "langchain/output_parsers/base"
-    autoload :StructuredOutputParser, "langchain/output_parsers/structured"
-    autoload :OutputFixingParser, "langchain/output_parsers/fix"
-  end
-
   module Errors
     class BaseError < StandardError; end
   end
 end
-
-require "langchain/railtie" if defined?(Rails)