human_sql 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2105327e3f06a71f6a2e87920bd571bd82e6c2d7c891a9bf939f685a9796a2dc
-  data.tar.gz: 5012bb480c854b5b86a891130dd73ac938e7cf1138428a6918d76193836f8d9d
+  metadata.gz: 0b99e3383795c42236a802343a72f13c0de24240d35476a871d424bf3d87f795
+  data.tar.gz: 43f3c4d3a6f801bf1fb5109cbc58ec5f2fef9cfc14ac875a4a1dc5e9ea78930a
 SHA512:
-  metadata.gz: e39cece766a98e64e0f6bf59a2124348e15a6e970fbee4d25c6184a74508b839445cf9d00012d081240b6dfff4336ff19b12b1ac27c0a587ab212cdba57adbee
-  data.tar.gz: 66b6ee8fb138967521063913ab8891f36b1950f01ce4dd733555d7cc58da40a3b6f72a1cf843b38a85546cd8f53b13625d2a6cef96d608f9292cc0356d691a28
+  metadata.gz: 8e981540d9770d4b9db1ed0476c5417175ab813983c645ff351dc49aa3e1bbbd239ee36e2b6afd3effbd3387e04edbf417c098714c45c433f49aa5c6aa67ea32
+  data.tar.gz: b114d7dac96701c265a8fe52efc99b9039784a4e607c31540c9c0380f2c8bf7e901ee0387c65760f6eea3fa4651065100b6c1faee6dfe9b68ae0035ac7ce6dc2

data/lib/human_sql/version.rb

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

data/lib/human_sql.rb

@@ -7,7 +7,7 @@ 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'))
@@ -19,8 +19,11 @@ module HumanSQL
 
     def generate_query
       prompt = build_query_prompt(@user_input, @schema_content)
+
       generated_query_response = call_openai_service(prompt)&.strip
-      extract_active_record_query(generated_query_response)
+      extracted_query = extract_active_record_query(generated_query_response)
+      
+      extracted_query
     end
 
     def get_results
@@ -32,6 +35,7 @@ module HumanSQL
 
       formatted_results = format_results_for_openai(results)
       natural_language_response = generate_natural_language_response(formatted_results, @user_input)
+
       natural_language_response
     rescue StandardError => e
       process_error_in_natural_language(e.message)
@@ -40,7 +44,7 @@ module HumanSQL
     private
 
     def build_query_prompt(user_input, schema_content)
-      <<-PROMPT
+      prompt = <<-PROMPT
         The user has requested: "#{user_input}".
         This is the database schema:
 
@@ -49,11 +53,12 @@ module HumanSQL
         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.
       PROMPT
+      prompt
     end
 
     def call_openai_service(prompt)
       body = {
-        model: "gpt-4",
+        model: "gpt-4o-mini",
         messages: [
           {
             role: "system",
@@ -84,12 +89,14 @@ module HumanSQL
         response_body = JSON.parse(response.body)
         response_body.dig('choices', 0, 'message', 'content')
       else
-        raise "Error in OpenAI API: #{response.code} - #{response.body}"
+        error_message = "Error in OpenAI API: #{response.code} - #{response.body}"
+        raise error_message
       end
     end
 
     def extract_active_record_query(response)
       return nil if response.blank?
+
       code_lines = response.lines.select { |line| line.strip.match(/^[A-Za-z]\w*\./) }
       return nil if code_lines.empty?
       code_lines.join("\n").strip
@@ -103,15 +110,17 @@ module HumanSQL
 
     def format_results_for_openai(results)
       if results.is_a?(ActiveRecord::Relation) || results.is_a?(Array)
-        results.map do |result|
+        formatted = results.map do |result|
           if result.respond_to?(:attributes)
             result.attributes.map { |key, value| "#{key}: #{value}" }.join(', ')
           else
             result.to_s
           end
         end.join("\\n")
+        formatted
       else
-        results.respond_to?(:attributes) ? results.attributes.map { |key, value| "#{key}: #{value}" }.join(', ') : results.to_s
+        formatted = results.respond_to?(:attributes) ? results.attributes.map { |key, value| "#{key}: #{value}" }.join(', ') : results.to_s
+        formatted
       end
     end
 
@@ -123,6 +132,7 @@ module HumanSQL
         #{formatted_results}
 
         Please generate a natural language description that clearly and understandably explains these results to the user in #{HumanSQLConfig[:default_language]}.
+        Do not ask for confirmation, just confirm what has already been done.
       PROMPT
 
       call_openai_service(prompt)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: human_sql
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Nicolas Bertin
@@ -55,6 +55,8 @@ files:
 - human_sql-0.1.1.gem
 - human_sql-0.1.2.gem
 - human_sql-0.1.3.gem
+- human_sql-0.1.4.gem
+- human_sql-0.1.5.gem
 - lib/human_sql.rb
 - lib/human_sql/version.rb
 - sig/human_sql.rbs