update for pyweb presentation

Author: rsyring

.env

@@ -0,0 +1 @@
+FLASK_ENV=development

docker-compose.yaml

@@ -13,24 +13,19 @@
 
 version: '2'
 services:
-  flog-pg:
+  flog2-pg:
       image: postgres:12-alpine
-      container_name: flog-pg
+      container_name: flog2-pg
       ports:
         - '127.0.0.1:54321:5432'
       environment:
-        # Kk for flog dev, potentially UNSAFE in other applications.  Don't blindly copy & paste
+        # Kk for flog2 dev, potentially UNSAFE in other applications.  Don't blindly copy & paste
         # without considering implications.
         POSTGRES_HOST_AUTH_METHOD: trust
         # Could use this instead with a strong password if working outside a dev env
         # POSTGRES_PASSWORD: password
-  flog-rabbitmq:
+  flog2-rabbitmq:
     image: rabbitmq:3.8-alpine
-    container_name: flog-rabbitmq
+    container_name: flog2-rabbitmq
     ports:
       - '127.0.0.1:56721:5672'
-  flog-redis:
-    image: redis:5-alpine
-    container_name: flog-redis
-    ports:
-      - '127.0.0.1:63791:6379'

flog-config.py

@@ -0,0 +1,13 @@
+db_uri = 'postgresql://postgres@localhost:54321/flog'
+
+
+def development_config(app, config):
+    config['SQLALCHEMY_DATABASE_URI'] = db_uri
+
+    return config
+
+
+def testing_config(app, config):
+    config['SQLALCHEMY_DATABASE_URI'] = db_uri + '_tests'
+
+    return config

flog/actors.py

@@ -1,32 +1,77 @@
-import click
+import logging
+import pathlib
+from os import environ
 
-from flask import Flask
+import click
+import flask
 from flask.cli import FlaskGroup
-from flask_sqlalchemy import SQLAlchemy
 
 import flog.cli
+import flog.ext
+from flog.libs.config import init_config
+from flog.libs.logging import init_logging
+from flog.libs.testing import CLIRunner
+import flog.views
+
+_app_name = 'flog'
+_root_path = pathlib.Path(__file__).parent
+
+log = logging.getLogger(__name__)
+
+
+class FlogApp(flask.Flask):
+    test_cli_runner_class = CLIRunner
+
+    @classmethod
+    def create(cls, init_app=True, testing=False, **kwargs):
+        """
+            For CLI app init blueprints but not config b/c we want to give the calling CLI group
+            the ability to set values from the command line args/options before configuring the
+            app. But if we don't init the blueprints right away, then the CLI doesn't know
+            anything about the cli groups & commands added by blueprints.
+        """
+        if testing:
+            environ['FLASK_ENV'] = 'testing'
 
-db = SQLAlchemy()
+        app = cls(_app_name, root_path=_root_path, **kwargs)
+        app.testing = testing
 
+        app.init_blueprints()
+        if init_app:
+            app.init_app()
 
-def create_app():
-    # Circular imports require this import to go inside the function
-    from flog import views
+        return app
 
-    app = Flask(__name__)
+    def init_blueprints(self):
+        self.register_blueprint(flog.cli.cli_bp)
+        self.register_blueprint(flog.views.public)
 
-    app.config['SQLALCHEMY_DATABASE_URI'] = \
-        'postgresql://postgres:password@localhost:54321/postgres'
-    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+    def init_app(self, log_level='info', with_sentry=False):
+        init_config(self)
 
-    db.init_app(app)
+        if not self.testing:
+            init_logging(log_level, self.name)
 
-    app.register_blueprint(views.public)
-    app.register_blueprint(flog.cli.cli_bp)
+        if with_sentry:
+            assert not self.testing, 'Sentry should not be enabled during testing.'
+            sentry_dsn = self.config.get('SENTRY_DSN')
+            if not sentry_dsn:
+                raise ValueError('Sentry DSN expected but not configured.')
+            else:
+                import sentry_sdk
+                sentry_sdk.init(sentry_dsn)
 
-    return app
+        flog.ext.init_ext(self)
 
 
-@click.group(cls=FlaskGroup, create_app=create_app)
-def cli():
-    """Management script for the Wiki application."""
+@click.group(cls=FlaskGroup, create_app=lambda _: FlogApp.create(init_app=False))
+@click.option('--quiet', 'log_level', flag_value='quiet', help='Hide info level log messages')
+@click.option('--info', 'log_level', flag_value='info', default=True,
+    help='Show info level log messages (default)')
+@click.option('--debug', 'log_level', flag_value='debug', help='Show debug level log messages')
+@click.option('--with-sentry', is_flag=True, default=False,
+    help='Enable Sentry (usually only in production)')
+@flask.cli.pass_script_info
+def cli(scriptinfo, log_level, with_sentry):
+    app = scriptinfo.load_app()
+    app.init_app(log_level, with_sentry)

flog/app.py

@@ -1,118 +1,29 @@
-import concurrent.futures
+import logging
 
-import arrow
 import click
-import dramatiq
-from flask import Blueprint
-
-from flog import actors
-from flog.libs import hackernews as hn
-from flog.libs import localhost
+from flask import Blueprint, current_app
 
+from flog.libs.database import create_db
 
+log = logging.getLogger(__name__)
 cli_bp = Blueprint('cli', __name__, cli_group=None)
 
 
