This commit is contained in:
parent
f114bc987e
commit
ab39404cc6
|
@ -2,6 +2,9 @@
|
|||
line-length = 88
|
||||
target-version = ["py38"]
|
||||
|
||||
[tool.isort]
|
||||
profile = "black"
|
||||
|
||||
[tool.poetry]
|
||||
name = "poetrybot"
|
||||
version = "0.1.1"
|
||||
|
|
|
@ -2,7 +2,7 @@ from contextlib import contextmanager
|
|||
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.ext.declarative import declarative_base
|
||||
from sqlalchemy.orm import sessionmaker, scoped_session
|
||||
from sqlalchemy.orm import scoped_session, sessionmaker
|
||||
|
||||
Base = declarative_base()
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ from sqlalchemy.orm import contains_eager
|
|||
from sqlalchemy.orm.exc import NoResultFound
|
||||
from sqlalchemy.sql.expression import func
|
||||
|
||||
from .models import Poem, User, Poet
|
||||
from .models import Poem, Poet, User
|
||||
|
||||
|
||||
def get_a_random_poem(session, author=None, argument=None):
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
"""Database models for poetrybot."""
|
||||
from sqlalchemy import Column, Integer, String, Text, ForeignKey
|
||||
from sqlalchemy.orm import relationship, backref
|
||||
|
||||
from sqlalchemy import Column, ForeignKey, Integer, String, Text
|
||||
from sqlalchemy.orm import backref, relationship
|
||||
|
||||
from . import Base
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from telegram.ext import Updater, CommandHandler
|
||||
from telegram.ext import CommandHandler, Updater
|
||||
|
||||
from .commands.help import help
|
||||
from .commands.quote import quote
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import logging
|
||||
import re
|
||||
|
||||
from telegram import Update, ParseMode
|
||||
from telegram import ParseMode, Update
|
||||
from telegram.ext import CallbackContext
|
||||
|
||||
from poetrybot.database import store
|
||||
|
|
|
@ -5,7 +5,6 @@ from poetrybot.database import store
|
|||
from poetrybot.database.models import Poem
|
||||
|
||||
from ..errors import error
|
||||
|
||||
from . import bp
|
||||
from .schemas import PoemSchema
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@ from poetrybot.database import store
|
|||
from poetrybot.database.models import Poet
|
||||
|
||||
from ..errors import error
|
||||
|
||||
from . import bp
|
||||
from .schemas import PoetSchema
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from marshmallow import Schema, fields, ValidationError
|
||||
from marshmallow import Schema, ValidationError, fields
|
||||
|
||||
|
||||
class PoetSchema(Schema):
|
||||
|
|
|
@ -5,9 +5,8 @@ from poetrybot.database import store
|
|||
from poetrybot.database.models import User
|
||||
|
||||
from ..errors import error
|
||||
|
||||
from . import bp
|
||||
from .schemas import UserSchema, UserEditSchema
|
||||
from .schemas import UserEditSchema, UserSchema
|
||||
|
||||
user_edit_schema = UserEditSchema()
|
||||
user_schema = UserSchema()
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from marshmallow import Schema, fields, ValidationError
|
||||
from marshmallow import Schema, ValidationError, fields
|
||||
|
||||
|
||||
def validate_id(n):
|
||||
|
|
Loading…
Reference in a new issue