Merge pull request #37 from AdCombo/revert_bad_resource_validation_commit

Revert bad resource validation commit

Author: roman-adcombo

docs/conf.py

@@ -63,7 +63,7 @@
 # The short X.Y version.
 version = "1.0"
 # The full version, including alpha/beta/rc tags.
-release = "1.0.4"
+release = "1.0.5"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

flask_combo_jsonapi/resource.py

@@ -17,7 +17,7 @@
 from flask_combo_jsonapi.schema import compute_schema, get_relationships, get_model_field
 from flask_combo_jsonapi.data_layers.base import BaseDataLayer
 from flask_combo_jsonapi.data_layers.alchemy import SqlalchemyDataLayer
-from flask_combo_jsonapi.utils import JSONEncoder, validate_model_init_params
+from flask_combo_jsonapi.utils import JSONEncoder
 
 
 class ResourceMeta(MethodViewType):
@@ -39,14 +39,6 @@ def __new__(cls, name, bases, d):
             data_layer_kwargs = d["data_layer"]
             rv._data_layer = data_layer_cls(data_layer_kwargs)
 
-            if "schema" in d and "model" in data_layer_kwargs:
-                model = data_layer_kwargs["model"]
-                schema_fields = [get_model_field(d["schema"], key) for key in d["schema"]._declared_fields.keys()]
-                invalid_params = validate_model_init_params(model=model, params_names=schema_fields)
-                if invalid_params:
-                    raise Exception(f"Construction of {name} failed. Schema '{d['schema'].__name__}' has "
-                                    f"fields={invalid_params} are not declare in {model.__name__} init parameters")
-
         rv.decorators = (check_headers,)
         if "decorators" in d:
             rv.decorators += d["decorators"]

flask_combo_jsonapi/utils.py

@@ -1,5 +1,3 @@
-import inspect
-
 import simplejson as json
 from uuid import UUID
 from datetime import datetime
@@ -19,30 +17,3 @@ def default(self, obj):
         elif isinstance(obj, UUID):
             return str(obj)
         return json.JSONEncoder.default(self, obj)
-
-
-def get_model_init_params_names(model):
-    """Retrieve all params of model init method
-
-    :param DeclarativeMeta model: an object from sqlalchemy
-    :return tuple: list of init method fields names and boolean flag that init method has kwargs
-    """
-    argnames, _, varkw = inspect.getfullargspec(model.__init__)[:3]
-    if argnames:
-        argnames.remove('self')
-    return argnames, bool(varkw)
-
-
-def validate_model_init_params(model, params_names):
-    """Retrieve invalid params of model init method if it exists
-    :param DeclarativeMeta model: an object from sqlalchemy
-    :param list params_names: parameters names to check
-    :return list: list of invalid fields or None
-    """
-    init_args, has_kwargs = get_model_init_params_names(model)
-    if has_kwargs:
-        return
-
-    invalid_params = [name for name in params_names if name not in init_args]
-    if invalid_params:
-        return invalid_params

setup.py

@@ -1,7 +1,7 @@
 import os
 from setuptools import setup, find_packages
 
-__version__ = "1.0.4"
+__version__ = "1.0.5"
 
 
 requirements_filepath = os.path.join(os.path.dirname(__name__), "requirements.txt")