From 87ce266b14cf7a4d1eb2db9ded24a645b12dc948 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 9 Mar 2025 16:48:32 +0800 Subject: [PATCH] fix warnings --- app/actions/__init__.py | 2 +- app/actions/add_download.py | 8 ++++---- app/actions/fetch_medias.py | 6 +++--- app/actions/fetch_rss.py | 14 +++++++------- app/actions/fetch_torrents.py | 14 +++++++------- app/actions/filter_medias.py | 6 +++--- app/actions/filter_torrents.py | 14 +++++++------- app/actions/scan_file.py | 4 ++-- app/actions/send_message.py | 6 +++--- app/actions/transfer_file.py | 2 +- app/api/endpoints/search.py | 2 +- app/schemas/download.py | 8 ++++---- app/schemas/event.py | 2 +- app/schemas/workflow.py | 28 ++++++++++++++-------------- 14 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/actions/__init__.py b/app/actions/__init__.py index 259e2cec..27f6a3c8 100644 --- a/app/actions/__init__.py +++ b/app/actions/__init__.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from typing import List, Any, Union +from typing import Union from app.chain import ChainBase from app.db.systemconfig_oper import SystemConfigOper diff --git a/app/actions/add_download.py b/app/actions/add_download.py index 0558c2bf..f8bcbb57 100644 --- a/app/actions/add_download.py +++ b/app/actions/add_download.py @@ -15,10 +15,10 @@ class AddDownloadParams(ActionParams): """ 添加下载资源参数 """ - downloader: Optional[str] = Field(None, description="下载器") - save_path: Optional[str] = Field(None, description="保存路径") - labels: Optional[str] = Field(None, description="标签(,分隔)") - only_lack: Optional[bool] = Field(False, description="仅下载缺失的资源") + downloader: Optional[str] = Field(default=None, description="下载器") + save_path: Optional[str] = Field(default=None, description="保存路径") + labels: Optional[str] = Field(default=None, description="标签(,分隔)") + only_lack: Optional[bool] = Field(default=False, description="仅下载缺失的资源") class AddDownloadAction(BaseAction): diff --git a/app/actions/fetch_medias.py b/app/actions/fetch_medias.py index 5d98de60..f229a9e3 100644 --- a/app/actions/fetch_medias.py +++ b/app/actions/fetch_medias.py @@ -17,9 +17,9 @@ class FetchMediasParams(ActionParams): """ 获取媒体数据参数 """ - source_type: Optional[str] = Field("ranking", description="来源") - sources: Optional[List[str]] = Field([], description="榜单") - api_path: Optional[str] = Field(None, description="API路径") + source_type: Optional[str] = Field(default="ranking", description="来源") + sources: Optional[List[str]] = Field(default=[], description="榜单") + api_path: Optional[str] = Field(default=None, description="API路径") class FetchMediasAction(BaseAction): diff --git a/app/actions/fetch_rss.py b/app/actions/fetch_rss.py index eac7a26b..2e65839a 100644 --- a/app/actions/fetch_rss.py +++ b/app/actions/fetch_rss.py @@ -15,13 +15,13 @@ class FetchRssParams(ActionParams): """ 获取RSS资源列表参数 """ - url: str = Field(None, description="RSS地址") - proxy: Optional[bool] = Field(False, description="是否使用代理") - timeout: Optional[int] = Field(15, description="超时时间") - content_type: Optional[str] = Field(None, description="Content-Type") - referer: Optional[str] = Field(None, description="Referer") - ua: Optional[str] = Field(None, description="User-Agent") - match_media: Optional[str] = Field(None, description="匹配媒体信息") + url: str = Field(default=None, description="RSS地址") + proxy: Optional[bool] = Field(default=False, description="是否使用代理") + timeout: Optional[int] = Field(default=15, description="超时时间") + content_type: Optional[str] = Field(default=None, description="Content-Type") + referer: Optional[str] = Field(default=None, description="Referer") + ua: Optional[str] = Field(default=None, description="User-Agent") + match_media: Optional[str] = Field(default=None, description="匹配媒体信息") class FetchRssAction(BaseAction): diff --git a/app/actions/fetch_torrents.py b/app/actions/fetch_torrents.py index 5e88a465..f303cc0b 100644 --- a/app/actions/fetch_torrents.py +++ b/app/actions/fetch_torrents.py @@ -15,13 +15,13 @@ class FetchTorrentsParams(ActionParams): """ 获取站点资源参数 """ - search_type: Optional[str] = Field("keyword", description="搜索类型") - name: Optional[str] = Field(None, description="资源名称") - year: Optional[str] = Field(None, description="年份") - type: Optional[str] = Field(None, description="资源类型 (电影/电视剧)") - season: Optional[int] = Field(None, description="季度") - sites: Optional[List[int]] = Field([], description="站点列表") - match_media: Optional[bool] = Field(False, description="匹配媒体信息") + search_type: Optional[str] = Field(default="keyword", description="搜索类型") + name: Optional[str] = Field(default=None, description="资源名称") + year: Optional[str] = Field(default=None, description="年份") + type: Optional[str] = Field(default=None, description="资源类型 (电影/电视剧)") + season: Optional[int] = Field(default=None, description="季度") + sites: Optional[List[int]] = Field(default=[], description="站点列表") + match_media: Optional[bool] = Field(default=False, description="匹配媒体信息") class FetchTorrentsAction(BaseAction): diff --git a/app/actions/filter_medias.py b/app/actions/filter_medias.py index d14f29f1..ec0086fd 100644 --- a/app/actions/filter_medias.py +++ b/app/actions/filter_medias.py @@ -12,9 +12,9 @@ class FilterMediasParams(ActionParams): """ 过滤媒体数据参数 """ - type: Optional[str] = Field(None, description="媒体类型 (电影/电视剧)") - vote: Optional[int] = Field(0, description="评分") - year: Optional[str] = Field(None, description="年份") + type: Optional[str] = Field(default=None, description="媒体类型 (电影/电视剧)") + vote: Optional[int] = Field(default=0, description="评分") + year: Optional[str] = Field(default=None, description="年份") class FilterMediasAction(BaseAction): diff --git a/app/actions/filter_torrents.py b/app/actions/filter_torrents.py index 8fdd6f2a..0b46cd05 100644 --- a/app/actions/filter_torrents.py +++ b/app/actions/filter_torrents.py @@ -13,13 +13,13 @@ class FilterTorrentsParams(ActionParams): """ 过滤资源数据参数 """ - rule_groups: Optional[List[str]] = Field([], description="规则组") - quality: Optional[str] = Field(None, description="资源质量") - resolution: Optional[str] = Field(None, description="资源分辨率") - effect: Optional[str] = Field(None, description="特效") - include: Optional[str] = Field(None, description="包含规则") - exclude: Optional[str] = Field(None, description="排除规则") - size: Optional[str] = Field(None, description="资源大小范围(MB)") + rule_groups: Optional[List[str]] = Field(default=[], description="规则组") + quality: Optional[str] = Field(default=None, description="资源质量") + resolution: Optional[str] = Field(default=None, description="资源分辨率") + effect: Optional[str] = Field(default=None, description="特效") + include: Optional[str] = Field(default=None, description="包含规则") + exclude: Optional[str] = Field(default=None, description="排除规则") + size: Optional[str] = Field(default=None, description="资源大小范围(MB)") class FilterTorrentsAction(BaseAction): diff --git a/app/actions/scan_file.py b/app/actions/scan_file.py index 7092d320..47fa43a4 100644 --- a/app/actions/scan_file.py +++ b/app/actions/scan_file.py @@ -15,8 +15,8 @@ class ScanFileParams(ActionParams): 整理文件参数 """ # 存储 - storage: Optional[str] = Field("local", description="存储") - directory: Optional[str] = Field(None, description="目录") + storage: Optional[str] = Field(default="local", description="存储") + directory: Optional[str] = Field(default=None, description="目录") class ScanFileAction(BaseAction): diff --git a/app/actions/send_message.py b/app/actions/send_message.py index bebba726..42f13644 100644 --- a/app/actions/send_message.py +++ b/app/actions/send_message.py @@ -10,8 +10,8 @@ class SendMessageParams(ActionParams): """ 发送消息参数 """ - client: Optional[List[str]] = Field([], description="消息渠道") - userid: Optional[Union[str, int]] = Field(None, description="用户ID") + client: Optional[List[str]] = Field(default=[], description="消息渠道") + userid: Optional[Union[str, int]] = Field(default=None, description="用户ID") class SendMessageAction(BaseAction): @@ -57,7 +57,7 @@ class SendMessageAction(BaseAction): index += 1 # 发送消息 if not params.client: - params.client = [None] + params.client = [""] for client in params.client: self.chain.post_message( Notification( diff --git a/app/actions/transfer_file.py b/app/actions/transfer_file.py index 962bfeaa..77a00e31 100644 --- a/app/actions/transfer_file.py +++ b/app/actions/transfer_file.py @@ -18,7 +18,7 @@ class TransferFileParams(ActionParams): 整理文件参数 """ # 来源 - source: Optional[str] = Field("downloads", description="来源") + source: Optional[str] = Field(default="downloads", description="来源") class TransferFileAction(BaseAction): diff --git a/app/api/endpoints/search.py b/app/api/endpoints/search.py index 2dad3b78..a11fc17f 100644 --- a/app/api/endpoints/search.py +++ b/app/api/endpoints/search.py @@ -29,7 +29,7 @@ def search_by_id(mediaid: str, mtype: str = None, area: str = "title", title: str = None, - year: int = None, + year: str = None, season: str = None, sites: str = None, _: schemas.TokenPayload = Depends(verify_token)) -> Any: diff --git a/app/schemas/download.py b/app/schemas/download.py index c98b7350..486d7c82 100644 --- a/app/schemas/download.py +++ b/app/schemas/download.py @@ -7,7 +7,7 @@ class DownloadTask(BaseModel): """ 下载任务 """ - download_id: Optional[str] = Field(None, description="任务ID") - downloader: Optional[str] = Field(None, description="下载器") - path: Optional[str] = Field(None, description="下载路径") - completed: Optional[bool] = Field(False, description="是否完成") + download_id: Optional[str] = Field(default=None, description="任务ID") + downloader: Optional[str] = Field(default=None, description="下载器") + path: Optional[str] = Field(default=None, description="下载路径") + completed: Optional[bool] = Field(default=False, description="是否完成") diff --git a/app/schemas/event.py b/app/schemas/event.py index 241ac285..9b2e0065 100644 --- a/app/schemas/event.py +++ b/app/schemas/event.py @@ -11,7 +11,7 @@ class Event(BaseModel): 事件模型 """ event_type: str = Field(..., description="事件类型") - event_data: Optional[dict] = Field({}, description="事件数据") + event_data: Optional[dict] = Field(default={}, description="事件数据") priority: Optional[int] = Field(0, description="事件优先级") diff --git a/app/schemas/workflow.py b/app/schemas/workflow.py index 4934c1cb..3b695e0e 100644 --- a/app/schemas/workflow.py +++ b/app/schemas/workflow.py @@ -13,18 +13,18 @@ class Workflow(BaseModel): """ 工作流信息 """ - id: Optional[int] = Field(None, description="工作流ID") - name: Optional[str] = Field(None, description="工作流名称") - description: Optional[str] = Field(None, description="工作流描述") - timer: Optional[str] = Field(None, description="定时器") - state: Optional[str] = Field(None, description="状态") - current_action: Optional[str] = Field(None, description="已执行动作") - result: Optional[str] = Field(None, description="任务执行结果") - run_count: Optional[int] = Field(0, description="已执行次数") - actions: Optional[list] = Field([], description="任务列表") - flows: Optional[list] = Field([], description="任务流") - add_time: Optional[str] = Field(None, description="创建时间") - last_time: Optional[str] = Field(None, description="最后执行时间") + id: Optional[int] = Field(default=None, description="工作流ID") + name: Optional[str] = Field(default=None, description="工作流名称") + description: Optional[str] = Field(default=None, description="工作流描述") + timer: Optional[str] = Field(default=None, description="定时器") + state: Optional[str] = Field(default=None, description="状态") + current_action: Optional[str] = Field(default=None, description="已执行动作") + result: Optional[str] = Field(default=None, description="任务执行结果") + run_count: Optional[int] = Field(default=0, description="已执行次数") + actions: Optional[list] = Field(default=[], description="任务列表") + flows: Optional[list] = Field(default=[], description="任务流") + add_time: Optional[str] = Field(default=None, description="创建时间") + last_time: Optional[str] = Field(default=None, description="最后执行时间") class Config: orm_mode = True @@ -34,8 +34,8 @@ class ActionParams(BaseModel): """ 动作基础参数 """ - loop: Optional[bool] = Field(False, description="是否需要循环") - loop_interval: Optional[int] = Field(0, description="循环间隔 (秒)") + loop: Optional[bool] = Field(default=False, description="是否需要循环") + loop_interval: Optional[int] = Field(default=0, description="循环间隔 (秒)") class Action(BaseModel):