quillsql 0.2__tar.gz → 0.3__tar.gz

{quillsql-0.2/quillsql.egg-info → quillsql-0.3}/PKG-INFO

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

{quillsql-0.2 → quillsql-0.3}/quill-python/core.py

@@ -1,7 +1,6 @@
 import psycopg2
 import requests
 
-
 class Quill:
     def __init__(
         self,
@@ -14,28 +13,27 @@ class Quill:
 
     def query(self, org_id, data):
         metadata = data["metadata"]
-
+        
         target_pool = self.main_pool
         task = metadata["task"]
-        query = metadata["id"]
 
         headers = {"Authorization": f"Bearer {self.private_key}"}
 
         if task == "query":
-            url = "https://quill-344421.uc.r.appspot.com/validate"
-            headers = {
-                "Authorization": f"Bearer {self.private_key}",
-            }
-            params = {
-                "orgId": org_id,
-            }
-            response = requests.post(
-                url, json={"query": query}, headers=headers, params=params
-            )
-            response_data = response.json()
-            field_to_remove = response_data.get("fieldToRemove")
-
             try:
+                url = "https://quill-344421.uc.r.appspot.com/validate"
+                headers = {
+                    "Authorization": f"Bearer {self.private_key}",
+                }
+                params = {
+                    "orgId": org_id,
+                }
+                response = requests.post(
+                    url, json={"query": metadata.get("query")}, headers=headers, params=params
+                )
+                response_data = response.json()
+                field_to_remove = response_data.get("fieldToRemove")
+
                 cursor = target_pool.cursor()
                 cursor.execute(response_data["query"])
                 query_result = cursor.fetchall()
@@ -53,59 +51,73 @@ class Quill:
                 return formatted_result
 
             except Exception as err:
-                return {"error": True, "errorMessage": str(err)}
+                return {"error": str(err), "errorMessage": str(err) if err else ""}
 
         elif task == "config":
-            response = requests.get(
-                "https://quill-344421.uc.r.appspot.com/config",
-                params={
-                    "orgId": org_id,
-                    "name": metadata.get("name") if metadata else None,
-                },
-                headers={
-                    "Authorization": f"Bearer {self.private_key}",
-                },
-            )
-            dash_config = response.json()
+            try:
+                response = requests.get(
+                    "https://quill-344421.uc.r.appspot.com/config",
+                    params={
+                        "orgId": org_id,
+                        "name": metadata.get("name")
+                    },
+                    headers={
+                        "Authorization": f"Bearer {self.private_key}",
+                    },
+                )
+                dash_config = response.json()
 
-            if dash_config["filters"]:
-                for i, filter in enumerate(dash_config["filters"]):
-                    # run query
-                    cursor = target_pool.cursor()
-                    cursor.execute(filter["query"])
-                    rows = cursor.fetchall()
+                if dash_config and dash_config["filters"]:
+                    for i, filter in enumerate(dash_config["filters"]):
+                        # run query
+                        cursor = target_pool.cursor()
+                        cursor.execute(filter["query"])
+                        rows = cursor.fetchall()
 
-                    # Update the options for each filter with the rows
-                    dash_config["filters"][i]["options"] = rows
+                        # Update the options for each filter with the rows
+                        dash_config["filters"][i]["options"] = rows
 
-            return dash_config
+                return dash_config
+            
+            except Exception as err:
+                return {"error": str(err), "errorMessage": str(err) if err else ""}
 
         elif task == "create":
-            response = requests.post(
-                "https://quill-344421.uc.r.appspot.com/item",
-                json=metadata,
-                params={"orgId": org_id},
-                headers=headers,
-            ).json()
+            try:
+                response = requests.post(
+                    "https://quill-344421.uc.r.appspot.com/item",
+                    json=metadata,
+                    params={"orgId": org_id},
+                    headers=headers,
+                ).json()
 
-            return response
+                return response
+            except:
+                return {"error": str(err), "errorMessage": str(err) if err else ""}
 
         elif task == "item":
             try:
                 resp = requests.get(
                     "https://quill-344421.uc.r.appspot.com/selfhostitem",
-                    params={"id": id, "orgId": org_id},
+                    params={"id": metadata.get("id"), "orgId": org_id},
                     headers={"Authorization": f"Bearer {self.private_key}"},
                 )
                 resp_data = resp.json()
+                data_to_send = {
+                "query": resp_data["queryString"],
+                "orgId": org_id,
+                "filters": metadata.get("filters")
+                }
+
                 response = requests.post(
                     "https://quill-344421.uc.r.appspot.com/validate",
-                    json={"query": resp_data["queryString"]},
-                    params={"orgId": org_id},
-                    headers={"Authorization": f"Bearer {self.private_key}"},
+                    json=data_to_send,
+                    headers={"Authorization": f"Bearer {self.private_key}"}
                 )
                 response_data = response.json()
-                field_to_remove = response_data["fieldToRemove"]
+                
+
+                field_to_remove = response_data["fieldToRemove"] if response_data["fieldToRemove"] else None
 
                 with target_pool.cursor() as cursor:
                     cursor.execute(response_data["query"])
@@ -125,4 +137,4 @@ class Quill:
                 return {**resp_data, "fields": fields, "rows": rows}
 
             except Exception as err:
-                return {"error": str(err), "errorMessage": str(err) if err else ""}
+                return {"error": str(err), "errorMessage": str(err) if err else ""}

{quillsql-0.2 → quillsql-0.3/quillsql.egg-info}/PKG-INFO

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

quillsql-0.3/quillsql.egg-info/requires.txt

@@ -0,0 +1,2 @@
+psycopg2-binary
+requests

{quillsql-0.2 → quillsql-0.3}/setup.py

@@ -2,9 +2,9 @@ from setuptools import setup, find_packages
 
 setup(
     name="quillsql",
-    version="0.2",
+    version="0.3",
     packages=find_packages(),
-    install_requires=["psycopg2", "requests"],
+    install_requires=["psycopg2-binary", "requests"],
     author="Quill",
     author_email="shawn@quillsql.com",
     description="Quill SDK for Python.",

quillsql-0.2/quillsql.egg-info/requires.txt

@@ -1,2 +0,0 @@
-psycopg2
-requests