From a7e6bc14dc9a71ad7eaea0eaae9b950f5d2919cd Mon Sep 17 00:00:00 2001 From: NepPure Date: Sun, 2 Mar 2025 19:17:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=BD=8D=E7=BD=AE=E5=B9=B6=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 +-- docker-compose.yml | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 111466ff3..6a7aa09c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,7 @@ FROM nonebot/nb-cli:latest WORKDIR / COPY . /MaiMBot/ WORKDIR /MaiMBot -RUN mv config/env.example config/.env \ -&& mv config/bot_config_toml config/bot_config.toml +RUN mv config/bot_config_toml config/bot_config.toml RUN pip install --upgrade -r requirements.txt VOLUME [ "/MaiMBot/config" ] EXPOSE 8080 diff --git a/docker-compose.yml b/docker-compose.yml index 4c136b284..cfe787c04 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: - mongodb:/data/db - mongodbCONFIG:/data/configdb image: mongo:latest - + maimbot: container_name: maimbot environment: @@ -41,8 +41,8 @@ services: volumes: - maimbotCONFIG:/MaiMBot/config - maimbotDATA:/MaiMBot/data + - ./.env.prod:/MaiMBot/.env.prod image: sengokucola/maimbot:latest - volumes: maimbotCONFIG: @@ -51,4 +51,5 @@ volumes: napcatCONFIG: mongodb: mongodbCONFIG: - + + From 352a10d4ee53663b339cfdd607cb60b80f36e0d0 Mon Sep 17 00:00:00 2001 From: NepPure Date: Sun, 2 Mar 2025 19:27:53 +0800 Subject: [PATCH 2/5] add colorama --- requirements.txt | Bin 520 -> 540 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3f0fe05ddd8064040ea79e51e0a7998bbc477374..11536d12ac13cd06045bcb620cb223d5e19ba7ec 100644 GIT binary patch delta 28 gcmeBRnZvSygGq#!fr}xTA)g@!h>I8!8FGOb08&^5U;qFB delta 7 OcmbQk(!sKUg9!i$Jptzc From c1f2b6a0eb942b0ae1f659dd4fb352e8fbae04f6 Mon Sep 17 00:00:00 2001 From: NepPure Date: Sun, 2 Mar 2025 19:36:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?#=20=E6=82=A8=E4=B8=8D=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E6=96=87=E4=BB=B6=E8=A2=AB=E4=BB=93=E5=BA=93=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=EF=BC=8C=E8=AF=B7=E4=BF=AE=E6=94=B9.env.prod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 25 +++++++++++++++++++++++++ .gitignore | 3 +-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 000000000..2c8e76c18 --- /dev/null +++ b/.env @@ -0,0 +1,25 @@ +# 您不应该修改默认值，这个文件被仓库索引，请修改.env.prod +HOST=127.0.0.1 +PORT=8080 + +COMMAND_START=["/"] + +# 插件配置 +PLUGINS=["src2.plugins.chat"] + +# 默认配置 +MONGODB_HOST=127.0.0.1 +MONGODB_PORT=27017 +DATABASE_NAME=MegBot + +MONGODB_USERNAME = "" # 默认空值 +MONGODB_PASSWORD = "" # 默认空值 +MONGODB_AUTH_SOURCE = "" # 默认空值 + +#key and url +CHAT_ANY_WHERE_KEY= +SILICONFLOW_KEY= +CHAT_ANY_WHERE_BASE_URL=https://api.chatanywhere.tech/v1 +SILICONFLOW_BASE_URL=https://api.siliconflow.cn/v1/ +DEEP_SEEK_KEY= +DEEP_SEEK_BASE_URL=https://api.deepseek.com/v1 \ No newline at end of file diff --git a/.gitignore b/.gitignore index c19b9ce33..097126da9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ reasoning_content.bat reasoning_window.bat queue_update.txt memory_graph.gml -.env.dev +.env.* # Byte-compiled / optimized / DLL files @@ -147,7 +147,6 @@ celerybeat.pid *.sage.py # Environments -.env .venv env/ venv/ From 3db73fe03c6ea4874503defdcd7b7a4ed7e398ab Mon Sep 17 00:00:00 2001 From: NepPure Date: Sun, 2 Mar 2025 19:37:32 +0800 Subject: [PATCH 4/5] ENVIRONMENT=prod --- .env | 1 + 1 file changed, 1 insertion(+) diff --git a/.env b/.env index 2c8e76c18..6e242e1f5 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ # 您不应该修改默认值，这个文件被仓库索引，请修改.env.prod +ENVIRONMENT=prod HOST=127.0.0.1 PORT=8080 From 304562d93a7831bf1f63e4e6d096d011136db714 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Sun, 2 Mar 2025 19:43:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=E5=BC=82=E6=AD=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/schedule/schedule_llm_module.py | 23 ++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/plugins/schedule/schedule_llm_module.py b/src/plugins/schedule/schedule_llm_module.py index cf88a8653..1fcad52d2 100644 --- a/src/plugins/schedule/schedule_llm_module.py +++ b/src/plugins/schedule/schedule_llm_module.py @@ -23,7 +23,7 @@ class LLMModel: self.model_name = model_name self.params = kwargs - async def generate_response(self, prompt: str) -> Tuple[str, str]: + def generate_response(self, prompt: str) -> Tuple[str, str]: """根据输入的提示生成模型的响应""" headers = { "Authorization": f"Bearer {self.api_key}", @@ -42,17 +42,16 @@ class LLMModel: api_url = f"{self.base_url.rstrip('/')}/chat/completions" try: - async with aiohttp.ClientSession() as session: - async with session.post(api_url, headers=headers, json=data) as response: - response.raise_for_status() # 检查响应状态 - - result = await response.json() - if "choices" in result and len(result["choices"]) > 0: - content = result["choices"][0]["message"]["content"] - reasoning_content = result["choices"][0]["message"].get("reasoning_content", "") - return content, reasoning_content # 返回内容和推理内容 - return "没有返回结果", "" # 返回两个值 - + response = requests.post(api_url, headers=headers, json=data) + response.raise_for_status() # 检查响应状态 + + result = response.json() + if "choices" in result and len(result["choices"]) > 0: + content = result["choices"][0]["message"]["content"] + reasoning_content = result["choices"][0]["message"].get("reasoning_content", "") + return content, reasoning_content # 返回内容和推理内容 + return "没有返回结果", "" # 返回两个值 + except Exception as e: return f"请求失败: {str(e)}", "" # 返回错误信息和空字符串