🎈 perf: 支持自定义 PyPI 软件仓库地址

fixes: #1165
This commit is contained in:
Soulter
2025-04-14 21:19:36 +08:00
parent 068d9ca60b
commit 3756cb766e
7 changed files with 18 additions and 20 deletions
+4 -1
View File
@@ -23,7 +23,10 @@ db_helper = SQLiteDatabase(DB_PATH)
sp = (
SharedPreferences()
) # 简单的偏好设置存储, 这里后续应该存储到数据库中, 一些部分可以存储到配置中
pip_installer = PipInstaller(astrbot_config.get("pip_install_arg", ""))
pip_installer = PipInstaller(
astrbot_config.get("pip_install_arg", ""),
astrbot_config.get("pypi_index_url", None),
)
web_chat_queue = asyncio.Queue(maxsize=32)
web_chat_back_queue = asyncio.Queue(maxsize=32)
WEBUI_SK = "Advanced_System_for_Text_Response_and_Bot_Operations_Tool"
+4 -10
View File
@@ -97,7 +97,7 @@ DEFAULT_CONFIG = {
"wake_prefix": ["/"],
"log_level": "INFO",
"pip_install_arg": "",
"plugin_repo_mirror": "",
"pypi_index_url": "https://mirrors.aliyun.com/pypi/simple/",
"knowledge_db": {},
"persona": [],
"timezone": "",
@@ -1216,16 +1216,10 @@ CONFIG_METADATA_2 = {
"type": "string",
"hint": "安装插件依赖时,会使用 Python 的 pip 工具。这里可以填写额外的参数,如 `--break-system-package` 等。",
},
"plugin_repo_mirror": {
"description": "件仓库镜像",
"pypi_index_url": {
"description": "PyPI 软件仓库地址",
"type": "string",
"hint": "已废弃,请使用管理面板->设置页的代理地址选择",
"obvious_hint": True,
"options": [
"default",
"https://ghp.ci/",
"https://github-mirror.us.kg/",
],
"hint": "安装 Python 依赖时请求的 PyPI 软件仓库地址。默认为 https://mirrors.aliyun.com/pypi/simple/",
},
},
},
+1 -1
View File
@@ -106,7 +106,7 @@ class AstrBotCoreLifecycle:
await self.pipeline_scheduler.initialize()
# 初始化更新器
self.astrbot_updator = AstrBotUpdator(self.astrbot_config["plugin_repo_mirror"])
self.astrbot_updator = AstrBotUpdator()
# 初始化事件总线
self.event_bus = EventBus(self.event_queue, self.pipeline_scheduler)
+1 -1
View File
@@ -28,7 +28,7 @@ from .filter.permission import PermissionTypeFilter, PermissionType
class PluginManager:
def __init__(self, context: Context, config: AstrBotConfig):
self.updator = PluginUpdator(config["plugin_repo_mirror"])
self.updator = PluginUpdator()
self.context = context
self.context._star_manager = self
+4 -4
View File
@@ -5,8 +5,9 @@ logger = logging.getLogger("astrbot")
class PipInstaller:
def __init__(self, pip_install_arg: str):
def __init__(self, pip_install_arg: str, pypi_index_url: str = None):
self.pip_install_arg = pip_install_arg
self.pypi_index_url = pypi_index_url
def install(
self,
@@ -20,10 +21,9 @@ class PipInstaller:
elif requirements_path:
args.extend(["-r", requirements_path])
if not mirror:
mirror = "https://mirrors.aliyun.com/pypi/simple/"
index_url = mirror or self.pypi_index_url or "https://pypi.org/simple"
args.extend(["--trusted-host", "mirrors.aliyun.com", "-i", mirror])
args.extend(["--trusted-host", "mirrors.aliyun.com", "-i", index_url])
if self.pip_install_arg:
args.extend(self.pip_install_arg.split())
+2 -1
View File
@@ -136,10 +136,11 @@ class UpdateRoute(Route):
data = await request.json
package = data.get("package", "")
mirror = data.get("mirror", None)
if not package:
return Response().error("缺少参数 package 或不合法。").__dict__
try:
pip_installer.install(package)
pip_installer.install(package, mirror=mirror)
return Response().ok(None, "安装成功。").__dict__
except Exception as e:
logger.error(f"/api/update_pip: {traceback.format_exc()}")
+2 -2
View File
@@ -27,8 +27,8 @@ import axios from 'axios';
</v-card-title>
<v-card-text>
<v-text-field v-model="pipInstallPayload.package" label="*库名,如 llmtuner" variant="outlined"></v-text-field>
<v-text-field v-model="pipInstallPayload.mirror" label="镜像站链接(可选)" variant="outlined"></v-text-field>
<small>如果不填镜像站链接默认使用阿里云镜像https://mirrors.aliyun.com/pypi/simple/</small>
<v-text-field v-model="pipInstallPayload.mirror" label="强制 PyPI 软件仓库链接(可选)" variant="outlined"></v-text-field>
<small>强制 PyPI 软件仓库链接 > 配置项 `PyPI 软件仓库地址`</small>
<div>
<small>{{ status }}</small>
</div>