rainycode 1.1.9__tar.gz → 1.3.0__tar.gz

{rainycode-1.1.9 → rainycode-1.3.0}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.1.9
+Version: 1.3.0
 Summary: FastAPI base modules
-Requires-Python: >=3.8
-Requires-Dist: build==1.4.0
+Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2
 Requires-Dist: fastapi==0.133.1
 Requires-Dist: aiohttp==3.13.3
@@ -18,3 +17,6 @@ Requires-Dist: pycryptodome==3.23.0
 Requires-Dist: uvicorn[standard]==0.41.0
 Requires-Dist: tortoise-orm[asyncmy]==0.25.4
 Requires-Dist: pydantic-settings==2.13.1
+Provides-Extra: release
+Requires-Dist: build==1.4.0; extra == "release"
+Requires-Dist: twine==6.1.0; extra == "release"

{rainycode-1.1.9 → rainycode-1.3.0}/common_base/aiorequests.py

@@ -1,8 +1,8 @@
 import json
 import ssl
-import certifi
-import aiohttp
 
+import aiohttp
+import certifi
 
 # 模块级别 SSL 上下文，使用 certifi 证书，避免重复创建
 _SSL_CONTEXT = ssl.create_default_context(cafile=certifi.where())
@@ -10,7 +10,7 @@ _SSL_CONTEXT = ssl.create_default_context(cafile=certifi.where())
 
 def parse_url(url, params=None, suffix=None):
     if params:
-        query = "&".join(["{}={}".format(k, params[k]) for k in sorted(params.keys())])
+        query = "&".join([f"{k}={params[k]}" for k in sorted(params.keys())])
         if "?" in url:
             url += "&" + query
         else:

{rainycode-1.1.9 → rainycode-1.3.0}/common_base/exception.py

@@ -1,5 +1,6 @@
-from common_base.logging import logger
 from typing import cast
+
+from common_base.logging import logger
 from common_base.response import ErrorReturn
 from fastapi import HTTPException, Request, status
 from fastapi.exceptions import RequestValidationError, ResponseValidationError

{rainycode-1.1.9 → rainycode-1.3.0}/common_base/logging.py

@@ -1,12 +1,12 @@
+import logging
 import os
 import sys
-import logging
 import traceback
 
 
 def logging_config(app_name: str):
     # 日志目录
-    log_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../log"))
+    log_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../logs"))
     if not os.path.exists(log_dir):
         os.mkdir(log_dir)
     file_path = log_dir + '/' + app_name + '.log'

{rainycode-1.1.9 → rainycode-1.3.0}/common_depends/auth_depend.py

@@ -1,11 +1,15 @@
 import json
-from fastapi import Depends, Request
-from fastapi.security import OAuth2PasswordBearer, SecurityScopes
-from common_base.consts import REDIS_PREFIX_BLOCKLIST, REDIS_PREFIX_USER_INFO
+
+from common_base.consts import (
+    REDIS_PREFIX_BLOCKLIST,
+    REDIS_PREFIX_USER_INFO,
+)
 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 fastapi import Depends, Request
+from fastapi.security import OAuth2PasswordBearer, SecurityScopes
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="api/auth_center/login")
 

{rainycode-1.1.9 → rainycode-1.3.0}/common_models/base_model.py

@@ -1,12 +1,13 @@
 import uuid
 from collections.abc import Iterable
-from typing_extensions import Self
-from typing import Optional, Any
-from tortoise import fields, BaseDBAsyncClient
-from tortoise.expressions import Q
-from tortoise.queryset import BulkCreateQuery, QuerySet, QuerySetSingle
+from typing import Any, Optional
+
 from common_utils.snowflake_util import get_snowflake_id
 from core.databases.aiodb import MySQLUtils
+from tortoise import BaseDBAsyncClient, fields
+from tortoise.expressions import Q
+from tortoise.queryset import BulkCreateQuery, QuerySet, QuerySetSingle
+from typing_extensions import Self
 
 
 class BaseModel(MySQLUtils):