-@cli_bp.cli.command('hn-profile')
-@click.argument('username')
-def hn_profile(username):
-    user = hn.User(username)
-    print(user)
-
-
-@cli_bp.cli.command('hello')
-@click.argument('name', default='World')
-@click.option('--queue', 'use_queue', is_flag=True, default=False)
-def hello(name, use_queue):
-    if use_queue:
-        actors.say_hello.send(name)
-        print('say_hello() job has been queued.')
-    else:
-        actors.say_hello(name)
-
-
-@cli_bp.cli.command()
-def top_stories():
-    story_ids = hn.top_stories()
-    messages = [actors.hn_story.message(sid) for sid in story_ids]
-    group = dramatiq.group(messages).run()
-    # 60 second timeout (in milliseconds)
-    for result in group.get_results(block=True, timeout=60_000):
-        print(result)
-
-
-@cli_bp.cli.command()
-@click.option('--queue', 'use_queue', is_flag=True, default=False)
-def falcon_page(use_queue):
-    if use_queue:
-        actors.falcon_page.send()
-        print('random_article() job has been queued.')
-    else:
-        print(actors.falcon_page())
-
-
-@cli_bp.cli.command()
-@click.argument('fetch_number', default=10)
-def falcon_pages(fetch_number):
-    page_messages = [actors.falcon_page.message() for x in range(fetch_number)]
-    group = dramatiq.group(page_messages).run()
-    # 60 second timeout (in milliseconds)
-    for result in group.get_results(block=True, timeout=60_000):
-        print(result)
-
-
-@cli_bp.cli.command()
-@click.argument('requests_num', type=int)
-@click.option('--workers-num', default=5)
-def falcon_pages_threadpool(workers_num, requests_num):
-    with concurrent.futures.ThreadPoolExecutor(max_workers=workers_num) as executor:
-        future_to_url = [executor.submit(localhost.fetch_page) for x in range(requests_num)]
-
-    start = arrow.now()
-    for future in concurrent.futures.as_completed(future_to_url):
-        print(future.result())
-
-    duration = arrow.now() - start
-    secs = duration.total_seconds()
-
-    print('worker count:', workers_num)
-    print('Requests / second:', requests_num / secs)
-
-
 @cli_bp.cli.command()
-@click.argument('requests_num', type=int)
-@click.option('--workers-num', default=4)
-def falcon_pages_procpool(workers_num, requests_num):
-    with concurrent.futures.ProcessPoolExecutor(max_workers=workers_num) as executor:
-        future_to_url = [executor.submit(localhost.fetch_page) for x in range(requests_num)]
-
-    start = arrow.now()
-    for future in concurrent.futures.as_completed(future_to_url):
-        print(future.result())
-
-    duration = arrow.now() - start
-    secs = duration.total_seconds()
-
-    print('worker count:', workers_num)
-    print('Requests / second:', requests_num / secs)
+@click.argument('name', default='World')
+def hello(name):
+    log.debug('cli debug logging example')
+    print(f'Hello, {name}!')
 
 
 @cli_bp.cli.command()
-@click.argument('requests_num', type=int)
-@click.option('--workers-num', default=4)
-def falcon_pages_async(workers_num, requests_num):
-    import aiohttp
-    import asyncio
-
-    async def fetch(session, url):
-        async with session.get(url) as response:
-            return await response.text()
-
-    async def main():
-        async with aiohttp.ClientSession() as session:
-            for x in range(requests_num):
-                text = await fetch(session, 'http://localhost:5000/')
-                print(text)
-
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(main())
+@click.option('--drop-first', is_flag=True, default=False)
+@click.option('--for-tests', is_flag=True, default=False)
+def db_init(drop_first, for_tests):
+    """ Initialize the database """
+    app = current_app
+    sa_url = app.config['SQLALCHEMY_DATABASE_URI']
+    if for_tests:
+        sa_url += '_tests'
+
+    create_db(sa_url, drop_first)

flog/cli.py

@@ -1,16 +1,15 @@
-from mixer.backend.flask import mixer as flask_mixer
 import pytest
 
 import flog.app
+import flog.ext
 
 
 @pytest.fixture(scope='session')
 def app():
-    app = flog.app.create_app()
-    app.testing = True
+    app = flog.app.FlogApp.create(testing=True)
 
-    flog.app.db.drop_all(app=app)
-    flog.app.db.create_all(app=app)
+    flog.ext.db.drop_all(app=app)
+    flog.ext.db.create_all(app=app)
 
     return app
 
@@ -19,24 +18,20 @@ def app():
 def db(app):
     # print('db fixture')
     with app.app_context():
-        yield flog.app.db
-        flog.app.db.session.remove()
+        yield flog.ext.db
+        flog.ext.db.session.remove()
 
 
-@pytest.fixture(scope='session')
-def mixer_ext(app):
-    # print('mixer_ext fixture')
-    mixer = flask_mixer
-    mixer.init_app(app)
-    return mixer
+@pytest.fixture()
+def web(app):
+    return app.test_client()
 
 
 @pytest.fixture()
-def mixer(mixer_ext, db):
-    # print('mixer fixture')
-    return flask_mixer
+def cli(app):
+    return app.test_cli_runner()
 
 
-@pytest.fixture()
-def client(app):
-    return app.test_client()
+@pytest.fixture(scope='session')
+def script_args():
+    return ['python', '-c', 'from flog import app; app.cli()']

flog/conftest.py

@@ -0,0 +1,7 @@
+from flask_sqlalchemy import SQLAlchemy
+
+db = SQLAlchemy()
+
+
+def init_ext(app):
+    db.init_app(app)