rainycode 1.5.1__tar.gz → 1.5.3__tar.gz

{rainycode-1.5.1 → rainycode-1.5.3}/PKG-INFO

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

rainycode-1.5.3/common_base/aiorequests.py

@@ -0,0 +1,55 @@
+import json
+import ssl
+
+import aiohttp
+import certifi
+
+# 模块级别 SSL 上下文，使用 certifi 证书，避免重复创建
+_SSL_CONTEXT = ssl.create_default_context(cafile=certifi.where())
+
+# 连接池：跨请求复用 keep-alive 长连接（而非每次新建 connector）。
+# limit: 全池同时最大连接数（含活跃与 keep-alive 空闲复用）
+# limit_per_host: 单个 host 端点同时最大连接数，限制对单一对端的并发/占用
+# 惰性初始化：TCPConnector 构造需要运行中的事件循环，只能在首次请求（async 上下文）时创建，
+# 不能在模块 import 时同步 create（否则抛 RuntimeError: no running event loop）。
+_CONNECTOR: aiohttp.TCPConnector | None = None
+
+
+def _get_connector() -> aiohttp.TCPConnector:
+    global _CONNECTOR
+    if _CONNECTOR is None:
+        _CONNECTOR = aiohttp.TCPConnector(ssl=_SSL_CONTEXT, limit=300, limit_per_host=100)
+    return _CONNECTOR
+
+
+def parse_url(url, params=None, suffix=None):
+    if params:
+        query = "&".join([f"{k}={params[k]}" for k in sorted(params.keys())])
+        if "?" in url:
+            url += "&" + query
+        else:
+            url += "?" + query
+    if suffix:
+        url += suffix
+    return url
+
+
+async def get(url, params=None, headers=None, suffix=None):
+    url = parse_url(url, params, suffix)
+    async with (
+        aiohttp.ClientSession(connector=_get_connector(), trust_env=True) as session,
+        session.get(url, headers=headers) as response,
+    ):
+        text = await response.text()
+        return json.loads(text)
+
+
+async def post(url, data=None, headers=None):
+    if isinstance(data, dict):
+        data = json.dumps(data)
+    async with (
+        aiohttp.ClientSession(connector=_get_connector(), trust_env=True) as session,
+        session.post(url, data=data, headers=headers) as response,
+    ):
+        text = await response.text()
+        return json.loads(text)

{rainycode-1.5.1 → rainycode-1.5.3}/common_models/file_model.py

@@ -1,17 +1,12 @@
-from core.base_config import base_config
 from tortoise import fields
 
 from common_models.base_model import CreateModel
+from core.base_config import base_config
 
 
 class File(CreateModel):
     """
-    上传文件注册表：所有上传文件落一条元数据，磁盘文件本身放 upload_root 下。
-
-    url 存最小相对路径（如 dishes/xxx.jpg，不含前缀），经 fix_data 序列化钩子
-    （库 model2dict/get_data 会自动调用）加上可配置前缀（/uploads 或完整 CDN URL）
-    得到前端可直接访问的完整路径。业务表经外键引用 File.id（如 UserDish.image），
-    不冗余存 url 字符串。md5 用于识别相同文件（上传去重）。
+    文件表
     """
     id = fields.IntField(primary_key=True, description="主键")
     name = fields.CharField(max_length=255, description="原始文件名")

{rainycode-1.5.1 → rainycode-1.5.3}/common_servers/api/auth_api.py

@@ -1,9 +1,10 @@
+from fastapi import APIRouter, Body, Query, Request, Security
+
 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
+from common_servers.schemas.auth_schema import TokenResponse, UserInfo
+from common_servers.service.auth_svc import AuthService, UserLogin, UserRegister, WechatLogin
 
 router = APIRouter(prefix="/auth")
 
