Merge pull request #28 from iidamie/dev

fix: Dev to Main

Author: iidamie

CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.2.8-beta.1](https://github.com/iidamie/deepseek2api/compare/v1.2.7...v1.2.8-beta.1) (2025-02-20)
+
+
+### Bug Fixes
+
+* 优化 POW 生成机制 ([286f3bd](https://github.com/iidamie/deepseek2api/commit/286f3bdab4ddeed302784dd6c148d72c040d0202))
+* 优化异常处理 ([66ce0ae](https://github.com/iidamie/deepseek2api/commit/66ce0ae9c02af83fe256e6d01821980be4ba2304))
+* 优化异常处理 ([755b20f](https://github.com/iidamie/deepseek2api/commit/755b20f59ceaa70182db24024d1118e16c24de73))
+* 优化异常处理 ([ef9073b](https://github.com/iidamie/deepseek2api/commit/ef9073b6c8a57b84902705780ca54f52746b6a21))
+
 ## [1.2.7](https://github.com/iidamie/deepseek2api/compare/v1.2.6...v1.2.7) (2025-02-19)
 
 

app.py

@@ -89,12 +89,12 @@ def init_account_queue():
 DEEPSEEK_COMPLETION_URL = f"https://{DEEPSEEK_HOST}/api/v0/chat/completion"
 BASE_HEADERS = {
     'Host': "chat.deepseek.com",
-    'User-Agent': "DeepSeek/1.0.11 Android/35",
+    'User-Agent': "DeepSeek/1.0.13 Android/35",
     'Accept': "application/json",
     'Accept-Encoding': "gzip",
     'Content-Type': "application/json",
     'x-client-platform': "android",
-    'x-client-version': "1.0.11",
+    'x-client-version': "1.0.13",
     'x-client-locale': "zh_CN",
     'accept-charset': "UTF-8"
 }
@@ -207,7 +207,7 @@ def determine_mode_and_token(request: Request):
         request.state.tried_accounts = []  # 初始化已尝试账号
         selected_account = choose_new_account()
         if not selected_account:
-            raise HTTPException(status_code=500, detail="No accounts configured or all accounts are busy.")
+            raise HTTPException(status_code=429, detail="No accounts configured or all accounts are busy.")
         if not selected_account.get("token", "").strip():
             try:
                 login_deepseek_via_account(selected_account)
@@ -430,7 +430,7 @@ def get_pow_response(request: Request, max_attempts=3):
                 "target_path": challenge["target_path"]
             }
             pow_str = json.dumps(pow_dict, separators=(',', ':'), ensure_ascii=False)
-            encoded = base64.b64encode(pow_str.encode("utf-8")).decode("utf-8").rstrip("=")
+            encoded = base64.b64encode(pow_str.encode("utf-8")).decode("utf-8").rstrip()
             resp.close()
             return encoded
         else:
@@ -633,7 +633,7 @@ def process_data():
                                     line = raw_line.decode("utf-8")
                                 except Exception as e:
                                     logger.warning(f"[sse_stream] 解码失败: {e}")
-                                    continue
+                                    raise HTTPException(status_code=500, detail="Server is error.")
                                 if not line:
                                     continue
                                 if line.startswith("data:"):
@@ -652,6 +652,10 @@ def process_data():
                                         result_queue.put(chunk)  # 将数据放入队列
                                     except Exception as e:
                                         logger.warning(f"[sse_stream] 无法解析: {data_str}, 错误: {e}")
+                                        raise HTTPException(status_code=500, detail="Server is error.")                 
+                        except Exception as e:
+                            logger.warning(f"[sse_stream] 错误: {e}")
+                            raise HTTPException(status_code=500, detail="Server is error.")
                         finally:
                             deepseek_resp.close()
 
@@ -752,7 +756,7 @@ def collect_data():
                             line = raw_line.decode("utf-8")
                         except Exception as e:
                             logger.warning(f"[chat_completions] 解码失败: {e}")
-                            continue
+                            raise HTTPException(status_code=500, detail="Server is error.") 
                         if not line:
                             continue
                         if line.startswith("data:"):
@@ -778,8 +782,11 @@ def collect_data():
                                     elif ctype == "text":
                                         text_list.append(ctext)
                             except Exception as e:
-                                logger.warning(f"[chat_completions] 无法解析: {data_str}, 错误: {e}")
-                                continue
+                                logger.warning(f"[collect_data] 无法解析: {data_str}, 错误: {e}")
+                                raise HTTPException(status_code=500, detail="Server is error.")
+                except Exception as e:
+                    logger.warning(f"[collect_data] 错误: {e}")
+                    raise HTTPException(status_code=500, detail="Server is error.")
                 finally:
                     deepseek_resp.close()
                     final_reasoning = "".join(think_list)

version.txt

@@ -1 +1 @@
-1.2.7
+1.2.8-beta.1