datajunction-query 0.0.1a106__tar.gz → 0.0.1a107__tar.gz

{datajunction_query-0.0.1a106 → datajunction_query-0.0.1a107}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datajunction-query
-Version: 0.0.1a106
+Version: 0.0.1a107
 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 → datajunction_query-0.0.1a107}/config.djqs.yml

@@ -12,6 +12,10 @@ engines:
     extra_params:
       http_scheme: http
       user: admin
+  - name: dj_system
+    version: ''
+    type: sqlalchemy
+    uri: postgresql+psycopg://readonly_user:readonly_pass@postgres_metadata:5432/dj
 catalogs:
   - name: warehouse
     engines:
@@ -19,3 +23,6 @@ catalogs:
   - name: tpch
     engines:
       - trino
+  - name: dj
+    engines:
+      - dj_system

{datajunction_query-0.0.1a106 → datajunction_query-0.0.1a107}/djqs/__about__.py

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

{datajunction_query-0.0.1a106 → datajunction_query-0.0.1a107}/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)

{datajunction_query-0.0.1a106 → datajunction_query-0.0.1a107}/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(

{datajunction_query-0.0.1a106 → datajunction_query-0.0.1a107}/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] = "",

{datajunction_query-0.0.1a106 → datajunction_query-0.0.1a107}/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(