Fix origin IP lookup

Author: laurentpellegrino

ipregistry/core.py

@@ -13,8 +13,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 """
-
 from .cache import IpregistryCache, NoCache
+from .json import IpInfo, RequesterIpInfo
 from .model import LookupError, ApiResponse, ApiResponseCredits, ApiResponseThrottling
 from .request import DefaultRequestHandler, IpregistryRequestHandler
 
@@ -72,7 +72,7 @@ def batch_lookup_ips(self, ips, **options):
         return response
 
     def lookup_ip(self, ip='', **options):
-        if isinstance(ip, str) and len(ip) > 0:
+        if isinstance(ip, str):
             return self.__lookup_ip(ip, options)
         else:
             raise ValueError("Invalid value for 'ip' parameter: " + ip)
@@ -86,7 +86,8 @@ def __lookup_ip(self, ip, options):
 
         if cache_value is None:
             response = self._requestHandler.lookup_ip(ip, options)
-            self._cache.put(cache_key, response.data)
+            if isinstance(response.data, IpInfo):
+                self._cache.put(cache_key, response.data)
             return response
 
         return ApiResponse(

ipregistry/request.py

@@ -23,7 +23,8 @@
 import requests
 
 from .__init__ import __version__
-from .model import ApiError, ApiResponse, ApiResponseCredits, ApiResponseThrottling, ClientError, IpInfo, LookupError
+from .model import (ApiError, ApiResponse, ApiResponseCredits, ApiResponseThrottling, ClientError, IpInfo,
+                    LookupError, RequesterIpInfo)
 
 
 class IpregistryRequestHandler(ABC):
@@ -88,7 +89,11 @@ def lookup_ip(self, ip, options):
             response.raise_for_status()
             json_response = response.json()
 
-            return self.build_api_response(response, IpInfo(**json_response))
+            return self.build_api_response(
+                response,
+                RequesterIpInfo(**json_response) if ip == ''
+                else IpInfo(**json_response)
+            )
         except requests.HTTPError:
             self.__create_api_error(response)
         except Exception as err:
@@ -112,7 +117,6 @@ def build_api_response(response, data):
                 ipregistry_credits_remaining,
             ),
             data,
-            None if throttling_limit is None and throttling_remaining is None and throttling_reset is None else
             ApiResponseThrottling(
                 throttling_limit,
                 throttling_remaining,

tests/test_client.py

@@ -68,9 +68,18 @@ def test_client_cache_inmemory_batch_ips_lookup(self):
         batch_ips_response2 = client.batch_lookup_ips(['1.1.1.1', '1.1.1.3'])
         self.assertEqual(0, batch_ips_response2.credits.consumed)
 
+    def test_origin_lookup_ip(self):
+        """
+        Test that a simple origin IP lookup returns data
+        """
+        client = IpregistryClient(os.getenv('IPREGISTRY_API_KEY'))
+        response = client.lookup_ip()
+        self.assertIsNotNone(response.data.ip)
+        self.assertIsNotNone(response.data.user_agent)
+
     def test_lookup_ip(self):
         """
-        Test that a simple lookup returns data
+        Test that a simple IP lookup returns data
         """
         client = IpregistryClient(os.getenv('IPREGISTRY_API_KEY'))
         response = client.lookup_ip('8.8.8.8')