From b6867b904d358bd6e1f285556ac950f4a576df76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E6=B2=B3=E6=99=B4?= Date: Tue, 11 Mar 2025 17:07:37 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8os.g?= =?UTF-8?q?etenv=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BB=8E?= =?UTF-8?q?config=E5=AF=B9=E8=B1=A1=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=9A=84=E5=80=BC=E6=97=B6=E5=87=BA=E7=8E=B0KeyError?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/__init__.py | 15 ++++++++------- src/plugins/memory_system/memory.py | 15 ++++++++------- src/plugins/memory_system/memory_test1.py | 15 ++++++++------- src/plugins/schedule/schedule_generator.py | 17 +++++++++-------- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/plugins/chat/__init__.py b/src/plugins/chat/__init__.py index 2e01262b1..11c059c1c 100644 --- a/src/plugins/chat/__init__.py +++ b/src/plugins/chat/__init__.py @@ -1,5 +1,6 @@ import asyncio import time +import os from loguru import logger from nonebot import get_driver, on_message, require @@ -31,13 +32,13 @@ driver = get_driver() config = driver.config Database.initialize( - uri=config.MONGODB_URI, - host=config.MONGODB_HOST, - port=int(config.MONGODB_PORT), - db_name=config.DATABASE_NAME, - username=config.MONGODB_USERNAME, - password=config.MONGODB_PASSWORD, - auth_source=config.MONGODB_AUTH_SOURCE + uri=os.getenv("MONGODB_URI"), + host=os.getenv("MONGODB_HOST", "127.0.0.1"), + port=int(os.getenv("MONGODB_PORT", "27017")), + db_name=os.getenv("DATABASE_NAME", "MegBot"), + username=os.getenv("MONGODB_USERNAME"), + password=os.getenv("MONGODB_PASSWORD"), + auth_source=os.getenv("MONGODB_AUTH_SOURCE"), ) logger.success("初始化数据库成功") diff --git a/src/plugins/memory_system/memory.py b/src/plugins/memory_system/memory.py index 13a9f8c38..2884b6dae 100644 --- a/src/plugins/memory_system/memory.py +++ b/src/plugins/memory_system/memory.py @@ -3,6 +3,7 @@ import datetime import math import random import time +import os import jieba import networkx as nx @@ -887,13 +888,13 @@ config = driver.config start_time = time.time() Database.initialize( - uri=config.MONGODB_URI, - host=config.MONGODB_HOST, - port=config.MONGODB_PORT, - db_name=config.DATABASE_NAME, - username=config.MONGODB_USERNAME, - password=config.MONGODB_PASSWORD, - auth_source=config.MONGODB_AUTH_SOURCE + uri=os.getenv("MONGODB_URI"), + host=os.getenv("MONGODB_HOST", "127.0.0.1"), + port=int(os.getenv("MONGODB_PORT", "27017")), + db_name=os.getenv("DATABASE_NAME", "MegBot"), + username=os.getenv("MONGODB_USERNAME"), + password=os.getenv("MONGODB_PASSWORD"), + auth_source=os.getenv("MONGODB_AUTH_SOURCE"), ) # 创建记忆图 memory_graph = Memory_graph() diff --git a/src/plugins/memory_system/memory_test1.py b/src/plugins/memory_system/memory_test1.py index bbd734ec2..72accc2b3 100644 --- a/src/plugins/memory_system/memory_test1.py +++ b/src/plugins/memory_system/memory_test1.py @@ -69,13 +69,14 @@ class Database: def __init__(self): if not Database.db: Database.initialize( - host=os.getenv("MONGODB_HOST"), - port=int(os.getenv("MONGODB_PORT")), - db_name=os.getenv("DATABASE_NAME"), - username=os.getenv("MONGODB_USERNAME"), - password=os.getenv("MONGODB_PASSWORD"), - auth_source=os.getenv("MONGODB_AUTH_SOURCE") - ) + uri=os.getenv("MONGODB_URI"), + host=os.getenv("MONGODB_HOST", "127.0.0.1"), + port=int(os.getenv("MONGODB_PORT", "27017")), + db_name=os.getenv("DATABASE_NAME", "MegBot"), + username=os.getenv("MONGODB_USERNAME"), + password=os.getenv("MONGODB_PASSWORD"), + auth_source=os.getenv("MONGODB_AUTH_SOURCE"), + ) @classmethod def initialize(cls, host, port, db_name, username=None, password=None, auth_source="admin"): diff --git a/src/plugins/schedule/schedule_generator.py b/src/plugins/schedule/schedule_generator.py index 2fe259c47..12c6ce3b5 100644 --- a/src/plugins/schedule/schedule_generator.py +++ b/src/plugins/schedule/schedule_generator.py @@ -1,3 +1,4 @@ +import os import datetime import json from typing import Dict, Union @@ -14,13 +15,13 @@ driver = get_driver() config = driver.config Database.initialize( - uri=config.MONGODB_URI, - host=config.MONGODB_HOST, - port=int(config.MONGODB_PORT), - db_name=config.DATABASE_NAME, - username=config.MONGODB_USERNAME, - password=config.MONGODB_PASSWORD, - auth_source=config.MONGODB_AUTH_SOURCE + uri=os.getenv("MONGODB_URI"), + host=os.getenv("MONGODB_HOST", "127.0.0.1"), + port=int(os.getenv("MONGODB_PORT", "27017")), + db_name=os.getenv("DATABASE_NAME", "MegBot"), + username=os.getenv("MONGODB_USERNAME"), + password=os.getenv("MONGODB_PASSWORD"), + auth_source=os.getenv("MONGODB_AUTH_SOURCE"), ) class ScheduleGenerator: @@ -176,6 +177,6 @@ class ScheduleGenerator: # print(scheduler.tomorrow_schedule) # if __name__ == "__main__": -# main() +# main() bot_schedule = ScheduleGenerator()