Loosen dependency pins: cachetools, aiohttp, requests (#129)

* Loosen dependency pins: cachetools, aiohttp, requests

* Refactor cache import to streamline usage of TTLCache

* Fix missing await on resp.text() in async handlers

* Fix async tests

---------

Co-authored-by: Silvano Cerza <silvanocerza@gmail.com>

Author: socketz

ipinfo/cache/default.py

@@ -2,16 +2,14 @@
 A default cache implementation that uses `cachetools` for an in-memory LRU cache.
 """
 
-import cachetools
-
 from .interface import CacheInterface
-
+from cachetools import TTLCache
 
 class DefaultCache(CacheInterface):
     """Default, in-memory cache."""
 
     def __init__(self, **cache_options):
-        self.cache = cachetools.TTLCache(**cache_options)
+        self.cache = TTLCache(**cache_options)
 
     def __contains__(self, key):
         return self.cache.__contains__(key)

ipinfo/handler_async.py

@@ -150,7 +150,7 @@ async def getDetails(self, ip_address=None, timeout=None):
                 if content_type == "application/json":
                     error_response = await resp.json()
                 else:
-                    error_response = {"error": resp.text()}
+                    error_response = {"error": await resp.text()}
                 raise APIError(error_code, error_response)
             details = await resp.json()
 
@@ -208,7 +208,7 @@ async def getResproxy(self, ip_address, timeout=None):
                 if content_type == "application/json":
                     error_response = await resp.json()
                 else:
-                    error_response = {"error": resp.text()}
+                    error_response = {"error": await resp.text()}
                 raise APIError(error_code, error_response)
             details = await resp.json()
 

ipinfo/handler_core_async.py

@@ -153,7 +153,7 @@ async def getDetails(self, ip_address=None, timeout=None):
                 if content_type == "application/json":
                     error_response = await resp.json()
                 else:
-                    error_response = {"error": resp.text()}
+                    error_response = {"error": await resp.text()}
                 raise APIError(error_code, error_response)
             details = await resp.json()
 

ipinfo/handler_lite_async.py

@@ -141,7 +141,7 @@ async def getDetails(self, ip_address=None, timeout=None):
                 if content_type == "application/json":
                     error_response = await resp.json()
                 else:
-                    error_response = {"error": resp.text()}
+                    error_response = {"error": await resp.text()}
                 raise APIError(error_code, error_response)
             details = await resp.json()
 

ipinfo/handler_plus_async.py

@@ -153,7 +153,7 @@ async def getDetails(self, ip_address=None, timeout=None):
                 if content_type == "application/json":
                     error_response = await resp.json()
                 else:
-                    error_response = {"error": resp.text()}
+                    error_response = {"error": await resp.text()}
                 raise APIError(error_code, error_response)
             details = await resp.json()
 

pyproject.toml

@@ -9,9 +9,9 @@ authors = [
 license = { text = "Apache License 2.0" }
 requires-python = ">=3.10"
 dependencies = [
-    "requests>=2.18.4",
-    "cachetools==4.2.0",
-    "aiohttp>=3.12.14,<=4",
+    "requests>=2.18.4,<3",
+    "cachetools>=4.2,<8",
+    "aiohttp>=3,<4",
 ]
 
 [project.urls]

tests/handler_async_test.py

@@ -22,7 +22,7 @@ def __init__(self, text, status, headers):
         self.status = status
         self.headers = headers
 
-    def text(self):
+    async def text(self):
         return self._text
 
     async def json(self):

tests/handler_lite_async_test.py

@@ -17,7 +17,7 @@ def __init__(self, text, status, headers):
         self.status = status
         self.headers = headers
 
-    def text(self):
+    async def text(self):
         return self._text
 
     async def json(self):