Flask-Exts 0.2.1__tar.gz → 0.2.2__tar.gz

{flask_exts-0.2.1 → flask_exts-0.2.2}/CHANGES.rst

@@ -1,3 +1,16 @@
+v0.2.2
+------
+
+Released 2025-04-09
+
+- fix datetimepicker
+- set session = db.session as default if ModelView of sqla init session is None
+- set session = db.session as default if QueryAjaxModelLoader init session is None
+- fix select.ajax for select2@4.1.0 
+- fix select in modal
+- add casbin
+- add module: security 
+
 v0.2.1
 ------
 

{flask_exts-0.2.1 → flask_exts-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Flask-Exts
-Version: 0.2.1
+Version: 0.2.2
 Summary: Flask extensions with admin, SQLAlchemy, babel, forms, fields, widgets, and so on.
 Project-URL: Documentation, https://flask-exts.readthedocs.io
 Project-URL: Source, https://github.com/ojso/flask-exts
@@ -41,11 +41,14 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Build Tools
 Requires-Python: >=3.10
+Requires-Dist: casbin>=1.0
 Requires-Dist: flask-babel>=4.0
 Requires-Dist: flask-login>=0.6
 Requires-Dist: flask-sqlalchemy>=3.0
 Requires-Dist: flask>=3.0
+Requires-Dist: pyjwt>=2.0
 Requires-Dist: tablib>=3.0
+Requires-Dist: webauthn>=2.0
 Requires-Dist: wtforms>=3.0
 Provides-Extra: rediscli
 Requires-Dist: redis>=4.0.0; extra == 'rediscli'
@@ -56,10 +59,10 @@ Flask Exts
 
 Flask-Exts is mainly inspired by:
 
-- `WTForms <https://github.com/wtforms/wtforms/>`_
-- `Flask-Admin <https://github.com/flask-admin/flask-admin/>`_
+- `Flask-Admin <https://github.com/pallets-eco/flask-admin/>`_
+- `Flask-Security <https://github.com/pallets-eco/flask-security/>`_
 
-Flask-Exts is part rewrited from above and well tested.
+Flask-Exts is partially rewrited from above and well tested.
 
 License
 -------

{flask_exts-0.2.1 → flask_exts-0.2.2}/README.rst

@@ -3,10 +3,10 @@ Flask Exts
 
 Flask-Exts is mainly inspired by:
 
-- `WTForms <https://github.com/wtforms/wtforms/>`_
-- `Flask-Admin <https://github.com/flask-admin/flask-admin/>`_
+- `Flask-Admin <https://github.com/pallets-eco/flask-admin/>`_
+- `Flask-Security <https://github.com/pallets-eco/flask-security/>`_
 
-Flask-Exts is part rewrited from above and well tested.
+Flask-Exts is partially rewrited from above and well tested.
 
 License
 -------

{flask_exts-0.2.1 → flask_exts-0.2.2}/docs/configure.rst

@@ -6,8 +6,6 @@ Configuration
 ==============
 
 ========================== =====================================================================
-``BABEL_ENABLED``          Set to ``False`` to disable babel extension.
-                           Default is ``True``.
 ``BABEL_ACCEPT_LANGUAGES`` Set to ``en;zh`` to bebel's accept languages.
                            Default is ``None``.
 ``BABEL_DEFAULT_TIMEZONE`` Set to ``Asia/Shanghai`` to babel's default timezone.
@@ -20,17 +18,7 @@ Configuration
                            Default is ``csrf_token``.
 ``CSRF_TIME_LIMIT``        Max age in seconds for CSRF tokens. 
                            Default is ``1800``. 
-``TEMPLATE_ENABLED``       Set to ``False`` to disable templating extension.
-                           Default is ``True``.
 ``TEMPLATE_THEME``         Set to ``theme`` to create custom theme                           
                            Default is ``template.theme.BootstrapTheme(4)``
-``USER_ENABLED``           Set to ``False`` to disable ``User`` support. 
-                           Default is ``True``. 
-``ADMIN_ENABLED``          Set to ``False`` to disable ``Admin`` support. 
-                           Default is ``True``. 
-``USER_CENTER``            set to ``user center`` to create custom user_center
-                           Default is ``users.user_center.DefaultUserCenter()``
-``FLASK_LOGIN_ENABLED``    Set to ``False`` to disable ``Flask-Login``. 
-                           Default is ``True``. 
 ========================== =====================================================================
 

{flask_exts-0.2.1 → flask_exts-0.2.2}/docs/index.rst

@@ -6,7 +6,14 @@
 Welcome to Flask-Exts's documentation!
 ======================================
 
-**Flask-Exts** is a Flask extensions with admin, SQLAlchemy, babel, forms, fields, widgets, and so on.
+**Flask-Exts** is a Flask extensions with SQLAlchemy, babel, forms, fields, widgets, and so on.
+
+Flask-Exts is mainly inspired by:
+
+- `Flask-Admin <https://github.com/pallets-eco/flask-admin/>`_
+- `Flask-Security <https://github.com/pallets-eco/flask-security/>`_
+
+Flask-Exts is partially rewrited from above and well tested.
 
 .. _installation:
 

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/bootstrap4/app.py

@@ -1,13 +1,12 @@
-# -*- coding: utf-8 -*-
 from enum import Enum
 from flask import Flask, render_template, request, flash, redirect, url_for
 from markupsafe import Markup
 from wtforms.validators import DataRequired, Length, Regexp
 from wtforms.fields import *
-from flask_sqlalchemy import SQLAlchemy
 from flask_exts.forms.form import FlaskForm
 from flask_exts.forms.fields import SwitchField
 from flask_exts import Manager
+from flask_exts.datastore.sqla import db
 
 manager = Manager()
 
@@ -16,7 +15,6 @@ app.secret_key = 'dev'
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///:memory:'
 app.config['ADMIN_ENABLED'] = False
 manager.init_app(app)
-db = SQLAlchemy(app)
 
 class ExampleForm(FlaskForm):
     """An example form that contains all the supported bootstrap style form fields."""

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/bootstrap5/app.py

@@ -1,19 +1,17 @@
 from enum import Enum
 from flask import Flask, render_template, request, flash, redirect, url_for
-from flask import current_app
 from markupsafe import Markup
 from wtforms.validators import DataRequired, Length, Regexp
 from wtforms.fields import *
-from flask_sqlalchemy import SQLAlchemy
 
 from flask_exts.forms.form import FlaskForm
 from flask_exts.forms.fields import SwitchField
 from flask_exts import Manager
 from flask_exts.template.theme import BootstrapTheme
+from flask_exts.datastore.sqla import db
 
 theme = BootstrapTheme(version=5)
 
-manager = Manager()
 app = Flask(__name__)
 app.secret_key = "dev"
 
@@ -22,8 +20,9 @@ app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
 # set bootstrap5
 app.config["TEMPLATE_THEME"] = theme
 app.config['ADMIN_ENABLED'] = False
+
+manager = Manager()
 manager.init_app(app)
-db = SQLAlchemy(app)
 
 
 class ExampleForm(FlaskForm):

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/admin_views.py

@@ -9,18 +9,18 @@ from flask_exts.admin.menu import MenuLink
 
 
 def add_views(app):
-    admin = app.extensions["admin"][0]
+    admin = app.extensions["manager"].admins[0]
 
     admin.add_view(myview)
     admin.add_view(userview)
     admin.add_view(keywordview)
-    admin.add_view(treeview)
     admin.add_view(authorview)
     admin.add_view(tagview)
     admin.add_view(postview)
-    admin.add_link(MenuLink(name="other", url="/", category="other"))
-    admin.add_sub_category(name="Links", parent_name="Other")
-    admin.add_link(MenuLink(name="Back Home", url="/", category="Links"))
-    admin.add_link(
-        MenuLink(name="External link", url="http://www.example.com/", category="Links")
-    )
+    admin.add_view(treeview)
+    admin.menu.add_category(name="Links")
+    admin.menu.add_link(MenuLink(name="Back Home", url="/", category="Links"))
+    admin.menu.add_sub_category(name='External',parent_name='Links')
+    # admin.menu.add_link(
+    #     MenuLink(name="External link", url="http://www.example.com/", category="External")
+    # )

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/build_sample.py

@@ -1,5 +1,6 @@
 import random
 import datetime
+from flask_exts.proxies import current_usercenter
 from .models import db
 from .models.author import Author
 from .models.author import AVAILABLE_USER_TYPES
@@ -7,11 +8,19 @@ from .models.tag import Tag
 from .models.post import Post
 from .models.tree import Tree
 from .models.keyword import Keyword
-from .models.user import User
+from .models.user import MyUser
+
+
+def build_user_admin():
+    u, _ = current_usercenter.create_user(
+        username="admin", password="admin", email="admin@example.com"
+    )
+    r, _ = current_usercenter.create_role(name="admin")
+    current_usercenter.user_add_role(u, r)
 
 
 def build_sample_userkeyword():
-    user_log = User()
+    user_log = MyUser()
     user_log.username = "log"
     user_log.email = "log"
     user_log.password = "log"
@@ -215,5 +224,6 @@ def build_sample_db():
     build_sample_userkeyword()
     build_sample_tree()
     build_sample_post()
+    build_user_admin()
 
     return

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/make_app.py

@@ -1,7 +1,6 @@
 import os.path as op
 from flask import Flask
 from flask_exts import Manager
-from .user_center import UserCenter
 
 
 def get_sqlite_path():
@@ -10,11 +9,6 @@ def get_sqlite_path():
     return database_path
 
 
-def register_users(app):
-    user_center = app.config["USER_CENTER"]
-    user_center.register_user("admin", "admin", "admin@example.com")
-
-
 def create_app():
     app = Flask(__name__)
     app.config["SECRET_KEY"] = "dev"
@@ -24,9 +18,10 @@ def create_app():
     # app.config["SQLALCHEMY_ECHO"] = True
     app.config["DATABASE_FILE"] = get_sqlite_path()
     app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///" + app.config["DATABASE_FILE"]
-
-    app.config["USER_CENTER"] = UserCenter()
-
+    # JWT
+    app.config["JWT_SECRET_KEY"] = "SECRET_KEY"
+    app.config["JWT_HASH"] = "HS256"
+    # app.config["ADMIN_ACCESS_ENABLED"] = False
     init_app(app)
 
     return app
@@ -34,13 +29,13 @@ def create_app():
 
 def init_app(app: Flask):
 
-    from .models import init_db
-
-    init_db(app)
-
     manager = Manager()
     manager.init_app(app)
 
+    from .models import init_models
+
+    init_models()
+
     from .admin_views import add_views
 
     add_views(app)
@@ -50,4 +45,3 @@ def init_app(app: Flask):
             from .build_sample import build_sample_db
 
             build_sample_db()
-            register_users(app)

flask_exts-0.2.2/examples/demo/models/__init__.py

@@ -0,0 +1,12 @@
+from flask_exts.datastore.sqla import db
+
+
+def init_models():
+    from . import user
+    from . import keyword
+    from . import user_keyword
+    from . import tag
+    from . import author
+    from . import post
+    from . import post_tag
+    from . import tree

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/models/user.py

@@ -5,12 +5,12 @@ from sqlalchemy.orm import mapped_column
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.associationproxy import AssociationProxy
-from flask_login import UserMixin
 from . import db
 from .keyword import Keyword
 from .user_keyword import UserKeywordAssociation
 
-class User(db.Model, UserMixin):
+class MyUser(db.Model):
+    __tablename__="myuser"
     id: Mapped[int] = mapped_column(primary_key=True)
     username: Mapped[str]
     email: Mapped[str]
@@ -21,7 +21,7 @@ class User(db.Model, UserMixin):
     )
 
     user_keyword_associations: Mapped[List["UserKeywordAssociation"]] = relationship(
-        back_populates="user",
+        back_populates="myuser",
         cascade="all, delete-orphan",
     )
 

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/models/user_keyword.py

