Skip to content

refactor(core): use generic package mapping for optional dependency checks #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OhYee merged 6 commits into from
Dec 25, 2025
Merged

refactor(core): use generic package mapping for optional dependency checks #25

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca3ca9b
Initial plan
Copilot Dec 25, 2025
5c01863
fix(core): add 'ag_ui' to optional dependency error check
Copilot Dec 25, 2025
54bb23b
refactor(core): use generic package mapping for optional dependency c…
Copilot Dec 25, 2025
7575061
fix(core): restore specificity in error message and add clarifying co…
Copilot Dec 25, 2025
9bbe850
refactor(core): use constant for server install command to reduce dup…
Copilot Dec 25, 2025
3e95d91
refactor(core): group packages by install command in _OPTIONAL_PACKAGES
Copilot Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions agentrun/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,13 @@
"MergeOptions",
}

# 可选依赖包映射：安装命令 -> 导入错误的包名列表
# Optional dependency mapping: installation command -> list of import error package names
# 将使用相同安装命令的包合并到一起 / Group packages with the same installation command
_OPTIONAL_PACKAGES = {
"agentrun-sdk[server]": ["fastapi", "uvicorn", "ag_ui"],
}


def __getattr__(name: str):
"""延迟加载 server 模块的导出，避免可选依赖导致导入失败
Expand All @@ -303,12 +310,15 @@ def __getattr__(name: str):
return getattr(server, name)
except ImportError as e:
# 检查是否是缺少可选依赖导致的错误
if "fastapi" in str(e) or "uvicorn" in str(e):
raise ImportError(
f"'{name}' requires the 'server' optional dependencies. "
"Install with: pip install agentrun-sdk[server]\n"
f"Original error: {e}"
) from e
error_str = str(e)
for install_cmd, package_names in _OPTIONAL_PACKAGES.items():
for package_name in package_names:
if package_name in error_str:
raise ImportError(
f"'{name}' requires the 'server' optional dependencies. "
f"Install with: pip install {install_cmd}\n"
f"Original error: {e}"
) from e
# 其他导入错误继续抛出
raise

Expand Down
Loading