Genshin-bots/gsuid_core
1
0
Fork 0
mirror of https://github.com/Genshin-bots/gsuid_core.git synced 2025-05-08 21:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ 升级部分依赖, 完善pdm的自动安装依赖部分

Browse Source
This commit is contained in:
KimigaiiWuyi 2024-02-07 04:53:22 +08:00
parent 27f4b835d5
commit cfb362e22f
7 changed files with 1325 additions and 1198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
# ⚙️[GenshinUID](https://github.com/KimigaiiWuyi/GenshinUID) Core 0.1.0 # ⚙️[GenshinUID](https://github.com/KimigaiiWuyi/GenshinUID) Core 0.5.1
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?&labelColor=ef8336)](https://pycqa.github.io/isort/) [![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?&labelColor=ef8336)](https://pycqa.github.io/isort/)

14
gsuid_core/server.py
View File

@ -202,6 +202,18 @@ def check_pyproject(pyproject: Path):
def install_dependencies(dependencies: Dict): def install_dependencies(dependencies: Dict):
global installed_dependencies global installed_dependencies
start_tool = check_start_tool()
if start_tool == 'pdm':
result = subprocess.run(
'pdm run python -m ensurepip',
capture_output=True,
text=True,
)
# 检查命令执行结果
if result.returncode != 0:
logger.warning("PDM中pip环境检查失败。错误信息：")
logger.warning(result.stderr)
return
# 解析依赖项 # 解析依赖项
for ( for (
dependency, dependency,
@ -214,7 +226,7 @@ def install_dependencies(dependencies: Dict):
): ):
logger.info(f'安装依赖 {dependency} 中...') logger.info(f'安装依赖 {dependency} 中...')
result = subprocess.run( result = subprocess.run(
f'{check_start_tool()} install {dependency}', f'{start_tool} install {dependency}',
capture_output=True, capture_output=True,
text=True, text=True,
) )

12
gsuid_core/utils/download_resource/download_core.py
View File

@ -118,9 +118,7 @@ async def download_all_file(
pre_data = content_bs.find_all('pre')[0] pre_data = content_bs.find_all('pre')[0]
data_list = pre_data.find_all('a') data_list = pre_data.find_all('a')
size_list = [i for i in content_bs.strings] size_list = [i for i in content_bs.strings]
logger.trace( logger.trace(f'{TAG} 数据库 {endpoint} 中存在 {len(data_list)} 个内容!')
f'{TAG} 数据库 {endpoint} 中存在 {len(data_list)} 个内容!'
)
temp_num = 0 temp_num = 0
size_temp = 0 size_temp = 0
@ -141,9 +139,7 @@ async def download_all_file(
or not os.stat(file_path).st_size or not os.stat(file_path).st_size
or not is_diff or not is_diff
): ):
logger.info( logger.info(f'{TAG} {plugin_name} 开始下载 {endpoint}/{name}')
f'{TAG} {plugin_name} 开始下载 {endpoint}/{name}'
)
temp_num += 1 temp_num += 1
size_temp += size size_temp += size
TASKS.append( TASKS.append(
@ -163,9 +159,7 @@ async def download_all_file(
logger.trace(f'{TAG} 数据库 {endpoint} 无需下载!') logger.trace(f'{TAG} 数据库 {endpoint} 无需下载!')
n += 1 n += 1
else: else:
logger.success( logger.success(f'{TAG}数据库 {endpoint} 已下载{temp_num}个内容!')
f'{TAG}数据库 {endpoint} 已下载{temp_num}个内容!'
)
temp_num = 0 temp_num = 0
if n == len(EPATH_MAP): if n == len(EPATH_MAP):
logger.success(f'插件 {plugin_name} 资源库已是最新!') logger.success(f'插件 {plugin_name} 资源库已是最新!')

1259
pdm.lock generated
View File

File diff suppressed because it is too large Load Diff

1173
poetry.lock generated
View File

File diff suppressed because it is too large Load Diff

6
pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "gsuid-core" name = "gsuid-core"
version = "0.1.0" version = "0.5.1"
description = "KimigaiiWuyi/GenshinUID 的核心部分，平台无关，便于移植到其他平台以及框架。" description = "KimigaiiWuyi/GenshinUID 的核心部分，平台无关，便于移植到其他平台以及框架。"
authors = ["KimigaiiWuyi <444835641@qq.com>", "MingxuanGame <MingxuanGame@outlook.com>"] authors = ["KimigaiiWuyi <444835641@qq.com>", "MingxuanGame <MingxuanGame@outlook.com>"]
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
@ -43,6 +43,7 @@ toml = "^0.10.2"
bcrypt = "^4.0.1" bcrypt = "^4.0.1"
motor = "^3.3.2" motor = "^3.3.2"
pymongo = "^4.6.1" pymongo = "^4.6.1"
setuptools = ">=69.0.3"
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]
flake8 = "^6.0.0" flake8 = "^6.0.0"
@ -120,9 +121,10 @@ dependencies = [
"bcrypt==4.0.1", "bcrypt==4.0.1",
"pymongo>=4.6.1", "pymongo>=4.6.1",
"motor>=3.3.2", "motor>=3.3.2",
"setuptools>=69.0.3",
] ]
name = "gsuid-core" name = "gsuid-core"
version = "0.1.0" version = "0.5.1"
description = "KimigaiiWuyi/GenshinUID 的核心部分，平台无关，便于移植到其他平台以及框架。" description = "KimigaiiWuyi/GenshinUID 的核心部分，平台无关，便于移植到其他平台以及框架。"
readme = "README.md" readme = "README.md"

57
requirements.txt
View File

@ -1,75 +1,76 @@
--index-url https://mirrors.bfsu.edu.cn/pypi/web/simple --index-url https://mirrors.bfsu.edu.cn/pypi/web/simple
aioboto3==12.1.0 ; python_full_version >= "3.8.1" and python_version < "4.0" aioboto3==12.3.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
aiobotocore[boto3]==2.8.0 ; python_full_version >= "3.8.1" and python_version < "4.0" aiobotocore[boto3]==2.11.2 ; python_full_version >= "3.8.1" and python_version < "4.0"
aiofiles==23.2.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" aiofiles==23.2.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
aiohttp==3.9.1 ; python_full_version >= "3.8.1" and python_version < "4.0" aiohttp==3.9.3 ; python_full_version >= "3.8.1" and python_version < "4.0"
aioitertools==0.11.0 ; python_full_version >= "3.8.1" and python_version < "4.0" aioitertools==0.11.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
aiosignal==1.3.1 ; python_full_version >= "3.8.1" and python_version < "4.0" aiosignal==1.3.1 ; python_full_version >= "3.8.1" and python_version < "4.0"
aiosqlite==0.19.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" aiosqlite==0.19.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
anyio==3.7.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" anyio==4.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
apscheduler==3.10.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" apscheduler==3.10.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
async-timeout==4.0.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" async-timeout==4.0.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
attrs==23.1.0 ; python_full_version >= "3.8.1" and python_version < "4.0" attrs==23.2.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
backports-zoneinfo==0.2.1 ; python_full_version >= "3.8.1" and python_version < "3.9" backports-zoneinfo==0.2.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
bcrypt==4.1.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" bcrypt==4.1.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
beautifulsoup4==4.12.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" beautifulsoup4==4.12.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
boto3==1.33.1 ; python_full_version >= "3.8.1" and python_version < "4.0" boto3==1.34.34 ; python_full_version >= "3.8.1" and python_version < "4.0"
botocore==1.33.1 ; python_full_version >= "3.8.1" and python_version < "4.0" botocore==1.34.34 ; python_full_version >= "3.8.1" and python_version < "4.0"
casbin==1.33.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" casbin==1.35.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
certifi==2023.11.17 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" certifi==2024.2.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
click==8.1.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" click==8.1.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
colorama==0.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" colorama==0.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
dnspython==2.4.2 ; python_full_version >= "3.8.1" and python_version < "4.0" dnspython==2.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
email-validator==1.3.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" email-validator==1.3.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
exceptiongroup==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.11" exceptiongroup==1.2.0 ; python_full_version >= "3.8.1" and python_version < "3.11"
fastapi-amis-admin==0.6.9 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" fastapi-amis-admin==0.6.9 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
fastapi-user-auth==0.6.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" fastapi-user-auth==0.6.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
fastapi==0.105.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" fastapi==0.109.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
frozenlist==1.4.1 ; python_full_version >= "3.8.1" and python_version < "4.0" frozenlist==1.4.1 ; python_full_version >= "3.8.1" and python_version < "4.0"
gitdb==4.0.11 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" gitdb==4.0.11 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
gitpython==3.1.40 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" gitpython==3.1.41 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
greenlet==3.0.3 ; python_full_version >= "3.8.1" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0" greenlet==3.0.3 ; python_full_version >= "3.8.1" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0"
h11==0.14.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" h11==0.14.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
httpcore==1.0.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" httpcore==1.0.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
httpx==0.26.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" httpx==0.26.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
idna==3.6 ; python_full_version >= "3.8.1" and python_version < "4.0" idna==3.6 ; python_full_version >= "3.8.1" and python_version < "4.0"
jinja2==3.1.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" jinja2==3.1.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
jmespath==1.0.1 ; python_full_version >= "3.8.1" and python_version < "4.0" jmespath==1.0.1 ; python_full_version >= "3.8.1" and python_version < "4.0"
loguru==0.6.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" loguru==0.6.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
lxml==4.9.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" lxml==5.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
markupsafe==2.1.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" markupsafe==2.1.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
motor==3.3.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" motor==3.3.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
mpmath==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" mpmath==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
msgspec==0.18.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" msgspec==0.18.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
multidict==6.0.4 ; python_full_version >= "3.8.1" and python_version < "4.0" multidict==6.0.5 ; python_full_version >= "3.8.1" and python_version < "4.0"
passlib==1.7.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" passlib==1.7.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pillow==10.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" pillow==10.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pydantic==1.10.13 ; python_full_version >= "3.8.1" and python_version < "4.0" pydantic==1.10.14 ; python_full_version >= "3.8.1" and python_version < "4.0"
pymongo==4.6.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" pymongo==4.6.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pypng==0.20220715.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" pypng==0.20220715.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
python-dateutil==2.8.2 ; python_full_version >= "3.8.1" and python_version < "4.0" python-dateutil==2.8.2 ; python_full_version >= "3.8.1" and python_version < "4.0"
python-multipart==0.0.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" python-multipart==0.0.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pytz==2023.3.post1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" pytz==2024.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
qrcode[pil]==7.4.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" qrcode[pil]==7.4.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
s3transfer==0.8.0 ; python_full_version >= "3.8.1" and python_version < "4.0" s3transfer==0.10.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
setuptools==69.0.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
simpleeval==0.9.13 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" simpleeval==0.9.13 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
six==1.16.0 ; python_full_version >= "3.8.1" and python_version < "4.0" six==1.16.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
smmap==5.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" smmap==5.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
sniffio==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" sniffio==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
soupsieve==2.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" soupsieve==2.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
sqlalchemy-database==0.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" sqlalchemy-database==0.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
sqlalchemy2-stubs==0.0.2a37 ; python_full_version >= "3.8.1" and python_version < "4.0" sqlalchemy2-stubs==0.0.2a38 ; python_full_version >= "3.8.1" and python_version < "4.0"
sqlalchemy==1.4.50 ; python_full_version >= "3.8.1" and python_version < "4.0" sqlalchemy==1.4.51 ; python_full_version >= "3.8.1" and python_version < "4.0"
sqlmodel==0.0.11 ; python_full_version >= "3.8.1" and python_version < "4.0" sqlmodel==0.0.11 ; python_full_version >= "3.8.1" and python_version < "4.0"
sqlmodelx==0.0.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" sqlmodelx==0.0.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
starlette==0.27.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" starlette==0.36.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
toml==0.10.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" toml==0.10.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
typing-extensions==4.9.0 ; python_full_version >= "3.8.1" and python_version < "4.0" typing-extensions==4.9.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
tzdata==2023.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and platform_system == "Windows" tzdata==2023.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and platform_system == "Windows"
tzlocal==5.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" tzlocal==5.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
urllib3==1.26.18 ; python_full_version >= "3.8.1" and python_version < "4.0" urllib3==1.26.18 ; python_full_version >= "3.8.1" and python_version < "4.0"
uvicorn==0.25.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" uvicorn==0.27.0.post1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
websockets==10.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" websockets==10.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
win32-setctime==1.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and sys_platform == "win32" win32-setctime==1.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and sys_platform == "win32"
wrapt==1.16.0 ; python_full_version >= "3.8.1" and python_version < "4.0" wrapt==1.16.0 ; python_full_version >= "3.8.1" and python_version < "4.0"