chore: 优化utils模块

wechatter/commands/_commands/gasoline_price.py

@@ -4,12 +4,11 @@
 from bs4 import BeautifulSoup
 from loguru import logger
 
-import wechatter.utils.path_manager as pm
 from wechatter.commands.handlers import command
 from wechatter.exceptions import Bs4ParsingError
 from wechatter.models.wechat import SendTo
 from wechatter.sender import sender
-from wechatter.utils import get_request, load_json
+from wechatter.utils import get_abs_path, get_request, load_json
 
 
 @command(
@@ -78,7 +77,7 @@ def _parse_gasoline_price_response(response: requests.Response) -> str:
     return desired_text
 
 
-CITY_IDS_PATH = pm.get_abs_path("assets/gasoline_price_china/city_ids.json")
+CITY_IDS_PATH = get_abs_path("assets/gasoline_price_china/city_ids.json")
 
 
 def _get_city_id(city_name: str) -> str:

wechatter/commands/_commands/help.py

@@ -6,7 +6,7 @@
 from wechatter.config import config
 from wechatter.models.wechat import SendTo
 from wechatter.sender import sender
-from wechatter.utils.text_to_image import text_to_image
+from wechatter.utils import text_to_image
 
 
 @command(command="help", keys=["帮助", "help"], desc="获取帮助信息。")

wechatter/commands/_commands/openai_chat_gpt.py

@@ -13,9 +13,8 @@
 from wechatter.models.gpt import GptChatInfo
 from wechatter.models.wechat import Person, SendTo
 from wechatter.sender import sender
-from wechatter.utils import post_request_json
+from wechatter.utils import join_urls, post_request_json
 from wechatter.utils.time import get_current_date, get_current_time, get_current_week
-from wechatter.utils.url_joiner import join_urls
 
 DEFAULT_TOPIC = "（对话进行中*）"
 # TODO: 初始化对话，Prompt选择

wechatter/commands/_commands/qrcode.py

@@ -4,10 +4,10 @@
 import qrcode as qrc
 from loguru import logger
 
-import wechatter.utils.path_manager as pm
 from wechatter.commands.handlers import command
 from wechatter.models.wechat import SendTo
 from wechatter.sender import sender
+from wechatter.utils import get_abs_path
 from wechatter.utils.time import get_current_datetime
 
 
@@ -39,7 +39,7 @@ def get_qrcode_saved_path(data: str) -> str:
     if not data:
         raise ValueError("请输入文本或链接")
     datetime_str = get_current_datetime()
-    path = pm.get_abs_path(f"data/qrcodes/{datetime_str}.png")
+    path = get_abs_path(f"data/qrcodes/{datetime_str}.png")
     img = _generate_qrcode(data)
     _save_qrcode(img, path)
     return path

wechatter/commands/_commands/todo.py

@@ -4,11 +4,10 @@
 
 from loguru import logger
 
-import wechatter.utils.path_manager as pm
 from wechatter.commands.handlers import command
 from wechatter.models.wechat import SendTo
 from wechatter.sender import sender
-from wechatter.utils import load_json, save_json
+from wechatter.utils import get_abs_path, load_json, save_json
 
 
 # TODO: 使用SQLite进行数据持久化
@@ -64,19 +63,15 @@ def remove_todo_command_handler(to: Union[str, SendTo], message: str = "") -> No
 
 def _load_todos(person_id: str) -> List[str]:
     """加载特定用户的待办事项"""
-    file_path = pm.get_abs_path(
-        os.path.join("data", "todos", f"p{person_id}_todo.json")
-    )
+    file_path = get_abs_path(os.path.join("data", "todos", f"p{person_id}_todo.json"))
     if os.path.exists(file_path):
         return load_json(file_path)
     return []
 
 
 def _save_todos(person_id: str, content: List[str]) -> None:
     """保存待办事项到特定用户的 JSON 文件中"""
-    file_path = pm.get_abs_path(
-        os.path.join("data", "todos", f"p{person_id}_todo.json")
-    )
+    file_path = get_abs_path(os.path.join("data", "todos", f"p{person_id}_todo.json"))
     save_json(file_path, content)
 
 

wechatter/commands/_commands/weather.py

@@ -5,12 +5,11 @@
 from bs4 import BeautifulSoup
 from loguru import logger
 
-import wechatter.utils.path_manager as pm
 from wechatter.commands.handlers import command
 from wechatter.exceptions import Bs4ParsingError
 from wechatter.models.wechat import SendTo
 from wechatter.sender import sender
-from wechatter.utils import get_request, load_json
+from wechatter.utils import get_abs_path, get_request, load_json
 from wechatter.utils.time import get_current_hour, get_current_minute, get_current_ymdh
 
 
@@ -92,7 +91,7 @@ def weather_command_handler(to: Union[str, SendTo], message: str = "") -> None:
 }
 # fmt: on
 