@@ -10,17 +10,17 @@ from .keyword import Keyword
 
 class UserKeywordAssociation(db.Model):
     __tablename__ = "user_keyword"
-    user_id = mapped_column(ForeignKey("user.id"), primary_key=True)
+    myuser_id = mapped_column(ForeignKey("myuser.id"), primary_key=True)
     keyword_id = mapped_column(ForeignKey("keyword.id"), primary_key=True)
     special_key: Mapped[Optional[str]]
 
-    user: Mapped["User"] = relationship(back_populates="user_keyword_associations")
+    myuser: Mapped["MyUser"] = relationship(back_populates="user_keyword_associations")
     keyword: Mapped[Keyword] = relationship()
 
     # Reference to the "keyword" column inside the "Keyword" object.
     keyword_value = association_proxy('keyword', 'keyword')
 
-    def __init__(self, keyword=None, user=None, special_key=None):
-        self.user = user
+    def __init__(self, keyword=None, myuser=None, special_key=None):
+        self.myuser = myuser
         self.keyword = keyword
         self.special_key = special_key

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/views/author_view.py

@@ -4,12 +4,10 @@ from flask_babel import gettext
 from flask_exts.admin.sqla.filters import BaseSQLAFilter
 from flask_exts.admin.sqla.filters import FilterEqual
 from flask_exts.admin.sqla import ModelView
