mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-03 20:02:47 +00:00 
			
		
		
		
	First attempts to use type hinting
This commit is contained in:
		@@ -10,21 +10,23 @@ from hashids import Hashids
 | 
			
		||||
import flask_assets
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
assets = flask_assets.Environment()
 | 
			
		||||
db = SQLAlchemy()
 | 
			
		||||
hashids = Hashids(min_length=32)  # , salt=current_app.config.get('SECRET_KEY')
 | 
			
		||||
login = LoginManager()
 | 
			
		||||
login.login_view = 'auth.login'
 | 
			
		||||
login.login_message = 'Please log in to access this page.'
 | 
			
		||||
mail = Mail()
 | 
			
		||||
migrate = Migrate()
 | 
			
		||||
paranoid = Paranoid()
 | 
			
		||||
paranoid.redirect_view = '/'
 | 
			
		||||
socketio = SocketIO()
 | 
			
		||||
assets: flask_assets.Environment = flask_assets.Environment()
 | 
			
		||||
db: SQLAlchemy = SQLAlchemy()
 | 
			
		||||
# TODO: Add 'SECRET_KEY' from as 'salt' kwarg
 | 
			
		||||
hashids: Hashids = Hashids(min_length=32)
 | 
			
		||||
login: LoginManager = LoginManager()
 | 
			
		||||
login.login_view: str = 'auth.login'
 | 
			
		||||
login.login_message: str = 'Please log in to access this page.'
 | 
			
		||||
mail: Mail = Mail()
 | 
			
		||||
migrate: Migrate = Migrate()
 | 
			
		||||
paranoid: Paranoid = Paranoid()
 | 
			
		||||
paranoid.redirect_view: str = '/'
 | 
			
		||||
socketio: SocketIO = SocketIO()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def create_app(config_class=Config):
 | 
			
		||||
    app = Flask(__name__)
 | 
			
		||||
def create_app(config_class: Config = Config) -> Flask:
 | 
			
		||||
    ''' Creates an initialized Flask (WSGI Application) object. '''
 | 
			
		||||
    app: Flask = Flask(__name__)
 | 
			
		||||
    app.config.from_object(config_class)
 | 
			
		||||
 | 
			
		||||
    assets.init_app(app)
 | 
			
		||||
@@ -35,13 +37,10 @@ def create_app(config_class=Config):
 | 
			
		||||
    migrate.init_app(app, db)
 | 
			
		||||
    paranoid.init_app(app)
 | 
			
		||||
    socketio.init_app(
 | 
			
		||||
        app,
 | 
			
		||||
        message_queue=app.config.get('NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI')
 | 
			
		||||
    )
 | 
			
		||||
        app, message_queue=app.config['NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI'])
 | 
			
		||||
 | 
			
		||||
    from .utils import HashidConverter, permission_context_processor
 | 
			
		||||
    from .utils import HashidConverter
 | 
			
		||||
    app.url_map.converters['hashid'] = HashidConverter
 | 
			
		||||
    app.context_processor(permission_context_processor)
 | 
			
		||||
 | 
			
		||||
    from .events import socketio as socketio_events
 | 
			
		||||
    from .events import sqlalchemy as sqlalchemy_events
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										20
									
								
								app/cli.py
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								app/cli.py
									
									
									
									
									
								
							@@ -6,7 +6,7 @@ from flask_migrate import upgrade
 | 
			
		||||
def register(app):
 | 
			
		||||
    @app.cli.command()
 | 
			
		||||
    def deploy():
 | 
			
		||||
        """Run deployment tasks."""
 | 
			
		||||
        ''' Run deployment tasks. '''
 | 
			
		||||
        # migrate database to latest revision
 | 
			
		||||
        upgrade()
 | 
			
		||||
        # create or update user roles
 | 
			
		||||
