rainycode 1.4.4__tar.gz → 1.4.6__tar.gz

{rainycode-1.4.4 → rainycode-1.4.6}/PKG-INFO

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

{rainycode-1.4.4 → rainycode-1.4.6}/common_models/__init__.py

@@ -1,4 +1,5 @@
+from common_models.file_model import File
 from common_models.user_model import User
 from common_models.wechat_model import WechatApp, WechatUser
 
-__all__ = ["User", "WechatApp", "WechatUser"]
+__all__ = ["File", "User", "WechatApp", "WechatUser"]

rainycode-1.4.6/common_models/file_model.py

@@ -0,0 +1,30 @@
+from core.base_config import base_config
+from tortoise import fields
+
+from common_models.base_model import CreateModel
+
+
+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="原始文件名")
+    url = fields.CharField(max_length=255, description="相对路径(不含前缀, 如 dishes/xxx.jpg)")
+    size = fields.IntField(default=0, description="文件字节数")
+    ext = fields.CharField(max_length=10, description="扩展名")
+    md5 = fields.CharField(max_length=32, null=True, description="文件内容 MD5(用于识别相同文件)")
+
+    class Meta:
+        table = "file"
+        table_description = "上传文件表"
+
+    def fix_data(self, result: dict) -> None:
+        """序列化后钩子（库 model2dict 调用）：若含 url 则拼接可配置前缀。"""
+        if 'url' in result:
+            result['url'] = f"{base_config.upload_url_prefix}/{result['url']}"

rainycode-1.4.6/common_servers/service/file_svc.py

@@ -0,0 +1,62 @@
+import hashlib
+import uuid
+from pathlib import Path
+
+from common_base.exception import CustomException
+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 去重。"""
+
+    @classmethod
+    async def upload(
+            cls,
+            user: User,
+            file,
+            *,
+            subdir: str,
+            allowed_exts: set[str] = ALLOWED_IMAGE_EXTS,
+            max_bytes: int = DEFAULT_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="不支持的文件格式")
+
+        content = await file.read()
+        if len(content) > max_bytes:
+            raise CustomException(msg="文件大小超限")
+
+        md5 = hashlib.md5(content).hexdigest()
+        existing = await File.get_or_none(md5=md5)
+        if existing:
+            # 相同文件已存在，直接复用（不重复写盘），仅返回其注册信息
+            return await File.model2dict(existing)
+
+        filename = f"{uuid.uuid4().hex}.{ext}"
+        relative = f"{subdir}/{filename}"  # 磁盘相对路径 & File.url（不含前缀）
+        path = Path(base_config.upload_root) / relative
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_bytes(content)
+
+        row = await File.create(
+            name=file.filename or filename,
+            url=relative,
+            size=len(content),
+            ext=ext,
+            md5=md5,
+            creator_id=user.id,
+        )
+        return await File.model2dict(row)

{rainycode-1.4.4 → rainycode-1.4.6}/core/base_config.py

@@ -13,6 +13,11 @@ class BaseConfig(BaseSettings):
     # 基础 URL
     base_url: str = ""
 
+    # 文件上传：本地存储根目录 + 访问 URL 前缀。
+    # upload_url_prefix 可为相对路径（/uploads）或完整 CDN URL（https://cdn.xxx.com/uploads），
+    upload_root: str = 'uploads'
+    upload_url_prefix: str = '/uploads'
+
     # 跨域
     cors_origins: list[str] = ['*']
     cors_allow_credentials: bool = True

{rainycode-1.4.4 → rainycode-1.4.6}/pyproject.toml

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

{rainycode-1.4.4 → rainycode-1.4.6}/rainycode.egg-info/PKG-INFO

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

{rainycode-1.4.4 → rainycode-1.4.6}/rainycode.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ common_base/response.py
 common_depends/auth_depend.py
 common_models/__init__.py
 common_models/base_model.py
+common_models/file_model.py
 common_models/user_model.py
 common_models/wechat_model.py
 common_servers/router.py
@@ -14,6 +15,7 @@ common_servers/api/auth_api.py
 common_servers/api/wechat_api.py
 common_servers/schemas/auth_schema.py
 common_servers/service/auth_svc.py
+common_servers/service/file_svc.py
 common_servers/service/wechat_svc.py
 common_utils/bcrypt_util.py
 common_utils/captcha_util.py