Skip to content
Snippets Groups Projects
Commit a01646e5 authored by Tim Repke's avatar Tim Repke
Browse files

fix flake8 styles

parent 94b2751d
No related branches found
No related tags found
No related merge requests found
Pipeline #712 failed
......@@ -5,7 +5,7 @@ from server.util.logging import get_logger
logger = get_logger('nacsos.main')
logger.info('Starting up server')
from server import app
from server import app # noqa: F401, E402
# config = Config()
# config.bind = f'{settings.SERVER.HOST}:{settings.SERVER.PORT}'
......
from fastapi import APIRouter, Depends, HTTPException, status as http_status, Header
from fastapi import APIRouter, Depends, HTTPException, status as http_status
from nacsos_data.models.annotations import AnnotationTaskModel, \
AnnotationTaskLabel, \
AnnotationTaskLabelChoice, \
AssignmentScopeModel, \
AssignmentModel, \
AssignmentStatus, \
AssignmentScopeBaseConfig, \
AssignmentScopeConfig
from nacsos_data.models.items import AnyItemModel
from nacsos_data.db.crud.items import read_any_item_by_item_id
......@@ -34,7 +31,7 @@ from nacsos_data.db.crud.annotations import \
UserProjectAssignmentScope, \
store_assignments
from nacsos_data.util.annotations.validation import merge_task_and_annotations, annotated_task_to_annotations
from nacsos_data.util.annotations.assignments.random import AssignmentScopeRandomConfig, random_assignments
from nacsos_data.util.annotations.assignments.random import random_assignments
from pydantic import BaseModel
from server.util.security import UserPermissionChecker
......@@ -234,12 +231,12 @@ async def save_annotation(annotated_item: AnnotatedItem,
else:
raise HTTPException(
status_code=http_status.HTTP_403_FORBIDDEN,
detail=f'The combination of project, assignment, user, task, and item is invalid.',
detail='The combination of project, assignment, user, task, and item is invalid.',
)
@router.get('/config/items/', response_model=list[ItemWithCount])
async def get_annotations(permissions=Depends(UserPermissionChecker('dataset_read'))) \
async def get_items_with_count(permissions=Depends(UserPermissionChecker('dataset_read'))) \
-> list[ItemWithCount]:
items = await read_item_ids_with_assignment_count_for_project(project_id=permissions.permissions.project_id,
engine=db_engine)
......
from datetime import timedelta
from fastapi import APIRouter, Body, Depends, HTTPException, status
from fastapi import APIRouter, Depends, HTTPException, status
from fastapi.security import OAuth2PasswordRequestForm
from nacsos_data.models.users import UserModel
......
......@@ -38,8 +38,8 @@ async def get_import_details(import_id: str,
@router.get('/import/{import_id}/count/', response_model=int)
async def get_import_details(import_id: str,
permissions: UserPermissions = Depends(UserPermissionChecker('imports_read'))) -> int:
async def get_import_counts(import_id: str,
permissions: UserPermissions = Depends(UserPermissionChecker('imports_read'))) -> int:
return await read_item_count_for_import(import_id=import_id, engine=db_engine)
......
......@@ -4,8 +4,6 @@ from nacsos_data.models.projects import ProjectTypeLiteral
from nacsos_data.models.items import AnyItemModel
from nacsos_data.models.items.twitter import TwitterItemModel
from nacsos_data.db.crud.items import \
create_item, \
create_items, \
read_item_count_for_project
from nacsos_data.db.crud.items.basic import \
read_all_basic_items_for_project, \
......@@ -15,10 +13,7 @@ from nacsos_data.db.crud.items.twitter import \
read_all_twitter_items_for_project, \
read_all_twitter_items_for_project_paged, \
read_twitter_item_by_item_id, \
read_twitter_items_by_author_id, \
read_twitter_item_by_twitter_id, \
create_twitter_item, \
create_twitter_items
create_twitter_item
from server.data import db_engine
from server.util.security import UserPermissionChecker
......@@ -42,8 +37,8 @@ async def list_project_data(project_id: str, item_type: ProjectTypeLiteral,
@router.get('/{item_type}/list/{page}/{page_size}', response_model=list[AnyItemModel])
async def list_project_data(project_id: str, item_type: ProjectTypeLiteral, page: int, page_size: int,
permission=Depends(UserPermissionChecker('dataset_read'))):
async def list_project_data_paged(project_id: str, item_type: ProjectTypeLiteral, page: int, page_size: int,
permission=Depends(UserPermissionChecker('dataset_read'))):
if item_type == 'basic':
return await read_all_basic_items_for_project_paged(project_id=project_id,
page=page, page_size=page_size, engine=db_engine)
......
......@@ -23,8 +23,8 @@ async def get_all_users(permissions: UserPermissions = Depends(UserPermissionChe
# FIXME refine required permission
@router.get('/list/project/{project_id}', response_model=list[UserModel])
async def get_all_users(project_id: str,
permissions: UserPermissions = Depends(UserPermissionChecker('annotations_edit'))) \
async def get_project_users(project_id: str,
permissions: UserPermissions = Depends(UserPermissionChecker('annotations_edit'))) \
-> list[UserInDBModel]:
result = await read_project_users(project_id=project_id, engine=db_engine)
return result
......@@ -46,4 +46,3 @@ async def get_users_by_ids(user_id: list[str] = Query(),
-> list[UserInDBModel]:
result = await read_users_by_ids(user_ids=user_id, engine=db_engine)
return result
# TODO integrate this somehow in a sensible way
# https://fastapi.tiangolo.com/tutorial/background-tasks/
# https://github.com/tiangolo/full-stack-fastapi-postgresql/blob/490c554e23343eec0736b06e59b2108fdd057fdc/%7B%7Bcookiecutter.project_slug%7D%7D/backend/app/app/utils.py
\ No newline at end of file
# https://github.com/tiangolo/full-stack-fastapi-postgresql/blob/490c554e23343eec0736b06e59b2108fdd057fdc/%7B%7Bcookiecutter.project_slug%7D%7D/backend/app/app/utils.py
......@@ -4,7 +4,6 @@ import logging
import logging.config
from uvicorn.logging import DefaultFormatter
from hypercorn.logging import Logger
from server.util.config import settings
......
......@@ -13,7 +13,7 @@ except ImportError as e:
RUSAGE_SELF = None
def getrusage(*args):
def getrusage(*args): # noqa:E303
return 0.0, 0.0
......
......@@ -3,7 +3,7 @@ from datetime import timedelta, datetime
from pydantic import BaseModel
from jose import JWTError, jwt
from passlib.context import CryptContext
from fastapi import Depends, HTTPException, status, Path, Header
from fastapi import Depends, HTTPException, status, Header
from fastapi.security import OAuth2PasswordBearer
from nacsos_data.models.users import UserModel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment