Update utils.py

utils.py

@@ -213,10 +213,10 @@ def construct_with_stats(final_query, subquery_info):
 
     with_as_statements = []
     for subquery_name, subquery in subquery_info.items():
-        with_as_statement = f"{subquery_name} AS (\n{subquery['result']}\n)"
+        with_as_statement = f"{subquery_name} AS (\n{subquery['result']}\n) \n--{subquery['description'].replace('\n',' ')}\n"
         with_as_statements.append(with_as_statement)
 
-    with_as_statement = ",\n".join(with_as_statements)
+    with_as_statement = "\n,\n".join(with_as_statements)
     
     if len(with_as_statements)>0:
       final_query_with_with_as = f"WITH {with_as_statement}\n{final_query}"
@@ -232,10 +232,16 @@ def get_subquery_info(json_response):
     subquery_keys = get_keys_matching_pattern(json_response, r'subquery\d+')
     return {key:json_response[key] for key in subquery_keys}
 
+def add_single_query_description(query, json_response):
+    if json_response.get("query",None)!=None:
+      query = f"{query}\n --{json_response['query']['description'].replace('\n',' ')}\n"
+    return query
+
 def construct_final_query(query, json_response):
     query = remove_with_as(query)
     subquery_info = get_subquery_info(json_response)
     final_query_with_with_as = construct_with_stats(query, subquery_info)
+    final_query_with_with_as = add_single_query_description(final_query_with_with_as, json_response)
     final_query_with_with_as = final_query_with_with_as.replace('\n\n','\n')
     final_query_with_with_as = sqlparse.format(final_query_with_with_as, reindent=True)
     return final_query_with_with_as