rbx 3.22.1.dev186__tar.gz → 3.22.2__tar.gz

{rbx-3.22.1.dev186 → rbx-3.22.2}/PKG-INFO

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

{rbx-3.22.1.dev186 → rbx-3.22.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rbx"
-version = "3.22.1.dev186"
+version = "3.22.2"
 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.22.1.dev186"
+current_version = "3.22.2"
 commit = true
 parse = """
 	(?P<major>\\d+)\\.

rbx-3.22.2/rbx/__init__.py

@@ -0,0 +1 @@
+__version__ = "3.22.2"

{rbx-3.22.1.dev186 → rbx-3.22.2}/rbx/clients/__init__.py

@@ -124,7 +124,6 @@ class Client(metaclass=Singleton):
         headers=None,
         params=None,
         timeout=None,
-        include_headers=False,
     ):
         """Wrap the method call in common error handling."""
         endpoint = endpoint if endpoint is not None else self.ENDPOINT
@@ -218,15 +217,13 @@ class Client(metaclass=Singleton):
 
         # 204 "No Content" responses return nothing
         if response.status_code == 204:
-            if include_headers:
-                return {"content": None, "headers": dict(response.headers)}
             return
 
         if content_type == "text/plain":
-            content = response.text
+            return response.text
         else:
             try:
-                content = self.get_response(response)
+                return self.get_response(response)
             except ValueError:
                 extra = {
                     "request": payload,
@@ -236,12 +233,6 @@ class Client(metaclass=Singleton):
                     "Invalid JSON response", details=extra, status_code=500, url=url
                 )
 
-        # Return content with headers if requested, otherwise just content
-        if include_headers:
-            return {"content": content, "headers": dict(response.headers)}
-        else:
-            return content
-
     def request(
         self,
         method,
@@ -252,7 +243,6 @@ class Client(metaclass=Singleton):
         headers=None,
         params=None,
         timeout=None,
-        include_headers=False,
     ):
         """Attempt to re-authenticate when the token has expired.
 
@@ -271,7 +261,6 @@ class Client(metaclass=Singleton):
             headers=headers,
             params=params,
             timeout=timeout,
-            include_headers=include_headers,
         )
 
         try:

{rbx-3.22.1.dev186 → rbx-3.22.2}/rbx/clients/place.py

@@ -275,26 +275,3 @@ class PlaceExchangeClient(Client):
             path=path,
             params=params if params else None,
         )
-
-    def get_screens(self, page=None):
-        """Retrieve a page of screens from Place Exchange."""
-        path = f"v3/orgs/{self.org_id}/avails"
-        params = {"page_size": 1000}
-
-        if page:
-            params["page"] = page
-
-        response = self.request("get", path, params=params, include_headers=True)
-
-        # Extract the page for the next page from the Link header if it exists
-        next_page = None
-        if "Link" in response["headers"]:
-            links = response["headers"]["Link"].split(",")
-            for link in links:
-                if "rel='next'" in link:
-                    # Extract the page parameter from the URL
-                    url_part = link.split(";")[0].strip("<>")
-                    if "page=" in url_part:
-                        next_page = int(url_part.split("page=")[1].split("&")[0])
-
-        return response["content"], next_page

{rbx-3.22.1.dev186 → rbx-3.22.2}/rbx/web/handlers.py

@@ -1,10 +1,11 @@
+import traceback
 import os
 
 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, TransientException
+from ..exceptions import BadRequest, FatalException, TransientException
 
 
 def register_error_handlers(app):
@@ -20,6 +21,11 @@ def register_error_handlers(app):
 
     >>> raise BadRequest('Message')
 
+    Important: the `PYTHONNODEBUGRANGES` environment variable must be set for the traceback
+    to be formatted in a format Google App Reporting understands.
+
+    >>> PYTHONNODEBUGRANGES=1
+
     """
 
     @app.errorhandler(401)
@@ -79,15 +85,18 @@ def register_error_handlers(app):
         response.status_code = 408
         return response
 
+    # FatalException exceptions
+    @app.errorhandler(FatalException)
+    def fatal_exception(error):
+        report_exception(app)
+        response = jsonify(message=str(error))
+        response.status_code = 500
+        return response
+
     # Uncaught exceptions
     @app.errorhandler(Exception)
     def unhandled_exception(error):
-        if os.getenv("GAE_ENV", "").startswith("standard"):
-            client = Client()
-            client.report_exception(http_context=build_flask_context(request))
-        else:
-            app.logger.exception(f"Unhandled Exception: {error}")
-
+        report_exception(app)
         response = jsonify(
             message="Something went wrong!",
             details=[
@@ -98,3 +107,14 @@ def register_error_handlers(app):
         )
         response.status_code = 500
         return response
+
+
+def report_exception(app, message=None):
+    context = build_flask_context(request)
+    context.responseStatusCode = 500
+    message = message or traceback.format_exc()
+
+    if os.getenv("GAE_ENV", "").startswith("standard"):
+        Client().report(message, http_context=context)
+    else:
+        app.logger.error(message)

{rbx-3.22.1.dev186 → rbx-3.22.2}/rbx.egg-info/PKG-INFO

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

rbx-3.22.1.dev186/rbx/__init__.py

@@ -1 +0,0 @@
-__version__ = "3.22.1.dev186"