фиксит код по правилам из flake8-type-checking

This commit is contained in:
Maxim Slipenko 2024-08-22 12:00:45 +03:00
parent cc7c97e962
commit 9ca5264c6d
No known key found for this signature in database
GPG Key ID: 6DEA9FA7DE98C7D6
12 changed files with 57 additions and 38 deletions

View File

@ -1,8 +1,6 @@
import asyncio import asyncio
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from .config_manager import ConfigManager
try: try:
import dash_bootstrap_components as dbc import dash_bootstrap_components as dbc
import flask import flask
@ -17,6 +15,8 @@ from karkas_core.modules_system.public_api import get_module
if TYPE_CHECKING: if TYPE_CHECKING:
from karkas_blocks.standard.roles import Roles as IRoles from karkas_blocks.standard.roles import Roles as IRoles
from .config_manager import ConfigManager
def create_control(key: str, config: ConfigManager): def create_control(key: str, config: ConfigManager):
value = config.get(key) value = config.get(key)

View File

@ -1,13 +1,14 @@
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from aiogram import Bot
from aiogram.filters import BaseFilter from aiogram.filters import BaseFilter
from aiogram.types import Message
from typing_extensions import deprecated from typing_extensions import deprecated
from karkas_core.modules_system.public_api import get_module from karkas_core.modules_system.public_api import get_module
if TYPE_CHECKING: if TYPE_CHECKING:
from aiogram import Bot
from aiogram.types import Message
from karkas_blocks.standard.config import IConfig from karkas_blocks.standard.config import IConfig
from karkas_blocks.standard.roles import Roles as IRoles from karkas_blocks.standard.roles import Roles as IRoles

View File

