langchainrb 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dde504e05b1cbb32c857569bf71301537fed2deb468f1bdd69a7ef900a41c085
-  data.tar.gz: '08659cddd6f0bb285e167c7a35dbd2f83c2e9bb51a69206217ea91649e99839c'
+  metadata.gz: a8a7ebf84076b609719daddc97e448f4d4fe987e8ee1eeaddb70df667f163d02
+  data.tar.gz: d52a9619b5913e8ce51563697e38841f9798e04f3caf294d7f331ff159eb70cb
 SHA512:
-  metadata.gz: ce4dd091498659a2d8dda4b54e9e9584dc19be5f390dc5f1d98efa054a264134dc3510f2f83c65bdf23edfbd7344587b91113e69c2ea1fea2cdc157317735799
-  data.tar.gz: a6df110aa7d96c87402164f67aadab0a97e2a62b68b7466cf630fe79dd0611a1740ae11163361eef9c98fc816f7ba12d7bfc0aa2225759cc8191f59fead8fcbd
+  metadata.gz: 2354d82608942a1744be426f23277b18fee508f539613327c9ed6f784d7da18f317d2266d356f3124eef93ea5052fe237f3fc639ff56db4b86060b08f16df1d2
+  data.tar.gz: 282873b85e832e9a872f007a5a6bf35400e22639c5c7f26ac535da4f06370f35d6de35a44d434ec81fedfcff1143a448440cf8bf76ae38e01d0ad5ec15f08dc7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.15.1] - 2024-08-19
+- Drop `to_bool` gem in favour of custom util class
+- Drop `colorize` which is GPL-licensed in favour of `rainbow`
+- Improve Langchain::Tool::Weather tool
+
 ## [0.15.0] - 2024-08-14
 - Fix Langchain::Assistant when llm is Anthropic
 - Fix GoogleGemini#chat method
@@ -135,7 +140,7 @@
 - AWS Bedrock is available as an LLM provider. Available models from AI21, Cohere, AWS, and Anthropic.
 
 ## [0.7.3] - 2023-11-08
-- LLM response passes through the context in RAG cases 
+- LLM response passes through the context in RAG cases
 - Fix gpt-4 token length validation
 
 ## [0.7.2] - 2023-11-02
@@ -180,7 +185,7 @@
 
 ## [0.6.13] - 2023-08-23
 - Add `k:` parameter to all `ask()` vector search methods
-- Bump Faraday to 2.x 
+- Bump Faraday to 2.x
 
 ## [0.6.12] - 2023-08-13
 

data/lib/langchain/contextual_logger.rb

@@ -42,13 +42,13 @@ module Langchain
       for_class_name = for_class&.name
 
       log_line_parts = []
-      log_line_parts << "[Langchain.rb]".colorize(color: :yellow)
+      log_line_parts << colorize("[Langchain.rb]", color: :yellow)
       log_line_parts << if for_class.respond_to?(:logger_options)
-        "[#{for_class_name}]".colorize(for_class.logger_options) + ":"
+        colorize("[#{for_class_name}]", for_class.logger_options) + ":"
       elsif for_class_name
         "[#{for_class_name}]:"
       end
-      log_line_parts << args.first.colorize(MESSAGE_COLOR_OPTIONS[method])
+      log_line_parts << colorize(args.first, MESSAGE_COLOR_OPTIONS[method])
       log_line = log_line_parts.compact.join(" ")
 
       @logger.send(
@@ -56,5 +56,11 @@ module Langchain
         log_line
       )
     end
+
+    private
+
+    def colorize(line, options)
+      Langchain::Utils::Colorizer.colorize(line, options)
+    end
   end
 end

data/lib/langchain/evals/ragas/faithfulness.rb

@@ -47,7 +47,7 @@ module Langchain
           verdicts = match.captures.first
           verdicts
             .split(".")
-            .count { |value| value.strip.to_boolean }
+            .count { |value| to_boolean(value.strip) }
         end
 
         def statements_verification(statements:, context:)
@@ -79,6 +79,10 @@ module Langchain
             file_path: Langchain.root.join("langchain/evals/ragas/prompts/faithfulness_statements_extraction.yml")
           )
         end
+
+        def to_boolean(value)
+          Langchain::Utils::ToBoolean.new.to_bool(value)
+        end
       end
     end
   end

data/lib/langchain/tool/weather.rb

@@ -7,53 +7,103 @@ module Langchain::Tool
   # 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")
+  #     assistant = Langchain::Assistant.new(
+  #       llm: llm,
+  #       tools: [weather]
+  #     )
   #
   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
+    define_function :get_current_weather, description: "Returns current weather for a city" do
+      property :city,
+        type: "string",
+        description: "City name",
+        required: true
+      property :state_code,
+        type: "string",
+        description: "State code",
+        required: true
+      property :country_code,
+        type: "string",
+        description: "Country code",
+        required: false
+      property :units,
+        type: "string",
+        description: "Units for temperature (imperial or metric). Default: \"imperial\"",
+        enum: ["imperial", "metric", "standard"],
+        required: false
     end
 
-    attr_reader :client, :units
+    def initialize(api_key:)
+      @api_key = api_key
+    end
 
