diff --git a/dsRag/Config/Config.py b/dsRag/Config/Config.py index 39424426..9ea76f74 100644 --- a/dsRag/Config/Config.py +++ b/dsRag/Config/Config.py @@ -16,6 +16,7 @@ ES_CONFIG = { } # 阿里云中用来调用 deepseek v3 的密钥【驿来特】 +MODEL_API_URL = "https://dashscope.aliyuncs.com/compatible-mode/v1" MODEL_API_KEY = "sk-f6da0c787eff4b0389e4ad03a35a911f" MODEL_NAME = "qwen-plus" # MODEL_NAME = "deepseek-v3" diff --git a/dsRag/Config/__pycache__/Config.cpython-310.pyc b/dsRag/Config/__pycache__/Config.cpython-310.pyc index 19fad96a..db9006e0 100644 Binary files a/dsRag/Config/__pycache__/Config.cpython-310.pyc and b/dsRag/Config/__pycache__/Config.cpython-310.pyc differ diff --git a/dsRag/Neo4j/N3_InputShiTi.py b/dsRag/Neo4j/N3_InputShiTi.py index b19dd8b0..4944cc1c 100644 --- a/dsRag/Neo4j/N3_InputShiTi.py +++ b/dsRag/Neo4j/N3_InputShiTi.py @@ -9,7 +9,7 @@ import hashlib import requests from py2neo import Graph from typing import Dict, List -from Config import NEO4J_URI, NEO4J_AUTH, MODEL_API_URL, MODEL_API_KEY, MODEL_NAME +from Config.Config import NEO4J_URI, NEO4J_AUTH, MODEL_API_URL, MODEL_API_KEY, MODEL_NAME # ================== 配置类 ================== diff --git a/dsRag/Neo4j/N4_PrintShiTi.py b/dsRag/Neo4j/N4_PrintShiTi.py index 9e48aad9..ee535d41 100644 --- a/dsRag/Neo4j/N4_PrintShiTi.py +++ b/dsRag/Neo4j/N4_PrintShiTi.py @@ -1,6 +1,7 @@ from py2neo import Graph -import json -from Config import * + +from Config.Config import * + def query_all_questions(): # Neo4j连接配置 diff --git a/dsRag/Neo4j/Neo4jExecutor.py b/dsRag/Neo4j/Neo4jExecutor.py index 65450327..75dfaa34 100644 --- a/dsRag/Neo4j/Neo4jExecutor.py +++ b/dsRag/Neo4j/Neo4jExecutor.py @@ -1,7 +1,8 @@ import re -from Config import * -from py2neo import Graph, Node, Relationship, Subgraph from typing import List, Tuple +from Config.Config import * +from py2neo import Graph, Node, Relationship, Subgraph + def clear(db): # 清空数据 diff --git a/dsRag/Start.py b/dsRag/Start.py index 383308bb..dfe8329c 100644 --- a/dsRag/Start.py +++ b/dsRag/Start.py @@ -42,7 +42,7 @@ logger.addHandler(console_handler) # 初始化异步 OpenAI 客户端 client = AsyncOpenAI( api_key=Config.MODEL_API_KEY, - base_url="https://dashscope.aliyuncs.com/compatible-mode/v1", + base_url=Config.MODEL_API_URL, ) async def lifespan(app: FastAPI):