From 53d05ef5c5d7c2c28a07a85fac3f3b27464c71ce Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Wed, 3 Oct 2018 01:18:00 +0200 Subject: [PATCH 1/2] Attempt to add quotes to mattermore --- app/app.py | 24 ++++++++++++++++++++++-- app/models.py | 29 +++++++++++++++++++++++++++++ app/templates/quotes.html | 24 ++++++++++++++++++++++++ config.py | 3 ++- 4 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 app/templates/quotes.html diff --git a/app/app.py b/app/app.py index 4b95af0..d6d5ba0 100644 --- a/app/app.py +++ b/app/app.py @@ -1,9 +1,11 @@ import json from functools import wraps -from flask import Flask, request, Response, abort +from flask import Flask, request, Response, abort, render_template from flask_sqlalchemy import SQLAlchemy import requests import config +import re +import pdb app = Flask(__name__) @@ -57,7 +59,6 @@ def requires_token(token_name): def decorated_function(*args, **kwargs): expected_token = config.tokens[token_name] token = request.values.get('token') - print(token, expected_token) if expected_token != token: return abort(401) return f(*args, **kwargs) @@ -123,3 +124,22 @@ def door(username): tokens = request.values.get('text').strip().split() command = tokens[0].lower() return mattermost_response(slotmachien_request(username, command)) + + +QUOTEE_REGEX = re.compile('\W*(\w+).*') + +@app.route('/addquote', methods=['POST']) +@requires_token('quote') +def add_quote(): + user = request.values['user_name'] + channel = request.values['channel_name'] + quote_text = request.values['text'] + quote = models.Quote(user, quote_text, channel) + db.session.add(quote) + db.session.commit() + return mattermost_response("Your quote has been added.") + +@app.route('/', methods=['GET']) +def list_quotes(): + return render_template('quotes.html', quotes = models.Quote.query.all()) + diff --git a/app/models.py b/app/models.py index 30896b9..b40784a 100644 --- a/app/models.py +++ b/app/models.py @@ -1,4 +1,6 @@ from .app import db +from datetime import datetime +import re class User(db.Model): @@ -14,3 +16,30 @@ class User(db.Model): super() self.username = username self.admin = admin + +class Quote(db.Model): + id = db.Column(db.Integer, primary_key=True) + quoter = db.Column(db.String(255), unique=False, nullable=False) + quotee = db.Column(db.String(255), unique=False, nullable=True) + channel = db.Column(db.String(255), unique=False, nullable=False) + quote = db.Column(db.String(1023), unique=True, nullable=False) + created_at = db.Column( + db.DateTime, nullable=False, + default=datetime.utcnow + ) + + QUOTEE_REGEX = re.compile('\W*(\w+).*') + + def __repr__(self): + return f"" + + def __init__(self, quoter, quote, channel): + super() + self.quoter = quoter + self.quote = quote + self.channel = channel + self.created_at = datetime.utcnow() + # Experimentally try to find quoted user + quotee_match = Quote.QUOTEE_REGEX.search(quote) + self.quotee = quotee_match.group(1) if quotee_match is not None else None + diff --git a/app/templates/quotes.html b/app/templates/quotes.html new file mode 100644 index 0000000..8ce49c8 --- /dev/null +++ b/app/templates/quotes.html @@ -0,0 +1,24 @@ + + + Zeus WPI Quotes + + +

Zeus WPI Quotes

+ + + + + + + + {% for quote in quotes %} + + + + + + + {% endfor %} +
QuoterQuoteeWhenQuote
{{ quote.quoter }}{{ quote.quotee }}{{ quote.created_at }}{{ quote.quote }}
+ + diff --git a/config.py b/config.py index 1ad584a..20db883 100644 --- a/config.py +++ b/config.py @@ -2,7 +2,8 @@ DATABASE_URL = 'sqlite:////tmp/mattermost.db' tokens = { 'authorize': '123', 'door': '123', - 'revoke': '123' + 'revoke': '123', + 'quote': '123' } slotmachien_url = 'https://kelder.zeus.ugent.be/slotmachien/slack/' slotmachien_token = '123' From ddfa2d02b2dd703ecb16307d65c2500ec73f5a36 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Wed, 13 Feb 2019 20:31:21 +0100 Subject: [PATCH 2/2] Add migrations --- app/app.py | 2 + migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++++ migrations/env.py | 90 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 ++++++++ migrations/versions/49d24a3cb696_.py | 46 ++++++++++++++ requirements.txt | 7 +++ 7 files changed, 215 insertions(+) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/49d24a3cb696_.py diff --git a/app/app.py b/app/app.py index d6d5ba0..6ae4815 100644 --- a/app/app.py +++ b/app/app.py @@ -2,6 +2,7 @@ import json from functools import wraps from flask import Flask, request, Response, abort, render_template from flask_sqlalchemy import SQLAlchemy +from flask_migrate import Migrate import requests import config import re @@ -14,6 +15,7 @@ app.config['SQLALCHEMY_DATABASE_URI'] = config.DATABASE_URL # Supress Flask warning app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False db = SQLAlchemy(app) +migrate = Migrate(app, db) response_setting = "in_channel" diff --git a/migrations/README b/migrations/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..2d31c5a --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,90 @@ +from __future__ import with_statement +from alembic import context +from sqlalchemy import engine_from_config, pool +from logging.config import fileConfig +import logging + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from flask import current_app +config.set_main_option('sqlalchemy.url', + current_app.config.get('SQLALCHEMY_DATABASE_URI')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure(url=url) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + engine = engine_from_config(config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool) + + connection = engine.connect() + context.configure(connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args) + + try: + with context.begin_transaction(): + context.run_migrations() + except Exception as exception: + logger.error(exception) + raise exception + finally: + connection.close() + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 0000000..2c01563 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/49d24a3cb696_.py b/migrations/versions/49d24a3cb696_.py new file mode 100644 index 0000000..2561a80 --- /dev/null +++ b/migrations/versions/49d24a3cb696_.py @@ -0,0 +1,46 @@ +"""Initial migration + +Revision ID: 49d24a3cb696 +Revises: +Create Date: 2019-02-13 19:22:05.984105 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '49d24a3cb696' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('quote', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('quoter', sa.String(length=255), nullable=False), + sa.Column('quotee', sa.String(length=255), nullable=True), + sa.Column('channel', sa.String(length=255), nullable=False), + sa.Column('quote', sa.String(length=1023), nullable=False), + sa.Column('created_at', sa.DateTime(), nullable=False), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('quote') + ) + op.create_table('user', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('username', sa.String(length=255), nullable=False), + sa.Column('authorized', sa.Boolean(), nullable=True), + sa.Column('admin', sa.Boolean(), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('username') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('user') + op.drop_table('quote') + # ### end Alembic commands ### diff --git a/requirements.txt b/requirements.txt index ea5f2e1..e0b813c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,20 @@ +alembic==1.0.7 certifi==2018.8.24 chardet==3.0.4 click==6.7 Flask==1.0.2 +Flask-Migrate==2.3.1 Flask-SQLAlchemy==2.3.2 idna==2.7 itsdangerous==0.24 Jinja2==2.10 +Mako==1.0.7 MarkupSafe==1.0 +PyBug==1.2.1 +python-dateutil==2.8.0 +python-editor==1.0.4 requests==2.19.1 +six==1.12.0 SQLAlchemy==1.2.12 urllib3==1.23 Werkzeug==0.14.1