human_sql 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b99e3383795c42236a802343a72f13c0de24240d35476a871d424bf3d87f795
-  data.tar.gz: 43f3c4d3a6f801bf1fb5109cbc58ec5f2fef9cfc14ac875a4a1dc5e9ea78930a
+  metadata.gz: a61925cacbf601619d70681bbb66384d911689155fe732e23dc2f848003008e5
+  data.tar.gz: 9e69254fada3069ceab0c720b4f11f79ebff12047ce329058ca3c31829b9b6be
 SHA512:
-  metadata.gz: 8e981540d9770d4b9db1ed0476c5417175ab813983c645ff351dc49aa3e1bbbd239ee36e2b6afd3effbd3387e04edbf417c098714c45c433f49aa5c6aa67ea32
-  data.tar.gz: b114d7dac96701c265a8fe52efc99b9039784a4e607c31540c9c0380f2c8bf7e901ee0387c65760f6eea3fa4651065100b6c1faee6dfe9b68ae0035ac7ce6dc2
+  metadata.gz: 62e3320021cc7aec5b26cc658cedd12aef67a9147219962f618065e067a8a4e962cfffb5354902c98644f3ea1b79e4cc42aba4ffbbfb2045db2f74eef8429ab7
+  data.tar.gz: daa62db81b58e300f8cb8fb073363ee7f2875ab52d45c792f07d41ef2ad484c8a207f123bea52e1989fc22ded04ac25f83584106f489e7e005aa40d01ae1eec3

data/lib/human_sql/version.rb

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

data/lib/human_sql.rb

@@ -7,10 +7,10 @@ require_relative 'human_sql/version'
 module HumanSQL
   class QueryBuilder
     OPENAI_API_URL = 'https://api.openai.com/v1/chat/completions'
-    
+
     def initialize(user_input)
       @user_input = user_input
-      @schema_content = File.read(Rails.root.join('db', 'schema.rb'))
+      @schema_content = summarize_schema_with_ignored_tables
     end
 
     def self.run(user_input)
@@ -43,6 +43,54 @@ module HumanSQL
 
     private
 
+    def summarize_schema_with_ignored_tables
+      schema_content = File.read(Rails.root.join('db', 'schema.rb'))
+      ignored_tables = HumanSQLConfig[:ignored_tables] || []
+
+      schema_summary = {}
+      schema_content.split("\n").each do |line|
+        if line.strip.start_with?("create_table")
+          table_name = line.match(/"([^"]+)"/)[1]
+          next if ignored_tables.include?(table_name)
+
+          schema_summary[table_name] = { columns: [], has_many: [], belongs_to: [] }
+        end
+
+        current_table = schema_summary.keys.last if schema_summary.any?
+
+        if line.strip.match?(/^t\.(\w+)\s+"([^"]+)"/) && current_table
+          next if ignored_tables.include?(current_table)
+
+          column_type = line.strip.match(/^t\.(\w+)\s+"([^"]+)"/)[1]
+          column_name = line.strip.match(/^t\.(\w+)\s+"([^"]+)"/)[2]
+          schema_summary[current_table][:columns] << "#{column_name}=#{column_type}"
+        end
+
+        if line.strip.start_with?("add_foreign_key")
+          match_data = line.strip.match(/"([^"]+)", "([^"]+)"(?:, column: "([^"]+)")?/)
+          if match_data
+            parent_table = match_data[1]
+            child_table = match_data[2]
+            next if ignored_tables.include?(parent_table) || ignored_tables.include?(child_table)
+
+            schema_summary[child_table] ||= { columns: [], has_many: [], belongs_to: [] }
+            schema_summary[parent_table] ||= { columns: [], has_many: [], belongs_to: [] }
+            schema_summary[child_table][:belongs_to] << parent_table
+            schema_summary[parent_table][:has_many] << child_table
+          end
+        end
+      end
+
+      schema_summary.map do |table, details|
+        columns = details[:columns].join(",")
+        has_many = details[:has_many].join(",")
+        belongs_to = details[:belongs_to].join(",")
+        %Q{#{table}={#{columns},:has_many=>[#{has_many}],:belongs_to=>[#{belongs_to}]}}
+      end.join("\n")
+    rescue StandardError => e
+      raise "Error processing schema: #{e.message}"
+    end
+
     def build_query_prompt(user_input, schema_content)
       prompt = <<-PROMPT
         The user has requested: "#{user_input}".
@@ -51,7 +99,10 @@ module HumanSQL
         #{schema_content}
 
         Please generate an ActiveRecord query based on this schema. The query should be in a single line of code and return the result according to the user's request. 
-        If it's necessary to access multiple related tables, prefer to use `includes` over `joins` to optimize data loading.
+        If it's necessary to access multiple related tables, prefer to use preload to optimize data loading.
+        If the user indicates a date and time type field, only the value of the indicated date or time is saved without considering the time zone.
+
+        #{HumanSQLConfig[:additional_instructions]}
       PROMPT
       prompt
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: human_sql
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Nicolas Bertin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2024-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,6 +57,8 @@ files:
 - human_sql-0.1.3.gem
 - human_sql-0.1.4.gem
 - human_sql-0.1.5.gem
+- human_sql-0.1.6.gem
+- human_sql-0.1.7.gem
 - lib/human_sql.rb
 - lib/human_sql/version.rb
 - sig/human_sql.rbs
@@ -82,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A gem to convert natural language to ActiveRecord queries using OpenAI