Forward cache_close wait for bound methods

Author: shuofengzhang

async_lru/__init__.py

@@ -333,9 +333,20 @@ def cache_clear(self) -> None:
         self.__wrapper.cache_clear()
 
     async def cache_close(
-        self, *, cancel: bool = False, return_exceptions: bool = True
+        self,
+        *,
+        wait: bool = False,
+        cancel: bool = False,
+        return_exceptions: bool = True,
     ) -> None:
-        await self.__wrapper.cache_close()
+        if cancel or return_exceptions is not True:
+            warnings.warn(
+                "cancel/return_exceptions are deprecated; use wait=True to allow tasks "
+                "to finish and wait=False to cancel pending tasks.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        await self.__wrapper.cache_close(wait=wait)
 
     def cache_info(self) -> _CacheInfo:
         return self.__wrapper.cache_info()

tests/test_close.py

@@ -42,3 +42,28 @@ async def coro(val: int) -> int:
 
     # double call is no-op
     await coro.cache_close()
+
+
+async def test_cache_close_wait_bound_method(check_lru: Callable[..., None]) -> None:
+    class Foo:
+        @alru_cache()
+        async def coro(self, val: int) -> int:
+            await asyncio.sleep(0.05)
+            return val
+
+    foo = Foo()
+    inputs = [1, 2, 3]
+
+    coros = [foo.coro(v) for v in inputs]
+    gather = asyncio.gather(*coros)
+
+    await asyncio.sleep(0.01)
+
+    # wait=True should allow tasks to finish (no cancellation)
+    await foo.coro.cache_close(wait=True)
+
+    results = await gather
+    assert results == inputs
+
+    check_lru(foo.coro, hits=0, misses=3, cache=3, tasks=0)
+    assert foo.coro.cache_parameters()["closed"]