Skip to content

Commit d0a1140

Browse files
committed
fastapi upgrade, CRUDBase replaced with fastcrud
1 parent b5babd3 commit d0a1140

File tree

6 files changed

+29
-10
lines changed

6 files changed

+29
-10
lines changed

src/app/api/v1/posts.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ async def write_post(
3636
post_internal_dict["created_by_user_id"] = db_user["id"]
3737

3838
post_internal = PostCreateInternal(**post_internal_dict)
39-
return await crud_posts.create(db=db, object=post_internal)
39+
created_post: PostRead = await crud_posts.create(db=db, object=post_internal)
40+
return created_post
4041

4142

4243
@router.get("/{username}/posts", response_model=PaginatedListResponse[PostRead])
@@ -77,7 +78,7 @@ async def read_post(
7778
if db_user is None:
7879
raise NotFoundException("User not found")
7980

80-
db_post = await crud_posts.get(
81+
db_post: PostRead | None = await crud_posts.get(
8182
db=db, schema_to_select=PostRead, id=id, created_by_user_id=db_user["id"], is_deleted=False
8283
)
8384
if db_post is None:

src/app/api/v1/rate_limits.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ async def write_rate_limit(
3131
raise DuplicateValueException("Rate Limit Name not available")
3232

3333
rate_limit_internal = RateLimitCreateInternal(**rate_limit_internal_dict)
34-
return await crud_rate_limits.create(db=db, object=rate_limit_internal)
34+
created_rate_limit: RateLimitRead = await crud_rate_limits.create(db=db, object=rate_limit_internal)
35+
return created_rate_limit
3536

3637

3738
@router.get("/tier/{tier_name}/rate_limits", response_model=PaginatedListResponse[RateLimitRead])
@@ -65,7 +66,9 @@ async def read_rate_limit(
6566
if not db_tier:
6667
raise NotFoundException("Tier not found")
6768

68-
db_rate_limit = await crud_rate_limits.get(db=db, schema_to_select=RateLimitRead, tier_id=db_tier["id"], id=id)
69+
db_rate_limit: dict | None = await crud_rate_limits.get(
70+
db=db, schema_to_select=RateLimitRead, tier_id=db_tier["id"], id=id
71+
)
6972
if db_rate_limit is None:
7073
raise NotFoundException("Rate Limit not found")
7174

src/app/api/v1/tiers.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ async def write_tier(
2424
raise DuplicateValueException("Tier Name not available")
2525

2626
tier_internal = TierCreateInternal(**tier_internal_dict)
27-
return await crud_tiers.create(db=db, object=tier_internal)
27+
created_tier: TierRead = await crud_tiers.create(db=db, object=tier_internal)
28+
return created_tier
2829

2930

3031
@router.get("/tiers", response_model=PaginatedListResponse[TierRead])
@@ -40,7 +41,7 @@ async def read_tiers(
4041

4142
@router.get("/tier/{name}", response_model=TierRead)
4243
async def read_tier(request: Request, name: str, db: Annotated[AsyncSession, Depends(async_get_db)]) -> dict:
43-
db_tier = await crud_tiers.get(db=db, schema_to_select=TierRead, name=name)
44+
db_tier: TierRead | None = await crud_tiers.get(db=db, schema_to_select=TierRead, name=name)
4445
if db_tier is None:
4546
raise NotFoundException("Tier not found")
4647

src/app/api/v1/users.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ async def write_user(
3636
del user_internal_dict["password"]
3737

3838
user_internal = UserCreateInternal(**user_internal_dict)
39-
return await crud_users.create(db=db, object=user_internal)
39+
created_user: UserRead = await crud_users.create(db=db, object=user_internal)
40+
return created_user
4041

4142

4243
@router.get("/users", response_model=PaginatedListResponse[UserRead])
@@ -61,7 +62,9 @@ async def read_users_me(request: Request, current_user: Annotated[UserRead, Depe
6162

6263
@router.get("/user/{username}", response_model=UserRead)
6364
async def read_user(request: Request, username: str, db: Annotated[AsyncSession, Depends(async_get_db)]) -> dict:
64-
db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username, is_deleted=False)
65+
db_user: UserRead | None = await crud_users.get(
66+
db=db, schema_to_select=UserRead, username=username, is_deleted=False
67+
)
6568
if db_user is None:
6669
raise NotFoundException("User not found")
6770

@@ -168,7 +171,7 @@ async def read_user_tier(
168171
if not db_tier:
169172
raise NotFoundException("Tier not found")
170173

171-
joined = await crud_users.get_joined(
174+
joined: dict = await crud_users.get_joined(
172175
db=db,
173176
join_model=Tier,
174177
join_prefix="tier_",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# ruff: noqa
2+
from fastcrud.exceptions.http_exceptions import (
3+
CustomException,
4+
BadRequestException,
5+
NotFoundException,
6+
ForbiddenException,
7+
UnauthorizedException,
8+
UnprocessableEntityException,
9+
DuplicateValueException,
10+
RateLimitException,
11+
)

src/app/core/worker/functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ async def sample_background_task(ctx: Worker, name: str) -> str:
1717

1818
# -------- base functions --------
1919
async def startup(ctx: Worker) -> None:
20-
logging.info('Worker Started')
20+
logging.info("Worker Started")
2121

2222

2323
async def shutdown(ctx: Worker) -> None:

0 commit comments

Comments
 (0)