From 7ea1b7bbe866f8407fcd3b68bb303378109a619e Mon Sep 17 00:00:00 2001 From: zstar <65890619+zstar1003@users.noreply.github.com> Date: Mon, 9 Jun 2025 15:43:59 +0800 Subject: [PATCH] =?UTF-8?q?chore(database):=20=E7=A7=BB=E9=99=A4=E6=9C=AA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了 MySQL、Elasticsearch 和 Redis 的连接代码 - 保留了 MinIO 的连接代码 - 移除了未使用的导入语句 --- api/db/services/database.py | 85 ------------------------------------- 1 file changed, 85 deletions(-) diff --git a/api/db/services/database.py b/api/db/services/database.py index 0d365ac..29cdee0 100644 --- a/api/db/services/database.py +++ b/api/db/services/database.py @@ -1,9 +1,6 @@ -import mysql.connector import os -import redis from minio import Minio from dotenv import load_dotenv -from elasticsearch import Elasticsearch from pathlib import Path # 加载环境变量 @@ -25,36 +22,15 @@ def is_running_in_docker(): # 根据运行环境选择合适的主机地址和端口 if is_running_in_docker(): - MYSQL_HOST = "mysql" - MYSQL_PORT = 3306 MINIO_HOST = "minio" MINIO_VISIT_HOST = os.getenv("MINIO_VISIT_HOST", "localhost") MINIO_PORT = 9000 - ES_HOST = "es01" - ES_PORT = 9200 - REDIS_HOST = "redis" - REDIS_PORT = 6379 else: - MYSQL_HOST = "localhost" - MYSQL_PORT = int(os.getenv("MYSQL_PORT", "5455")) MINIO_HOST = "localhost" MINIO_VISIT_HOST = "localhost" MINIO_PORT = int(os.getenv("MINIO_PORT", "9000")) - ES_HOST = "localhost" - ES_PORT = int(os.getenv("ES_PORT", "9200")) - REDIS_HOST = "localhost" - REDIS_PORT = int(os.getenv("REDIS_PORT", "6379")) -# 数据库连接配置 -DB_CONFIG = { - "host": MYSQL_HOST, - "port": MYSQL_PORT, - "user": "root", - "password": os.getenv("MYSQL_PASSWORD", "infini_rag_flow"), - "database": "rag_flow", -} - # MinIO连接配置 MINIO_CONFIG = { "endpoint": f"{MINIO_HOST}:{MINIO_PORT}", @@ -64,32 +40,6 @@ MINIO_CONFIG = { "visit_point": f"{MINIO_VISIT_HOST}:{MINIO_PORT}", } -# Elasticsearch连接配置 -ES_CONFIG = { - "host": f"http://{ES_HOST}:{ES_PORT}", - "user": os.getenv("ELASTIC_USER", "elastic"), - "password": os.getenv("ELASTIC_PASSWORD", "infini_rag_flow"), - "use_ssl": os.getenv("ES_USE_SSL", "false").lower() == "true", -} - -# Redis连接配置 -REDIS_CONFIG = { - "host": REDIS_HOST, - "port": REDIS_PORT, - "password": os.getenv("REDIS_PASSWORD", "infini_rag_flow"), - "decode_responses": False, -} - - -def get_db_connection(): - """创建MySQL数据库连接""" - try: - conn = mysql.connector.connect(**DB_CONFIG) - return conn - except Exception as e: - print(f"MySQL连接失败: {str(e)}") - raise e - def get_minio_client(): """创建MinIO客户端连接""" @@ -99,38 +49,3 @@ def get_minio_client(): except Exception as e: print(f"MinIO连接失败: {str(e)}") raise e - - -def get_es_client(): - """创建Elasticsearch客户端连接""" - try: - # 构建连接参数 - es_params = {"hosts": [ES_CONFIG["host"]]} - - # 添加认证信息 - if ES_CONFIG["user"] and ES_CONFIG["password"]: - es_params["basic_auth"] = (ES_CONFIG["user"], ES_CONFIG["password"]) - - # 添加SSL配置 - if ES_CONFIG["use_ssl"]: - es_params["use_ssl"] = True - es_params["verify_certs"] = False # 在开发环境中可以设置为False,生产环境应该设置为True - - es_client = Elasticsearch(**es_params) - return es_client - except Exception as e: - print(f"Elasticsearch连接失败: {str(e)}") - raise e - - -def get_redis_connection(): - """创建Redis连接""" - try: - # 使用配置创建Redis连接 - r = redis.Redis(**REDIS_CONFIG) - # 测试连接 - r.ping() - return r - except Exception as e: - print(f"Redis连接失败: {str(e)}") - raise e