@@ -14,7 +15,7 @@ class BaseModel(MySQLUtils):
     @classmethod
     async def create(
             cls,
-            using_db: Optional[BaseDBAsyncClient] = None,
+            using_db: BaseDBAsyncClient | None = None,
             **kwargs: Any
     ) -> Self:
         if not kwargs.get('id', 0) and 'id' in cls._meta.fields:
@@ -51,11 +52,11 @@ class BaseModel(MySQLUtils):
     def bulk_create(
             cls,
             objects: Iterable[Self],
-            batch_size: Optional[int] = None,
+            batch_size: int | None = None,
             ignore_conflicts: bool = False,
-            update_fields: Optional[Iterable[str]] = None,
-            on_conflict: Optional[Iterable[str]] = None,
-            using_db: Optional[BaseDBAsyncClient] = None,
+            update_fields: Iterable[str] | None = None,
+            on_conflict: Iterable[str] | None = None,
+            using_db: BaseDBAsyncClient | None = None,
             **kwargs: Any
     ) -> "BulkCreateQuery[Self]":
         if 'id' in cls._meta.fields:
@@ -80,8 +81,8 @@ class BaseModel(MySQLUtils):
 
     async def save(
             self,
-            using_db: Optional[BaseDBAsyncClient] = None,
-            update_fields: Optional[Iterable[str]] = None,
+            using_db: BaseDBAsyncClient | None = None,
+            update_fields: Iterable[str] | None = None,
             force_create: bool = False,
             force_update: bool = False,
             **kwargs: Any
@@ -92,6 +93,14 @@ class BaseModel(MySQLUtils):
                                   force_update=force_update)
 
 
+class TimeModel(BaseModel):
+    create_time = fields.DatetimeField(auto_now_add=True, description='创建时间')
+    update_time = fields.DatetimeField(auto_now=True, description='更新时间')
+
+    class Meta:
+        abstract = True
+
+
 class CreateModel(BaseModel):
     create_time = fields.DatetimeField(auto_now_add=True, description='创建时间')
     creator = fields.CharField(max_length=50, null=True, description="创建人")

{rainycode-1.1.9 → rainycode-1.3.0}/common_models/user_model.py

@@ -1,4 +1,5 @@
 from tortoise import fields
+
 from common_models.base_model import UpdateModel
 
 

{rainycode-1.1.9 → rainycode-1.3.0}/common_models/wechat_model.py

@@ -1,7 +1,10 @@
-from tortoise import fields
 from enum import Enum
+
+from tortoise import fields
+
 from common_models.base_model import CreateModel
 
+
 class AppTypeEnum(str, Enum):
     MINI_PROGRAM = "mini_program"
     OFFICIAL_ACCOUNT = "official_account"

{rainycode-1.1.9 → rainycode-1.3.0}/common_servers/api/auth_api.py

@@ -1,9 +1,9 @@
-from common_models.user_model import User
-from fastapi import APIRouter, Security, Body, Query, Request
 from common_base.response import SuccessReturn
 from common_depends.auth_depend import login_require
+from common_models.user_model import User
 from common_servers.schemas.auth_schema import *
 from common_servers.service.auth_svc import AuthService
+from fastapi import APIRouter, Body, Query, Request, Security
 
 router = APIRouter(prefix="/auth")
 

{rainycode-1.1.9 → rainycode-1.3.0}/common_servers/api/wechat_api.py

@@ -1,12 +1,13 @@
 import json
 from urllib.parse import urlencode
-from fastapi import APIRouter, Request, Query, Response
-from fastapi.responses import RedirectResponse
+
 from common_base.consts import REDIS_PREFIX_OAUTH_STATE
 from common_base.exception import CustomException
 from common_servers.service.auth_svc import AuthService
 from common_servers.service.wechat_svc import WechatService
 from core.databases.aioredis import AioRedis
