shen/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-02-25 08:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: global plugin config read

Browse Source
This commit is contained in:
zhayujie
2023-07-20 14:24:40 +08:00
parent 954e55f4b4
commit 4bab4299f2
5 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/banwords/banwords.py
View File

@@ -26,14 +26,16 @@ class Banwords(Plugin):
try:
curdir = os.path.dirname(__file__)
config_path = os.path.join(curdir, "config.json")
conf = None
if not os.path.exists(config_path):
conf = {"action": "ignore"}
with open(config_path, "w") as f:
json.dump(conf, f, indent=4)
else:
with open(config_path, "r") as f:
conf = super().load_config() or json.load(f)
# loading config from global plugin config
conf = super().load_config()
if not conf:
if not os.path.exists(config_path):
conf = {"action": "ignore"}
with open(config_path, "w") as f:
json.dump(conf, f, indent=4)
else:
with open(config_path, "r") as f:
conf = super().load_config() or json.load(f)
self.searchr = WordsSearch()
self.action = conf["action"]
banwords_path = os.path.join(curdir, "banwords.txt")

13
plugins/bdunit/bdunit.py
View File

@@ -31,12 +31,13 @@ class BDunit(Plugin):
try:
curdir = os.path.dirname(__file__)
config_path = os.path.join(curdir, "config.json")
conf = None
if not os.path.exists(config_path):
raise Exception("config.json not found")
else:
with open(config_path, "r") as f:
conf = super().load_config() or json.load(f)
conf = super().load_config()
if not conf:
if not os.path.exists(config_path):
raise Exception("config.json not found")
else:
with open(config_path, "r") as f:
conf = json.load(f)
self.service_id = conf["service_id"]
self.api_key = conf["api_key"]
self.secret_key = conf["secret_key"]

18
plugins/godcmd/godcmd.py
View File

@@ -180,14 +180,16 @@ class Godcmd(Plugin):
curdir = os.path.dirname(__file__)
config_path = os.path.join(curdir, "config.json")
gconf = None
if not os.path.exists(config_path):
gconf = {"password": "", "admin_users": []}
with open(config_path, "w") as f:
json.dump(gconf, f, indent=4)
else:
with open(config_path, "r") as f:
gconf = super().load_config() or json.load(f)
# loading config from global plugin config
gconf = super().load_config()
if not gconf:
if not os.path.exists(config_path):
gconf = {"password": "", "admin_users": []}
with open(config_path, "w") as f:
json.dump(gconf, f, indent=4)
else:
with open(config_path, "r") as f:
gconf = json.load(f)
if gconf["password"] == "":
self.temp_password = "".join(random.sample(string.digits, 4))
logger.info("[Godcmd] 因未设置口令，本次的临时口令为%s。" % self.temp_password)

5
plugins/plugin.py
View File

@@ -1,5 +1,6 @@
import os
from config import pconf
from common.log import logger
class Plugin:
def __init__(self):
@@ -10,7 +11,9 @@ class Plugin:
加载当前插件配置
:return: 插件配置字典
"""
return pconf(self.name)
conf = pconf(self.name)
logger.info(f"loading from global plugin config, plugin_name={self.name}, conf={conf}")
return conf
def get_help_text(self, **kwargs):
return "暂无帮助信息"

13
plugins/tool/tool.py
View File

@@ -121,12 +121,13 @@ class Tool(Plugin):
def _read_json(self) -> dict:
curdir = os.path.dirname(__file__)
config_path = os.path.join(curdir, "config.json")
tool_config = {"tools": [], "kwargs": {}}
if not os.path.exists(config_path):
return tool_config
else:
with open(config_path, "r") as f:
tool_config = super().load_config() or json.load(f)
tool_config = super().load_config()
if not tool_config:
if not os.path.exists(config_path):
return {"tools": [], "kwargs": {}}
else:
with open(config_path, "r") as f:
tool_config = json.load(f)
return tool_config
def _build_tool_kwargs(self, kwargs: dict):