@ -3,7 +3,6 @@ from typing import TYPE_CHECKING
from aiogram import Router from aiogram import Router
from aiogram.filters import Command from aiogram.filters import Command
from aiogram.types import Message
from karkas_core.modules_system.public_api import ( from karkas_core.modules_system.public_api import (
get_metainfo, get_metainfo,
@ -12,6 +11,8 @@ from karkas_core.modules_system.public_api import (
) )
if TYPE_CHECKING: if TYPE_CHECKING:
from aiogram.types import Message
from karkas_blocks.standard.config import IConfig from karkas_blocks.standard.config import IConfig
config: "IConfig" = get_module("standard.config", "config") config: "IConfig" = get_module("standard.config", "config")

View File

@ -7,7 +7,6 @@ from aiogram import Bot, Router, types
from aiogram.enums import ChatMemberStatus, ParseMode from aiogram.enums import ChatMemberStatus, ParseMode
from aiogram.exceptions import TelegramBadRequest from aiogram.exceptions import TelegramBadRequest
from aiogram.filters import JOIN_TRANSITION, LEAVE_TRANSITION, ChatMemberUpdatedFilter from aiogram.filters import JOIN_TRANSITION, LEAVE_TRANSITION, ChatMemberUpdatedFilter
from aiogram.types import ChatMemberUpdated, PollAnswer
from karkas_core.modules_system.public_api import get_module, log, register_router from karkas_core.modules_system.public_api import get_module, log, register_router
@ -22,6 +21,8 @@ from .verifications_methods.simple import (
from .verifications_methods.utils import user_mention from .verifications_methods.utils import user_mention
if TYPE_CHECKING: if TYPE_CHECKING:
from aiogram.types import ChatMemberUpdated, PollAnswer
from karkas_blocks.standard.config import IConfig from karkas_blocks.standard.config import IConfig
from karkas_blocks.standard.filters import ChatIDFilter as IChatIDFilter from karkas_blocks.standard.filters import ChatIDFilter as IChatIDFilter

View File

@ -1,15 +1,18 @@
import asyncio import asyncio
from functools import wraps from functools import wraps
from typing import TYPE_CHECKING
from aiogram import Bot
from aiogram.exceptions import TelegramBadRequest from aiogram.exceptions import TelegramBadRequest
from aiogram.filters.callback_data import CallbackData from aiogram.filters.callback_data import CallbackData
from aiogram.types import ChatMemberUpdated
from karkas_core.modules_system.public_api import log from karkas_core.modules_system.public_api import log
from .utils import mute_user, unmute_user from .utils import mute_user, unmute_user
if TYPE_CHECKING:
from aiogram import Bot
from aiogram.types import ChatMemberUpdated
class BaseTask: class BaseTask:
def __init__( def __init__(

View File

@ -1,13 +1,17 @@
from string import Template from string import Template
from typing import TYPE_CHECKING
from aiogram import Bot
from aiogram.enums import ParseMode, PollType from aiogram.enums import ParseMode, PollType
from aiogram.types import ChatMemberUpdated, InlineKeyboardButton, InlineKeyboardMarkup from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
from ..utils import get_plural_form, key_from_poll, key_from_user_chat from ..utils import get_plural_form, key_from_poll, key_from_user_chat
from .base import BaseTask, VerificationCallback, mute_while_task from .base import BaseTask, VerificationCallback, mute_while_task
from .utils import user_mention from .utils import user_mention
if TYPE_CHECKING:
from aiogram import Bot
from aiogram.types import ChatMemberUpdated
class SimpleBaseTask(BaseTask): class SimpleBaseTask(BaseTask):
pass pass

View File

@ -1,9 +1,12 @@
import time import time
from typing import TYPE_CHECKING
from aiogram import Bot
from aiogram.enums import ParseMode from aiogram.enums import ParseMode
from aiogram.types import ChatPermissions, User from aiogram.types import ChatPermissions, User
if TYPE_CHECKING:
from aiogram import Bot
def user_mention(user: User, mode=ParseMode.HTML): def user_mention(user: User, mode=ParseMode.HTML):
if mode == ParseMode.HTML: if mode == ParseMode.HTML:

View File

@ -1,10 +1,14 @@
import importlib import importlib
import os import os
import traceback import traceback
from typing import TYPE_CHECKING
from aiogram import Bot, Dispatcher
from aiogram.types import Update from aiogram.types import Update
if TYPE_CHECKING:
from aiogram import Bot, Dispatcher
from fastapi import FastAPI, Request
def get_module_directory(module_name): def get_module_directory(module_name):
spec = importlib.util.find_spec(module_name) spec = importlib.util.find_spec(module_name)
@ -16,15 +20,10 @@ def get_module_directory(module_name):
return os.path.dirname(module_path) return os.path.dirname(module_path)
try: async def register_bot_webhook(app: FastAPI, bot: Bot, dp: Dispatcher):
from fastapi import FastAPI, Request
async def register_bot_webhook(app: FastAPI, bot: Bot, dp: Dispatcher):
async def handle_webhook(request: Request): async def handle_webhook(request: Request):
try: try:
update = Update.model_validate( update = Update.model_validate(await request.json(), context={"bot": bot})
await request.json(), context={"bot": bot}
)
await dp.feed_update(bot, update) await dp.feed_update(bot, update)
except Exception: except Exception:
traceback.print_exc() traceback.print_exc()
@ -33,6 +32,3 @@ try:
return {"ok": True} return {"ok": True}
app.post("/webhook")(handle_webhook) app.post("/webhook")(handle_webhook)
except ImportError:
pass

View File

@ -1,9 +1,11 @@
import types
from dataclasses import dataclass from dataclasses import dataclass
from typing import Dict, List, Optional, Union from typing import TYPE_CHECKING, Dict, List, Optional, Union
from dataclasses_json import dataclass_json from dataclasses_json import dataclass_json
if TYPE_CHECKING:
import types
@dataclass_json @dataclass_json
@dataclass @dataclass

View File

@ -1,8 +1,7 @@
import inspect import inspect
import types import types
from typing import Any, Tuple, Union from typing import TYPE_CHECKING, Any, Tuple, Union
from aiogram import BaseMiddleware, Router
from aiogram.fsm.context import FSMContext from aiogram.fsm.context import FSMContext
from aiogram.fsm.storage.base import StorageKey from aiogram.fsm.storage.base import StorageKey
@ -10,6 +9,9 @@ from aiogram.fsm.storage.base import StorageKey
from karkas_core.modules_system.loaders.base import DependencyInfo from karkas_core.modules_system.loaders.base import DependencyInfo
from karkas_core.singleton import Singleton from karkas_core.singleton import Singleton
if TYPE_CHECKING:
from aiogram import BaseMiddleware, Router
async def set_chat_menu_button(menu_button): async def set_chat_menu_button(menu_button):
app = Singleton() app = Singleton()

View File

@ -1,6 +1,5 @@
import types import types
from _ast import AnnAssign from typing import TYPE_CHECKING, Any
from typing import Any
from aiogram import Bot from aiogram import Bot
from RestrictedPython import ( from RestrictedPython import (
@ -20,6 +19,9 @@ from RestrictedPython.Guards import ( # guarded_setattr,; full_write_guard,
from karkas_core.logger import log from karkas_core.logger import log
from karkas_core.modules_system.safe.zope_guards import extra_safe_builtins from karkas_core.modules_system.safe.zope_guards import extra_safe_builtins
if TYPE_CHECKING:
from _ast import AnnAssign
class RestrictedPythonPolicy(RestrictingNodeTransformer): class RestrictedPythonPolicy(RestrictingNodeTransformer):
def visit_AsyncFunctionDef(self, node): def visit_AsyncFunctionDef(self, node):

View File

@ -1,7 +1,11 @@
from aiogram import Bot, Dispatcher from typing import TYPE_CHECKING
from aiogram.fsm.storage.memory import MemoryStorage from aiogram.fsm.storage.memory import MemoryStorage
from karkas_core.modules_system import ModulesManager if TYPE_CHECKING:
from aiogram import Bot, Dispatcher
from karkas_core.modules_system import ModulesManager
class SingletonMeta(type): class SingletonMeta(type):