From 84006baff2c6f3aa5905de2a28ce560472306bc1 Mon Sep 17 00:00:00 2001 From: chakcy <947105045@qq.com> Date: Tue, 14 Apr 2026 21:06:10 +0800 Subject: [PATCH] =?UTF-8?q?modify:=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.toml | 4 ++-- public/utils/launch.py | 2 +- pyproject.toml | 1 + src/chongming/app/api/routers/todo.py | 1 - src/chongming/app/core/config.py | 4 ++-- src/chongming/app/core/jwt_cache.py | 2 +- src/chongming/app/core/scheduler.py | 4 ++-- src/chongming/app/core/static_files.py | 2 -- uv.lock | 27 ++++++++++++++++++++++++++ 9 files changed, 36 insertions(+), 11 deletions(-) diff --git a/public/config.toml b/public/config.toml index b401d09..7db073c 100644 --- a/public/config.toml +++ b/public/config.toml @@ -44,7 +44,7 @@ reload = true [development.logging] level = "DEBUG" -file = "logs/dev.log" +file = "logs" format = "%(asctime)s - %(name)s - %(levelname)s - %(message)s" [development.cors] @@ -65,7 +65,7 @@ workers = 4 [production.logging] level = "INFO" -file = "logs/prod.log" +file = "logs" format = "%(asctime)s - %(name)s - %(levelname)s - %(message)s" max_size = 10485760 # 10MB backup_count = 5 # 最多保存 10 个日志文件 diff --git a/public/utils/launch.py b/public/utils/launch.py index d18e7c9..fffc4c9 100644 --- a/public/utils/launch.py +++ b/public/utils/launch.py @@ -9,7 +9,7 @@ key = None def init_module_bank(config): MODULE_BANK_PATH_LIST = config["production"]["module_system"]["path"] for module_path in MODULE_BANK_PATH_LIST: - if os.path.exists(module_path) == False: + if not os.path.exists(module_path): raise ValueError(f"模块路径不存在: {module_path}") packer_list = [ diff --git a/pyproject.toml b/pyproject.toml index 3e476e3..c9b21dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,6 +36,7 @@ url = "https://mirrors.ustc.edu.cn/pypi/web/simple/" dev = [ "pyarmor", "pyinstaller", + "ruff>=0.15.10", ] [tool.hatch.build.targets.wheel] diff --git a/src/chongming/app/api/routers/todo.py b/src/chongming/app/api/routers/todo.py index 19a4423..e7afc5b 100644 --- a/src/chongming/app/api/routers/todo.py +++ b/src/chongming/app/api/routers/todo.py @@ -6,7 +6,6 @@ from sqlalchemy.ext.asyncio import AsyncSession from ...model.todo import TodoCreate, TodoUpdate, TodoRead from ...core.database import get_session from ...service.todo import TodoService -from ...model.user import User from ..deps import get_current_user diff --git a/src/chongming/app/core/config.py b/src/chongming/app/core/config.py index 0dd32bf..e6ef66c 100644 --- a/src/chongming/app/core/config.py +++ b/src/chongming/app/core/config.py @@ -5,10 +5,10 @@ from typing import TypedDict, Literal, Optional, cast, List if sys.version_info >= (3, 11): import tomllib - from typing import Required, NotRequired + from typing import Required else: import tomli as tomllib - from typing_extensions import Required, NotRequired + from typing_extensions import Required # 设置 env 为 development 或 production diff --git a/src/chongming/app/core/jwt_cache.py b/src/chongming/app/core/jwt_cache.py index fd0aff3..2d26d0e 100644 --- a/src/chongming/app/core/jwt_cache.py +++ b/src/chongming/app/core/jwt_cache.py @@ -278,7 +278,7 @@ class JWTCache: if token_type: keys = [f"user:{user_id}:{token_type}"] else: - keys = [f"user:{user_id}:access", f"{user_id}:refresh"] + keys = [f"user:{user_id}:access", f"user:{user_id}:refresh"] for key in keys: token_hashes = self.cache.get(key, []) diff --git a/src/chongming/app/core/scheduler.py b/src/chongming/app/core/scheduler.py index ea1788c..a999e49 100644 --- a/src/chongming/app/core/scheduler.py +++ b/src/chongming/app/core/scheduler.py @@ -7,7 +7,7 @@ import os import sys import tempfile from contextlib import suppress -from typing import Dict, List, Optional, Callable, AsyncGenerator, TypedDict, Any +from typing import Dict, List, Optional, Callable, AsyncGenerator from datetime import datetime from fastapi import Request @@ -101,7 +101,7 @@ class TaskService: else: import fcntl - fcntl.flock(lock_file.fileno(), fcntl.LOCK_UN) + fcntl.flock(self.lock_file.fileno(), fcntl.LOCK_UN) self.lock_file.close() async def add_interval_job( diff --git a/src/chongming/app/core/static_files.py b/src/chongming/app/core/static_files.py index ed98892..b36f786 100644 --- a/src/chongming/app/core/static_files.py +++ b/src/chongming/app/core/static_files.py @@ -1,9 +1,7 @@ import os -import mimetypes from fastapi import HTTPException from fastapi.responses import Response from fastapi.staticfiles import StaticFiles -from typing import Optional from sqlite_vfs.core import SQLiteVFS diff --git a/uv.lock b/uv.lock index 20ae5d4..ce2999c 100644 --- a/uv.lock +++ b/uv.lock @@ -365,6 +365,7 @@ dependencies = [ dev = [ { name = "pyarmor" }, { name = "pyinstaller" }, + { name = "ruff" }, ] [package.metadata] @@ -388,6 +389,7 @@ requires-dist = [ dev = [ { name = "pyarmor" }, { name = "pyinstaller" }, + { name = "ruff", specifier = ">=0.15.10" }, ] [[package]] @@ -1341,6 +1343,31 @@ wheels = [ { url = "https://mirrors.ustc.edu.cn/pypi/packages/de/3d/8161f7711c017e01ac9f008dfddd9410dff3674334c233bde66e7ba65bbf/pywin32_ctypes-0.2.3-py3-none-any.whl", hash = "sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8", size = 30756, upload-time = "2024-08-14T10:15:33.187Z" }, ] +[[package]] +name = "ruff" +version = "0.15.10" +source = { registry = "https://mirrors.ustc.edu.cn/pypi/web/simple/" } +sdist = { url = "https://mirrors.ustc.edu.cn/pypi/packages/e7/d9/aa3f7d59a10ef6b14fe3431706f854dbf03c5976be614a9796d36326810c/ruff-0.15.10.tar.gz", hash = "sha256:d1f86e67ebfdef88e00faefa1552b5e510e1d35f3be7d423dc7e84e63788c94e", size = 4631728, upload-time = "2026-04-09T14:06:09.884Z" } +wheels = [ + { url = "https://mirrors.ustc.edu.cn/pypi/packages/eb/00/a1c2fdc9939b2c03691edbda290afcd297f1f389196172826b03d6b6a595/ruff-0.15.10-py3-none-linux_armv6l.whl", hash = "sha256:0744e31482f8f7d0d10a11fcbf897af272fefdfcb10f5af907b18c2813ff4d5f", size = 10563362, upload-time = "2026-04-09T14:06:21.189Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/5c/15/006990029aea0bebe9d33c73c3e28c80c391ebdba408d1b08496f00d422d/ruff-0.15.10-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b1e7c16ea0ff5a53b7c2df52d947e685973049be1cdfe2b59a9c43601897b22e", size = 10951122, upload-time = "2026-04-09T14:06:02.236Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/f2/c0/4ac978fe874d0618c7da647862afe697b281c2806f13ce904ad652fa87e4/ruff-0.15.10-py3-none-macosx_11_0_arm64.whl", hash = "sha256:93cc06a19e5155b4441dd72808fdf84290d84ad8a39ca3b0f994363ade4cebb1", size = 10314005, upload-time = "2026-04-09T14:06:00.026Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/da/73/c209138a5c98c0d321266372fc4e33ad43d506d7e5dd817dd89b60a8548f/ruff-0.15.10-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83e1dd04312997c99ea6965df66a14fb4f03ba978564574ffc68b0d61fd3989e", size = 10643450, upload-time = "2026-04-09T14:05:42.137Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/ec/76/0deec355d8ec10709653635b1f90856735302cb8e149acfdf6f82a5feb70/ruff-0.15.10-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8154d43684e4333360fedd11aaa40b1b08a4e37d8ffa9d95fee6fa5b37b6fab1", size = 10379597, upload-time = "2026-04-09T14:05:49.984Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/dc/be/86bba8fc8798c081e28a4b3bb6d143ccad3fd5f6f024f02002b8f08a9fa3/ruff-0.15.10-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ab88715f3a6deb6bde6c227f3a123410bec7b855c3ae331b4c006189e895cef", size = 11146645, upload-time = "2026-04-09T14:06:12.246Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/a8/89/140025e65911b281c57be1d385ba1d932c2366ca88ae6663685aed8d4881/ruff-0.15.10-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a768ff5969b4f44c349d48edf4ab4f91eddb27fd9d77799598e130fb628aa158", size = 12030289, upload-time = "2026-04-09T14:06:04.776Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/88/de/ddacca9545a5e01332567db01d44bd8cf725f2db3b3d61a80550b48308ea/ruff-0.15.10-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ee3ef42dab7078bda5ff6a1bcba8539e9857deb447132ad5566a038674540d0", size = 11496266, upload-time = "2026-04-09T14:05:55.485Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/bc/bb/7ddb00a83760ff4a83c4e2fc231fd63937cc7317c10c82f583302e0f6586/ruff-0.15.10-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51cb8cc943e891ba99989dd92d61e29b1d231e14811db9be6440ecf25d5c1609", size = 11256418, upload-time = "2026-04-09T14:05:57.69Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/dc/8d/55de0d35aacf6cd50b6ee91ee0f291672080021896543776f4170fc5c454/ruff-0.15.10-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:e59c9bdc056a320fb9ea1700a8d591718b8faf78af065484e801258d3a76bc3f", size = 11288416, upload-time = "2026-04-09T14:05:44.695Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/68/cf/9438b1a27426ec46a80e0a718093c7f958ef72f43eb3111862949ead3cc1/ruff-0.15.10-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:136c00ca2f47b0018b073f28cb5c1506642a830ea941a60354b0e8bc8076b151", size = 10621053, upload-time = "2026-04-09T14:05:52.782Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/4c/50/e29be6e2c135e9cd4cb15fbade49d6a2717e009dff3766dd080fcb82e251/ruff-0.15.10-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8b80a2f3c9c8a950d6237f2ca12b206bccff626139be9fa005f14feb881a1ae8", size = 10378302, upload-time = "2026-04-09T14:06:14.361Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/18/2f/e0b36a6f99c51bb89f3a30239bc7bf97e87a37ae80aa2d6542d6e5150364/ruff-0.15.10-py3-none-musllinux_1_2_i686.whl", hash = "sha256:e3e53c588164dc025b671c9df2462429d60357ea91af7e92e9d56c565a9f1b07", size = 10850074, upload-time = "2026-04-09T14:06:16.581Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/11/08/874da392558ce087a0f9b709dc6ec0d60cbc694c1c772dab8d5f31efe8cb/ruff-0.15.10-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b0c52744cf9f143a393e284125d2576140b68264a93c6716464e129a3e9adb48", size = 11358051, upload-time = "2026-04-09T14:06:18.948Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/e4/46/602938f030adfa043e67112b73821024dc79f3ab4df5474c25fa4c1d2d14/ruff-0.15.10-py3-none-win32.whl", hash = "sha256:d4272e87e801e9a27a2e8df7b21011c909d9ddd82f4f3281d269b6ba19789ca5", size = 10588964, upload-time = "2026-04-09T14:06:07.14Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/25/b6/261225b875d7a13b33a6d02508c39c28450b2041bb01d0f7f1a83d569512/ruff-0.15.10-py3-none-win_amd64.whl", hash = "sha256:28cb32d53203242d403d819fd6983152489b12e4a3ae44993543d6fe62ab42ed", size = 11745044, upload-time = "2026-04-09T14:05:39.473Z" }, + { url = "https://mirrors.ustc.edu.cn/pypi/packages/58/ed/dea90a65b7d9e69888890fb14c90d7f51bf0c1e82ad800aeb0160e4bacfd/ruff-0.15.10-py3-none-win_arm64.whl", hash = "sha256:601d1610a9e1f1c2165a4f561eeaa2e2ea1e97f3287c5aa258d3dab8b57c6188", size = 11035607, upload-time = "2026-04-09T14:05:47.593Z" }, +] + [[package]] name = "setuptools" version = "75.3.4"