langchainrb_rails 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37760a671cfe732f12ddb79769997ae325240b5c1b0bb96ee3e13786d605cc6a
-  data.tar.gz: 89b9aa5c04ffb28823836cfef7428990e27e1d38dc231240fb4e7004ab3db614
+  metadata.gz: 6bb3982f419d252f6e94018548685566d9775993ad6349957211a4d686e9a10c
+  data.tar.gz: 783c3d1683d654903f745aa6b1fd973787b03581792a1292a0d5724c6983eda8
 SHA512:
-  metadata.gz: 78c3d36d67ace05932ef36bc9e9136837bb350e5698aad55836f3d6dea0602228f461f2ae1aafc10ec050151d7f6b71e5a7cca21357b1a5f6bf2410f38596a69
-  data.tar.gz: fa5a1bdd97e82d71f9b4b35d0c1f15245c87966cdef60117364174f8306a7df72848dda3b52e2635844a5ae05d25a9e1c6166bf7a25b9ccd52565ae787c8fc86
+  metadata.gz: f1fe4ad36c5c12c7260cff5bf29046330d2e649a0f8d96707b13831f09c2c185cf88c5a202f3621eb03cb87fae1df6f7bb75a6bdac5cd9471a4e4637daaafa5f
+  data.tar.gz: f0effcbf9679194a32ece6ff84cc26cf0c5cea5956c9a51ee1a33ba3e32bf4ea56807bba9a463b9edc227d1cb572508bfad70e3a1e8063c5f374e12e1e97d834

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.1.5] - 2023-11-30
+- Qdrant vectorsearch generator
+
+## [0.1.4] - 2023-11-20
+- Bugfix AR integration when using vectorsearch other than Pgvector
+
 ## [0.1.3] - 2023-11-01
 - Pgvector vectorsearch generator
 

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in langchainrb_rails.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rake", "~> 13.1"
 
 gem "rspec", "~> 3.0"
 

data/Gemfile.lock

@@ -1,76 +1,77 @@
 PATH
   remote: .
   specs:
