langchainrb_rails 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ab2d33d89929b9222202d42cc5616aac73ca65fa81c3e4f2bc3d516a3a05c6
-  data.tar.gz: 4ce553994a4219904875168369ab598de11162db2cd6810d202af005acb10638
+  metadata.gz: 262c77cc37284572d2ae586351fa8a0de84ab842df2b6145263bb36387107ef6
+  data.tar.gz: 663f5528780513d3480696f93505146be9d3735e35f5e4da55c33d552d375687
 SHA512:
-  metadata.gz: bd93a8976a54120bcec4f8c10ff5bfc5c36d8bccd9f172b071a7732d675ade00ddc3021f93ecb080f508728fdb06b45e5c086933b0bd5522dd094b08d9334d93
-  data.tar.gz: 0fd5d062e69a441c50c4963749e31c6773f38ba3e063d21574983b5fd4579c495c3e1b95d340540754c8f89b110c4e1f6ea3f0399265bcf315a0d26f5b6b8e36
+  metadata.gz: cf3ccaedef7d42260d76d5c923300f466195d981285617f811d0888273134db9d8e23ce3cbb2e994f6f0c3352e7364da9a2256fa9004bd5a06b01c14e79a4ece
+  data.tar.gz: 47cbfcfc417a4fca10742a6484d9f379f3003c1f97ca6720e3d04937dc7cd3a32332682c160c0f6c727a5ade5e843a685d58c50faa237d812eeee3ad90b99f03

data/.tool-versions

@@ -1 +1 @@
-ruby 3.1.2
+ruby 3.2.2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.1.6] - 2023-01-25
+- Fix bug when multiple ActiveRecord models use vectorsearch
+- Bump langchainrb version
+- Avoid extra query when Pgvector is used
+
+## [0.1.5] - 2023-11-30
+- Qdrant vectorsearch generator
+
 ## [0.1.4] - 2023-11-20
 - Bugfix AR integration when using vectorsearch other than Pgvector
 

data/Gemfile.lock

@@ -1,41 +1,41 @@
 PATH
   remote: .
   specs:
