Update app.py

app.py

@@ -368,9 +368,10 @@ def handsome_chat_completions():
                 )
                 total_time = end_time - start_time
 
+                response_content = ""
                 prompt_tokens = 0
                 completion_tokens = 0
-                response_content = ""
+                
                 for line in full_response_content.splitlines():
                     if line.startswith("data:"):
                         line = line[5:].strip()
@@ -378,45 +379,35 @@ def handsome_chat_completions():
                             continue
                         try:
                             response_json = json.loads(line)
-
-                            if (
-                                "usage" in response_json and
-                                "completion_tokens" in response_json["usage"]
-                            ):
-                                completion_tokens = response_json[
-                                    "usage"
-                                ]["completion_tokens"]
-
-                            if (
-                                "choices" in response_json and
-                                len(response_json["choices"]) > 0 and
-                                "delta" in response_json["choices"][0] and
-                                "content" in response_json[
-                                    "choices"
-                                ][0]["delta"]
-                            ):
-                                response_content += response_json[
-                                    "choices"
-                                ][0]["delta"]["content"]
-
-                            if (
-                                "usage" in response_json and
-                                "prompt_tokens" in response_json["usage"]
-                            ):
-                                prompt_tokens = response_json[
-                                    "usage"
-                                ]["prompt_tokens"]
-
-                        except (
-                            KeyError,
-                            ValueError,
-                            IndexError
-                        ) as e:
-                            logging.error(
-                                f"解析流式响应单行 JSON 失败: {e}, "
-                                f"行内容: {line}"
-                            )
-
+                
+                            if "usage" in response_json:
+                                 if "completion_tokens" in response_json["usage"]:
+                                     completion_tokens += response_json["usage"]["completion_tokens"]
+                                 if "prompt_tokens" in response_json["usage"]:
+                                     prompt_tokens += response_json["usage"]["prompt_tokens"]
+                
+                
+                            if "choices" in response_json:
+                                for choice in response_json["choices"]:
+                                    if "delta" in choice and "content" in choice["delta"]:
+                                        response_content += choice["delta"]["content"]
+                                    elif "message" in choice and "content" in choice["message"]:
+                                        response_content += choice["message"]["content"]
+                
+                                    if "finish_reason" in choice:
+                                        finish_reason = choice["finish_reason"]
+                                        # Handle finish_reason as needed (e.g., log it)
+                                        logging.debug(f"Finish reason: {finish_reason}")
+                        except json.JSONDecodeError as e:
+                            logging.error(f"JSON 解析失败: {e}, 行内容: {line}")
+                        except KeyError as e:
+                            logging.error(f"键错误: {e}, 行内容: {line}")
+                        except IndexError as e:
+                            logging.error(f"索引错误: {e}, 行内容: {line}")
+                
+                print(f'{response_content=}')
+                print(f'{prompt_tokens=}')
+                print(f'{completion_tokens=}')
                 user_content = extract_user_content(data.get("messages", []))
 
                 user_content_replaced = user_content.replace(