starmallow 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

starmallow/__init__.py

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

starmallow/endpoint.py

@@ -153,8 +153,10 @@ class SchemaModel(ma.Schema):
             self.schema,
             required=self.required,
             load_default=self.load_default,
+            unknown=ma.EXCLUDE,
             **self.kwargs,
             metadata=metadata,
+
         )
 
     def load(

starmallow/params.py

@@ -159,6 +159,7 @@ class Header(Param):
             title=title,
         )
 
+
 class Cookie(Param):
     in_ = ParamType.cookie
 

starmallow/request_resolver.py

@@ -90,16 +90,22 @@ def request_params_to_args(
                 error_store.store_error(error.messages, field_name)
         elif isinstance(param.model, ma.Schema):
             try:
-                if ignore_namespace:
-                    # Load model from entire params
-                    values[field_name] = param.model.load(received_params, unknown=ma.EXCLUDE)
-                else:
-                    values[field_name] = param.model.load(
-                        received_params.get(alias, ma.missing),
-                        unknown=ma.EXCLUDE,
-                    )
+                load_params = received_params if ignore_namespace else received_params.get(alias, {})
+
+                # Entire model is optional and no data was passed in.
+                # if getattr(param.model, 'required') is False and not load_params:
+                #     values[field_name] = None
+                # else:
+                    # NOTE: If schema is not required, but there are some params defined then we will try to load
+                    # This is because multiple schemas/fields may be defined per ParamType.
+                values[field_name] = param.model.load(load_params, unknown=ma.EXCLUDE)
+
             except ma.ValidationError as error:
-                error_store.store_error(error.messages)
+                # Entire model is optional, so ignore errors
+                if getattr(param.model, 'required', None) is False:
+                    values[field_name] = None
+                else:
+                    error_store.store_error(error.messages)
         else:
             raise Exception(f'Invalid model type {type(param.model)}, expected marshmallow Schema or Field')
 

starmallow/schema_generator.py

@@ -223,6 +223,7 @@ class SchemaGenerator(BaseSchemaGenerator):
             *endpoint.form_params.items(),
         ]
         schema_by_media_type = {}
+        is_body_required = True
 
         # If only 1 schema is defined. Use it as the entire schema.
         if len(all_body_params) == 1 and isinstance(all_body_params[0][1].model, ma.Schema):
@@ -233,6 +234,9 @@ class SchemaGenerator(BaseSchemaGenerator):
             if endpoint_schema:
                 schema_by_media_type[body_param.media_type] = {'schema': endpoint_schema}
 
+            if getattr(body_param.model, 'required', True) is False:
+                is_body_required = False
+
         # Otherwise, loop over all body params and build a new schema from the key value pairs.
         # This mimic's FastApi's behaviour: https://fastapi.tiangolo.com/tutorial/body-multiple-params/#multiple-body-parameters
         else:
