Spaces:
Running
Running
Update app.py
Browse files
app.py
CHANGED
@@ -520,7 +520,7 @@ class GrokApiClient:
|
|
520 |
|
521 |
if response.status_code != 200:
|
522 |
logger.error(f"上传文件失败,状态码:{response.status_code}", "Server")
|
523 |
-
|
524 |
|
525 |
result = response.json()
|
526 |
logger.info(f"上传文件成功: {result}", "Server")
|
@@ -528,7 +528,7 @@ class GrokApiClient:
|
|
528 |
|
529 |
except Exception as error:
|
530 |
logger.error(str(error), "Server")
|
531 |
-
|
532 |
def upload_base64_image(self, base64_data, url):
|
533 |
try:
|
534 |
if 'data:image' in base64_data:
|
@@ -644,7 +644,7 @@ class GrokApiClient:
|
|
644 |
|
645 |
|
646 |
text_content = process_content(current.get("content", ""))
|
647 |
-
if is_last_message:
|
648 |
last_message_content = f"{role.upper()}: {text_content or '[图片]'}\n"
|
649 |
continue
|
650 |
if text_content or (is_last_message and file_attachments):
|
@@ -663,6 +663,7 @@ class GrokApiClient:
|
|
663 |
if file_id:
|
664 |
file_attachments.insert(0, file_id)
|
665 |
messages = last_message_content.strip()
|
|
|
666 |
return {
|
667 |
"temporary": CONFIG["API"].get("IS_TEMP_CONVERSATION", False),
|
668 |
"modelName": self.model_id,
|
@@ -1078,10 +1079,12 @@ def chat_completions():
|
|
1078 |
f"当前令牌: {json.dumps(CONFIG['API']['SIGNATURE_COOKIE'], indent=2)}","Server")
|
1079 |
logger.info(
|
1080 |
f"当前可用模型的全部可用数量: {json.dumps(token_manager.get_remaining_token_request_capacity(), indent=2)}","Server")
|
|
|
1081 |
if CONFIG['SERVER']['CF_CLEARANCE']:
|
1082 |
CONFIG["SERVER"]['COOKIE'] = f"{CONFIG['API']['SIGNATURE_COOKIE']};{CONFIG['SERVER']['CF_CLEARANCE']}"
|
1083 |
else:
|
1084 |
CONFIG["SERVER"]['COOKIE'] = CONFIG['API']['SIGNATURE_COOKIE']
|
|
|
1085 |
try:
|
1086 |
proxy_options = Utils.get_proxy_options()
|
1087 |
response = curl_requests.post(
|
|
|
520 |
|
521 |
if response.status_code != 200:
|
522 |
logger.error(f"上传文件失败,状态码:{response.status_code}", "Server")
|
523 |
+
raise Exception(f"上传文件失败,状态码:{response.status_code}")
|
524 |
|
525 |
result = response.json()
|
526 |
logger.info(f"上传文件成功: {result}", "Server")
|
|
|
528 |
|
529 |
except Exception as error:
|
530 |
logger.error(str(error), "Server")
|
531 |
+
raise Exception(f"上传文件失败,状态码:{response.status_code}")
|
532 |
def upload_base64_image(self, base64_data, url):
|
533 |
try:
|
534 |
if 'data:image' in base64_data:
|
|
|
644 |
|
645 |
|
646 |
text_content = process_content(current.get("content", ""))
|
647 |
+
if is_last_message and convert_to_file:
|
648 |
last_message_content = f"{role.upper()}: {text_content or '[图片]'}\n"
|
649 |
continue
|
650 |
if text_content or (is_last_message and file_attachments):
|
|
|
663 |
if file_id:
|
664 |
file_attachments.insert(0, file_id)
|
665 |
messages = last_message_content.strip()
|
666 |
+
|
667 |
return {
|
668 |
"temporary": CONFIG["API"].get("IS_TEMP_CONVERSATION", False),
|
669 |
"modelName": self.model_id,
|
|
|
1079 |
f"当前令牌: {json.dumps(CONFIG['API']['SIGNATURE_COOKIE'], indent=2)}","Server")
|
1080 |
logger.info(
|
1081 |
f"当前可用模型的全部可用数量: {json.dumps(token_manager.get_remaining_token_request_capacity(), indent=2)}","Server")
|
1082 |
+
|
1083 |
if CONFIG['SERVER']['CF_CLEARANCE']:
|
1084 |
CONFIG["SERVER"]['COOKIE'] = f"{CONFIG['API']['SIGNATURE_COOKIE']};{CONFIG['SERVER']['CF_CLEARANCE']}"
|
1085 |
else:
|
1086 |
CONFIG["SERVER"]['COOKIE'] = CONFIG['API']['SIGNATURE_COOKIE']
|
1087 |
+
logger.info(json.dumps(request_payload,indent=2),"Server")
|
1088 |
try:
|
1089 |
proxy_options = Utils.get_proxy_options()
|
1090 |
response = curl_requests.post(
|