Browse Source

apikey配置调整

jiaqiang 4 days ago
parent
commit
855e1359b5
3 changed files with 26 additions and 9 deletions
  1. 9 6
      llmops/agents/llm.py
  2. 3 2
      llmops/complete_agent_flow_rule.py
  3. 14 1
      llmops/config.py

+ 9 - 6
llmops/agents/llm.py

@@ -1,7 +1,7 @@
 
 
 from langchain_openai import ChatOpenAI
-from llmops.config import qwen3_32B_model
+from llmops.config import qwen3_32B_model, deepseek_v3_model
 
 
 
@@ -45,9 +45,9 @@ def get_deepseek_v3_llm() -> ChatOpenAI:
     :return:
     """
     try:
-        model_name = qwen3_32B_model["name"]
-        api_key = qwen3_32B_model.get("api_key", "")
-        base_url = qwen3_32B_model.get("base_url", "")
+        model_name = deepseek_v3_model["name"]
+        api_key = deepseek_v3_model.get("api_key", "")
+        base_url = deepseek_v3_model.get("base_url", "")
         return get_llm(model_name=model_name, api_key=api_key, base_url=base_url)
     except Exception as e:
         raise e
@@ -57,7 +57,10 @@ if __name__ == '__main__':
     """
     程序入口
     """
-    llm = get_qwen3_32B_llm()
-    print(llm)
+    # llm = get_qwen3_32B_llm()
+    # print(llm)
+    # response = llm.invoke("你好")
+    # print(response)
+    llm = get_deepseek_v3_llm()
     response = llm.invoke("你好")
     print(response)

+ 3 - 2
llmops/complete_agent_flow_rule.py

@@ -32,7 +32,7 @@ from typing import Dict, Any, List
 from datetime import datetime
 from langgraph.graph import StateGraph, START, END
 
-from workflow_state import (
+from llmops.workflow_state import (
     IntegratedWorkflowState,
     create_initial_integrated_state,
     get_calculation_progress,
@@ -48,6 +48,7 @@ from llmops.agents.rules_engine_metric_calculation_agent import RulesEngineMetri
 from llmops.agents.data_manager import DataManager
 import os
 from llmops.agents.data_classify_agent import data_classify
+from llmops.config import DEEPSEEK_API_KEY
 
 class CompleteAgentFlow:
     """完整的智能体工作流"""
@@ -630,7 +631,7 @@ async def main():
     # 导入配置
     import config
 
-    if not config.DEEPSEEK_API_KEY:
+    if not DEEPSEEK_API_KEY:
         print("❌ 未找到API密钥")
         return
 

+ 14 - 1
llmops/config.py

@@ -33,6 +33,10 @@ load_dotenv()
 # ============================================================================
 # API密钥配置 - 优先从环境变量读取,支持通过.env文件配置
 DEEPSEEK_API_KEY = os.getenv("DEEPSEEK_API_KEY")
+if not DEEPSEEK_API_KEY:
+    print(f"从环境变量中获取 DEEPSEEK_API_KEY 失败,使用默认值")
+    DEEPSEEK_API_KEY = "sk-d9526c1f01dc488d9aae9624ce4bba14"
+
 
 # API基础URL配置 - 默认使用DeepSeek官方API地址
 DEEPSEEK_BASE_URL = os.getenv("DEEPSEEK_BASE_URL", "https://api.deepseek.com")
@@ -41,7 +45,7 @@ DEEPSEEK_BASE_URL = os.getenv("DEEPSEEK_BASE_URL", "https://api.deepseek.com")
 # 规则引擎 API 配置
 # ============================================================================
 # 规则引擎基础URL配置 - 用于指标计算和知识库访问
-RULES_ENGINE_BASE_URL = os.getenv("RULES_ENGINE_BASE_URL", "http://localhost:8081")
+RULES_ENGINE_BASE_URL = os.getenv("RULES_ENGINE_BASE_URL", "http://10.192.72.11:31809")
 
 # ============================================================================
 # 项目路径配置
@@ -98,8 +102,17 @@ DATA_CLASSIFY_ENGINE_PARAM_MAPPER = {
     "农业": "metric-农业分类打标-1230"
 }
 
+# 千问32B模型配置
 qwen3_32B_model = {
     "name": "Qwen3-32B",
     "api_key": "",
     "base_url": "http://10.192.72.12:9996/v1"
+}
+
+
+# deepseek模型配置
+deepseek_v3_model = {
+    "name": "deepseek-chat",
+    "api_key": DEEPSEEK_API_KEY,
+    "base_url": DEEPSEEK_BASE_URL
 }