datajunction-query 0.0.1a57__py3-none-any.whl → 0.0.1a58__py3-none-any.whl

{datajunction_query-0.0.1a57.dist-info → datajunction_query-0.0.1a58.dist-info}/METADATA

@@ -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.dist-info → datajunction_query-0.0.1a58.dist-info}/RECORD

@@ -1,8 +1,8 @@
-djqs/__about__.py,sha256=bDw59G17tp7ZhL3GwzGI7gGhobq5JrivLqn3Bq2VQ_Y,51
+djqs/__about__.py,sha256=8V1Y3GlOIENmZdxogzyStiLOAhaYsAxXEbZpddJSW2s,51
 djqs/__init__.py,sha256=nN5-uJoSVEwuc8n-wMygqeF0Xhxi_zqqbCgutZvAt3E,384
 djqs/config.py,sha256=Flva9W8McnTunUlHGhYd0CsgbsjWbZIoPW25ZTzFxws,3029
 djqs/constants.py,sha256=T-sO5C5-NNdEywGglTIu6bjT1VooFwW4XWNA_ZwSYM8,412
-djqs/engine.py,sha256=0yYHMIa9UHn3VL7_SubwYntfnQgQp4GH5ez1_3mKKwE,5857
+djqs/engine.py,sha256=5HvrFnQmy89j2duPNT-zSktpfl7zKj-FZdeJ5SvFf8M,5719
 djqs/enum.py,sha256=GJVLYDJ2zWjjUBENgyjZZ_94A24BJtvci-AKTmA0zek,590
 djqs/exceptions.py,sha256=z-EjGLRwHL_v3zl1-RICwQis7wUwl3000tse0YwuoBE,4992
 djqs/fixes.py,sha256=TcXnh0I1z4vEAupPatzrvnqyToGihndnxmLJtIn-_Z8,33
@@ -11,17 +11,17 @@ djqs/utils.py,sha256=R-t2A8RvwLu2Lxcs8r5kxQ7AfuDRKJ7G9XcjfdXAhvQ,2075
 djqs/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djqs/api/catalogs.py,sha256=I_i8-Nok0V3ND1FpOCQ5Nmgaof5MLH8i0oeTjvDxQgw,3062
 djqs/api/engines.py,sha256=278fsgIgQXe4WAmbfbxoA08ALe57us_zKlaK_hbiDrc,1611
-djqs/api/helpers.py,sha256=c3aUMrZk6Xja1Iarcpf3G1rrwqm0OqZbP5HWUfLCkgI,2457
-djqs/api/main.py,sha256=D99c_I2sZm8vXFuW2ZKqV_NqfahJ1mSvytPShVDlsi8,1728
-djqs/api/queries.py,sha256=NAZd2T9_CgWYKsxH7RxTUj6SIA2t8C4HEZHl_n47LL8,5485
-djqs/api/tables.py,sha256=5qADafYVkOBaPhq1s9s3Tf_RuTE1Eiqnnvi5bUYB7Io,1457
+djqs/api/helpers.py,sha256=91UGqs-SAq3fCU9yElBMev9vqtDospOjBq0icfFl1qs,2468
+djqs/api/main.py,sha256=cbZHxkfmushgw8e0G2q8f5Ytexqk-qjKtZPyHK5sbjQ,2075
+djqs/api/queries.py,sha256=gSdzI7pVhCsZDpjP5l0NTvHq4ykF20CFzKiLZrrlUmQ,5523
+djqs/api/tables.py,sha256=1hwYPRAG9kZfS8HE3r_omC4AjHadAbdhFIwx3e4KOvo,1582
 djqs/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djqs/models/catalog.py,sha256=o3Wlghwr6ax4Eo-3zE5Mdq478xyUxeaf2o3whFprXtU,2038
 djqs/models/engine.py,sha256=k9cBvnYAfzz4yaBDvErDqXIwlqrRsKRbGikBKTQHJPA,889
 djqs/models/query.py,sha256=Qsy69Cfrkn5myOZZfLrR83JB4ynPXogitUo8A7hRsz8,3338
 djqs/models/table.py,sha256=7HmiXWHBWEthqdwPYLlsOgeKD-w9urCHoC4xaQ1RnM8,238
-datajunction_query-0.0.1a57.dist-info/METADATA,sha256=6getW4FFvLVAKAM_-tnVWNTbwVU3nkWETNdXYpbZdQQ,9465
-datajunction_query-0.0.1a57.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-datajunction_query-0.0.1a57.dist-info/licenses/AUTHORS.rst,sha256=G9YmXPfQ0kAuxqlCwvWVvUnZitP9hAc-rPfZ5q7Pv1U,235
-datajunction_query-0.0.1a57.dist-info/licenses/LICENSE.txt,sha256=KuSxhVgPuUGoYWphJig4POcTAIUNLUj8vOx-cqQFMj8,1081
-datajunction_query-0.0.1a57.dist-info/RECORD,,
+datajunction_query-0.0.1a58.dist-info/METADATA,sha256=ehByOgLgh-X4iKB7tEfAeTVWddeCTp46KzwnwW9GOQY,9495
+datajunction_query-0.0.1a58.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+datajunction_query-0.0.1a58.dist-info/licenses/AUTHORS.rst,sha256=G9YmXPfQ0kAuxqlCwvWVvUnZitP9hAc-rPfZ5q7Pv1U,235
+datajunction_query-0.0.1a58.dist-info/licenses/LICENSE.txt,sha256=KuSxhVgPuUGoYWphJig4POcTAIUNLUj8vOx-cqQFMj8,1081
+datajunction_query-0.0.1a58.dist-info/RECORD,,

djqs/__about__.py

@@ -1,4 +1,4 @@
 """
 Version for Hatch
 """
-__version__ = "0.0.1a57"
+__version__ = "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(

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)

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),

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],

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]] = []