datajunction-server 0.0.1a44.dev10__tar.gz → 0.0.1a45__tar.gz

{datajunction_server-0.0.1a44.dev10 → datajunction_server-0.0.1a45}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.1a44.dev10
+Version: 0.0.1a45
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>

datajunction_server-0.0.1a45/datajunction_server/__about__.py

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a45"

{datajunction_server-0.0.1a44.dev10 → datajunction_server-0.0.1a45}/datajunction_server/internal/access/authentication/github.py

@@ -42,7 +42,7 @@ def get_github_user(access_token: str) -> Optional[User]:  # pragma: no cover
     ).json()
     if "message" in user_data and user_data["message"] == "Bad credentials":
         return None
-    session = next(get_session())
+    session = next(get_session())  # type: ignore  # pylint: disable=no-value-for-parameter
     existing_user: Optional[User] = None
     try:
         existing_user = session.execute(

{datajunction_server-0.0.1a44.dev10 → datajunction_server-0.0.1a45}/datajunction_server/internal/access/authentication/google.py

@@ -82,7 +82,7 @@ def get_google_user(token: str) -> User:
             http_status_code=HTTPStatus.FORBIDDEN,
             message=f"Error retrieving Google user: {response.text}",
         )
-    session = next(get_session())
+    session = next(get_session())  # type: ignore  # pylint: disable=no-value-for-parameter
     existing_user = session.execute(
         select(User).where(User.email == user_data["login"]),
     ).scalar()

{datajunction_server-0.0.1a44.dev10 → datajunction_server-0.0.1a45}/datajunction_server/sql/functions.py

