4ef7931941
修复问题： - 添加缺失的 httpx 依赖到 requirements.txt - 修复前端批量删除参数格式与后端不匹配（数组->对象数组） - 移除 app/api/main.py 中重复创建 app 的冗余代码 - 修复 Plugins.vue v-model 直接修改 store 状态的 Vue 警告 - 修复 README 端口/启动命令文档与实际配置不一致 - 修正 pytest.ini 过时配置 (asyncio_default_fixture_loop_scope) - 修复 WebUI index.html 语言设置为 zh-CN - 修复 .gitignore 错误忽略 tests/ 目录 后端优化： - 修复调度器默认间隔从 5 秒改为 30 分钟，避免无节制验证 - 修复 validate_all_now 在调度器停止时无法执行的 bug - 设置保存后热更新运行中调度器的验证间隔 - 将 update_score 优化为原子单事务 SQL，消除并发竞态 - 导出功能改为真正的流式分批读取（iter_batches），降低大导出内存占用 - ProxyResponse Schema 补齐 response_time_ms 字段 - 日志级别改为从配置动态读取，不再硬编码 INFO - 清理 validator_service 中的冗余 try/finally 代码 插件健壮性： - 修复 ip3366/ip89/kuaidaili/proxylist_download/speedx/yundaili/proxyscrape 的端口范围检查和 IPv6 地址解析问题（改用 rsplit + 1-65535 校验） - 修复 PluginService.list_plugins 并发竞争条件 - 修复 run_all_plugins 去重逻辑与数据库 UNIQUE 约束保持一致 - 修复 proxyscrape 异常时错误跳过 fallback 的 bug 测试： - 新增 7 个插件解析单元测试 - 新增 update_score 自动删除和 iter_batches 流式读取测试 - 全部 74 个测试通过
107 lines
3.0 KiB
Python
107 lines
3.0 KiB
Python
"""Pydantic 模型 - 用于 API 请求/响应校验"""
|
|
from pydantic import BaseModel, Field, field_validator
|
|
from typing import Optional, List
|
|
|
|
|
|
class ProxyCreate(BaseModel):
|
|
ip: str
|
|
port: int = Field(ge=1, le=65535)
|
|
protocol: str = "http"
|
|
score: int = Field(default=10, ge=0, le=100)
|
|
|
|
@field_validator("protocol")
|
|
@classmethod
|
|
def validate_protocol(cls, v: str):
|
|
v = v.lower().strip()
|
|
if v not in ("http", "https", "socks4", "socks5"):
|
|
raise ValueError("protocol must be http, https, socks4 or socks5")
|
|
return v
|
|
|
|
|
|
class ProxyResponse(BaseModel):
|
|
ip: str
|
|
port: int
|
|
protocol: str
|
|
score: int
|
|
response_time_ms: Optional[float] = None
|
|
last_check: Optional[str] = None
|
|
|
|
|
|
class PluginResponse(BaseModel):
|
|
id: str
|
|
name: str
|
|
display_name: str
|
|
description: str
|
|
enabled: bool
|
|
last_run: Optional[str] = None
|
|
success_count: int = 0
|
|
failure_count: int = 0
|
|
|
|
|
|
class SettingsSchema(BaseModel):
|
|
crawl_timeout: int = Field(default=30, ge=5, le=120)
|
|
validation_timeout: int = Field(default=10, ge=3, le=60)
|
|
max_retries: int = Field(default=3, ge=0, le=10)
|
|
default_concurrency: int = Field(default=50, ge=10, le=200)
|
|
min_proxy_score: int = Field(default=0, ge=0, le=100)
|
|
proxy_expiry_days: int = Field(default=7, ge=1, le=30)
|
|
auto_validate: bool = True
|
|
validate_interval_minutes: int = Field(default=30, ge=5, le=1440)
|
|
|
|
|
|
class CrawlResult(BaseModel):
|
|
plugin_id: str
|
|
proxy_count: int
|
|
valid_count: int
|
|
invalid_count: int = 0
|
|
|
|
|
|
class ProxyListRequest(BaseModel):
|
|
page: int = Field(default=1, ge=1)
|
|
page_size: int = Field(default=20, ge=1, le=100)
|
|
protocol: Optional[str] = None
|
|
min_score: int = Field(default=0, ge=0)
|
|
max_score: Optional[int] = Field(default=None, ge=0)
|
|
sort_by: str = "last_check"
|
|
sort_order: str = "DESC"
|
|
|
|
@field_validator("protocol")
|
|
@classmethod
|
|
def validate_protocol(cls, v):
|
|
if v is not None and v.lower() not in ("http", "https", "socks4", "socks5"):
|
|
raise ValueError("协议类型必须是 http, https, socks4 或 socks5")
|
|
return v.lower() if v else v
|
|
|
|
@field_validator("sort_by")
|
|
@classmethod
|
|
def validate_sort_by(cls, v):
|
|
if v not in ("ip", "port", "protocol", "score", "last_check"):
|
|
raise ValueError("排序字段必须是 ip, port, protocol, score 或 last_check")
|
|
return v
|
|
|
|
@field_validator("sort_order")
|
|
@classmethod
|
|
def validate_sort_order(cls, v):
|
|
if v.upper() not in ("ASC", "DESC"):
|
|
raise ValueError("排序方式必须是 ASC 或 DESC")
|
|
return v.upper()
|
|
|
|
|
|
class ProxyDeleteItem(BaseModel):
|
|
ip: str
|
|
port: int = Field(ge=1, le=65535)
|
|
|
|
|
|
class BatchDeleteRequest(BaseModel):
|
|
proxies: List[ProxyDeleteItem] = Field(max_length=1000)
|
|
|
|
|
|
class PluginToggleRequest(BaseModel):
|
|
enabled: bool
|
|
|
|
|
|
class ExportRequest(BaseModel):
|
|
format: str = Field(pattern=r"^(csv|txt|json)$")
|
|
protocol: Optional[str] = None
|
|
limit: int = Field(default=10000, ge=1, le=100000)
|