Skip to content

Commit cff99ab

Browse files
committed
🎨 format
1 parent 57d67e5 commit cff99ab

File tree

6 files changed

+31
-39
lines changed

6 files changed

+31
-39
lines changed

Diff for: arclet/entari/builtins/auto_reload.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ async def watch(self):
4646
if plugin := load_plugin(pid):
4747
logger("INFO", f"Reloaded {plugin.id}")
4848
else:
49-
logger("ERROR",f"Failed to reload {pid}")
49+
logger("ERROR", f"Failed to reload {pid}")
5050

5151
async def launch(self, manager: Launart):
5252
async with self.stage("blocking"):

Diff for: arclet/entari/core.py

+7-15
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
from .config import Config as EntariConfig
2020
from .event.protocol import MessageCreatedEvent, event_parse
2121
from .event.send import SendResponse
22+
from .logger import log
2223
from .plugin import load_plugin
2324
from .plugin.service import plugin_service
24-
from .session import Session, EntariProtocol
25-
from .logger import log
25+
from .session import EntariProtocol, Session
2626

2727

2828
class ApiProtocolProvider(Provider[ApiProtocol]):
@@ -71,13 +71,9 @@ def from_config(cls, config: EntariConfig | None = None):
7171
configs.append(WebhookInfo(**{k: v for k, v in conf.items() if k != "type"}))
7272
return cls(*configs, log_level=log_level, ignore_self_message=ignore_self_message)
7373

74-
def __init__(
75-
self,
76-
*configs: Config,
77-
log_level: str | int = "INFO",
78-
ignore_self_message: bool = True
79-
):
74+
def __init__(self, *configs: Config, log_level: str | int = "INFO", ignore_self_message: bool = True):
8075
from . import __version__
76+
8177
log.core.opt(colors=True).info(f"Entari <b><c>version {__version__}</c></b>")
8278
super().__init__(*configs, default_api_cls=EntariProtocol)
8379
if not hasattr(EntariConfig, "instance"):
@@ -102,13 +98,9 @@ def log_msg(event: MessageCreatedEvent):
10298
@es.use(SendResponse.__disp_name__)
10399
async def log_send(event: SendResponse):
104100
if event.session:
105-
log.message.info(
106-
f"[{event.session.channel.name or event.session.channel.id}] <- {event.message!r}"
107-
)
101+
log.message.info(f"[{event.session.channel.name or event.session.channel.id}] <- {event.message!r}")
108102
else:
109-
log.message.info(
110-
f"[{event.channel}] <- {event.message!r}"
111-
)
103+
log.message.info(f"[{event.channel}] <- {event.message!r}")
112104

