bx_builder_chain 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6d9468ceb20458a750bc55fae3ac0d10e6c0d26a36461d4a24b2c25e0c20c4
-  data.tar.gz: 0caa475c638e32ba81c8757cf988fc3955e75a71b884b3bf3be73c3ecfa4607c
+  metadata.gz: fce719d547006f3558e46770fd93fcb40ae18b9192cd822c39e6f799492b17f8
+  data.tar.gz: 55646bf7a27c50ed76b936e8e4b2620e6f99590c73102d204586d7c471068717
 SHA512:
-  metadata.gz: 316099f684a647f01ce0267ea11be809eed444738846294af9886a546ceca23d39aa26fc3003294b496c96aa1815b3df90c0d41470091e8140478d3ad75e7899
-  data.tar.gz: 9e62733d326e2ee41af83e27f3a3ae3162b8bf510aed98c93d1f8447cfba178e5203e180db11a711ed742327a2722ec47e302aff1762abd97b53158f0b9c0a8b
+  metadata.gz: 21a59e389d2764994ce4e145a1286c4d8d0c1221b2130db8c6b0eb9f9effbdf8783c5eade25fd1e80e34409dcb0df0fbc5e07364177164379bb099eb34d4b803
+  data.tar.gz: 642dc5a052c79000eff8601695696f18fbfc7346a0f5d72032377985061e65faaf61865c3b7ef306dcdd3b7e07b03444dfdd0d7dbceba849018415828a2e93b2

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    bx_builder_chain (0.1.0)
+    bx_builder_chain (0.1.1)
       baran (= 0.1.7)
-      docx
-      dotenv
-      nokogiri
-      pdf-reader
-      pg
-      roo
-      ruby-openai
+      docx (~> 0.8.0)
+      dotenv (~> 2.8)
+      nokogiri (~> 1.8)
+      pdf-reader (~> 2.11.0)
+      pg (~> 1.5.3)
+      roo (~> 2.8.3)
+      ruby-openai (~> 5.1.0)
       sequel (~> 5.71)
       zeitwerk (= 2.6.11)
 
@@ -85,7 +85,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    ruby-openai (5.0.0)
+    ruby-openai (5.1.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)

data/lib/bx_builder_chain/configuration.rb

@@ -1,21 +1,27 @@
-# Inside your gem (e.g., in `lib/bx_builder_chain/vectorsearch/configuration.rb`)
+# In your Configuration class (e.g., `lib/bx_builder_chain/vectorsearch/configuration.rb`)
 
 module BxBuilderChain
-    class Configuration
-      attr_accessor :pg_url, :openai_api_key, :public_namespace, :threshold, :default_prompt_template
-  
-      def initialize
-        @pg_url             = ENV['DB_URL']
-        @openai_api_key     = ENV['OPENAI_API_KEY']
-        @public_namespace   = 'public'
-        @threshold          = 0.25
-        @default_prompt_template = "Context information is below
+  class Configuration
+    attr_accessor :pg_url, :openai_api_key, :public_namespace, :threshold, 
+                  :default_prompt_template, :database_host, :database_port, :database_name, 
+                  :database_user, :database_password
+
+    def initialize
+      @pg_url = ENV['DB_URL'] || nil
+      @openai_api_key = ENV['OPENAI_API_KEY']
+      @public_namespace = 'public'
+      @threshold = 0.25
+      @default_prompt_template = "Context information is below
 --------------------
 %{context}
 --------------------
 Given the context information and not prior knowledge
 answer the question: %{question}"
-      end
+      @database_host = ENV['DB_HOSTNAME']
+      @database_port = ENV['DB_PORT']
+      @database_name = ENV['DB_NAME']
+      @database_user = ENV['DB_USER']
+      @database_password = ENV['DB_PASSWORD']
     end
   end
-  
+end

data/lib/bx_builder_chain/vectorsearch/pgvector.rb

@@ -23,11 +23,10 @@ module BxBuilderChain::Vectorsearch
     # @param llm [Object] The LLM client to use
     # @param namespace [String] The namespace to use for the index when inserting/querying
     def initialize(llm:, namespaces: [BxBuilderChain.configuration.public_namespace] || ['public'])
-
       depends_on "sequel"
       require "sequel"
-
-      @db = Sequel.connect(BxBuilderChain.configuration.pg_url)
+      
+      @db = create_sequel_connection
       @table_name = "bx_builder_chain_embeddings"
       @namespace_column = "namespace"
       set_namespaces(namespaces)
@@ -224,5 +223,22 @@ module BxBuilderChain::Vectorsearch
       namespaces = [namespaces] unless namespaces.is_a?(Array)
       @namespaces = namespaces.push(BxBuilderChain.configuration.public_namespace).uniq  
     end    
+    
+    def create_sequel_connection
+      config = BxBuilderChain.configuration
+
+      if config.pg_url
+        Sequel.connect(config.pg_url)
+      else
+        Sequel.connect(
+          adapter: 'postgres',
+          host: config.database_host,
+          database: config.database_name,
+          user: config.database_user,
+          password: config.database_password,
+          port: config.database_port
+        )
+      end
+    end
   end
 end

data/lib/bx_builder_chain/version.rb

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

data/lib/generators/bx_builder_chain/templates/initializer.rb

@@ -1,6 +1,16 @@
 BxBuilderChain.configure do |config|
-  config.pg_url = "your_database_url" # eg 'postgres://postgres:password@localhost:5432/my_db'
-  config.openai_api_key = "your_openai_api_key" # eg ENV['OPENAI_API_KEY']
+  config.openai_api_key = ENV['OPENAI_API_KEY']
+
+  # for db use this
+  config.pg_url = ENV['DB_URL'] || nil # eg 'postgres://postgres:password@localhost:5432/my_db'
+
+  # or this - pg_url with take preference
+  config.database_host = ENV['DB_HOSTNAME'] || 'localhost'
+  config.database_name = ENV['DB_NAME']
+  config.database_user = ENV['DB_USER']
+  config.database_password = ENV['DB_PASSWORD']
+  config.database_port = ENV['DB_PORT'] || '5432' # Defaulting to 5432 if not set
+
   config.public_namespace = "public"
   config.threshold = 0.25
   config.default_prompt_template = "Context information is below

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bx_builder_chain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Paul Ketelle