Skip to content

Commit 444c91e

Browse files
author
zhansheng.lzs
committed
style(acli): black-format synced tree; fix noqa placement and W1404
CI runs pre-commit --all-files while local commits only checked staged files, so the synced tree (rewritten acli. -> dashscope.acli., +10 cols per import) was never black-formatted: 23 files reformatted. The rewrite also pushed four noqa'd imports past 79 cols; black wrapped them and the trailing noqa no longer covered F401/E402 — fixed at the source with exploded first-line-noqa imports (agenticCLI). commands.py implicit string concat joined by black tripped pylint W1404 — single literal at the source. sync_acli.sh now runs the repo-pinned black on the synced tree so local output always satisfies CI. Also commit the two sync scripts.
1 parent a79a3cf commit 444c91e

25 files changed

Lines changed: 307 additions & 55 deletions

‎dashscope/acli/agents/subagent.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ async def _subagent_invoke(
7373
"(missing parent agent reference)"
7474
)
7575

76-
from dashscope.acli.agent import Agent # local import to avoid module-load cycle
76+
from dashscope.acli.agent import (
77+
Agent,
78+
) # local import to avoid module-load cycle
7779
from dashscope.acli.memory.manager import MemoryManager
7880

7981
# Look up per-agent config overrides (max_turns, model, temperature)

‎dashscope/acli/agents/subagents.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,10 @@ def _subagents_list(config: Config) -> None:
154154
def _subagents_reload(config: Config) -> None:
155155
# pylint: disable=unused-argument
156156
"""Re-scan custom_extensions.toml and refresh subagent registry."""
157-
from dashscope.acli.cli import PROVIDER_MODELS, sync_extensions_into_catalog
157+
from dashscope.acli.cli import (
158+
PROVIDER_MODELS,
159+
sync_extensions_into_catalog,
160+
)
158161
from dashscope.acli.extensions import apply_extensions
159162

160163
ext = apply_extensions(PROVIDER_MODELS)

‎dashscope/acli/cli/__init__.py‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424
from dashscope.acli.skills import load_skill_files # noqa: E402
2525

2626
load_skill_files()
27-
from dashscope.acli.cli.completer import _get_arg_hint, _is_dir_safe # noqa: F401,E402
27+
from dashscope.acli.cli.completer import ( # noqa: F401,E402
28+
_get_arg_hint,
29+
_is_dir_safe,
30+
)
2831

2932
# Import constants and multimodal handling from submodules
3033
from dashscope.acli.cli.constants import ( # noqa: F401,E402
@@ -54,11 +57,16 @@
5457
_cap_enabled,
5558
sync_extensions_into_catalog,
5659
)
57-
from dashscope.acli.cli.handlers_misc import _handle_report_command # noqa: F401,E402
60+
from dashscope.acli.cli.handlers_misc import ( # noqa: F401,E402
61+
_handle_report_command,
62+
)
5863
from dashscope.acli.cli.handlers_setup import _handle_setup # noqa: F401,E402
5964

6065
# Import MCP management from submodule
61-
from dashscope.acli.cli.mcp import _connect_mcp, _mcp_clients # noqa: F401,E402
66+
from dashscope.acli.cli.mcp import ( # noqa: F401,E402
67+
_connect_mcp,
68+
_mcp_clients,
69+
)
6270
from dashscope.acli.cli.repl import _run_loop # noqa: E402
6371
from dashscope.acli.cli.runners import ( # noqa: E402
6472
_run_dry_run,
@@ -69,7 +77,10 @@
6977
_compose_system_prompt,
7078
_load_system_prompt,
7179
)
72-
from dashscope.acli.cli.streaming import _do_compress, _do_summarize # noqa: F401,E402
80+
from dashscope.acli.cli.streaming import ( # noqa: F401,E402
81+
_do_compress,
82+
_do_summarize,
83+
)
7384

7485
# Cron scheduler
7586
_scheduler = None

‎dashscope/acli/cli/completer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,9 @@ def _slot_candidates(self, tokens: list[str], arg_index: int) -> list[str]:
245245
return []
246246

247247
if cmd == "/subagents":
248-
from dashscope.acli.agents.subagents import SUBAGENT_CAPABILITY_KEYS
248+
from dashscope.acli.agents.subagents import (
249+
SUBAGENT_CAPABILITY_KEYS,
250+
)
249251

250252
if arg_index == 1:
251253
return _SUBCOMMANDS["/subagents"]

