llm_chain 0.5.5 → 0.6.0

data/lib/llm_chain/tools/code_interpreter.rb

@@ -55,10 +55,17 @@ module LLMChain
 
       def call(prompt, context: {})
         code = extract_code(prompt)
-        language = detect_language(code, prompt)
+        language = context[:language]&.to_s || detect_language(code, prompt)
         
-        return "No code found to execute" if code.empty?
-        return "Unsupported language: #{language}" unless @allowed_languages.include?(language)
+        return { error: "No code found to execute" } if code.empty?
+        unless @allowed_languages.include?(language)
+          return {
+            code: code,
+            language: language,
+            error: "Language '#{language}' is not supported",
+            formatted: "Cannot execute: Language '#{language}' is not supported"
+          }
+        end
         
         begin
           if safe_to_execute?(code)

data/lib/llm_chain/tools/date_time.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'time'
+require 'json'
 
 module LLMChain
   module Tools
@@ -31,28 +32,83 @@ module LLMChain
       def call(prompt, context: {})
         params = extract_parameters(prompt)
         tz = params[:timezone]
-        time = tz ? Time.now.getlocal(timezone_offset(tz)) : Time.now
+        
+        if tz
+          # Use TZInfo for proper timezone handling
+          require 'tzinfo'
+          tz_info = TZInfo::Timezone.get(map_timezone_name(tz))
+          time = tz_info.now
+          timezone_abbr = tz_info.current_period.abbreviation
+        else
+          time = Time.now
+          timezone_abbr = time.zone
+        end
+        
         {
-          timezone: tz || Time.now.zone,
+          timezone: tz ? map_timezone_name(tz) : time.zone,
           iso: time.iso8601,
-          formatted: time.strftime("%Y-%m-%d %H:%M:%S %Z")
+          formatted: time.strftime("%Y-%m-%d %H:%M:%S") + " #{timezone_abbr}"
         }
       end
 
       def extract_parameters(prompt)
-        tz_match = prompt.match(/in\s+([A-Za-z_\/]+)/)
-        { timezone: tz_match && tz_match[1] }
+        # First try to parse as JSON (for ReAct agent)
+        begin
+          json_params = JSON.parse(prompt)
+          return { timezone: json_params['timezone'] || json_params[:timezone] }
+        rescue JSON::ParserError
+          # Fallback to regex extraction
+        end
+        
+        # Extract timezone from prompt using regex
+        tz_match = prompt.match(/in\s+([A-Za-z_\s\/]+)/)
+        timezone = tz_match && tz_match[1]&.strip
+        
+        # Map common timezone names to IANA format
+        timezone = map_timezone_name(timezone) if timezone
+        
+        { timezone: timezone }
       end
 
       private
 
       def timezone_offset(tz)
+        return 0 unless tz
+        
+        # Map common timezone names to IANA format
+        tz = map_timezone_name(tz)
+        
         # Fallback: use TZInfo if available, else default to system
         require 'tzinfo'
-        TZInfo::Timezone.get(tz).current_period.offset
-      rescue LoadError, TZInfo::InvalidTimezoneIdentifier
+        TZInfo::Timezone.get(tz).current_period.offset.utc_total_offset
+      rescue LoadError, NameError, TZInfo::InvalidTimezoneIdentifier
         0
       end
+
+      def map_timezone_name(tz)
+        return nil unless tz
+        
+        # Map common timezone names to IANA format
+        timezone_map = {
+          'moscow' => 'Europe/Moscow',
+          'msk' => 'Europe/Moscow',
+          'new york' => 'America/New_York',
+          'nyc' => 'America/New_York',
+          'london' => 'Europe/London',
+          'paris' => 'Europe/Paris',
+          'tokyo' => 'Asia/Tokyo',
+          'beijing' => 'Asia/Shanghai',
+          'shanghai' => 'Asia/Shanghai',
+          'sydney' => 'Australia/Sydney',
+          'los angeles' => 'America/Los_Angeles',
+          'la' => 'America/Los_Angeles',
+          'chicago' => 'America/Chicago',
+          'utc' => 'UTC',
+          'gmt' => 'GMT'
+        }
+        
+        timezone_map[tz.downcase] || tz
+      end
     end
   end
 end 

data/lib/llm_chain/tools/web_search.rb

@@ -21,12 +21,20 @@ module LLMChain
       BING_SAFE = 'Moderate'.freeze
       BING_RESPONSE_FILTER = 'Webpages'.freeze
 