-    langchainrb_rails (0.1.4)
-      langchainrb (~> 0.7.0)
+    langchainrb_rails (0.1.6)
+      langchainrb (>= 0.7, < 0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    actioncable (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailbox (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.2)
-      actionpack (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailer (7.1.3)
+      actionpack (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activesupport (= 7.1.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionpack (7.1.3)
+      actionview (= 7.1.3)
+      activesupport (= 7.1.3)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -43,35 +43,35 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
-      actionpack (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actiontext (7.1.3)
+      actionpack (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
+    actionview (7.1.3)
+      activesupport (= 7.1.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.2)
-      activesupport (= 7.1.2)
+    activejob (7.1.3)
+      activesupport (= 7.1.3)
       globalid (>= 0.3.6)
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activerecord (7.1.2)
-      activemodel (= 7.1.2)
-      activesupport (= 7.1.2)
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activerecord (7.1.3)
+      activemodel (= 7.1.3)
+      activesupport (= 7.1.3)
       timeout (>= 0.4.0)
-    activestorage (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activesupport (= 7.1.2)
+    activestorage (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activesupport (= 7.1.3)
       marcel (~> 1.0)
-    activesupport (7.1.2)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -81,13 +81,14 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     baran (0.1.10)
     base64 (0.2.0)
-    bigdecimal (3.1.4)
-    brakeman (6.0.1)
+    bigdecimal (3.1.6)
+    brakeman (6.1.1)
+      racc
     builder (3.2.4)
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
@@ -95,7 +96,7 @@ GEM
     byebug (11.1.3)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     date (3.3.4)
@@ -107,14 +108,14 @@ GEM
       activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.9.0)
+    io-console (0.7.2)
+    irb (1.11.1)
       rdoc
-      reline (>= 0.3.8)
-    json (2.6.3)
+      reline (>= 0.4.2)
+    json (2.7.1)
     json-schema (4.0.0)
       addressable (>= 2.8)
-    langchainrb (0.7.5)
+    langchainrb (0.9.0)
       baran (~> 0.1.9)
       colorize (~> 0.8.1)
       json-schema (~> 4.0.0)
@@ -125,7 +126,7 @@ GEM
       zeitwerk (~> 2.5)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -138,26 +139,26 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.2)
     mutex_m (0.2.0)
-    net-imap (0.4.4)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nio4r (2.7.0)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
+    nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
@@ -169,7 +170,7 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    psych (5.1.1.1)
+    psych (5.1.2)
       stringio
     public_suffix (5.0.4)
     racc (1.7.3)
@@ -181,20 +182,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.2)
-      actioncable (= 7.1.2)
-      actionmailbox (= 7.1.2)
-      actionmailer (= 7.1.2)
-      actionpack (= 7.1.2)
-      actiontext (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activemodel (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    rails (7.1.3)
+      actioncable (= 7.1.3)
+      actionmailbox (= 7.1.3)
+      actionmailer (= 7.1.3)
+      actionpack (= 7.1.3)
+      actiontext (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activemodel (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.1.3)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -202,9 +203,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    railties (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -212,11 +213,11 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.1.0)
-    rb_sys (0.9.83)
-    rdoc (6.6.0)
+    rb_sys (0.9.87)
+    rdoc (6.6.2)
       psych (>= 4.0.0)
-    regexp_parser (2.8.2)
-    reline (0.4.0)
+    regexp_parser (2.8.3)
+    reline (0.4.2)
       io-console (~> 0.5)
     rexml (3.2.6)
     rspec (3.12.0)
@@ -232,7 +233,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.57.2)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -240,31 +241,31 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-performance (1.20.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    standard (1.32.0)
+    standard (1.33.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.57.2)
+      rubocop (~> 1.59.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.2)
+      standard-performance (~> 1.3)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.2.1)
+    standard-performance (1.3.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.19.1)
+      rubocop-performance (~> 1.20.1)
     standardrb (1.0.1)
       standard
-    stringio (3.0.9)
+    stringio (3.1.0)
     thor (1.3.0)
     tiktoken_ruby (0.0.6)
       rb_sys (~> 0.9.68)

data/README.md

@@ -115,6 +115,11 @@ rails generate langchainrb_rails:pgvector --model=Product --llm=openai
 rails generate langchainrb_rails:pinecone --model=Product --llm=openai
 ```
 
+### Qdrant Generator - adds vectorsearch to your ActiveRecord model
+```bash
+rails generate langchainrb_rails:qdrant --model=Product --llm=openai
+```
+
 Available `--llm` options: `cohere`, `google_palm`, `hugging_face`, `llama_cpp`, `ollama`, `openai`, and `replicate`. The selected LLM will be used to generate embeddings and completions.
 
 The `--model` option is used to specify which ActiveRecord model vectorsearch capabilities will be added to.

data/lib/langchainrb_overrides/vectorsearch/pgvector.rb

@@ -105,7 +105,7 @@ module Langchain::Vectorsearch
     # @param k [Integer] The number of results to have in context
     # @yield [String] Stream responses back one String at a time
     # @return [String] The answer to the question
-    def ask(question, k: 4, &block)
+    def ask(question:, k: 4, &block)
       # Noisy as the embedding column has a lot of data
       ActiveRecord::Base.logger.silence do
         search_results = similarity_search(query: question, k: k)

data/lib/langchainrb_rails/active_record/hooks.rb

@@ -71,12 +71,12 @@ module LangchainrbRails
         #
         # @param provider [Object] The `Langchain::Vectorsearch::*` instance
         def vectorsearch
-          class_variable_set(:@@provider, LangchainrbRails.config.vectorsearch)
+          class_variable_set(:@@provider, LangchainrbRails.config.vectorsearch.dup)
 
           # Pgvector-specific configuration
           if LangchainrbRails.config.vectorsearch.is_a?(Langchain::Vectorsearch::Pgvector)
             has_neighbors(:embedding)
-            LangchainrbRails.config.vectorsearch.model = self
+            class_variable_get(:@@provider).model = self
           end
         end
 
@@ -99,6 +99,8 @@ module LangchainrbRails
             k: k
           )
 
+          return records if LangchainrbRails.config.vectorsearch.is_a?(Langchain::Vectorsearch::Pgvector)
+
           # We use "__id" when Weaviate is the provider
           ids = records.map { |record| record.try("id") || record.dig("__id") }
           where(id: ids)
@@ -112,7 +114,7 @@ module LangchainrbRails
         # @return [String] The answer to the question
         def ask(question, k: 4, &block)
           class_variable_get(:@@provider).ask(
-            question,
+            question: question,
             k: k,
             &block
           ).completion

data/lib/langchainrb_rails/generators/langchainrb_rails/pgvector_generator.rb

@@ -4,7 +4,7 @@ module LangchainrbRails
   module Generators
     #
     # Usage:
-    #     rails g langchain:pgvector -model=Product -llm=openai
+    #     rails generate langchainrb_rails:pgvector --model=Product --llm=openai
     #
     class PgvectorGenerator < LangchainrbRails::Generators::BaseGenerator
       desc "This generator adds Pgvector vectorsearch integration to your ActiveRecord model"

data/lib/langchainrb_rails/generators/langchainrb_rails/qdrant_generator.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module LangchainrbRails
+  module Generators
+    #
+    # PineconeGenerator does the following:
+    # 1. Creates the `langchainrb_rails.rb` initializer file
+    # 2. Adds necessary code to the ActiveRecord model to enable vectorsearch
+    # 3. Adds `qdrant-ruby` gem to the Gemfile
+    #
+    # Usage:
+    #     rails generate langchainrb_rails:qdrant --model=Product --llm=openai
+    #
+    class QdrantGenerator < LangchainrbRails::Generators::BaseGenerator
+      desc "This generator adds Qdrant vectorsearch integration to your ActiveRecord model"
+      source_root File.join(__dir__, "templates")
+
+      # Creates the `langchainrb_rails.rb` initializer file
+      def create_initializer_file
+        template "qdrant_initializer.rb", "config/initializers/langchainrb_rails.rb"
+      end
+
+      # Adds `vectorsearch` class method to the model and `after_save` callback that calls `upsert_to_vectorsearch()`
+      def add_to_model
+        inject_into_class "app/models/#{model_name.downcase}.rb", model_name do
+          "  vectorsearch\n\n  after_save :upsert_to_vectorsearch\n\n"
+        end
+      end
+
+      # Adds `qdrant-ruby` gem to the Gemfile
+      # TODO: Can we automatically run `bundle install`?
+      def add_to_gemfile
+        gem "qdrant-ruby"
+      end
+
+      private
+
+      # @return [String] Name of the model
+      def model_name
+        options["model"]
+      end
+
+      # @return [String] LLM provider to use
+      def llm
+        options["llm"]
+      end
+
+      # @return [Langchain::LLM::*] LLM class
+      def llm_class
+        Langchain::LLM.const_get(LLMS[llm])
+      end
+    end
+  end
+end

data/lib/langchainrb_rails/generators/langchainrb_rails/templates/qdrant_initializer.rb.tt

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+LangchainrbRails.configure do |config|
+  config.vectorsearch = Langchain::Vectorsearch::Qdrant.new(
+    llm: <%= llm_class %>.new(api_key: ENV["<%= llm.upcase %>_API_KEY"]),
+    url: ENV["QDRANT_URL"],
+    api_key: ENV["QDRANT_API_KEY"],
+    index_name: ""
+  )
+end

data/lib/langchainrb_rails/railtie.rb

@@ -12,6 +12,7 @@ module LangchainrbRails
       require_relative "generators/langchainrb_rails/chroma_generator"
       require_relative "generators/langchainrb_rails/pinecone_generator"
       require_relative "generators/langchainrb_rails/pgvector_generator"
+      require_relative "generators/langchainrb_rails/qdrant_generator"
     end
   end
 end

data/lib/langchainrb_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LangchainrbRails
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/lib/langchainrb_rails.rb

@@ -19,6 +19,7 @@ module LangchainrbRails
     autoload :BaseGenerator, "langchainrb_rails/generators/langchainrb_rails/base_generator"
     autoload :ChromaGenerator, "langchainrb_rails/generators/langchainrb_rails/chroma_generator"
     autoload :PgvectorGenerator, "langchainrb_rails/generators/langchainrb_rails/pgvector_generator"
+    autoload :QdrantGenerator, "langchainrb_rails/generators/langchainrb_rails/qdrant_generator"
   end
 
   class << self

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: langchainrb_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: langchainrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -90,11 +96,13 @@ files:
 - lib/langchainrb_rails/generators/langchainrb_rails/chroma_generator.rb
 - lib/langchainrb_rails/generators/langchainrb_rails/pgvector_generator.rb
 - lib/langchainrb_rails/generators/langchainrb_rails/pinecone_generator.rb
+- lib/langchainrb_rails/generators/langchainrb_rails/qdrant_generator.rb
 - lib/langchainrb_rails/generators/langchainrb_rails/templates/add_vector_column_template.rb.tt
 - lib/langchainrb_rails/generators/langchainrb_rails/templates/chroma_initializer.rb.tt
 - lib/langchainrb_rails/generators/langchainrb_rails/templates/enable_vector_extension_template.rb.tt
 - lib/langchainrb_rails/generators/langchainrb_rails/templates/pgvector_initializer.rb.tt
 - lib/langchainrb_rails/generators/langchainrb_rails/templates/pinecone_initializer.rb.tt
+- lib/langchainrb_rails/generators/langchainrb_rails/templates/qdrant_initializer.rb.tt
 - lib/langchainrb_rails/railtie.rb
 - lib/langchainrb_rails/version.rb
 - sig/langchainrb_rails.rbs
@@ -121,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Rails wrapper for langchainrb gem