diff --git a/version.txt b/version.txt
index c488f7d..e39e601 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.8.7-beta2
\ No newline at end of file
+1.8.7-beta3
\ No newline at end of file
From 3cc67f003f657ebe3b6227931f68bf09634e3a05 Mon Sep 17 00:00:00 2001
From: lanqian528 <5499636+lanqian528@users.noreply.github.com>
Date: Fri, 28 Mar 2025 15:27:57 +0800
Subject: [PATCH 6/6] v1.8.8-beta1 image 2api
---
chatgpt/ChatService.py | 14 +++
chatgpt/chatFormat.py | 43 +++++--
chatgpt/chatFormat_v1.py | 234 +++++++++++++++++++++++++++++++++++++++
version.txt | 2 +-
4 files changed, 285 insertions(+), 8 deletions(-)
create mode 100644 chatgpt/chatFormat_v1.py
diff --git a/chatgpt/ChatService.py b/chatgpt/ChatService.py
index 163cd9e..7260de0 100644
--- a/chatgpt/ChatService.py
+++ b/chatgpt/ChatService.py
@@ -410,6 +410,20 @@ async def get_download_url(self, file_id):
logger.error(f"Failed to get download url: {e}")
return ""
+ async def get_attachment_url(self, file_id, conversation_id):
+ url = f"{self.base_url}/conversation/{conversation_id}/attachment/{file_id}/download"
+ headers = self.base_headers.copy()
+ try:
+ r = await self.s.get(url, headers=headers, timeout=10)
+ if r.status_code == 200:
+ download_url = r.json().get('download_url')
+ return download_url
+ else:
+ raise HTTPException(status_code=r.status_code, detail=r.text)
+ except Exception as e:
+ logger.error(f"Failed to get download url: {e}")
+ return ""
+
async def get_download_url_from_upload(self, file_id):
url = f"{self.base_url}/files/{file_id}/uploaded"
headers = self.base_headers.copy()
diff --git a/chatgpt/chatFormat.py b/chatgpt/chatFormat.py
index 8f2a3bc..ae15459 100644
--- a/chatgpt/chatFormat.py
+++ b/chatgpt/chatFormat.py
@@ -137,6 +137,7 @@ async def stream_response(service, response, model, max_tokens):
last_message_id = None
last_role = None
last_content_type = None
+ last_status = None
model_slug = None
end = False
@@ -160,6 +161,8 @@ async def stream_response(service, response, model, max_tokens):
async for chunk in response:
chunk = chunk.decode("utf-8")
+ print(chunk)
+ print("=====================================")
if end:
logger.info(f"Response Model: {model_slug}")
yield "data: [DONE]\n\n"
@@ -214,6 +217,8 @@ async def stream_response(service, response, model, max_tokens):
if role == 'assistant' and last_role != 'assistant':
if recipient == 'dalle.text2im':
new_text = f"\n```{recipient}\n{part[len_last_content:]}"
+ elif recipient == 't2uay3k.sj1i4kz':
+ new_text = f"\n```image_creator\n{part[len_last_content:]}"
elif last_role == None:
new_text = part[len_last_content:]
else:
@@ -225,6 +230,21 @@ async def stream_response(service, response, model, max_tokens):
else:
new_text = part[len_last_content:]
len_last_content = len(part)
+ elif outer_content_type == "multimodal_text":
+ parts = content.get("parts", [])
+ new_text = ""
+ for part in parts:
+ file_id = part.get('asset_pointer').replace('sediment://', '')
+ full_height = part.get("height", 0)
+ current_height = part.get('metadata', {}).get("generation", {}).get("height", 0)
+ if full_height > current_height:
+ completed_rate = current_height / full_height
+ new_text = f"\n> {completed_rate:.2%}\n"
+ if last_role != role:
+ new_text = f"\n```{new_text}"
+ else:
+ image_download_url = await service.get_attachment_url(file_id, conversation_id)
+ new_text = f"\n```\n\n"
else:
text = content.get("text", "")
if outer_content_type == "code" and last_content_type != "code":
@@ -241,6 +261,8 @@ async def stream_response(service, response, model, max_tokens):
new_text = "\n```\n" + new_text
elif last_content_type == "execution_output" and outer_content_type != "execution_output":
new_text = "\n```\n" + new_text
+ elif last_content_type == "multimodal_text" and outer_content_type != "multimodal_text":
+ new_text = "\n```\n" + new_text
delta = {"content": new_text}
last_content_type = outer_content_type
@@ -248,6 +270,7 @@ async def stream_response(service, response, model, max_tokens):
delta = {}
finish_reason = "length"
end = True
+
elif status == "finished_successfully":
if content.get("content_type") == "multimodal_text":
parts = content.get("parts", [])
@@ -258,14 +281,19 @@ async def stream_response(service, response, model, max_tokens):
inner_content_type = part.get('content_type')
if inner_content_type == "image_asset_pointer":
last_content_type = "image_asset_pointer"
- file_id = part.get('asset_pointer').replace('file-service://', '')
- logger.debug(f"file_id: {file_id}")
- image_download_url = await service.get_download_url(file_id)
- logger.debug(f"image_download_url: {image_download_url}")
- if image_download_url:
- delta = {"content": f"\n```\n\n"}
+ if part.get('asset_pointer').startswith('file-service://'):
+ file_id = part.get('asset_pointer').replace('file-service://', '')
+ logger.debug(f"file_id: {file_id}")
+ image_download_url = await service.get_download_url(file_id)
+ logger.debug(f"image_download_url: {image_download_url}")
+ if image_download_url:
+ delta = {"content": f"\n```\n\n"}
+ else:
+ delta = {"content": f"\n```\nFailed to load the image.\n"}
else:
- delta = {"content": f"\n```\nFailed to load the image.\n"}
+ file_id = part.get('asset_pointer').replace('sediment://', '')
+ image_download_url = await service.get_attachment_url(file_id, conversation_id)
+ delta = {"content": f"\n\n"}
elif message.get("end_turn"):
part = content.get("parts", [])[0]
new_text = part[len_last_content:]
@@ -294,6 +322,7 @@ async def stream_response(service, response, model, max_tokens):
continue
last_message_id = message_id
last_role = role
+ last_status = status
if not end and not delta.get("content"):
delta = {"role": "assistant", "content": ""}
chunk_new_data["choices"][0]["delta"] = delta
diff --git a/chatgpt/chatFormat_v1.py b/chatgpt/chatFormat_v1.py
new file mode 100644
index 0000000..bc42746
--- /dev/null
+++ b/chatgpt/chatFormat_v1.py
@@ -0,0 +1,234 @@
+import asyncio
+import json
+import random
+import re
+import string
+import time
+import uuid
+
+import pybase64
+import websockets
+from fastapi import HTTPException
+
+from api.files import get_file_content
+from api.models import model_system_fingerprint
+from api.tokens import split_tokens_from_content, calculate_image_tokens, num_tokens_from_messages
+from utils.Logger import logger
+
+moderation_message = "I'm sorry, I cannot provide or engage in any content related to pornography, violence, or any unethical material. If you have any other questions or need assistance, please feel free to let me know. I'll do my best to provide support and assistance."
+
+
+async def format_not_stream_response(response, prompt_tokens, max_tokens, model):
+ chat_id = f"chatcmpl-{''.join(random.choice(string.ascii_letters + string.digits) for _ in range(29))}"
+ system_fingerprint_list = model_system_fingerprint.get(model, None)
+ system_fingerprint = random.choice(system_fingerprint_list) if system_fingerprint_list else None
+ created_time = int(time.time())
+ all_text = ""
+ async for chunk in response:
+ try:
+ if chunk.startswith("data: [DONE]"):
+ break
+ elif not chunk.startswith("data: "):
+ continue
+ else:
+ chunk = json.loads(chunk[6:])
+ if not chunk["choices"][0].get("delta"):
+ continue
+ all_text += chunk["choices"][0]["delta"]["content"]
+ except Exception as e:
+ logger.error(f"Error: {chunk}, error: {str(e)}")
+ continue
+ content, completion_tokens, finish_reason = await split_tokens_from_content(all_text, max_tokens, model)
+ message = {
+ "role": "assistant",
+ "content": content,
+ }
+ usage = {
+ "prompt_tokens": prompt_tokens,
+ "completion_tokens": completion_tokens,
+ "total_tokens": prompt_tokens + completion_tokens
+ }
+ if not message.get("content"):
+ raise HTTPException(status_code=403, detail="No content in the message.")
+
+ data = {
+ "id": chat_id,
+ "object": "chat.completion",
+ "created": created_time,
+ "model": model,
+ "choices": [
+ {
+ "index": 0,
+ "message": message,
+ "logprobs": None,
+ "finish_reason": finish_reason
+ }
+ ],
+ "usage": usage
+ }
+ if system_fingerprint:
+ data["system_fingerprint"] = system_fingerprint
+ return data
+
+
+async def head_process_response(response):
+ async for chunk in response:
+ chunk = chunk.decode("utf-8")
+ if chunk.startswith("data: {"):
+ chunk_old_data = json.loads(chunk[6:])
+ message = chunk_old_data.get("message", {})
+ if not message and "error" in chunk_old_data:
+ return response, False
+ role = message.get('author', {}).get('role')
+ if role == 'user' or role == 'system':
+ continue
+
+ status = message.get("status")
+ if status == "in_progress":
+ return response, True
+ return response, False
+
+
+async def stream_response(service, response, model, max_tokens):
+ chat_id = f"chatcmpl-{''.join(random.choice(string.ascii_letters + string.digits) for _ in range(29))}"
+ created_time = int(time.time())
+
+ chunk_new_data = {
+ "id": chat_id,
+ "object": "chat.completion.chunk",
+ "created": created_time,
+ "model": model,
+ "choices": [
+ {
+ "index": 0,
+ "delta": {"role": "assistant", "content": ""},
+ "logprobs": None,
+ "finish_reason": None
+ }
+ ]
+ }
+ yield f"data: {json.dumps(chunk_new_data)}\n\n"
+
+ async for chunk in response:
+ chunk = chunk.decode("utf-8")
+ try:
+ if chunk.startswith("data: {"):
+ chunk_old_data = json.loads(chunk[6:].strip())
+ except Exception as e:
+ logger.error(f"Error: {chunk}, error: {str(e)}")
+ continue
+
+
+def get_url_from_content(content):
+ if isinstance(content, str) and content.startswith('http'):
+ try:
+ url = re.match(
+ r'(?i)\b((?:[a-z][\w-]+:(?:/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:\'".,<>?«»“”‘’]))',
+ content.split(' ')[0])[0]
+ content = content.replace(url, '').strip()
+ return url, content
+ except Exception:
+ return None, content
+ return None, content
+
+
+def format_messages_with_url(content):
+ url_list = []
+ while True:
+ url, content = get_url_from_content(content)
+ if url:
+ url_list.append(url)
+ logger.info(f"Found a file_url from messages: {url}")
+ else:
+ break
+ if not url_list:
+ return content
+ new_content = [
+ {
+ "type": "text",
+ "text": content
+ }
+ ]
+ for url in url_list:
+ new_content.append({
+ "type": "image_url",
+ "image_url": {
+ "url": url
+ }
+ })
+ return new_content
+
+
+async def api_messages_to_chat(service, api_messages, upload_by_url=False):
+ file_tokens = 0
+ chat_messages = []
+ for api_message in api_messages:
+ role = api_message.get('role')
+ content = api_message.get('content')
+ if upload_by_url:
+ if isinstance(content, str):
+ content = format_messages_with_url(content)
+ if isinstance(content, list):
+ parts = []
+ attachments = []
+ content_type = "multimodal_text"
+ for i in content:
+ if i.get("type") == "text":
+ parts.append(i.get("text"))
+ elif i.get("type") == "image_url":
+ image_url = i.get("image_url")
+ url = image_url.get("url")
+ detail = image_url.get("detail", "auto")
+ file_content, mime_type = await get_file_content(url)
+ file_meta = await service.upload_file(file_content, mime_type)
+ if file_meta:
+ file_id = file_meta["file_id"]
+ file_size = file_meta["size_bytes"]
+ file_name = file_meta["file_name"]
+ mime_type = file_meta["mime_type"]
+ use_case = file_meta["use_case"]
+ if mime_type.startswith("image/"):
+ width, height = file_meta["width"], file_meta["height"]
+ file_tokens += await calculate_image_tokens(width, height, detail)
+ parts.append({
+ "content_type": "image_asset_pointer",
+ "asset_pointer": f"file-service://{file_id}",
+ "size_bytes": file_size,
+ "width": width,
+ "height": height
+ })
+ attachments.append({
+ "id": file_id,
+ "size": file_size,
+ "name": file_name,
+ "mime_type": mime_type,
+ "width": width,
+ "height": height
+ })
+ else:
+ if not use_case == "ace_upload":
+ await service.check_upload(file_id)
+ file_tokens += file_size // 1000
+ attachments.append({
+ "id": file_id,
+ "size": file_size,
+ "name": file_name,
+ "mime_type": mime_type,
+ })
+ metadata = {
+ "attachments": attachments
+ }
+ else:
+ content_type = "text"
+ parts = [content]
+ metadata = {}
+ chat_message = {
+ "id": f"{uuid.uuid4()}",
+ "author": {"role": role},
+ "content": {"content_type": content_type, "parts": parts},
+ "metadata": metadata
+ }
+ chat_messages.append(chat_message)
+ text_tokens = await num_tokens_from_messages(api_messages, service.resp_model)
+ prompt_tokens = text_tokens + file_tokens
+ return chat_messages, prompt_tokens
diff --git a/version.txt b/version.txt
index e39e601..599cf33 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.8.7-beta3
\ No newline at end of file
+1.8.8-beta1
\ No newline at end of file