quillsql 2.2.2__py3-none-any.whl → 2.2.4__py3-none-any.whl

quillsql/core.py

@@ -129,13 +129,14 @@ class Quill:
                     return {
                         "status": "error",
                         "error": pivot_template_response.get("error"),
-                        "data": pivot_template_response.get("metadata") or {},
+                        "data": (pivot_template_response.get("metadata") or {}),
                     }
 
-                template = pivot_template_response.get("metadata", {}).get("template")
-                config = pivot_template_response.get("metadata", {}).get("config")
-                distinct_values_query = pivot_template_response.get("metadata", {}).get("distinctValuesQuery")
-                row_count_query = pivot_template_response.get("metadata", {}).get("rowCountQuery")
+                pivot_metadata = pivot_template_response.get("metadata") or {}
+                template = pivot_metadata.get("template")
+                config = pivot_metadata.get("config") or {}
+                distinct_values_query = pivot_metadata.get("distinctValuesQuery")
+                row_count_query = pivot_metadata.get("rowCountQuery")
 
                 # Step 2: Run the distinct values query to get unique values
                 distinct_values = []
@@ -180,10 +181,10 @@ class Quill:
                     self.target_connection.database_type,
                     metadata.get("databaseType"),
                     metadata,
-                    pivot_template_response.get("metadata", {}).get("runQueryConfig")
+                    pivot_metadata.get("runQueryConfig"),
                 )
 
-                responseMetadata = pivot_template_response.get("metadata") or {}
+                responseMetadata = pivot_metadata or {}
                 # Set rows and fields from first query result (the pivot query)
                 if final_results.get("queryResults") and len(final_results["queryResults"]) >= 1:
                     query_results = final_results["queryResults"][0]
@@ -228,7 +229,7 @@ class Quill:
                     return {
                         'status': 'error',
                         'error': response.get('error'),
-                        'data': response.get('metadata') or {},
+                        'data': (response.get('metadata') or {}),
                     }
                 
                 flag_query_results = self.run_queries(
@@ -236,16 +237,23 @@ class Quill:
                     self.target_connection.database_type,
                 )
                 
-                tenant_flags = [
-                    {
-                        'tenantField': tenant_field,
-                        'flags': list(set(row['quill_flag'] for row in query_result['rows']))
+                tenant_flags = []
+                response_metadata = response.get('metadata') or {}
+                query_order = response_metadata.get('queryOrder') or []
+                query_results = (flag_query_results or {}).get('queryResults') or []
+                for tenant_field, query_result in zip(query_order, query_results):
+                    rows = []
+                    if isinstance(query_result, dict):
+                        rows = query_result.get('rows') or []
+                    flags = {
+                        row.get('quill_flag')
+                        for row in rows
+                        if isinstance(row, dict) and row.get('quill_flag') is not None
                     }
-                    for tenant_field, query_result in zip(
-                        response['metadata']['queryOrder'],
-                        flag_query_results['queryResults']
-                    )
-                ]
+                    tenant_flags.append({
+                        'tenantField': tenant_field,
+                        'flags': list(flags),
+                    })
             elif tenants[0] == SINGLE_TENANT and flags:
                 if flags and isinstance(flags[0], dict):
                     tenant_flags = [{'tenantField': SINGLE_TENANT, 'flags': flags}]
@@ -330,14 +338,18 @@ class Quill:
                     normalized_results.get("queryResults") or []
                 )
 
-            if (
-                normalized_results.get("mapped_array")
-                and responseMetadata.get("runQueryConfig", {}).get("arrayToMap")
-            ):
-                array_to_map = responseMetadata["runQueryConfig"]["arrayToMap"]
-                for index, mapped_rows in enumerate(normalized_results["mapped_array"]):
-                    responseMetadata[array_to_map["arrayName"]][index][array_to_map["field"]] = mapped_rows
-                del normalized_results["mapped_array"]
+            run_query_config = responseMetadata.get("runQueryConfig") or {}
+            array_to_map = run_query_config.get("arrayToMap")
+            if normalized_results.get("mapped_array") and array_to_map:
+                target_collection = responseMetadata.get(array_to_map.get("arrayName"))
+                if isinstance(target_collection, list):
+                    for index, mapped_rows in enumerate(normalized_results["mapped_array"]):
+                        if index >= len(target_collection):
+                            continue
+                        target_entry = target_collection[index]
+                        if isinstance(target_entry, dict):
+                            target_entry[array_to_map.get("field")] = mapped_rows
+                normalized_results.pop("mapped_array", None)
 
             query_results_list = normalized_results.get("queryResults") or []
             if len(query_results_list) == 1:

{quillsql-2.2.2.dist-info → quillsql-2.2.4.dist-info}/METADATA

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

{quillsql-2.2.2.dist-info → quillsql-2.2.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 quillsql/__init__.py,sha256=FiuoxaNZveKXOPB0hkpfGNlpZKmSn3pRwcqm9HKYbCQ,180
-quillsql/core.py,sha256=TaQ-1dKyHfR8xxDup_CogPp66MvnKwFWJV00sg61jVY,22596
+quillsql/core.py,sha256=HMmRtQQj3bWuLTIE8YuZaj6cAwh4bSui3pFe9pA9SgQ,23261
 quillsql/error.py,sha256=n9VKHw4FAgg7ZEAz2YQ8L_8FdRG_1shwGngf2iWhUSM,175
 quillsql/assets/__init__.py,sha256=oXQ2ZS5XDXkXTYjADxNfGt55cIn_rqfgWL2EDqjTyoI,45
 quillsql/assets/pgtypes.py,sha256=-B_2wUaoAsdX7_HnJhUlx4ptZQ6x-cXwuST9ACgGFdE,33820
@@ -14,7 +14,7 @@ quillsql/utils/pivot_template.py,sha256=NzHO7Ux8GVAKY-DUtsOmE7TUls2q6FJG2kgJxVWq
 quillsql/utils/run_query_processes.py,sha256=FRmNvjTDLUBr7MqDKQmivdC0anwybMXUyzQbKnaZx70,698
 quillsql/utils/schema_conversion.py,sha256=TFfMibN9nOsxNRhHw5YIFl3jGTvipG81bxX4LFDulUY,314
 quillsql/utils/tenants.py,sha256=ZD2FuKz0gjBVSsThHDv1P8PU6EL8E009NWihE5hAH-Q,2022
-quillsql-2.2.2.dist-info/METADATA,sha256=-6MvxXsVJQFJRkorVZXkggWzoyguME6bfnoHjYUbzD4,1786
-quillsql-2.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-quillsql-2.2.2.dist-info/top_level.txt,sha256=eU2vHnVqwpYQJ3ADl1Q-DIBzbYejZRUhcMdN_4zMCz8,9
-quillsql-2.2.2.dist-info/RECORD,,
+quillsql-2.2.4.dist-info/METADATA,sha256=wEywCChkWsaEmZezh0DCkKUXHkgGLv0RR3OzCgEEWk0,1786
+quillsql-2.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+quillsql-2.2.4.dist-info/top_level.txt,sha256=eU2vHnVqwpYQJ3ADl1Q-DIBzbYejZRUhcMdN_4zMCz8,9
+quillsql-2.2.4.dist-info/RECORD,,