diff --git a/plugins/genshin/farming/_spider.py b/plugins/genshin/farming/_spider.py index 6f8f1664..ea8146b8 100644 --- a/plugins/genshin/farming/_spider.py +++ b/plugins/genshin/farming/_spider.py @@ -4,19 +4,13 @@ from abc import ABC, abstractmethod from collections import Counter from multiprocessing import RLock from ssl import SSLZeroReturnError -from typing import TypeVar, ParamSpec, final, Iterable +from typing import Iterable, ParamSpec, TypeVar, final from httpx import AsyncClient, HTTPError from core.dependence.assets import AssetsService from plugins.genshin.farming._const import AREAS, INTERVAL, RETRY_TIMES, WEEK_MAP -from plugins.genshin.farming._model import ( - FarmingData, - MaterialData, - AreaData, - AvatarData, - WeaponData, -) +from plugins.genshin.farming._model import (AreaData, AvatarData, FarmingData, MaterialData, WeaponData) from utils.log import logger __all__ = ("Spider",) diff --git a/plugins/genshin/farming/plugin.py b/plugins/genshin/farming/plugin.py index 397ca761..ca5d8443 100644 --- a/plugins/genshin/farming/plugin.py +++ b/plugins/genshin/farming/plugin.py @@ -2,7 +2,6 @@ import asyncio from asyncio import Lock from copy import deepcopy from datetime import datetime -from functools import partial from typing import ParamSpec, TYPE_CHECKING, TypeVar import aiofiles @@ -16,7 +15,7 @@ from core.dependence.assets import AssetsService from gram_core.plugin import Plugin, handler from gram_core.services.template.models import FileType, RenderGroupResult from gram_core.services.template.services import TemplateService -from plugins.genshin.farming._const import AREAS, INTERVAL +from plugins.genshin.farming._const import AREAS from plugins.genshin.farming._model import AreaData, AvatarData, FullFarmingData, RenderData, UserOwned, WeaponData from plugins.genshin.farming._spider import Spider from plugins.tools.genshin import CharacterDetails, CookiesNotFoundError, GenshinHelper, PlayerNotFoundError