-    # Initializes the Weather tool
-    #
-    # @param api_key [String] Open Weather API key
-    # @return [Langchain::Tool::Weather] Weather tool
-    def initialize(api_key:, units: "metric")
-      depends_on "open-weather-ruby-client"
-      require "open-weather-ruby-client"
+    def get_current_weather(city:, state_code:, country_code: nil, units: "imperial")
+      validate_input(city: city, state_code: state_code, country_code: country_code, units: units)
 
-      OpenWeather::Client.configure do |config|
-        config.api_key = api_key
-        config.user_agent = "Langchainrb Ruby Client"
-      end
+      Langchain.logger.info("get_current_weather", for: self.class, city:, state_code:, country_code:, units:)
 
-      @client = OpenWeather::Client.new
+      fetch_current_weather(city: city, state_code: state_code, country_code: country_code, units: units)
     end
 
-    # Returns current weather for a city
-    #
-    # @param input [String] comma separated city and unit (optional: imperial, metric, or standard)
-    # @return [String] Answer
-    def execute(input:)
-      Langchain.logger.info("Executing for \"#{input}\"", for: self.class)
+    private
+
+    def fetch_current_weather(city:, state_code:, country_code:, units:)
+      params = {appid: @api_key, q: [city, state_code, country_code].compact.join(","), units: units}
+
+      location_response = send_request(path: "geo/1.0/direct", params: params.except(:units))
+      return location_response if location_response.is_a?(String) # Error occurred
+
+      location = location_response.first
+      return "Location not found" unless location
+
+      params = params.merge(lat: location["lat"], lon: location["lon"]).except(:q)
+      weather_data = send_request(path: "data/2.5/weather", params: params)
+
+      parse_weather_response(weather_data, units)
+    end
 
-      input_array = input.split(";")
-      city, units = *input_array.map(&:strip)
+    def send_request(path:, params:)
+      uri = URI.parse("https://api.openweathermap.org/#{path}?#{URI.encode_www_form(params)}")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
 
-      data = client.current_weather(city: city, units: units)
-      weather = data.main.map { |key, value| "#{key} #{value}" }.join(", ")
-      "The current weather in #{data.name} is #{weather}"
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request["Content-Type"] = "application/json"
+
+      Langchain.logger.info("Sending request to OpenWeatherMap API", path: path, params: params.except(:appid))
+      response = http.request(request)
+      Langchain.logger.info("Received response from OpenWeatherMap API", status: response.code)
+
+      if response.code == "200"
+        JSON.parse(response.body)
+      else
+        "API request failed: #{response.code} - #{response.message}"
+      end
+    end
+
+    def validate_input(city:, state_code:, country_code:, units:)
+      raise ArgumentError, "City name cannot be empty" if city.to_s.strip.empty?
+      raise ArgumentError, "State code cannot be empty" if state_code.to_s.strip.empty?
+      raise ArgumentError, "Invalid units. Use \"imperial\", \"standard\" or \"metric\"" unless ["imperial", "metric", "standard"].include?(units)
+    end
+
+    def parse_weather_response(response, units)
+      temp_unit = case units
+      when "standard" then "K"
+      when "metric" then "°C"
+      when "imperial" then "°F"
+      end
+      speed_unit = (units == "imperial") ? "mph" : "m/s"
+      {
+        temperature: "#{response["main"]["temp"]} #{temp_unit}",
+        humidity: "#{response["main"]["humidity"]}%",
+        description: response["weather"][0]["description"],
+        wind_speed: "#{response["wind"]["speed"]} #{speed_unit}"
+      }
     end
   end
 end

data/lib/langchain/utils/colorizer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Langchain
+  module Utils
+    class Colorizer
+      def self.colorize(line, options)
+        decorated_line = Rainbow(line)
+        options.each_pair.each do |modifier, value|
+          decorated_line = if modifier == :mode
+            decorated_line.public_send(value)
+          else
+            decorated_line.public_send(modifier, value)
+          end
+        end
+        decorated_line
+      end
+    end
+  end
+end

data/lib/langchain/utils/to_boolean.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Langchain
+  module Utils
+    class ToBoolean
+      TRUTHABLE_STRINGS = %w[1 true t yes y]
+      private_constant :TRUTHABLE_STRINGS
+
+      def to_bool(value)
+        case value
+        when String
+          TRUTHABLE_STRINGS.include?(value.downcase)
+        when Integer
+          value == 1
+        when TrueClass
+          true
+        when FalseClass
+          false
+        when Symbol
+          to_bool(value.to_s)
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/langchain/version.rb

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

data/lib/langchain.rb

@@ -2,8 +2,7 @@
 
 require "logger"
 require "pathname"
-require "colorize"
-require "to_bool"
+require "rainbow"
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/langchainrb.rb")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: langchainrb
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baran
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.9
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: to_bool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: matrix
   requirement: !ruby/object:Gem::Requirement
@@ -472,20 +458,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: open-weather-ruby-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -785,8 +757,10 @@ files:
 - lib/langchain/tool/weather.rb
 - lib/langchain/tool/wikipedia.rb
 - lib/langchain/tool_definition.rb
+- lib/langchain/utils/colorizer.rb
 - lib/langchain/utils/cosine_similarity.rb
 - lib/langchain/utils/hash_transformer.rb
+- lib/langchain/utils/to_boolean.rb
 - lib/langchain/vectorsearch/base.rb
 - lib/langchain/vectorsearch/chroma.rb
 - lib/langchain/vectorsearch/elasticsearch.rb