+from fastapi import APIRouter, Query, Request, Response
+from fastapi.responses import RedirectResponse
 
 router = APIRouter(prefix="/wechat")
 

{rainycode-1.1.9 → rainycode-1.3.0}/common_servers/router.py

@@ -1,7 +1,6 @@
-from fastapi import APIRouter
 from common_servers.api.auth_api import router as auth_router
 from common_servers.api.wechat_api import router as wechat_router
-
+from fastapi import APIRouter
 
 base_router = APIRouter()
 

{rainycode-1.1.9 → rainycode-1.3.0}/common_servers/schemas/auth_schema.py

@@ -1,4 +1,5 @@
-from pydantic import BaseModel, Field, EmailStr
+from pydantic import BaseModel, Field
+
 
 class UserLogin(BaseModel):
     """用户登录模型"""

{rainycode-1.1.9 → rainycode-1.3.0}/common_servers/service/auth_svc.py

@@ -1,32 +1,36 @@
-from datetime import datetime, timedelta
-import uuid
 import json
 import re
+import uuid
+from datetime import datetime, timedelta
 from urllib.parse import urlencode
-from fastapi.responses import RedirectResponse
+
 from common_base.consts import (
     REDIS_PREFIX_BLOCKLIST,
-    REDIS_PREFIX_REFRESH_TOKEN,
+    REDIS_PREFIX_LOGIN_LOCK_IP,
+    REDIS_PREFIX_LOGIN_LOCK_USER,
     REDIS_PREFIX_OAUTH_STATE,
+    REDIS_PREFIX_REFRESH_TOKEN,
     REDIS_PREFIX_USER_INFO,
     REDIS_PREFIX_WECHAT_CODE,
     REDIS_PREFIX_WECHAT_OAUTH_CODE,
-    REDIS_PREFIX_LOGIN_LOCK_USER,
-    REDIS_PREFIX_LOGIN_LOCK_IP,
 )
 from common_base.exception import CustomException
 from common_base.logging import logger
 from common_models.user_model import User
-from common_models.wechat_model import WechatApp, WechatUser, AppTypeEnum
+from common_models.wechat_model import AppTypeEnum, WechatApp, WechatUser
+from common_servers.schemas.auth_schema import (
+    UserLogin,
+    UserRegister,
+    WechatLogin,
+)
 from common_utils.bcrypt_util import PwdUtil
 from common_utils.jwt_util import JwtUtil
 from common_utils.wechat_util import WechatUtil
+from core.base_config import base_config
 from core.databases.aioredis import AioRedis
-from common_servers.schemas.auth_schema import UserRegister, UserLogin, WechatLogin
-from tortoise.transactions import atomic
+from fastapi.responses import RedirectResponse
 from tortoise.expressions import Q
-from core.base_config import base_config
-
+from tortoise.transactions import atomic
 
 # 登录限流配置
 LOGIN_FAIL_LIMIT = 5  # 最大失败次数
@@ -219,14 +223,14 @@ class AuthService:
             raise CustomException(msg="授权码已失效，请重新授权")
 
         # 获取公众号配置
-        app_config = await WechatApp.get_or_none(id=app_pk, app_type=AppTypeEnum.OFFICIAL_ACCOUNT)
-        if not app_config:
+        wechat_app = await WechatApp.get_or_none(id=app_pk, app_type=AppTypeEnum.OFFICIAL_ACCOUNT)
+        if not wechat_app:
             raise CustomException(msg="公众号配置不存在")
 
         # 用 code 换取 access_token 和 openid
         wx_res = await WechatUtil.get_oauth_access_token(
-            app_config.app_id,
-            app_config.app_secret,
+            wechat_app.app_id,
+            wechat_app.app_secret,
             code
         )
         openid = wx_res.get("openid")
@@ -239,7 +243,7 @@ class AuthService:
         await AioRedis.set(code_key, "1", ex=300)
 
         # 检查用户是否已存在
