dycw-utilities 0.157.0__tar.gz → 0.157.2__tar.gz

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/PKG-INFO

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

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/pyproject.toml

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

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/tests/test_eventkit.py

@@ -65,17 +65,13 @@ class TestAddListener:
 
                 def listener_sync() -> None: ...
 
-                _ = add_listener(
-                    event, listener_sync, logger=str(root), logger_allow_pytest=True
-                )
+                _ = add_listener(event, listener_sync, logger=str(root))
             case "async":
 
                 async def listener_async() -> None:
                     await sleep(0.01)
 
-                _ = add_listener(
-                    event, listener_async, logger=str(root), logger_allow_pytest=True
-                )
+                _ = add_listener(event, listener_async, logger=str(root))
 
         event.emit(None)
         await sleep(0.01)
@@ -237,7 +233,7 @@ class TestLiftListener:
             LiftListenerError,
             match="Synchronous listener .* cannot be paired with an asynchronous error handler .*",
         ):
-            _ = lift_listener(listener, Event(), error=error, logger_allow_pytest=True)
+            _ = lift_listener(listener, Event(), error=error)
 
 
 class TestLiftedEvent:

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/tests/test_logging.py

@@ -78,7 +78,7 @@ class TestBasicConfig:
     ) -> None:
         name = unique_str()
         with set_log_factory:
-            basic_config(obj=name, filters=filters, plain=plain, allow_pytest=True)
+            basic_config(obj=name, filters=filters, plain=plain)
         getLogger(name).warning("message")
         record = one(r for r in caplog.records if r.name == name)
         assert record.message == "message"
@@ -535,11 +535,5 @@ class TestToLogger:
         name = unique_str()
         assert to_logger(name).name == name
 
-    @mark.parametrize(("allow_pytest", "expected"), [param(False, 1), param(True, 0)])
-    def test_allow_pytest(self, *, allow_pytest: bool, expected: int) -> None:
-        name = unique_str()
-        logger = to_logger(name, allow_pytest=allow_pytest)
-        assert len(logger.filters) == expected
-
     def test_none(self) -> None:
         assert to_logger(None).name == "root"

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.157.0"
+__version__ = "0.157.2"

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/utilities/eventkit.py

