liuwei_x_x/abot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除Glances依赖与遗留配置项

Browse Source
This commit is contained in:
liuwei
2026-05-06 10:39:46 +08:00
parent 0b8b60e3aa
commit 16daf24dfc
4 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.example.yaml
View File

@@ -31,10 +31,6 @@ email_config:
sender_password: "${ABOT_EMAIL_PASSWORD:}" sender_password: "${ABOT_EMAIL_PASSWORD:}"
alert_recipient: "${ABOT_EMAIL_ALERT_RECIPIENT:}" alert_recipient: "${ABOT_EMAIL_ALERT_RECIPIENT:}"
glances:
host: "${ABOT_GLANCES_HOST:127.0.0.1}"
port: "${ABOT_GLANCES_PORT:61208}"
wx_config: wx_config:
# 微信管理账号，用于接收部分管理员指令。 # 微信管理账号，用于接收部分管理员指令。
admin: [ "${ABOT_WX_ADMIN:admin}" ] admin: [ "${ABOT_WX_ADMIN:admin}" ]

4
config.yaml
View File

@@ -31,10 +31,6 @@ email_config:
sender_password: "${ABOT_EMAIL_PASSWORD:}" sender_password: "${ABOT_EMAIL_PASSWORD:}"
alert_recipient: "${ABOT_EMAIL_ALERT_RECIPIENT:}" alert_recipient: "${ABOT_EMAIL_ALERT_RECIPIENT:}"
glances:
host: "${ABOT_GLANCES_HOST:127.0.0.1}"
port: "${ABOT_GLANCES_PORT:61208}"
wx_config: wx_config:
# 微信管理账号，用于接收部分管理员指令。 # 微信管理账号，用于接收部分管理员指令。
admin: [ "${ABOT_WX_ADMIN:admin}" ] admin: [ "${ABOT_WX_ADMIN:admin}" ]

7
configuration.py
View File

@@ -168,7 +168,7 @@ class Config(object):
db_config["pool_size"] = self._safe_int(db_config.get("pool_size", 10), 10) db_config["pool_size"] = self._safe_int(db_config.get("pool_size", 10), 10)
normalized["db_config"] = db_config normalized["db_config"] = db_config
# Redis / 邮件 / Glances 配置中不少值来自环境变量，解析后先统一转型， # Redis / 邮件 配置中不少值来自环境变量，解析后先统一转型，
# 这样后续业务代码就不需要到处防守“字符串数字”的情况。 # 这样后续业务代码就不需要到处防守“字符串数字”的情况。
redis_config = dict(normalized.get("redis_config", {}) or {}) redis_config = dict(normalized.get("redis_config", {}) or {})
redis_config["port"] = self._safe_int(redis_config.get("port", 6379), 6379) redis_config["port"] = self._safe_int(redis_config.get("port", 6379), 6379)
@@ -180,10 +180,6 @@ class Config(object):
email_config["smtp_port"] = self._safe_int(email_config.get("smtp_port", 465), 465) email_config["smtp_port"] = self._safe_int(email_config.get("smtp_port", 465), 465)
normalized["email_config"] = email_config normalized["email_config"] = email_config
glances_config = dict(normalized.get("glances", {}) or {})
glances_config["port"] = self._safe_int(glances_config.get("port", 61208), 61208)
normalized["glances"] = glances_config
return normalized return normalized
@classmethod @classmethod
@@ -430,7 +426,6 @@ class Config(object):
self.mariadb = self.resolved_config.get("db_config", {}) self.mariadb = self.resolved_config.get("db_config", {})
self.redis = self.resolved_config.get("redis_config", {}) self.redis = self.resolved_config.get("redis_config", {})
self.email = self.resolved_config.get("email_config", {}) self.email = self.resolved_config.get("email_config", {})
self.glances = self.resolved_config.get("glances", {})
self.wx_config = self.resolved_config.get("wx_config", {}) self.wx_config = self.resolved_config.get("wx_config", {})
self.llm = self.resolved_config.get("llm", {}) self.llm = self.resolved_config.get("llm", {})

2
requirements.txt
View File

@@ -45,8 +45,6 @@ loguru~=0.7.3
opencv-python~=4.11.0.86 opencv-python~=4.11.0.86
pathlib~=1.0.1 pathlib~=1.0.1
Glances~=4.3.1
aiofiles~=24.1.0 aiofiles~=24.1.0
undetected-chromedriver~=3.5.5 undetected-chromedriver~=3.5.5
urllib3~=2.5.0 urllib3~=2.5.0