-        wechat_user = await WechatUser.get_or_none(openid=openid, wechat_app=app_config).select_related("user")
+        wechat_user = await WechatUser.get_or_none(openid=openid, wechat_app=wechat_app).select_related("user")
 
         if wechat_user:
             # 用户已存在，直接登录
@@ -257,7 +261,7 @@ class AuthService:
             # 使用 _bind_or_register_wechat_user 创建或绑定用户
             user = await cls._bind_or_register_wechat_user(
                 openid=openid,
-                app_config=app_config,
+                wechat_app=wechat_app,
                 unionid=wx_res.get("unionid"),
                 nickname=user_info.get("nickname"),
                 avatar=user_info.get("headimgurl")
@@ -275,7 +279,7 @@ class AuthService:
         api_prefix = f"/api/{base_config.app_name}" if base_config.app_name else ""
         callback_url = f"{base_config.base_url}{api_prefix}/wechat/oauth/callback"
         userinfo_auth_url = WechatUtil.build_oauth_url(
-            appid=app_config.app_id,
+            appid=wechat_app.app_id,
             redirect_uri=callback_url,
             scope="snsapi_userinfo",
             state=new_state
@@ -321,10 +325,10 @@ class AuthService:
     async def _authenticate_wechat_mini(cls, data: WechatLogin) -> User:
         """微信小程序认证"""
         # 1. 获取小程序配置
-        app_config = await WechatApp.get_or_none(
+        wechat_app = await WechatApp.get_or_none(
             app_id=data.app_id, app_type=AppTypeEnum.MINI_PROGRAM
         )
-        if not app_config:
+        if not wechat_app:
             raise CustomException(msg="无效的小程序配置")
 
         # 2. 检查 code 是否已使用（防重放）
@@ -334,7 +338,7 @@ class AuthService:
 
         # 3. code 换取 session_key 和 openid
         wx_res = await WechatUtil.code2session(
-            app_config.app_id, app_config.app_secret, data.code
+            wechat_app.app_id, wechat_app.app_secret, data.code
         )
         openid = wx_res.get("openid")
         unionid = wx_res.get("unionid")
@@ -350,7 +354,7 @@ class AuthService:
         phone = None
         if data.encrypted_data and data.iv:
             phone_info = WechatUtil.decrypt_data(
-                session_key, data.encrypted_data, data.iv, app_config.app_id
+                session_key, data.encrypted_data, data.iv, wechat_app.app_id
             )
             phone = phone_info.get("phoneNumber")
             # 校验手机号格式
@@ -360,7 +364,7 @@ class AuthService:
         # 6. 使用 _bind_or_register_wechat_user 处理用户绑定/注册
         return await cls._bind_or_register_wechat_user(
             openid=openid,
-            app_config=app_config,
+            wechat_app=wechat_app,
             unionid=unionid,
             phone=phone,
             session_key=session_key,
@@ -430,7 +434,7 @@ class AuthService:
     async def _bind_or_register_wechat_user(
         cls,
         openid: str,
-        app_config: WechatApp,
+        wechat_app: WechatApp,
         unionid: str | None = None,
         phone: str | None = None,
         nickname: str | None = None,
@@ -442,7 +446,7 @@ class AuthService:
 
         Args:
             openid: 微信 OpenID
-            app_config: 微信应用配置
+            wechat_app: 微信应用配置
             unionid: 微信 UnionID（可选，用于跨应用关联）
             phone: 手机号（可选，小程序一键登录获取）
             nickname: 微信昵称
@@ -454,7 +458,7 @@ class AuthService:
         """
         # 1. 检查 WechatUser 是否已存在
         wechat_user = await WechatUser.get_or_none(
-            openid=openid, wechat_app=app_config
+            openid=openid, wechat_app=wechat_app
         ).select_related("user")
 
         if wechat_user:
@@ -480,7 +484,7 @@ class AuthService:
         if not user and unionid:
             other_wechat_user = (
                 await WechatUser.filter(unionid=unionid)
-                .exclude(wechat_app=app_config)
+                .exclude(wechat_app=wechat_app)
                 .first()
                 .select_related("user")
             )
@@ -502,7 +506,7 @@ class AuthService:
         # 4. 创建 WechatUser 关联
         await WechatUser.create(
             user=user,
-            wechat_app=app_config,
+            wechat_app=wechat_app,
             openid=openid,
             unionid=unionid,
             session_key=session_key,

{rainycode-1.1.9 → rainycode-1.3.0}/common_servers/service/wechat_svc.py

@@ -1,6 +1,7 @@
-import time
 import hashlib
+import time
 import xml.etree.ElementTree as ET
+
 from common_base.exception import CustomException
 from common_base.logging import logger
 from common_models.wechat_model import WechatApp

{rainycode-1.1.9 → rainycode-1.3.0}/common_utils/bcrypt_util.py

@@ -1,6 +1,5 @@
 from passlib.context import CryptContext
 
-
 # 密码加密配置
 PwdContext = CryptContext(
     schemes=["bcrypt"],

{rainycode-1.1.9 → rainycode-1.3.0}/common_utils/captcha_util.py

@@ -2,6 +2,7 @@ import base64
 import random
 import string
 from io import BytesIO
+
 from PIL import Image, ImageDraw, ImageFont
 
 

{rainycode-1.1.9 → rainycode-1.3.0}/common_utils/ip_util.py

@@ -1,4 +1,5 @@
 import re
+
 from common_base import aiorequests
 
 

{rainycode-1.1.9 → rainycode-1.3.0}/common_utils/jwt_util.py

@@ -1,8 +1,10 @@
-import jwt
 from datetime import datetime, timedelta
 from typing import Any
+
+import jwt
 from core.base_config import base_config
 
+
 class JwtUtil:
     """
     JWT 工具类

{rainycode-1.1.9 → rainycode-1.3.0}/common_utils/snowflake_util.py

@@ -1,8 +1,8 @@
+import hashlib
 import os
-import time
 import socket
+import time
 import uuid
-import hashlib
 
 
 class SnowflakeIDGenerator:

{rainycode-1.1.9 → rainycode-1.3.0}/common_utils/wechat_util.py

@@ -1,10 +1,12 @@
+import base64
+import json
+from urllib.parse import quote
+
 from common_base import aiorequests
 from common_base.exception import CustomException
 from common_base.logging import logger
 from Crypto.Cipher import AES
-from urllib.parse import quote
-import base64
-import json
+
 
 class WechatUtil:
 

{rainycode-1.1.9 → rainycode-1.3.0}/core/databases/aiodb.py

@@ -1,13 +1,14 @@
 import datetime
-from typing import Dict, List, Optional, Any, Tuple
+from contextlib import asynccontextmanager
+from typing import Any
+
+from core.base_config import base_config
 from fastapi import FastAPI
 from fastapi.encoders import jsonable_encoder
 from tortoise import Tortoise
-from tortoise.models import Model
 from tortoise.contrib.fastapi import RegisterTortoise
-from tortoise.queryset import QuerySetSingle, QuerySet
-from contextlib import asynccontextmanager
-from core.base_config import base_config
+from tortoise.models import Model
+from tortoise.queryset import QuerySet, QuerySetSingle
 
 db_models = [
     'aerich.models',
@@ -92,8 +93,8 @@ class MySQLUtils(Model):
     @staticmethod
     def json_encoder(
             obj: Any,
-            include: Optional[List[str]] = None,
-            exclude: Optional[List[str]] = None,
+            include: list[str] | None = None,
+            exclude: list[str] | None = None,
             **kwargs
     ):
         return jsonable_encoder(
@@ -109,13 +110,13 @@ class MySQLUtils(Model):
     async def model2dict(
             cls,
             model: Model,
-            include: List[str] | None = None,
-            exclude: List[str] | None = None,
-            alias: List[Tuple[str, str]] | None = None,
-            fetch_related: List[str] | None = None,
+            include: list[str] | None = None,
+            exclude: list[str] | None = None,
+            alias: list[tuple[str, str]] | None = None,
+            fetch_related: list[str] | None = None,
             flat: bool = False,  # 扁平化
             **kwargs
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         meta = getattr(cls, 'PydanticMeta', getattr(cls, 'Meta', None))
         if meta:
             _include = getattr(meta, 'include', None)
@@ -224,15 +225,15 @@ class MySQLUtils(Model):
     async def get_data(
             cls,
             *args,
-            include: List[str] | None = None,  # 包含哪些字段，默认全部
-            exclude: List[str] | None = None,  # 排除哪些字段，默认全部
-            alias: List[Tuple[str, str]] | None = None,  # 字段别名，如[('id', 'uid')]
-            fetch_related: List[str] | None = None,  # 对应关系表
+            include: list[str] | None = None,  # 包含哪些字段，默认全部
+            exclude: list[str] | None = None,  # 排除哪些字段，默认全部
+            alias: list[tuple[str, str]] | None = None,  # 字段别名，如[('id', 'uid')]
+            fetch_related: list[str] | None = None,  # 对应关系表
             flat: bool = False,  # 扁平化
             deleted: bool | None = None,
             queryset_model: QuerySetSingle | Model | None = None,
             **kwargs
-    ) -> Dict[str, Any] | None:
+    ) -> dict[str, Any] | None:
         if 'deleted' in cls._meta.fields and deleted is None:
             kwargs['deleted'] = False
 
@@ -264,15 +265,15 @@ class MySQLUtils(Model):
     async def get_or_none_data(
             cls,
             *args,
-            include: List[str] | None = None,  # 包含哪些字段，默认全部
-            exclude: List[str] | None = None,  # 排除哪些字段，默认全部
-            alias: List[Tuple[str, str]] | None = None,  # 字段别名，如[('id', 'uid')]
-            fetch_related: List[str] | None = None,  # 对应关系表
+            include: list[str] | None = None,  # 包含哪些字段，默认全部
+            exclude: list[str] | None = None,  # 排除哪些字段，默认全部
+            alias: list[tuple[str, str]] | None = None,  # 字段别名，如[('id', 'uid')]
+            fetch_related: list[str] | None = None,  # 对应关系表
             flat: bool = False,  # 扁平化
             deleted: bool | None = None,
             queryset_model: QuerySetSingle | Model | None = None,
             **kwargs
-    ) -> Dict[str, Any] | None:
+    ) -> dict[str, Any] | None:
         if 'deleted' in cls._meta.fields and deleted is None:
             kwargs['deleted'] = False
 
@@ -307,16 +308,16 @@ class MySQLUtils(Model):
             page_no: int | None = 0,
             page_size: int | None = 0,
             nocount: bool = False,
-            include: List[str] | None = None,   # 包含哪些字段，默认全部
-            exclude: List[str] | None = None,   # 排除哪些字段，默认全部
-            alias: List[Tuple[str, str]] | None = None,   # 字段别名，如[('id', 'uid')]
-            fetch_related: List[str] | None = None,  # 对应关系表
+            include: list[str] | None = None,   # 包含哪些字段，默认全部
+            exclude: list[str] | None = None,   # 排除哪些字段，默认全部
+            alias: list[tuple[str, str]] | None = None,   # 字段别名，如[('id', 'uid')]
+            fetch_related: list[str] | None = None,  # 对应关系表
             flat: bool = False,  # 扁平化
             deleted: bool | None = None,
             queryset: QuerySet | None = None,
-            order_by: List[str] | None = None,
+            order_by: list[str] | None = None,
             **kwargs
-    ) -> Dict[str, Any] | List[Dict[str, Any]]:
+    ) -> dict[str, Any] | list[dict[str, Any]]:
         if 'deleted' in cls._meta.fields and deleted is None:
             kwargs['deleted'] = False
 

{rainycode-1.1.9 → rainycode-1.3.0}/core/databases/aioredis.py

@@ -1,12 +1,13 @@
-import time
 import asyncio
+import time
+from collections.abc import Callable, Mapping
 from contextlib import asynccontextmanager
-from typing import Optional, Union, Callable, Mapping
-from redis.asyncio import Redis
-from redis import asyncio as aioredis
-from redis.typing import KeyT, EncodableT, ExpiryT, ZScoreBoundT, AnyKeyT
+
 from common_base.logging import log_exc
 from core.base_config import base_config
+from redis import asyncio as aioredis
+from redis.asyncio import Redis
+from redis.typing import AnyKeyT, EncodableT, ExpiryT, KeyT, ZScoreBoundT
 
 
 class AioRedis:
@@ -33,7 +34,7 @@ class AioRedis:
                     )
                     cls.__redis_pool = Redis(connection_pool=pool)
                     # 测试连接是否有效
-                    cls.__redis_pool.ping()
+                    await cls.__redis_pool.ping()  # pyright: ignore[reportGeneralTypeIssues]
                 except Exception as e:
                     log_exc(e)
                     raise
@@ -63,7 +64,7 @@ class AioRedis:
             pass
 
     @classmethod
-    async def get(cls, name: KeyT) -> Optional[str]:
+    async def get(cls, name: KeyT) -> str | None:
         redis = await cls.connect()
         result = await redis.get(name)
         return result
@@ -73,11 +74,11 @@ class AioRedis:
             cls,
             name: KeyT,
             value: EncodableT,
-            ex: Union[ExpiryT, None] = None,  # 超时秒数
-            px: Union[ExpiryT, None] = None,  # 超时毫秒
+            ex: ExpiryT | None = None,  # 超时秒数
+            px: ExpiryT | None = None,  # 超时毫秒
             nx: bool = False,
             xx: bool = False
-    ) -> Optional[bool]:
+    ) -> bool | None:
         redis = await cls.connect()
         result = await redis.set(name, value, ex=ex, px=px, nx=nx, xx=xx)
         return result
@@ -86,7 +87,7 @@ class AioRedis:
     async def exists(
         cls,
         *names: KeyT
-    ) -> Optional[bool]:
+    ) -> bool | None:
         redis = await cls.connect()
         result = await redis.exists(*names)
         return result
