简化依赖包
This commit is contained in:
@@ -47,22 +47,6 @@ class DependencyConfig:
|
|||||||
return config.dependency_management.mirror_url
|
return config.dependency_management.mirror_url
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
@property
|
|
||||||
def use_proxy(self) -> bool:
|
|
||||||
"""是否使用网络代理"""
|
|
||||||
config = self._get_config()
|
|
||||||
if config and hasattr(config, 'dependency_management'):
|
|
||||||
return config.dependency_management.use_proxy
|
|
||||||
return False
|
|
||||||
|
|
||||||
@property
|
|
||||||
def proxy_url(self) -> str:
|
|
||||||
"""网络代理URL"""
|
|
||||||
config = self._get_config()
|
|
||||||
if config and hasattr(config, 'dependency_management'):
|
|
||||||
return config.dependency_management.proxy_url
|
|
||||||
return ""
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def install_timeout(self) -> int:
|
def install_timeout(self) -> int:
|
||||||
"""安装超时时间(秒)"""
|
"""安装超时时间(秒)"""
|
||||||
@@ -71,17 +55,6 @@ class DependencyConfig:
|
|||||||
return config.dependency_management.auto_install_timeout
|
return config.dependency_management.auto_install_timeout
|
||||||
return 300
|
return 300
|
||||||
|
|
||||||
@property
|
|
||||||
def pip_options(self) -> list:
|
|
||||||
"""pip安装选项"""
|
|
||||||
config = self._get_config()
|
|
||||||
if config and hasattr(config, 'dependency_management'):
|
|
||||||
return config.dependency_management.pip_options
|
|
||||||
return [
|
|
||||||
"--no-warn-script-location",
|
|
||||||
"--disable-pip-version-check"
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
@@ -19,15 +19,13 @@ class DependencyManager:
|
|||||||
负责检查和自动安装插件的Python包依赖
|
负责检查和自动安装插件的Python包依赖
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, auto_install: bool = True, use_mirror: bool = False, mirror_url: Optional[str] = None, use_proxy: bool = False, proxy_url: Optional[str] = None):
|
def __init__(self, auto_install: bool = True, use_mirror: bool = False, mirror_url: Optional[str] = None):
|
||||||
"""初始化依赖管理器
|
"""初始化依赖管理器
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
auto_install: 是否自动安装缺失的依赖
|
auto_install: 是否自动安装缺失的依赖
|
||||||
use_mirror: 是否使用PyPI镜像源
|
use_mirror: 是否使用PyPI镜像源
|
||||||
mirror_url: PyPI镜像源URL
|
mirror_url: PyPI镜像源URL
|
||||||
use_proxy: 是否使用网络代理
|
|
||||||
proxy_url: 网络代理URL
|
|
||||||
"""
|
"""
|
||||||
# 延迟导入配置以避免循环依赖
|
# 延迟导入配置以避免循环依赖
|
||||||
try:
|
try:
|
||||||
@@ -38,20 +36,14 @@ class DependencyManager:
|
|||||||
self.auto_install = config.auto_install if auto_install is True else auto_install
|
self.auto_install = config.auto_install if auto_install is True else auto_install
|
||||||
self.use_mirror = config.use_mirror if use_mirror is False else use_mirror
|
self.use_mirror = config.use_mirror if use_mirror is False else use_mirror
|
||||||
self.mirror_url = config.mirror_url if mirror_url is None else mirror_url
|
self.mirror_url = config.mirror_url if mirror_url is None else mirror_url
|
||||||
self.use_proxy = config.use_proxy if use_proxy is False else use_proxy
|
|
||||||
self.proxy_url = config.proxy_url if proxy_url is None else proxy_url
|
|
||||||
self.install_timeout = config.install_timeout
|
self.install_timeout = config.install_timeout
|
||||||
self.pip_options = config.pip_options.copy()
|
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"无法加载依赖配置,使用默认设置: {e}")
|
logger.warning(f"无法加载依赖配置,使用默认设置: {e}")
|
||||||
self.auto_install = auto_install
|
self.auto_install = auto_install
|
||||||
self.use_mirror = use_mirror or False
|
self.use_mirror = use_mirror or False
|
||||||
self.mirror_url = mirror_url or ""
|
self.mirror_url = mirror_url or ""
|
||||||
self.use_proxy = use_proxy
|
|
||||||
self.proxy_url = proxy_url or ""
|
|
||||||
self.install_timeout = 300
|
self.install_timeout = 300
|
||||||
self.pip_options = ["--no-warn-script-location", "--disable-pip-version-check"]
|
|
||||||
|
|
||||||
def check_dependencies(self, dependencies: Any, plugin_name: str = "") -> Tuple[bool, List[str], List[str]]:
|
def check_dependencies(self, dependencies: Any, plugin_name: str = "") -> Tuple[bool, List[str], List[str]]:
|
||||||
"""检查依赖包是否满足要求
|
"""检查依赖包是否满足要求
|
||||||
@@ -240,19 +232,11 @@ class DependencyManager:
|
|||||||
try:
|
try:
|
||||||
cmd = [sys.executable, "-m", "pip", "install", package]
|
cmd = [sys.executable, "-m", "pip", "install", package]
|
||||||
|
|
||||||
# 添加镜像源设置(优先)
|
# 添加镜像源设置
|
||||||
if self.use_mirror and self.mirror_url:
|
if self.use_mirror and self.mirror_url:
|
||||||
cmd.extend(["-i", self.mirror_url])
|
cmd.extend(["-i", self.mirror_url])
|
||||||
logger.debug(f"[Plugin:{plugin_name}] 使用PyPI镜像源: {self.mirror_url}")
|
logger.debug(f"[Plugin:{plugin_name}] 使用PyPI镜像源: {self.mirror_url}")
|
||||||
|
|
||||||
# 添加代理设置
|
|
||||||
if self.use_proxy and self.proxy_url:
|
|
||||||
cmd.extend(["--proxy", self.proxy_url])
|
|
||||||
logger.debug(f"[Plugin:{plugin_name}] 使用网络代理: {self.proxy_url}")
|
|
||||||
|
|
||||||
# 添加配置的pip选项
|
|
||||||
cmd.extend(self.pip_options)
|
|
||||||
|
|
||||||
logger.debug(f"[Plugin:{plugin_name}] 执行安装命令: {' '.join(cmd)}")
|
logger.debug(f"[Plugin:{plugin_name}] 执行安装命令: {' '.join(cmd)}")
|
||||||
|
|
||||||
result = subprocess.run(
|
result = subprocess.run(
|
||||||
@@ -289,13 +273,11 @@ def get_dependency_manager() -> DependencyManager:
|
|||||||
return _global_dependency_manager
|
return _global_dependency_manager
|
||||||
|
|
||||||
|
|
||||||
def configure_dependency_manager(auto_install: bool = True, use_mirror: bool = False, mirror_url: Optional[str] = None, use_proxy: bool = False, proxy_url: Optional[str] = None):
|
def configure_dependency_manager(auto_install: bool = True, use_mirror: bool = False, mirror_url: Optional[str] = None):
|
||||||
"""配置全局依赖管理器"""
|
"""配置全局依赖管理器"""
|
||||||
global _global_dependency_manager
|
global _global_dependency_manager
|
||||||
_global_dependency_manager = DependencyManager(
|
_global_dependency_manager = DependencyManager(
|
||||||
auto_install=auto_install,
|
auto_install=auto_install,
|
||||||
use_mirror=use_mirror,
|
use_mirror=use_mirror,
|
||||||
mirror_url=mirror_url,
|
mirror_url=mirror_url
|
||||||
use_proxy=use_proxy,
|
)
|
||||||
proxy_url=proxy_url
|
|
||||||
)
|
|
||||||
@@ -268,15 +268,6 @@ auto_install_timeout = 300
|
|||||||
use_mirror = true
|
use_mirror = true
|
||||||
mirror_url = "https://pypi.tuna.tsinghua.edu.cn/simple" # PyPI镜像源URL,如: "https://pypi.tuna.tsinghua.edu.cn/simple"
|
mirror_url = "https://pypi.tuna.tsinghua.edu.cn/simple" # PyPI镜像源URL,如: "https://pypi.tuna.tsinghua.edu.cn/simple"
|
||||||
|
|
||||||
# 是否使用网络代理(高级选项)
|
|
||||||
use_proxy = false
|
|
||||||
proxy_url = "" # 网络代理URL,如: "http://proxy.example.com:8080"
|
|
||||||
|
|
||||||
# pip安装选项
|
|
||||||
pip_options = [
|
|
||||||
"--no-warn-script-location",
|
|
||||||
"--disable-pip-version-check"
|
|
||||||
]
|
|
||||||
|
|
||||||
# 安装前是否提示用户(暂未实现)
|
# 安装前是否提示用户(暂未实现)
|
||||||
prompt_before_install = false
|
prompt_before_install = false
|
||||||
|
|||||||
Reference in New Issue
Block a user