langchainrb 0.15.4 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d2d64fb264bf47488e83581540b88f7746f0e1b1b318d7dfc9c15356f40c8c
-  data.tar.gz: efbd840632f0f22b202d9257a2020c4bc49cea7528d79efa7e05f963e9e4745f
+  metadata.gz: e5ee7b8ae1bd67027846f794a9d070ce4dcedc6e3c6c36eb169a42ba8a55f124
+  data.tar.gz: c5889ddebb21147551c33fe8be1df6ce1659018d6fb489579e497567fd744bf0
 SHA512:
-  metadata.gz: f57817cc62de3af8f9aa80c62e421255e4172f55d54d91c1adc7d7a03ac9272e866670532c996a19d502c6d3110627d778efdad8c4faad0b07868c8b0aebc81c
-  data.tar.gz: b35d82314edc0d747c87a37bd0e2036755f884e85977639e8b53063ca8ebd7002b9dd4ae9a5dd443f088552e575471e080dc9aa4519e25efaa908e16130b613a
+  metadata.gz: ef5d74c4e9f2a0e5f0f13b000dd5b82bbfa3ed9481d0bd1defce49d03da7071b31e02a5ec0237cce43b8ea8d76607541e59fe400d9db8803cf6961bb02b2f5bc
+  data.tar.gz: 01a816d66a313b387ce2b37789501636e7b7bede507bd61253bcea7cac3cd641fe74ab18498fe7ddff1bc5b8e38ec39bc0385912ae9e9f310cf94f4d5ec31e9c

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [0.15.6] - 2024-09-16
+- Throw an error when `Langchain::Assistant#add_message_callback` is not a callable proc.
+- Resetting instructions on Langchain::Assistant with Google Gemini no longer throws an error.
+- Add Meta models support for AWS Bedrock LLM
+
+## [0.15.5] - 2024-09-10 🇧🇦
+- Fix for Langchain::Prompt::PromptTemplate supporting nested JSON data
+- Require common libs at top-level
+- Add `add_message_callback` to `Langchain::Assistant` constructor to invoke an optional function when any message is added to the conversation
+- Adding Assistant syntactic sugar with #run! and #add_message_and_run!
+
 ## [0.15.4] - 2024-08-30
 - Improve the Langchain::Tool::Database tool
 - Allow explictly setting tool_choice on the Assistant instance

data/README.md

@@ -421,13 +421,13 @@ assistant = Langchain::Assistant.new(
 )
 
 # Add a user message and run the assistant
-assistant.add_message_and_run(content: "What's the latest news about AI?")
+assistant.add_message_and_run!(content: "What's the latest news about AI?")
 
 # Access the conversation thread
 messages = assistant.messages
 
 # Run the assistant with automatic tool execution
