quillsql 1.7__tar.gz → 1.9__tar.gz

{quillsql-1.7 → quillsql-1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quillsql
-Version: 1.7
+Version: 1.9
 Summary: Quill SDK for Python.
 Home-page: https://github.com/quill-sql/quill-python
 Author: Quill

{quillsql-1.7 → quillsql-1.9}/quillsql/core.py

@@ -7,8 +7,8 @@ import redis
 from psycopg2.extensions import make_dsn
 
 ## The host url of the Quill metadata server
-# HOST = "https://quill-344421.uc.r.appspot.com"  # or "http://localhost:8080"
-HOST = "http://localhost:8080"
+HOST = "https://quill-344421.uc.r.appspot.com"  # or "http://localhost:8080"
+# HOST = "http://localhost:8080"
 
 
 ## The TTL for new cache entries (default: 1h)
@@ -43,7 +43,8 @@ class CachedPool:
 
     def exec(self, sql):
         self.cur.execute(sql)
-        return self.cur.fetchall()
+        rows = self.cur.fetchall()
+        return [json.loads(json.dumps(row, default=str)) for row in rows]
 
     def query(self, sql):
         if not self.cache:
@@ -89,7 +90,7 @@ def handleQueryTask(org_id, metadata, private_key, target_pool):
 
     formatted_result = {
         "fields": fields,
-        "rows": [dict(zip(names, row)) for row in query_result],
+        "rows": [dict(row) for row in query_result],
     }
 
     for row in formatted_result["rows"]:
@@ -128,6 +129,8 @@ def handleConfigTask(org_id, metadata, private_key, target_pool):
     if not dash_config:
         dash_config["filters"] = []
 
+    # TODO: MOVE TO DATABASE LEVEL
+    # dash_config["dateFilter"]["comparison"] = True
     return dash_config
 
 
@@ -187,14 +190,7 @@ def handleItemTask(org_id, metadata, private_key, target_pool):
     cursor = target_pool.cursor()
 
     query_result = target_pool.query(response_data["query"])
-
-    if "compareQuery" in response_data:
-        compare_rows_result = target_pool.query(response_data["compareQuery"])
-    columns = [desc[0] for desc in cursor.description]
-
-    if compare_rows_result:
-        compare_rows = [dict(zip(columns, row)) for row in compare_rows_result]
-    rows = [dict(json.loads(json.dumps(row, default=str))) for row in query_result]
+    rows = [dict(row) for row in query_result]
     fields = [
         {"name": desc[0], "dataTypeID": desc[1]}
         for desc in cursor.description
@@ -205,21 +201,21 @@ def handleItemTask(org_id, metadata, private_key, target_pool):
         if field_to_remove in row:
             del row[field_to_remove]
 
-    if compare_rows:
+    compare_rows = None
+    if "compareQuery" in response_data:
+        compare_rows_result = target_pool.query(response_data["compareQuery"])
+        compare_rows = [dict(row) for row in compare_rows_result]
         for row in compare_rows:
             row = {key: value for key, value in row.items() if key != field_to_remove}
             if field_to_remove in row:
                 del row[field_to_remove]
-
-    if compare_rows:
-        return {
-            **resp_data,
-            "fields": fields,
-            "compareRows": compare_rows,
-            "rows": sorted(rows, key=lambda x: x[resp_data["dateField"]["field"]]),
-        }
-    else:
-        return {**resp_data, "fields": fields, "rows": rows}
+    
+    return {
+        **resp_data,
+        "fields": fields,
+        "rows": rows,
+        **({ "comparisonRows": compare_rows } if compare_rows else {})
+    }
 
 
 ## handles org tasks

{quillsql-1.7 → quillsql-1.9}/quillsql.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quillsql
-Version: 1.7
+Version: 1.9
 Summary: Quill SDK for Python.
 Home-page: https://github.com/quill-sql/quill-python
 Author: Quill

{quillsql-1.7 → quillsql-1.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="quillsql",
-    version="1.7",  # v0.3.0 for parity
+    version="1.9",  # v0.3.0 for parity
     packages=find_packages(),
     install_requires=[
         "psycopg2-binary",

{quillsql-1.7 → quillsql-1.9}/tests/simple_test.py

@@ -61,25 +61,6 @@ def test_config_gets_admin_metadata():
         assert "customer_id" not in row
 
 
-# def test_config_gets_admin_metadata_2():
-#     res = quill.query(
-#         org_id="2",
-#         data={
-#             "metadata": {
-#                 "id": "65895d225cd2e8cb2bd8542d",
-#                 "orgId": "2",
-#                 "clientId": "6579031b3e41c378aa8180ec",
-#                 "task": "item",
-#                 "filters": [],
-#             }
-#         },
-#     )
-
-#     print(res)
-#     assert res is not None
-#     assert "rows" in res
-
-
 def test_handles_empty_client_id():
     res = quill.query(
         org_id="2",
@@ -285,7 +266,6 @@ def test_view_works_correctly_with_clientId():
         },
     )
 
-    print(res)
     assert res is not None
     assert "errorMessage" not in res
     assert "code" in res