diff --git a/util/cmd_config.py b/util/cmd_config.py index d5fc5cdc..0312505e 100644 --- a/util/cmd_config.py +++ b/util/cmd_config.py @@ -40,14 +40,18 @@ class CmdConfig(): @staticmethod def init_attributes(keys: list, init_val = ""): check_exist() + conf_str = '' with open(cpath, "r", encoding="utf-8") as f: - d = json.load(f) - _tag = False - for k in keys: - if k not in d: - d[k] = init_val - _tag = True - if _tag: - with open(cpath, "w", encoding="utf-8") as f: - json.dump(d, f, indent=4, ensure_ascii=False) - f.flush() \ No newline at end of file + conf_str = f.read() + if conf_str.startswith(u'/ufeff'): + conf_str = conf_str.encode('utf8')[3:].decode('utf8') + d = json.loads(conf_str) + _tag = False + for k in keys: + if k not in d: + d[k] = init_val + _tag = True + if _tag: + with open(cpath, "w", encoding="utf-8") as f: + json.dump(d, f, indent=4, ensure_ascii=False) + f.flush() \ No newline at end of file diff --git a/util/gplugin.py b/util/gplugin.py index 0c8a455a..5795179f 100644 --- a/util/gplugin.py +++ b/util/gplugin.py @@ -259,7 +259,7 @@ def web_search(question, provider: Provider, session_id, official_fc=False): if has_func: provider.forget(session_id) - question3 = f"""请你用活泼的语气回答`{question}`问题。\n以下是相关材料,请直接拿此材料针对问题进行总结回答。在引文末加上参考链接的标号,如` [1]`;在文章末尾加上各参考链接,如`[1] <标题> <网址>`;不要提到任何函数调用的信息;在总结的末尾加上 1-2 个相关的emoji。```\n{function_invoked_ret}\n```\n""" + question3 = f"""请你用活泼的语气回答`{question}`问题。\n以下是相关材料,请直接拿此材料针对问题进行总结回答。在文章末尾加上各参考链接,如`[1] <url>`;不要提到任何函数调用的信息;在总结的末尾加上1或2个相关的emoji。```\n{function_invoked_ret}\n```\n""" gu.log(f"web_search: {question3}", tag="web_search", level=gu.LEVEL_DEBUG, max_len=99999) _c = 0 while _c < 3: