Merge pull request #53 from mekanix/feature/specific-model

Try import of specific DB type model first

freenit/__init__.py

@@ -1,12 +1,13 @@
 import sys
 from importlib import import_module
 
-import freenit.schemas.user
 from flask import Flask, send_file
 from flask_collect import Collect
 from flask_cors import CORS
 from flask_jwt_extended import JWTManager
 from flask_security import Security
+
+import freenit.schemas.user
 from freenit.schemas.paging import PageOutSchema
 
 from . import cli
@@ -19,8 +20,14 @@ def sqlinit(app):
     from .db import db
     db.init_app(app)
     app.db = db
-    User = import_module(f"{app.config['NAME']}.models.user").User
-    role_module = import_module(f"{app.config['NAME']}.models.role")
+    try:
+        User = import_module(f"{app.config['NAME']}.models.sql.user").User
+    except ModuleNotFoundError:
+        User = import_module(f"{app.config['NAME']}.models.user").User
+    try:
+        role_module = import_module(f"{app.config['NAME']}.models.role")
+    except ModuleNotFoundError:
+        role_module = import_module(f"{app.config['NAME']}.models.sql.role")
     Role = role_module.Role
     UserRoles = role_module.UserRoles
     app.user_datastore = PeeweeUserDatastore(
@@ -35,8 +42,14 @@ def mongoinit(app):
     from flask_security import MongoEngineUserDatastore
     from flask_mongoengine import MongoEngine
     app.db = MongoEngine(app)
-    User = import_module(f"{app.config['NAME']}.models.user").User
-    Role = import_module(f"{app.config['NAME']}.models.role").Role
+    try:
+        User = import_module(f"{app.config['NAME']}.models.user").User
+    except ModuleNotFoundError:
+        User = import_module(f"{app.config['NAME']}.models.mongo.user").User
+    try:
+        Role = import_module(f"{app.config['NAME']}.models.role").Role
+    except ModuleNotFoundError:
+        Role = import_module(f"{app.config['NAME']}.models.mongo.role").Role
     app.user_datastore = MongoEngineUserDatastore(app.db, User, Role)
 
 

freenit/schemas/base.py

@@ -1,4 +1,4 @@
-from marshmallow import Schema
+from marshmallow import EXCLUDE, Schema
 
 from ..fields.objectid import ID
 
@@ -9,3 +9,4 @@ class BaseSchema(Schema):
     class Meta:
         strict = True
         ordered = True
+        unknown = EXCLUDE

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name='freenit',
-    version='0.1.3',
+    version='0.1.4',
     description='REST API framework based on Flask-Smorest',
     long_description=README,
     long_description_content_type='text/markdown',