quillsql 0.5__py3-none-any.whl → 0.8__py3-none-any.whl

quillsql/core.py

@@ -13,18 +13,22 @@ class Quill:
 
     def query(self, org_id, data):
         metadata = data["metadata"]
+
         
         target_pool = self.main_pool
         task = metadata["task"]
+        print("task", task)
+       
 
         headers = {"Authorization": f"Bearer {self.private_key}"}
 
         if task == "query":
             try:
+                query = metadata["query"]
 
                 url = "https://quill-344421.uc.r.appspot.com/validate"
                 headers = {
-                    "Authorization": f"Bearer {private_key}"
+                    "Authorization": f"Bearer {self.private_key}"
                 }
 
                 data = {
@@ -41,16 +45,27 @@ class Quill:
                 cursor = target_pool.cursor()
                 cursor.execute(response_data["query"])
                 query_result = cursor.fetchall()
-                columns = [desc[0] for desc in cursor.description]
+                names = [desc[0] for desc in cursor.description]
+                fields = [{"name": desc[0], "dataTypeID": desc[1]} for desc in cursor.description if desc[0] != field_to_remove]
+                # rearrange_fields = any(field["dataTypeID"] == 1082 or field["name"] == "created_at" for field in fields)
+                # if rearrange_fields:
+                #     # Sort fields so that the entry with dataTypeID = 1082 or name "created_at" is the first element
+                #     fields.sort(key=lambda x: (x["dataTypeID"] != 1082, x["name"] != "created_at"))
+                # fields.sort(key=lambda x: x["dataTypeID"] != 1082)
                 formatted_result = {
-                    "fields": [col for col in columns if col != field_to_remove],
-                    "rows": [dict(zip(columns, row)) for row in query_result],
+                    "fields": fields,
+                    "rows": [dict(zip(names, row)) for row in query_result],
                 }
 
                 # Remove the undesired field from the row dictionaries
                 for row in formatted_result["rows"]:
                     if field_to_remove in row:
                         del row[field_to_remove]
+                    row['created_at'] = row['created_at'].strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z'
+
+                
+
+                print('formatted result', formatted_result)
 
                 return formatted_result
 
@@ -59,6 +74,7 @@ class Quill:
 
         elif task == "config":
             try:
+                print('here we are in config')
                 response = requests.get(
                     "https://quill-344421.uc.r.appspot.com/config",
                     params={
@@ -71,9 +87,13 @@ class Quill:
                 )
                 dash_config = response.json()
 
+                print('common sense')
+
+               
                 if dash_config and dash_config["filters"]:
                     for i, filter in enumerate(dash_config["filters"]):
                         # run query
+                        print('stuff', dash_config)
                         cursor = target_pool.cursor()
                         cursor.execute(filter["query"])
                         rows = cursor.fetchall()
@@ -81,6 +101,9 @@ class Quill:
                         # Update the options for each filter with the rows
                         dash_config["filters"][i]["options"] = rows
 
+                if not dash_config:
+                    dash_config["filters"] = []
+                    
                 return dash_config
             
             except Exception as err:
@@ -88,6 +111,7 @@ class Quill:
 
         elif task == "create":
             try:
+                print('check create', metadata, org_id)
                 response = requests.post(
                     "https://quill-344421.uc.r.appspot.com/item",
                     json=metadata,
@@ -96,7 +120,7 @@ class Quill:
                 ).json()
 
                 return response
-            except:
+            except Exception as err:
                 return {"error": str(err), "errorMessage": str(err) if err else ""}
 
         elif task == "item":
@@ -128,7 +152,7 @@ class Quill:
                     query_result = cursor.fetchall()
                     columns = [desc[0] for desc in cursor.description]
                     rows = [dict(zip(columns, row)) for row in query_result]
-                    fields = [column for column in columns if column != field_to_remove]
+                    fields = [{"name": desc[0], "dataTypeID": desc[1]} for desc in cursor.description if desc[0] != field_to_remove]
                     rows = [
                         {
                             key: value
@@ -141,4 +165,73 @@ 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 ""}
+            
+        elif task == "view":
+            print('inside of view')
+            query = metadata.get("query", None)
+            name = metadata.get("name", None)
+            id = metadata.get("id", None)
+            deleted = metadata.get("deleted", None)
+            try:
+                if query and not deleted:
+                    with target_pool.cursor() as cursor:
+                        cursor.execute(query)
+                        query_result = cursor.fetchall()
+                        cursor.execute("select typname, oid, typarray from pg_type order by oid;")
+                        types_query = cursor.fetchall()
+
+
+
+                if (id and deleted):
+                    table_post = {"id": id, "deleted": deleted}
+                elif (id):
+                    fields = [{"name": desc[0], "dataTypeID": desc[1]} for desc in cursor.description]
+                    print('almost there')
+                    table_post = {
+                        "id": id,
+                        "name": name,
+                        "isVisible": True,
+                        "viewQuery": query,
+                        "columns": [
+                            {
+                                "fieldType": next((type[0] for type in types_query if field['dataTypeID'] == type[2]), None),
+                                "name": field['name'],
+                                "displayName": field['name'],
+                                "isVisible": True
+                            }
+                            for field in fields
+                        ]
+                    }
+                else:
+                    fields = [{"name": desc[0], "dataTypeID": desc[1]} for desc in cursor.description if desc[0]]
+                    table_post = {
+                        "name": name,
+                        "isVisible": True,
+                        "viewQuery": query,
+                        "columns": [
+                            {
+                                "fieldType": next((type[0] for type in types_query if field['dataTypeID'] == type[2]), None),
+                                "name": field['name'],
+                                "displayName": field['name'],
+                                "isVisible": True
+                            }
+                            for field in fields
+                        ]
+                    }
+
+                response = requests.post(
+                    "http://localhost:8080/createtable",
+                    json=table_post,
+                    headers={"Authorization": f"Bearer {self.private_key}"}
+                )
+                response_data = response.json()
+                
+                return response_data
+
+            except Exception as e:
+                print(f"An error occurred: {e}")
+    # Optionally, re-raise the error if you want it to be handled by an upper layer or if you want the program to exit
+    # raise
+
+        

{quillsql-0.5.dist-info → quillsql-0.8.dist-info}/METADATA

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

quillsql-0.8.dist-info/RECORD

@@ -0,0 +1,7 @@
+quillsql/__init__.py,sha256=IgJnPRLx5GcenVt82mMQo0ydvXYB_-39Ft4Of5sEEGA,39
+quillsql/core.py,sha256=dsEHtdi-pcVReDp1MdXMCKoFHyn4YXC4sjsGq6h-B9A,9465
+quillsql-0.8.dist-info/LICENSE,sha256=f2-T2fNvArbqfNW8RwsOu2IWEwpsaRX6G-AJvLJKuzg,1068
+quillsql-0.8.dist-info/METADATA,sha256=KHos9m3vUMS5cvXrJQcTxY-HHXd0_QR7BVBRKIL8iWM,320
+quillsql-0.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+quillsql-0.8.dist-info/top_level.txt,sha256=eU2vHnVqwpYQJ3ADl1Q-DIBzbYejZRUhcMdN_4zMCz8,9
+quillsql-0.8.dist-info/RECORD,,

quillsql-0.5.dist-info/RECORD

@@ -1,7 +0,0 @@
-quillsql/__init__.py,sha256=IgJnPRLx5GcenVt82mMQo0ydvXYB_-39Ft4Of5sEEGA,39
-quillsql/core.py,sha256=zcPE0LVh9n-DUvuS75kOV1ftoKiHPAlBKxdqhA1rhX4,5354
-quillsql-0.5.dist-info/LICENSE,sha256=f2-T2fNvArbqfNW8RwsOu2IWEwpsaRX6G-AJvLJKuzg,1068
-quillsql-0.5.dist-info/METADATA,sha256=uzLkAdYw-pAqzYPx6BZh66tkzVX1pnAEIsZCQp_odiw,320
-quillsql-0.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-quillsql-0.5.dist-info/top_level.txt,sha256=eU2vHnVqwpYQJ3ADl1Q-DIBzbYejZRUhcMdN_4zMCz8,9
-quillsql-0.5.dist-info/RECORD,,