Spaces:
Paused
Paused
Upload app.py
Browse files
app.py
CHANGED
|
@@ -552,7 +552,7 @@ def handle_non_stream_response(response, model, prompt_tokens):
|
|
| 552 |
raise
|
| 553 |
|
| 554 |
def generate_stream_response(response, model, prompt_tokens):
|
| 555 |
-
"""
|
| 556 |
total_completion_tokens = 0
|
| 557 |
|
| 558 |
for chunk in stream_notdiamond_response(response, model):
|
|
@@ -683,17 +683,17 @@ def handle_request():
|
|
| 683 |
request_data = request.get_json()
|
| 684 |
model_id = request_data.get('model', '')
|
| 685 |
|
| 686 |
-
auth_manager
|
| 687 |
-
if not auth_manager:
|
| 688 |
-
return jsonify({'error': 'No available accounts for this model'}), 403
|
| 689 |
-
|
| 690 |
stream = request_data.get('stream', False)
|
| 691 |
prompt_tokens = count_message_tokens(
|
| 692 |
request_data.get('messages', []),
|
| 693 |
model_id
|
| 694 |
)
|
| 695 |
payload = build_payload(request_data, model_id)
|
| 696 |
-
|
|
|
|
|
|
|
|
|
|
| 697 |
if stream:
|
| 698 |
return Response(
|
| 699 |
stream_with_context(generate_stream_response(response, model_id, prompt_tokens)),
|
|
@@ -713,17 +713,6 @@ def handle_request():
|
|
| 713 |
'details': str(e)
|
| 714 |
}
|
| 715 |
}), 503
|
| 716 |
-
except json.JSONDecodeError as e:
|
| 717 |
-
logger.error("JSON decode error: %s", str(e), exc_info=True)
|
| 718 |
-
return jsonify({
|
| 719 |
-
'error': {
|
| 720 |
-
'message': 'Invalid JSON in request',
|
| 721 |
-
'type': 'invalid_request_error',
|
| 722 |
-
'param': None,
|
| 723 |
-
'code': None,
|
| 724 |
-
'details': str(e)
|
| 725 |
-
}
|
| 726 |
-
}), 400
|
| 727 |
except Exception as e:
|
| 728 |
logger.error("Unexpected error: %s", str(e), exc_info=True)
|
| 729 |
return jsonify({
|
|
|
|
| 552 |
raise
|
| 553 |
|
| 554 |
def generate_stream_response(response, model, prompt_tokens):
|
| 555 |
+
"""生��流式 HTTP 响应。"""
|
| 556 |
total_completion_tokens = 0
|
| 557 |
|
| 558 |
for chunk in stream_notdiamond_response(response, model):
|
|
|
|
| 683 |
request_data = request.get_json()
|
| 684 |
model_id = request_data.get('model', '')
|
| 685 |
|
| 686 |
+
# 不直接使用传入的 auth_manager,而是让 make_request 函数自己选择账号
|
|
|
|
|
|
|
|
|
|
| 687 |
stream = request_data.get('stream', False)
|
| 688 |
prompt_tokens = count_message_tokens(
|
| 689 |
request_data.get('messages', []),
|
| 690 |
model_id
|
| 691 |
)
|
| 692 |
payload = build_payload(request_data, model_id)
|
| 693 |
+
|
| 694 |
+
# 传入 None 作为 auth_manager,让 make_request 自己选择账号
|
| 695 |
+
response = make_request(payload, None, model_id)
|
| 696 |
+
|
| 697 |
if stream:
|
| 698 |
return Response(
|
| 699 |
stream_with_context(generate_stream_response(response, model_id, prompt_tokens)),
|
|
|
|
| 713 |
'details': str(e)
|
| 714 |
}
|
| 715 |
}), 503
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 716 |
except Exception as e:
|
| 717 |
logger.error("Unexpected error: %s", str(e), exc_info=True)
|
| 718 |
return jsonify({
|