113105
def on(
114106
self,
@@ -182,7 +174,7 @@ def __init__(self, origin: type[Service]):
182174
def validate(self, param: Param):
183175
anno = get_origin(param.annotation)
184176
return isinstance(anno, type) and issubclass(anno, self.origin)
185-
177+
186178
async def __call__(self, context: Contexts):
187179
return it(Launart).get_component(self.origin)
188180

Diff for: arclet/entari/event/send.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from dataclasses import dataclass
22
from typing import TYPE_CHECKING, Union
33

4-
from arclet.letoderea import es, provide, Contexts
5-
from satori.model import MessageReceipt
4+
from arclet.letoderea import Contexts, es, provide
65
from satori.client import Account
6+
from satori.model import MessageReceipt
77

88
from ..message import MessageChain
99
from .base import BasedEvent
@@ -55,4 +55,4 @@ async def gather(self, context: Contexts):
5555

5656
send_pub = es.define(SendResponse.__disp_name__, SendResponse)
5757
send_pub.bind(provide(MessageChain, target="message"))
58-
send_pub.bind(provide(list, target="result"))
58+
send_pub.bind(provide(list, target="result"))

Diff for: arclet/entari/logger.py

+10-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
from __future__ import annotations
2+
13
import inspect
24
import logging
35
import sys
4-
from typing import Union, TYPE_CHECKING, Optional
6+
from typing import TYPE_CHECKING
57

68
from loguru import logger
79

@@ -11,7 +13,7 @@
1113

1214
class LoggerManager:
1315
def __init__(self):
14-
self.loggers: dict[str, "Logger"] = {}
16+
self.loggers: dict[str, Logger] = {}
1517
self.fork("[core]")
1618
self.fork("[plugin]")
1719
self.fork("[message]")
@@ -39,15 +41,13 @@ def wrapper(self, name: str, color: str = "blue"):
3941
patched = patched.bind(name=f"plugins.{name}")
4042
self.loggers[f"plugin.{name}"] = patched
4143

42-
def _log(level: str, message: str, exception: Optional[Exception] = None):
43-
patched.opt(colors=True, exception=exception).log(
44-
level, f"| <{color}>{name}</{color}> {message}"
45-
)
44+
def _log(level: str, message: str, exception: Exception | None = None):
45+
patched.opt(colors=True, exception=exception).log(level, f"| <{color}>{name}</{color}> {message}")
4646

4747
return _log
4848

4949
@staticmethod
50-
def set_level(level: Union[str, int]):
50+
def set_level(level: str | int):
5151
if isinstance(level, str):
5252
level = level.upper()
5353
logging.basicConfig(
@@ -68,15 +68,11 @@ def emit(self, record: logging.LogRecord):
6868
level = record.levelno
6969

7070
frame, depth = inspect.currentframe(), 0
71-
while frame and (
72-
depth == 0 or frame.f_code.co_filename == logging.__file__
73-
):
71+
while frame and (depth == 0 or frame.f_code.co_filename == logging.__file__):
7472
frame = frame.f_back
7573
depth += 1
7674

77-
logger.opt(depth=depth, exception=record.exc_info).log(
78-
level, record.getMessage()
79-
)
75+
logger.opt(depth=depth, exception=record.exc_info).log(level, record.getMessage())
8076

8177

8278
logging.basicConfig(
@@ -88,9 +84,7 @@ def emit(self, record: logging.LogRecord):
8884

8985
def default_filter(record):
9086
log_level = record["extra"].get("entari_log_level", "INFO")
91-
levelno = (
92-
logger.level(log_level).no if isinstance(log_level, str) else log_level
93-
)
87+
levelno = logger.level(log_level).no if isinstance(log_level, str) else log_level
9488
return record["level"].no >= levelno
9589

9690

Diff for: arclet/entari/plugin/__init__.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ def load_plugin(path: str, config: dict | None = None, recursive_guard: set[str]
5858
if referent in recursive_guard:
5959
continue
6060
if referent in plugin_service.plugins:
61-
log.plugin.opt(colors=True).debug(f"reloading <y>{mod.__name__}</y>'s referent <y>{referent!r}</y>")
61+
log.plugin.opt(colors=True).debug(
62+
f"reloading <y>{mod.__name__}</y>'s referent <y>{referent!r}</y>"
63+
)
6264
dispose(referent)
6365
if not load_plugin(referent):
6466
plugin_service._referents[mod.__name__].add(referent)
@@ -69,7 +71,9 @@ def load_plugin(path: str, config: dict | None = None, recursive_guard: set[str]
6971
except RegisterNotInPluginError as e:
7072
log.plugin.opt(colors=True).error(f"{e.args[0]}")
7173
except Exception as e:
72-
log.plugin.opt(colors=True).exception(f"failed to load plugin <blue>{path!r}</blue> caused by {e!r}", exc_info=e)
74+
log.plugin.opt(colors=True).exception(
75+
f"failed to load plugin <blue>{path!r}</blue> caused by {e!r}", exc_info=e
76+
)
7377

7478

7579
def load_plugins(dir_: str | PathLike | Path):

Diff for: arclet/entari/session.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from arclet.letoderea import ParsingStop, StepOut, es
77
from satori.client.account import Account
88
from satori.client.protocol import ApiProtocol
9-
from satori.element import Element
109
from satori.const import Api
10+
from satori.element import Element
1111
from satori.model import Channel, Guild, Member, MessageReceipt, PageResult, Role, User
1212

1313
from .event.protocol import Event, FriendRequestEvent, GuildMemberRequestEvent, GuildRequestEvent, MessageEvent
@@ -52,7 +52,9 @@ async def send_private_message(
5252
channel = await self.user_channel_create(user_id=user_id)
5353
return await self.message_create(channel_id=channel.id, content=message, source=source)
5454

55-
async def message_create(self, channel_id: str, content: str | Iterable[str | Element], source: Event | None = None) -> list[MessageReceipt]:
55+
async def message_create(
56+
self, channel_id: str, content: str | Iterable[str | Element], source: Event | None = None
57+
) -> list[MessageReceipt]:
5658
"""发送消息。返回一个 `MessageReceipt` 对象构成的数组。
5759
5860
Args:

0 commit comments

Comments
 (0)