‎dashscope/acli/cli/dispatch.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,9 @@ def _handle_slash_command(
353353
console.print(render_help_text())
354354
return True
355355
elif cmd.startswith("/provider"):
356-
from dashscope.acli.cli.handlers_provider import handle_provider_command
356+
from dashscope.acli.cli.handlers_provider import (
357+
handle_provider_command,
358+
)
357359

358360
handle_provider_command(cmd, agent, config)
359361
return True

‎dashscope/acli/cli/handlers_capability.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
from rich.console import Console
99

10-
from dashscope.acli.cli.constants import ALL_CAPABILITY_KEYS, CAPABILITY_CATALOG
10+
from dashscope.acli.cli.constants import (
11+
ALL_CAPABILITY_KEYS,
12+
CAPABILITY_CATALOG,
13+
)
1114
from dashscope.acli.config import PROVIDER_MODELS, Config
1215

1316
console = Console()
@@ -150,7 +153,9 @@ def _handle_capability_command(cmd: str, config: Config):
150153
# Already enabled — but extension caps may still lack credentials
151154
# (enabled without a token, or env var unset). Offer the prompt
152155
# again and re-register so the tools bind to fresh creds.
153-
from dashscope.acli.cli.handlers_key import _maybe_prompt_extension_token
156+
from dashscope.acli.cli.handlers_key import (
157+
_maybe_prompt_extension_token,
158+
)
154159

155160
_maybe_prompt_extension_token(cap_key, config)
156161
from dashscope.acli.cli.mcp import _connect_mcp
@@ -183,7 +188,9 @@ def _handle_capability_command(cmd: str, config: Config):
183188
return
184189

185190
# Extension-capability bearer/apikey-header token
186-
from dashscope.acli.cli.handlers_key import _maybe_prompt_extension_token
191+
from dashscope.acli.cli.handlers_key import (
192+
_maybe_prompt_extension_token,
193+
)
187194

188195
_maybe_prompt_extension_token(cap_key, config)
189196

@@ -234,7 +241,9 @@ def _handle_capability_command(cmd: str, config: Config):
234241

235242
if sub in ("reload", "refresh"):
236243
from dashscope.acli.extensions import apply_extensions
237-
from dashscope.acli.tools.platform import refresh_extension_capability_tools
244+
from dashscope.acli.tools.platform import (
245+
refresh_extension_capability_tools,
246+
)
238247

239248
ext = apply_extensions(PROVIDER_MODELS)
240249
sync_extensions_into_catalog(ext)

‎dashscope/acli/cli/handlers_config.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ def _print_status():
5353
get_audit_logger().set_privacy_mode(True)
5454
# Enforce at the tool surface too (not just the slash-command gate):
5555
# drop every registered cloud capability tool + connected MCP tools.
56-
from dashscope.acli.tools.platform import unregister_cloud_capability_tools
56+
from dashscope.acli.tools.platform import (
57+
unregister_cloud_capability_tools,
58+
)
5759
from dashscope.acli.tools.registry import registry
5860

5961
removed = unregister_cloud_capability_tools()
@@ -605,7 +607,9 @@ def _handle_directives_command(cmd: str, config: Config) -> None:
605607
return
606608

607609
if sub == "proposals":
608-
from dashscope.acli.memory.directives_learning import list_proposed_directives
610+
from dashscope.acli.memory.directives_learning import (
611+
list_proposed_directives,
612+
)
609613

610614
proposals = list_proposed_directives("pending")
611615
if not proposals:

‎dashscope/acli/cli/handlers_session.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def _handle_session_command(cmd: str, config, agent) -> None:
162162
session_mgr.set_scene("")
163163
console.print(f"[green]Scene memory cleared ({topic})[/green]")
164164
elif rest.startswith("set "):
165-
text = rest[len("set "):].strip()
165+
text = rest[len("set ") :].strip()
166166
if session_mgr.set_scene(text):
167167
console.print(
168168
f"[green]Scene memory replaced ({topic})[/green]",

‎dashscope/acli/cli/repl.py‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
from rich.panel import Panel
1616

1717
from dashscope.acli.agent import Agent
18-
from dashscope.acli.cli.completer import AcliCompleter, SafeFileHistory, _HintProcessor
18+
from dashscope.acli.cli.completer import (
19+
AcliCompleter,
20+
SafeFileHistory,
21+
_HintProcessor,
22+
)
1923
from dashscope.acli.cli.dispatch import (
2024
_handle_skill_continue,
2125
_handle_slash_command,
@@ -31,13 +35,20 @@
3135
_init_mcp_servers,
3236
_mcp_clients,
3337
)
34-
from dashscope.acli.cli.multimodal import _expand_at_references, _to_multimodal_content
38+
from dashscope.acli.cli.multimodal import (
39+
_expand_at_references,
40+
_to_multimodal_content,
41+
)
3542
from dashscope.acli.cli.startup import (
3643
_compose_system_prompt,
3744
_load_system_prompt,
3845
_print_banner,
3946
)
40-
from dashscope.acli.cli.streaming import _do_compress, _do_summarize, _stream_response
47+
from dashscope.acli.cli.streaming import (
48+
_do_compress,
49+
_do_summarize,
50+
_stream_response,
51+
)
4152
from dashscope.acli.config import (
4253
PROVIDER_MODELS,
4354
WORKSPACE_CONFIG_FILE,
@@ -137,10 +148,18 @@ async def _run_loop(config: Config):
137148

138149
# Pin parent agent ref for local.subagent / local.delegate BEFORE platform
139150
# tool registration so register_one_capability finds a parent to attach to.
140-
from dashscope.acli.agents.delegate import set_config as set_delegate_config
141-
from dashscope.acli.agents.delegate import set_parent_agent as set_delegate_parent
142-
from dashscope.acli.agents.subagent import set_config as set_subagent_config
143-
from dashscope.acli.agents.subagent import set_parent_agent as set_subagent_parent
151+
from dashscope.acli.agents.delegate import (
152+
set_config as set_delegate_config,
153+
)
154+
from dashscope.acli.agents.delegate import (
155+
set_parent_agent as set_delegate_parent,
156+
)
157+
from dashscope.acli.agents.subagent import (
158+
set_config as set_subagent_config,
159+
)
160+
from dashscope.acli.agents.subagent import (
161+
set_parent_agent as set_subagent_parent,
162+
)
144163

145164
set_subagent_parent(agent)
146165
set_subagent_config(config)

‎dashscope/acli/cli/runners.py‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010

1111
from dashscope.acli.agent import Agent
1212
from dashscope.acli.cli.handlers_key import ensure_provider_key
13-
from dashscope.acli.cli.multimodal import _expand_at_references, _to_multimodal_content
14-
from dashscope.acli.cli.startup import _compose_system_prompt, _load_system_prompt
13+
from dashscope.acli.cli.multimodal import (
14+
_expand_at_references,
15+
_to_multimodal_content,
16+
)
17+
from dashscope.acli.cli.startup import (
18+
_compose_system_prompt,
19+
_load_system_prompt,
20+
)
1521
from dashscope.acli.config import (
1622
PROVIDER_MODELS,
1723
Config,
@@ -73,10 +79,18 @@ async def _run_oneshot(config: Config, prompt: str):
7379
# Pin parent agent ref for local.subagent / local.delegate BEFORE platform
7480
# tool registration so register_one_capability finds a parent to attach to
7581
# (same ordering as cli/repl.py).
76-
from dashscope.acli.agents.delegate import set_config as set_delegate_config
77-
from dashscope.acli.agents.delegate import set_parent_agent as set_delegate_parent
78-
from dashscope.acli.agents.subagent import set_config as set_subagent_config
79-
from dashscope.acli.agents.subagent import set_parent_agent as set_subagent_parent
82+
from dashscope.acli.agents.delegate import (
83+
set_config as set_delegate_config,
84+
)
85+
from dashscope.acli.agents.delegate import (
86+
set_parent_agent as set_delegate_parent,
87+
)
88+
from dashscope.acli.agents.subagent import (
89+
set_config as set_subagent_config,
90+
)
91+
from dashscope.acli.agents.subagent import (
92+
set_parent_agent as set_subagent_parent,
93+
)
8094

8195
set_subagent_parent(agent)
8296
set_subagent_config(config)
@@ -255,7 +269,9 @@ def _run_tui_mode(config: Config):
255269
from dashscope.acli.extensions import apply_extensions
256270

257271
_ext = apply_extensions(PROVIDER_MODELS)
258-
from dashscope.acli.cli.handlers_capability import sync_extensions_into_catalog
272+
from dashscope.acli.cli.handlers_capability import (
273+
sync_extensions_into_catalog,
274+
)
259275

260276
sync_extensions_into_catalog(_ext)
261277

@@ -264,10 +280,18 @@ def _run_tui_mode(config: Config):
264280
provider = get_provider_chain(config)
265281
executor = Executor(auto_approve=config.auto_approve)
266282

267-
from dashscope.acli.agents.delegate import set_config as set_delegate_config
268-
from dashscope.acli.agents.delegate import set_parent_agent as set_delegate_parent
269-
from dashscope.acli.agents.subagent import set_config as set_subagent_config
270-
from dashscope.acli.agents.subagent import set_parent_agent as set_subagent_parent
283+
from dashscope.acli.agents.delegate import (
284+
set_config as set_delegate_config,
285+
)
286+
from dashscope.acli.agents.delegate import (
287+
set_parent_agent as set_delegate_parent,
288+
)
289+
from dashscope.acli.agents.subagent import (
290+
set_config as set_subagent_config,
291+
)
292+
from dashscope.acli.agents.subagent import (
293+
set_parent_agent as set_subagent_parent,
294+
)
271295
from dashscope.acli.hooks import create_hook_bus
272296
from dashscope.acli.platforms import get_memory_provider
273297
from dashscope.acli.tools.platform import disabled_capabilities_hint

0 commit comments

Comments
 (0)