dycw-utilities 0.150.13__tar.gz → 0.150.14__tar.gz

{dycw_utilities-0.150.13 → dycw_utilities-0.150.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.150.13
+Version: 0.150.14
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.150.13 → dycw_utilities-0.150.14}/pyproject.toml

@@ -232,7 +232,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.150.13"
+version = "0.150.14"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -265,7 +265,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.150.13"
+current_version = "0.150.14"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.150.13 → dycw_utilities-0.150.14}/src/tests/test_sqlalchemy.py

@@ -94,7 +94,7 @@ from utilities.sqlalchemy import (
 )
 from utilities.text import strip_and_dedent
 from utilities.typing import get_args, get_literal_elements
-from utilities.whenever import format_compact, get_now, to_local_plain
+from utilities.whenever import MILLISECOND, format_compact, get_now, to_local_plain
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
@@ -144,6 +144,9 @@ class TestCheckConnect:
     async def test_async(self, *, test_async_engine: AsyncEngine) -> None:
         assert await check_connect_async(test_async_engine)
 
+    async def test_async_timeout(self, *, test_async_engine: AsyncEngine) -> None:
+        assert not await check_connect_async(test_async_engine, timeout=MILLISECOND)
+
 
 class TestCheckEngine:
     async def test_main(self, *, test_async_engine: AsyncEngine) -> None:

{dycw_utilities-0.150.13 → dycw_utilities-0.150.14}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.150.13"
+__version__ = "0.150.14"

{dycw_utilities-0.150.13 → dycw_utilities-0.150.14}/src/utilities/sqlalchemy.py

@@ -97,12 +97,17 @@ from utilities.iterables import (
 )
 from utilities.reprlib import get_repr
 from utilities.text import secret_str, snake_case
-from utilities.types import MaybeIterable, MaybeType, StrMapping, TupleOrStrMapping
+from utilities.types import (
+    Delta,
+    MaybeIterable,
+    MaybeType,
+    StrMapping,
+    TupleOrStrMapping,
+)
 
 if TYPE_CHECKING:
     from enum import Enum, StrEnum
 
-    from whenever import TimeDelta
 
 type EngineOrConnectionOrAsync = Engine | Connection | AsyncEngine | AsyncConnection
 type Dialect = Literal["mssql", "mysql", "oracle", "postgresql", "sqlite"]
@@ -127,12 +132,14 @@ def check_connect(engine: Engine, /) -> bool:
         return False
 
 
-async def check_connect_async(engine: AsyncEngine, /) -> bool:
+async def check_connect_async(
+    engine: AsyncEngine, /, *, timeout: Delta | None = None
+) -> bool:
     """Check if an engine can connect."""
     try:
-        async with engine.connect() as conn:
+        async with timeout_td(timeout), engine.connect() as conn:
             return bool((await conn.execute(_SELECT)).scalar_one())
-    except (OperationalError, ProgrammingError):
+    except (OperationalError, ProgrammingError, TimeoutError):
         return False
 
 
@@ -143,7 +150,7 @@ async def check_engine(
     engine: AsyncEngine,
     /,
     *,
-    timeout: TimeDelta | None = None,
+    timeout: Delta | None = None,
     error: type[Exception] = TimeoutError,
     num_tables: int | tuple[int, float] | None = None,
 ) -> None:
@@ -316,7 +323,7 @@ async def ensure_tables_created(
     engine: AsyncEngine,
     /,
     *tables_or_orms: TableOrORMInstOrClass,
-    timeout: TimeDelta | None = None,
+    timeout: Delta | None = None,
     error: type[Exception] = TimeoutError,
 ) -> None:
     """Ensure a table/set of tables is/are created."""
@@ -345,7 +352,7 @@ async def ensure_tables_created(
 async def ensure_tables_dropped(
     engine: AsyncEngine,
     *tables_or_orms: TableOrORMInstOrClass,
-    timeout: TimeDelta | None = None,
+    timeout: Delta | None = None,
     error: type[Exception] = TimeoutError,
 ) -> None:
     """Ensure a table/set of tables is/are dropped."""
@@ -575,9 +582,9 @@ async def insert_items(
     snake: bool = False,
     chunk_size_frac: float = CHUNK_SIZE_FRAC,
     assume_tables_exist: bool = False,
-    timeout_create: TimeDelta | None = None,
+    timeout_create: Delta | None = None,
     error_create: type[Exception] = TimeoutError,
-    timeout_insert: TimeDelta | None = None,
+    timeout_insert: Delta | None = None,
     error_insert: type[Exception] = TimeoutError,
 ) -> None:
     """Insert a set of items into a database.
@@ -676,9 +683,9 @@ async def migrate_data(
     table_or_orm_to: TableOrORMInstOrClass | None = None,
     chunk_size_frac: float = CHUNK_SIZE_FRAC,
     assume_tables_exist: bool = False,
-    timeout_create: TimeDelta | None = None,
+    timeout_create: Delta | None = None,
     error_create: type[Exception] = TimeoutError,
-    timeout_insert: TimeDelta | None = None,
+    timeout_insert: Delta | None = None,
     error_insert: type[Exception] = TimeoutError,
 ) -> None:
     """Migrate the contents of a table from one database to another."""
@@ -812,9 +819,9 @@ async def upsert_items(
     selected_or_all: _SelectedOrAll = "selected",
     chunk_size_frac: float = CHUNK_SIZE_FRAC,
     assume_tables_exist: bool = False,
-    timeout_create: TimeDelta | None = None,
+    timeout_create: Delta | None = None,
     error_create: type[Exception] = TimeoutError,
-    timeout_insert: TimeDelta | None = None,
+    timeout_insert: Delta | None = None,
     error_insert: type[Exception] = TimeoutError,
 ) -> None:
     """Upsert a set of items into a database.
@@ -934,7 +941,7 @@ async def yield_connection(
     engine: AsyncEngine,
     /,
     *,
-    timeout: TimeDelta | None = None,
+    timeout: Delta | None = None,
     error: MaybeType[BaseException] = TimeoutError,
 ) -> AsyncIterator[AsyncConnection]:
     """Yield an async connection."""