datajunction-query 0.0.1a57__tar.gz → 0.0.1a58__tar.gz

{datajunction_query-0.0.1a57 → datajunction_query-0.0.1a58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-query
-Version: 0.0.1a57
+Version: 0.0.1a58
 Summary: OSS Implementation of a DataJunction Query Service
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <roberto@dealmeida.net>
@@ -32,6 +32,7 @@ Requires-Dist: sqlalchemy<2.0.0,>=1.4.41
 Requires-Dist: sqlmodel<1.0.0,>=0.0.8
 Requires-Dist: sqlparse<1.0.0,>=0.4.3
 Requires-Dist: toml>=0.10.2
+Requires-Dist: trino>=0.324.0
 Provides-Extra: uvicorn
 Requires-Dist: uvicorn[standard]>=0.21.1; extra == 'uvicorn'
 Description-Content-Type: text/x-rst

{datajunction_query-0.0.1a57/tests → datajunction_query-0.0.1a58}/config.djqs.yml

@@ -5,7 +5,17 @@ engines:
     uri: duckdb:////code/docker/default.duckdb
     extra_params:
       location: /code/docker/default.duckdb
+  - name: trino
+    version: 451
+    type: sqlalchemy
+    uri: trino://trino-coordinator:8080/tpch/sf1
+    extra_params:
+      http_scheme: http
+      user: admin
 catalogs:
   - name: warehouse
     engines:
       - duckdb
+  - name: tpch
+    engines:
+      - trino

{datajunction_query-0.0.1a57 → datajunction_query-0.0.1a58}/djqs/__about__.py

@@ -1,4 +1,4 @@
 """
 Version for Hatch
 """
-__version__ = "0.0.1a57"
+__version__ = "0.0.1a58"

{datajunction_query-0.0.1a57 → datajunction_query-0.0.1a58}/djqs/api/helpers.py

@@ -58,7 +58,7 @@ def get_columns(
     if not uri:
         raise DJException("Cannot retrieve columns without a uri")
 
-    engine = create_engine(uri, **extra_params)
+    engine = create_engine(uri, connect_args=extra_params)
     try:
         inspector = inspect(engine)
         column_metadata = inspector.get_columns(

{datajunction_query-0.0.1a57 → datajunction_query-0.0.1a58}/djqs/api/main.py

@@ -8,6 +8,7 @@ Main DJ query server app.
 # pylint: disable=unused-import,expression-not-assigned
 
 import logging
+from contextlib import asynccontextmanager
 
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse
@@ -22,7 +23,19 @@ _logger = logging.getLogger(__name__)
 
 settings = get_settings()
 session = next(get_session())
-load_djqs_config(settings=settings, session=session)
+
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):  # pylint: disable=W0621,W0613
+    """
+    Load DJQS config on app startup
+    """
+    try:
+        load_djqs_config(settings=settings, session=session)
+    except Exception as e:  # pylint: disable=W0718
+        _logger.warning("Could not load DJQS config: %s", e)
+    yield
+
 
 app = FastAPI(
     title=settings.name,
@@ -32,6 +45,7 @@ app = FastAPI(
         "name": "MIT License",
         "url": "https://mit-license.org/",
     },
+    lifespan=lifespan,
 )
 app.include_router(catalogs.get_router)
 app.include_router(engines.get_router)

{datajunction_query-0.0.1a57 → datajunction_query-0.0.1a58}/djqs/api/queries.py

@@ -66,7 +66,7 @@ router = APIRouter(tags=["SQL Queries"])
         },
     },
 )
-async def submit_query(
+async def submit_query(  # pylint: disable=too-many-arguments
     accept: Optional[str] = Header(None),
     *,
     session: Session = Depends(get_session),

{datajunction_query-0.0.1a57 → datajunction_query-0.0.1a58}/djqs/api/tables.py

@@ -33,14 +33,20 @@ def table_columns(
             f"for `table` must be in the format `<catalog>.<schema>.<table>`",
         )
     settings = get_settings()
+
+    if engine_version == "":
+        version = ""
+    else:  # pragma: no cover
+        version = engine_version or settings.default_reflection_engine_version
+
     engine = get_engine(
         session=session,
         name=engine or settings.default_reflection_engine,
-        version=engine_version or settings.default_reflection_engine_version,
+        version=version,
     )
     external_columns = get_columns(
         uri=engine.uri,
-        extra_params={},
+        extra_params=engine.extra_params,
         catalog=table_parts[0],
         schema=table_parts[1],
         table=table_parts[2],

{datajunction_query-0.0.1a57 → datajunction_query-0.0.1a58}/djqs/engine.py

@@ -14,7 +14,6 @@ from sqlalchemy import create_engine, text
 from sqlmodel import Session, select
 
 from djqs.config import Settings
-from djqs.models.catalog import Catalog
 from djqs.models.engine import Engine, EngineType
 from djqs.models.query import (
     ColumnMetadata,
@@ -78,9 +77,6 @@ def run_query(
     columns (name and type) and a stream of rows (tuples).
     """
     _logger.info("Running query on catalog %s", query.catalog_name)
-    catalog = session.exec(
-        select(Catalog).where(Catalog.name == query.catalog_name),
-    ).one()
     engine = session.exec(
         select(Engine)
         .where(Engine.name == query.engine_name)
@@ -104,8 +100,7 @@ def run_query(
         cur = conn.cursor()
 
         return run_snowflake_query(query, cur)
-
-    sqla_engine = create_engine(engine.uri, **catalog.extra_params)
+    sqla_engine = create_engine(engine.uri, connect_args=engine.extra_params)
     connection = sqla_engine.connect()
 
     output: List[Tuple[str, List[ColumnMetadata], Stream]] = []