From 7b149f0f51d139d99862634398d2cfe9a411e0fc Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 15 Aug 2025 16:33:05 +0800
Subject: [PATCH] 'commit'

---
 dsLightRag/Config/GoApiConst.py               |   6 ++
 .../__pycache__/GoApiConst.cpython-310.pyc    | Bin 0 -> 239 bytes
 dsLightRag/Test/G1_Gemini.py                  |   3 +-
 dsLightRag/Util/GoApiUtil.py                  |  79 +++++++++++-------
 .../__pycache__/GoApiUtil.cpython-310.pyc     | Bin 2221 -> 2406 bytes
 5 files changed, 56 insertions(+), 32 deletions(-)
 create mode 100644 dsLightRag/Config/GoApiConst.py
 create mode 100644 dsLightRag/Config/__pycache__/GoApiConst.cpython-310.pyc

diff --git a/dsLightRag/Config/GoApiConst.py b/dsLightRag/Config/GoApiConst.py
new file mode 100644
index 00000000..4dde1049
--- /dev/null
+++ b/dsLightRag/Config/GoApiConst.py
@@ -0,0 +1,6 @@
+# GPT-3.5 模型
+MODEL_GPT35 = "gpt-3.5-turbo"
+# GPT-4 模型
+MODEL_GPT4 = "gpt-4-0613"
+# Google的文本生成模型
+MODEL_GEMINI = "gemini-2.5-pro"
diff --git a/dsLightRag/Config/__pycache__/GoApiConst.cpython-310.pyc b/dsLightRag/Config/__pycache__/GoApiConst.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..331866d66e4b5d005ec1522d1b52aa9c7570d01b
GIT binary patch
literal 239
zcmd1j<>g`kg46HkWy}H6k3k${zzF0x0CBMZkVs*OVn|_(VoYI*VoG5SX3%7*;!Q6o
z(KXgH)h#J4O3JU|0&z`r4a^LUtN7AWb2IZYb&Y_s1x5LOn#{Mjef?cred65%LX1ss
zalttzQ9Mw#tFNb@=SqemW}t0g;+L_DRZL28cz#hfkP0Zu&q_@$0kV8D(=$qf64PUx
s^YhX&(_`H89Sbsn?BWu=g34PQHo5sJr8%i~Am<me0SOjH7A6iR0JTXyC;$Ke

literal 0
HcmV?d00001

diff --git a/dsLightRag/Test/G1_Gemini.py b/dsLightRag/Test/G1_Gemini.py
index a69f587f..3ed52885 100644
--- a/dsLightRag/Test/G1_Gemini.py
+++ b/dsLightRag/Test/G1_Gemini.py
@@ -1,3 +1,4 @@
+from Config.GoApiConst import MODEL_GPT35, MODEL_GPT4
 from Util.GoApiUtil import ModelInteractor
 
 # 示例使用
@@ -6,7 +7,7 @@ if __name__ == "__main__":
     interactor = ModelInteractor()
 
     # 使用不同的模型和提示词
-    model_name = "gemini-2.5-pro"
+    model_name = MODEL_GPT4
     prompt_text = "请详细介绍一下你自己，分成几个段落来说明"
 
     # 发送流式请求
diff --git a/dsLightRag/Util/GoApiUtil.py b/dsLightRag/Util/GoApiUtil.py
index eb99ba37..63bee6bc 100644
--- a/dsLightRag/Util/GoApiUtil.py
+++ b/dsLightRag/Util/GoApiUtil.py
@@ -1,10 +1,7 @@
 import json
-
 import requests
-
 from Config.Config import GPTNB_API_KEY
 
-
 class ModelInteractor:
     def __init__(self, api_key=GPTNB_API_KEY, api_url="https://goapi.gptnb.ai/v1/chat/completions"):
         self.api_key = api_key
@@ -13,16 +10,16 @@ class ModelInteractor:
             "Content-Type": "application/json",
             "Authorization": f"Bearer {self.api_key}"
         }
-
+    
     def stream_request(self, model, prompt, temperature=0.7):
         """
         发送流式请求到模型API
-
+        
         参数:
         - model: 模型名称
         - prompt: 用户提示词
         - temperature: 温度参数，控制输出的随机性
-
+        
         返回:
         - 无返回值，直接打印流式响应
         """
@@ -35,7 +32,7 @@ class ModelInteractor:
             "temperature": temperature,
             "stream": True
         }
-
+        
         try:
             response = requests.post(
                 self.api_url,
@@ -45,34 +42,54 @@ class ModelInteractor:
                 timeout=30
             )
             response.raise_for_status()
-
+            
             print(f"使用模型 {model} 的流式响应内容: ")
+            buffer = ""
             for chunk in response.iter_content(chunk_size=None):
                 if chunk:
                     chunk_data = chunk.decode('utf-8', errors='replace')
-
-                    for line in chunk_data.splitlines():
-                        line = line.strip()
-                        if not line:
-                            continue
-
-                        if line == 'data: [DONE]':
-                            print("\n流式响应结束")
-                            return
-
-                        if line.startswith('data: '):
-                            line = line[6:]
-
-                        try:
-                            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 and content != '\n':
-                                    print(content, end='', flush=True)
-                        except json.JSONDecodeError as e:
-                            print(f"[调试] JSON解析错误: {e}, 内容: {line}")
-
+                    buffer += chunk_data
+                    
+                    # 处理buffer中的所有完整JSON对象
+                    while True:
+                        # 查找JSON对象的开始和结束位置
+                        start_pos = buffer.find('{')
+                        if start_pos == -1:
+                            break  # 没有找到JSON开始
+                            
+                        # 尝试找到匹配的结束括号
+                        depth = 1
+                        end_pos = start_pos + 1
+                        while end_pos < len(buffer) and depth > 0:
+                            if buffer[end_pos] == '{':
+                                depth += 1
+                            elif buffer[end_pos] == '}':
+                                depth -= 1
+                            end_pos += 1
+                            
+                        if depth == 0:
+                            # 找到了完整的JSON对象
+                            json_str = buffer[start_pos:end_pos]
+                            buffer = buffer[end_pos:]
+                            
+                            try:
+                                data = json.loads(json_str)
+                                if 'choices' in data and len(data['choices']) > 0:
+                                    delta = data['choices'][0].get('delta', {})
+                                    content = delta.get('content', '')
+                                    if content and content != '\n':
+                                        print(content, end='', flush=True)
+                            except json.JSONDecodeError as e:
+                                print(f"[调试] JSON解析错误: {e}, 内容: {json_str}")
+                        else:
+                            # 没有找到完整的JSON对象
+                            break
+                        
+                # 检查是否结束
+                if 'data: [DONE]' in buffer:
+                    print("\n流式响应结束")
+                    return
+                            
         except requests.exceptions.RequestException as e:
             print(f"请求发生错误: {e}")
 
diff --git a/dsLightRag/Util/__pycache__/GoApiUtil.cpython-310.pyc b/dsLightRag/Util/__pycache__/GoApiUtil.cpython-310.pyc
index 54f36ab92ecbbb841856f8ec7b1b612aaf0bf953..f05247a5b448b0b6211fb59681e506c870a8b472 100644
GIT binary patch
delta 877
zcmZuvOKTHR6u$S)%$-M)d8DZ|_CZ0d#3H&;i=g6zg1GFWG$0}EO-++BX=f&u#yb`)
zE{oCIjkMKv=SE6bA_e#U0Fe$Z>cX1tTy!U>XVRhw-r=6}oo~MLox?D1oV~PJOQj41
zr}_P5`M}&VcQB@+g>U8@AQNzJ!S&MwA&wd5gppNpA9IOGOkR~kxv?uo$fX6Qhm<Q7
zjTtPlgm0sJ??RQU-e;~>be3c(W-gIX<CJTcQAl;f>AJzJ4IJuRXLgl%cU-}o(16P6
zLScd@f&{0FxQaZ^4VJFTkSR}O5wk$efOEjfaE&&*fLI66ZcGmW%@gg{|FQAM+IGZ?
zpi$?ECnSr)WNgBWHl~dWfxMpNNmwq$GCcJFdE2lI;4E6i?Nzo9E0)fp^%U!zLJJ!t
zG`R`IF{T5yxaDngi*;2cXjTE~@WGBRNf?bHw@*faTruZ&FbZvq8g`(vEVow>JHeAH
zXiZ+kv2F}8BeWmcE<Mb1cn-OE_B!k46qag1S5K@2?Ol+LpxN`I?F{y)VpZ%Wp4W~>
zm>}+rN34;5&Evkm_PM@#hxjNBYW+v&x!nANMN^JQghWNj<s$rW{}-Hn48MmLhX{v}
zI#I4oO_cmdVWsJy=vfGfFUk!el!5Mg21KpRw|iTUzdn8TZTZ#y@{88y=9T`OBd*d>
zN1mK=StL!D+(?<O6`3#I(~H;<2Xt_lj@KtAOJ1Z*l<RIaZ?sc^6@y}4_hC*@n5ngg
z&IIMWT5?%j=e3Goa|?dpd7bf+{o<N>mYM+lhH%x>XJl++8Jk$cL^23OEK3^B;3PKS
zYVc%!XlhctR(mX&>}n@tiu|OXGUvnxwSb32PV4DaVnYf+LnbygPXd@zya7nwDKV}M
JD`1u;zX7U!<N5#q

delta 696
zcmY*X&1(}u6rVRcyF0ttY`)sqv_&hTm=?i<<{-KFc@Pw|hoaEd&<W;?q}knC8fM#I
z^<)adfS0zC;7#$+e?$BST<>BJ-o4egMv%_q&HKHX_kQm^W`1NpXWULQX%k!ze!Z_f
zvya?w0G9d*w~9$TbWm@j`tN`c2?8V)^ngAGsR>Q60~WI02en8`J5q0OVF`N=?vUl}
z(2$1rNg54HB!nZ9do(nqIkZOvZ`&c4e3%%K*!p+7Wyyuxq~7De6scVR63Y@1)*`_;
zN2EvKEn`eZSg&aTvwBwpHcU!Bg3uCKX}uuc&LD6lIt8)|BG+WzVC;!pfece(qE1FM
zw55%BQsfaQWCCLn;!IQX27!qvj}uMpX>sXpnUR1s(pw*agbt8i8e1z!XP<~^$@j@2
zi`!fxPq4|**><|+hhwk_o1}YX+&fZ`My8S7`tpy&MUt7A<dB|Dk0<?~U!2|0)FZZ_
zUa_}oR*%$gy{O(8moE1VQ3)zH=8g?~k;q)Db?R$X-@}(7kuIvOpyH)stnM2()sZm`
zIrY_8nz#M+Ry}Cd+f_f({lKfQN4Af#fxlS~YLVXRRD>UCt!i6cGp|EZHOz%``dV$H
z-F#~QHLG#mh{Y7%Bv$Zd)pv8=$RPArRDxeDrGbG94&`VmaI`kq)B#Fun1Ts#P+VaB
vG|U0-(-Yb^j<eJ1C0{*TiV3aLTl^tC4L7b%c;2`WyXV!6bx)@b&1!!Dgr2Ex