do aiohttp batch req + tests

Author: UmanShahzad

ipinfo/handler_async.py

@@ -8,7 +8,6 @@
 import sys
 
 import aiohttp
-import requests
 
 from .cache.default import DefaultCache
 from .details import Details
@@ -139,26 +138,26 @@ async def getBatchDetails(self, ip_addresses):
         if len(lookup_addresses) == 0:
             return result
 
-        # Do the lookup
+        # do http req
         url = self.API_URL + "/batch"
         headers = self._get_headers()
         headers["content-type"] = "application/json"
-        response = requests.post(
-            url, json=lookup_addresses, headers=headers, **self.request_options
-        )
-        if response.status_code == 429:
-            raise RequestQuotaExceededError()
-        response.raise_for_status()
+        async with self.httpsess.post(
+            url, data=json.dumps(lookup_addresses), headers=headers
+        ) as resp:
+            if resp.status == 429:
+                raise RequestQuotaExceededError()
+            resp.raise_for_status()
+            json_resp = await resp.json()
 
-        # Format & fill up cache
-        json_response = response.json()
-        for ip_address, details in json_response.items():
+        # format & fill up cache
+        for ip_address, details in json_resp.items():
             if isinstance(details, dict):
                 self._format_details(details)
                 self.cache[ip_address] = details
 
-        # Merge cached results with new lookup
-        result.update(json_response)
+        # merge cached results with new lookup
+        result.update(json_resp)
 
         return result
 

tests/handler_async_test.py

@@ -28,8 +28,9 @@ async def test_headers():
     assert "authorization" in headers
 
 
+@pytest.mark.parametrize('n', range(5))
 @pytest.mark.asyncio
-async def test_get_details():
+async def test_get_details(n):
     token = os.environ.get("IPINFO_TOKEN", "")
     handler = AsyncHandler(token)
     details = await handler.getDetails("8.8.8.8")
@@ -81,3 +82,24 @@ async def test_get_details():
         assert len(domains["domains"]) == 5
 
     await handler.deinit()
+
+@pytest.mark.parametrize('n', range(5))
+@pytest.mark.asyncio
+async def test_get_batch_details(n):
+    token = os.environ.get("IPINFO_TOKEN", "")
+    handler = AsyncHandler(token)
+    ips = ["1.1.1.1", "8.8.8.8", "9.9.9.9"]
+    details = await handler.getBatchDetails(ips)
+
+    for ip in ips:
+        assert ip in details
+        d = details[ip]
+        assert d["ip"] == ip
+        if token:
+            assert "asn" in d
+            assert "company" in d
+            assert "privacy" in d
+            assert "abuse" in d
+            assert "domains" in d
+
+    await handler.deinit()

tests/handler_test.py

@@ -5,6 +5,7 @@
 from ipinfo.cache.default import DefaultCache
 from ipinfo.details import Details
 from ipinfo.handler import Handler
+import pytest
 
 
 def test_init():
@@ -25,7 +26,8 @@ def test_headers():
     assert "authorization" in headers
 
 
-def test_get_details():
+@pytest.mark.parametrize('n', range(5))
+def test_get_details(n):
     token = os.environ.get("IPINFO_TOKEN", "")
     handler = Handler(token)
     details = handler.getDetails("8.8.8.8")