Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor mypy and ruff fixes, fastcrud bumped to 0.10.0 #128

Merged
merged 1 commit into from
Mar 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ redis = "^5.0.1"
arq = "^0.25.0"
gunicorn = "^21.2.0"
bcrypt = "^4.1.1"
fastcrud = "^0.7.0"
fastcrud = "^0.10.0"


[build-system]
Expand Down
5 changes: 3 additions & 2 deletions src/app/api/v1/posts.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Annotated
from typing import Annotated, Any

from fastapi import APIRouter, Depends, Request
from fastcrud.paginated import PaginatedListResponse, compute_offset, paginated_response
Expand Down Expand Up @@ -65,7 +65,8 @@ async def read_posts(
is_deleted=False,
)

return paginated_response(crud_data=posts_data, page=page, items_per_page=items_per_page)
response: dict[str, Any] = paginated_response(crud_data=posts_data, page=page, items_per_page=items_per_page)
return response


@router.get("/{username}/post/{id}", response_model=PostRead)
Expand Down
5 changes: 3 additions & 2 deletions src/app/api/v1/rate_limits.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Annotated
from typing import Annotated, Any

from fastapi import APIRouter, Depends, Request
from fastcrud.paginated import PaginatedListResponse, compute_offset, paginated_response
Expand Down Expand Up @@ -54,7 +54,8 @@ async def read_rate_limits(
tier_id=db_tier["id"],
)

return paginated_response(crud_data=rate_limits_data, page=page, items_per_page=items_per_page)
response: dict[str, Any] = paginated_response(crud_data=rate_limits_data, page=page, items_per_page=items_per_page)
return response


@router.get("/tier/{tier_name}/rate_limit/{id}", response_model=RateLimitRead)
Expand Down
7 changes: 4 additions & 3 deletions src/app/api/v1/tiers.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Annotated
from typing import Annotated, Any

from fastapi import APIRouter, Depends, Request
from sqlalchemy.ext.asyncio import AsyncSession
from fastcrud.paginated import PaginatedListResponse, compute_offset, paginated_response
from sqlalchemy.ext.asyncio import AsyncSession

from ...api.dependencies import get_current_superuser
from ...core.db.database import async_get_db
Expand Down Expand Up @@ -35,7 +35,8 @@ async def read_tiers(
db=db, offset=compute_offset(page, items_per_page), limit=items_per_page, schema_to_select=TierRead
)

return paginated_response(crud_data=tiers_data, page=page, items_per_page=items_per_page)
response: dict[str, Any] = paginated_response(crud_data=tiers_data, page=page, items_per_page=items_per_page)
return response


@router.get("/tier/{name}", response_model=TierRead)
Expand Down
5 changes: 3 additions & 2 deletions src/app/api/v1/users.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Annotated, Any

from fastapi import APIRouter, Depends, Request
from sqlalchemy.ext.asyncio import AsyncSession
from fastcrud.paginated import PaginatedListResponse, compute_offset, paginated_response
from sqlalchemy.ext.asyncio import AsyncSession

from ...api.dependencies import get_current_superuser, get_current_user
from ...core.db.database import async_get_db
Expand Down Expand Up @@ -51,7 +51,8 @@ async def read_users(
is_deleted=False,
)

return paginated_response(crud_data=users_data, page=page, items_per_page=items_per_page)
response: dict[str, Any] = paginated_response(crud_data=users_data, page=page, items_per_page=items_per_page)
return response


@router.get("/user/me/", response_model=UserRead)
Expand Down
6 changes: 3 additions & 3 deletions src/scripts/create_first_superuser.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import asyncio
import uuid
import logging
import uuid
from datetime import UTC, datetime

from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, MetaData, String, Table, insert, select
Expand Down Expand Up @@ -60,10 +60,10 @@ async def create_first_user(session: AsyncSession) -> None:
await conn.commit()

logger.info(f"Admin user {username} created successfully.")

else:
logger.info(f"Admin user {username} already exists.")

except Exception as e:
logger.error(f"Error creating admin user: {e}")

Expand Down
4 changes: 2 additions & 2 deletions src/scripts/create_first_tier.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ async def create_first_tier(session: AsyncSession) -> None:
session.add(Tier(name=tier_name))
await session.commit()
logger.info(f"Tier '{tier_name}' created successfully.")

else:
logger.info(f"Tier '{tier_name}' already exists.")

except Exception as e:
logger.error(f"Error creating tier: {e}")

Expand Down