RemiZOffAlex/myapp-full
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix flake8

Browse Source
This commit is contained in:
RemiZOffAlex
2020-08-17 19:57:37 +03:00
parent a9736c09fe
commit ae5c629782
46 changed files with 229 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
myapp/ns_api/__init__.py
View File

@@ -1,8 +1,6 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__license__ = 'MIT'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru'
from functools import wraps
from flask_jsonrpc import JSONRPC
@@ -10,6 +8,7 @@ from flask import session
from .. import app, models
def login_required(func):
@wraps(func)
def decorated_function(*args, **kwargs):
@@ -17,7 +16,7 @@ def login_required(func):
user = models.db_session.query(
models.User
).filter(
models.User.id==session['user_id']
models.User.id == session['user_id']
).first()
if user:
return func(*args, **kwargs)
@@ -29,9 +28,10 @@ def login_required(func):
raise Exception('Необходима авторизация')
return decorated_function
jsonrpc = JSONRPC(app, '/api')
from . import (
from . import ( # noqa F401
login,
note,
page,

11
myapp/ns_api/login.py
View File

@@ -2,26 +2,23 @@ __author__ = 'RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru/'
import string
from flask import session
from flask_jsonrpc.exceptions import InvalidRequestError
from . import jsonrpc
from .. import app, lib, models
@jsonrpc.method('login')
def login(username: str, password: str)->bool:
def login(username: str, password: str) -> bool:
user = models.db_session.query(
models.User
).filter(
models.User.name==username,
models.User.password==lib.get_hash_password(
models.User.name == username,
models.User.password == lib.get_hash_password(
password,
app.config['SECRET_KEY']
),
models.User.disabled==False
models.User.disabled == False
).first()
if user is None:
raise ValueError

19
myapp/ns_api/note.py
View File

@@ -1,19 +1,18 @@
__author__ = 'RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru'
from . import jsonrpc, login_required
from .. import app, lib, models
@jsonrpc.method('note')
def note_id(id: int)->dict:
def note_id(id: int) -> dict:
"""Заметка
"""
note = models.db_session.query(
models.Note
).filter(
models.Note.id==id
models.Note.id == id
).first()
if note is None:
raise ValueError
@@ -28,7 +27,7 @@ def note_id(id: int)->dict:
@jsonrpc.method('note.add')
@login_required
def note_add(title: str, body: str)->dict:
def note_add(title: str, body: str) -> dict:
"""Добавление новой заметки
"""
newNote = models.Note(
@@ -47,7 +46,7 @@ def note_add(title: str, body: str)->dict:
@jsonrpc.method('note.destroy')
@login_required
def note_destroy(id: int)->bool:
def note_destroy(id: int) -> bool:
"""Полное уничтожение заметки
Аргументы:
@@ -56,7 +55,7 @@ def note_destroy(id: int)->bool:
note = models.db_session.query(
models.Note
).filter(
models.Note.id==id
models.Note.id == id
).first()
if note is None:
raise ValueError
@@ -69,13 +68,13 @@ def note_destroy(id: int)->bool:
@jsonrpc.method('note.update')
@login_required
def note_update(id: int, title: str, body: str)->dict:
def note_update(id: int, title: str, body: str) -> dict:
"""Обновить заметку
"""
note = models.db_session.query(
models.Note
).filter(
models.Note.id==id
models.Note.id == id
).first()
if note is None:
raise ValueError
@@ -92,7 +91,7 @@ def note_update(id: int, title: str, body: str)->dict:
@jsonrpc.method('notes')
def notes_list(page: int)->list:
def notes_list(page: int) -> list:
"""Список заметок
"""
notes = models.db_session.query(
@@ -118,7 +117,7 @@ def notes_list(page: int)->list:
@jsonrpc.method('notes.count')
def notes_count()->int:
def notes_count() -> int:
"""Количество заметок
"""
result = models.db_session.query(

19
myapp/ns_api/page.py
View File

@@ -1,19 +1,18 @@
__author__ = 'RemiZOffAlex'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru'
from . import jsonrpc, login_required
from .. import app, lib, models
@jsonrpc.method('page')
def page_id(id: int)->dict:
def page_id(id: int) -> dict:
"""Статья
"""
page = models.db_session.query(
models.Page
).filter(
models.Page.id==id
models.Page.id == id
).first()
if page is None:
raise ValueError
@@ -28,7 +27,7 @@ def page_id(id: int)->dict:
@jsonrpc.method('page.add')
@login_required
def page_add(title: str, body: str)->dict:
def page_add(title: str, body: str) -> dict:
"""Добавление новой статьи
"""
newPage = models.Page(
@@ -47,7 +46,7 @@ def page_add(title: str, body: str)->dict:
@jsonrpc.method('page.destroy')
@login_required
def page_destroy(id: int)->bool:
def page_destroy(id: int) -> bool:
"""Полное уничтожение статьи
Аргументы:
@@ -56,7 +55,7 @@ def page_destroy(id: int)->bool:
page = models.db_session.query(
models.Page
).filter(
models.Page.id==id
models.Page.id == id
).first()
if page is None:
raise ValueError
@@ -69,13 +68,13 @@ def page_destroy(id: int)->bool:
@jsonrpc.method('page.update')
@login_required
def page_update(id: int, title: str, text: str)->dict:
def page_update(id: int, title: str, text: str) -> dict:
"""Обновить статью
"""
page = models.db_session.query(
models.Page
).filter(
models.Page.id==id
models.Page.id == id
).first()
if page is None:
raise ValueError
@@ -92,7 +91,7 @@ def page_update(id: int, title: str, text: str)->dict:
@jsonrpc.method('pages')
def pages_list(page: int)->list:
def pages_list(page: int) -> list:
"""Список статей
"""
pages = models.db_session.query(
@@ -118,7 +117,7 @@ def pages_list(page: int)->list:
@jsonrpc.method('pages.count')
def pages_count()->int:
def pages_count() -> int:
"""Общее количество статей
"""
result = models.db_session.query(

4
myapp/ns_api/tag/__init__.py
View File

@@ -1,11 +1,9 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__license__ = 'MIT'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru'
from . import (
from . import ( # noqa F401
note,
page,
tag

42
myapp/ns_api/tag/note.py
View File

@@ -1,8 +1,6 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__license__ = 'MIT'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru'
from .. import jsonrpc, login_required
from ... import app, lib, models
@@ -10,29 +8,29 @@ from ... import app, lib, models
@jsonrpc.method('tag.note.add')
@login_required
def tag_note_add(tag: int, id: int)->dict:
def tag_note_add(tag: int, id: int) -> dict:
"""Добавление тега в заметку
"""
noteRow = models.db_session.query(
models.Note
).filter(
models.Note.id==id,
models.Note.user_id==lib.get_user().id
models.Note.id == id,
models.Note.user_id == lib.get_user().id
).first()
if noteRow is None:
raise ValueError
tagRow = models.db_session.query(
models.Tag
).filter(
models.Tag.id==tag
models.Tag.id == tag
).first()
if tagRow is None:
raise ValueError
exist = models.db_session.query(
models.TagNote
).filter(
models.TagNote.tag_id==tagRow.id,
models.TagNote.note_id==noteRow.id
models.TagNote.tag_id == tagRow.id,
models.TagNote.note_id == noteRow.id
).first()
if exist:
raise ValueError
@@ -48,29 +46,29 @@ def tag_note_add(tag: int, id: int)->dict:
@jsonrpc.method('tag.note.delete')
@login_required
def tag_note_delete(tag: int, id: int)->bool:
def tag_note_delete(tag: int, id: int) -> bool:
"""Удаление тега из заметки
"""
noteRow = models.db_session.query(
models.Note
).filter(
models.Note.id==id,
models.Note.user_id==lib.get_user().id
models.Note.id == id,
models.Note.user_id == lib.get_user().id
).first()
if noteRow is None:
raise ValueError
tagRow = models.db_session.query(
models.Tag
).filter(
models.Tag.id==tag
models.Tag.id == tag
).first()
if tagRow is None:
raise ValueError
exist = models.db_session.query(
models.TagNote
).filter(
models.TagNote.tag_id==tag,
models.TagNote.note_id==id
models.TagNote.tag_id == tag,
models.TagNote.note_id == id
).first()
if exist is None:
raise ValueError
@@ -81,25 +79,25 @@ def tag_note_delete(tag: int, id: int)->bool:
@jsonrpc.method('tag.notes')
@login_required
def tag_notes_list(id: int, page: int)->list:
def tag_notes_list(id: int, page: int) -> list:
"""Список заметок
"""
tag = models.db_session.query(
models.Tag
).filter(
models.Tag.id==id
models.Tag.id == id
).first()
if tag is None:
raise ValueError
indexes = models.db_session.query(
models.TagNote.note_id
).filter(
models.TagNote.tag_id==id
models.TagNote.tag_id == id
)
notes = models.db_session.query(
models.Note
).filter(
models.Note.user_id==lib.get_user().id,
models.Note.user_id == lib.get_user().id,
models.Note.id.in_(indexes)
).order_by(
models.Note.title.asc()
@@ -122,25 +120,25 @@ def tag_notes_list(id: int, page: int)->list:
@jsonrpc.method('tag.notes.count')
@login_required
def tag_notes_count(id: int)->int:
def tag_notes_count(id: int) -> int:
"""Общее количество заметок
"""
tag = models.db_session.query(
models.Tag
).filter(
models.Tag.id==id
models.Tag.id == id
).first()
if tag is None:
raise ValueError
indexes = models.db_session.query(
models.TagNote.note_id
).filter(
models.TagNote.tag_id==id
models.TagNote.tag_id == id
)
result = models.db_session.query(
models.Note
).filter(
models.Note.user_id==lib.get_user().id,
models.Note.user_id == lib.get_user().id,
models.Note.id.in_(indexes)
).count()
return result

30
myapp/ns_api/tag/page.py
View File

@@ -1,8 +1,6 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__license__ = 'MIT'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru'
from .. import jsonrpc, login_required
from ... import app, lib, models
@@ -10,28 +8,28 @@ from ... import app, lib, models
@jsonrpc.method('tag.page.add')
@login_required
def tag_page_add(tag: int, id: int)->dict:
def tag_page_add(tag: int, id: int) -> dict:
"""Добавление тега на страницы
"""
tagRow = models.db_session.query(
models.Tag
).filter(
models.Tag.id==tag
models.Tag.id == tag
).first()
if tagRow is None:
raise ValueError
page = models.db_session.query(
models.Page
).filter(
models.Page.id==id
models.Page.id == id
).first()
if page is None:
raise ValueError
exist = models.db_session.query(
models.TagPage
).filter(
models.TagPage.tag_id==tagRow.id,
models.TagPage.page_id==page.id
models.TagPage.tag_id == tagRow.id,
models.TagPage.page_id == page.id
).first()
if exist:
raise ValueError
@@ -47,14 +45,14 @@ def tag_page_add(tag: int, id: int)->dict:
@jsonrpc.method('tag.page.delete)')
@login_required
def tag_page_delete(tag: int, id: int)->bool:
def tag_page_delete(tag: int, id: int) -> bool:
"""Удаление тега со страницы
"""
exist = models.db_session.query(
models.TagPage
).filter(
models.TagPage.tag_id==tag,
models.TagPage.page_id==id
models.TagPage.tag_id == tag,
models.TagPage.page_id == id
).first()
if exist is None:
raise ValueError
@@ -64,20 +62,20 @@ def tag_page_delete(tag: int, id: int)->bool:
@jsonrpc.method('tag.pages')
def tag_pages_list(id: int, page: int)->list:
def tag_pages_list(id: int, page: int) -> list:
"""Список статей
"""
tag = models.db_session.query(
models.Tag
).filter(
models.Tag.id==id
models.Tag.id == id
).first()
if tag is None:
raise ValueError
indexes = models.db_session.query(
models.TagPage.page_id
).filter(
models.TagPage.tag_id==id
models.TagPage.tag_id == id
)
pages = models.db_session.query(
models.Page
@@ -104,20 +102,20 @@ def tag_pages_list(id: int, page: int)->list:
@jsonrpc.method('tag.pages.count')
def tag_pages_count(id: int)->int:
def tag_pages_count(id: int) -> int:
"""Общее количество статей
"""
tag = models.db_session.query(
models.Tag
).filter(
models.Tag.id==id
models.Tag.id == id
).first()
if tag is None:
raise ValueError
indexes = models.db_session.query(
models.TagPage.page_id
).filter(
models.TagPage.tag_id==id
models.TagPage.tag_id == id
)
result = models.db_session.query(
models.Page

18
myapp/ns_api/tag/tag.py
View File

@@ -1,16 +1,14 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__license__ = 'MIT'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru'
from .. import jsonrpc, login_required
from ... import app, lib, models
from ... import models
@jsonrpc.method('tag.add')
@login_required
def tag_add(name: str)->dict:
def tag_add(name: str) -> dict:
"""Добавить новый тег
"""
exist = models.db_session.query(
@@ -29,13 +27,13 @@ def tag_add(name: str)->dict:
@jsonrpc.method('tag.delete')
@login_required
def tag_delete(id: int)->bool:
def tag_delete(id: int) -> bool:
"""Удалить тег
"""
exist = models.db_session.query(
models.Tag
).filter(
models.Tag.id==id
models.Tag.id == id
).first()
if exist is None:
raise ValueError
@@ -46,14 +44,14 @@ def tag_delete(id: int)->bool:
@jsonrpc.method('tag.exist')
def tag_exist(name: str)->dict:
def tag_exist(name: str) -> dict:
"""Проверить существует ли тег и вернуть информацию о нём
"""
text = name.lower().strip()
tagRow = models.db_session.query(
models.Tag
).filter(
models.Tag.name==text
models.Tag.name == text
).first()
if tagRow is None:
raise ValueError
@@ -65,7 +63,7 @@ def tag_exist(name: str)->dict:
@jsonrpc.method('tags')
def tags_list()->list:
def tags_list() -> list:
"""Список тегов
"""
tags = models.db_session.query(
@@ -80,7 +78,7 @@ def tags_list()->list:
@jsonrpc.method('tags.groups')
def tags_groups()->dict:
def tags_groups() -> dict:
"""Облако тегов
"""
tags = models.db_session.query(

20
myapp/ns_api/user.py
View File

@@ -1,28 +1,26 @@
__author__ = 'RemiZOffAlex'
__copyright__ = '(c) RemiZOffAlex'
__license__ = 'MIT'
__email__ = 'remizoffalex@mail.ru'
__url__ = 'https://remizoffalex.ru'
from . import jsonrpc, login_required
from . import jsonrpc
from .. import app, lib, models
@jsonrpc.method('user.pages')
def user_pages_list(id: int, page: int)->list:
def user_pages_list(id: int, page: int) -> list:
"""Список статей пользователя
"""
user = models.db_session.query(
models.User
).filter(
models.User.id==id
models.User.id == id
).first()
if user is None:
raise ValueError
pages = models.db_session.query(
models.Page
).filter(
models.Page.user_id==id
models.Page.user_id == id
).order_by(
models.Page.title.asc()
)
@@ -44,26 +42,26 @@ def user_pages_list(id: int, page: int)->list:
@jsonrpc.method('user.pages.count')
def user_pages_count(id: int)->int:
def user_pages_count(id: int) -> int:
"""Общее количество статей
"""
user = models.db_session.query(
models.User
).filter(
models.User.id==id
models.User.id == id
).first()
if user is None:
raise ValueError
result = models.db_session.query(
models.Page
).filter(
models.Page.user_id==id
models.Page.user_id == id
).count()
return result
@jsonrpc.method('users')
def users_list(page: int)->list:
def users_list(page: int) -> list:
"""Показать список пользователей
"""
users = models.db_session.query(
@@ -82,7 +80,7 @@ def users_list(page: int)->list:
@jsonrpc.method('users.count')
def users_count()->int:
def users_count() -> int:
"""Количество список пользователей
"""
result = models.db_session.query(