Binding DB sessions based on SQLAlchemy 1, changing how to declare Base Model classes, and other code modernization

CHANGELOG.md

@@ -12,3 +12,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   codebase
 - Use host 0.0.0.0 for test servers
 - Fix bug with example-flask-peewee import
+- Fix bug with example-cherrypy import (Specify parent package name when importing setting, local_setting modules)
+- Changed the DB session creation, DB connection closing, and DB model creation to align with SQLAlchemy 2. (for example-flask program)
+- Removed flask-script package from requirements.txt as it doesn't work with recent flasks (programs: example-flask, example-flask-mongoengine, example-flask-peewee)
+- Configured the manage.py file to use the CLI environment built into flask (programs: example-flask, example-flask-mongoengine, example-flask-peewee) as the flask-script package has been removed
+- Changed the part that binds the DB session to comply with SQLAlchemy 2 (for example-pyramid program)
+- Changed the part that fetches authenticated users from DB to be SQLAlchemy 2 based (for example-pyramid program)
+- Removed all entries in the SOCIAL_AUTH_KEYS dictionary in local_settings.py.template into a single variable (tests showed that adding provider-supplied key information in SOCIAL_AUTH_KEYS caused errors on social login) (for example-pyramid program)
+- Changed the DB model creation part. (for example-pyramid program)
+- Error occurred when social login integration was completed because it was supposed to find google plus ID in the redirected URL. google plus is discontinued, so delete the part that gets plus ID. (for example-pyramid program)
+- Changed the part that binds the DB session and creates the Base Model class to comply with SQLAlchemy 2 (for example-tornado, example-webpy program)
+- Added local_settings.py.template file to reference other programs to easily generate local_settings.py (for example-tornado, example-webpy program)
+- Fixed an error importing the local_settings module from settings.py (for the example-tornado program)
+- Change the declaration of the Model class based on SQLAlchemy 2 (corresponds to the example-tornado, example-webpy program)
+- Fix bug with example-webpy import
+- Separated AUTHENTICATION_BACKENDS and PIPELINE entries into separate settings.py entries as web.config entries in app.py (for example-webpy program)

example-cherrypy/example/app.py

@@ -1,12 +1,11 @@
 import os
-import sys
 
 import cherrypy
-import settings
 from common import filters
 from common.utils import common_context, url_for
+from example import settings
 from jinja2 import Environment, FileSystemLoader
-from social_cherrypy.utils import backends, load_strategy
+from social_cherrypy.utils import load_strategy
 from social_cherrypy.views import CherryPyPSAViews
 from social_core.utils import setting_name
 
@@ -15,7 +14,9 @@
 from .db.user import User
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-DATABASE_NAME = "sqlite:///{dbname}".format(dbname=os.path.join(BASE_DIR, "db.sqlite3"))
+DATABASE_NAME = "sqlite:///{dbname}".format(  # fix: skip
+    dbname=os.path.join(BASE_DIR, "db.sqlite3")
+)
 
 SAEnginePlugin(cherrypy.engine, DATABASE_NAME).subscribe()
 
@@ -38,9 +39,9 @@ def render_home(self):
             cherrypy.config[setting_name("AUTHENTICATION_BACKENDS")],
             load_strategy(),
             user=getattr(cherrypy.request, "user", None),
-            plus_id=cherrypy.config.get(setting_name("SOCIAL_AUTH_GOOGLE_PLUS_KEY")),
         )
-        return cherrypy.tools.jinja2env.get_template("home.html").render(**context)
+        jinja2env = cherrypy.tools.jinja2env
+        return jinja2env.get_template("home.html").render(**context)
 
 
 def load_user():
@@ -56,22 +57,24 @@ def session_commit():
 
 
 def get_settings(module):
+    not_in_items = ["__builtins__", "__file__"]
     return {
         key: value
         for key, value in module.__dict__.items()
-        if key not in module.__builtins__ and key not in ["__builtins__", "__file__"]
+        if key not in module.__builtins__ and key not in not_in_items
     }
 
 
 SOCIAL_SETTINGS = get_settings(settings)
 
 try:
-    import local_settings
+    from example import local_settings
 
     SOCIAL_SETTINGS.update(get_settings(local_settings))
 except ImportError:
     raise RuntimeError(
-        "Define a local_settings.py using " "local_settings.py.template as base"
+        "Define a local_settings.py using "  # fix: skip
+        "local_settings.py.template as base"
     )
 
 
@@ -82,7 +85,7 @@ def run_app(listen_address="0.0.0.0:8001"):
             "server.socket_port": int(port),
             "server.socket_host": host,
             "tools.sessions.on": True,
-            "tools.sessions.storage_type": "ram",
+            "tools.sessions.storage_class": cherrypy.lib.sessions.RamSession,
             "tools.db.on": True,
             "tools.authenticate.on": True,
             "SOCIAL_AUTH_USER_MODEL": "example.db.user.User",

example-cherrypy/example/db/__init__.py

@@ -1,3 +1,5 @@
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import DeclarativeBase
 