@@ -102,7 +103,7 @@ class AioRedis:
             incr: bool = False,
             gt: bool = False,
             lt: bool = False
-    ) -> Union[int, float]:
+    ) -> int | float:
         redis = await cls.connect()
         result = await redis.zadd(name, mapping, nx, xx, ch, incr, gt, lt)
         return result
@@ -118,7 +119,7 @@ class AioRedis:
             cls,
             name: KeyT,
             value: EncodableT
-    ) -> Optional[float]:
+    ) -> float | None:
         redis = await cls.connect()
         result = await redis.zscore(name, value)
         return result
@@ -135,10 +136,10 @@ class AioRedis:
             name: KeyT,
             max: ZScoreBoundT,
             min: ZScoreBoundT,
-            start: Union[int, None] = None,
-            num: Union[int, None] = None,
+            start: int | None = None,
+            num: int | None = None,
             withscores: bool = False,
-            score_cast_func: Union[type, Callable] = float,
+            score_cast_func: type | Callable = float,
     ):
         redis = await cls.connect()
         result = await redis.zrevrangebyscore(name, max, min, start, num, withscores, score_cast_func)

{rainycode-1.1.9 → rainycode-1.3.0}/core/middleware/http_middleware.py

@@ -1,9 +1,11 @@
 import time