-    langchainrb_rails (0.1.3)
+    langchainrb_rails (0.1.5)
       langchainrb (~> 0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    actioncable (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailbox (7.1.2)
+      actionpack (= 7.1.2)
+      activejob (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.1)
-      actionpack (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailer (7.1.2)
+      actionpack (= 7.1.2)
+      actionview (= 7.1.2)
+      activejob (= 7.1.2)
+      activesupport (= 7.1.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.1)
-      actionview (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionpack (7.1.2)
+      actionview (= 7.1.2)
+      activesupport (= 7.1.2)
       nokogiri (>= 1.8.5)
+      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.1)
-      actionpack (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actiontext (7.1.2)
+      actionpack (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.1)
-      activesupport (= 7.1.1)
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.1)
-      activesupport (= 7.1.1)
+    activejob (7.1.2)
+      activesupport (= 7.1.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activerecord (7.1.1)
-      activemodel (= 7.1.1)
-      activesupport (= 7.1.1)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activesupport (= 7.1.1)
+    activestorage (7.1.2)
+      actionpack (= 7.1.2)
+      activejob (= 7.1.2)
+      activerecord (= 7.1.2)
+      activesupport (= 7.1.2)
       marcel (~> 1.0)
-    activesupport (7.1.1)
+    activesupport (7.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -83,8 +84,8 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    baran (0.1.9)
-    base64 (0.1.1)
+    baran (0.1.10)
+    base64 (0.2.0)
     bigdecimal (3.1.4)
     brakeman (6.0.1)
     builder (3.2.4)
@@ -97,9 +98,9 @@ GEM
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     crass (1.0.6)
-    date (3.3.3)
+    date (3.3.4)
     diff-lcs (1.5.0)
-    drb (2.1.1)
+    drb (2.2.0)
       ruby2_keywords
     erubi (1.12.0)
     globalid (1.2.1)
@@ -107,13 +108,13 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     io-console (0.6.0)
-    irb (1.8.3)
+    irb (1.9.0)
       rdoc
       reline (>= 0.3.8)
     json (2.6.3)
     json-schema (4.0.0)
       addressable (>= 2.8)
-    langchainrb (0.7.1)
+    langchainrb (0.7.5)
       baran (~> 0.1.9)
       colorize (~> 0.8.1)
       json-schema (~> 4.0.0)
@@ -138,13 +139,13 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.20.0)
-    mutex_m (0.1.2)
-    net-imap (0.4.2)
+    mutex_m (0.2.0)
+    net-imap (0.4.4)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
     net-smtp (0.4.0)
       net-protocol
@@ -170,8 +171,8 @@ GEM
       pry (>= 0.13, < 0.15)
     psych (5.1.1.1)
       stringio
-    public_suffix (5.0.3)
-    racc (1.7.1)
+    public_suffix (5.0.4)
+    racc (1.7.3)
     rack (3.0.8)
     rack-session (2.0.0)
       rack (>= 3.0.0)
@@ -180,20 +181,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.1)
-      actioncable (= 7.1.1)
-      actionmailbox (= 7.1.1)
-      actionmailer (= 7.1.1)
-      actionpack (= 7.1.1)
-      actiontext (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activemodel (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    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)
       bundler (>= 1.15.0)
-      railties (= 7.1.1)
+      railties (= 7.1.2)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -201,21 +202,21 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    railties (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rb_sys (0.9.82)
-    rdoc (6.5.0)
+    rake (13.1.0)
+    rb_sys (0.9.83)
+    rdoc (6.6.0)
       psych (>= 4.0.0)
     regexp_parser (2.8.2)
-    reline (0.3.9)
+    reline (0.4.0)
       io-console (~> 0.5)
     rexml (3.2.6)
     rspec (3.12.0)
@@ -231,29 +232,28 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.56.4)
-      base64 (~> 0.1.1)
+    rubocop (1.57.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       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)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.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)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    standard (1.31.2)
+    standard (1.32.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.56.4)
+      rubocop (~> 1.57.2)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.2)
     standard-custom (1.0.2)
@@ -264,13 +264,13 @@ GEM
       rubocop-performance (~> 1.19.1)
     standardrb (1.0.1)
       standard
-    stringio (3.0.8)
+    stringio (3.0.9)
     thor (1.3.0)
     tiktoken_ruby (0.0.6)
       rb_sys (~> 0.9.68)
     tiktoken_ruby (0.0.6-x86_64-darwin)
     tiktoken_ruby (0.0.6-x86_64-linux)
-    timeout (0.4.0)
+    timeout (0.4.1)
     to_bool (2.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -296,7 +296,7 @@ DEPENDENCIES
   langchainrb_rails!
   pry-byebug (~> 3.10.0)
   rails (> 6.0.0)
-  rake (~> 13.0)
+  rake (~> 13.1)
   rspec (~> 3.0)
   rubocop
   standardrb

data/README.md

@@ -2,11 +2,14 @@
 ---
 The fastest way to sprinkle AI ✨ on top of your Rails app. Add OpenAI-powered question-and-answering in minutes.
 
+Available for paid consulting engagements! [Email me](mailto:andrei@sourcelabs.io).
+
 ![Tests status](https://github.com/andreibondarev/langchainrb_rails/actions/workflows/ci.yml/badge.svg?branch=main)
 [![Gem Version](https://badge.fury.io/rb/langchainrb_rails.svg)](https://badge.fury.io/rb/langchainrb_rails)
 [![Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/gems/langchainrb_rails)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/andreibondarev/langchainrb_rails/blob/main/LICENSE.txt)
 [![](https://dcbadge.vercel.app/api/server/WDARp7J2n8?compact=true&style=flat)](https://discord.gg/WDARp7J2n8)
+[![X](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40rushing_andrei)](https://twitter.com/rushing_andrei)
 
 ## Dependencies
 
@@ -96,7 +99,7 @@ end
 Re-generate embeddings after modifying this method:
 
 ```ruby
-product.embed!
+Product.embed!
 ```
 
 ## Rails Generators
@@ -112,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_rails/active_record/hooks.rb

@@ -76,9 +76,8 @@ module LangchainrbRails
           # Pgvector-specific configuration
           if LangchainrbRails.config.vectorsearch.is_a?(Langchain::Vectorsearch::Pgvector)
             has_neighbors(:embedding)
+            LangchainrbRails.config.vectorsearch.model = self
           end
-
-          LangchainrbRails.config.vectorsearch.model = self
         end
 
         # Iterates over records and generate embeddings.
@@ -113,7 +112,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.3"
+  VERSION = "0.1.5"
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: langchainrb_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrei Bondarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: langchainrb
@@ -90,11 +90,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