human_sql 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28c8b51819d0630673469964904069f4dd8cfb31a76f9afe439f28f5184a6376
-  data.tar.gz: 9c17f374223cd3d1eecbe147eef5e926b03c36501b7c7188525549202d59d2a9
+  metadata.gz: e45103fa9637558a0eadf18130856bf6d53c2c33225315c80e90906962a68fd2
+  data.tar.gz: be46708a8723b7de39926eb7e8872d48466c70bd39700b1d36f7c1a01b1323a0
 SHA512:
-  metadata.gz: a0fa556ecb44c2151999eb741a128fc00846d645e31652940c292a4fe2172df3a9088a5b470ec68f352f0d5675633e4ed078fcadd427e18752e92cf90244646d
-  data.tar.gz: a712c3f78aa08d7c86ddcbd4e7c83e5abf9fde5cb6fca298fdbec80d977bd6bf89fd0cb49ab75f52852b647519a9e0142066a03d5197f7aaf460ad4f27efc767
+  metadata.gz: cd1cfee88517e5bb5613227f790a3396f6a4e05df8a28cb96a4fb85c4fb1606916995c72490f4af52e63bfda794c14c4430942499576c28390df62e25405a9fd
+  data.tar.gz: a6782bb601f3437ec6cf7ccd6b11893b51861431501c5f4b003200ab29080a6094261a2f6bdb90edd6977722bb2a3bcec68180f1415a24a989795398c8d01f2c

data/lib/human_sql/version.rb

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

data/lib/human_sql.rb

@@ -28,9 +28,13 @@ module HumanSQL
       raise "Could not generate a valid query." if generated_query.blank?
 
       results = execute_query(generated_query)
+      raise "No results found." if results.blank?
+
       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)
     end
 
     private
@@ -53,7 +57,7 @@ module HumanSQL
         messages: [
           {
             role: "system",
-            content: "You are an assistant that converts natural language into ActiveRecord queries. The queries must be in a single line of code."
+            content: "You are an assistant that converts natural language into ActiveRecord queries and explains results in natural language."
           },
           {
             role: "user",
@@ -93,13 +97,13 @@ module HumanSQL
 
     def execute_query(generated_query)
       eval(generated_query)
-    rescue StandardError => e
+    rescue StandardError
       nil
     end
 
     def format_results_for_openai(results)
       if results.is_a?(ActiveRecord::Relation) || results.is_a?(Array)
-        formatted_results = results.map do |result|
+        results.map do |result|
           if result.respond_to?(:attributes)
             result.attributes.map { |key, value| "#{key}: #{value}" }.join(', ')
           else
@@ -107,9 +111,8 @@ module HumanSQL
           end
         end.join("\\n")
       else
-        formatted_results = results.respond_to?(:attributes) ? results.attributes.map { |key, value| "#{key}: #{value}" }.join(', ') : results.to_s
+        results.respond_to?(:attributes) ? results.attributes.map { |key, value| "#{key}: #{value}" }.join(', ') : results.to_s
       end
-      formatted_results.gsub("\n", "\\n")
     end
 
     def generate_natural_language_response(formatted_results, user_input)
@@ -119,10 +122,22 @@ module HumanSQL
 
         #{formatted_results}
 
-        Please generate a natural language description that clearly and understandably explains these results to the user in #{HumanSQLConfig[:default_language]} language.
+        Please generate a natural language description that clearly and understandably explains these results to the user in #{HumanSQLConfig[:default_language]}.
+      PROMPT
+
+      call_openai_service(prompt)
+    end
+
+    def process_error_in_natural_language(error_message)
+      prompt = <<-PROMPT
+        An error occurred while processing the user's query. The error is as follows:
+
+        "#{error_message}"
+
+        Please generate a natural language response that explains the error in a way that is understandable to the user.
       PROMPT
 
       call_openai_service(prompt)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: human_sql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nicolas Bertin