+
+from common_base.logging import logger
 from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
-from starlette.types import ASGIApp
 from starlette.responses import Response
-from common_base.logging import logger
+from starlette.types import ASGIApp
+
 
 class RequestHttpMiddleware(BaseHTTPMiddleware):
     def __init__(self, app: ASGIApp) -> None:

{rainycode-1.1.9 → rainycode-1.3.0}/core/start.py

@@ -1,15 +1,25 @@
 import os
-from typing import Any, AsyncGenerator
+from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from fastapi import FastAPI, HTTPException
-from fastapi.exceptions import RequestValidationError, ResponseValidationError
-from starlette.middleware.cors import CORSMiddleware
-from starlette.staticfiles import StaticFiles
-from common_base.exception import AllExceptionHandler, CustomException, CustomExceptionHandler, HttpExceptionHandler, RequestValidationHandle, ResponseValidationHandle, ValueExceptionHandler
+from typing import Any
+
+from common_base.exception import (
+    AllExceptionHandler,
+    CustomException,
+    CustomExceptionHandler,
+    HttpExceptionHandler,
+    RequestValidationHandle,
+    ResponseValidationHandle,
+    ValueExceptionHandler,
+)
 from common_base.logging import logger
 from core.base_config import BaseConfig, base_config
 from core.databases.aiodb import AioDb
 from core.middleware.http_middleware import RequestHttpMiddleware