-assistant.run(auto_tool_execution: true)
+assistant.run!
 ```
 
 ### Configuration
@@ -435,11 +435,12 @@ assistant.run(auto_tool_execution: true)
 * `tools`: An array of tool instances (optional)
 * `instructions`: System instructions for the assistant (optional)
 * `tool_choice`: Specifies how tools should be selected. Default: "auto". A specific tool function name can be passed. This will force the Assistant to **always** use this function.
+* `add_message_callback`: A callback function (proc, lambda) that is called when any message is added to the conversation (optional)
 
 ### Key Methods
 * `add_message`: Adds a user message to the messages array
-* `run`: Processes the conversation and generates responses
-* `add_message_and_run`: Combines adding a message and running the assistant
+* `run!`: Processes the conversation and generates responses
+* `add_message_and_run!`: Combines adding a message and running the assistant
 * `submit_tool_output`: Manually submit output to a tool call
 * `messages`: Returns a list of ongoing messages
 

data/lib/langchain/assistants/assistant.rb

@@ -17,7 +17,7 @@ module Langchain
 
     attr_reader :llm, :thread, :instructions, :state, :llm_adapter, :tool_choice
     attr_reader :total_prompt_tokens, :total_completion_tokens, :total_tokens
-    attr_accessor :tools
+    attr_accessor :tools, :add_message_callback
 
     # Create a new assistant
     #
@@ -25,12 +25,15 @@ module Langchain
     # @param thread [Langchain::Thread] The thread that'll keep track of the conversation
     # @param tools [Array<Langchain::Tool::Base>] Tools that the assistant has access to
     # @param instructions [String] The system instructions to include in the thread
+    # @param tool_choice [String] Specify how tools should be selected. Options: "auto", "any", "none", or <specific function name>
+    # @params add_message_callback [Proc] A callback function (Proc or lambda) that is called when any message is added to the conversation
     def initialize(
       llm:,
       thread: nil,
       tools: [],
       instructions: nil,
-      tool_choice: "auto"
+      tool_choice: "auto",
+      add_message_callback: nil
     )
       unless tools.is_a?(Array) && tools.all? { |tool| tool.class.singleton_class.included_modules.include?(Langchain::ToolDefinition) }
         raise ArgumentError, "Tools must be an array of objects extending Langchain::ToolDefinition"
@@ -38,7 +41,15 @@ module Langchain
 
       @llm = llm
       @llm_adapter = LLM::Adapter.build(llm)
+
       @thread = thread || Langchain::Thread.new
+
+      # TODO: Validate that it is, indeed, a Proc or lambda
+      if !add_message_callback.nil? && !add_message_callback.respond_to?(:call)
+        raise ArgumentError, "add_message_callback must be a callable object, like Proc or lambda"
+      end
+      @thread.add_message_callback = add_message_callback
+
       @tools = tools
       self.tool_choice = tool_choice
       @instructions = instructions
@@ -51,9 +62,8 @@ module Langchain
       raise ArgumentError, "Thread must be an instance of Langchain::Thread" unless @thread.is_a?(Langchain::Thread)
 
       # The first message in the thread should be the system instructions
-      # TODO: What if the user added old messages and the system instructions are already in there? Should this overwrite the existing instructions?
-      initialize_instructions
       # For Google Gemini, and Anthropic system instructions are added to the `system:` param in the `chat` method
+      initialize_instructions
     end
 
     # Add a user message to the thread
@@ -107,6 +117,13 @@ module Langchain
       thread.messages
     end
 
+    # Run the assistant with automatic tool execution
+    #
+    # @return [Array<Langchain::Message>] The messages in the thread
+    def run!
+      run(auto_tool_execution: true)
+    end
+
     # Add a user message to the thread and run the assistant
     #
     # @param content [String] The content of the message
@@ -117,6 +134,14 @@ module Langchain
       run(auto_tool_execution: auto_tool_execution)
     end
 
+    # Add a user message to the thread and run the assistant with automatic tool execution
+    #
+    # @param content [String] The content of the message
+    # @return [Array<Langchain::Message>] The messages in the thread
+    def add_message_and_run!(content:)
+      add_message_and_run(content: content, auto_tool_execution: true)
+    end
+
     # Submit tool output to the thread
     #
     # @param tool_call_id [String] The ID of the tool call to submit output for
@@ -139,19 +164,24 @@ module Langchain
 
     # Set new instructions
     #
-    # @param [String] New instructions that will be set as a system message
+    # @param new_instructions [String] New instructions that will be set as a system message
     # @return [Array<Langchain::Message>] The messages in the thread
     def instructions=(new_instructions)
       @instructions = new_instructions
 
-      # Find message with role: "system" in thread.messages and delete it from the thread.messages array
-      thread.messages.delete_if(&:system?)
-
-      # Set new instructions by adding new system message
-      message = build_message(role: "system", content: new_instructions)
-      thread.messages.unshift(message)
+      # This only needs to be done that support Message#@role="system"
+      if !llm.is_a?(Langchain::LLM::GoogleGemini) &&
+          !llm.is_a?(Langchain::LLM::GoogleVertexAI) &&
+          !llm.is_a?(Langchain::LLM::Anthropic)
+        # Find message with role: "system" in thread.messages and delete it from the thread.messages array
+        replace_system_message!(content: new_instructions)
+      end
     end
 
+    # Set tool_choice, how tools should be selected
+    #
+    # @param new_tool_choice [String] Tool choice
+    # @return [String] Selected tool choice
     def tool_choice=(new_tool_choice)
       validate_tool_choice!(new_tool_choice)
       @tool_choice = new_tool_choice
@@ -159,6 +189,17 @@ module Langchain
 
     private
 
+    # Replace old system message with new one
+    #
+    # @param content [String] New system message content
+    # @return [Array<Langchain::Message>] The messages in the thread
+    def replace_system_message!(content:)
+      thread.messages.delete_if(&:system?)
+
+      message = build_message(role: "system", content: content)
+      thread.messages.unshift(message)
+    end
+
     # TODO: If tool_choice = "tool_function_name" and then tool is removed from the assistant, should we set tool_choice back to "auto"?
     def validate_tool_choice!(tool_choice)
       allowed_tool_choices = llm_adapter.allowed_tool_choices.concat(available_tool_names)
@@ -287,7 +328,7 @@ module Langchain
 
     def initialize_instructions
       if llm.is_a?(Langchain::LLM::OpenAI) || llm.is_a?(Langchain::LLM::MistralAI)
-        add_message(role: "system", content: instructions) if instructions
+        self.instructions = @instructions if @instructions
       end
     end
 

data/lib/langchain/assistants/thread.rb

@@ -4,12 +4,14 @@ module Langchain
   # Langchain::Thread keeps track of messages in a conversation.
   # TODO: Add functionality to persist to the thread to disk, DB, storage, etc.
   class Thread
-    attr_accessor :messages
+    attr_accessor :messages, :add_message_callback
 
     # @param messages [Array<Langchain::Message>]
-    def initialize(messages: [])
+    # @param add_message_callback [Proc] A callback to call when a message is added to the thread
+    def initialize(messages: [], add_message_callback: nil)
       raise ArgumentError, "messages array must only contain Langchain::Message instance(s)" unless messages.is_a?(Array) && messages.all? { |m| m.is_a?(Langchain::Messages::Base) }
 
+      @add_message_callback = add_message_callback
       @messages = messages
     end
 
@@ -34,6 +36,9 @@ module Langchain
     def add_message(message)
       raise ArgumentError, "message must be a Langchain::Message instance" unless message.is_a?(Langchain::Messages::Base)
 
+      # Call the callback with the message
+      add_message_callback.call(message) if add_message_callback # rubocop:disable Style/SafeNavigation
+
       # Prepend the message to the thread
       messages << message
     end

data/lib/langchain/llm/aws_bedrock.rb

@@ -48,7 +48,7 @@ module Langchain::LLM
 
     attr_reader :client, :defaults
 
-    SUPPORTED_COMPLETION_PROVIDERS = %i[anthropic cohere ai21].freeze
+    SUPPORTED_COMPLETION_PROVIDERS = %i[anthropic ai21 cohere meta].freeze
     SUPPORTED_CHAT_COMPLETION_PROVIDERS = %i[anthropic].freeze
     SUPPORTED_EMBEDDING_PROVIDERS = %i[amazon].freeze
 
@@ -209,6 +209,8 @@ module Langchain::LLM
         compose_parameters_cohere params
       elsif completion_provider == :ai21
         compose_parameters_ai21 params
+      elsif completion_provider == :meta
+        compose_parameters_meta params
       end
     end
 
@@ -219,6 +221,8 @@ module Langchain::LLM
         Langchain::LLM::CohereResponse.new(JSON.parse(response.body.string))
       elsif completion_provider == :ai21
         Langchain::LLM::AI21Response.new(JSON.parse(response.body.string, symbolize_names: true))
+      elsif completion_provider == :meta
+        Langchain::LLM::AwsBedrockMetaResponse.new(JSON.parse(response.body.string))
       end
     end
 
@@ -282,6 +286,16 @@ module Langchain::LLM
       }
     end
 
+    def compose_parameters_meta(params)
+      default_params = @defaults.merge(params)
+
+      {
+        temperature: default_params[:temperature],
+        top_p: default_params[:top_p],
+        max_gen_len: default_params[:max_tokens_to_sample]
+      }
+    end
+
     def response_from_chunks(chunks)
       raw_response = {}
 

data/lib/langchain/llm/google_vertex_ai.rb

@@ -88,8 +88,6 @@ module Langchain::LLM
     def chat(params = {})
       params[:system] = {parts: [{text: params[:system]}]} if params[:system]
       params[:tools] = {function_declarations: params[:tools]} if params[:tools]
-      # This throws an error when tool_choice is passed
-      params[:tool_choice] = {function_calling_config: {mode: params[:tool_choice].upcase}} if params[:tool_choice]
 
       raise ArgumentError.new("messages argument is required") if Array(params[:messages]).empty?
 

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Langchain::LLM
+  class AwsBedrockMetaResponse < BaseResponse
+    def completion
+      completions.first
+    end
+
+    def completions
+      [raw_response.dig("generation")]
+    end
+
+    def stop_reason
+      raw_response.dig("stop_reason")
+    end
+
+    def prompt_tokens
+      raw_response.dig("prompt_token_count").to_i
+    end
+
+    def completion_tokens
+      raw_response.dig("generation_token_count").to_i
+    end
+
+    def total_tokens
+      prompt_tokens + completion_tokens
+    end
+  end
+end

data/lib/langchain/output_parsers/structured_output_parser.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "json"
 require "json-schema"
 
 module Langchain::OutputParsers

data/lib/langchain/processors/eml.rb

@@ -1,4 +1,4 @@
-require "uri"
+# frozen_string_literal: true
 
 module Langchain
   module Processors

data/lib/langchain/prompt/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "strscan"
-require "json"
 require "yaml"
 
 module Langchain::Prompt

data/lib/langchain/prompt/loading.rb

@@ -2,7 +2,6 @@
 
 require "strscan"
 require "pathname"
-require "json"
 require "yaml"
 
 module Langchain::Prompt

data/lib/langchain/prompt/prompt_template.rb

@@ -58,8 +58,9 @@ module Langchain::Prompt
     #
     def format(**kwargs)
       result = @template
+      result = result.gsub(/{{/, "{").gsub(/}}/, "}")
       kwargs.each { |key, value| result = result.gsub(/\{#{key}\}/, value.to_s) }
-      result.gsub(/{{/, "{").gsub(/}}/, "}")
+      result
     end
 
     #

data/lib/langchain/tool_definition.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "json"
-
 #
 # Extends a class to be used as a tool in the assistant.
 # A tool is a collection of functions (methods) used to perform specific tasks.
@@ -42,8 +40,8 @@ module Langchain::ToolDefinition
   # @param method_name [Symbol] Name of the method to define
   # @param description [String] Description of the function
   # @yield Block that defines the parameters for the function
-  def define_function(method_name, description:, &)
-    function_schemas.add_function(method_name:, description:, &)
+  def define_function(method_name, description:, &block)
+    function_schemas.add_function(method_name:, description:, &block)
   end
 
   # Returns the FunctionSchemas instance for this tool
@@ -76,11 +74,11 @@ module Langchain::ToolDefinition
     # @param description [String] Description of the function
     # @yield Block that defines the parameters for the function
     # @raise [ArgumentError] If a block is defined and no parameters are specified for the function
-    def add_function(method_name:, description:, &)
+    def add_function(method_name:, description:, &block)
       name = "#{@tool_name}__#{method_name}"
 
-      if block_given?
-        parameters = ParameterBuilder.new(parent_type: "object").build(&)
+      if block_given? # rubocop:disable Performance/BlockGivenWithExplicitBlock
+        parameters = ParameterBuilder.new(parent_type: "object").build(&block)
 
         if parameters[:properties].empty?
           raise ArgumentError, "Function parameters must have at least one property defined within it, if a block is provided"
@@ -130,8 +128,8 @@ module Langchain::ToolDefinition
     #
     # @yield Block that defines the properties of the schema
     # @return [Hash] The built schema
-    def build(&)
-      instance_eval(&)
+    def build(&block)
+      instance_eval(&block)
       @schema
     end
 
@@ -144,13 +142,13 @@ module Langchain::ToolDefinition
     # @param required [Boolean] Whether the property is required
     # @yield [Block] Block for nested properties (only for object and array types)
     # @raise [ArgumentError] If any parameter is invalid
-    def property(name = nil, type:, description: nil, enum: nil, required: false, &)
+    def property(name = nil, type:, description: nil, enum: nil, required: false, &block)
       validate_parameters(name:, type:, enum:, required:)
 
       prop = {type:, description:, enum:}.compact
 
-      if block_given?
-        nested_schema = ParameterBuilder.new(parent_type: type).build(&)
+      if block_given? # rubocop:disable Performance/BlockGivenWithExplicitBlock
+        nested_schema = ParameterBuilder.new(parent_type: type).build(&block)
 
         case type
         when "object"

data/lib/langchain/vectorsearch/epsilla.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require "securerandom"
-require "json"
 require "timeout"
-require "uri"
 
 module Langchain::Vectorsearch
   class Epsilla < Base

data/lib/langchain/version.rb

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

data/lib/langchain.rb

@@ -4,6 +4,9 @@ require "logger"
 require "pathname"
 require "rainbow"
 require "zeitwerk"
+require "uri"
+require "json"
+
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/langchainrb.rb")
 loader.inflector.inflect(
@@ -30,6 +33,7 @@ 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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: langchainrb
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.6
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-30 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baran
@@ -712,6 +712,7 @@ files:
 - lib/langchain/llm/replicate.rb
 - lib/langchain/llm/response/ai21_response.rb
 - lib/langchain/llm/response/anthropic_response.rb
+- lib/langchain/llm/response/aws_bedrock_meta_response.rb
 - lib/langchain/llm/response/aws_titan_response.rb
 - lib/langchain/llm/response/base_response.rb
 - lib/langchain/llm/response/cohere_response.rb