-CITY_IDS_PATH = pm.get_abs_path("assets/weather_china/city_ids.json")
+CITY_IDS_PATH = get_abs_path("assets/weather_china/city_ids.json")
 
 
 # 封装起来，方便定时任务调用

wechatter/config/config.py

@@ -3,7 +3,7 @@
 import yaml
 from loguru import logger
 
-from wechatter.utils.path_manager import get_abs_path
+from wechatter.utils import get_abs_path
 
 
 def load_config(config_path="config.yaml") -> Dict:

wechatter/database/database.py

@@ -2,7 +2,7 @@
 from sqlalchemy.orm import sessionmaker
 
 from wechatter.database.tables import Base
-from wechatter.utils.path_manager import get_abs_path
+from wechatter.utils import get_abs_path
 
 DB_PATH = get_abs_path("data/wechatter.sqlite")
 

wechatter/database/tables/game_states.py

@@ -7,7 +7,7 @@
 
 from wechatter.database.tables import Base
 from wechatter.models.game.game_states import GameStates as GameStatesModel
-from wechatter.utils.unique_list import UniqueListDecoder, UniqueListEncoder
+from wechatter.utils import UniqueListDecoder, UniqueListEncoder
 
 if TYPE_CHECKING:
     from wechatter.database.tables.group import Group

wechatter/games/__init__.py

@@ -5,7 +5,7 @@
 from wechatter.commands.handlers import command
 from wechatter.models.wechat import Message, SendTo
 from wechatter.sender import sender
-from wechatter.utils.unique_list import UniqueList
+from wechatter.utils import UniqueList
 
 from ._games import *  # noqa: F403
 from .game import Game

wechatter/games/_games/tictactoe.py

@@ -7,7 +7,7 @@
 from typing_extensions import override
 
 from wechatter.games.game import Game
-from wechatter.utils.path_manager import get_abs_path
+from wechatter.utils import get_abs_path
 
 
 class Tictactoe(Game):

wechatter/games/game.py

@@ -7,7 +7,7 @@
 from wechatter.models.game import GameStates
 from wechatter.models.wechat import Group, Person
 from wechatter.sender import sender
-from wechatter.utils.unique_list import UniqueList
+from wechatter.utils import UniqueList
 
 
 class Game(ABC):

wechatter/init_logger.py

@@ -4,7 +4,7 @@
 
 from loguru import logger
 
-from wechatter.utils.path_manager import get_abs_path
+from wechatter.utils import get_abs_path
 
 # 使用环境变量中的 LOG_LEVEL
 LOG_LEVEL_NAME = os.environ.get("WECHATTER_LOG_LEVEL", "INFO")

wechatter/sender/notifier.py

@@ -5,8 +5,7 @@
 
 from wechatter.config import config
 from wechatter.sender import sender
-from wechatter.utils import get_request
-from wechatter.utils.url_joiner import join_urls
+from wechatter.utils import get_request, join_urls
 
 if TYPE_CHECKING:
     from wechatter.models.wechat import SendTo

wechatter/sender/sender.py

@@ -6,11 +6,10 @@
 import tenacity
 from loguru import logger
 
-import wechatter.utils.http_request as http_request
 from wechatter.config import config
 from wechatter.models.wechat import QuotedResponse, SendTo
 from wechatter.sender.quotable import make_quotable
-from wechatter.utils.url_joiner import join_urls
+from wechatter.utils import join_urls, post_request
 
 
 # 对retry装饰器重新包装，增加日志输出
@@ -94,7 +93,7 @@ def logging_wrapper(*args, **kwargs):
 def _post_request(
     url, data=None, json=None, files=None, headers={}, timeout=5
 ) -> requests.Response:
-    return http_request.post_request(
+    return post_request(
         url, data=data, json=json, files=files, headers=headers, timeout=timeout
     )
 

wechatter/utils/__init__.py

@@ -1,6 +1,12 @@
+# isort:skip_file
+from .path_manager import get_abs_path, is_file_exist, join_path
+from .text_to_image import text_to_image
+from .file_manager import check_and_create_file, check_and_create_folder
 from .http_request import get_request, get_request_json, post_request, post_request_json
 from .json_manager import load_json, save_json
+from .unique_list import UniqueList, UniqueListDecoder, UniqueListEncoder
 from .url_codec import url_decode, url_encode
+from .url_joiner import join_urls
 
 __all__ = [
     "load_json",
@@ -11,4 +17,14 @@
     "post_request_json",
     "url_encode",
     "url_decode",
+    "text_to_image",
+    "get_abs_path",
+    "join_path",
+    "is_file_exist",
+    "join_urls",
+    "check_and_create_folder",
+    "check_and_create_file",
+    "UniqueList",
+    "UniqueListEncoder",
+    "UniqueListDecoder",
 ]