rainycode 1.6.2__tar.gz → 1.6.3__tar.gz

{rainycode-1.6.2 → rainycode-1.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.6.2
+Version: 1.6.3
 Summary: FastAPI base modules
 Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2

{rainycode-1.6.2 → rainycode-1.6.3}/common_depends/auth_depend.py

@@ -11,7 +11,7 @@ from common_base.exception import CustomException
 from common_models.user_model import User
 from common_utils.jwt_util import JwtUtil
 from core.databases.aioredis import AioRedis
-from core.start import base_config
+from core.base_config import base_config
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl=f"/api/{base_config.app_name}/auth/login", auto_error=False)
 
@@ -21,7 +21,7 @@ async def get_current_user(request: Request, token: str, security_scopes: Securi
     """
     payload = JwtUtil.decode_token(token)
     if not payload:
-        raise CustomException(msg=f"无效的令牌 {token}", status_code=401)
+        raise CustomException(msg="无效的令牌", status_code=401)
 
     # 检查是否在黑名单中
     if await AioRedis.get(f"{REDIS_PREFIX_BLOCKLIST}{token}"):
@@ -29,7 +29,7 @@ async def get_current_user(request: Request, token: str, security_scopes: Securi
 
     user_id = payload.get("sub")
     if not user_id:
-        raise CustomException(msg=f"无效的令牌 {token}", status_code=401)
+        raise CustomException(msg="无效的令牌", status_code=401)
 
     # 1. 尝试从缓存获取
     user = None

{rainycode-1.6.2 → rainycode-1.6.3}/common_servers/service/file_svc.py

@@ -16,8 +16,8 @@ class FileService:
             cls,
             user: User,
             file,
-            *,
             subdir: str,
+            upload_root: str = base_config.upload_root,
             allowed_exts: set[str] = base_config.upload_allowed_image_exts,
             max_bytes: int = base_config.upload_max_bytes,
     ) -> dict:
@@ -37,7 +37,7 @@ class FileService:
 
         filename = f"{uuid.uuid4().hex}.{ext}"
         relative = f"{subdir}/{filename}"  # 磁盘相对路径 & File.url（不含前缀）
-        path = Path(base_config.upload_root) / relative
+        path = Path(upload_root) / relative
         path.parent.mkdir(parents=True, exist_ok=True)
         path.write_bytes(content)
 

rainycode-1.6.3/common_utils/pagination.py

@@ -0,0 +1,34 @@
+class Pagination:
+    """
+    对 Tortoise ORM 查询集执行分页，并返回总记录数和当前页数据。
+
+    示例：
+        qs = Order.filter(couple_id=couple.id).order_by('-id')
+        page = await Pagination.page(qs, page_no=page_no, page_size=page_size)
+
+    返回结构为 {'items': 当前页模型对象列表, 'count': 符合查询条件的总数}。
+    本类只负责查询计数和 limit/offset，不负责序列化或组装业务字段。
+    调用方应在需要时转换模型对象，并确保查询集具有稳定的排序规则。
+    """
+    DEFAULT_PAGE_SIZE = 20
+    MAX_PAGE_SIZE = 999
+
+    @classmethod
+    async def page(cls, qs, page_no: int | None = None, page_size: int | None = None) -> dict:
+        """获取指定页的数据。
+
+        Args:
+            qs: 已完成筛选及排序的 Tortoise ORM 查询集。
+            page_no: 页码，从 1 开始；未提供或小于 1 时按第 1 页处理。
+            page_size: 每页条数；未提供时使用默认值，并限制在 1 到 MAX_PAGE_SIZE 之间。
+
+        Returns:
+            包含当前页模型对象列表 ``items`` 和匹配记录总数 ``count`` 的字典。
+        """
+        page_no = page_no or 1
+        page_no = page_no if page_no > 0 else 1
+        page_size = page_size or cls.DEFAULT_PAGE_SIZE
+        page_size = min(max(page_size, 1), cls.MAX_PAGE_SIZE)
+        count = await qs.count()
+        items = await qs.limit(page_size).offset((page_no - 1) * page_size)
+        return {'items': items, 'count': count}

{rainycode-1.6.2 → rainycode-1.6.3}/core/start.py

@@ -13,7 +13,7 @@ from common_base.exception import (
     ValueExceptionHandler,
 )
 from common_base.logging import logger
-from core.base_config import BaseConfig, base_config
+from core.base_config import BaseConfig
 from core.databases.aiodb import AioDb
 from core.middleware.http_middleware import RequestHttpMiddleware
 from fastapi import FastAPI, HTTPException
@@ -39,9 +39,9 @@ def start_server(config: BaseConfig):
     # 注册异常处理
     register_exception(app)
     # 注册中间件
-    register_middlewares(app)
+    register_middlewares(app, config)
     # 注册静态文件
-    register_files(app)
+    register_files(app, config)
 
     return app
 
@@ -79,25 +79,25 @@ def register_exception(app: FastAPI):
     app.add_exception_handler(Exception, AllExceptionHandler) # pyright: ignore[reportArgumentType]
 
 
-def register_middlewares(app: FastAPI) -> None:
+def register_middlewares(app: FastAPI, config: BaseConfig) -> None:
     """
     注册中间件
     """
     app.add_middleware(RequestHttpMiddleware)
     app.add_middleware(
         CORSMiddleware,
-        allow_origins=base_config.cors_origins,
-        allow_credentials=base_config.cors_allow_credentials,
-        allow_methods=base_config.cors_allow_methods,
-        allow_headers=base_config.cors_allow_headers
+        allow_origins=config.cors_origins,
+        allow_credentials=config.cors_allow_credentials,
+        allow_methods=config.cors_allow_methods,
+        allow_headers=config.cors_allow_headers
     )
 
 
-def register_files(app: FastAPI) -> None:
+def register_files(app: FastAPI, config: BaseConfig) -> None:
     """
     注册文件相关配置
     """
-    static_dir = base_config.static_root
+    static_dir = config.static_root
     if not os.path.exists(static_dir):
         os.mkdir(static_dir)
     app.mount('/static', StaticFiles(directory=static_dir))

{rainycode-1.6.2 → rainycode-1.6.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rainycode"
-version = "1.6.2"
+version = "1.6.3"
 description = "FastAPI base modules"
 requires-python = ">=3.10"
 

{rainycode-1.6.2 → rainycode-1.6.3}/rainycode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.6.2
+Version: 1.6.3
 Summary: FastAPI base modules
 Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2

{rainycode-1.6.2 → rainycode-1.6.3}/rainycode.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ common_utils/captcha_util.py
 common_utils/datetime_util.py
 common_utils/ip_util.py
 common_utils/jwt_util.py
+common_utils/pagination.py
 common_utils/snowflake_util.py
 common_utils/wechat_util.py
 core/base_config.py