+from fastapi import FastAPI, HTTPException
+from fastapi.exceptions import RequestValidationError, ResponseValidationError
+from starlette.middleware.cors import CORSMiddleware
+from starlette.staticfiles import StaticFiles
 
 
 def start_server(config: BaseConfig):

{rainycode-1.1.9 → rainycode-1.3.0}/pyproject.toml

@@ -4,12 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rainycode"
-version = "1.1.9"
+version = "1.3.0"
 description = "FastAPI base modules"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 
 dependencies = [
-    "build == 1.4.0",
     "aerich == 0.9.2",
     "fastapi == 0.133.1",
     "aiohttp == 3.13.3",
@@ -26,9 +25,12 @@ dependencies = [
     "pydantic-settings == 2.13.1",
 ]
 
+[project.optional-dependencies]
+release = [
+    "build == 1.4.0",
+    "twine == 6.1.0",
+]
+
 [tool.setuptools.packages.find]
 where = ["."]
-include = ["core*", "common*", "utlis*"]
-
-[tool.setuptools.package-data]
-utlis = ["py.typed"]
+include = ["core*", "common*"]

{rainycode-1.1.9 → rainycode-1.3.0}/rainycode.egg-info/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.1.9
+Version: 1.3.0
 Summary: FastAPI base modules
-Requires-Python: >=3.8
-Requires-Dist: build==1.4.0
+Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2
 Requires-Dist: fastapi==0.133.1
 Requires-Dist: aiohttp==3.13.3
@@ -18,3 +17,6 @@ Requires-Dist: pycryptodome==3.23.0
 Requires-Dist: uvicorn[standard]==0.41.0
 Requires-Dist: tortoise-orm[asyncmy]==0.25.4
 Requires-Dist: pydantic-settings==2.13.1
+Provides-Extra: release
+Requires-Dist: build==1.4.0; extra == "release"
+Requires-Dist: twine==6.1.0; extra == "release"

{rainycode-1.1.9 → rainycode-1.3.0}/rainycode.egg-info/SOURCES.txt

@@ -12,7 +12,6 @@ common_models/wechat_model.py
 common_servers/router.py
 common_servers/api/auth_api.py
 common_servers/api/wechat_api.py
-common_servers/schemas/__init__.py
 common_servers/schemas/auth_schema.py
 common_servers/service/auth_svc.py
 common_servers/service/wechat_svc.py

{rainycode-1.1.9 → rainycode-1.3.0}/rainycode.egg-info/requires.txt

@@ -1,4 +1,3 @@
-build==1.4.0
 aerich==0.9.2
 fastapi==0.133.1
 aiohttp==3.13.3
@@ -13,3 +12,7 @@ pycryptodome==3.23.0
 uvicorn[standard]==0.41.0
 tortoise-orm[asyncmy]==0.25.4
 pydantic-settings==2.13.1
+
+[release]
+build==1.4.0
+twine==6.1.0