commit d908f6738812fde5a5c4867fa23296648cf91b3f Author: codl Date: Tue Jul 25 09:52:24 2017 +0200 init diff --git a/app.py b/app.py new file mode 100644 index 0000000..427ce51 --- /dev/null +++ b/app.py @@ -0,0 +1,20 @@ +from flask import Flask +from flask_sqlalchemy import SQLAlchemy +from sqlalchemy import MetaData +from flask_migrate import Migrate + +app = Flask(__name__) +app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql:///forget' +app.config['SQLALCHEMY_ECHO'] = True +app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + +metadata = MetaData(naming_convention = { + "ix": 'ix_%(column_0_label)s', + "uq": "uq_%(table_name)s_%(column_0_name)s", + "ck": "ck_%(table_name)s_%(constraint_name)s", + "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", + "pk": "pk_%(table_name)s" +}) + +db = SQLAlchemy(app, metadata=metadata) +migrate = Migrate(app, db) diff --git a/forget.py b/forget.py new file mode 100644 index 0000000..97d4c56 --- /dev/null +++ b/forget.py @@ -0,0 +1,2 @@ +from app import app +import routes diff --git a/lib.py b/lib.py new file mode 100644 index 0000000..5adf6ea --- /dev/null +++ b/lib.py @@ -0,0 +1,10 @@ +from model import User +from flask import request +from functools import update_wrapper + +def require_auth(fun): + # TODO actual auth and session checking and such + def newfun(*args, **kwargs): + fun(User.query.get('8080418'), *args, **kwargs) + update_wrapper(newfun, fun) + return newfun diff --git a/migrations/README b/migrations/README new file mode 100755 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 100755 index 0000000..23663ff --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,87 @@ +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() + 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 100755 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/253e9e2dae2d_init.py b/migrations/versions/253e9e2dae2d_init.py new file mode 100644 index 0000000..6316ff6 --- /dev/null +++ b/migrations/versions/253e9e2dae2d_init.py @@ -0,0 +1,52 @@ +"""init + +Revision ID: 253e9e2dae2d +Revises: +Create Date: 2017-07-25 09:50:45.374362 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '253e9e2dae2d' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('users', + sa.Column('display_name', sa.String(), nullable=True), + sa.Column('id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('id', name=op.f('pk_users')) + ) + op.create_table('account', + sa.Column('user_id', sa.Integer(), nullable=True), + sa.Column('remote_id', sa.String(), nullable=False), + sa.Column('service', sa.Enum('twitter', name='enum_services'), nullable=False), + sa.Column('credentials', sa.JSON(), nullable=True), + sa.Column('policy_enabled', sa.Boolean(), nullable=True), + sa.Column('policy_keep_younger', sa.Interval(), nullable=True), + sa.Column('policy_keep_latest', sa.Integer(), nullable=True), + sa.Column('policy_delete_every', sa.Interval(), nullable=True), + sa.ForeignKeyConstraint(['user_id'], ['users.id'], name=op.f('fk_account_user_id_users')), + sa.PrimaryKeyConstraint('remote_id', 'service', name=op.f('pk_account')) + ) + op.create_table('sessions', + sa.Column('user_id', sa.Integer(), nullable=True), + sa.Column('token', sa.String(), nullable=False), + sa.ForeignKeyConstraint(['user_id'], ['users.id'], name=op.f('fk_sessions_user_id_users')), + sa.PrimaryKeyConstraint('token', name=op.f('pk_sessions')) + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('sessions') + op.drop_table('account') + op.drop_table('users') + # ### end Alembic commands ### diff --git a/model.py b/model.py new file mode 100644 index 0000000..dab4f3e --- /dev/null +++ b/model.py @@ -0,0 +1,36 @@ +import datetime + +from app import db + +model = db.Model + +class User(db.Model): + __tablename__ = 'users' + + display_name = db.Column(db.String) + id = db.Column(db.Integer, primary_key=True) + +class Account(db.Model): + + user = db.relationship(User) + user_id = db.Column(db.Integer, db.ForeignKey('users.id')) + + remote_id = db.Column(db.String, primary_key=True) + service = db.Column( + db.Enum("twitter", name="enum_services") + , primary_key=True) + credentials = db.Column(db.JSON) + + policy_enabled = db.Column(db.Boolean, default=False) + policy_keep_younger = db.Column(db.Interval) + policy_keep_latest = db.Column(db.Integer) + policy_delete_every = db.Column(db.Interval) + +class Session(db.Model): + __tablename__ = 'sessions' + + user = db.relationship(User) + user_id = db.Column(db.Integer, db.ForeignKey('users.id')) + + token = db.Column(db.String, primary_key=True) + diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..1ff85e9 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +alembic==0.9.3 +Flask==0.12.2 +Flask-Migrate==2.0.4 +Flask-SQLAlchemy==2.2 +psycopg2==2.7.1 diff --git a/routes.py b/routes.py new file mode 100644 index 0000000..4d928d6 --- /dev/null +++ b/routes.py @@ -0,0 +1,9 @@ +from app import app +from flask import request, Response +from lib import require_auth + +@app.route('/') +@require_auth +def index(viewer): + return "Hello, %s (%s)" % (viewer.name, viewer.twitter_id) +