-      # --- Приватные константы для парсинга ---
+      # --- Private constants for parsing ---
       QUERY_COMMANDS_REGEX = /\b(search for|find|lookup|google|what is|who is|where is|when is)\b/i.freeze
       POLITENESS_REGEX = /\b(please|can you|could you|would you)\b/i.freeze
       NUM_RESULTS_REGEX = /(\d+)\s*(results?|items?|links?)/i.freeze
+      FOR_SEARCH_REGEX = /\A(for|to)?\s*search:?\s*/i.freeze
+      DOUBLE_COMMA_REGEX = /,\s*,/
+      TRAILING_PUNCTUATION_REGEX = /[,;]\s*$/
+      MULTISPACE_REGEX = /\s+/
       MAX_QUERY_WORDS = 10
 
+      SERVER_ERROR_REGEX = /5\d\d/
+
+      # @param api_key [String, nil] API key for the search engine (Google or Bing)
+      # @param search_engine [Symbol] :google or :bing
       def initialize(api_key: nil, search_engine: :google)
         @api_key = api_key || ENV['GOOGLE_API_KEY'] || ENV['SEARCH_API_KEY']
         @search_engine = search_engine
@@ -47,10 +55,15 @@ module LLMChain
         )
       end
 
+      # @param prompt [String]
+      # @return [Boolean] Whether the prompt contains search keywords
       def match?(prompt)
         contains_keywords?(prompt, SEARCH_KEYWORDS)
       end
 
+      # @param prompt [String] User's original query
+      # @param context [Hash] (unused)
+      # @return [Hash] Search results and formatted string
       def call(prompt, context: {})
         query = extract_query(prompt)
         return "No search query found" if query.empty?
@@ -71,6 +84,8 @@ module LLMChain
         end
       end
 
