mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-22 13:05:18 +00:00
zhangtao
4e2b668d7b
本次提交包含多项优化和修复： 1. 修复CRUD初始化参数传递、搜索参数处理逻辑 2. 更新环境配置中的大模型相关参数 3. 重构部分服务方法命名，统一代码风格 4. 新增多个枚举类型，补充模型关联关系和加载选项 5. 优化查询参数类实现，完善字段校验逻辑 6. 调整Pydantic模型字段注释和类型定义 7. 简化并移除冗余的CRUD方法实现 8. 新增超级管理员权限装饰器 9. 修复邮件日志模型的租户关联和字段定义
126 lines
4.7 KiB
Python
126 lines
4.7 KiB
Python
import re
|
|
from dataclasses import dataclass
|
|
|
|
from fastapi import Query
|
|
from pydantic import (
|
|
BaseModel,
|
|
ConfigDict,
|
|
Field,
|
|
field_validator,
|
|
model_validator,
|
|
)
|
|
|
|
from app.common.enums import QueueEnum
|
|
from app.core.base_params import BaseQueryParam, TenantByQueryParam, UserByQueryParam
|
|
from app.core.base_schema import BaseSchema, TenantBySchema, UserBySchema
|
|
from app.core.validator import datetime_validator
|
|
|
|
|
|
class NodeCreateSchema(BaseModel):
|
|
"""
|
|
节点创建/编辑时只设置节点基本信息，节点参数在执行时设置
|
|
"""
|
|
|
|
name: str = Field(..., max_length=64, description="任务名称")
|
|
func: str | None = Field(default=None, description="代码块")
|
|
args: str | None = Field(default=None, description="位置参数")
|
|
kwargs: str | None = Field(default=None, description="关键字参数")
|
|
coalesce: bool | None = Field(default=False, description="是否合并运行:是否在多个运行时间到期时仅运行作业一次")
|
|
max_instances: int | None = Field(default=1, ge=1, description="最大实例数:允许的最大并发执行实例数")
|
|
jobstore: str | None = Field(default="default", max_length=64, description="任务存储")
|
|
executor: str | None = Field(default="default", max_length=64, description="任务执行器:将运行此作业的执行程序的名称")
|
|
start_date: str | None = Field(default=None, description="开始时间")
|
|
end_date: str | None = Field(default=None, description="结束时间")
|
|
code: str | None = Field(default=None, max_length=32, description="节点编码")
|
|
|
|
@field_validator("name")
|
|
@classmethod
|
|
def validate_name(cls, v: str) -> str:
|
|
v = v.strip()
|
|
if len(v) < 1 or len(v) > 64:
|
|
raise ValueError("任务名称长度必须在1-64个字符之间")
|
|
return v
|
|
|
|
@field_validator("code")
|
|
@classmethod
|
|
def validate_code(cls, v: str | None) -> str | None:
|
|
if v is None:
|
|
return v
|
|
v = v.strip()
|
|
if len(v) < 2 or len(v) > 32:
|
|
raise ValueError("节点编码长度必须在2-32个字符之间")
|
|
if not re.match(r"^[A-Za-z][A-Za-z0-9_]*$", v):
|
|
raise ValueError("节点编码必须以字母开头，仅允许字母、数字、下划线")
|
|
return v
|
|
|
|
@model_validator(mode="after")
|
|
def _validate_func(self):
|
|
if not self.func or not self.func.strip():
|
|
raise ValueError("必须提供代码块(func)")
|
|
return self
|
|
|
|
|
|
class NodeUpdateSchema(NodeCreateSchema):
|
|
"""节点更新模型"""
|
|
|
|
|
|
class NodeOutSchema(NodeCreateSchema, BaseSchema, UserBySchema, TenantBySchema):
|
|
"""节点响应模型"""
|
|
|
|
trigger: str | None = Field(default=None, description="触发器")
|
|
trigger_args: str | None = Field(default=None, description="触发器参数")
|
|
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
|
|
@dataclass
|
|
class NodeQueryParam(BaseQueryParam, UserByQueryParam, TenantByQueryParam):
|
|
"""节点查询参数"""
|
|
|
|
def __init__(
|
|
self,
|
|
name: str | None = Query(None, description="节点名称"),
|
|
*args,
|
|
**kwargs,
|
|
) -> None:
|
|
super().__init__(*args, **kwargs)
|
|
self.name = (QueueEnum.like.value, name) if name else None
|
|
|
|
|
|
class NodeExecuteSchema(BaseModel):
|
|
"""节点执行参数"""
|
|
|
|
trigger: str = Field(default="now", description="触发方式: now/cron/interval/date")
|
|
trigger_args: str | None = Field(default=None, description="触发器参数")
|
|
start_date: str | None = Field(default=None, description="开始时间")
|
|
end_date: str | None = Field(default=None, description="结束时间")
|
|
|
|
@field_validator("trigger")
|
|
@classmethod
|
|
def _validate_trigger(cls, v: str) -> str:
|
|
allowed = {"now", "cron", "interval", "date"}
|
|
v = v.strip()
|
|
if v not in allowed:
|
|
raise ValueError("触发器必须为 now/cron/interval/date")
|
|
return v
|
|
|
|
@model_validator(mode="after")
|
|
def _validate_trigger_args(self):
|
|
"""非立即执行时必须提供触发器参数"""
|
|
if self.trigger != "now" and not self.trigger_args:
|
|
raise ValueError("非立即执行时必须提供触发器参数")
|
|
return self
|
|
|
|
@model_validator(mode="after")
|
|
def _validate_dates(self):
|
|
"""跨字段校验：结束时间不得早于开始时间。"""
|
|
if self.start_date and self.end_date:
|
|
try:
|
|
start = datetime_validator(self.start_date)
|
|
end = datetime_validator(self.end_date)
|
|
except Exception:
|
|
raise ValueError("时间格式必须为 YYYY-MM-DD HH:MM:SS")
|
|
if end < start:
|
|
raise ValueError("结束时间不能早于开始时间")
|
|
return self
|