-Base = declarative_base()
+
+class Base(DeclarativeBase):
+    pass

example-cherrypy/example/db/saplugin.py

@@ -1,13 +1,13 @@
 from cherrypy.process import plugins
 from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session, sessionmaker
+from sqlalchemy.orm import Session
 
 
 class SAEnginePlugin(plugins.SimplePlugin):
     def __init__(self, bus, connection_string=None):
         self.sa_engine = None
         self.connection_string = connection_string
-        self.session = scoped_session(sessionmaker(autoflush=True, autocommit=False))
+        self.session = Session(autoflush=True, autocommit=False)
         super().__init__(bus)
 
     def start(self):
@@ -23,14 +23,14 @@ def stop(self):
             self.sa_engine = None
 
     def bind(self):
-        self.session.configure(bind=self.sa_engine)
+        self.session.bind = self.sa_engine
         return self.session
 
     def commit(self):
         try:
             self.session.commit()
-        except:
+        except Exception:
             self.session.rollback()
             raise
         finally:
-            self.session.remove()
+            self.session.close()

example-cherrypy/example/db/user.py

@@ -1,16 +1,19 @@
-from sqlalchemy import Boolean, Column, Integer, String
+from typing import Optional
+
+from sqlalchemy import String
+from sqlalchemy.orm import Mapped, mapped_column
 
 from . import Base
 
 
 class User(Base):
     __tablename__ = "users"
-    id = Column(Integer, primary_key=True)
-    username = Column(String(200))
-    password = Column(String(200), default="")
-    name = Column(String(100))
-    email = Column(String(200))
-    active = Column(Boolean, default=True)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    username: Mapped[str] = mapped_column(String(200))
+    password: Mapped[str] = mapped_column(String(200), default="")
+    name: Mapped[Optional[str]] = mapped_column(String(100))
+    email: Mapped[Optional[str]] = mapped_column(String(200))
+    active: Mapped[bool] = mapped_column(default=True)
 
     def is_active(self):
         return self.active

example-cherrypy/manage.py

@@ -2,6 +2,9 @@
 import sys
 
 import cherrypy
+from example.app import DATABASE_NAME, run_app
+from example.db import Base
+from social_cherrypy.models import SocialBase
 from sqlalchemy import create_engine
 
 cherrypy.config.update(
@@ -10,11 +13,6 @@
     }
 )
 
-from example.app import DATABASE_NAME, run_app
-from example.db import Base
-from example.db.user import User
-from social_cherrypy.models import SocialBase
-
 if __name__ == "__main__":
     if len(sys.argv) > 1 and sys.argv[1] == "syncdb":
         engine = create_engine(DATABASE_NAME)

example-common/filters.py

@@ -42,11 +42,15 @@ def slice_by(value, items):
 
 
 def social_backends(backends):
-    return filter_backends(backends, lambda name, backend: name not in LEGACY_NAMES)
+    return filter_backends(  # fix: skip
+        backends, lambda name, backend: name not in LEGACY_NAMES
+    )
 
 
 def legacy_backends(backends):
-    return filter_backends(backends, lambda name, backend: name in LEGACY_NAMES)
+    return filter_backends(  # fix: skip
+        backends, lambda name, backend: name in LEGACY_NAMES
+    )
 
 
 def oauth_backends(backends):

example-common/pipeline.py

@@ -11,11 +11,15 @@ def require_email(strategy, details, user=None, is_new=False, *args, **kwargs):
             details["email"] = email
         else:
             current_partial = kwargs.get("current_partial")
-            return strategy.redirect(f"/email?partial_token={current_partial.token}")
+            return strategy.redirect(  # fix: skip
+                f"/email?partial_token={current_partial.token}"
+            )
 
 
 @partial
-def require_country(strategy, details, user=None, is_new=False, *args, **kwargs):
+def require_country(  # fix: skip
+    strategy, details, user=None, is_new=False, *args, **kwargs
+):
     if kwargs.get("ajax"):
         return
     elif is_new and not details.get("country"):
@@ -24,7 +28,9 @@ def require_country(strategy, details, user=None, is_new=False, *args, **kwargs)
             details["country"] = country
         else:
             current_partial = kwargs.get("current_partial")
-            return strategy.redirect(f"/country?partial_token={current_partial.token}")
+            return strategy.redirect(  # fix: skip
+                f"/country?partial_token={current_partial.token}"
+            )
 
 
 @partial
@@ -37,4 +43,6 @@ def require_city(strategy, details, user=None, is_new=False, *args, **kwargs):
             details["city"] = city
         else:
             current_partial = kwargs.get("current_partial")
-            return strategy.redirect(f"/city?partial_token={current_partial.token}")
+            return strategy.redirect(  # fix: skip
+                f"/city?partial_token={current_partial.token}"
+            )

example-common/utils.py

@@ -16,7 +16,9 @@ def associations(user, strategy):
     return list(user_associations)
 
 
