starmallow 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

starmallow/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 from .applications import StarMallow
 from .exceptions import RequestValidationError

starmallow/applications.py

@@ -35,7 +35,7 @@ from starmallow.exception_handlers import (
     http_exception_handler,
     request_validation_exception_handler,
 )
-from starmallow.exceptions import RequestValidationError
+from starmallow.exceptions import RequestValidationError, SchemaGenerationError
 from starmallow.middleware import AsyncExitStackMiddleware
 from starmallow.responses import JSONResponse
 from starmallow.routing import APIRoute, APIRouter
@@ -168,7 +168,10 @@ class StarMallow(Starlette):
     def init_openapi(self):
         if self.openapi_url:
             async def openapi(req: Request) -> JSONResponse:
-                return JSONResponse(self.openapi())
+                try:
+                    return JSONResponse(self.openapi())
+                except Exception as e:
+                    raise SchemaGenerationError() from e
 
             self.add_route(self.openapi_url, openapi, include_in_schema=False)
 

starmallow/exceptions.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Union
 
 from starlette.exceptions import HTTPException
-from starlette.status import HTTP_422_UNPROCESSABLE_ENTITY
+from starlette.status import HTTP_422_UNPROCESSABLE_ENTITY, HTTP_500_INTERNAL_SERVER_ERROR
 
 
 class RequestValidationError(HTTPException):
@@ -20,3 +20,10 @@ class WebSocketRequestValidationError(HTTPException):
     ) -> None:
         super().__init__(status_code=HTTP_422_UNPROCESSABLE_ENTITY)
         self.errors = errors
+
+
+class SchemaGenerationError(HTTPException):
+    def __init__(
+        self,
+    ) -> None:
+        super().__init__(status_code=HTTP_500_INTERNAL_SERVER_ERROR, detail="Failed to generate schema")

starmallow/ext/marshmallow/openapi.py

@@ -240,7 +240,7 @@ class OpenAPIConverter(ApiSpecOpenAPIConverter):
                 ret["explode"] = True
                 ret["style"] = "form"
             if prop.get("description", None):
-                ret["description"] = prop.pop("description")
+                ret["description"] = prop.pop("description", None)
             ret["schema"] = prop
 
             if 'deprecated' in field.metadata:

starmallow/routing.py

