flibusta-apps/book_library_server
1
0
Fork 0
mirror of https://github.com/flibusta-apps/book_library_server.git synced 2025-12-06 15:15:36 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Migrate to ruff

Browse Source
This commit is contained in:
Bulat Kurbanov
2023-01-07 23:49:26 +01:00
parent b58b3b4e4c
commit 09130d7905
27 changed files with 605 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fastapi_book_server/app/depends.py
View File

@@ -1,6 +1,6 @@
from typing import Optional
from fastapi import Security, HTTPException, Query, status
from fastapi import HTTPException, Query, Security, status
from core.auth import default_security
from core.config import env_config

2
fastapi_book_server/app/filters/book.py
View File

@@ -1,7 +1,7 @@
from datetime import date
from typing import Optional
from fastapi.params import Query
from fastapi import Query
from app.depends import get_allowed_langs

2
fastapi_book_server/app/models.py
View File

@@ -4,7 +4,7 @@ from typing import Optional
import ormar
from sqlalchemy import text
from core.db import metadata, database
from core.db import database, metadata
class BaseMeta(ormar.ModelMeta):

3
fastapi_book_server/app/services/author.py
View File

@@ -1,8 +1,7 @@
from typing import TypedDict
from app.models import Author
from app.services.common import TRGMSearchService, MeiliSearchService, GetRandomService
from app.services.common import GetRandomService, MeiliSearchService, TRGMSearchService
GET_OBJECT_IDS_QUERY = """
SELECT ARRAY(

9
fastapi_book_server/app/services/book.py
View File

@@ -1,14 +1,13 @@
from typing import TypedDict, Optional
from typing import Optional, TypedDict
from app.models import Book as BookDB
from app.services.common import (
TRGMSearchService,
MeiliSearchService,
GetRandomService,
BaseFilterService,
GetRandomService,
MeiliSearchService,
TRGMSearchService,
)
GET_OBJECT_IDS_QUERY = """
SELECT ARRAY(
WITH filtered_books AS (

7
fastapi_book_server/app/services/common.py
View File

@@ -2,20 +2,19 @@ import abc
import asyncio
from concurrent.futures import ThreadPoolExecutor
from random import choice
from typing import Optional, Generic, TypeVar, TypedDict, Union
from typing import Generic, Optional, TypedDict, TypeVar, Union
import meilisearch
from databases import Database
from fastapi_pagination.api import resolve_params
from fastapi_pagination.bases import AbstractParams, RawParams
import meilisearch
from ormar import Model, QuerySet
from redis import asyncio as aioredis
from sqlalchemy import Table
from app.utils.pagination import Page, CustomPage
from app.utils.pagination import CustomPage, Page
from core.config import env_config
MODEL = TypeVar("MODEL", bound=Model)
QUERY = TypeVar("QUERY", bound=TypedDict)

3
fastapi_book_server/app/services/sequence.py
View File

@@ -1,8 +1,7 @@
from typing import TypedDict
from app.models import Sequence
from app.services.common import TRGMSearchService, MeiliSearchService, GetRandomService
from app.services.common import GetRandomService, MeiliSearchService, TRGMSearchService
GET_OBJECT_IDS_QUERY = """
SELECT ARRAY (

3
fastapi_book_server/app/services/translator.py
View File

@@ -1,6 +1,5 @@
from app.models import Author
from app.services.common import TRGMSearchService, MeiliSearchService
from app.services.common import MeiliSearchService, TRGMSearchService
GET_OBJECT_IDS_QUERY = """
SELECT ARRAY(

2
fastapi_book_server/app/utils/pagination.py
View File

@@ -1,4 +1,4 @@
from typing import Protocol, TypeVar, Any, Generic, Sequence, runtime_checkable
from typing import Any, Generic, Protocol, Sequence, TypeVar, runtime_checkable
from fastapi_pagination import Page, Params
from fastapi_pagination.bases import AbstractParams

1
fastapi_book_server/app/views/__init__.py
View File

@@ -8,7 +8,6 @@ from app.views.sequence import sequence_router
from app.views.source import source_router
from app.views.translation import translation_router
routers = [
source_router,
author_router,

4
fastapi_book_server/app/views/author.py
View File

@@ -1,5 +1,4 @@
from fastapi import APIRouter, Depends, Request, HTTPException, status
from fastapi import APIRouter, Depends, HTTPException, Request, status
from fastapi_pagination import Params
from fastapi_pagination.ext.ormar import paginate
@@ -13,7 +12,6 @@ from app.services.author import AuthorMeiliSearchService, GetRandomAuthorService
from app.services.translator import TranslatorMeiliSearchService
from app.utils.pagination import CustomPage
author_router = APIRouter(
prefix="/api/v1/authors",
tags=["author"],

4
fastapi_book_server/app/views/author_annotation.py
View File

@@ -1,13 +1,11 @@
from fastapi import APIRouter, Depends, HTTPException, status
from fastapi_pagination import Params, Page
from fastapi_pagination import Page, Params
from fastapi_pagination.ext.ormar import paginate
from app.depends import check_token
from app.models import AuthorAnnotation as AuthorAnnotationDB
from app.serializers.author_annotation import AuthorAnnotation
author_annotation_router = APIRouter(
prefix="/api/v1/author_annotations",
tags=["author_annotation"],

8
fastapi_book_server/app/views/book.py
View File

@@ -1,23 +1,21 @@
from typing import Optional
from fastapi import APIRouter, Depends, Request, HTTPException, status
from fastapi import APIRouter, Depends, HTTPException, Request, status
from fastapi_pagination import Params
from app.depends import check_token, get_allowed_langs
from app.filters.book import get_book_filter
from app.models import Book as BookDB
from app.models import BookAnnotation as BookAnnotationDB
from app.serializers.book import Book, RemoteBook, BookDetail
from app.serializers.book import Book, BookDetail, RemoteBook
from app.serializers.book_annotation import BookAnnotation
from app.services.book import (
BookMeiliSearchService,
BookFilterService,
BookMeiliSearchService,
GetRandomBookService,
)
from app.utils.pagination import CustomPage
book_router = APIRouter(
prefix="/api/v1/books",
tags=["book"],

4
fastapi_book_server/app/views/book_annotation.py
View File

@@ -1,13 +1,11 @@
from fastapi import APIRouter, Depends, HTTPException, status
from fastapi_pagination import Params, Page
from fastapi_pagination import Page, Params
from fastapi_pagination.ext.ormar import paginate
from app.depends import check_token
from app.models import BookAnnotation as BookAnnotationDB
from app.serializers.book_annotation import BookAnnotation
book_annotation_router = APIRouter(
prefix="/api/v1/book_annotations",
tags=["book_annotation"],

7
fastapi_book_server/app/views/genre.py
View File

@@ -1,5 +1,4 @@
from fastapi import APIRouter, Depends, HTTPException, status, Request
from fastapi import APIRouter, Depends, HTTPException, Request, status
from fastapi_pagination import Params
from fastapi_pagination.ext.ormar import paginate
@@ -10,7 +9,6 @@ from app.serializers.genre import Genre
from app.services.genre import GenreMeiliSearchService
from app.utils.pagination import CustomPage
genre_router = APIRouter(
prefix="/api/v1/genres", tags=["genres"], dependencies=[Depends(check_token)]
)
@@ -31,7 +29,8 @@ async def get_genres(genre_filter: dict = Depends(get_genre_filter)):
@genre_router.get("/metas", response_model=list[str])
async def get_genre_metas():
genres = await GenreDB.objects.fields("meta").values_list(flatten=True)
return sorted(list(set(genres)))
genres.sort()
return list(set(genres))
@genre_router.get("/{id}", response_model=Genre)

1
fastapi_book_server/app/views/healthcheck.py
View File

@@ -1,6 +1,5 @@
from fastapi import APIRouter
healtcheck_router = APIRouter(tags=["healthcheck"])

4
fastapi_book_server/app/views/sequence.py
View File

@@ -1,5 +1,4 @@
from fastapi import APIRouter, Depends, Request
from fastapi_pagination import Params
from fastapi_pagination.ext.ormar import paginate
@@ -8,10 +7,9 @@ from app.models import Book as BookDB
from app.models import Sequence as SequenceDB
from app.serializers.sequence import Book as SequenceBook
from app.serializers.sequence import Sequence
from app.services.sequence import SequenceMeiliSearchService, GetRandomSequenceService
from app.services.sequence import GetRandomSequenceService, SequenceMeiliSearchService
from app.utils.pagination import CustomPage
sequence_router = APIRouter(
prefix="/api/v1/sequences",
tags=["sequence"],

4
fastapi_book_server/app/views/source.py
View File

@@ -1,13 +1,11 @@
from fastapi import APIRouter, Depends
from fastapi_pagination import Params, Page
from fastapi_pagination import Page, Params
from fastapi_pagination.ext.ormar import paginate
from app.depends import check_token
from app.models import Source as SourceDB
from app.serializers.source import Source
source_router = APIRouter(
prefix="/api/v1/sources",
tags=["source"],

2
fastapi_book_server/app/views/translation.py
View File

@@ -1,5 +1,4 @@
from fastapi import APIRouter, Depends
from fastapi_pagination import Params
from fastapi_pagination.ext.ormar import paginate
@@ -8,7 +7,6 @@ from app.models import Translation as TranslationDB
from app.serializers.translation import Translation
from app.utils.pagination import CustomPage
translation_router = APIRouter(
prefix="/api/v1/translation",
tags=["translation"],