@@ -280,7 +284,7 @@ class SchemaGenerator(BaseSchemaGenerator):
         if schema_by_media_type:
             schema['requestBody'] = {
                 'content': schema_by_media_type,
-                'required': True,
+                'required': is_body_required,
             }
 
     def _add_security_params(

starmallow/utils.py

@@ -9,7 +9,7 @@ from contextlib import AsyncExitStack, asynccontextmanager, contextmanager
 from dataclasses import is_dataclass
 from decimal import Decimal
 from enum import Enum
-from types import NoneType
+from types import NoneType, UnionType
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -191,7 +191,7 @@ def is_body_allowed_for_status_code(status_code: int | str | None) -> bool:
 
 
 def is_optional(field):
-    return get_origin(field) is Union and type(None) in get_args(field)
+    return get_origin(field) in (Union, UnionType) and type(None) in get_args(field)
 
 
 def get_path_param_names(path: str) -> Set[str]:

{starmallow-0.5.0.dist-info → starmallow-0.6.0.dist-info}/METADATA

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

{starmallow-0.5.0.dist-info → starmallow-0.6.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-starmallow/__init__.py,sha256=01Y6juyLnOP83a39nE_mBYK-sEnBIX2SceZ_W32qY9w,322
+starmallow/__init__.py,sha256=HQAGoExawiWadHBvjDtczQGIc9vyqmGXuE4ddzl_lBs,322
 starmallow/applications.py,sha256=mSL4YDozP8n6v22g4NX7EAMXmGhzzhtjtZd68YHcFvw,31720
 starmallow/concurrency.py,sha256=MVRjo4Vqss_yqhaoeVt3xb7rLaSuAq_q9uYgTwbsojE,1375
 starmallow/constants.py,sha256=u0h8cJKhJY0oIZqzr7wpEZG2bPLrw5FroMnn3d8KBNQ,129
@@ -7,20 +7,20 @@ starmallow/datastructures.py,sha256=iH_KJuJ6kBCWEsnHFLdA3iyb6ZxhfdMHYrJlhiEZtDU,
 starmallow/decorators.py,sha256=MYk3WEFRSfQTN0Y3JoL3Y_Cz47gatMrVEPtNDw42XwU,4105
 starmallow/delimited_field.py,sha256=gonWgYg6G5xH2yXAyfDgkePmQ8dUaRSp2hdJ3mCfOBw,3466
 starmallow/docs.py,sha256=eA39LunVMEoPU5ge4qxm2eiJbrFTUSUu5EhG1L_LKxk,6268
-starmallow/endpoint.py,sha256=YdEtRKF1Z-p_KXoqJJNP_9nEwOzvgxYoMI3Rly7ECrM,15888
+starmallow/endpoint.py,sha256=WTXimVb6lfCYAUY8KDZS-mc1yHynSBjR2Sa4IGol2fc,15921
 starmallow/endpoints.py,sha256=UrwVZCxbmWI20iNtJ0oXxo4d3-y12TjsOGs_jnStTiU,939
 starmallow/exception_handlers.py,sha256=gr2qLYWEtsIEH28n7OreEiiLVz6Y7b6osRyS9esJbBk,891
 starmallow/exceptions.py,sha256=vabtPJkTmtCdC8_2OPBE8Osz0v0KxaSOX6IWf1jgNkc,872
 starmallow/fields.py,sha256=arrTabCYoJFZcoY69EZTBH3YUg7CUSr3-zYLiAjYLTM,1238
-starmallow/params.py,sha256=-f6ut1p_w_I8lyEgRciJxUtHmoVXKAD2Ug4KuRjPlJA,8661
-starmallow/request_resolver.py,sha256=kT7B0BWSqBP_9Jl865Ya_Op9I3W4FyfBxXjvtucWT_0,10785
+starmallow/params.py,sha256=MJzUzUs6GEyrbpDZ1r8To8vR-QwpopdxDStq802o5Ug,8662
+starmallow/request_resolver.py,sha256=5UpdK6NkT7jxTjw1XtSsyXgqfiQHmVBcMQdr0ycmego,11214
 starmallow/requests.py,sha256=o_yNhH9WJ35uAGuoXa5_gihevHeaveOvkP525dbwQSU,843
 starmallow/responses.py,sha256=k2pf_m21ykf_FECdODUz400pMucMJJf_Zm8TXFujvaU,2012
 starmallow/routing.py,sha256=Uxnlkl4eIs56TZ8VAgNmlh-K89ku1Xu_ROR5S8x-rkg,45128
-starmallow/schema_generator.py,sha256=BKtXVQoNFWoAIEtiRNylWls_7nyFIshy3_myooogjoI,17806
+starmallow/schema_generator.py,sha256=yi368FwF9B50ZHSNOG0rvYVirVUeMFq2kXkUDeJUz4w,17961
 starmallow/serializers.py,sha256=rBEKMNgONgz_bai12uDvAEMCI_aEFGsqMSeIoWtlrOI,12514
 starmallow/types.py,sha256=8GXWjvzXQhF5NMHf14fbid6uErxVd1Xk_w2I4FoUgZ4,717
-starmallow/utils.py,sha256=AkVesTbYnshaXZqdgpc09TpZF07LIUeCOwOlvCaQrAI,11412
+starmallow/utils.py,sha256=Ab6F2yOiy65gVGC2C4mNyKiPTPdsRyH5eVAv7Q_dGbw,11436
 starmallow/websockets.py,sha256=yIz3LzTBMNclpEoG7oTMbQwxbcdKNU6M8XcqZMyBTuA,2223
 starmallow/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 starmallow/ext/marshmallow/__init__.py,sha256=33jENGdfPq4-CDG0LOmN3KOGW1pXTy7a2oMwy4hrYzM,208
@@ -34,7 +34,7 @@ starmallow/security/http.py,sha256=cpGjM1kFDq3i_bOY96kMkf4cspBUxFkkET9lTK3NA-0,6
 starmallow/security/oauth2.py,sha256=1nv1580PY4cwgu5gzpQCf2MfMNv2Cfv05753AUHPOhQ,10005
 starmallow/security/open_id_connect_url.py,sha256=IPsL2YzWc2mPwJbrUn6oFRTi7uRAG6mR62CGwmzBs1k,1399
 starmallow/security/utils.py,sha256=bd8T0YM7UQD5ATKucr1bNtAvz_Y3__dVNAv5UebiPvc,293
-starmallow-0.5.0.dist-info/METADATA,sha256=M7Y6uK8nmKdGATGmuX96mPkyvlAlww0xnASnYcddDkE,5651
-starmallow-0.5.0.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
-starmallow-0.5.0.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
-starmallow-0.5.0.dist-info/RECORD,,
+starmallow-0.6.0.dist-info/METADATA,sha256=JLW2qKd2rbIU1kE7FHp2NoOeYDTckYEPR3tKGiRv-k0,5651
+starmallow-0.6.0.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
+starmallow-0.6.0.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
+starmallow-0.6.0.dist-info/RECORD,,