@@ -14,27 +14,29 @@ def register(app):
 | 
			
		||||
 | 
			
		||||
    @app.cli.group()
 | 
			
		||||
    def daemon():
 | 
			
		||||
        """Daemon commands."""
 | 
			
		||||
        ''' Daemon commands. '''
 | 
			
		||||
        pass
 | 
			
		||||
 | 
			
		||||
    @daemon.command('run')
 | 
			
		||||
    def run_daemon():
 | 
			
		||||
        """Run daemon"""
 | 
			
		||||
        ''' Run daemon '''
 | 
			
		||||
        corpus: Corpus
 | 
			
		||||
        for corpus in Corpus.query.filter(Corpus.num_analysis_sessions > 0):
 | 
			
		||||
            corpus.num_analysis_sessions = 0
 | 
			
		||||
        db.session.commit()
 | 
			
		||||
        from app.daemon import Daemon
 | 
			
		||||
        daemon = Daemon()
 | 
			
		||||
        daemon: Daemon = Daemon()
 | 
			
		||||
        daemon.run()
 | 
			
		||||
 | 
			
		||||
    @app.cli.group()
 | 
			
		||||
    def test():
 | 
			
		||||
        """Test commands."""
 | 
			
		||||
        ''' Test commands. '''
 | 
			
		||||
        pass
 | 
			
		||||
 | 
			
		||||
    @test.command('run')
 | 
			
		||||
    def run_test():
 | 
			
		||||
        """Run unit tests."""
 | 
			
		||||
        import unittest
 | 
			
		||||
        tests = unittest.TestLoader().discover('tests')
 | 
			
		||||
        unittest.TextTestRunner(verbosity=2).run(tests)
 | 
			
		||||
        ''' Run unit tests. '''
 | 
			
		||||
        from unittest import TestLoader, TextTestRunner
 | 
			
		||||
        from unittest.suite import TestSuite
 | 
			
		||||
        tests: TestSuite = TestLoader().discover('tests')
 | 
			
		||||
        TextTestRunner(verbosity=2).run(tests)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										18
									
								
								app/email.py
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								app/email.py
									
									
									
									
									
								
							@@ -1,17 +1,25 @@
 | 
			
		||||
from flask import current_app, render_template
 | 
			
		||||
from flask_mail import Message
 | 
			
		||||
from typing import Any, Text
 | 
			
		||||
from . import mail
 | 
			
		||||
from .decorators import background
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def create_message(recipient, subject, template, **kwargs):
 | 
			
		||||
    msg = Message('{} {}'.format(current_app.config['NOPAQUE_MAIL_SUBJECT_PREFIX'], subject), recipients=[recipient])  # noqa
 | 
			
		||||
    msg.body = render_template('{}.txt.j2'.format(template), **kwargs)
 | 
			
		||||
    msg.html = render_template('{}.html.j2'.format(template), **kwargs)
 | 
			
		||||
def create_message(
 | 
			
		||||
    recipient: str,
 | 
			
		||||
    subject: str,
 | 
			
		||||
    template: str,
 | 
			
		||||
    **kwargs: Any
 | 
			
		||||
) -> Message:
 | 
			
		||||
    subject_prefix: str = current_app.config['NOPAQUE_MAIL_SUBJECT_PREFIX']
 | 
			
		||||
    msg: Message = Message(
 | 
			
		||||
        f'{subject_prefix} {subject}', recipients=[recipient])
 | 
			
		||||
    msg.body: Text = render_template(f'{template}.txt.j2', **kwargs)
 | 
			
		||||
    msg.html: Text = render_template(f'{template}.html.j2', **kwargs)
 | 
			
		||||
    return msg
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@background
 | 
			
		||||
def send(msg, *args, **kwargs):
 | 
			
		||||
def send(msg: Message, *args, **kwargs):
 | 
			
		||||
    with kwargs['app'].app_context():
 | 
			
		||||
        mail.send(msg)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,10 @@
 | 
			
		||||
from app import hashids
 | 
			
		||||
from werkzeug.routing import BaseConverter
 | 
			
		||||
from .models import Permission
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class HashidConverter(BaseConverter):
 | 
			
		||||
    def to_python(self, value):
 | 
			
		||||
    def to_python(self, value: str) -> int:
 | 
			
		||||
        return hashids.decode(value)[0]
 | 
			
		||||
 | 
			
		||||
    def to_url(self, value):
 | 
			
		||||
    def to_url(self, value: int) -> str:
 | 
			
		||||
        return hashids.encode(value)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def permission_context_processor():
 | 
			
		||||
    return {'Permission': Permission}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user