+      # @param prompt [String]
+      # @return [Hash] :query and :num_results
       def extract_parameters(prompt)
         {
           query: extract_query(prompt),
@@ -80,20 +95,22 @@ module LLMChain
 
       private
 
-      # @param prompt [String] Исходный запрос
-      # @return [String] Извлечённая суть поискового запроса
+      # @param prompt [String] Original query
+      # @return [String] Extracted search query
       def extract_query(prompt)
         return "" if prompt.nil? || prompt.strip.empty?
         query = prompt.gsub(QUERY_COMMANDS_REGEX, '')
                       .gsub(POLITENESS_REGEX, '')
                       .strip
-        words = query.split
-        return words.first(MAX_QUERY_WORDS).join(' ') if words.length > MAX_QUERY_WORDS
+        query = query.gsub(NUM_RESULTS_REGEX, '').strip
+        query = query.sub(FOR_SEARCH_REGEX, '')
+        query = query.gsub(DOUBLE_COMMA_REGEX, ',').gsub(MULTISPACE_REGEX, ' ')
+        query = query.sub(TRAILING_PUNCTUATION_REGEX, '').strip
         query
       end
 
-      # @param prompt [String] Исходный запрос
-      # @return [Integer] Количество результатов (по умолчанию)
+      # @param prompt [String] Original query
+      # @return [Integer] Number of results (default)
       def extract_num_results(prompt)
         return DEFAULT_NUM_RESULTS if prompt.nil? || prompt.empty?
         match = prompt.match(NUM_RESULTS_REGEX)
@@ -101,6 +118,11 @@ module LLMChain
         DEFAULT_NUM_RESULTS
       end
 
+      # @param query [String] Search query
+      # @param num_results [Integer] Number of results
+      # @param max_retries [Integer] Maximum number of attempts
+      # @return [Array<Hash>] Array of search results
+      # @raise [StandardError] If all attempts fail
       def perform_search_with_retry(query, num_results, max_retries: 3)
         retries = 0
         last_error = nil
@@ -118,14 +140,14 @@ module LLMChain
             retry
           else
             log_error("Search failed after #{retries} attempts", e)
-            # Fallback to hardcoded results as last resort
-            hardcoded = get_hardcoded_results(query)
-            return hardcoded unless hardcoded.empty?
             raise e
           end
         end
       end
 
+      # @param query [String] Search query
+      # @param num_results [Integer] Number of results
+      # @return [Array<Hash>] Array of search results
       def perform_search(query, num_results)
         case @search_engine
         when :google
@@ -137,7 +159,9 @@ module LLMChain
         end
       end
 
-      # --- Google Search SRP decomposition ---
+      # @param query [String] Search query
+      # @param num_results [Integer] Number of results
+      # @return [Array<Hash>] Array of search results
       def search_google_results(query, num_results)
         unless @api_key
           handle_api_error(StandardError.new("No API key"), "Google API key not provided, using fallback")
@@ -157,6 +181,10 @@ module LLMChain
         end
       end
 
+      # @param query [String] Search query
+      # @param num_results [Integer] Number of results
+      # @param search_engine_id [String] Google search engine ID
+      # @return [Net::HTTPResponse, nil] Google response or nil on error
       def fetch_google_response(query, num_results, search_engine_id)
         require 'timeout'
         Timeout.timeout(GOOGLE_TIMEOUT) do
@@ -180,6 +208,8 @@ module LLMChain
         nil
       end
 
+      # @param response [Net::HTTPResponse, nil]
+      # @return [Array<Hash>] Array of search results
       def parse_google_response(response)
         return [] unless response && response.code == '200'
         data = JSON.parse(response.body) rescue nil
@@ -199,7 +229,9 @@ module LLMChain
         []
       end
 
-      # --- Bing Search SRP decomposition ---
+      # @param query [String] Search query
+      # @param num_results [Integer] Number of results
+      # @return [Array<Hash>] Array of search results
       def search_bing_results(query, num_results)
         unless @api_key
           handle_api_error(StandardError.new("No API key"), "Bing API key not provided, using fallback")
@@ -214,6 +246,9 @@ module LLMChain
         end
       end
 
+      # @param query [String] Search query
+      # @param num_results [Integer] Number of results
+      # @return [Net::HTTPResponse, nil] Bing response or nil on error
       def fetch_bing_response(query, num_results)
         require 'timeout'
         Timeout.timeout(BING_TIMEOUT) do
@@ -239,6 +274,8 @@ module LLMChain
         nil
       end
 
+      # @param response [Net::HTTPResponse, nil]
+      # @return [Array<Hash>] Array of search results
       def parse_bing_response(response)
         return [] unless response && response.code == '200'
         data = JSON.parse(response.body) rescue nil
@@ -258,18 +295,29 @@ module LLMChain
         []
       end
 
+      # @param error [Exception] Exception
+      # @param context [String, nil] Error context
+      # @return [void]
       def handle_api_error(error, context = nil)
         log_error(context || "API error", error)
       end
 
-      # --- Fallback/hardcoded results parsing ---
+      # @param query [String] Search query
+      # @return [Array<Hash>] Array of results
       def parse_hardcoded_results(query)
         hardcoded = get_hardcoded_results(query)
         return [] if hardcoded.empty?
         hardcoded
       end
 
-      # --- Форматирование результатов поиска ---
+      # Заглушка для hardcoded results
+      def get_hardcoded_results(query)
+        []
+      end
+
+      # @param query [String] Search query
+      # @param results [Array<Hash>] Array of search results
+      # @return [Hash] Formatted results
       def format_search_results(query, results)
         return {
           query: query,
@@ -278,7 +326,12 @@ module LLMChain
         } if results.empty?
 
         formatted_results = results.map.with_index(1) do |result, index|
-          "#{index}. #{result[:title]}\n   #{result[:snippet]}\n   #{result[:url]}"
+          title = result[:title].to_s.strip
+          title = 'Untitled' if title.empty?
+          snippet = result[:snippet].to_s.strip
+          snippet = 'No description available' if snippet.empty?
+          url = result[:url].to_s.strip
+          "#{index}. #{title}\n   #{snippet}\n   #{url}"
         end.join("\n\n")
 
         {
@@ -289,7 +342,9 @@ module LLMChain
         }
       end
 
-      # --- Логирование и обработка ошибок ---
+      # @param message [String] Message
+      # @param error [Exception] Exception
+      # @return [void]
       def log_error(message, error)
         return unless should_log?
         if defined?(Rails) && Rails.logger
@@ -299,6 +354,9 @@ module LLMChain
         end
       end
 
+      # @param message [String] Message
+      # @param error [Exception] Exception
+      # @return [void]
       def log_retry(message, error)
         return unless should_log?
         if defined?(Rails) && Rails.logger
@@ -308,16 +366,19 @@ module LLMChain
         end
       end
 
+      # @return [Boolean] Whether logging is enabled
       def should_log?
-        ENV['LLM_CHAIN_DEBUG'] == 'true' || 
-          ENV['RAILS_ENV'] == 'development' ||
-          (defined?(Rails) && Rails.env.development?)
+        return true if ENV['LLM_CHAIN_DEBUG'] == 'true'
+        return true if ENV['RAILS_ENV'] == 'development'
+        return true if defined?(Rails) && Rails.respond_to?(:env) && Rails.env.development?
+        false
       end
 
+      # @param error [Exception]
+      # @return [Boolean] Whether the error is retryable
       def retryable_error?(error)
-        # Определяем, стоит ли повторять запрос при данной ошибке
         case error
-        when Net::TimeoutError, Net::OpenTimeout, Net::ReadTimeout
+        when Timeout::Error, Net::OpenTimeout, Net::ReadTimeout
           true
         when SocketError
           # DNS ошибки обычно временные
@@ -326,7 +387,7 @@ module LLMChain
           true
         when Net::HTTPError
           # Повторяем только для серверных ошибок (5xx)
-          error.message.match?(/5\d\d/)
+          error.message.match?(SERVER_ERROR_REGEX)
         else
           false
         end

data/lib/llm_chain/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LlmChain
-  VERSION = "0.5.5"
+  VERSION = "0.6.0"
 end

data/lib/llm_chain.rb

@@ -21,6 +21,7 @@ require_relative "llm_chain/tools/date_time"
 require_relative "llm_chain/embeddings/clients/local/weaviate_vector_store"
 require_relative "llm_chain/embeddings/clients/local/weaviate_retriever"
 require_relative "llm_chain/embeddings/clients/local/ollama_client"
+require_relative "llm_chain/agents"
 
 module LLMChain
   # Exception classes

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: llm_chain
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - FuryCow
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-16 00:00:00.000000000 Z
+date: 2025-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -56,42 +56,42 @@ dependencies:
   name: faraday-net_http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: weaviate-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
@@ -100,15 +100,91 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-description:
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.20'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+description: "LLM Chain is a powerful Ruby framework that provides tools for building
+  sophisticated \nLLM-powered applications. It includes support for prompt management,
+  conversation chains, \nmemory systems, vector storage integration, and seamless
+  LLM provider connections.\n\nKey features:\n• Chain-based conversation flows\n•
+  Memory management with Redis\n• Vector storage with Weaviate\n• Multiple LLM provider
+  support\n• Prompt templating and management\n• Easy integration with existing Ruby
+  applications\n"
 email:
 - dreamweaver0408@gmail.com
 executables:
@@ -123,10 +199,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/composite_agent_example.rb
+- examples/planner_agent_example.rb
 - examples/quick_demo.rb
+- examples/react_agent_example.rb
 - examples/tools_example.rb
 - exe/llm-chain
 - lib/llm_chain.rb
+- lib/llm_chain/agents.rb
+- lib/llm_chain/agents/agent_factory.rb
+- lib/llm_chain/agents/composite_agent.rb
+- lib/llm_chain/agents/planner_agent.rb
+- lib/llm_chain/agents/react_agent.rb
 - lib/llm_chain/builders/memory_context.rb
 - lib/llm_chain/builders/prompt.rb
 - lib/llm_chain/builders/rag_documents.rb
@@ -145,6 +229,7 @@ files:
 - lib/llm_chain/embeddings/clients/local/ollama_client.rb
 - lib/llm_chain/embeddings/clients/local/weaviate_retriever.rb
 - lib/llm_chain/embeddings/clients/local/weaviate_vector_store.rb
+- lib/llm_chain/interfaces/agent.rb
 - lib/llm_chain/interfaces/builders/memory_context_builder.rb
 - lib/llm_chain/interfaces/builders/prompt_builder.rb
 - lib/llm_chain/interfaces/builders/rag_documents_builder.rb
@@ -171,6 +256,10 @@ licenses:
 metadata:
   homepage_uri: https://github.com/FuryCow/llm_chain
   source_code_uri: https://github.com/FuryCow/llm_chain
+  changelog_uri: https://github.com/FuryCow/llm_chain/blob/main/CHANGELOG.md
+  documentation_uri: https://github.com/FuryCow/llm_chain#readme
+  bug_tracker_uri: https://github.com/FuryCow/llm_chain/issues
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -189,5 +278,6 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: Ruby-analog LangChain to work with LLM
+summary: A comprehensive Ruby framework for building LLM-powered applications with
+  chains, memory, and vector storage
 test_files: []