checking in cache

Author: Samuel-Gill

ipinfo/handler.py

@@ -315,6 +315,7 @@ def getBatchDetailsIter(
         if batch_size is None:
             batch_size = BATCH_MAX_SIZE
 
+        result = {}
         lookup_addresses = []
         for ip_address in ip_addresses:
             if isinstance(ip_address, IPv4Address) or isinstance(
@@ -330,6 +331,27 @@ def getBatchDetailsIter(
             else:
                 lookup_addresses.append(ip_address)
 
+        # pre-populate with anything we've got in the cache, and keep around
+        # the IPs not in the cache.
+        for ip_address in ip_addresses:
+            # if the supplied IP address uses the objects defined in the
+            # built-in module ipaddress extract the appropriate string notation
+            # before formatting the URL.
+            if isinstance(ip_address, IPv4Address) or isinstance(
+                ip_address, IPv6Address
+            ):
+                ip_address = ip_address.exploded
+
+            try:
+                cached_ipaddr = self.cache[cache_key(ip_address)]
+                result[ip_address] = cached_ipaddr
+            except KeyError:
+                lookup_addresses.append(ip_address)
+
+        # all in cache - exit early.
+        if len(lookup_addresses) == 0:
+            yield result
+
         url = API_URL + "/batch"
         headers = handler_utils.get_headers(self.access_token, self.headers)
         headers["content-type"] = "application/json"
@@ -361,6 +383,5 @@ def getBatchDetailsIter(
             )
             for ip in batch:
                 detail = details.get(ip)
-                if detail is not None:
-                    self.cache[cache_key(ip)] = detail
-                    yield detail
+                self.cache[cache_key(ip)] = detail
+                yield detail

ipinfo/handler_async.py

@@ -394,7 +394,6 @@ async def process_batch(batch):
                     for ip_address, details in json_response.items():
                         self.cache[cache_key(ip_address)] = details
                         results[ip_address] = details
-
             except Exception as e:
                 return handler_utils.return_or_fail(raise_on_fail, e, results)