mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-14 21:52:56 +08:00
* ✨ feat(env): 支持git更新 * ✨ feat(aliyun): 更新阿里云URL构建逻辑,支持组织名称并优化令牌解码处理 * ✨ feat(config): 修改错误提示信息,更新基础配置文件名称为.env.example * ⚡ 插件商店支持aliyun * ✨ feat(store): 优化插件数据获取逻辑,合并插件列表和额外插件列表 * 🐛 修复非git仓库的初始化更新 * ✨ feat(update): 增强更新提示信息,添加非git源的变更文件说明 * 🎨 代码格式化 * ✨ webui与resources支持git更新 * ✨ feat(update): 更新webui路径处理逻辑 * Fix/test_runwork (#2001) * fix(test): 修复测试工作流 - 修改自动更新模块中的导入路径 - 更新插件商店模块中的插件信息获取逻辑 - 优化插件添加、更新和移除流程 - 统一插件相关错误信息的格式 - 调整测试用例以适应新的插件管理逻辑 * test(builtin_plugins): 重构插件商店相关测试 - 移除 jsd 相关测试用例,只保留 gh(GitHub)的测试 - 删除了 test_plugin_store.py 文件,清理了插件商店的测试 - 更新了 test_search_plugin.py 中的插件版本号 - 调整了 test_update_plugin.py 中的已加载插件版本 - 移除了 StoreManager 类中的 is_external 变量 - 更新了 RepoFileManager 类中的文件获取逻辑,优先使用 GitHub * ✨ feat(submodule): 添加子模块管理功能,支持子模块的初始化、更新和信息获取 * ✨ feat(update): 移除资源管理器,重构更新逻辑,支持通过ZhenxunRepoManager进行资源和Web UI的更新 * test(auto_update): 修改更新检测消息格式 (#2003) - 移除了不必要的版本号后缀(如 "-e6f17c4") - 统一了版本更新消息的格式,删除了冗余信息 * 🐛 修复web zip更新路径问题 * ⚡ 文件获取优化使用ali * Fix/test (#2008) * test: 修复bot测试 - 在 test_check_update.py 中跳过两个测试函数 - 移除 test_check.py 中的 mocked_api 参数和相关调用 - 删除 test_add_plugin.py 中的多个测试函数 - 移除 test_remove_plugin.py 中的 mocked_api 参数和相关调用 - 删除 test_search_plugin.py 中的多个测试函数 - 移除 test_update_all_plugin.py 和 test_update_plugin.py 中的 mocked_api 参数和相关调用 * 🚨 auto fix by pre-commit hooks --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * 修复res zip更新路径问题 * 🐛 修复zhenxun更新zip占用问题 * ✨ feat(update): 优化资源更新逻辑,调整更新路径和消息处理 --------- Co-authored-by: molanp <104612722+molanp@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
509 lines
16 KiB
Python
509 lines
16 KiB
Python
import base64
|
|
import contextlib
|
|
import sys
|
|
from typing import Protocol
|
|
|
|
from aiocache import cached
|
|
from alibabacloud_devops20210625 import models as devops_20210625_models
|
|
from alibabacloud_devops20210625.client import Client as devops20210625Client
|
|
from alibabacloud_tea_openapi import models as open_api_models
|
|
from alibabacloud_tea_util import models as util_models
|
|
from nonebot.compat import model_dump
|
|
from pydantic import BaseModel, Field
|
|
|
|
from zhenxun.utils.http_utils import AsyncHttpx
|
|
|
|
if sys.version_info >= (3, 11):
|
|
from enum import StrEnum
|
|
else:
|
|
from strenum import StrEnum
|
|
|
|
from .const import (
|
|
ALIYUN_ENDPOINT,
|
|
ALIYUN_ORG_ID,
|
|
ALIYUN_REGION,
|
|
ALIYUN_REPO_MAPPING,
|
|
CACHED_API_TTL,
|
|
GIT_API_COMMIT_FORMAT,
|
|
GIT_API_PROXY_COMMIT_FORMAT,
|
|
GIT_API_TREES_FORMAT,
|
|
JSD_PACKAGE_API_FORMAT,
|
|
Aliyun_AccessKey_ID,
|
|
Aliyun_Secret_AccessKey_encrypted,
|
|
RDC_access_token_encrypted,
|
|
)
|
|
from .func import (
|
|
get_fastest_archive_formats,
|
|
get_fastest_raw_formats,
|
|
get_fastest_release_source_formats,
|
|
)
|
|
|
|
|
|
class RepoInfo(BaseModel):
|
|
"""仓库信息"""
|
|
|
|
owner: str
|
|
repo: str
|
|
branch: str = "main"
|
|
|
|
async def get_raw_download_url(self, path: str) -> str:
|
|
return (await self.get_raw_download_urls(path))[0]
|
|
|
|
async def get_archive_download_url(self) -> str:
|
|
return (await self.get_archive_download_urls())[0]
|
|
|
|
async def get_release_source_download_url_tgz(self, version: str) -> str:
|
|
return (await self.get_release_source_download_urls_tgz(version))[0]
|
|
|
|
async def get_release_source_download_url_zip(self, version: str) -> str:
|
|
return (await self.get_release_source_download_urls_zip(version))[0]
|
|
|
|
async def get_raw_download_urls(self, path: str) -> list[str]:
|
|
url_formats = await get_fastest_raw_formats()
|
|
return [
|
|
url_format.format(**self.to_dict(), path=path) for url_format in url_formats
|
|
]
|
|
|
|
async def get_archive_download_urls(self) -> list[str]:
|
|
url_formats = await get_fastest_archive_formats()
|
|
return [url_format.format(**self.to_dict()) for url_format in url_formats]
|
|
|
|
async def get_release_source_download_urls_tgz(self, version: str) -> list[str]:
|
|
url_formats = await get_fastest_release_source_formats()
|
|
return [
|
|
url_format.format(**self.to_dict(), version=version, compress="tar.gz")
|
|
for url_format in url_formats
|
|
]
|
|
|
|
async def get_release_source_download_urls_zip(self, version: str) -> list[str]:
|
|
url_formats = await get_fastest_release_source_formats()
|
|
return [
|
|
url_format.format(**self.to_dict(), version=version, compress="zip")
|
|
for url_format in url_formats
|
|
]
|
|
|
|
async def update_repo_commit(self):
|
|
with contextlib.suppress(Exception):
|
|
newest_commit = await self.get_newest_commit(
|
|
self.owner, self.repo, self.branch
|
|
)
|
|
if newest_commit:
|
|
self.branch = newest_commit
|
|
return True
|
|
return False
|
|
|
|
def to_dict(self, **kwargs):
|
|
return model_dump(self, **kwargs)
|
|
|
|
@classmethod
|
|
@cached(ttl=CACHED_API_TTL)
|
|
async def get_newest_commit(cls, owner: str, repo: str, branch: str) -> str:
|
|
commit_url = GIT_API_COMMIT_FORMAT.format(owner=owner, repo=repo, branch=branch)
|
|
commit_url_proxy = GIT_API_PROXY_COMMIT_FORMAT.format(
|
|
owner=owner, repo=repo, branch=branch
|
|
)
|
|
resp = await AsyncHttpx().get([commit_url, commit_url_proxy])
|
|
return "" if resp.status_code != 200 else resp.json()["sha"]
|
|
|
|
|
|
class APIStrategy(Protocol):
|
|
"""API策略"""
|
|
|
|
body: BaseModel
|
|
|
|
async def parse_repo_info(self, repo_info: RepoInfo) -> BaseModel: ...
|
|
|
|
def get_files(self, module_path: str, is_dir: bool) -> list[str]: ...
|
|
|
|
|
|
class RepoAPI:
|
|
"""基础接口"""
|
|
|
|
def __init__(self, strategy: APIStrategy):
|
|
self.strategy = strategy
|
|
|
|
async def parse_repo_info(self, repo_info: RepoInfo):
|
|
body = await self.strategy.parse_repo_info(repo_info)
|
|
self.strategy.body = body
|
|
|
|
def get_files(self, module_path: str, is_dir: bool) -> list[str]:
|
|
return self.strategy.get_files(module_path, is_dir)
|
|
|
|
|
|
class FileType(StrEnum):
|
|
"""文件类型"""
|
|
|
|
FILE = "file"
|
|
DIR = "directory"
|
|
PACKAGE = "gh"
|
|
|
|
|
|
class FileInfo(BaseModel):
|
|
"""文件信息"""
|
|
|
|
type: FileType
|
|
name: str
|
|
files: list["FileInfo"] = Field(default_factory=list)
|
|
|
|
|
|
class JsdelivrStrategy:
|
|
"""Jsdelivr策略"""
|
|
|
|
body: FileInfo
|
|
|
|
def get_file_paths(self, module_path: str, is_dir: bool = True) -> list[str]:
|
|
"""获取文件路径"""
|
|
paths = module_path.split("/")
|
|
filename = "" if is_dir and module_path else paths[-1]
|
|
paths = paths if is_dir and module_path else paths[:-1]
|
|
cur_file = self.body
|
|
for path in paths: # 导航到正确的目录
|
|
cur_file = next(
|
|
(
|
|
f
|
|
for f in cur_file.files
|
|
if f.type == FileType.DIR and f.name == path
|
|
),
|
|
None,
|
|
)
|
|
if not cur_file:
|
|
raise ValueError(f"模块路径{module_path}不存在")
|
|
|
|
def collect_files(file: FileInfo, current_path: str, filename: str):
|
|
"""收集文件"""
|
|
if file.type == FileType.FILE and (not filename or file.name == filename):
|
|
return [f"{current_path}/{file.name}"]
|
|
elif file.type == FileType.DIR and file.files:
|
|
return [
|
|
path
|
|
for f in file.files
|
|
for path in collect_files(
|
|
f,
|
|
(
|
|
f"{current_path}/{f.name}"
|
|
if f.type == FileType.DIR
|
|
else current_path
|
|
),
|
|
filename,
|
|
)
|
|
]
|
|
return []
|
|
|
|
files = collect_files(cur_file, "/".join(paths), filename)
|
|
return files if module_path else [f[1:] for f in files]
|
|
|
|
@classmethod
|
|
@cached(ttl=CACHED_API_TTL)
|
|
async def parse_repo_info(cls, repo_info: RepoInfo) -> "FileInfo":
|
|
"""解析仓库信息"""
|
|
|
|
"""获取插件包信息
|
|
|
|
参数:
|
|
repo_info: 仓库信息
|
|
|
|
返回:
|
|
FileInfo: 插件包信息
|
|
"""
|
|
jsd_package_url: str = JSD_PACKAGE_API_FORMAT.format(
|
|
owner=repo_info.owner, repo=repo_info.repo, branch=repo_info.branch
|
|
)
|
|
res = await AsyncHttpx.get(url=jsd_package_url)
|
|
if res.status_code != 200:
|
|
raise ValueError(f"下载错误, code: {res.status_code}")
|
|
return FileInfo(**res.json())
|
|
|
|
def get_files(self, module_path: str, is_dir: bool = True) -> list[str]:
|
|
"""获取文件路径"""
|
|
return self.get_file_paths(module_path, is_dir)
|
|
|
|
|
|
class TreeType(StrEnum):
|
|
"""树类型"""
|
|
|
|
FILE = "blob"
|
|
DIR = "tree"
|
|
|
|
|
|
class Tree(BaseModel):
|
|
"""树"""
|
|
|
|
path: str
|
|
mode: str
|
|
type: TreeType
|
|
sha: str
|
|
size: int | None = None
|
|
url: str
|
|
|
|
|
|
class TreeInfo(BaseModel):
|
|
"""树信息"""
|
|
|
|
sha: str
|
|
url: str
|
|
tree: list[Tree]
|
|
|
|
|
|
class GitHubStrategy:
|
|
"""GitHub策略"""
|
|
|
|
body: TreeInfo
|
|
|
|
def export_files(self, module_path: str, is_dir: bool) -> list[str]:
|
|
"""导出文件路径"""
|
|
tree_info = self.body
|
|
return [
|
|
file.path
|
|
for file in tree_info.tree
|
|
if file.type == TreeType.FILE
|
|
and file.path.startswith(module_path)
|
|
and (not is_dir or file.path[len(module_path)] == "/" or not module_path)
|
|
]
|
|
|
|
@classmethod
|
|
@cached(ttl=CACHED_API_TTL)
|
|
async def parse_repo_info(cls, repo_info: RepoInfo) -> "TreeInfo":
|
|
"""获取仓库树
|
|
|
|
参数:
|
|
repo_info: 仓库信息
|
|
|
|
返回:
|
|
TreesInfo: 仓库树信息
|
|
"""
|
|
git_tree_url: str = GIT_API_TREES_FORMAT.format(
|
|
owner=repo_info.owner, repo=repo_info.repo, branch=repo_info.branch
|
|
)
|
|
res = await AsyncHttpx.get(url=git_tree_url)
|
|
if res.status_code != 200:
|
|
raise ValueError(f"下载错误, code: {res.status_code}")
|
|
return TreeInfo(**res.json())
|
|
|
|
def get_files(self, module_path: str, is_dir: bool = True) -> list[str]:
|
|
"""获取文件路径"""
|
|
return self.export_files(module_path, is_dir)
|
|
|
|
|
|
class AliyunTreeType(StrEnum):
|
|
"""阿里云树类型"""
|
|
|
|
FILE = "blob"
|
|
DIR = "tree"
|
|
|
|
|
|
class AliyunTree(BaseModel):
|
|
"""阿里云树节点"""
|
|
|
|
id: str
|
|
is_lfs: bool = Field(alias="isLFS", default=False)
|
|
mode: str
|
|
name: str
|
|
path: str
|
|
type: AliyunTreeType
|
|
|
|
class Config:
|
|
populate_by_name = True
|
|
|
|
|
|
class AliyunFileInfo:
|
|
"""阿里云策略"""
|
|
|
|
content: str
|
|
"""文件内容"""
|
|
file_path: str
|
|
"""文件路径"""
|
|
ref: str
|
|
"""分支/标签/提交版本"""
|
|
repository_id: str
|
|
"""仓库ID"""
|
|
|
|
@classmethod
|
|
async def get_client(cls) -> devops20210625Client:
|
|
"""获取阿里云客户端"""
|
|
config = open_api_models.Config(
|
|
access_key_id=Aliyun_AccessKey_ID,
|
|
access_key_secret=base64.b64decode(
|
|
Aliyun_Secret_AccessKey_encrypted.encode()
|
|
).decode(),
|
|
endpoint=ALIYUN_ENDPOINT,
|
|
region_id=ALIYUN_REGION,
|
|
)
|
|
|
|
return devops20210625Client(config)
|
|
|
|
@classmethod
|
|
async def get_file_content(
|
|
cls, file_path: str, repo: str, ref: str = "main"
|
|
) -> str:
|
|
"""获取文件内容
|
|
|
|
参数:
|
|
file_path: 文件路径
|
|
repo: 仓库名称
|
|
ref: 分支名称/标签名称/提交版本号
|
|
|
|
返回:
|
|
str: 文件内容
|
|
"""
|
|
try:
|
|
repository_id = ALIYUN_REPO_MAPPING.get(repo)
|
|
if not repository_id:
|
|
raise ValueError(f"未找到仓库 {repo} 对应的阿里云仓库ID")
|
|
|
|
client = await cls.get_client()
|
|
|
|
request = devops_20210625_models.GetFileBlobsRequest(
|
|
organization_id=ALIYUN_ORG_ID,
|
|
file_path=file_path,
|
|
ref=ref,
|
|
access_token=base64.b64decode(
|
|
RDC_access_token_encrypted.encode()
|
|
).decode(),
|
|
)
|
|
|
|
runtime = util_models.RuntimeOptions()
|
|
headers = {}
|
|
|
|
response = await client.get_file_blobs_with_options_async(
|
|
repository_id,
|
|
request,
|
|
headers,
|
|
runtime,
|
|
)
|
|
|
|
if response and response.body and response.body.result:
|
|
if not response.body.success:
|
|
raise ValueError(
|
|
f"阿里云请求失败: {response.body.error_code} - "
|
|
f"{response.body.error_message}"
|
|
)
|
|
return response.body.result.content or ""
|
|
|
|
raise ValueError("获取阿里云文件内容失败")
|
|
except Exception as e:
|
|
raise ValueError(f"获取阿里云文件内容失败: {e}")
|
|
|
|
@classmethod
|
|
async def get_repository_tree(
|
|
cls,
|
|
repo: str,
|
|
path: str = "",
|
|
ref: str = "main",
|
|
search_type: str = "DIRECT",
|
|
) -> list[AliyunTree]:
|
|
"""获取仓库树信息
|
|
|
|
参数:
|
|
repo: 仓库名称
|
|
path: 代码仓库内的文件路径
|
|
ref: 分支名称/标签名称/提交版本
|
|
search_type: 查找策略
|
|
"DIRECT" # 仅展示当前目录下的内容
|
|
"RECURSIVE" # 递归查找当前路径下的所有文件
|
|
"FLATTEN" # 扁平化展示
|
|
|
|
返回:
|
|
list[AliyunTree]: 仓库树信息列表
|
|
"""
|
|
try:
|
|
repository_id = ALIYUN_REPO_MAPPING.get(repo)
|
|
if not repository_id:
|
|
raise ValueError(f"未找到仓库 {repo} 对应的阿里云仓库ID")
|
|
|
|
client = await cls.get_client()
|
|
|
|
request = devops_20210625_models.ListRepositoryTreeRequest(
|
|
organization_id=ALIYUN_ORG_ID,
|
|
path=path,
|
|
access_token=base64.b64decode(
|
|
RDC_access_token_encrypted.encode()
|
|
).decode(),
|
|
ref_name=ref,
|
|
type=search_type,
|
|
)
|
|
|
|
runtime = util_models.RuntimeOptions()
|
|
headers = {}
|
|
|
|
response = await client.list_repository_tree_with_options_async(
|
|
repository_id, request, headers, runtime
|
|
)
|
|
|
|
if response and response.body:
|
|
if not response.body.success:
|
|
raise ValueError(
|
|
f"阿里云请求失败: {response.body.error_code} - "
|
|
f"{response.body.error_message}"
|
|
)
|
|
return [
|
|
AliyunTree(**item.to_map()) for item in (response.body.result or [])
|
|
]
|
|
raise ValueError("获取仓库树信息失败")
|
|
except Exception as e:
|
|
raise ValueError(f"获取仓库树信息失败: {e}")
|
|
|
|
@classmethod
|
|
async def get_newest_commit(cls, repo: str, branch: str = "main") -> str:
|
|
"""获取最新提交
|
|
参数:
|
|
repo: 仓库名称
|
|
branch: sha 分支名称/标签名称/提交版本号
|
|
返回:
|
|
commit: 最新提交信息
|
|
"""
|
|
try:
|
|
repository_id = ALIYUN_REPO_MAPPING.get(repo)
|
|
if not repository_id:
|
|
raise ValueError(f"未找到仓库 {repo} 对应的阿里云仓库ID")
|
|
|
|
client = await cls.get_client()
|
|
|
|
request = devops_20210625_models.GetRepositoryCommitRequest(
|
|
organization_id=ALIYUN_ORG_ID,
|
|
access_token=base64.b64decode(
|
|
RDC_access_token_encrypted.encode()
|
|
).decode(),
|
|
)
|
|
|
|
runtime = util_models.RuntimeOptions()
|
|
headers = {}
|
|
|
|
response = await client.get_repository_commit_with_options_async(
|
|
repository_id, branch, request, headers, runtime
|
|
)
|
|
|
|
if response and response.body:
|
|
if not response.body.success:
|
|
raise ValueError(
|
|
f"阿里云请求失败: {response.body.error_code} - "
|
|
f"{response.body.error_message}"
|
|
)
|
|
return response.body.result.id or ""
|
|
raise ValueError("获取仓库commit信息失败")
|
|
except Exception as e:
|
|
raise ValueError(f"获取仓库commit信息失败: {e}")
|
|
|
|
def export_files(
|
|
self, tree_list: list[AliyunTree], module_path: str, is_dir: bool
|
|
) -> list[str]:
|
|
"""导出文件路径"""
|
|
return [
|
|
file.path
|
|
for file in tree_list
|
|
if file.type == AliyunTreeType.FILE
|
|
and file.path.startswith(module_path)
|
|
and (not is_dir or file.path[len(module_path)] == "/" or not module_path)
|
|
]
|
|
|
|
@classmethod
|
|
async def parse_repo_info(cls, repo: str) -> list[str]:
|
|
"""解析仓库信息获取仓库树"""
|
|
repository_id = ALIYUN_REPO_MAPPING.get(repo)
|
|
if not repository_id:
|
|
raise ValueError(f"未找到仓库 {repo} 对应的阿里云仓库ID")
|
|
|
|
tree_list = await cls.get_repository_tree(
|
|
repo=repo,
|
|
)
|
|
return cls().export_files(tree_list, "", True)
|