quillsql 2.2.1__tar.gz → 2.2.3__tar.gz

{quillsql-2.2.1 → quillsql-2.2.3}/PKG-INFO

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

{quillsql-2.2.1 → quillsql-2.2.3}/quillsql/core.py

@@ -113,8 +113,9 @@ class Quill:
                     **metadata,
                     "tenants": tenants,
                     "flags": flags,
-                    "adminEnabled": admin_enabled,
                 }
+                if admin_enabled is not None:
+                    pivot_payload["adminEnabled"] = admin_enabled
                 if filters is not None:
                     pivot_payload["sdkFilters"] = [
                         convert_custom_filter(f) for f in filters
@@ -212,17 +213,16 @@ class Quill:
                 tenants[0] != SINGLE_TENANT
             ):
                 
-                response = self.post_quill(
-                    'tenant-mapped-flags',
-                    {
-                        'reportId': metadata.get('reportId') or metadata.get('dashboardItemId'),
-                        'clientId': metadata.get('clientId'),
-                        'dashboardName': metadata.get('name'),
-                        'tenants': tenants,
-                        'flags': flags,
-                        'adminEnabled': admin_enabled,
-                    },
-                )
+                tenant_flags_payload = {
+                    'reportId': metadata.get('reportId') or metadata.get('dashboardItemId'),
+                    'clientId': metadata.get('clientId'),
+                    'dashboardName': metadata.get('name'),
+                    'tenants': tenants,
+                    'flags': flags,
+                }
+                if admin_enabled is not None:
+                    tenant_flags_payload['adminEnabled'] = admin_enabled
+                response = self.post_quill('tenant-mapped-flags', tenant_flags_payload)
                 
                 if response.get('error'):
                     return {
@@ -236,16 +236,22 @@ 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 = []
+                query_order = response.get('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}]
@@ -277,14 +283,15 @@ class Quill:
                 and metadata.get("runQueryConfig").get("getColumns")
                 else None
             )
-            payload = {
+            payload: dict = {
                 **metadata,
                 "tenants": tenants,
                 "flags": tenant_flags,
                 "viewQuery": view_query,
                 "preQueryResultsColumns": pre_query_columns,
-                "adminEnabled": admin_enabled,
             }
+            if admin_enabled is not None:
+                payload["adminEnabled"] = admin_enabled
             if filters is not None:
                 payload["sdkFilters"] = [convert_custom_filter(f) for f in filters]
             quill_results = self.post_quill(metadata.get("task"), payload)
@@ -329,17 +336,18 @@ class Quill:
                     normalized_results.get("queryResults") or []
                 )
 
-            if (
-                normalized_results.get("mapped_array")
-                and metadata.get("runQueryConfig", {}).get("arrayToMap")
-            ):
-                array_to_map = metadata["runQueryConfig"]["arrayToMap"]
-                for array, index in zip(
-                    normalized_results["mapped_array"],
-                    range(len(normalized_results["mapped_array"])),
-                ):
-                    responseMetadata[array_to_map["arrayName"]][index][array_to_map["field"]] = array
-                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:
@@ -354,15 +362,14 @@ class Quill:
 
         except Exception as err:
             if task == "update-view":
-                self.post_quill(
-                    "set-broken-view",
-                    {
-                        "table": metadata.get("name"),
-                        "clientId": metadata.get("clientId"),
-                        "error": str(err),
-                        "adminEnabled": admin_enabled,
-                    },
-                )
+                broken_view_payload = {
+                    "table": metadata.get("name"),
+                    "clientId": metadata.get("clientId"),
+                    "error": str(err),
+                }
+                if admin_enabled is not None:
+                    broken_view_payload["adminEnabled"] = admin_enabled
+                self.post_quill("set-broken-view", broken_view_payload)
             return {
                 "error": str(err).splitlines()[0],
                 "status": "error",

{quillsql-2.2.1 → quillsql-2.2.3}/quillsql.egg-info/PKG-INFO

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

{quillsql-2.2.1 → quillsql-2.2.3}/quillsql.egg-info/SOURCES.txt

@@ -20,4 +20,5 @@ quillsql/utils/filters.py
 quillsql/utils/pivot_template.py
 quillsql/utils/run_query_processes.py
 quillsql/utils/schema_conversion.py
-quillsql/utils/tenants.py
+quillsql/utils/tenants.py
+tests/test_core.py

{quillsql-2.2.1 → quillsql-2.2.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="quillsql",
-    version="2.2.1",
+    version="2.2.3",
     packages=find_packages(),
     install_requires=[
         "psycopg2-binary",

quillsql-2.2.3/tests/test_core.py

@@ -0,0 +1,53 @@
+import os
+import sys
+from unittest.mock import MagicMock, patch
+
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+
+from quillsql.core import Quill
+
+
+@patch("quillsql.core.CachedConnection")
+def test_query_handles_none_tenant_flag_responses(mock_cached_connection):
+    mock_connection = MagicMock()
+    mock_connection.database_type = "PostgreSQL"
+    mock_cached_connection.return_value = mock_connection
+
+    quill = Quill(
+        private_key="test-key",
+        database_type="PostgreSQL",
+        database_config={},
+    )
+
+    quill.run_queries = MagicMock(
+        side_effect=[
+            {"queryResults": [None]},
+            {"queryResults": []},
+        ]
+    )
+
+    def post_quill_side_effect(path, payload):
+        if path == "tenant-mapped-flags":
+            return {
+                "queries": [
+                    'SELECT * FROM (SELECT "id" AS "customer_id", "name" AS "quill_label", "id" AS "quill_flag" FROM "public"."customers") AS "subq_owner_query" WHERE "customer_id" IN (2)'
+                ],
+                "metadata": {"queryOrder": ["customer_id"]},
+            }
+        return {"queries": [], "metadata": {}}
+
+    quill.post_quill = MagicMock(side_effect=post_quill_side_effect)
+
+    result = quill.query(
+        tenants=["tenant-1"],
+        metadata={
+            "task": "report",
+            "clientId": "client-123",
+            "reportId": "report-456",
+            "databaseType": "PostgreSQL",
+        },
+    )
+
+    assert result["status"] == "success"
+    assert result["data"] == {}
+