public/basethon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
trojvn
2025-05-18 13:30:24 +03:00
parent 818f5f5f10
commit 50b0c16048
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
basethon/__init__.py
View File

@ -3,7 +3,7 @@ from .base_session import BaseSession
from .base_thon import BaseData, BaseThon from .base_thon import BaseData, BaseThon
from .json_async_converter import JsonAsyncConverter from .json_async_converter import JsonAsyncConverter
from .json_converter import JsonConverter from .json_converter import JsonConverter
from .models import BaseThonOptions, BaseThonSearchCodeOptions from .models import ThonOptions, ThonSearchCodeOptions
__all__ = [ __all__ = [
"BaseThon", "BaseThon",
@ -12,6 +12,6 @@ __all__ = [
"BaseData", "BaseData",
"JsonAsyncConverter", "JsonAsyncConverter",
"AsyncBaseSession", "AsyncBaseSession",
"BaseThonOptions", "ThonOptions",
"BaseThonSearchCodeOptions", "ThonSearchCodeOptions",
] ]

7
basethon/base_thon.py
View File

@ -13,7 +13,7 @@ from telethon.tl.functions.help import GetCountriesListRequest, GetNearestDcRequ
from telethon.tl.functions.langpack import GetLangPackRequest from telethon.tl.functions.langpack import GetLangPackRequest
from telethon.types import JsonNumber, JsonObject, JsonObjectValue, JsonString from telethon.types import JsonNumber, JsonObject, JsonObjectValue, JsonString
from basethon.models import BaseThonOptions, BaseThonSearchCodeOptions from basethon.models import ThonOptions, ThonSearchCodeOptions
from .constants import API_PACKS from .constants import API_PACKS
from .exceptions import ThonBannedError from .exceptions import ThonBannedError
@ -129,7 +129,7 @@ class BaseData:
class BaseThon(BaseData): class BaseThon(BaseData):
def __init__(self, options: BaseThonOptions): def __init__(self, options: ThonOptions):
self.__item = options.item self.__item = options.item
self.__retries = options.retries self.__retries = options.retries
self.__timeout = options.timeout self.__timeout = options.timeout
@ -207,7 +207,8 @@ class BaseThon(BaseData):
self._logger.exception(e) self._logger.exception(e)
return f"ERROR_AUTH:{e}" return f"ERROR_AUTH:{e}"
async def search_code(self, options: BaseThonSearchCodeOptions) -> str: async def search_code(self, options: ThonSearchCodeOptions | None = None) -> str:
options = options or ThonSearchCodeOptions()
future = datetime.now() + timedelta(seconds=options.wait_time) future = datetime.now() + timedelta(seconds=options.wait_time)
while future > datetime.now(): while future > datetime.now():
async for message in self.client.iter_messages( async for message in self.client.iter_messages(

4
basethon/models/__init__.py
View File

@ -3,7 +3,7 @@ from pathlib import Path
@dataclass @dataclass
class BaseThonOptions: class ThonOptions:
item: Path | None item: Path | None
json_data: dict json_data: dict
retries: int = 10 retries: int = 10
@ -12,7 +12,7 @@ class BaseThonOptions:
@dataclass @dataclass
class BaseThonSearchCodeOptions: class ThonSearchCodeOptions:
limit: int = 1 limit: int = 1
date_delta: int = 60 date_delta: int = 60
wait_time: int = 300 wait_time: int = 300