bx_builder_chain 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 006f8200cd1577b6ad0687b1607cad5aabf833971d3a3e3fe2f7718988ec6fbb
-  data.tar.gz: 51be4ca4f480ab7ed47582fc2482b10e53e2a858eb798889ed65cbcf85f76e91
+  metadata.gz: 2f1c1f9ea5cdc963d3fb3b18014d5a41d5fd02f95e29b5e35ce513430b5f65e3
+  data.tar.gz: b193911735fd53950dad77a3809d33f6200212e9ef47ef146ba54977c179c1ea
 SHA512:
-  metadata.gz: 4f2e15d46fa5c06974fa10df37d27204d30bf92e4615a0c77dfbed4a0e84091a0e304ae5b98e52b2434c8937d97616e4d4e3213f959226657c84075431663b9c
-  data.tar.gz: b4762d1c53c6ccc6fc434f53ed058f55273798af70da586e722981a53159d49fc93f197321a7ece9b95b90c80d2c731c5de76d0830782e488571caf7cee8c682
+  metadata.gz: d8b367eb68dd0b967d38c5877b4c293a193e263e7fb4408c7ad81a8ce6404199ba07f1dd88dbe1043e96aed57918d36090b0355173aa0d9c95bb966d40aaa041
+  data.tar.gz: 5311cc6046109e3a016cbc24aaba5d0741117af9a5d609606696279bc983d00b2d2b733566852cfaf0d6d44d4c77a8a44bde6c0b9edbf0feaada3fe0e58095d3

data/Gemfile

@@ -19,4 +19,9 @@ gem "docx"
 gem "roo"
 gem "baran"
 
-gem "pry"
+gem "pry"
+
+gem "rails"
+gem "rspec-rails"
+gem 'fakeredis'
+gem 'database_cleaner'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bx_builder_chain (0.1.2)
+    bx_builder_chain (0.1.6)
       baran (= 0.1.7)
       docx (~> 0.8.0)
       dotenv (~> 2.8)
