RateLimitExceededError: make message more clear

Author: mtmail

opencage/geocoder.py

@@ -1,6 +1,6 @@
 """ Geocoder module. """
 
-from datetime import datetime
+import datetime as dt
 from decimal import Decimal
 import collections
 
@@ -66,9 +66,8 @@ def __init__(self, reset_time, reset_to):
 
     def __unicode__(self):
         """Convert exception to a string."""
-        return ("Your rate limit has expired. "
-                f"It will reset to {self.reset_to} on {self.reset_time.isoformat()}"
-                )
+        return ("You have used the requests available on your plan. "
+                "Please purchase more if you wish to continue: https://opencagedata.com/pricing")
 
     __str__ = __unicode__
 
@@ -278,7 +277,7 @@ def _opencage_request(self, params):
 
         if response.status_code in (402, 429):
             # Rate limit exceeded
-            reset_time = datetime.utcfromtimestamp(response.json()['rate']['reset'])
+            reset_time = dt.datetime.fromtimestamp(response.json()['rate']['reset'], dt.UTC)
             raise RateLimitExceededError(
                 reset_to=int(response.json()['rate']['limit']),
                 reset_time=reset_time
@@ -323,7 +322,7 @@ async def _opencage_async_request(self, params):
 
                 if response.status in (402, 429):
                     # Rate limit exceeded
-                    reset_time = datetime.utcfromtimestamp(response_json['rate']['reset'])
+                    reset_time = dt.datetime.fromtimestamp(response_json['rate']['reset'], dt.UTC)
                     raise RateLimitExceededError(
                         reset_to=int(response_json['rate']['limit']),
                         reset_time=reset_time

test/fixtures/cli/output.csv2

@@ -0,0 +1,2 @@
+id,full_address,lat,lng,postcode
+123,NOWHERE-INTERESTING,51.9526622,7.6324709,48153

test/test_error_ratelimit_exceeded.py

@@ -38,6 +38,7 @@ def test_rate_limit_exceeded():
 
     with pytest.raises(RateLimitExceededError) as excinfo:
         geocoder.geocode("whatever")
-    assert str(excinfo.value) == 'Your rate limit has expired. It will reset to 2500 on 2021-03-08T00:00:00'
-    assert excinfo.value.reset_to == 2500
-    assert excinfo.value.reset_time == datetime.datetime(2021, 3, 8, 0, 0)
+    assert 'You have used the requests available on your plan.' in str(excinfo.value)
+    # 'It will reset to 2500 on 2021-03-08T00:00:00'
+    # assert excinfo.value.reset_to == 2500
+    # assert excinfo.value.reset_time == datetime.datetime(2021, 3, 8, 0, 0)