@@ -70,4 +71,4 @@ async def get_wechat_oauth_url(
     - 如果用户未注册，自动重定向到 snsapi_userinfo 授权
     """
     authorize_url = await AuthService.get_wechat_oauth_url(app_pk, redirect_uri, state)
-    return SuccessReturn(data={"authorize_url": authorize_url})
+    return SuccessReturn(data={"authorize_url": authorize_url})

{rainycode-1.5.1 → rainycode-1.5.3}/common_servers/api/wechat_api.py

@@ -1,13 +1,14 @@
 import json
 from urllib.parse import urlencode
 
+from fastapi import APIRouter, Query, Request, 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.5.1 → rainycode-1.5.3}/common_servers/router.py

@@ -1,6 +1,7 @@
+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.5.1 → rainycode-1.5.3}/common_servers/service/auth_svc.py

@@ -4,6 +4,10 @@ import uuid
 from datetime import datetime, timedelta
 from urllib.parse import urlencode
 
+from fastapi.responses import RedirectResponse
+from tortoise.expressions import Q
+from tortoise.transactions import atomic
+
 from common_base.consts import (
     REDIS_PREFIX_BLOCKLIST,
     REDIS_PREFIX_LOGIN_LOCK_IP,
@@ -28,9 +32,6 @@ 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 fastapi.responses import RedirectResponse
-from tortoise.expressions import Q
-from tortoise.transactions import atomic
 
 # 登录限流配置
 LOGIN_FAIL_LIMIT = 5  # 最大失败次数

{rainycode-1.5.1 → rainycode-1.5.3}/common_servers/service/file_svc.py

@@ -7,10 +7,6 @@ from common_models.file_model import File
 from common_models.user_model import User
 from core.base_config import base_config
 
-# 默认上传约束
-DEFAULT_MAX_BYTES = 5 * 1024 * 1024  # 5MB
-ALLOWED_IMAGE_EXTS = {'jpg', 'jpeg', 'png', 'webp'}
-
 
 class FileService:
     """通用文件上传服务：校验格式/大小、写盘、落 File 注册表、按 md5 去重。"""
@@ -22,15 +18,9 @@ class FileService:
             file,
             *,
             subdir: str,
-            allowed_exts: set[str] = ALLOWED_IMAGE_EXTS,
-            max_bytes: int = DEFAULT_MAX_BYTES,
+            allowed_exts: set[str] = base_config.upload_allowed_image_exts,
+            max_bytes: int = base_config.upload_max_bytes,
     ) -> dict:
-        """
-        上传文件到 upload_root/<subdir>/ 并落 File 记录，返回序列化结果（url 经 fix_data 加前缀）。
-
-        相同内容（md5 命中）复用已有 File 记录与磁盘文件，不重复写盘。
-        file 为 FastAPI UploadFile（含 .filename/.content_type/.read()）。
-        """
         ext = file.filename.rsplit('.', 1)[-1].lower() if '.' in file.filename else ''
         if ext not in allowed_exts:
             raise CustomException(msg="不支持的文件格式")
@@ -59,4 +49,4 @@ class FileService:
             md5=md5,
             creator_id=user.id,
         )
-        return await File.model2dict(row)
+        return await File.model2dict(row)

{rainycode-1.5.1 → rainycode-1.5.3}/common_utils/datetime_util.py

@@ -7,6 +7,6 @@ from zoneinfo import ZoneInfo
 CN_TZ = ZoneInfo('Asia/Shanghai')
 
 
-def now_app() -> datetime:
-    """返回当前时刻的 aware Asia/Shanghai datetime（与 DB 读回值时间基准一致）。"""
+def chinese_now() -> datetime:
+    """返回当前时刻的 aware Asia/Shanghai datetime"""
     return datetime.now(CN_TZ)

{rainycode-1.5.1 → rainycode-1.5.3}/common_utils/jwt_util.py

@@ -1,7 +1,9 @@
 from datetime import datetime, timedelta
 from typing import Any
+from zoneinfo import ZoneInfo
 
 import jwt
+
 from core.base_config import base_config
 
 
@@ -25,7 +27,7 @@ class JwtUtil:
             str: JWT Token
         """
         to_encode = data.copy()
-        expire = datetime.now() + expires_delta
+        expire = datetime.now(ZoneInfo('Asia/Shanghai')) + expires_delta
         
         to_encode.update({"exp": expire})
         encoded_jwt = jwt.encode(to_encode, cls.SECRET_KEY, algorithm=cls.ALGORITHM)

{rainycode-1.5.1 → rainycode-1.5.3}/core/base_config.py

@@ -14,7 +14,7 @@ class BaseConfig(BaseSettings):
     base_url: str = ""
 
     # 文件上传：本地存储根目录 + 访问 URL 前缀。
-    # upload_url_prefix 可为相对路径（/uploads）或完整 CDN URL（https://cdn.xxx.com/uploads），
+    # upload_url_prefix 可为相对路径（/uploads）或完整 URL（https://cdn.xxx.com/uploads），
     upload_root: str = 'uploads'
     upload_url_prefix: str = '/uploads'
 
@@ -32,6 +32,10 @@ class BaseConfig(BaseSettings):
     # Refresh Token 有效期
     refresh_token_expire_days: int = 30
 
+    # 文件上传约束（common_servers/service/file_svc.py）
+    upload_max_bytes: int = 5 * 1024 * 1024   # 5MB
+    upload_allowed_image_exts: set[str] = {'jpg', 'jpeg', 'png', 'webp'}
+
     model_config = SettingsConfigDict(
         env_file=('envs/dev.env', 'envs/pro.env'),
         env_file_encoding="utf-8",

rainycode-1.5.3/pyproject.toml

@@ -0,0 +1,60 @@
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "rainycode"
+version = "1.5.3"
+description = "FastAPI base modules"
+requires-python = ">=3.10"
+
+dependencies = [
+    "aerich == 0.9.2",
+    "fastapi == 0.133.1",
+    "aiohttp == 3.13.3",
+    "passlib==1.7.4",
+    "redis == 7.2.1",
+    "pyjwt == 2.11.0",
+    "pillow == 12.1.1",
+    "bcrypt == 4.0.1",
+    "certifi == 2026.2.25",
+    "cryptography == 46.0.5",
+    "pycryptodome == 3.23.0",
+    "uvicorn[standard] == 0.41.0",
+    "tortoise-orm[asyncmy] == 0.25.4",
+    "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*"]
+
+
+[tool.ruff]
+target-version = "py312"   # 按 Python 3.12 语法判断，UP 规则才不会误降级
+line-length = 120          # 中文注释 + FastAPI 调用链较长，120 比 88 舒服
+
+[tool.ruff.lint]
+select = [
+    "E", "W",  # pycodestyle：基础风格（空格/空行/换行）
+    "F",       # pyflakes：未用 import / 变量、未定义名
+    "I",       # isort：import 自动排序分组
+    "B",       # bugbear：常见 bug 模式（可变默认值、裸 except 等）
+    "UP",      # pyupgrade：语法现代化（Optional[X] → X | None 等）
+]
+ignore = [
+    "B008",    # 函数调用作为默认值 —— FastAPI 的 Security/Depends/Query/Body 必须这么写
+]
+
+[tool.ruff.lint.per-file-ignores]
+"migrations/*" = ["ALL"]   # aerich 自动生成的迁移文件，不检查
+"__init__.py" = ["F401"]   # 模块聚合导出，允许未使用 import
+
+[tool.ruff.lint.isort]
+known-first-party = ["servers", "models"]   # 本项目模块，排序时与第三方库分组

{rainycode-1.5.1 → rainycode-1.5.3}/rainycode.egg-info/PKG-INFO

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

rainycode-1.5.1/common_base/aiorequests.py

@@ -1,39 +0,0 @@
-import json
-import ssl
-
-import aiohttp
-import certifi
-
-# 模块级别 SSL 上下文，使用 certifi 证书，避免重复创建
-_SSL_CONTEXT = ssl.create_default_context(cafile=certifi.where())
-
-
-def parse_url(url, params=None, suffix=None):
-    if params:
-        query = "&".join([f"{k}={params[k]}" for k in sorted(params.keys())])
-        if "?" in url:
-            url += "&" + query
-        else:
-            url += "?" + query
-    if suffix:
-        url += suffix
-    return url
-
-
-async def get(url, params=None, headers=None, suffix=None):
-    url = parse_url(url, params, suffix)
-    connector = aiohttp.TCPConnector(ssl=_SSL_CONTEXT)
-    async with aiohttp.ClientSession(connector=connector, trust_env=True) as session:
-        async with session.get(url, headers=headers) as response:
-            text = await response.text()
-            return json.loads(text)
-
-
-async def post(url, data=None, headers=None):
-    connector = aiohttp.TCPConnector(ssl=_SSL_CONTEXT)
-    async with aiohttp.ClientSession(connector=connector, trust_env=True) as session:
-        if isinstance(data, dict):
-            data = json.dumps(data)
-        async with session.post(url, data=data, headers=headers) as response:
-            text = await response.text()
-            return json.loads(text)

rainycode-1.5.1/pyproject.toml

@@ -1,36 +0,0 @@
-[build-system]
-requires = ["setuptools>=61.0", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "rainycode"
-version = "1.5.1"
-description = "FastAPI base modules"
-requires-python = ">=3.10"
-
-dependencies = [
-    "aerich == 0.9.2",
-    "fastapi == 0.133.1",
-    "aiohttp == 3.13.3",
-    "passlib==1.7.4",
-    "redis == 7.2.1",
-    "pyjwt == 2.11.0",
-    "pillow == 12.1.1",
-    "bcrypt == 4.0.1",
-    "certifi == 2026.2.25",
-    "cryptography == 46.0.5",
-    "pycryptodome == 3.23.0",
-    "uvicorn[standard] == 0.41.0",
-    "tortoise-orm[asyncmy] == 0.25.4",
-    "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*"]