@@ -17,25 +17,122 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
+    actioncable (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      mail (>= 2.7.1)
+    actionmailer (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.1.7.6)
+      actionview (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.7.6)
+      activesupport (= 6.1.7.6)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.7.6)
+      activesupport (= 6.1.7.6)
+      globalid (>= 0.3.6)
+    activemodel (6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activerecord (6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activestorage (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     afm (0.2.2)
     ast (2.4.2)
     baran (0.1.7)
+    builder (3.2.4)
     coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    date (3.3.3)
     diff-lcs (1.5.0)
     docx (0.8.0)
       nokogiri (~> 1.13, >= 1.13.0)
       rubyzip (~> 2.0)
     dotenv (2.8.1)
+    erubi (1.12.0)
+    fakeredis (0.9.2)
+      redis (~> 4.8)
     faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     hashery (2.1.2)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
     json (2.6.3)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
     method_source (1.0.0)
+    mini_mime (1.1.5)
+    minitest (5.20.0)
     multipart-post (2.3.0)
+    net-imap (0.3.7)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
     nokogiri (1.13.10-arm64-darwin)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -53,8 +150,39 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.7.1)
+    rack (2.2.8)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (6.1.7.6)
+      actioncable (= 6.1.7.6)
+      actionmailbox (= 6.1.7.6)
+      actionmailer (= 6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actiontext (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7.6)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
+    redis (4.8.1)
     regexp_parser (2.8.1)
     rexml (3.2.6)
     roo (2.8.3)
@@ -72,6 +200,14 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
+    rspec-rails (6.0.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
     rspec-support (3.12.1)
     rubocop (1.50.2)
       json (~> 2.3)
@@ -93,8 +229,22 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sequel (5.71.0)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    thor (1.2.2)
+    timeout (0.4.0)
     ttfunk (1.7.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
     zeitwerk (2.6.11)
 
 PLATFORMS
@@ -103,15 +253,19 @@ PLATFORMS
 DEPENDENCIES
   baran
   bx_builder_chain!
+  database_cleaner
   docx
   dotenv
+  fakeredis
   nokogiri
   pdf-reader
   pg
   pry
+  rails
   rake (~> 13.0)
   roo
   rspec (~> 3.0)
+  rspec-rails
   rubocop (~> 1.21)
   ruby-openai
   sequel (~> 5.71)

data/Rakefile

@@ -2,6 +2,10 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'fileutils'
+require "dotenv"
+
+Dotenv.load
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -10,3 +14,102 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: %i[spec rubocop]
+
+namespace :test do
+  desc "Creates a dummy Rails app for testing"
+  task :dummy_rails do
+    require 'rails'
+
+    puts "Creating Rails Test App"
+    dummy_path = File.expand_path("spec/dummy", __dir__)
+    system("rm -rf #{dummy_path}") if File.directory?(dummy_path)
+
+    rails_version = Rails::VERSION::STRING
+    rails_new_command = "rails _#{rails_version}_ new #{dummy_path} --skip-bundle --skip-git --skip-keeps --skip-action-mailbox --skip-action-mailer --skip-action-text --skip-active-storage --skip-action-cable --skip-puma --skip-bootsnap --skip-spring --skip-listen --skip-javascript --skip-turbolinks --skip-test --skip-system-test --quiet"
+    unless system(rails_new_command)
+        puts "Error while installing Rails Test App. Exiting."
+        exit 1
+    end
+
+    # Copy .env across
+    env_source_path = File.expand_path(".env", __dir__)
+    env_dest_path = File.join(dummy_path, ".env")
+
+    # Check if the source .env file exists and then copy
+    if File.exist?(env_source_path)
+    FileUtils.cp(env_source_path, env_dest_path)
+    puts "Copied .env file to the dummy Rails app."
+    else
+    puts "No .env file found in the gem root directory."
+    end
+
+    # remove the asset pipeline initializer file
+    puts 'Removing assets initializer...'
+    assets_file_path = File.expand_path("spec/dummy/config/initializers/assets.rb")
+    File.delete(assets_file_path) if File.exist?(assets_file_path)
+
+
+    puts "Adding gems"
+    # adding gem
+    gemfile_path = "#{dummy_path}/Gemfile"
+    open(gemfile_path, 'a') do |f|
+        f.puts "\ngem 'bx_builder_chain', path: '#{File.expand_path('../../', dummy_path)}'"
+        f.puts "\ngem 'pg'"
+    end
+
+    unless system("cd #{dummy_path} && bundle install")
+        puts "Error while installing gems. Exiting."
+        exit 1
+    end
+
+    puts "Generating builder chain rails files"
+    # Installing Gems
+    unless system("cd #{dummy_path} && bundle exec rails g bx_builder_chain:install")
+        puts "Error while Generating builder chain rails files. Exiting."
+        exit 1
+    end
+
+    puts "\nUpdating DB config"
+    # Update db config
+    database_config_path = File.join(dummy_path, 'config', 'database.yml')
+
+    # Create a hash for the new database configuration
+    pg_config = '
+default: &default
+    adapter: postgresql
+    encoding: unicode
+    pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+    timeout: 5000
+    host: <%= ENV.fetch("DB_HOSTNAME") { "localhost" } %>
+    username: <%= ENV.fetch("DB_USER") { "postgres" } %>
+    password: <%= ENV.fetch("DB_PASSWORD") { "password" } %>
+    port: <%= ENV.fetch("DB_PORT") { "5432" } %>
+
+development:
+    <<: *default
+    database: <%= ENV.fetch("DB_NAME") { "dev_db" } %>
+
+test:
+    <<: *default
+    database: <%= ENV.fetch("DB_NAME") { "test_db" } %>
+
+production:
+    <<: *default
+    database: <%= ENV.fetch("DB_NAME") { "prod_db" } %>
+'
+
+    # Write the new configuration to database.yml
+    File.open(database_config_path, 'w') do |f|
+        f.write pg_config
+    end
+    
+    puts "Setting up DB"
+    # Installing Gems
+    unless system("cd #{dummy_path} && bundle exec rails db:create && bundle exec rails db:migrate")
+        puts "Error while setting up the db. Exiting."
+        exit 1
+    end
+
+    puts "Created dummy Rails app in spec/dummy"
+  end
+end

data/lib/bx_builder_chain/version.rb

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

data/lib/generators/bx_builder_chain/templates/app/controllers/bx_builder_chain/documents_controller.rb

@@ -13,25 +13,27 @@ module BxBuilderChain
     def delete_documents
       return render json: { error: 'No document IDs provided' }, status: :bad_request unless params[:ids].present?
     
-      # Filter documents by the provided IDs and the namespace from the current user groups
       documents_to_delete = BxBuilderChain::Document.where(id: params[:ids], namespace: current_user_document_groups.first)
-    
-      # Destroy the documents
       documents_to_delete.destroy_all
     
       render json: { success: 'Documents deleted successfully' }
     end
 
     def upload_and_process
-      service = DocumentUploadService.new(
-        files: params[:files],
-        user_groups: current_user_document_groups, # optional defaults to ['public']
-        client_class_name: CLIENT_CLASS_NAME, # optional defaults to 'BxBuilderChain::Vectorsearch::Pgvector'
-        llm_class_name: LLM_CLASS_NAME # optional defaults to 'BxBuilderChain::Llm::OpenAi'
-      )
+      result = document_service.upload_and_process
+
+      render_result(result)
+    end
 
-      result = service.upload_and_process
+    def upload_and_process_later
+      result = document_service.upload_and_process_later
+
+      render_result(result)
+    end
+
+    private
 
+    def render_result(result)
       if result[:error]
         render json: { error: result[:error] }, status: :bad_request
       else
@@ -39,24 +41,15 @@ module BxBuilderChain
       end
     end
 
-    def upload_and_process_later
-      service = DocumentUploadService.new(
+    def document_service
+      @service ||= DocumentUploadService.new(
         files: params[:files],
         current_user_groups: current_user_document_groups,
         client_class_name: CLIENT_CLASS_NAME,
         llm_class_name: LLM_CLASS_NAME
       )
-      result = service.upload_and_process_later
-
-      if result[:error]
-        render json: { error: result[:error] }, status: :bad_request
-      else
-        render json: result
-      end
     end
 
-    private
-
     def current_user_document_groups
       params[:current_user_groups].to_s.split(',').reject(&:blank?) 
       # replace this with the actual user document permission groups

data/lib/generators/bx_builder_chain/templates/app/models/bx_builder_chain/document.rb

@@ -7,6 +7,8 @@ module BxBuilderChain
     
     before_destroy :destroy_associated_data
     after_update :update_associated_embedding_namespaces, if: :saved_change_to_namespace?
+    
+    validates :name, uniqueness: { scope: :namespace, message: "and namespace combination already exists" }
 
     private
 

data/lib/pgvector/pg.rb

@@ -1,7 +1,7 @@
 require "pg"
 
 module Pgvector
-  module PG
+  module Pg
     def self.register_vector(registry)
       registry.register_type(0, "vector", nil, TextDecoder::Vector)
       registry.register_type(1, "vector", nil, BinaryDecoder::Vector)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bx_builder_chain
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Paul Ketelle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk