langchainrb 0.18.0 → 0.19.1

data/lib/langchain/llm/mistral_ai.rb

@@ -8,8 +8,8 @@ module Langchain::LLM
   #    llm = Langchain::LLM::MistralAI.new(api_key: ENV["MISTRAL_AI_API_KEY"])
   class MistralAI < Base
     DEFAULTS = {
-      chat_completion_model_name: "mistral-large-latest",
-      embeddings_model_name: "mistral-embed"
+      chat_model: "mistral-large-latest",
+      embedding_model: "mistral-embed"
     }.freeze
 
     attr_reader :defaults
@@ -24,7 +24,7 @@ module Langchain::LLM
 
       @defaults = DEFAULTS.merge(default_options)
       chat_parameters.update(
-        model: {default: @defaults[:chat_completion_model_name]},
+        model: {default: @defaults[:chat_model]},
         n: {default: @defaults[:n]},
         safe_prompt: {},
         temperature: {default: @defaults[:temperature]},
@@ -44,7 +44,7 @@ module Langchain::LLM
 
     def embed(
       text:,
-      model: defaults[:embeddings_model_name],
+      model: defaults[:embedding_model],
       encoding_format: nil
     )
       params = {

data/lib/langchain/llm/ollama.rb

@@ -12,9 +12,10 @@ module Langchain::LLM
 
     DEFAULTS = {
       temperature: 0.0,
-      completion_model_name: "llama3.1",
-      embeddings_model_name: "llama3.1",
-      chat_completion_model_name: "llama3.1"
+      completion_model: "llama3.1",
+      embedding_model: "llama3.1",
+      chat_model: "llama3.1",
+      options: {}
     }.freeze
 
     EMBEDDING_SIZES = {
@@ -41,11 +42,12 @@ module Langchain::LLM
       @api_key = api_key
       @defaults = DEFAULTS.merge(default_options)
       chat_parameters.update(
-        model: {default: @defaults[:chat_completion_model_name]},
+        model: {default: @defaults[:chat_model]},
         temperature: {default: @defaults[:temperature]},
         template: {},
         stream: {default: false},
-        response_format: {default: @defaults[:response_format]}
+        response_format: {default: @defaults[:response_format]},
+        options: {default: @defaults[:options]}
       )
       chat_parameters.remap(response_format: :format)
     end
@@ -55,7 +57,7 @@ module Langchain::LLM
     def default_dimensions
       # since Ollama can run multiple models, look it up or generate an embedding and return the size
       @default_dimensions ||=
-        EMBEDDING_SIZES.fetch(defaults[:embeddings_model_name].to_sym) do
+        EMBEDDING_SIZES.fetch(defaults[:embedding_model].to_sym) do
           embed(text: "test").embedding.size
         end
     end
@@ -77,7 +79,7 @@ module Langchain::LLM
     #
     def complete(
       prompt:,
-      model: defaults[:completion_model_name],
+      model: defaults[:completion_model],
       images: nil,
       format: nil,
       system: nil,
@@ -199,7 +201,7 @@ module Langchain::LLM
     #
     def embed(
       text:,
-      model: defaults[:embeddings_model_name],
+      model: defaults[:embedding_model],
       mirostat: nil,
       mirostat_eta: nil,
       mirostat_tau: nil,

data/lib/langchain/llm/openai.rb

@@ -16,8 +16,8 @@ module Langchain::LLM
     DEFAULTS = {
       n: 1,
       temperature: 0.0,
-      chat_completion_model_name: "gpt-4o-mini",
-      embeddings_model_name: "text-embedding-3-small"
+      chat_model: "gpt-4o-mini",
+      embedding_model: "text-embedding-3-small"
     }.freeze
 
     EMBEDDING_SIZES = {
@@ -41,7 +41,7 @@ module Langchain::LLM
 
       @defaults = DEFAULTS.merge(default_options)
       chat_parameters.update(
-        model: {default: @defaults[:chat_completion_model_name]},
+        model: {default: @defaults[:chat_model]},
         logprobs: {},
         top_logprobs: {},
         n: {default: @defaults[:n]},
@@ -61,7 +61,7 @@ module Langchain::LLM
     # @return [Langchain::LLM::OpenAIResponse] Response object
     def embed(
       text:,
-      model: defaults[:embeddings_model_name],
+      model: defaults[:embedding_model],
       encoding_format: nil,
       user: nil,
       dimensions: @defaults[:dimensions]
@@ -109,6 +109,7 @@ module Langchain::LLM
       messages = [{role: "user", content: prompt}]
       chat(messages: messages, **params)
     end
+
     # rubocop:enable Style/ArgumentsForwarding
 
     # Generate a chat completion for given messages.
@@ -159,7 +160,7 @@ module Langchain::LLM
     end
 
     def default_dimensions
-      @defaults[:dimensions] || EMBEDDING_SIZES.fetch(defaults[:embeddings_model_name])
+      @defaults[:dimensions] || EMBEDDING_SIZES.fetch(defaults[:embedding_model])
     end
 
     private

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

@@ -37,7 +37,10 @@ module Langchain::LLM::Parameters
       parallel_tool_calls: {},
 
       # Additional optional parameters
-      logit_bias: {}
+      logit_bias: {},
+
+      # Additional llm options. Ollama only.
+      options: {}
     }
 
     def initialize(parameters: {})

data/lib/langchain/llm/replicate.rb

@@ -14,8 +14,8 @@ module Langchain::LLM
       # TODO: Figure out how to send the temperature to the API
       temperature: 0.01, # Minimum accepted value
       # TODO: Design the interface to pass and use different models
-      completion_model_name: "replicate/vicuna-13b",
-      embeddings_model_name: "creatorrr/all-mpnet-base-v2",
+      completion_model: "replicate/vicuna-13b",
+      embedding_model: "creatorrr/all-mpnet-base-v2",
       dimensions: 384
     }.freeze
 
@@ -49,7 +49,7 @@ module Langchain::LLM
         sleep(0.1)
       end
 
-      Langchain::LLM::ReplicateResponse.new(response, model: @defaults[:embeddings_model_name])
+      Langchain::LLM::ReplicateResponse.new(response, model: @defaults[:embedding_model])
     end
 
     #
@@ -66,7 +66,7 @@ module Langchain::LLM
         sleep(0.1)
       end
 
-      Langchain::LLM::ReplicateResponse.new(response, model: @defaults[:completion_model_name])
+      Langchain::LLM::ReplicateResponse.new(response, model: @defaults[:completion_model])
     end
 
     #
@@ -94,11 +94,11 @@ module Langchain::LLM
     private
 
     def completion_model
-      @completion_model ||= client.retrieve_model(@defaults[:completion_model_name]).latest_version
+      @completion_model ||= client.retrieve_model(@defaults[:completion_model]).latest_version
     end
 
     def embeddings_model
-      @embeddings_model ||= client.retrieve_model(@defaults[:embeddings_model_name]).latest_version
+      @embeddings_model ||= client.retrieve_model(@defaults[:embedding_model]).latest_version
     end
   end
 end

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

@@ -9,5 +9,25 @@ module Langchain::LLM
     def completion
       completions.dig(0, :data, :text)
     end
+
+    def chat_completion
+      raw_response.dig(:choices, 0, :message, :content)
+    end
+
+    def prompt_tokens
+      raw_response.dig(:usage, :prompt_tokens).to_i
+    end
+
+    def completion_tokens
+      raw_response.dig(:usage, :completion_tokens).to_i
+    end
+
+    def total_tokens
+      raw_response.dig(:usage, :total_tokens).to_i
+    end
+
+    def role
+      raw_response.dig(:choices, 0, :message, :role)
+    end
   end
 end

data/lib/langchain/tool_definition.rb

@@ -103,6 +103,13 @@ module Langchain::ToolDefinition
     # @return [String] JSON string of schemas in Anthropic format
     def to_anthropic_format
       @schemas.values.map do |schema|
+        # Adds a default input_schema if no parameters are present
+        schema[:function][:parameters] ||= {
+          type: "object",
+          properties: {},
+          required: []
+        }
+
         schema[:function].transform_keys(parameters: :input_schema)
       end
     end

data/lib/langchain/utils/image_wrapper.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "open-uri"
+require "base64"
+
+module Langchain
+  module Utils
+    class ImageWrapper
+      attr_reader :image_url
+
+      def initialize(image_url)
+        @image_url = image_url
+      end
+
+      def base64
+        @base64 ||= begin
+          image_data = open_image.read
+          Base64.strict_encode64(image_data)
+        end
+      end
+
+      def mime_type
+        # TODO: Make it work with local files
+        open_image.meta["content-type"]
+      end
+
+      private
+
+      def open_image
+        # TODO: Make it work with local files
+        uri = URI.parse(image_url)
+        raise URI::InvalidURIError, "Invalid URL scheme" unless %w[http https].include?(uri.scheme)
+        @open_image ||= URI.open(image_url) # rubocop:disable Security/Open
+      end
+    end
+  end
+end

data/lib/langchain/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: langchainrb
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-12 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baran
@@ -640,6 +640,7 @@ files:
 - lib/langchain/assistant.rb
 - lib/langchain/assistant/llm/adapter.rb
 - lib/langchain/assistant/llm/adapters/anthropic.rb
+- lib/langchain/assistant/llm/adapters/aws_bedrock_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
@@ -736,6 +737,7 @@ files:
 - lib/langchain/tool_definition.rb
 - lib/langchain/utils/cosine_similarity.rb
 - lib/langchain/utils/hash_transformer.rb
+- lib/langchain/utils/image_wrapper.rb
 - lib/langchain/utils/to_boolean.rb
 - lib/langchain/vectorsearch/base.rb
 - lib/langchain/vectorsearch/chroma.rb