From 2540a553039c0d36b934159aefdbae6f1be0925a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:08:31 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20`pre-commit-ci`=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sruid_utils/api/hakush/requests.py | 4 +-- StarRailUID/starrailuid_charinfo/to_data.py | 26 +++++++------- StarRailUID/starrailuid_resource/__init__.py | 8 ++--- StarRailUID/starrailuid_wiki/__init__.py | 16 ++++----- StarRailUID/utils/map/name_covert.py | 4 +-- .../utils/resource/download_from_cos.py | 34 +++++++++---------- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/StarRailUID/sruid_utils/api/hakush/requests.py b/StarRailUID/sruid_utils/api/hakush/requests.py index a7061e5..43b8ea7 100644 --- a/StarRailUID/sruid_utils/api/hakush/requests.py +++ b/StarRailUID/sruid_utils/api/hakush/requests.py @@ -1,13 +1,13 @@ from typing import Dict, Union -from httpx import AsyncClient from msgspec import convert +from httpx import AsyncClient from ..utils import _HEADER from .model import ( HakushHsrCharacter, - HakushHsrCharacterIndex, HakushHsrLightcone, + HakushHsrCharacterIndex, HakushHsrLightconeIndex, ) diff --git a/StarRailUID/starrailuid_charinfo/to_data.py b/StarRailUID/starrailuid_charinfo/to_data.py index c3980d3..c5755c9 100644 --- a/StarRailUID/starrailuid_charinfo/to_data.py +++ b/StarRailUID/starrailuid_charinfo/to_data.py @@ -1,35 +1,35 @@ import json from pathlib import Path -from typing import Dict, List, Optional, Union +from typing import Dict, List, Union, Optional from httpx import ReadTimeout from msgspec import json as msgjson +from ..utils.error_reply import UID_HINT from ..sruid_utils.api.mihomo import MihomoData from ..sruid_utils.api.mihomo.models import Avatar +from ..utils.resource.RESOURCE_PATH import PLAYER_PATH from ..sruid_utils.api.mihomo.requests import get_char_card_info -from ..utils.error_reply import UID_HINT +from .cal_value import cal_relic_sub_affix, cal_relic_main_affix from ..utils.excel.model import AvatarPromotionConfig, EquipmentPromotionConfig from ..utils.map.SR_MAP_PATH import ( - AvatarRankSkillUp, - EquipmentID2Name, - EquipmentID2Rarity, + SetId2Name, ItemId2Name, Property2Name, RelicId2SetId, - SetId2Name, - avatarId2DamageType, - avatarId2EnName, + EquipmentID2Name, + AvatarRankSkillUp, + EquipmentID2Rarity, + rankId2Name, + skillId2Name, avatarId2Name, + skillId2Effect, + avatarId2EnName, avatarId2Rarity, characterSkillTree, - rankId2Name, skillId2AttackType, - skillId2Effect, - skillId2Name, + avatarId2DamageType, ) -from ..utils.resource.RESOURCE_PATH import PLAYER_PATH -from .cal_value import cal_relic_main_affix, cal_relic_sub_affix async def api_to_dict( diff --git a/StarRailUID/starrailuid_resource/__init__.py b/StarRailUID/starrailuid_resource/__init__.py index 971433e..7ebeeea 100644 --- a/StarRailUID/starrailuid_resource/__init__.py +++ b/StarRailUID/starrailuid_resource/__init__.py @@ -1,10 +1,10 @@ -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.bot import Bot +from gsuid_core.models import Event +from gsuid_core.logger import logger -from ..utils.resource.download_from_cos import check_use from ..utils.sr_prefix import PREFIX +from ..utils.resource.download_from_cos import check_use sv_sr_download_config = SV('sr下载资源', pm=1) diff --git a/StarRailUID/starrailuid_wiki/__init__.py b/StarRailUID/starrailuid_wiki/__init__.py index 8ea9476..dccc812 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 ( - alias_to_char_name, name_to_avatar_id, - name_to_relic_set_id, name_to_weapon_id, + alias_to_char_name, + name_to_relic_set_id, ) from ..utils.resource.RESOURCE_PATH import ( - GUIDE_CHARACTER_PATH, - GUIDE_LIGHT_CONE_PATH, - WIKI_LIGHT_CONE_PATH, - WIKI_MATERIAL_FOR_ROLE, - WIKI_RELIC_PATH, WIKI_ROLE_PATH, + WIKI_RELIC_PATH, + GUIDE_CHARACTER_PATH, + WIKI_LIGHT_CONE_PATH, + GUIDE_LIGHT_CONE_PATH, + WIKI_MATERIAL_FOR_ROLE, ) sv_sr_wiki = SV('星铁WIKI') diff --git a/StarRailUID/utils/map/name_covert.py b/StarRailUID/utils/map/name_covert.py index cbcb9d6..87cdf05 100644 --- a/StarRailUID/utils/map/name_covert.py +++ b/StarRailUID/utils/map/name_covert.py @@ -1,7 +1,7 @@ from .SR_MAP_PATH import ( - EquipmentID2EnName, - EquipmentID2Name, SetId2Name, + EquipmentID2Name, + EquipmentID2EnName, alias_data, avatarId2Name, avatarId2Rarity, diff --git a/StarRailUID/utils/resource/download_from_cos.py b/StarRailUID/utils/resource/download_from_cos.py index 01bc245..15e7b19 100644 --- a/StarRailUID/utils/resource/download_from_cos.py +++ b/StarRailUID/utils/resource/download_from_cos.py @@ -2,33 +2,33 @@ import asyncio from pathlib import Path from typing import Dict, List, Tuple, Union -from aiohttp import ClientTimeout, TCPConnector -from aiohttp.client import ClientSession from bs4 import BeautifulSoup -from gsuid_core.logger import logger -from gsuid_core.utils.download_resource.download_core import check_url -from gsuid_core.utils.download_resource.download_file import download from msgspec import json as msgjson +from gsuid_core.logger import logger +from aiohttp.client import ClientSession +from aiohttp import TCPConnector, ClientTimeout +from gsuid_core.utils.download_resource.download_file import download +from gsuid_core.utils.download_resource.download_core import check_url from .download_url import download_file from .RESOURCE_PATH import ( - CHAR_ICON_PATH, - CHAR_PORTRAIT_PATH, - CHAR_PREVIEW_PATH, - CONSUMABLE_PATH, - ELEMENT_PATH, - GUIDE_CHARACTER_PATH, - GUIDE_LIGHT_CONE_PATH, + WIKI_PATH, GUIDE_PATH, RELIC_PATH, - RESOURCE_PATH, SKILL_PATH, WEAPON_PATH, - WIKI_LIGHT_CONE_PATH, - WIKI_MATERIAL_FOR_ROLE, - WIKI_PATH, - WIKI_RELIC_PATH, + ELEMENT_PATH, + RESOURCE_PATH, + CHAR_ICON_PATH, WIKI_ROLE_PATH, + CONSUMABLE_PATH, + WIKI_RELIC_PATH, + CHAR_PREVIEW_PATH, + CHAR_PORTRAIT_PATH, + GUIDE_CHARACTER_PATH, + WIKI_LIGHT_CONE_PATH, + GUIDE_LIGHT_CONE_PATH, + WIKI_MATERIAL_FOR_ROLE, ) with Path.open(