Remove make-key alias (#20)

Author: janbjorge

src/pgcachewatch/decorators.py

@@ -1,9 +1,10 @@
 import asyncio
+from functools import _make_key as make_key
 from typing import Awaitable, Callable, Hashable, Literal, TypeVar
 
 from typing_extensions import ParamSpec
 
-from pgcachewatch import strategies, utils
+from pgcachewatch import strategies
 from pgcachewatch.logconfig import logger
 
 P = ParamSpec("P")
@@ -12,7 +13,7 @@
 
 def cache(
     strategy: strategies.Strategy,
-    statistics_callback: Callable[[Literal["hit", "miss"]], None] | None = None,
+    statistics_callback: Callable[[Literal["hit", "miss"]], None] = lambda _: None,
 ) -> Callable[[Callable[P, Awaitable[T]]], Callable[P, Awaitable[T]]]:
     def outer(fn: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
         cached = dict[Hashable, asyncio.Future[T]]()
@@ -29,24 +30,20 @@ async def inner(*args: P.args, **kwargs: P.kwargs) -> T:
                 logger.debug("Cache clear")
                 cached.clear()
 
-            key = utils.make_key(args, kwargs)
+            key = make_key(args, kwargs, typed=False)
 
             try:
                 waiter = cached[key]
             except KeyError:
                 # Cache miss
-                ...
+                logger.debug("Cache miss")
+                statistics_callback("miss")
             else:
                 # Cache hit
                 logger.debug("Cache hit")
-                if statistics_callback:
-                    statistics_callback("hit")
+                statistics_callback("hit")
                 return await waiter
 
-            logger.debug("Cache miss")
-            if statistics_callback:
-                statistics_callback("miss")
-
             # Initialize Future to prevent cache stampedes.
             cached[key] = waiter = asyncio.Future[T]()
 

src/pgcachewatch/utils.py

@@ -1,24 +1,12 @@
 import asyncio
 import datetime
-import functools
-from typing import Generator, Hashable
+from typing import Generator
 
 import asyncpg
 
 from pgcachewatch import listeners, models
 
 
-def make_key(
-    args: tuple[Hashable, ...],
-    kwds: dict,
-    typed: bool = False,
-) -> Hashable:
-    """
-    Create a cache key from the given function arguments and keyword arguments.
-    """
-    return functools._make_key(args, kwds, typed)
-
-
 async def emit_event(
     conn: asyncpg.Connection | asyncpg.Pool,
     event: models.Event,