From 0b313a1c3f092b73bbf176323929ff6cfbbc6930 Mon Sep 17 00:00:00 2001 From: baiqwerdvd <158065462+baiqwerdvd@users.noreply.github.com> Date: Fri, 6 Sep 2024 02:43:03 +0800 Subject: [PATCH] format --- .../sruid_utils/api/hakush/requests.py | 6 ++-- .../sruid_utils/api/mihomo/requests.py | 6 ++-- StarRailUID/sruid_utils/api/mys/models.py | 2 +- StarRailUID/starrailuid_abyss/__init__.py | 6 ++-- .../starrailuid_abyss/draw_abyss_card.py | 18 +++++----- .../starrailuid_abyss_boss/__init__.py | 6 ++-- .../starrailuid_abyss_boss/draw_abyss_card.py | 18 +++++----- .../starrailuid_abyss_story/__init__.py | 6 ++-- .../draw_abyss_card.py | 18 +++++----- StarRailUID/starrailuid_calc/__init__.py | 10 +++--- StarRailUID/starrailuid_charinfo/__init__.py | 12 +++---- .../starrailuid_charinfo/draw_char_img.py | 34 +++++++++---------- .../starrailuid_charinfo/get_char_img.py | 14 ++++---- StarRailUID/starrailuid_charinfo/to_card.py | 8 ++--- StarRailUID/starrailuid_config/__init__.py | 6 ++-- .../starrailuid_config/config_default.py | 4 +-- StarRailUID/starrailuid_gachalog/__init__.py | 10 +++--- .../starrailuid_gachalog/draw_gachalogs.py | 18 +++++----- .../starrailuid_gachalog/get_gachalogs.py | 8 ++--- StarRailUID/starrailuid_help/__init__.py | 4 +-- StarRailUID/starrailuid_help/get_help.py | 10 +++--- StarRailUID/starrailuid_note/__init__.py | 10 +++--- StarRailUID/starrailuid_resource/__init__.py | 6 ++-- StarRailUID/starrailuid_rogue/__init__.py | 6 ++-- .../starrailuid_rogue/draw_rogue_card.py | 18 +++++----- StarRailUID/starrailuid_roleinfo/__init__.py | 8 ++--- .../draw_roleinfo_card.py | 18 +++++----- StarRailUID/starrailuid_roleinfo/utils.py | 2 +- StarRailUID/starrailuid_signin/__init__.py | 8 ++--- StarRailUID/starrailuid_stamina/__init__.py | 12 +++---- StarRailUID/starrailuid_user/__init__.py | 2 +- StarRailUID/starrailuid_wiki/__init__.py | 12 +++---- StarRailUID/utils/api.py | 10 ------ StarRailUID/utils/excel/model.py | 22 ++---------- StarRailUID/utils/image/image_tools.py | 2 +- StarRailUID/utils/map/SR_MAP_PATH.py | 7 ++-- StarRailUID/utils/map/name_covert.py | 4 +-- StarRailUID/utils/resource/RESOURCE_PATH.py | 2 +- .../utils/resource/download_from_cos.py | 4 +-- pyproject.toml | 8 +++++ 40 files changed, 182 insertions(+), 203 deletions(-) delete mode 100644 StarRailUID/utils/api.py diff --git a/StarRailUID/sruid_utils/api/hakush/requests.py b/StarRailUID/sruid_utils/api/hakush/requests.py index 1c17704..7ccfdb7 100644 --- a/StarRailUID/sruid_utils/api/hakush/requests.py +++ b/StarRailUID/sruid_utils/api/hakush/requests.py @@ -1,15 +1,15 @@ from typing import Dict, Union -from msgspec import convert from httpx import AsyncClient +from msgspec import convert -from ..utils import _HEADER from .model import ( HakushHsrCharacter, - HakushHsrLightcone, HakushHsrCharacterIndex, + HakushHsrLightcone, HakushHsrLightconeIndex, ) +from ..utils import _HEADER async def get_character_data( diff --git a/StarRailUID/sruid_utils/api/mihomo/requests.py b/StarRailUID/sruid_utils/api/mihomo/requests.py index e9baedd..e55dd0d 100644 --- a/StarRailUID/sruid_utils/api/mihomo/requests.py +++ b/StarRailUID/sruid_utils/api/mihomo/requests.py @@ -1,12 +1,10 @@ -from __future__ import annotations - from pathlib import Path -from msgspec import convert from httpx import AsyncClient +from msgspec import convert -from ..utils import _HEADER from .models import MihomoData +from ..utils import _HEADER from ....utils.resource.RESOURCE_PATH import PLAYER_PATH diff --git a/StarRailUID/sruid_utils/api/mys/models.py b/StarRailUID/sruid_utils/api/mys/models.py index 945474d..f36d5da 100644 --- a/StarRailUID/sruid_utils/api/mys/models.py +++ b/StarRailUID/sruid_utils/api/mys/models.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, List, Union, Optional +from typing import Any, Dict, List, Optional, Union from msgspec import Struct diff --git a/StarRailUID/starrailuid_abyss/__init__.py b/StarRailUID/starrailuid_abyss/__init__.py index fc8aa4d..23f16da 100644 --- a/StarRailUID/starrailuid_abyss/__init__.py +++ b/StarRailUID/starrailuid_abyss/__init__.py @@ -1,8 +1,5 @@ import re -from .draw_abyss_card import draw_abyss_img -from ..utils.sr_prefix import PREFIX - from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.sv import SV @@ -10,6 +7,9 @@ from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import UID_HINT +from .draw_abyss_card import draw_abyss_img +from ..utils.sr_prefix import PREFIX + sv_srabyss = SV("sr查询深渊") diff --git a/StarRailUID/starrailuid_abyss/draw_abyss_card.py b/StarRailUID/starrailuid_abyss/draw_abyss_card.py index 281dcd7..155349b 100644 --- a/StarRailUID/starrailuid_abyss/draw_abyss_card.py +++ b/StarRailUID/starrailuid_abyss/draw_abyss_card.py @@ -1,6 +1,15 @@ from pathlib import Path from typing import Any, Dict, Union +from PIL import Image, ImageDraw +from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error +from gsuid_core.utils.image.convert import convert_img +from gsuid_core.utils.image.image_tools import ( + draw_pic_with_ring, + get_qq_avatar, +) + from .utils import get_icon from ..sruid_utils.api.mys.models import AbyssAvatar from ..utils.fonts.starrail_fonts import ( @@ -12,15 +21,6 @@ from ..utils.fonts.starrail_fonts import ( ) from ..utils.mys_api import mys_api -from PIL import Image, ImageDraw -from gsuid_core.logger import logger -from gsuid_core.utils.error_reply import get_error -from gsuid_core.utils.image.convert import convert_img -from gsuid_core.utils.image.image_tools import ( - draw_pic_with_ring, - get_qq_avatar, -) - TEXT_PATH = Path(__file__).parent / "texture2D" white_color = (255, 255, 255) gray_color = (175, 175, 175) diff --git a/StarRailUID/starrailuid_abyss_boss/__init__.py b/StarRailUID/starrailuid_abyss_boss/__init__.py index 8bf8dce..b23ccdc 100644 --- a/StarRailUID/starrailuid_abyss_boss/__init__.py +++ b/StarRailUID/starrailuid_abyss_boss/__init__.py @@ -1,8 +1,5 @@ import re -from .draw_abyss_card import draw_abyss_img -from ..utils.sr_prefix import PREFIX - from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.sv import SV @@ -10,6 +7,9 @@ from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import UID_HINT +from .draw_abyss_card import draw_abyss_img +from ..utils.sr_prefix import PREFIX + sv_abyss_boss = SV("sr查询末日幻影") diff --git a/StarRailUID/starrailuid_abyss_boss/draw_abyss_card.py b/StarRailUID/starrailuid_abyss_boss/draw_abyss_card.py index 804fce8..b777f95 100644 --- a/StarRailUID/starrailuid_abyss_boss/draw_abyss_card.py +++ b/StarRailUID/starrailuid_abyss_boss/draw_abyss_card.py @@ -1,6 +1,15 @@ from pathlib import Path from typing import Any, Dict, Union +from PIL import Image, ImageDraw +from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error +from gsuid_core.utils.image.convert import convert_img +from gsuid_core.utils.image.image_tools import ( + draw_pic_with_ring, + get_qq_avatar, +) + from .utils import get_icon from ..sruid_utils.api.mys.models import AbyssAvatar from ..utils.fonts.starrail_fonts import ( @@ -12,15 +21,6 @@ from ..utils.fonts.starrail_fonts import ( ) from ..utils.mys_api import mys_api -from PIL import Image, ImageDraw -from gsuid_core.logger import logger -from gsuid_core.utils.error_reply import get_error -from gsuid_core.utils.image.convert import convert_img -from gsuid_core.utils.image.image_tools import ( - draw_pic_with_ring, - get_qq_avatar, -) - TEXT_PATH = Path(__file__).parent / "texture2D" white_color = (255, 255, 255) gray_color = (175, 175, 175) diff --git a/StarRailUID/starrailuid_abyss_story/__init__.py b/StarRailUID/starrailuid_abyss_story/__init__.py index cb684dd..8fa498f 100644 --- a/StarRailUID/starrailuid_abyss_story/__init__.py +++ b/StarRailUID/starrailuid_abyss_story/__init__.py @@ -1,8 +1,5 @@ import re -from .draw_abyss_card import draw_abyss_img -from ..utils.sr_prefix import PREFIX - from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.sv import SV @@ -10,6 +7,9 @@ from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import UID_HINT +from .draw_abyss_card import draw_abyss_img +from ..utils.sr_prefix import PREFIX + sv_abyss_story = SV("sr查询虚构叙事") diff --git a/StarRailUID/starrailuid_abyss_story/draw_abyss_card.py b/StarRailUID/starrailuid_abyss_story/draw_abyss_card.py index f6181a3..fde3396 100644 --- a/StarRailUID/starrailuid_abyss_story/draw_abyss_card.py +++ b/StarRailUID/starrailuid_abyss_story/draw_abyss_card.py @@ -1,6 +1,15 @@ from pathlib import Path from typing import Any, Dict, Union +from PIL import Image, ImageDraw +from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error +from gsuid_core.utils.image.convert import convert_img +from gsuid_core.utils.image.image_tools import ( + draw_pic_with_ring, + get_qq_avatar, +) + from .utils import get_icon from ..sruid_utils.api.mys.models import AbyssAvatar from ..utils.fonts.starrail_fonts import ( @@ -12,15 +21,6 @@ from ..utils.fonts.starrail_fonts import ( ) from ..utils.mys_api import mys_api -from PIL import Image, ImageDraw -from gsuid_core.logger import logger -from gsuid_core.utils.error_reply import get_error -from gsuid_core.utils.image.convert import convert_img -from gsuid_core.utils.image.image_tools import ( - draw_pic_with_ring, - get_qq_avatar, -) - TEXT_PATH = Path(__file__).parent / "texture2D" white_color = (255, 255, 255) gray_color = (175, 175, 175) diff --git a/StarRailUID/starrailuid_calc/__init__.py b/StarRailUID/starrailuid_calc/__init__.py index 32c7889..34c89b7 100644 --- a/StarRailUID/starrailuid_calc/__init__.py +++ b/StarRailUID/starrailuid_calc/__init__.py @@ -1,5 +1,10 @@ from typing import TYPE_CHECKING +from gsuid_core.sv import SV +from gsuid_core.utils.database.api import get_uid +from gsuid_core.utils.database.models import GsBind +from gsuid_core.utils.error_reply import get_error + from ..utils.error_reply import UID_HINT from ..utils.map.name_covert import ( alias_to_char_name, @@ -8,11 +13,6 @@ from ..utils.map.name_covert import ( from ..utils.mys_api import mys_api from ..utils.sr_prefix import PREFIX -from gsuid_core.sv import SV -from gsuid_core.utils.database.api import get_uid -from gsuid_core.utils.database.models import GsBind -from gsuid_core.utils.error_reply import get_error - if TYPE_CHECKING: from gsuid_core.bot import Bot from gsuid_core.models import Event diff --git a/StarRailUID/starrailuid_charinfo/__init__.py b/StarRailUID/starrailuid_charinfo/__init__.py index 00b8c05..b8c989c 100644 --- a/StarRailUID/starrailuid_charinfo/__init__.py +++ b/StarRailUID/starrailuid_charinfo/__init__.py @@ -2,12 +2,6 @@ from pathlib import Path import re from typing import Tuple, cast -from .get_char_img import draw_char_info_img -from .to_card import api_to_card -from ..utils.error_reply import UID_HINT -from ..utils.resource.RESOURCE_PATH import TEMP_PATH -from ..utils.sr_prefix import PREFIX - from PIL import Image from gsuid_core.bot import Bot from gsuid_core.message_models import Button @@ -18,6 +12,12 @@ from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.image.convert import convert_img from starrail_damage_cal.map.SR_MAP_PATH import avatarId2Name +from .get_char_img import draw_char_info_img +from .to_card import api_to_card +from ..utils.error_reply import UID_HINT +from ..utils.resource.RESOURCE_PATH import TEMP_PATH +from ..utils.sr_prefix import PREFIX + sv_char_info_config = SV("sr面板设置", pm=2) sv_get_char_info = SV("sr面板查询", priority=10) sv_get_sr_original_pic = SV("sr查看面板原图", priority=5) diff --git a/StarRailUID/starrailuid_charinfo/draw_char_img.py b/StarRailUID/starrailuid_charinfo/draw_char_img.py index 0494566..f25ee41 100644 --- a/StarRailUID/starrailuid_charinfo/draw_char_img.py +++ b/StarRailUID/starrailuid_charinfo/draw_char_img.py @@ -1,33 +1,20 @@ import copy import json import math -import textwrap from pathlib import Path +import textwrap from typing import Dict, Union from PIL import Image, ImageDraw from gsuid_core.logger import logger -from starrail_damage_cal.to_data import api_to_dict from gsuid_core.utils.image.convert import convert_img from gsuid_core.utils.image.image_tools import draw_text_by_line -from starrail_damage_cal.cal_damage import cal_info, cal_char_info +from starrail_damage_cal.cal_damage import cal_char_info, cal_info +from starrail_damage_cal.to_data import api_to_dict from ..utils.error_reply import CHAR_HINT -from ..utils.fonts.first_world import fw_font_28 from ..utils.excel.read_excel import light_cone_ranks -from ..utils.map.name_covert import name_to_avatar_id, alias_to_char_name -from ..utils.map.SR_MAP_PATH import ( - RelicId2Rarity, - AvatarRelicScore, - avatarId2Name, -) -from ..utils.resource.RESOURCE_PATH import ( - RELIC_PATH, - SKILL_PATH, - PLAYER_PATH, - WEAPON_PATH, - CHAR_PORTRAIT_PATH, -) +from ..utils.fonts.first_world import fw_font_28 from ..utils.fonts.starrail_fonts import ( sr_font_18, sr_font_20, @@ -38,6 +25,19 @@ from ..utils.fonts.starrail_fonts import ( sr_font_34, sr_font_38, ) +from ..utils.map.SR_MAP_PATH import ( + AvatarRelicScore, + RelicId2Rarity, + avatarId2Name, +) +from ..utils.map.name_covert import alias_to_char_name, name_to_avatar_id +from ..utils.resource.RESOURCE_PATH import ( + CHAR_PORTRAIT_PATH, + PLAYER_PATH, + RELIC_PATH, + SKILL_PATH, + WEAPON_PATH, +) Excel_path = Path(__file__).parent with Path.open(Excel_path / "Excel" / "SkillData.json", encoding="utf-8") as f: diff --git a/StarRailUID/starrailuid_charinfo/get_char_img.py b/StarRailUID/starrailuid_charinfo/get_char_img.py index 84ac529..af203d2 100644 --- a/StarRailUID/starrailuid_charinfo/get_char_img.py +++ b/StarRailUID/starrailuid_charinfo/get_char_img.py @@ -3,6 +3,13 @@ from pathlib import Path import re from typing import Dict, Optional, Tuple, Union +from gsuid_core.logger import logger +from starrail_damage_cal.excel.model import ( + AvatarPromotionConfig, + EquipmentPromotionConfig, +) +from starrail_damage_cal.to_data import api_to_dict + from .draw_char_img import draw_char_img from ..utils.error_reply import CHAR_HINT from ..utils.map.SR_MAP_PATH import ( @@ -28,13 +35,6 @@ from ..utils.map.name_covert import ( ) from ..utils.resource.RESOURCE_PATH import PLAYER_PATH -from gsuid_core.logger import logger -from starrail_damage_cal.excel.model import ( - AvatarPromotionConfig, - EquipmentPromotionConfig, -) -from starrail_damage_cal.to_data import api_to_dict - WEAPON_TO_INT = { "一": 1, "二": 2, diff --git a/StarRailUID/starrailuid_charinfo/to_card.py b/StarRailUID/starrailuid_charinfo/to_card.py index a9b7e31..b7c3b38 100644 --- a/StarRailUID/starrailuid_charinfo/to_card.py +++ b/StarRailUID/starrailuid_charinfo/to_card.py @@ -3,15 +3,15 @@ from pathlib import Path from typing import Dict, List, Tuple, Union from PIL import Image, ImageDraw -from starrail_damage_cal.to_data import api_to_dict from gsuid_core.utils.image.convert import convert_img -from starrail_damage_cal.map.SR_MAP_PATH import avatarId2Name from gsuid_core.utils.image.image_tools import crop_center_img +from starrail_damage_cal.map.SR_MAP_PATH import avatarId2Name +from starrail_damage_cal.to_data import api_to_dict from ..utils.fonts.first_world import fw_font_28 -from ..utils.map.name_covert import avatar_id_to_char_star -from ..utils.resource.RESOURCE_PATH import PLAYER_PATH, CHAR_PREVIEW_PATH from ..utils.fonts.starrail_fonts import sr_font_24, sr_font_30, sr_font_58 +from ..utils.map.name_covert import avatar_id_to_char_star +from ..utils.resource.RESOURCE_PATH import CHAR_PREVIEW_PATH, PLAYER_PATH half_color = (255, 255, 255, 120) first_color = (29, 29, 29) diff --git a/StarRailUID/starrailuid_config/__init__.py b/StarRailUID/starrailuid_config/__init__.py index 168ef05..a2dd94e 100644 --- a/StarRailUID/starrailuid_config/__init__.py +++ b/StarRailUID/starrailuid_config/__init__.py @@ -1,12 +1,12 @@ -from .set_config import set_config_func -from ..starrailuid_config.sr_config import srconfig - from gsuid_core.bot import Bot from gsuid_core.logger import logger from gsuid_core.models import Event from gsuid_core.sv import SV from gsuid_core.utils.database.models import GsBind +from .set_config import set_config_func +from ..starrailuid_config.sr_config import srconfig + PREFIX = srconfig.get_config("StarRailPrefix").data sv_self_config = SV("星穹铁道配置") diff --git a/StarRailUID/starrailuid_config/config_default.py b/StarRailUID/starrailuid_config/config_default.py index 3794655..10e93a4 100644 --- a/StarRailUID/starrailuid_config/config_default.py +++ b/StarRailUID/starrailuid_config/config_default.py @@ -2,10 +2,10 @@ from typing import Dict from gsuid_core.utils.plugins_config.models import ( GSC, - GsStrConfig, GsBoolConfig, - GsListStrConfig, GsIntConfig, + GsListStrConfig, + GsStrConfig, ) CONIFG_DEFAULT: Dict[str, GSC] = { diff --git a/StarRailUID/starrailuid_gachalog/__init__.py b/StarRailUID/starrailuid_gachalog/__init__.py index 490048a..bb46435 100644 --- a/StarRailUID/starrailuid_gachalog/__init__.py +++ b/StarRailUID/starrailuid_gachalog/__init__.py @@ -1,14 +1,14 @@ -from .draw_gachalogs import draw_gachalogs_img -from .get_gachalogs import save_gachalogs -from ..utils.error_reply import UID_HINT -from ..utils.sr_prefix import PREFIX - from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind +from .draw_gachalogs import draw_gachalogs_img +from .get_gachalogs import save_gachalogs +from ..utils.error_reply import UID_HINT +from ..utils.sr_prefix import PREFIX + sv_gacha_log = SV("sr抽卡记录") sv_get_gachalog_by_link = SV("sr导入抽卡链接", area="DIRECT") diff --git a/StarRailUID/starrailuid_gachalog/draw_gachalogs.py b/StarRailUID/starrailuid_gachalog/draw_gachalogs.py index 09b1d35..44e4411 100644 --- a/StarRailUID/starrailuid_gachalog/draw_gachalogs.py +++ b/StarRailUID/starrailuid_gachalog/draw_gachalogs.py @@ -4,6 +4,15 @@ import json from pathlib import Path from typing import List, Tuple, Union +from PIL import Image, ImageDraw +from gsuid_core.logger import logger +from gsuid_core.utils.image.convert import convert_img +from gsuid_core.utils.image.image_tools import ( + draw_pic_with_ring, + get_color_bg, + get_qq_avatar, +) + from ..utils.fonts.starrail_fonts import ( sr_font_20, sr_font_24, @@ -18,15 +27,6 @@ from ..utils.resource.RESOURCE_PATH import ( WEAPON_PATH, ) -from PIL import Image, ImageDraw -from gsuid_core.logger import logger -from gsuid_core.utils.image.convert import convert_img -from gsuid_core.utils.image.image_tools import ( - draw_pic_with_ring, - get_color_bg, - get_qq_avatar, -) - TEXT_PATH = Path(__file__).parent / "texture2d" EMO_PATH = Path(__file__).parent / "texture2d" / "emo" diff --git a/StarRailUID/starrailuid_gachalog/get_gachalogs.py b/StarRailUID/starrailuid_gachalog/get_gachalogs.py index 630e824..4d28362 100644 --- a/StarRailUID/starrailuid_gachalog/get_gachalogs.py +++ b/StarRailUID/starrailuid_gachalog/get_gachalogs.py @@ -1,15 +1,15 @@ -import json import asyncio -from pathlib import Path -from urllib import parse from datetime import datetime +import json +from pathlib import Path from typing import Dict, List, Optional +from urllib import parse import msgspec +from ..sruid_utils.api.mys.models import SingleGachaLog from ..utils.mys_api import mys_api from ..utils.resource.RESOURCE_PATH import PLAYER_PATH -from ..sruid_utils.api.mys.models import SingleGachaLog gacha_type_meta_data = { "群星跃迁": ["1"], diff --git a/StarRailUID/starrailuid_help/__init__.py b/StarRailUID/starrailuid_help/__init__.py index 10ffe0a..1e8ad31 100644 --- a/StarRailUID/starrailuid_help/__init__.py +++ b/StarRailUID/starrailuid_help/__init__.py @@ -1,7 +1,7 @@ -from gsuid_core.sv import SV from gsuid_core.bot import Bot -from gsuid_core.models import Event from gsuid_core.logger import logger +from gsuid_core.models import Event +from gsuid_core.sv import SV from .get_help import get_core_help from ..utils.sr_prefix import PREFIX diff --git a/StarRailUID/starrailuid_help/get_help.py b/StarRailUID/starrailuid_help/get_help.py index 7f5d7fe..6cd9b47 100644 --- a/StarRailUID/starrailuid_help/get_help.py +++ b/StarRailUID/starrailuid_help/get_help.py @@ -1,14 +1,14 @@ from pathlib import Path -from typing import Dict, Union, Optional +from typing import Dict, Optional, Union -import aiofiles from PIL import Image -from msgspec import json as msgjson -from gsuid_core.help.model import PluginHelp +import aiofiles from gsuid_core.help.draw_plugin_help import get_help +from gsuid_core.help.model import PluginHelp +from msgspec import json as msgjson -from ..version import StarRail_version from ..utils.fonts.starrail_fonts import starrail_font_origin +from ..version import StarRail_version TEXT_PATH = Path(__file__).parent / "texture2d" HELP_DATA = Path(__file__).parent / "Help.json" diff --git a/StarRailUID/starrailuid_note/__init__.py b/StarRailUID/starrailuid_note/__init__.py index 4b4442d..1ea8e24 100644 --- a/StarRailUID/starrailuid_note/__init__.py +++ b/StarRailUID/starrailuid_note/__init__.py @@ -1,14 +1,14 @@ -from .draw_note_card import draw_note_img -from .note_text import award -from ..utils.error_reply import UID_HINT -from ..utils.sr_prefix import PREFIX - from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind +from .draw_note_card import draw_note_img +from .note_text import award +from ..utils.error_reply import UID_HINT +from ..utils.sr_prefix import PREFIX + sv_get_monthly_data = SV("sr查询月历") diff --git a/StarRailUID/starrailuid_resource/__init__.py b/StarRailUID/starrailuid_resource/__init__.py index 33cdea6..45ea6f7 100644 --- a/StarRailUID/starrailuid_resource/__init__.py +++ b/StarRailUID/starrailuid_resource/__init__.py @@ -1,10 +1,10 @@ -from gsuid_core.sv import SV from gsuid_core.bot import Bot -from gsuid_core.models import Event from gsuid_core.logger import logger +from gsuid_core.models import Event +from gsuid_core.sv import SV -from ..utils.sr_prefix import PREFIX from ..utils.resource.download_from_cos import check_use +from ..utils.sr_prefix import PREFIX sv_sr_download_config = SV("sr下载资源", pm=1) diff --git a/StarRailUID/starrailuid_rogue/__init__.py b/StarRailUID/starrailuid_rogue/__init__.py index cc22f74..1e394b6 100644 --- a/StarRailUID/starrailuid_rogue/__init__.py +++ b/StarRailUID/starrailuid_rogue/__init__.py @@ -1,8 +1,5 @@ import re -from .draw_rogue_card import draw_rogue_img, draw_rogue_locust_img -from ..utils.sr_prefix import PREFIX - from gsuid_core.bot import Bot from gsuid_core.models import Event from gsuid_core.sv import SV @@ -10,6 +7,9 @@ from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.error_reply import UID_HINT +from .draw_rogue_card import draw_rogue_img, draw_rogue_locust_img +from ..utils.sr_prefix import PREFIX + sv_srabyss = SV("sr查询模拟宇宙") sv_srabyss_locust = SV("sr查询寰宇蝗灾") diff --git a/StarRailUID/starrailuid_rogue/draw_rogue_card.py b/StarRailUID/starrailuid_rogue/draw_rogue_card.py index c2af269..54fc419 100644 --- a/StarRailUID/starrailuid_rogue/draw_rogue_card.py +++ b/StarRailUID/starrailuid_rogue/draw_rogue_card.py @@ -2,6 +2,15 @@ import math from pathlib import Path from typing import Any, Dict, List, Optional, Union +from PIL import Image, ImageDraw +from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error +from gsuid_core.utils.image.convert import convert_img +from gsuid_core.utils.image.image_tools import ( + draw_pic_with_ring, + get_qq_avatar, +) + from .utils import get_icon from ..sruid_utils.api.mys.models import ( LocustBlocks, @@ -17,15 +26,6 @@ from ..utils.fonts.starrail_fonts import ( ) from ..utils.mys_api import mys_api -from PIL import Image, ImageDraw -from gsuid_core.logger import logger -from gsuid_core.utils.error_reply import get_error -from gsuid_core.utils.image.convert import convert_img -from gsuid_core.utils.image.image_tools import ( - draw_pic_with_ring, - get_qq_avatar, -) - TEXT_PATH = Path(__file__).parent / "texture2D" white_color = (255, 255, 255) gray_color = (175, 175, 175) diff --git a/StarRailUID/starrailuid_roleinfo/__init__.py b/StarRailUID/starrailuid_roleinfo/__init__.py index b5740c6..233e2ae 100644 --- a/StarRailUID/starrailuid_roleinfo/__init__.py +++ b/StarRailUID/starrailuid_roleinfo/__init__.py @@ -1,9 +1,5 @@ import re -from .draw_roleinfo_card import get_detail_img, get_role_img -from ..utils.error_reply import UID_HINT -from ..utils.sr_prefix import PREFIX - from gsuid_core.bot import Bot from gsuid_core.logger import logger from gsuid_core.models import Event @@ -11,6 +7,10 @@ from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind +from .draw_roleinfo_card import get_detail_img, get_role_img +from ..utils.error_reply import UID_HINT +from ..utils.sr_prefix import PREFIX + sv_get_info = SV("sr查询信息") diff --git a/StarRailUID/starrailuid_roleinfo/draw_roleinfo_card.py b/StarRailUID/starrailuid_roleinfo/draw_roleinfo_card.py index 3d42832..ed549cc 100644 --- a/StarRailUID/starrailuid_roleinfo/draw_roleinfo_card.py +++ b/StarRailUID/starrailuid_roleinfo/draw_roleinfo_card.py @@ -2,6 +2,15 @@ import asyncio from pathlib import Path from typing import Any, Dict, List, Optional, Union +from PIL import Image, ImageDraw +from gsuid_core.logger import logger +from gsuid_core.utils.error_reply import get_error +from gsuid_core.utils.image.convert import convert_img +from gsuid_core.utils.image.image_tools import ( + draw_pic_with_ring, + get_qq_avatar, +) + from .utils import get_icon, wrap_list from ..sruid_utils.api.mys.models import ( AvatarDetail, @@ -20,15 +29,6 @@ from ..utils.fonts.starrail_fonts import ( ) from ..utils.mys_api import mys_api -from PIL import Image, ImageDraw -from gsuid_core.logger import logger -from gsuid_core.utils.error_reply import get_error -from gsuid_core.utils.image.convert import convert_img -from gsuid_core.utils.image.image_tools import ( - draw_pic_with_ring, - get_qq_avatar, -) - TEXT_PATH = Path(__file__).parent / "texture2D" bg1 = Image.open(TEXT_PATH / "bg1.png") diff --git a/StarRailUID/starrailuid_roleinfo/utils.py b/StarRailUID/starrailuid_roleinfo/utils.py index 48629c3..e71c769 100644 --- a/StarRailUID/starrailuid_roleinfo/utils.py +++ b/StarRailUID/starrailuid_roleinfo/utils.py @@ -1,6 +1,6 @@ from io import BytesIO from pathlib import Path -from typing import List, TypeVar, Generator +from typing import Generator, List, TypeVar from PIL import Image from aiohttp import ClientSession diff --git a/StarRailUID/starrailuid_signin/__init__.py b/StarRailUID/starrailuid_signin/__init__.py index 4d481a8..991a887 100644 --- a/StarRailUID/starrailuid_signin/__init__.py +++ b/StarRailUID/starrailuid_signin/__init__.py @@ -1,7 +1,3 @@ -from ..starrailuid_config.sr_config import srconfig -from ..utils.error_reply import UID_HINT -from ..utils.sr_prefix import PREFIX - from gsuid_core.aps import scheduler from gsuid_core.bot import Bot from gsuid_core.logger import logger @@ -11,6 +7,10 @@ from gsuid_core.utils.boardcast.send_msg import send_board_cast_msg from gsuid_core.utils.database.models import GsBind from gsuid_core.utils.sign.sign import daily_sign, sign_in +from ..starrailuid_config.sr_config import srconfig +from ..utils.error_reply import UID_HINT +from ..utils.sr_prefix import PREFIX + SIGN_TIME = srconfig.get_config("SignTime").data IS_REPORT = srconfig.get_config("PrivateSignReport").data diff --git a/StarRailUID/starrailuid_stamina/__init__.py b/StarRailUID/starrailuid_stamina/__init__.py index 97c0863..020783c 100644 --- a/StarRailUID/starrailuid_stamina/__init__.py +++ b/StarRailUID/starrailuid_stamina/__init__.py @@ -1,11 +1,5 @@ import asyncio -from .draw_stamina_card import get_stamina_img -from .notice import get_notice_list -from .stamina_text import get_stamina_text -from ..utils.error_reply import UID_HINT -from ..utils.sr_prefix import PREFIX - from gsuid_core.aps import scheduler from gsuid_core.bot import Bot from gsuid_core.gss import gss @@ -16,6 +10,12 @@ from gsuid_core.sv import SV from gsuid_core.utils.database.api import get_uid from gsuid_core.utils.database.models import GsBind +from .draw_stamina_card import get_stamina_img +from .notice import get_notice_list +from .stamina_text import get_stamina_text +from ..utils.error_reply import UID_HINT +from ..utils.sr_prefix import PREFIX + sv_get_stamina = SV("sr查询体力") sv_get_stamina_admin = SV("sr强制推送", pm=1) diff --git a/StarRailUID/starrailuid_user/__init__.py b/StarRailUID/starrailuid_user/__init__.py index 914782d..17edc01 100644 --- a/StarRailUID/starrailuid_user/__init__.py +++ b/StarRailUID/starrailuid_user/__init__.py @@ -3,9 +3,9 @@ from gsuid_core.models import Event from gsuid_core.sv import SV from gsuid_core.utils.database.models import GsBind +from .draw_user_card import get_user_card from ..utils.message import send_diff_msg from ..utils.sr_prefix import PREFIX -from .draw_user_card import get_user_card sv_user_config = SV("sr用户管理", pm=2) sv_user_info = SV("sr用户信息") diff --git a/StarRailUID/starrailuid_wiki/__init__.py b/StarRailUID/starrailuid_wiki/__init__.py index 3dcb0b2..fd2c1a3 100644 --- a/StarRailUID/starrailuid_wiki/__init__.py +++ b/StarRailUID/starrailuid_wiki/__init__.py @@ -1,23 +1,23 @@ import re -from gsuid_core.sv import SV from gsuid_core.bot import Bot from gsuid_core.models import Event +from gsuid_core.sv import SV from gsuid_core.utils.image.convert import convert_img from ..utils.map.name_covert import ( - name_to_avatar_id, - name_to_weapon_id, alias_to_char_name, + name_to_avatar_id, name_to_relic_set_id, + name_to_weapon_id, ) from ..utils.resource.RESOURCE_PATH import ( - WIKI_ROLE_PATH, - WIKI_RELIC_PATH, GUIDE_CHARACTER_PATH, - WIKI_LIGHT_CONE_PATH, GUIDE_LIGHT_CONE_PATH, + WIKI_LIGHT_CONE_PATH, WIKI_MATERIAL_FOR_ROLE, + WIKI_RELIC_PATH, + WIKI_ROLE_PATH, ) sv_sr_wiki = SV("星铁WIKI") diff --git a/StarRailUID/utils/api.py b/StarRailUID/utils/api.py deleted file mode 100644 index 4ef09e1..0000000 --- a/StarRailUID/utils/api.py +++ /dev/null @@ -1,10 +0,0 @@ -from gsuid_core.utils.database.api import DBSqla - - -class SRDBSqla(DBSqla): - def __init__(self) -> None: - super().__init__(is_sr=True) - - -# srdbsqla = SRDBSqla() -# get_sqla = srdbsqla.get_sqla diff --git a/StarRailUID/utils/excel/model.py b/StarRailUID/utils/excel/model.py index df84b85..e483db1 100644 --- a/StarRailUID/utils/excel/model.py +++ b/StarRailUID/utils/excel/model.py @@ -1,4 +1,6 @@ -from typing import Dict, List, Union +from typing import List, Union + +from msgspec import Struct, convert from .read_excel import ( AvatarPromotion, @@ -7,8 +9,6 @@ from .read_excel import ( RelicSubAffix, ) -from msgspec import Struct, convert - class PromotionCost(Struct): ItemID: int @@ -71,22 +71,6 @@ class SingleRelicSubAffix(Struct): StepNum: int -# class AvatarPromotionConfigModel(Struct): -# Avatar: List[Dict[str, SingleAvatarPromotion]] - - -# class EquipmentPromotionConfigModel(Struct): -# Equipment: List[Dict[str, SingleEquipmentPromotion]] - - -# class RelicMainAffixConfigModel(Struct): -# Relic: List[Dict[str, SingleRelicMainAffix]] - - -# class RelicSubAffixConfigModel(Struct): -# Relic: Dict[str, Dict[str, SingleRelicSubAffix]] - - AvatarPromotionConfig = convert(AvatarPromotion, List[SingleAvatarPromotion]) EquipmentPromotionConfig = convert(EquipmentPromotion, List[SingleEquipmentPromotion]) RelicMainAffixConfig = convert(RelicMainAffix, List[SingleRelicMainAffix]) diff --git a/StarRailUID/utils/image/image_tools.py b/StarRailUID/utils/image/image_tools.py index d3df96e..ae0fcf7 100644 --- a/StarRailUID/utils/image/image_tools.py +++ b/StarRailUID/utils/image/image_tools.py @@ -1,5 +1,5 @@ from pathlib import Path -from typing import Union, Optional +from typing import Optional, Union from PIL import Image from gsuid_core.utils.image.image_tools import TEXT_PATH, CustomizeImage diff --git a/StarRailUID/utils/map/SR_MAP_PATH.py b/StarRailUID/utils/map/SR_MAP_PATH.py index 7b299fd..95d948f 100644 --- a/StarRailUID/utils/map/SR_MAP_PATH.py +++ b/StarRailUID/utils/map/SR_MAP_PATH.py @@ -1,11 +1,10 @@ -import json from pathlib import Path -from typing import Dict, List, Optional, TypedDict, Union +from typing import Dict, List, TypedDict, Union + +from msgspec import Struct, json as msgjson from ...version import StarRail_version -from msgspec import Struct, convert, json as msgjson - class RelicSetStatusAdd(Struct): Property: str diff --git a/StarRailUID/utils/map/name_covert.py b/StarRailUID/utils/map/name_covert.py index 713210f..fdf5918 100644 --- a/StarRailUID/utils/map/name_covert.py +++ b/StarRailUID/utils/map/name_covert.py @@ -1,7 +1,7 @@ from .SR_MAP_PATH import ( - SetId2Name, - EquipmentID2Name, EquipmentID2EnName, + EquipmentID2Name, + SetId2Name, alias_data, avatarId2Name, avatarId2Rarity, diff --git a/StarRailUID/utils/resource/RESOURCE_PATH.py b/StarRailUID/utils/resource/RESOURCE_PATH.py index 97a90fd..22bf252 100644 --- a/StarRailUID/utils/resource/RESOURCE_PATH.py +++ b/StarRailUID/utils/resource/RESOURCE_PATH.py @@ -1,5 +1,5 @@ -import sys from pathlib import Path +import sys from gsuid_core.data_store import get_res_path diff --git a/StarRailUID/utils/resource/download_from_cos.py b/StarRailUID/utils/resource/download_from_cos.py index 894e491..f9d35eb 100644 --- a/StarRailUID/utils/resource/download_from_cos.py +++ b/StarRailUID/utils/resource/download_from_cos.py @@ -1,3 +1,5 @@ +from gsuid_core.utils.download_resource.download_core import download_all_file + from .RESOURCE_PATH import ( CHAR_ICON_PATH, CHAR_PORTRAIT_PATH, @@ -15,8 +17,6 @@ from .RESOURCE_PATH import ( WIKI_ROLE_PATH, ) -from gsuid_core.utils.download_resource.download_core import download_all_file - async def check_use(): await download_all_file( diff --git a/pyproject.toml b/pyproject.toml index cdb38d4..7382031 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,6 +93,14 @@ extra-standard-library = ["typing_extensions"] combine-as-imports = true order-by-type = true relative-imports-order = "closest-to-furthest" +section-order = [ + "future", + "standard-library", + "first-party", + "third-party", + "local-folder", +] + [tool.pdm] [tool.pdm.build]