rbx 3.19.2.dev172__tar.gz → 3.20.0.dev175__tar.gz

{rbx-3.19.2.dev172 → rbx-3.20.0.dev175}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbx
-Version: 3.19.2.dev172
+Version: 3.20.0.dev175
 Summary: A collection of common tools for Scoota services.
 Author-email: The Scoota Engineering Team <engineering@scoota.com>
 License: 

{rbx-3.19.2.dev172 → rbx-3.20.0.dev175}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rbx"
-version = "3.19.2.dev172"
+version = "3.20.0.dev175"
 description = "A collection of common tools for Scoota services."
 authors = [
     { name = "The Scoota Engineering Team", email = "engineering@scoota.com" }
@@ -80,7 +80,7 @@ homepage = "https://github.com/rockabox/rbx"
 repository = "https://github.com/rockabox/rbx.git"
 
 [tool.bumpversion]
-current_version = "3.19.2.dev172"
+current_version = "3.20.0.dev175"
 commit = true
 parse = """
 	(?P<major>\\d+)\\.

rbx-3.20.0.dev175/rbx/__init__.py

@@ -0,0 +1 @@
+__version__ = "3.20.0.dev175"

{rbx-3.19.2.dev172 → rbx-3.20.0.dev175}/rbx/clients/__init__.py

@@ -11,8 +11,9 @@ from requests.exceptions import ConnectionError, Timeout
 from ..exceptions import (
     ClientError,
     Forbidden,
+    RequestTimeout,
     ServerError,
-    TransientServerError,
+    TooManyRequests,
     Unauthorized,
 )
 from ..utils import Singleton
@@ -174,7 +175,7 @@ class Client(metaclass=Singleton):
             else:
                 response = getattr(requests, method)(url, **args)
         except (ConnectionError, Timeout) as e:
-            raise TransientServerError(message=str(e), status_code=500, url=url)
+            raise RequestTimeout(message=str(e), url=url)
 
         # Never include the password field in the log on failure
         payload = copy(data)
@@ -182,7 +183,7 @@ class Client(metaclass=Singleton):
             payload.pop("password", None)
 
         if response.status_code == 500:
-            raise TransientServerError(response.text, details=payload, url=url)
+            raise ServerError(response.text, details=payload, url=url)
 
         if response.status_code == 401:
             raise Unauthorized(self.get_message(response), details=payload, url=url)
@@ -190,6 +191,12 @@ class Client(metaclass=Singleton):
         if response.status_code == 403:
             raise Forbidden(self.get_message(response), details=payload, url=url)
 
+        if response.status_code == 408:
+            raise RequestTimeout(self.get_message(response), details=payload, url=url)
+
+        if response.status_code == 429:
+            raise TooManyRequests(self.get_message(response), details=payload, url=url)
+
         if response.status_code >= 400:
             raise ClientError(
                 response.text,

{rbx-3.19.2.dev172 → rbx-3.20.0.dev175}/rbx/clients/retry.py

@@ -49,12 +49,16 @@ def if_exception_type(*exception_types):
 """A predicate that checks if an exception is a transient error.
 
 The following server errors are considered transient:
+- rbx.exceptions.RequestTimeout
+- rbx.exceptions.ServerError
+- rbx.exceptions.TooManyRequests
 - rbx.exceptions.TransientException
-- rbx.exceptions.TransientServerError
 """
 if_transient_error = if_exception_type(
+    exceptions.RequestTimeout,
+    exceptions.ServerError,
+    exceptions.TooManyRequests,
     exceptions.TransientException,
-    exceptions.TransientServerError,
 )
 
 

{rbx-3.19.2.dev172 → rbx-3.20.0.dev175}/rbx/exceptions.py

@@ -72,12 +72,14 @@ class Forbidden(ClientException):
     status_code = 403
 
 
-class ServerError(ClientException):
-    """5xx server errors."""
+class RequestTimeout(ClientException):
+    message = "Request Timeout"
+    status_code = 408
 
 
-class TransientServerError(ClientException):
-    """Transient 5xx server errors."""
+class TooManyRequests(ClientException):
+    message = "Too Many Requests"
+    status_code = 429
 
 
 class Unauthorized(ClientException):
@@ -104,6 +106,10 @@ class RetryError(ClientException):
         return f"{self.message}, last exception: {self.cause}"
 
 
+class ServerError(HTTPException):
+    """5xx server errors."""
+
+
 class TransientException(Exception):
     """Raise this exception when we know the cause is transient (e.g.: connection errors,
     consistency error, ...).

{rbx-3.19.2.dev172 → rbx-3.20.0.dev175}/rbx/web/handlers.py

@@ -4,7 +4,7 @@ from flask import jsonify, request
 from google.cloud.error_reporting import Client
 from google.cloud.error_reporting.util import build_flask_context
 
-from ..exceptions import BadRequest
+from ..exceptions import BadRequest, TransientException
 
 
 def register_error_handlers(app):
@@ -46,12 +46,24 @@ def register_error_handlers(app):
         response.status_code = 405
         return response
 
+    @app.errorhandler(408)
+    def request_timeout(error):
+        response = jsonify(message="Request Timeout")
+        response.status_code = 408
+        return response
+
     @app.errorhandler(415)
     def unsupported_media_type(error):
         response = jsonify(message="Unsupported Media Type")
         response.status_code = 415
         return response
 
+    @app.errorhandler(429)
+    def too_many_requests(error):
+        response = jsonify(message="Too Many Requests")
+        response.status_code = 429
+        return response
+
     # BadRequest exceptions
     @app.errorhandler(BadRequest)
     def invalid_exception(error):
@@ -60,6 +72,13 @@ def register_error_handlers(app):
         response.status_code = error.status_code
         return response
 
+    # TransientException exceptions
+    @app.errorhandler(TransientException)
+    def transient_exception(error):
+        response = jsonify(message="Request Timeout")
+        response.status_code = 408
+        return response
+
     # Uncaught exceptions
     @app.errorhandler(Exception)
     def unhandled_exception(error):

{rbx-3.19.2.dev172 → rbx-3.20.0.dev175}/rbx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbx
-Version: 3.19.2.dev172
+Version: 3.20.0.dev175
 Summary: A collection of common tools for Scoota services.
 Author-email: The Scoota Engineering Team <engineering@scoota.com>
 License: 

rbx-3.19.2.dev172/rbx/__init__.py

@@ -1 +0,0 @@
-__version__ = "3.19.2.dev172"