quillsql 0.6__tar.gz → 0.8__tar.gz

{quillsql-0.6 → quillsql-0.8}/PKG-INFO

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

{quillsql-0.6 → quillsql-0.8}/quillsql/core.py

@@ -42,18 +42,16 @@ class Quill:
 
                 field_to_remove = response_data.get("fieldToRemove")
 
-                print('response_data', response_data)
                 cursor = target_pool.cursor()
                 cursor.execute(response_data["query"])
                 query_result = cursor.fetchall()
-                print('testing', query_result)
                 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)
+                # 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": fields,
                     "rows": [dict(zip(names, row)) for row in query_result],
@@ -154,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
@@ -167,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.6 → quillsql-0.8}/quillsql.egg-info/PKG-INFO

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

{quillsql-0.6 → quillsql-0.8}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="quillsql",
-    version="0.6",
+    version="0.8",
     packages=find_packages(),
     install_requires=["psycopg2-binary", "requests"],
     author="Quill",