Prechádzať zdrojové kódy

完成对包括llm在内的配置参数的迁移,全部放在了config.py的环境配置类中

wangxq 1 mesiac pred
rodič
commit
42227e5386

+ 7 - 8
app/config/config.py

@@ -41,9 +41,6 @@ class BaseConfig:
         'max_overflow': 20
     }
     
-    # Neo4j 基础配置
-    NEO4J_ENCRYPTED = False
-    
     # LLM基础配置
     LLM_BASE_URL = "https://dashscope.aliyuncs.com/compatible-mode/v1"
     LLM_MODEL_NAME = "qwen-turbo"
@@ -71,6 +68,7 @@ class DevelopmentConfig(BaseConfig):
     NEO4J_HTTP_URI = "http://192.168.67.138:7474"
     NEO4J_USER = "neo4j"
     NEO4J_PASSWORD = "password"
+    NEO4J_ENCRYPTED = False
     
     # 开发环境文件路径配置
     UPLOAD_BASE_PATH = 'C:\\tmp\\upload'
@@ -83,21 +81,22 @@ class ProductionConfig(BaseConfig):
     PORT = 80
     
     # 生产环境 MinIO 配置
-    MINIO_HOST = os.environ.get('MINIO_HOST', 'minio.citupro.com')
-    MINIO_USER = os.environ.get('MINIO_USER', 'default-user')
-    MINIO_PASSWORD = os.environ.get('MINIO_PASSWORD', 'default-password')
+    MINIO_HOST = os.environ.get('MINIO_HOST', '192.168.3.143:9000')
+    MINIO_USER = os.environ.get('MINIO_USER', 'citu-dataops-acc-key')
+    MINIO_PASSWORD = os.environ.get('MINIO_PASSWORD', 'citu-dataops-secret-key')
     MINIO_SECURE = True
     BUCKET_NAME = 'dataops-bucket'
     PREFIX = ''
     
     # 生产环境 PostgreSQL 配置
-    SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL', 'postgresql://postgres:citupgdba@192.168.3.143:5432/dataops')
+    SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL', 'postgresql://postgres:dataOps@192.168.3.143:5432/dataops')
     
     # 生产环境 Neo4j 配置
     NEO4J_URI = os.environ.get('NEO4J_URI', "bolt://192.168.3.143:7687")
     NEO4J_HTTP_URI = os.environ.get('NEO4J_HTTP_URI', "http://192.168.3.143:7474")
     NEO4J_USER = os.environ.get('NEO4J_USER', "neo4j")
-    NEO4J_PASSWORD = os.environ.get('NEO4J_PASSWORD', "mxlneo4j")
+    NEO4J_PASSWORD = os.environ.get('NEO4J_PASSWORD', "cituneo4j")
+    NEO4J_ENCRYPTED = True
     
     # 生产环境文件路径配置
     UPLOAD_BASE_PATH = '/data/upload'

+ 3 - 8
app/core/llm/llm_service.py

@@ -9,11 +9,6 @@ from flask import current_app
 
 logger = logging.getLogger("app")
 
-# 保留旧参数以确保向后兼容性
-api_key = "sk-86d4622141d74e9a8d7c38ee873c4d91"
-base_url = "https://dashscope.aliyuncs.com/compatible-mode/v1"
-model_name = "qwen-turbo"
-
 def llm_client(content):
     """
     调用LLM服务进行内容生成
@@ -27,11 +22,11 @@ def llm_client(content):
     try:
         # 优先使用配置文件中的参数
         client = OpenAI(
-            api_key=current_app.config.get('LLM_API_KEY', api_key),
-            base_url=current_app.config.get('LLM_BASE_URL', base_url)
+            api_key=current_app.config.get('LLM_API_KEY'),
+            base_url=current_app.config.get('LLM_BASE_URL')
         )
         
-        model = current_app.config.get('LLM_MODEL_NAME', model_name)
+        model = current_app.config.get('LLM_MODEL_NAME')
         
         # 判断是否为翻译请求 - 通过分析内容是否包含中文字符
         is_translate_request = False

+ 3 - 8
app/core/meta_data/meta_data.py

@@ -22,11 +22,6 @@ from app.core.llm.llm_service import llm_client as llm_call  # 导入core/llm模
 
 logger = logging.getLogger("app")
 
-# 保留旧参数以确保向后兼容性
-api_key = "sk-86d4622141d74e9a8d7c38ee873c4d91"
-base_url = "https://dashscope.aliyuncs.com/compatible-mode/v1"
-model_name = "qwen-turbo"
-
 def get_formatted_time():
     """获取格式化的当前时间"""
     return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
@@ -64,9 +59,9 @@ def infer_column_type(df):
         columns = ','.join(res)
         
         # 使用配置中的LLM参数
-        api_k = current_app.config.get('LLM_API_KEY', api_key)
-        base_u = current_app.config.get('LLM_BASE_URL', base_url)
-        model = current_app.config.get('LLM_MODEL_NAME', model_name)
+        api_k = current_app.config.get('LLM_API_KEY')
+        base_u = current_app.config.get('LLM_BASE_URL')
+        model = current_app.config.get('LLM_MODEL_NAME')
         
         client = OpenAI(api_key=api_k, base_url=base_u)
         response = client.chat.completions.create(