Project structure update

Author: insspb

flask_mongoengine/__init__.py

@@ -5,16 +5,12 @@
 from mongoengine.errors import DoesNotExist
 from mongoengine.queryset import QuerySet
 
+from flask_mongoengine import db_fields
 from flask_mongoengine.connection import *
 from flask_mongoengine.json import override_json_encoder
 from flask_mongoengine.pagination import *
 from flask_mongoengine.sessions import *
 
-try:
-    from flask_mongoengine.wtf import db_fields
-except ImportError:
-    from mongoengine import fields as db_fields
-
 
 def current_mongoengine_instance():
     """Return a MongoEngine instance associated with current Flask app."""

flask_mongoengine/wtf/db_fields.py renamed to flask_mongoengine/db_fields.py

@@ -1,6 +1,14 @@
 """Responsible for mongoengine fields extension, if WTFForms integration used."""
 from typing import Callable, List, Optional, Union
 
+try:
+    from wtforms import fields as wtf_fields
+    from wtforms import validators as wtf_validators
+except ImportError:
+    wtf_fields = None
+    wtf_validators = None
+
+
 from mongoengine import fields
 
 __all__ = [

flask_mongoengine/wtf/__init__.py

@@ -1,2 +1,2 @@
 """WTFForms integration module init file."""
-from flask_mongoengine.wtf.db_fields import *  # noqa
+from flask_mongoengine.wtf.orm import model_fields, model_form  # noqa