-def common_context(authentication_backends, strategy, user=None, plus_id=None, **extra):
+def common_context(  # fix: skip
+    authentication_backends, strategy, user=None, plus_id=None, **extra
+):
     """Common view context"""
     context = {
         "user": user,

example-django-mongoengine/app/admin.py

@@ -1,3 +1,3 @@
-from django.contrib import admin
+from django.contrib import admin  # noqa: F401
 
 # Register your models here.

example-django-mongoengine/app/decorators.py

@@ -24,7 +24,6 @@ def wrapper(request, *args, **kwargs):
                         settings.AUTHENTICATION_BACKENDS,
                         load_strategy(),
                         request.user,
-                        plus_id=getattr(settings, "SOCIAL_AUTH_GOOGLE_PLUS_KEY", None),
                         **out
                     ),
                 )

example-django-mongoengine/app/mail.py

@@ -4,8 +4,10 @@
 
 
 def send_validation(strategy, backend, code, partial_token):
-    url = "{}?verification_code={}&partial_token={}".format(
-        reverse("social:complete", args=(backend.name,)), code.code, partial_token
+    url = "{}?verification_code={}&partial_token={}".format(  # fix: skip
+        reverse("social:complete", args=(backend.name,)),  # fix: skip
+        code.code,
+        partial_token,
     )
     url = strategy.request.build_absolute_uri(url)
     send_mail(

example-django-mongoengine/app/templatetags/backend_utils.py

@@ -80,7 +80,9 @@ def associated(context, backend):
     context["association"] = None
     if user and user.is_authenticated():
         try:
-            context["association"] = user.social_auth.filter(provider=backend.name)[0]
+            context["association"] = user.social_auth.filter(  # fix: skip
+                provider=backend.name
+            )[0]
         except IndexError:
             pass
     return ""

example-django-mongoengine/app/tests.py

@@ -1,3 +1,3 @@
-from django.test import TestCase
+from django.test import TestCase  # noqa: F401
 
 # Create your tests here.

example-django-mongoengine/app/views.py

@@ -1,14 +1,11 @@
 import json
 
-from django.conf import settings
 from django.contrib.auth import login
 from django.contrib.auth import logout as auth_logout
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import redirect
-from social_core.backends.google import GooglePlusAuth
 from social_core.backends.oauth import BaseOAuth1, BaseOAuth2
-from social_core.backends.utils import load_backends
 from social_django.utils import load_strategy, psa
 
 from .decorators import render_to

example-django-mongoengine/example/settings.py

@@ -237,18 +237,34 @@
 # Password validation
 # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
 
+UserAttributeSimilarityValidator = (  # fix: skip
+    "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"
+)
+
+MinimumLengthValidator = (  # fix: skip
+    "django.contrib.auth.password_validation.MinimumLengthValidator"
+)
+
+CommonPasswordValidator = (  # fix: skip
+    "django.contrib.auth.password_validation.CommonPasswordValidator"
+)
+
+NumericPasswordValidator = (  # fix: skip
+    "django.contrib.auth.password_validation.NumericPasswordValidator"
+)
+
 AUTH_PASSWORD_VALIDATORS = [
     {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
+        "NAME": UserAttributeSimilarityValidator,
     },
     {
-        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+        "NAME": MinimumLengthValidator,
     },
     {
-        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
+        "NAME": CommonPasswordValidator,
     },
     {
-        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
+        "NAME": NumericPasswordValidator,
     },
 ]
 
@@ -273,6 +289,6 @@
 STATIC_URL = "/static/"
 
 try:
-    from example.local_settings import *
+    from example.local_settings import *  # noqa: F401,F403
 except ImportError:
     pass

example-django-mongoengine/example/urls.py

@@ -9,7 +9,11 @@
     url(r"^login/$", app_views.home),
     url(r"^logout/$", app_views.logout),
     url(r"^done/$", app_views.done, name="done"),
-    url(r"^ajax-auth/(?P<backend>[^/]+)/$", app_views.ajax_auth, name="ajax-auth"),
+    url(
+        r"^ajax-auth/(?P<backend>[^/]+)/$",  # fix: skip
+        app_views.ajax_auth,
+        name="ajax-auth",
+    ),
     url(r"^email/$", app_views.require_email, name="require_email"),
     url(r"", include("social_django.urls")),
 ]

example-django-mongoengine/manage.py

@@ -11,7 +11,7 @@
         # issue is really that Django is missing to avoid masking other
         # exceptions on Python 2.
         try:
-            import django
+            import django  # noqa: F401
         except ImportError:
             raise ImportError(
                 "Couldn't import Django. Are you sure it's installed and "

example-django/app/admin.py

@@ -1,3 +1,3 @@
-from django.contrib import admin
+from django.contrib import admin  # noqa: F401
 
 # Register your models here.

example-django/app/decorators.py

@@ -24,7 +24,6 @@ def wrapper(request, *args, **kwargs):
                         settings.AUTHENTICATION_BACKENDS,
                         load_strategy(),
                         request.user,
-                        plus_id=getattr(settings, "SOCIAL_AUTH_GOOGLE_PLUS_KEY", None),
                         **out
                     ),
                 )