Skip to content

Commit aa279f0

Browse files
committed
chore: ruff format .
1 parent e781c5e commit aa279f0

150 files changed

Lines changed: 1261 additions & 509 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

astrbot/builtin_stars/astrbot/long_term_memory.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ async def on_req_llm(self, event: AstrMessageEvent, req: ProviderRequest) -> Non
172172
req.system_prompt += chats_str
173173

174174
async def after_req_llm(
175-
self, event: AstrMessageEvent, llm_resp: LLMResponse,
175+
self,
176+
event: AstrMessageEvent,
177+
llm_resp: LLMResponse,
176178
) -> None:
177179
if event.unified_msg_origin not in self.session_chats:
178180
return

astrbot/builtin_stars/astrbot/main.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ async def on_message(self, event: AstrMessageEvent):
8686

8787
@filter.on_llm_request()
8888
async def decorate_llm_req(
89-
self, event: AstrMessageEvent, req: ProviderRequest,
89+
self,
90+
event: AstrMessageEvent,
91+
req: ProviderRequest,
9092
) -> None:
9193
"""在请求 LLM 前注入人格信息、Identifier、时间、回复内容等 System Prompt"""
9294
if self.ltm and self.ltm_enabled(event):
@@ -97,7 +99,9 @@ async def decorate_llm_req(
9799

98100
@filter.on_llm_response()
99101
async def record_llm_resp_to_ltm(
100-
self, event: AstrMessageEvent, resp: LLMResponse,
102+
self,
103+
event: AstrMessageEvent,
104+
resp: LLMResponse,
101105
) -> None:
102106
"""在 LLM 响应后记录对话"""
103107
if self.ltm and self.ltm_enabled(event):

astrbot/builtin_stars/builtin_commands/commands/help.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ async def _query_astrbot_notice(self):
2323
return ""
2424

2525
async def _build_reserved_command_lines(self) -> list[str]:
26-
"""使用实时指令配置生成内置指令清单,确保重命名/禁用后与实际生效状态保持一致。
27-
"""
26+
"""使用实时指令配置生成内置指令清单,确保重命名/禁用后与实际生效状态保持一致。"""
2827
try:
2928
commands = await command_management.list_commands()
3029
except BaseException:

astrbot/builtin_stars/builtin_commands/commands/provider.py

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ def get(self, provider_id: str, umo: str | None, ttl: float) -> list[str] | None
4848
return models
4949

5050
def set(
51-
self, provider_id: str, umo: str | None, models: list[str], ttl: float,
51+
self,
52+
provider_id: str,
53+
umo: str | None,
54+
models: list[str],
55+
ttl: float,
5256
) -> None:
5357
if ttl <= 0:
5458
return
@@ -67,7 +71,10 @@ def _evict_if_needed(self) -> None:
6771
self._store.pop(key, None)
6872

6973
def invalidate(
70-
self, provider_id: str | None = None, *, umo: str | None = None,
74+
self,
75+
provider_id: str | None = None,
76+
*,
77+
umo: str | None = None,
7178
) -> None:
7279
if provider_id is None:
7380
self._store.clear()
@@ -106,7 +113,10 @@ def _register_provider_change_hook(self) -> None:
106113
register_change_hook(self._on_provider_manager_changed)
107114

108115
def invalidate_provider_models_cache(
109-
self, provider_id: str | None = None, *, umo: str | None = None,
116+
self,
117+
provider_id: str | None = None,
118+
*,
119+
umo: str | None = None,
110120
) -> None:
111121
"""Public hook for cache invalidation on external provider config changes."""
112122
self._model_cache.invalidate(provider_id, umo=umo)
@@ -205,7 +215,11 @@ def _resolve_model_name(
205215
return None
206216

207217
def _apply_model(
208-
self, prov: Provider, model_name: str, *, umo: str | None = None,
218+
self,
219+
prov: Provider,
220+
model_name: str,
221+
*,
222+
umo: str | None = None,
209223
) -> str:
210224
prov.set_model(model_name)
211225
self.invalidate_provider_models_cache(prov.meta().id, umo=umo)
@@ -287,7 +301,10 @@ async def _test_provider_capability(self, provider):
287301
err_code = "TEST_FAILED"
288302
err_reason = safe_error("", e)
289303
self._log_reachability_failure(
290-
provider, provider_capability_type, err_code, err_reason,
304+
provider,
305+
provider_capability_type,
306+
err_code,
307+
err_reason,
291308
)
292309
return False, err_code, err_reason
293310

@@ -558,7 +575,10 @@ async def provider(
558575
event.set_result(MessageEventResult().message("无效的参数。"))
559576

560577
async def _switch_model_by_name(
561-
self, message: AstrMessageEvent, model_name: str, prov: Provider,
578+
self,
579+
message: AstrMessageEvent,
580+
model_name: str,
581+
prov: Provider,
562582
) -> None:
563583
model_name = model_name.strip()
564584
if not model_name:

astrbot/builtin_stars/builtin_commands/main.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ async def groupnew_conv(self, message: AstrMessageEvent, sid: str) -> None:
170170

171171
@filter.command("switch")
172172
async def switch_conv(
173-
self, message: AstrMessageEvent, index: int | None = None,
173+
self,
174+
message: AstrMessageEvent,
175+
index: int | None = None,
174176
) -> None:
175177
"""通过 /ls 前面的序号切换对话"""
176178
await self.conversation_c.switch_conv(message, index)

astrbot/cli/commands/cmd_plug.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ def remove(name: str) -> None:
180180
plugin_path = plugin["local_path"]
181181

182182
click.confirm(
183-
f"Are you sure you want to uninstall plugin {name}?", default=False, abort=True,
183+
f"Are you sure you want to uninstall plugin {name}?",
184+
default=False,
185+
abort=True,
184186
)
185187

186188
try:

astrbot/cli/utils/version_comparator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ def split_version(version):
6262
return -1
6363
if isinstance(p1, str) and isinstance(p2, int):
6464
return 1
65-
if (isinstance(p1, int) and isinstance(p2, int)) or (isinstance(p1, str) and isinstance(p2, str)):
65+
if (isinstance(p1, int) and isinstance(p2, int)) or (
66+
isinstance(p1, str) and isinstance(p2, str)
67+
):
6668
if p1 > p2:
6769
return 1
6870
if p1 < p2:

astrbot/core/agent/context/compressor.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ class ContextCompressor(Protocol):
2525
"""
2626

2727
def should_compress(
28-
self, messages: list[Message], current_tokens: int, max_tokens: int,
28+
self,
29+
messages: list[Message],
30+
current_tokens: int,
31+
max_tokens: int,
2932
) -> bool:
3033
"""Check if compression is needed.
3134
@@ -59,7 +62,9 @@ class TruncateByTurnsCompressor:
5962
"""
6063

6164
def __init__(
62-
self, truncate_turns: int = 1, compression_threshold: float = 0.82,
65+
self,
66+
truncate_turns: int = 1,
67+
compression_threshold: float = 0.82,
6368
) -> None:
6469
"""Initialize the truncate by turns compressor.
6570
@@ -72,7 +77,10 @@ def __init__(
7277
self.compression_threshold = compression_threshold
7378

7479
def should_compress(
75-
self, messages: list[Message], current_tokens: int, max_tokens: int,
80+
self,
81+
messages: list[Message],
82+
current_tokens: int,
83+
max_tokens: int,
7684
) -> bool:
7785
"""Check if compression is needed.
7886
@@ -100,7 +108,8 @@ async def __call__(self, messages: list[Message]) -> list[Message]:
100108

101109

102110
def split_history(
103-
messages: list[Message], keep_recent: int,
111+
messages: list[Message],
112+
keep_recent: int,
104113
) -> tuple[list[Message], list[Message], list[Message]]:
105114
"""Split the message list into system messages, messages to summarize, and recent messages.
106115
@@ -181,7 +190,10 @@ def __init__(
181190
)
182191

183192
def should_compress(
184-
self, messages: list[Message], current_tokens: int, max_tokens: int,
193+
self,
194+
messages: list[Message],
195+
current_tokens: int,
196+
max_tokens: int,
185197
) -> bool:
186198
"""Check if compression is needed.
187199
@@ -211,7 +223,8 @@ async def __call__(self, messages: list[Message]) -> list[Message]:
211223
return messages
212224

213225
system_messages, messages_to_summarize, recent_messages = split_history(
214-
messages, self.keep_recent,
226+
messages,
227+
self.keep_recent,
215228
)
216229

217230
if not messages_to_summarize:

astrbot/core/agent/context/manager.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ def __init__(
4343
)
4444

4545
async def process(
46-
self, messages: list[Message], trusted_token_usage: int = 0,
46+
self,
47+
messages: list[Message],
48+
trusted_token_usage: int = 0,
4749
) -> list[Message]:
4850
"""Process the messages.
4951
@@ -68,11 +70,14 @@ async def process(
6870
# 2. 基于 token 的压缩
6971
if self.config.max_context_tokens > 0:
7072
total_tokens = self.token_counter.count_tokens(
71-
result, trusted_token_usage,
73+
result,
74+
trusted_token_usage,
7275
)
7376

7477
if self.compressor.should_compress(
75-
result, total_tokens, self.config.max_context_tokens,
78+
result,
79+
total_tokens,
80+
self.config.max_context_tokens,
7681
):
7782
result = await self._run_compression(result, total_tokens)
7883

@@ -82,7 +87,9 @@ async def process(
8287
return messages
8388

8489
async def _run_compression(
85-
self, messages: list[Message], prev_tokens: int,
90+
self,
91+
messages: list[Message],
92+
prev_tokens: int,
8693
) -> list[Message]:
8794
"""Compress/truncate the messages.
8895
@@ -111,7 +118,9 @@ async def _run_compression(
111118

112119
# last check
113120
if self.compressor.should_compress(
114-
messages, tokens_after_summary, self.config.max_context_tokens,
121+
messages,
122+
tokens_after_summary,
123+
self.config.max_context_tokens,
115124
):
116125
logger.info(
117126
"Context still exceeds max tokens after compression, applying halving truncation...",

astrbot/core/agent/context/token_counter.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ class TokenCounter(Protocol):
1111
"""
1212

1313
def count_tokens(
14-
self, messages: list[Message], trusted_token_usage: int = 0,
14+
self,
15+
messages: list[Message],
16+
trusted_token_usage: int = 0,
1517
) -> int:
1618
"""Count the total tokens in the message list.
1719
@@ -44,7 +46,9 @@ class EstimateTokenCounter:
4446
"""
4547

4648
def count_tokens(
47-
self, messages: list[Message], trusted_token_usage: int = 0,
49+
self,
50+
messages: list[Message],
51+
trusted_token_usage: int = 0,
4852
) -> int:
4953
if trusted_token_usage > 0:
5054
return trusted_token_usage

0 commit comments

Comments
 (0)