langchainrb 0.15.5 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb478a5261da82b78d6a90b6179e4050ae0fcba274c370b507f546b59cfd1a78
-  data.tar.gz: 7fb27d8b3c68060e923e69b1c67680be20846e5a384def4c6ce0efd1c9fa56ab
+  metadata.gz: e5ee7b8ae1bd67027846f794a9d070ce4dcedc6e3c6c36eb169a42ba8a55f124
+  data.tar.gz: c5889ddebb21147551c33fe8be1df6ce1659018d6fb489579e497567fd744bf0
 SHA512:
-  metadata.gz: b6533a4064e822c78cc7659c55c948b13b4904d75ab99fb50269f82d7f815e02ff3c0659f0b6c1905b16c0834f2577ccd136cb3d1a34db6e26b7352c77350a10
-  data.tar.gz: 170e767e0fdef21fc6051a161904ee867205bb18a98641b545adf7fe3933b499d157be52009fd20e168efa5d94e5a03c39a1a21c94c2747b8e6a0393f2099e4e
+  metadata.gz: ef5d74c4e9f2a0e5f0f13b000dd5b82bbfa3ed9481d0bd1defce49d03da7071b31e02a5ec0237cce43b8ea8d76607541e59fe400d9db8803cf6961bb02b2f5bc
+  data.tar.gz: 01a816d66a313b387ce2b37789501636e7b7bede507bd61253bcea7cac3cd641fe74ab18498fe7ddff1bc5b8e38ec39bc0385912ae9e9f310cf94f4d5ec31e9c

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 
-## [0.15.4] - 2024-09-10 🇧🇦
+## [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

data/README.md

@@ -421,7 +421,7 @@ 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

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,6 +25,8 @@ 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,
@@ -41,6 +43,11 @@ module Langchain
       @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
@@ -157,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
@@ -177,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)

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: langchainrb
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.15.6
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-10 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