@@ -584,7 +584,7 @@ class APIRouter(routing.Router):
                     method_tags.extend(endpoint_options.tags)
 
                 route = APIRoute(
-                    path,
+                    self.prefix + path,
                     endpoint_function,
                     methods=[method],
                     name=endpoint_options.name or name,

starmallow/schema_generator.py

@@ -4,6 +4,7 @@ import itertools
 import re
 import warnings
 from collections import defaultdict
+from logging import getLogger
 from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, Type
 
 import marshmallow as ma
@@ -29,6 +30,7 @@ from starmallow.utils import (
     status_code_ranges,
 )
 
+logger = getLogger(__name__)
 
 class SchemaRegistry(dict):
     '''
@@ -410,10 +412,8 @@ class SchemaGenerator(BaseSchemaGenerator):
 
         # Add default error response
         if (any_params or endpoint.body_params or endpoint.form_params) and not any(
-            [
-                status in schema['responses']
+            status in schema['responses']
                 for status in ["422", "4XX", "default"]
-            ],
         ):
             self._add_default_error_response(schema)
 
@@ -449,9 +449,13 @@ class SchemaGenerator(BaseSchemaGenerator):
         endpoints_info = self.get_endpoints(routes)
 
         for path, endpoints in endpoints_info.items():
-            self.spec.path(
-                path=path,
-                operations=self.get_operations(endpoints),
-            )
+            try:
+                self.spec.path(
+                    path=path,
+                    operations=self.get_operations(endpoints),
+                )
+            except Exception:
+                logger.error(f'Failed to generate schema for path {path}')
+                raise
 
         return self.spec.to_dict()

starmallow/utils.py

@@ -32,6 +32,7 @@ import marshmallow as ma
 import marshmallow.fields as mf
 import marshmallow_dataclass.collection_field as collection_field
 from marshmallow.validate import Equal, OneOf
+from starlette.responses import Response
 from typing_inspect import is_final_type, is_generic_type, is_literal_type
 
 from starmallow.concurrency import contextmanager_in_threadpool
@@ -257,9 +258,9 @@ def eq_marshmallow_fields(left: mf.Field, right: mf.Field) -> bool:
         This compares them instead.
     '''
     left_dict = left.__dict__.copy()
-    left_dict.pop('_creation_index')
+    left_dict.pop('_creation_index', None)
     right_dict = right.__dict__.copy()
-    right_dict.pop('_creation_index')
+    right_dict.pop('_creation_index', None)
 
     return left_dict == right_dict
 
@@ -302,7 +303,7 @@ def deep_dict_update(main_dict: Dict[Any, Any], update_dict: Dict[Any, Any]) ->
 
 
 def create_response_model(type_: Type[Any]) -> ma.Schema | mf.Field | None:
-    if type_ == inspect._empty:
+    if type_ in [inspect._empty, None] or issubclass(type_, Response):
         return None
 
     field = get_model_field(type_)

{starmallow-0.2.0.dist-info → starmallow-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: starmallow
-Version: 0.2.0
+Version: 0.2.1
 Summary: StarMallow framework
 Project-URL: Homepage, https://github.com/mvanderlee/starmallow
 Author-email: Michiel Vanderlee <jmt.vanderlee@gmail.com>

{starmallow-0.2.0.dist-info → starmallow-0.2.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-starmallow/__init__.py,sha256=tqX6S28Q4f2uL-sLuU-kA-FezgAqb3soEsmuf6Wwt1g,312
-starmallow/applications.py,sha256=bZxslvkNpsQMN4sagdiITnTDLEjFh--k8kPfEgIFQ_A,29167
+starmallow/__init__.py,sha256=Z9SbracH7YsHAB1n1L9nHMbxRCARFs22aHL9Nq8F9oU,312
+starmallow/applications.py,sha256=2lgblSsk9vbVI9t-r0RcvfFuvLB_vFw2OebSDiVO_TM,29311
 starmallow/concurrency.py,sha256=MVRjo4Vqss_yqhaoeVt3xb7rLaSuAq_q9uYgTwbsojE,1375
 starmallow/constants.py,sha256=u0h8cJKhJY0oIZqzr7wpEZG2bPLrw5FroMnn3d8KBNQ,129
 starmallow/dataclasses.py,sha256=ap9DInvQjH2AyI4MAAnbDEuNnbPb94PigaNmEb7AQU8,2658
@@ -10,19 +10,19 @@ starmallow/docs.py,sha256=eA39LunVMEoPU5ge4qxm2eiJbrFTUSUu5EhG1L_LKxk,6268
 starmallow/endpoint.py,sha256=5oHoWu2dSG_nnctRM60ZPkB1R9Mh4cJv5yxRbYEZHec,15593
 starmallow/endpoints.py,sha256=UrwVZCxbmWI20iNtJ0oXxo4d3-y12TjsOGs_jnStTiU,939
 starmallow/exception_handlers.py,sha256=gr2qLYWEtsIEH28n7OreEiiLVz6Y7b6osRyS9esJbBk,891
-starmallow/exceptions.py,sha256=AWIsbrqYXnPBQUGtUT0BPDqqljl53UdnIFTKw7BcraQ,642
+starmallow/exceptions.py,sha256=vabtPJkTmtCdC8_2OPBE8Osz0v0KxaSOX6IWf1jgNkc,872
 starmallow/fields.py,sha256=arrTabCYoJFZcoY69EZTBH3YUg7CUSr3-zYLiAjYLTM,1238
 starmallow/params.py,sha256=XRWIFLm2H5jQUIo4gm5Oi4xVqGNosaQSSi7QYqjJyxQ,7000
 starmallow/responses.py,sha256=k2pf_m21ykf_FECdODUz400pMucMJJf_Zm8TXFujvaU,2012
-starmallow/routing.py,sha256=jfEaP7bZm_744w1Q83BfeUHjRb0Jtd2umLc91J3awyA,47243
-starmallow/schema_generator.py,sha256=Tn9loWgvORScxt2UjcYW7KUt9zTk00gQwqkA1TOfGdw,16629
+starmallow/routing.py,sha256=UaqP4NLw7g3-gBFO85x83NDpsbFCZJMIjxQPT31BCS4,47257
+starmallow/schema_generator.py,sha256=6cMXlovR9xiA3g3Aryt6XFlzC74VVE-s_Ltsfl0nm-M,16815
 starmallow/serializers.py,sha256=rBEKMNgONgz_bai12uDvAEMCI_aEFGsqMSeIoWtlrOI,12514
 starmallow/types.py,sha256=8GXWjvzXQhF5NMHf14fbid6uErxVd1Xk_w2I4FoUgZ4,717
-starmallow/utils.py,sha256=PmOdXLVCC82Kqq4x_EYSLGVRuoc1WR6NCaMsHddTakg,9392
+starmallow/utils.py,sha256=MS44NCYDpKA3JRCvJ7lRhrBK57wT5T8QlylZxlcZLEU,9484
 starmallow/websockets.py,sha256=yIz3LzTBMNclpEoG7oTMbQwxbcdKNU6M8XcqZMyBTuA,2223
 starmallow/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 starmallow/ext/marshmallow/__init__.py,sha256=33jENGdfPq4-CDG0LOmN3KOGW1pXTy7a2oMwy4hrYzM,208
-starmallow/ext/marshmallow/openapi.py,sha256=6C-4n8sLPAmVutGVPkgpRJR-gJjJMXgsz0HicpDNcXw,9011
+starmallow/ext/marshmallow/openapi.py,sha256=5aGvbwLGVucsVhXExpYeyt8n5dQTzazrf-nuh6mVhmA,9017
 starmallow/middleware/__init__.py,sha256=vtNm85Z9pUPjJd-9giJGg3YL1wO7Jm5ooXBm31pDOK8,53
 starmallow/middleware/asyncexitstack.py,sha256=0GPhQSxqSVmAiVIqBIN5slueWYZ8bwh9f2bBPy7AbP0,1191
 starmallow/security/__init__.py,sha256=1rQFBIGnEbE51XDZSSi9NgPjXLScFq3RoLu4vk0KVYw,191
@@ -32,7 +32,7 @@ starmallow/security/http.py,sha256=rMwBYQQRil5iVjM87b0gsCENSFQXiqsdAfy0g6Qmvt8,6
 starmallow/security/oauth2.py,sha256=PWdrgqUeijxzRAQilXMXRb9DnA-U2-xMQ5LKL4S66t8,9914
 starmallow/security/open_id_connect_url.py,sha256=ykokB7mJYu4pFsHW4Ro1y71h-5H11mt90jyv64EIQBM,1386
 starmallow/security/utils.py,sha256=bd8T0YM7UQD5ATKucr1bNtAvz_Y3__dVNAv5UebiPvc,293
-starmallow-0.2.0.dist-info/METADATA,sha256=092BVH8BcK9I_XBrNALWyOJm-oeWEP4if7PPYTZ9WIc,5651
-starmallow-0.2.0.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
-starmallow-0.2.0.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
-starmallow-0.2.0.dist-info/RECORD,,
+starmallow-0.2.1.dist-info/METADATA,sha256=a-W6lFF1CHbt1bMQxz-VBT-flN3cZh_5FHB-WF0MBDA,5651
+starmallow-0.2.1.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
+starmallow-0.2.1.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
+starmallow-0.2.1.dist-info/RECORD,,