datajunction-query 0.0.1a106__py3-none-any.whl → 0.0.1a108__py3-none-any.whl

{datajunction_query-0.0.1a106.dist-info → datajunction_query-0.0.1a108.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datajunction-query
-Version: 0.0.1a106
+Version: 0.0.1a108
 Summary: OSS Implementation of a DataJunction Query Service
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <roberto@dealmeida.net>

{datajunction_query-0.0.1a106.dist-info → datajunction_query-0.0.1a108.dist-info}/RECORD

@@ -1,8 +1,8 @@
-djqs/__about__.py,sha256=j78vxOUSY060CaSMf9BHgtejaUpHBmaFeGKqCo5EBT0,53
+djqs/__about__.py,sha256=rVtLAopTAU0-BV-xPDIYfAygcjAnYbHwkO7T7s_9oZs,53
 djqs/__init__.py,sha256=nN5-uJoSVEwuc8n-wMygqeF0Xhxi_zqqbCgutZvAt3E,384
-djqs/config.py,sha256=8WLfe3M3maO4WhWb4ukrj8gdIlHQyLC4j9Q7KQ95bOQ,6662
+djqs/config.py,sha256=2tfHXFbW9HgvIEQ1DT4_WnSfRoxCRHzS_ateekj0I94,6664
 djqs/constants.py,sha256=WS0uC-cKLQ_ZPhtevcv6tJ8WI6UtxYGZwTqJJtsTep0,485
-djqs/engine.py,sha256=xk6bkPvlXxUFPJHOyGOAWlOexl5UxvGwWJFjXkr1sbs,7341
+djqs/engine.py,sha256=J5vHXG_xspI0AfJX3Mp0bZ99h5u7zJCVifDMZ-45w6g,7759
 djqs/enum.py,sha256=dHX8Z_0I_e7HQDUxQdpt18l7tC1P0NZru86ZGmMw23g,591
 djqs/exceptions.py,sha256=B9RqLG1Y3-5vz-iBiEKPIUBcE6TLpIfRZQ_rCyYFPqk,5983
 djqs/fixes.py,sha256=TcXnh0I1z4vEAupPatzrvnqyToGihndnxmLJtIn-_Z8,33
@@ -11,14 +11,14 @@ djqs/utils.py,sha256=iTctVXY4uSQnGn1O-_CdDXldiOwfufz582Lo8izox9M,906
 djqs/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djqs/api/helpers.py,sha256=V-CFmflRYorZ90BI7b8EPWbsP8j7RKn0aDItC3-_QdQ,1359
 djqs/api/main.py,sha256=SR0vbX0W1v8orfluyfsALrT1G3bF9emH1KBWoO9lcyw,2237
-djqs/api/queries.py,sha256=jr07a8Yxj3YrJ4yT18hGw5WLavIFTq2OZ_ixfghe1Yo,7742
-djqs/api/tables.py,sha256=XsjfpKJDerE3N2zeSr-ymw2cI-AcHqK7wGasXTWrFZg,1675
+djqs/api/queries.py,sha256=mcYI2xTvnBnHiNZcw0n5gjGdlAJbvmGsY6xovx_yjmE,7905
+djqs/api/tables.py,sha256=c3_VugV5fqGQU0uf5Mn7fx7LJ6ZjzOB5svCW40r_yE0,1626
 djqs/db/postgres.py,sha256=MnCKlZiX3PgS3qGUvwXHfjrV9Bgjb_css7x7vSlZ6_8,4863
 djqs/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djqs/models/query.py,sha256=n02TPSq8cZOuH49FyVieVwhGdrkaZ-4NpqCSuOgL5X4,3324
 djqs/models/table.py,sha256=EEJigO3RNjn-O9VWD7n3BtcvyKokQUiI5mfwKaGe-Lc,239
-datajunction_query-0.0.1a106.dist-info/METADATA,sha256=UXLZ6LuaM5PNSCJJJYrO0RzZiB7fUDpPU7UUM_zCxwU,9526
-datajunction_query-0.0.1a106.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-datajunction_query-0.0.1a106.dist-info/licenses/AUTHORS.rst,sha256=G9YmXPfQ0kAuxqlCwvWVvUnZitP9hAc-rPfZ5q7Pv1U,235
-datajunction_query-0.0.1a106.dist-info/licenses/LICENSE.txt,sha256=KuSxhVgPuUGoYWphJig4POcTAIUNLUj8vOx-cqQFMj8,1081
-datajunction_query-0.0.1a106.dist-info/RECORD,,
+datajunction_query-0.0.1a108.dist-info/METADATA,sha256=ViTRh2vTsjuFst8luulXYwJp-Zyws1x5WY_W5laFLpU,9526
+datajunction_query-0.0.1a108.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+datajunction_query-0.0.1a108.dist-info/licenses/AUTHORS.rst,sha256=G9YmXPfQ0kAuxqlCwvWVvUnZitP9hAc-rPfZ5q7Pv1U,235
+datajunction_query-0.0.1a108.dist-info/licenses/LICENSE.txt,sha256=KuSxhVgPuUGoYWphJig4POcTAIUNLUj8vOx-cqQFMj8,1081
+datajunction_query-0.0.1a108.dist-info/RECORD,,

djqs/__about__.py

@@ -2,4 +2,4 @@
 Version for Hatch
 """
 
-__version__ = "0.0.1a106"
+__version__ = "0.0.1a108"

djqs/api/queries.py

@@ -93,10 +93,12 @@ async def submit_query(  # pylint: disable=too-many-arguments
         )
 
     # Set default catalog and engine if not explicitly specified in submitted query
-    data["engine_name"] = data.get("engine_name") or settings.default_engine
-    data["engine_version"] = (
-        data.get("engine_version") or settings.default_engine_version
-    )
+    if not data.get("engine_name") and not data.get("engine_version"):
+        data["engine_name"] = settings.default_engine
+        data["engine_version"] = settings.default_engine_version
+    else:
+        data["engine_name"] = data.get("engine_name") or settings.default_engine
+        data["engine_version"] = data.get("engine_version") or ""
     data["catalog_name"] = data.get("catalog_name") or settings.default_catalog
 
     create_query = QueryCreate(**data)

djqs/api/tables.py

@@ -31,11 +31,10 @@ def table_columns(
             f"for `table` must be in the format `<catalog>.<schema>.<table>`",
         )
     settings = get_settings()
-
-    if engine and engine_version:
+    if engine:
         engine_config = settings.find_engine(
             engine_name=engine,
-            engine_version=engine_version or settings.default_engine_version,
+            engine_version=engine_version or "",
         )
     else:
         engine_config = settings.find_engine(

djqs/config.py

@@ -70,7 +70,7 @@ class Settings:  # pylint: disable=too-many-instance-attributes
         name: Optional[str] = "DJQS",
         description: Optional[str] = "A DataJunction Query Service",
         url: Optional[str] = "http://localhost:8001/",
-        index: Optional[str] = "postgresql://dj:dj@postgres_metadata:5432/dj",
+        index: Optional[str] = "postgresql://dj:dj@postgres_metadata:5432/djqs",
         default_catalog: Optional[str] = "",
         default_engine: Optional[str] = "",
         default_engine_version: Optional[str] = "",

djqs/engine.py

@@ -6,7 +6,7 @@ import json
 import logging
 import os
 from dataclasses import asdict
-from datetime import datetime, timezone
+from datetime import date, datetime, timezone
 from typing import Dict, List, Optional, Tuple
 
 import duckdb
@@ -84,7 +84,7 @@ def run_query(  # pylint: disable=R0914
 
     settings = get_settings()
     engine_name = query.engine_name or settings.default_engine
-    engine_version = query.engine_version or settings.default_engine_version
+    engine_version = query.engine_version
     engine = settings.find_engine(
         engine_name=engine_name,
         engine_version=engine_version,
@@ -164,6 +164,19 @@ def run_snowflake_query(
     return output
 
 
+def serialize_for_json(obj):
+    """
+    Handle serialization of date/datetimes for JSON output.
+    """
+    if isinstance(obj, list):
+        return [serialize_for_json(x) for x in obj]
+    if isinstance(obj, dict):
+        return {k: serialize_for_json(v) for k, v in obj.items()}
+    if isinstance(obj, (date, datetime)):
+        return obj.isoformat()
+    return obj
+
+
 async def process_query(
     settings: Settings,
     postgres_pool: AsyncConnectionPool,
@@ -221,7 +234,11 @@ async def process_query(
 
     settings.results_backend.add(
         str(query.id),
-        json.dumps([asdict(statement_result) for statement_result in results]),
+        json.dumps(
+            serialize_for_json(
+                [asdict(statement_result) for statement_result in results],
+            ),
+        ),
     )
 
     return QueryResults(