rails-nl2sql 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9723feb23a2bc5f1100279427d18b106964382689ade9c37b379cda0274e0a77
-  data.tar.gz: 9e4a429bc94b4f5d865e9efde2c19da5b6d9a775ffaf982e7ab1fe3070aa75f0
+  metadata.gz: 4c85af69e2b9d5c60665676f6b1aa853220bb44e98484bd0968b9e659528fa31
+  data.tar.gz: 8423aaec96729c329dad2fe601ba11ef84545054f84ab1f3e0fc32ac181a7a8f
 SHA512:
-  metadata.gz: 24b563aeed1df87e3afc4683230471e18351e364794989791dd28e2057d8db42cd3a083b678640ac74dfff6bb4d4c28573ea6efa955ee1faae29d1dd2fc3984a
-  data.tar.gz: 74aa67f890208d440baaae2f863e6d92cc04d00c9ffc0012e14239e5f5bc0d2807cc170b460cba6c95c487812c9960209b6e1a7bf76ec238c8d63df342855e2b
+  metadata.gz: 91739a9e2c4456f0232da6f614a5f9b7647b77267bc8d9eb49b3bb36a7d64542cca9ebf5e02897424bd8dc68b20a71a2d336ffd7eededd3b4b05cc2879d25fd4
+  data.tar.gz: 4e4540b9939bbb22bb093cf15482215016817b5cee95dbefaf6713cce048e5464136c62aeef0116659f378f020443e409b92d927bd4755a22c2c3829d6c9d022

data/lib/rails/nl2sql/query_generator.rb

@@ -27,6 +27,9 @@ module Rails
 
         generated_query = response.dig("choices", 0, "text")&.strip
         
+        # Clean up the response to remove markdown formatting
+        generated_query = clean_sql_response(generated_query)
+        
         # Safety check
         validate_query_safety(generated_query)
         
@@ -92,7 +95,7 @@ module Rails
              * This is essential
           6. **Ambiguity:** If a user question is ambiguous or requires more information to form a precise SQL query, clearly state that you need clarification and ask for more details. Do not guess.
           
-          **RESPOND WITH ONLY THE SQL QUERY - NO EXPLANATIONS OR ADDITIONAL TEXT.**
+          **RESPOND WITH ONLY THE SQL QUERY - NO EXPLANATIONS, NO MARKDOWN FORMATTING, NO CODE BLOCKS, NO ADDITIONAL TEXT.**
         PROMPT
       end
 
@@ -103,6 +106,45 @@ module Rails
         PROMPT
       end
 
+      def clean_sql_response(query)
+        return query unless query
+
+        # Remove markdown code blocks
+        query = query.gsub(/```sql\n?/, '')
+        query = query.gsub(/```\n?/, '')
+        
+        # Remove any leading/trailing whitespace
+        query = query.strip
+        
+        # Remove any explanatory text before or after the query
+        # Look for common patterns like "Here's the SQL query:" or "The query is:"
+        query = query.gsub(/^.*?(SELECT|WITH|INSERT|UPDATE|DELETE|CREATE|DROP|ALTER)/i, '\1')
+        
+        # Remove any trailing explanatory text after the query
+        # Split by newlines and take only the SQL part
+        lines = query.split("\n")
+        sql_lines = []
+        
+        lines.each do |line|
+          line = line.strip
+          # Skip empty lines or lines that look like explanations
+          next if line.empty?
+          next if line.match(/^(here|this|the query|explanation|note)/i)
+          
+          sql_lines << line
+        end
+        
+        # Rejoin the SQL lines
+        cleaned_query = sql_lines.join("\n").strip
+        
+        # Ensure it ends with a semicolon if it's a complete query
+        if cleaned_query.match(/^(SELECT|WITH)/i) && !cleaned_query.end_with?(';')
+          cleaned_query += ';'
+        end
+        
+        cleaned_query
+      end
+
       def validate_query_safety(query)
         return unless query
 

data/lib/rails/nl2sql/query_validator.rb

@@ -2,17 +2,36 @@ module Rails
   module Nl2sql
     class QueryValidator
       def self.validate(query)
+        return false unless query && !query.strip.empty?
+        
+        # Clean the query first
+        query = query.strip
+        
+        # Check if query is malformed (contains markdown or other formatting)
+        if query.include?('```') || query.include?('```sql')
+          raise Rails::Nl2sql::Error, "Query contains markdown formatting and could not be cleaned properly"
+        end
+        
         # Basic validation: prevent destructive commands
-        disallowed_keywords = %w(DROP DELETE UPDATE INSERT TRUNCATE ALTER CREATE)
-        if disallowed_keywords.any? { |keyword| query.upcase.include?(keyword) }
-          raise "Query contains disallowed keywords."
+        disallowed_keywords = %w(DROP DELETE UPDATE INSERT TRUNCATE ALTER CREATE EXEC EXECUTE MERGE REPLACE)
+        query_upper = query.upcase
+        
+        if disallowed_keywords.any? { |keyword| query_upper.include?(keyword) }
+          raise Rails::Nl2sql::Error, "Query contains disallowed keywords."
+        end
+
+        # Ensure it's a SELECT query
+        unless query_upper.strip.start_with?('SELECT', 'WITH')
+          raise Rails::Nl2sql::Error, "Only SELECT queries are allowed."
         end
 
-        # Use Rails' built-in sanitization to be safe
+        # Use Rails' built-in validation with EXPLAIN
         begin
-          ActiveRecord::Base.connection.execute("EXPLAIN #{query}")
+          # Remove trailing semicolon for EXPLAIN
+          explain_query = query.gsub(/;\s*$/, '')
+          ActiveRecord::Base.connection.execute("EXPLAIN #{explain_query}")
         rescue ActiveRecord::StatementInvalid => e
-          raise "Invalid SQL query: #{e.message}"
+          raise Rails::Nl2sql::Error, "Invalid SQL query: #{e.message}"
         end
 
         true

data/lib/rails/nl2sql/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Nl2sql
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-nl2sql
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Russell Van Curen