Merge pull request #24 from KnownBlackHat/feat/caching

Author: shahriyardx

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+    -   id: check-yaml
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+-   repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
+    -   id: black
+-   repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+    -   id: isort
+        exclude: '^(env)'

README.md

@@ -11,5 +11,5 @@ Using this for the first time? Here are some links to help you get started.
 - [Report bugs](https://github.com/shahriyardx/easy-pil/issues/)
 
 ## Get help
-- Ask us in our [Discord server](https://discord.gg/4rd4JQWmsY)
+- Ask us in our [Discord server](https://discord.gg/fVzt5THTNb)
 - Watch [Youtube Tutorials](https://www.youtube.com/playlist?list=PLb_oBhGqAlbT4yVqV0TSXggA8b0lZhGhn)

easy_pil/utils.py

@@ -5,7 +5,7 @@
 
 import aiohttp
 import requests
-from async_lru import alru_cache
+from aiocache import cached
 from PIL import Image
 
 
@@ -22,7 +22,7 @@ async def run_in_executor(func, **kwargs):
     return data
 
 
-@lru_cache()
+@lru_cache(maxsize=32)
 def load_image(link: str) -> Image.Image:
     """Load image from link
 
@@ -42,8 +42,8 @@ def load_image(link: str) -> Image.Image:
     return image
 
 
-@alru_cache()
-async def load_image_async(link: str) -> Image.Image:
+@cached(ttl=60 * 60 * 24)
+async def load_image_async(link: str, session=None) -> Image.Image:
     """Load image from link (async)
 
     Parameters
@@ -56,9 +56,13 @@ async def load_image_async(link: str) -> Image.Image:
     PIL.Image.Image
         Image link
     """
-    async with aiohttp.ClientSession() as session:
-        async with session.get(link) as response:
+    if isinstance(session, aiohttp.ClientSession):
+        async with session.get(link) as response:  # type: ignore
             data = await response.read()
+    else:
+        async with aiohttp.ClientSession() as session:
+            async with session.get(link) as response:
+                data = await response.read()
 
     _bytes = BytesIO(data)
     image = Image.open(_bytes).convert("RGBA")

requirements.txt

@@ -2,4 +2,4 @@ Pillow>=9.5.0
 requests>=2.30.0
 typing-extensions>=4.5.0
 aiohttp>=3.6.0
-async_lru>=2.0.2
+aiocache<=0.12.1