-from ..models import db
-from ..models.author import Author,AVAILABLE_USER_TYPES
+from ..models.author import Author, AVAILABLE_USER_TYPES
 from ..models.post import Post
 
 
-
 # Custom filter class
 class FilterLastNameBrown(BaseSQLAFilter):
     def apply(self, query, value, alias=None):
@@ -133,4 +131,4 @@ class AuthorView(ModelView):
         return form
 
 
-authorview = AuthorView(Author, db.session)
+authorview = AuthorView(Author)

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/views/keyword_view.py

@@ -1,5 +1,4 @@
 from flask_exts.admin.sqla import ModelView
-from ..models import db
 from ..models.keyword import Keyword
 
 
@@ -7,4 +6,4 @@ class KeywordView(ModelView):
     column_list = ("id", "keyword")
 
 
-keywordview = KeywordView(Keyword, db.session)
+keywordview = KeywordView(Keyword)

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/views/post_view.py

@@ -1,13 +1,13 @@
 from wtforms import validators
 from flask_exts.admin.sqla import ModelView
 from flask_exts.admin.sqla.filters import FilterLike
-from ..models import db
 from ..models.post import Post
 from ..models.author import Author
 
 
 # Customized Post model admin
 class PostView(ModelView):
+    can_view_details = True
     column_display_pk = True
     column_list = [
         "id",
@@ -24,6 +24,8 @@ class PostView(ModelView):
     column_default_sort = ("date", True)
     create_modal = True
     # edit_modal = True
+    # details_modal = True
+
     column_sortable_list = [
         "id",
         "title",
@@ -80,8 +82,12 @@ class PostView(ModelView):
         # },
     }
 
+    column_descriptions = dict(
+        color='favorite color'
+        )
+
 
 # Add views
 
 
-postview = PostView(Post, db.session)
+postview = PostView(Post)

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/views/tag_view.py

@@ -1,5 +1,4 @@
 from flask_exts.admin.sqla import ModelView
 from ..models.tag import Tag
-from ..models import db
 
-tagview = ModelView(Tag, db.session)
+tagview = ModelView(Tag)

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/views/tree_view.py

@@ -1,20 +1,27 @@
 from flask_exts.admin.sqla import ModelView
-from ..models import db
 from ..models.tree import Tree
 
+
 class TreeView(ModelView):
-    list_template = 'tree_list.html'
+    list_template = "tree_list.html"
     column_auto_select_related = True
     column_list = [
-        'id',
-        'name',
-        'parent',
+        "id",
+        "name",
+        "parent",
+    ]
+    form_excluded_columns = [
+        "children",
+    ]
+    column_filters = [
+        "id",
+        "name",
+        "parent",
     ]
-    form_excluded_columns = ['children', ]
-    column_filters = ['id', 'name', 'parent', ]
 
     # override the 'render' method to pass your own parameters to the template
     def render(self, template, **kwargs):
         return super().render(template, foo="bar", **kwargs)
 
-treeview = TreeView(Tree, db.session, category="tree")
+
+treeview = TreeView(Tree)

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/demo/views/user_view.py

@@ -1,6 +1,5 @@
 from flask_exts.admin.sqla import ModelView
-from ..models import db
-from ..models.user import User
+from ..models.user import MyUser
 
 
 class UserView(ModelView):
@@ -11,4 +10,4 @@ class UserView(ModelView):
     can_view_details = True
 
 
-userview = UserView(User, db.session, endpoint="users")
+userview = UserView(MyUser, name="Users", endpoint="users")

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/fileadmin/make_app.py

@@ -1,6 +1,7 @@
 from flask import Flask
 from flask_exts import Manager
 from .file_view import file_view
+from flask_exts.datastore.sqla import db
 
 
 def create_app():
@@ -8,6 +9,7 @@ def create_app():
     app = Flask(__name__)
     app.config["SECRET_KEY"] = "dev"
     app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
+    app.config["ADMIN_ACCESS_ENABLED"] = False
     init_app(app)
     return app
 
@@ -16,11 +18,15 @@ def init_app(app: Flask):
     manager = Manager()
     manager.init_app(app)
 
+    with app.app_context():
+        # db.drop_all()
+        db.create_all()
+
     # Flask views
     @app.route("/")
     def index():
 
         return '<a href="/admin/">Click me to get to Admin!</a>'
 
-    admin = app.extensions["admin"][0]
+    admin = app.extensions["manager"].admins[0]
     admin.add_view(file_view)

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/rediscli.py

@@ -5,11 +5,12 @@ from flask_exts.views.rediscli_view import RedisCli
 
 app = Flask(__name__)
 app.config["SECRET_KEY"] = "dev"
+app.config["ADMIN_ACCESS_ENABLED"] =False
 # Manager init
 manager = Manager()
 manager.init_app(app)
 # add rediscli
-admin = app.extensions["admin"][0]
+admin = app.extensions["manager"].admins[0]
 redis_view = RedisCli(Redis())
 admin.add_view(redis_view)
 

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/sqla-custom-inline-forms/make_app.py

@@ -8,6 +8,7 @@ from flask_exts.admin.menu import MenuLink
 from .models import db
 
 from .views.image_view import locationview
+
 # from .views.my_view import myview
 # from .views.user_view import userview
 # from .views.tree_view import treeview
@@ -15,19 +16,23 @@ from .views.image_view import locationview
 # from .views.post_view import tagview
 
 # Figure out base upload path
-static_path = op.join(op.dirname(__file__), 'static')
+static_path = op.join(op.dirname(__file__), "static")
+
 
 def remove_image(image_path):
     os.remove(op.join(static_path, image_path))
 
-def save_image(file_data,image_path):
+
+def save_image(file_data, image_path):
     file_data.save(op.join(static_path, image_path))
 
+
 def get_sqlite_path():
     app_dir = op.realpath(op.dirname(__file__))
     database_path = op.join(app_dir, "sample.sqlite")
     return database_path
 
+
 def create_app():
     app = Flask(__name__)
     app.config["SECRET_KEY"] = "dev"
@@ -37,23 +42,19 @@ def create_app():
     # app.config['SQLALCHEMY_ECHO'] = True
     app.config["DATABASE_FILE"] = get_sqlite_path()
     app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///" + app.config["DATABASE_FILE"]
+    app.config["ADMIN_ACCESS_ENABLED"] = False
     init_app(app)
 
     return app
 
 
 def init_app(app: Flask):
-
-    from .models import init_db
-
-    init_db(app)
-
     app.save_image = save_image
 
     from .models.model import Location
 
     # Register after_delete handler which will delete image file after model gets deleted
-    @event.listens_for(Location, 'after_delete')
+    @event.listens_for(Location, "after_delete")
     def _handle_image_delete(mapper, conn, target):
         for location_image in target.images:
             try:
@@ -65,19 +66,23 @@ def init_app(app: Flask):
     manager = Manager()
     manager.init_app(app)
 
-    admin = app.extensions["admin"][0]
+    admin = app.extensions["manager"].admins[0]
 
     admin.add_view(locationview)
-    admin.add_link(MenuLink(name='locationlist', url='/locationlist', category='List'))
+    admin.menu.add_link(
+        MenuLink(name="locationlist", url="/locationlist", category="List")
+    )
 
-    @app.route('/locationlist')
+    @app.route("/locationlist")
     def location_list():
         from .models.model import Location
         from flask import render_template
+
         locations = db.session.query(Location).all()
-        return render_template('locations.html', locations=locations)
+        return render_template("locations.html", locations=locations)
 
     if not op.exists(app.config["DATABASE_FILE"]):
-        with app.app_context():            
+        with app.app_context():
             from .data import build_sample_db
+
             build_sample_db()

flask_exts-0.2.2/examples/sqla-custom-inline-forms/models/__init__.py

@@ -0,0 +1 @@
+from flask_exts.datastore.sqla import db

{flask_exts-0.2.1 → flask_exts-0.2.2}/examples/sqla-custom-inline-forms/views/image_view.py

@@ -8,7 +8,6 @@ from flask_exts.admin.model.form import InlineFormAdmin
 from flask_exts.admin.sqla import ModelView
 from flask_exts.admin.sqla.form import InlineModelConverter
 from flask_exts.forms.fields.sqla import InlineModelFormList
-from ..models import db
 from ..models.model import ImageType, Location, LocationImage
 
 
@@ -41,7 +40,6 @@ class LocationImageInlineModelForm(InlineFormAdmin):
     form_ajax_refs = {
         "image_type": QueryAjaxModelLoader(
             name="image_type",
-            session=db.session,
             model=ImageType,
             fields=("name",),
             order_by="name",
@@ -72,7 +70,7 @@ class LocationView(ModelView):
     inline_models = (LocationImageInlineModelForm(),)
 
     def __init__(self):
-        super().__init__(Location, db.session, name="Locations")
+        super().__init__(Location, name="Locations")
 
 
 locationview = LocationView()

{flask_exts-0.2.1 → flask_exts-0.2.2}/pyproject.toml

@@ -32,6 +32,9 @@ dependencies = [
     "Flask-SQLAlchemy>=3.0",
     "Flask-Login>=0.6",
     "tablib>=3.0",
+    "casbin>=1.0",
+    "PyJWT>=2.0", 
+    "webauthn>=2.0",
 ]
 
 [project.optional-dependencies]
@@ -45,3 +48,7 @@ Issues = "https://github.com/ojso/flask-exts/issues"
 
 [tool.hatch.version]
 path = "src/flask_exts/__about__.py"
+
+[project.entry-points."flask.commands"]
+security = "flask_exts.commands:security_cli"
+datastore = "flask_exts.commands:datastore_cli"

flask_exts-0.2.2/src/flask_exts/__about__.py

@@ -0,0 +1 @@
+__version__ = "0.2.2"