dwyeapi 0.9.4__tar.gz → 0.9.5__tar.gz

{dwyeapi-0.9.4 → dwyeapi-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dwyeapi
-Version: 0.9.4
+Version: 0.9.5
 Summary: Lightweight FastAPI infrastructure — exceptions, database, config, security, cache, pagination, logger
 License: MIT
 Project-URL: Repository, https://github.com/danweiyuancircle/dwy-ai-experience

{dwyeapi-0.9.4 → dwyeapi-0.9.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dwyeapi"
-version = "0.9.4"
+version = "0.9.5"
 description = "Lightweight FastAPI infrastructure — exceptions, database, config, security, cache, pagination, logger"
 requires-python = ">=3.11"
 license = {text = "MIT"}

{dwyeapi-0.9.4 → dwyeapi-0.9.5}/src/dwyeapi/__init__.py

@@ -32,4 +32,4 @@ __all__ = [
     "is_prod",
     "logger",
 ]
-__version__ = "0.9.4"
+__version__ = "0.9.5"

{dwyeapi-0.9.4 → dwyeapi-0.9.5}/src/dwyeapi/providers/email/base.py

@@ -63,11 +63,17 @@ class EmailProviderBase(ABC):
         return "".join(secrets.choice("0123456789") for _ in range(self._length))
 
     async def send_code(self, target: str) -> bool:
-        """生成验证码存 Redis 并调用 `_send()` 发送。"""
+        """生成验证码：先发送成功再写入 Redis。
+
+        顺序约束：``_send`` 失败时不落库，避免用户未收到邮件却有可校验码。
+        发送成功后写 Redis；若写库失败则返回 False（邮件已发出属极端边界，业务可重发覆盖）。
+        """
         code = self._generate_code()
+        if not await self._send(target, code):
+            return False
         redis = await self._get_redis()
         await redis.set(f"{CODE_KEY_PREFIX}{target}", code, ex=self._ttl)
-        return await self._send(target, code)
+        return True
 
     async def verify_code(self, target: str, code: str) -> bool:
         """从 Redis 读取存储的验证码比对,成功则删除 key(一次性)。"""

{dwyeapi-0.9.4 → dwyeapi-0.9.5}/src/dwyeapi/providers/email/factory.py

@@ -64,6 +64,9 @@ def make_email_provider(settings: EmailSettings) -> EmailProvider:
 
         if not settings.resend.api_key:
             raise ValueError("EMAIL__RESEND__API_KEY 未配置")
+        # from_email 启用时必填：缺省会导致 resend 运行时发信失败，尽早在工厂拦截
+        if not settings.resend.from_email:
+            raise ValueError("EMAIL__RESEND__FROM_EMAIL 未配置")
         return ResendEmailProvider(
             api_key=settings.resend.api_key,
             from_email=settings.resend.from_email,

dwyeapi-0.9.5/src/dwyeapi/tasks/schema.py

@@ -0,0 +1,42 @@
+"""任务 API 请求/响应的 Pydantic schema。"""
+
+from datetime import datetime
+from typing import Any
+
+from pydantic import BaseModel, ConfigDict, Field
+
+from dwyeapi.tasks.model import TaskStatus
+
+# 与 Task ORM 列 String(50) 对齐；params 键数/体积限制防超大 body
+_TASK_TYPE_MAX_LEN = 50
+_PARAMS_MAX_KEYS = 50
+
+
+class TaskCreate(BaseModel):
+    """提交新任务的请求体。
+
+    约束与 ORM / 输入限长规则对齐：``task_type`` 最长 50；``params`` 最多 50 个键。
+    """
+
+    task_type: str = Field(min_length=1, max_length=_TASK_TYPE_MAX_LEN, description="已注册的任务类型名")
+    params: dict[str, Any] = Field(
+        default_factory=dict,
+        description="任务参数；键数量上限 50，避免超大 JSON 入库",
+        max_length=_PARAMS_MAX_KEYS,
+    )
+
+
+class TaskResponse(BaseModel):
+    """任务详情响应体,覆盖状态、进度、日志与结果等字段。"""
+
+    id: str
+    task_type: str
+    status: TaskStatus
+    params: dict[str, Any]
+    result: dict[str, Any] | None
+    progress: int
+    logs: str
+    created_at: datetime
+    updated_at: datetime
+
+    model_config = ConfigDict(from_attributes=True)

{dwyeapi-0.9.4 → dwyeapi-0.9.5}/src/dwyeapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dwyeapi
-Version: 0.9.4
+Version: 0.9.5
 Summary: Lightweight FastAPI infrastructure — exceptions, database, config, security, cache, pagination, logger
 License: MIT
 Project-URL: Repository, https://github.com/danweiyuancircle/dwy-ai-experience

{dwyeapi-0.9.4 → dwyeapi-0.9.5}/tests/test_tasks.py

@@ -127,6 +127,30 @@ class TestSchemas:
         assert tc.task_type == "export"
         assert tc.params == {"format": "csv"}
 
+    def test_task_create_rejects_empty_task_type(self):
+        """task_type 最短 1 字符。"""
+        import pytest
+        from pydantic import ValidationError
+
+        with pytest.raises(ValidationError):
+            TaskCreate(task_type="", params={})
+
+    def test_task_create_rejects_long_task_type(self):
+        """task_type 最长 50，对齐 ORM String(50)。"""
+        import pytest
+        from pydantic import ValidationError
+
+        with pytest.raises(ValidationError):
+            TaskCreate(task_type="x" * 51, params={})
+
+    def test_task_create_rejects_too_many_params_keys(self):
+        """params 键数上限 50。"""
+        import pytest
+        from pydantic import ValidationError
+
+        with pytest.raises(ValidationError):
+            TaskCreate(task_type="export", params={f"k{i}": i for i in range(51)})
+
     async def test_task_response_from_attributes(self, session):
         """TaskResponse should be constructible from a persisted Task ORM object."""
         task = Task(

dwyeapi-0.9.4/src/dwyeapi/tasks/schema.py

@@ -1,31 +0,0 @@
-"""任务 API 请求/响应的 Pydantic schema。"""
-
-from datetime import datetime
-from typing import Any
-
-from pydantic import BaseModel, ConfigDict
-
-from dwyeapi.tasks.model import TaskStatus
-
-
-class TaskCreate(BaseModel):
-    """提交新任务的请求体。"""
-
-    task_type: str
-    params: dict[str, Any]
-
-
-class TaskResponse(BaseModel):
-    """任务详情响应体,覆盖状态、进度、日志与结果等字段。"""
-
-    id: str
-    task_type: str
-    status: TaskStatus
-    params: dict[str, Any]
-    result: dict[str, Any] | None
-    progress: int
-    logs: str
-    created_at: datetime
-    updated_at: datetime
-
-    model_config = ConfigDict(from_attributes=True)