@@ -48,7 +48,6 @@ def add_listener[E: Event, F: Callable](
     error: Callable[[Event, BaseException], MaybeCoro[None]] | None = None,
     ignore: TypeLike[BaseException] | None = None,
     logger: LoggerLike | None = None,
-    logger_allow_pytest: bool = False,
     decorators: MaybeIterable[Callable[[F], F]] | None = None,
     done: Callable[..., MaybeCoro[None]] | None = None,
     keep_ref: bool = False,
@@ -60,7 +59,6 @@ def add_listener[E: Event, F: Callable](
         error=error,
         ignore=ignore,
         logger=logger,
-        logger_allow_pytest=logger_allow_pytest,
         decorators=decorators,
     )
     return cast("E", event.connect(lifted, done=done, keep_ref=keep_ref))
@@ -286,7 +284,6 @@ def lift_listener[F1: Callable[..., MaybeCoro[None]], F2: Callable](
     error: Callable[[Event, BaseException], MaybeCoro[None]] | None = None,
     ignore: TypeLike[BaseException] | None = None,
     logger: LoggerLike | None = None,
-    logger_allow_pytest: bool = False,
     decorators: MaybeIterable[Callable[[F2], F2]] | None = None,
 ) -> F1:
     match error, bool(iscoroutinefunction(listener)):
@@ -300,7 +297,7 @@ def lift_listener[F1: Callable[..., MaybeCoro[None]], F2: Callable](
                 except Exception as exc:  # noqa: BLE001
                     if (ignore is not None) and isinstance(exc, ignore):
                         return
-                    to_logger(logger, allow_pytest=logger_allow_pytest).exception("")
+                    to_logger(logger).exception("")
 
             lifted = listener_no_error_sync
 
@@ -314,7 +311,7 @@ def lift_listener[F1: Callable[..., MaybeCoro[None]], F2: Callable](
                 except Exception as exc:  # noqa: BLE001
                     if (ignore is not None) and isinstance(exc, ignore):
                         return
-                    to_logger(logger, allow_pytest=logger_allow_pytest).exception("")
+                    to_logger(logger).exception("")
 
             lifted = listener_no_error_async
         case _, _:

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/utilities/fastapi.py

@@ -13,7 +13,7 @@ from utilities.whenever import get_now_local
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
 
-    from utilities.types import Delta
+    from utilities.types import Delta, MaybeType
 
 
 _TASKS: list[Task[None]] = []
@@ -35,14 +35,19 @@ class _PingerReceiverApp(FastAPI):
 
 @enhanced_async_context_manager
 async def yield_ping_receiver(
-    port: int, /, *, host: str = "localhost", timeout: Delta | None = None
+    port: int,
+    /,
+    *,
+    host: str = "localhost",
+    timeout: Delta | None = None,
+    error: MaybeType[BaseException] = TimeoutError,
 ) -> AsyncIterator[None]:
     """Yield the ping receiver."""
     app = _PingerReceiverApp()  # skipif-ci
     server = Server(Config(app, host=host, port=port))  # skipif-ci
     _TASKS.append(create_task(server.serve()))  # skipif-ci
     try:  # skipif-ci
-        async with timeout_td(timeout):
+        async with timeout_td(timeout, error=error):
             yield
     finally:  # skipif-ci
         await server.shutdown()

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/utilities/logging.py

@@ -37,7 +37,6 @@ from utilities.atomicwrites import move_many
 from utilities.dataclasses import replace_non_sentinel
 from utilities.errors import ImpossibleCaseError
 from utilities.iterables import OneEmptyError, always_iterable, one
-from utilities.os import is_pytest
 from utilities.pathlib import ensure_suffix, to_path
 from utilities.re import (
     ExtractGroupError,
@@ -96,7 +95,6 @@ def basic_config(
     filters: MaybeIterable[_FilterType] | None = None,
     plain: bool = False,
     color_field_styles: Mapping[str, _FieldStyleKeys] | None = None,
-    allow_pytest: bool = False,
 ) -> None:
     """Do the basic config."""
     match obj:
@@ -122,7 +120,7 @@ def basic_config(
             )
         case str() as name:
             basic_config(
-                obj=to_logger(name, allow_pytest=allow_pytest),
+                obj=to_logger(name),
                 format_=format_,
                 prefix=prefix,
                 hostname=hostname,
@@ -262,7 +260,6 @@ def setup_logging(
     console_level: LogLevel = "INFO",
     console_prefix: str = "❯",  # noqa: RUF001
     console_filters: MaybeIterable[_FilterType] | None = None,
-    allow_pytest: bool = False,
     files_dir: MaybeCallablePathLike = Path.cwd,
     files_max_bytes: int = _DEFAULT_MAX_BYTES,
     files_when: _When = _DEFAULT_WHEN,
@@ -279,7 +276,7 @@ def setup_logging(
         level=console_level,
         filters=console_filters,
     )
-    logger_use = to_logger(logger, allow_pytest=allow_pytest)
+    logger_use = to_logger(logger)
     name = logger_use.name
     levels: list[LogLevel] = ["DEBUG", "INFO", "ERROR"]
     for level in levels:
@@ -578,18 +575,13 @@ class _Rotation:
 ##
 
 
-def to_logger(
-    logger: LoggerLike | None = None, /, *, allow_pytest: bool = False
-) -> Logger:
+def to_logger(logger: LoggerLike | None = None, /) -> Logger:
     """Convert to a logger."""
     match logger:
         case Logger():
             return logger
         case str() | None:
-            logger = getLogger(logger)
-            if not allow_pytest:
-                _ = logger.addFilter(lambda _: not is_pytest())
-            return logger
+            return getLogger(logger)
         case never:
             assert_never(never)
 

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/utilities/slack_sdk.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
     from slack_sdk.webhook import WebhookResponse
     from whenever import TimeDelta
 
-    from utilities.types import Delta
+    from utilities.types import Delta, MaybeType
 
 
 _TIMEOUT: Delta = MINUTE
@@ -39,11 +39,16 @@ def _get_client(url: str, /, *, timeout: Delta = _TIMEOUT) -> WebhookClient:
 
 
 async def send_to_slack_async(
-    url: str, text: str, /, *, timeout: TimeDelta = _TIMEOUT
+    url: str,
+    text: str,
+    /,
+    *,
+    timeout: TimeDelta = _TIMEOUT,
+    error: MaybeType[BaseException] = TimeoutError,
 ) -> None:
     """Send a message via Slack."""
     client = _get_async_client(url, timeout=timeout)
-    async with timeout_td(timeout):
+    async with timeout_td(timeout, error=error):
         response = await client.send(text=text)
     if response.status_code != HTTPStatus.OK:  # pragma: no cover
         raise SendToSlackError(text=text, response=response)

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/utilities/sqlalchemy.py

@@ -134,11 +134,15 @@ def check_connect(engine: Engine, /) -> bool:
 
 
 async def check_connect_async(
-    engine: AsyncEngine, /, *, timeout: Delta | None = None
+    engine: AsyncEngine,
+    /,
+    *,
+    timeout: Delta | None = None,
+    error: MaybeType[BaseException] = TimeoutError,
 ) -> bool:
     """Check if an engine can connect."""
     try:
-        async with timeout_td(timeout), engine.connect() as conn:
+        async with timeout_td(timeout, error=error), engine.connect() as conn:
             return bool((await conn.execute(_SELECT)).scalar_one())
     except (
         gaierror,

{dycw_utilities-0.157.0 → dycw_utilities-0.157.2}/src/utilities/sqlalchemy_polars.py

@@ -229,6 +229,7 @@ async def select_to_dataframe(
     in_clauses_chunk_size: int | None = None,
     chunk_size_frac: float = CHUNK_SIZE_FRAC,
     timeout: Delta | None = None,
+    error: MaybeType[BaseException] = TimeoutError,
     **kwargs: Any,
 ) -> DataFrame: ...
 @overload
@@ -244,6 +245,7 @@ async def select_to_dataframe(
     in_clauses_chunk_size: int | None = None,
     chunk_size_frac: float = CHUNK_SIZE_FRAC,
     timeout: Delta | None = None,
+    error: MaybeType[BaseException] = TimeoutError,
     **kwargs: Any,
 ) -> Iterable[DataFrame]: ...
 @overload
@@ -259,6 +261,7 @@ async def select_to_dataframe(
     in_clauses_chunk_size: int | None = None,
     chunk_size_frac: float = CHUNK_SIZE_FRAC,
     timeout: Delta | None = None,
+    error: MaybeType[BaseException] = TimeoutError,
     **kwargs: Any,
 ) -> AsyncIterable[DataFrame]: ...
 @overload
@@ -274,6 +277,7 @@ async def select_to_dataframe(
     in_clauses_chunk_size: int | None = None,
     chunk_size_frac: float = CHUNK_SIZE_FRAC,
     timeout: Delta | None = None,
+    error: MaybeType[BaseException] = TimeoutError,
     **kwargs: Any,
 ) -> DataFrame | Iterable[DataFrame] | AsyncIterable[DataFrame]: ...
 async def select_to_dataframe(