@@ -3444,6 +3444,21 @@ def infer_type(  # type: ignore
     return ct.BooleanType()
 
 
+class Replace(Function):
+    """
+    replace(str, search[, replace]) - Replaces all occurrences of `search` with `replace`.
+    """
+
+
+@Replace.register
+def infer_type(  # type: ignore
+    string: ct.StringType,
+    search: ct.StringType,
+    replace: Optional[ct.StringType] = "",
+) -> ct.StringType:
+    return ct.StringType()
+
+
 class RowNumber(Function):
     """
     row_number() - Assigns a unique, sequential number to each row, starting with

{datajunction_server-0.0.1a44.dev10 → datajunction_server-0.0.1a45}/datajunction_server/utils.py

@@ -13,6 +13,7 @@ from dotenv import load_dotenv
 from rich.logging import RichHandler
 from sqlalchemy.engine import Engine, create_engine
 from sqlalchemy.orm import Session, sessionmaker
+from starlette.background import BackgroundTasks
 from starlette.requests import Request
 from yarl import URL
 
@@ -59,7 +60,7 @@ def get_engine() -> Engine:
     Create the metadata engine.
     """
     settings = get_settings()
-    engine = create_engine(
+    return create_engine(
         settings.index,
         pool_pre_ping=True,
         pool_size=settings.db_pool_size,
@@ -70,20 +71,40 @@ def get_engine() -> Engine:
         },
     )
 
-    return engine
 
+engine = get_engine()
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
-def get_session() -> Iterator[Session]:
+
+class SessionManager:
+    """
+    Session context manager.
+    """
+
+    def __init__(self, session_maker: sessionmaker):
+        self.session: Session = session_maker()
+
+    def __enter__(self):
+        return self.session
+
+    def __exit__(self, exception_type, exception_value, traceback):
+        self.session.close()
+
+
+def close_session(session: Session):
+    """
+    Handles session closing
+    """
+    session.close()  # pragma: no cover
+
+
+def get_session(background_tasks: BackgroundTasks) -> Iterator[Session]:
     """
     Direct SQLAlchemy session.
     """
-    engine = get_engine()
-    session_local = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-    session = session_local()
-    try:
+    with SessionManager(SessionLocal) as session:  # pragma: no cover
+        background_tasks.add_task(close_session, session)
         yield session
-    finally:
-        session.close()
 
 
 def get_query_service_client() -> Optional[QueryServiceClient]:

{datajunction_server-0.0.1a44.dev10 → datajunction_server-0.0.1a45}/tests/sql/functions_test.py

@@ -2729,6 +2729,30 @@ def test_regexp_like(session: Session):
     assert query.select.projection[0].type == ct.BooleanType()  # type: ignore
 
 
+def test_replace(session: Session):
+    """
+    Test `replace`
+    """
+    # two arguments
+    query = parse(
+        "SELECT replace('%SystemDrive%\\Users\\John', '%SystemDrive%\\Users.*')",
+    )
+    exc = DJException()
+    ctx = ast.CompileContext(session=session, exception=exc)
+    query.compile(ctx)
+    assert not exc.errors
+    assert query.select.projection[0].type == ct.StringType()  # type: ignore
+    # three arguments
+    query = parse(
+        "SELECT replace('%SystemDrive%\\Users\\John', '%SystemDrive%\\Users.*', 'C:\\Users\\John')",
+    )
+    exc = DJException()
+    ctx = ast.CompileContext(session=session, exception=exc)
+    query.compile(ctx)
+    assert not exc.errors
+    assert query.select.projection[0].type == ct.StringType()  # type: ignore
+
+
 def test_row_number(session: Session):
     """
     Test `row_number`

{datajunction_server-0.0.1a44.dev10 → datajunction_server-0.0.1a45}/tests/utils_test.py

@@ -3,10 +3,12 @@ Tests for ``datajunction_server.utils``.
 """
 
 import logging
+from unittest.mock import patch
 
 import pytest
 from pytest_mock import MockerFixture
-from sqlalchemy.engine.url import make_url
+from sqlalchemy.orm import Session
+from starlette.background import BackgroundTasks
 from testcontainers.postgres import PostgresContainer
 from yarl import URL
 
@@ -39,16 +41,13 @@ def test_get_session(mocker: MockerFixture) -> None:
     """
     Test ``get_session``.
     """
-    engine = mocker.patch("datajunction_server.utils.get_engine")
-    sessionmaker = mocker.patch(  # pylint: disable=invalid-name
-        "datajunction_server.utils.sessionmaker",
-    )
-
-    session = next(get_session())
-    assert (
-        session
-        == sessionmaker(autocommit=False, autoflush=False, bind=engine).return_value
-    )
+    with patch(
+        "fastapi.BackgroundTasks",
+        mocker.MagicMock(autospec=BackgroundTasks),
+    ) as background_tasks:
+        background_tasks.side_effect = lambda x, y: None
+        session = next(get_session(background_tasks))
+        assert isinstance(session, Session)
 
 
 def test_get_settings(mocker: MockerFixture) -> None:
@@ -95,7 +94,6 @@ def test_get_engine(
     settings.index = connection_url
     mocker.patch("datajunction_server.utils.get_settings", return_value=settings)
     engine = get_engine()
-    assert engine.url == make_url(connection_url)
     assert engine.pool.size() == settings.db_pool_size
     assert engine.pool.timeout() == settings.db_pool_timeout
     assert engine.pool.overflow() == -settings.db_max_overflow

datajunction_server-0.0.1a44.dev10/backup/alembic_version.csv

@@ -1,2 +0,0 @@
-version_num
-d1a8716cf2d2

datajunction_server-0.0.1a44.dev10/backup/attributetype.csv

@@ -1,6 +0,0 @@
-name,allowed_node_types,uniqueness_scope,namespace,description,id
-effective_time,"[""dimension""]","[""node"", ""column_type""]",system,Points to a column which represents the effective time of a row in a dimension node. Used to facilitate proper joins with fact nodes on event time.,893767189219999747
-primary_key,"[""source"", ""transform"", ""dimension""]",[],system,Points to a column which is part of the primary key of the node,893767189220098051
-dimension,"[""source"", ""transform""]",[],system,Points to a dimension attribute column,893767189220130819
-expired_time,"[""dimension""]","[""node"", ""column_type""]",system,Points to a column which represents the expired time of a row in a dimension node. Used to facilitate proper joins with fact nodes on event time.,893767189220163587
-event_time,"[""source"", ""transform""]","[""node"", ""column_type""]",system,Points to a column which represents the time of the event in a given fact related node. Used to facilitate proper joins with dimension node to match the desired effect.,893767189220196355

datajunction_server-0.0.1a44.dev10/backup/availabilitystate.csv

@@ -1 +0,0 @@
-categorical_partitions,temporal_partitions,min_temporal_partition,max_temporal_partition,partitions,updated_at,catalog,schema_,table,valid_through_ts,id,url

datajunction_server-0.0.1a44.dev10/backup/backfill.csv

@@ -1 +0,0 @@
-spec,urls,id,materialization_id

datajunction_server-0.0.1a44.dev10/backup/catalog.csv

@@ -1,5 +0,0 @@
-uuid,created_at,updated_at,extra_params,id,name
-f02aa6de-e7a7-49c6-b2af-6787f4cf097a,2023-10-24 15:18:01.416663+00:00,2023-10-24 15:18:01.416666+00:00,{},0,default
-296f5060-cedd-4d9b-9a69-6dba41e428b7,2023-08-23 21:35:00.238192+00:00,2023-08-23 21:35:00.238197+00:00,{},893767189267939331,prodhive
-fd8cf13b-e8b4-4e06-884f-ef1423ddfad5,2023-08-23 21:35:00.326136+00:00,2023-08-23 21:35:00.326138+00:00,{},893767189556264964,druid
-73085279-2f8f-4bef-a899-2447ba19f5dc,2023-11-21 17:28:53.579435+00:00,2023-11-21 17:28:53.579437+00:00,{},919199198680383489,snowflake

datajunction_server-0.0.1a44.dev10/backup/catalogengines.csv

@@ -1,5 +0,0 @@
-catalog_id,engine_id
-893767189267939331,893767189901279238
-893767189267939331,893767190205104132
-893767189556264964,893767190464364549
-919199198680383489,919198128871407617