From 04913b776dcf2b209b84ef703d046ba1eb10db91 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Fri, 15 Aug 2025 16:11:35 +0800 Subject: [PATCH] 'commit' --- dsLightRag/Config/Config.py | 5 ++- .../Config/__pycache__/Config.cpython-310.pyc | Bin 1708 -> 1782 bytes dsLightRag/Test/TestGoogleGemini.py | 40 +++++++----------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dsLightRag/Config/Config.py b/dsLightRag/Config/Config.py index b967bc08..d9e13138 100644 --- a/dsLightRag/Config/Config.py +++ b/dsLightRag/Config/Config.py @@ -10,7 +10,7 @@ ALY_OSS_PREFIX = "HuangHai" LLM_API_KEY = "sk-44ae895eeb614aa1a9c6460579e322f1" LLM_BASE_URL = "https://api.deepseek.com" LLM_MODEL_NAME = "deepseek-chat" -#LLM_MODEL_NAME = "deepseek-reasoner" +# LLM_MODEL_NAME = "deepseek-reasoner" # 嵌入向量模型 EMBED_MODEL_NAME = "BAAI/bge-m3" @@ -58,3 +58,6 @@ OBS_PREFIX = "HuangHai" # 智谱的API KEY【吴缤申请个人版免费】 ZHIPU_API_KEY = "78dc1dfe37e04f29bd4ca9a49858a969.gn7TIZTfzpY35nx9" + +# GPTNB的API KEY +GPTNB_API_KEY = "sk-amQHwiEzPIZIB2KuF5A10dC23a0e4b02B48a7a2b6aFa0662" diff --git a/dsLightRag/Config/__pycache__/Config.cpython-310.pyc b/dsLightRag/Config/__pycache__/Config.cpython-310.pyc index 710fd9b3b60fef23bffde66f0b267d8f1f626627..986c5b85a98f2d70f87e911ebd94c9200c823bc9 100644 GIT binary patch delta 251 zcmZ3(`;C`3pO=@50SM;2o|ln0kyn;+$wcji98qd1O2G`8${R0iW8{wFD9A4^NiRw* zj@mqtDVWis%D6aNH!(NRqde2KD!?+Rx$T-m;)g;Nl$jQVa(LB*8 z$t=+=(ZI~i$WK#!@^fZ0#;D11EQe*HIQ?AxO}yemgFK`7pv+*`AU{W6*Qm*VSuB;K zcmw={L)?R0gX2Si5>bM1Zh&KOaJYYvOVs2@))neeyip#W0ip4Z0iN;Ru93HR-2+1W foM7CQ3`I;p&lNFEmSl5g^qU;Z=F7su%)tx*n=(m% delta 187 zcmeyyyM~uHpO=@50SJ_GCT6fq7zJ-}6yz6|q!*Tlu|9~$I&ix0{Sb`A1#^mV;8 z*^Jdv`4(@0e{hIE4rTzWC^}mJ diff --git a/dsLightRag/Test/TestGoogleGemini.py b/dsLightRag/Test/TestGoogleGemini.py index a2c3595d..889dfdc1 100644 --- a/dsLightRag/Test/TestGoogleGemini.py +++ b/dsLightRag/Test/TestGoogleGemini.py @@ -1,15 +1,16 @@ -import requests import json -import sys + +import requests + +from Config.Config import GPTNB_API_KEY # API配置 API_URL = "https://goapi.gptnb.ai/v1/chat/completions" -API_KEY = "sk-amQHwiEzPIZIB2KuF5A10dC23a0e4b02B48a7a2b6aFa0662" # 请求头 headers = { "Content-Type": "application/json", - "Authorization": f"Bearer {API_KEY}" + "Authorization": f"Bearer {GPTNB_API_KEY}" } # 请求体 - 添加stream: true参数启用流式响应 @@ -40,7 +41,6 @@ try: if chunk: # 解码chunk chunk_data = chunk.decode('utf-8', errors='replace') - print(f"[调试] 原始chunk: {chunk_data}", file=sys.stderr) # 处理可能的多部分响应 for line in chunk_data.splitlines(): @@ -49,30 +49,22 @@ try: continue # 检查是否结束 - if line == '[DONE]': - print("\n[调试] 接收到结束信号", file=sys.stderr) + if line == 'data: [DONE]': break # 去除可能的前缀 if line.startswith('data: '): line = line[6:] - try: - # 解析JSON - data = json.loads(line) - # 提取文本内容 - if 'choices' in data and len(data['choices']) > 0: - delta = data['choices'][0].get('delta', {}) - content = delta.get('content', '') - if content: - # 实时输出内容,不换行 - print(content, end='', flush=True) - except json.JSONDecodeError as e: - print(f"[调试] JSON解析错误: {e}, 内容: {line}", file=sys.stderr) - except Exception as e: - print(f"[调试] 处理错误: {e}", file=sys.stderr) - - print("\n\n流式响应结束") + # 解析JSON + data = json.loads(line) + # 提取文本内容 + if 'choices' in data and len(data['choices']) > 0: + delta = data['choices'][0].get('delta', {}) + content = delta.get('content', '') + if content: + # 实时输出内容,不换行 + print(content, end='', flush=True) except requests.exceptions.RequestException as e: - print(f"请求发生错误: {e}") \ No newline at end of file + print(f"请求发生错误: {e}")