Spaces:
Running
Running
Update app.py
Browse files
app.py
CHANGED
@@ -358,7 +358,6 @@ def handsome_chat_completions():
|
|
358 |
first_token_time = first_chunk_time - start_time if first_chunk_time else 0
|
359 |
total_time = end_time - start_time
|
360 |
|
361 |
-
# 处理流式响应,逐行解析 JSON
|
362 |
prompt_tokens = 0
|
363 |
completion_tokens = 0
|
364 |
response_content = ""
|
@@ -370,7 +369,6 @@ def handsome_chat_completions():
|
|
370 |
try:
|
371 |
response_json = json.loads(line)
|
372 |
|
373 |
-
# 提取信息,这里只累加 completion_tokens 和 content
|
374 |
if "usage" in response_json and "completion_tokens" in response_json["usage"]:
|
375 |
completion_tokens = response_json["usage"]["completion_tokens"]
|
376 |
|
@@ -383,7 +381,6 @@ def handsome_chat_completions():
|
|
383 |
except (KeyError, ValueError, IndexError) as e:
|
384 |
logging.error(f"解析流式响应单行 JSON 失败: {e}, 行内容: {line}")
|
385 |
|
386 |
-
# 提取用户输入的内容,忽略非文本内容
|
387 |
user_content = ""
|
388 |
messages = data.get("messages", [])
|
389 |
for message in messages:
|
@@ -397,7 +394,6 @@ def handsome_chat_completions():
|
|
397 |
|
398 |
user_content = user_content.strip()
|
399 |
|
400 |
-
# 记录日志,将换行符替换为 \n
|
401 |
user_content_replaced = user_content.replace('\n', '\\n').replace('\r', '\\n')
|
402 |
response_content_replaced = response_content.replace('\n', '\\n').replace('\r', '\\n')
|
403 |
|
@@ -406,13 +402,11 @@ def handsome_chat_completions():
|
|
406 |
)
|
407 |
return Response(stream_with_context(generate()), content_type=response.headers['Content-Type'])
|
408 |
else:
|
409 |
-
# 非流式响应处理... (保持原样)
|
410 |
response.raise_for_status()
|
411 |
end_time = time.time()
|
412 |
response_json = response.json()
|
413 |
total_time = end_time - start_time
|
414 |
|
415 |
-
# 从响应中提取信息
|
416 |
try:
|
417 |
prompt_tokens = response_json["usage"]["prompt_tokens"]
|
418 |
completion_tokens = response_json["usage"]["completion_tokens"]
|
@@ -423,7 +417,6 @@ def handsome_chat_completions():
|
|
423 |
completion_tokens = 0
|
424 |
response_content = ""
|
425 |
|
426 |
-
# 提取用户输入的内容,处理包含文本和文件的消息
|
427 |
user_content = ""
|
428 |
messages = data.get("messages", [])
|
429 |
for message in messages:
|
@@ -437,7 +430,6 @@ def handsome_chat_completions():
|
|
437 |
|
438 |
user_content = user_content.strip()
|
439 |
|
440 |
-
# 记录日志,将换行符替换为 \n
|
441 |
user_content_replaced = user_content.replace('\n', '\\n').replace('\r', '\\n')
|
442 |
response_content_replaced = response_content.replace('\n', '\\n').replace('\r', '\\n')
|
443 |
|
|
|
358 |
first_token_time = first_chunk_time - start_time if first_chunk_time else 0
|
359 |
total_time = end_time - start_time
|
360 |
|
|
|
361 |
prompt_tokens = 0
|
362 |
completion_tokens = 0
|
363 |
response_content = ""
|
|
|
369 |
try:
|
370 |
response_json = json.loads(line)
|
371 |
|
|
|
372 |
if "usage" in response_json and "completion_tokens" in response_json["usage"]:
|
373 |
completion_tokens = response_json["usage"]["completion_tokens"]
|
374 |
|
|
|
381 |
except (KeyError, ValueError, IndexError) as e:
|
382 |
logging.error(f"解析流式响应单行 JSON 失败: {e}, 行内容: {line}")
|
383 |
|
|
|
384 |
user_content = ""
|
385 |
messages = data.get("messages", [])
|
386 |
for message in messages:
|
|
|
394 |
|
395 |
user_content = user_content.strip()
|
396 |
|
|
|
397 |
user_content_replaced = user_content.replace('\n', '\\n').replace('\r', '\\n')
|
398 |
response_content_replaced = response_content.replace('\n', '\\n').replace('\r', '\\n')
|
399 |
|
|
|
402 |
)
|
403 |
return Response(stream_with_context(generate()), content_type=response.headers['Content-Type'])
|
404 |
else:
|
|
|
405 |
response.raise_for_status()
|
406 |
end_time = time.time()
|
407 |
response_json = response.json()
|
408 |
total_time = end_time - start_time
|
409 |
|
|
|
410 |
try:
|
411 |
prompt_tokens = response_json["usage"]["prompt_tokens"]
|
412 |
completion_tokens = response_json["usage"]["completion_tokens"]
|
|
|
417 |
completion_tokens = 0
|
418 |
response_content = ""
|
419 |
|
|
|
420 |
user_content = ""
|
421 |
messages = data.get("messages", [])
|
422 |
for message in messages:
|
|
|
430 |
|
431 |
user_content = user_content.strip()
|
432 |
|
|
|
433 |
user_content_replaced = user_content.replace('\n', '\\n').replace('\r', '\\n')
|
434 |
response_content_replaced = response_content.replace('\n', '\\n').replace('\r', '\\n')
|
435 |
|