py2http 0.1.65__tar.gz → 0.1.67__tar.gz

{py2http-0.1.65 → py2http-0.1.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py2http
-Version: 0.1.65
+Version: 0.1.67
 Summary: Declarative HTTP service entry point.
 Home-page: https://github.com/i2mint/py2http
 License: MIT

{py2http-0.1.65 → py2http-0.1.67}/py2http/default_configs.py

@@ -23,6 +23,7 @@ from i2.errors import (
     InputError,
     NotFoundError,
     DuplicateRecordError,
+    OverwritesNotAllowed,
 )
 
 from py2http.decorators import handle_json_req, send_json_resp, JsonRespEncoder
@@ -59,34 +60,51 @@ def _raise_http_client_error(error, message, reason=None):
     )
 
 
+# HTTP status of each client error, most specific class first. ``ForbiddenError`` and
+# ``OverwritesNotAllowed`` mean the client may not do this (403); any other
+# ``AuthorizationError`` means the request did not say who it is (401).
+_CLIENT_ERROR_STATUSES = (
+    ((ForbiddenError, OverwritesNotAllowed), 403),
+    (AuthorizationError, 401),
+    ((InputError, DuplicateRecordError), 400),
+    (NotFoundError, 404),
+)
+_AIOHTTP_ERRORS = {
+    400: web.HTTPBadRequest,
+    401: web.HTTPUnauthorized,
+    403: web.HTTPForbidden,
+    404: web.HTTPNotFound,
+}
+
+
+def error_status(error: Exception) -> int:
+    """The HTTP status for an error a handler raised (500 when it is not a client's).
+
+    >>> error_status(AuthorizationError()), error_status(ForbiddenError())
+    (401, 403)
+    >>> error_status(InputError()), error_status(KeyError())
+    (400, 500)
+    """
+    for error_types, status in _CLIENT_ERROR_STATUSES:
+        if isinstance(error, error_types):
+            return status
+    return 500
+
+
 def aiohttp_error_handler(error: Exception):
-    message = str(error)
-    if isinstance(error, (AuthorizationError, InputError, DuplicateRecordError)):
-        _raise_http_client_error(
-            web.HTTPBadRequest, message, reason=type(error).__name__
-        )
-    elif isinstance(error, ForbiddenError):
-        _raise_http_client_error(web.HTTPForbidden, message)
-    elif isinstance(error, NotFoundError):
-        _raise_http_client_error(web.HTTPNotFound, message)
-    else:
-        message = "Internal server error"
-        _raise_http_client_error(web.HTTPInternalServerError, message)
+    status = error_status(error)
+    if status == 500:
+        _raise_http_client_error(web.HTTPInternalServerError, "Internal server error")
+    reason = type(error).__name__ if status == 400 else None
+    _raise_http_client_error(_AIOHTTP_ERRORS[status], str(error), reason=reason)
 
 
 def bottle_error_handler(error: Exception):
     message = str(error)
-    if isinstance(error, (AuthorizationError, InputError, DuplicateRecordError)):
-        response.status = f"400 {type(error).__name__}"
-        # response.reason = type(error).__name__
-    elif isinstance(error, ForbiddenError):
-        response.status = 403
-    elif isinstance(error, NotFoundError):
-        response.status = 404
-    else:
-        response.status = 500
-        if os.getenv("OPAQUE_ERRORS", None):
-            message = "Internal server error"
+    status = error_status(error)
+    response.status = f"400 {type(error).__name__}" if status == 400 else status
+    if status == 500 and os.getenv("OPAQUE_ERRORS", None):
+        message = "Internal server error"
     return {"error": message}
 
 

{py2http-0.1.65 → py2http-0.1.67}/py2http/examples/object_dispatch.py

@@ -11,6 +11,8 @@ and its ecosystem (mongodol, s3dol, etc.).
 
 from typing import MutableMapping
 
+from py2http.service import shared_objects
+
 
 class BackendStore(MutableMapping):
     """MutableMapping wrapper that assumes that values are given as strings,
@@ -47,6 +49,9 @@ handlers = [
         endpoint=backend_store,
         name="backend_store",
         attr_names=["__iter__", "__getitem__", "__setitem__"],
+        # One store every client shares and may write to: fine for a demo. A real
+        # service passes obj_owner=<(request) -> authenticated user id> instead.
+        obj_owner=shared_objects,
     ),
 ]