Skip to content

Commit

Permalink
Revert "💄重构suno.py，修改成异步函数"
Browse files Browse the repository at this point in the history 
This reverts commit 63a68df.
  • Loading branch information
@Yanyutin753
Yanyutin753 committed Jun 20, 2024
1 parent a4b768e commit 1aa4494
Show file tree
Hide file tree
Showing 5 changed files with 300 additions and 123 deletions.
58 changes: 19 additions & 39 deletions data/message.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from starlette.responses import StreamingResponse, JSONResponse

from data.cookie import suno_auth
from suno.suno import SongsGen
from util.config import RETRIES
from util.logger import logger
from util.tool import get_clips_ids, check_status_complete, deleteSongID, calculate_token_costs
Expand Down Expand Up @@ -44,24 +45,23 @@ async def generate_data(db_manager, chat_user_message, chat_id, timeStamp, Model

for try_count in range(RETRIES):
cookie = None
song_gen = None
try:
cookie = str(await db_manager.get_request_cookie()).strip()
if cookie is None:
raise RuntimeError("没有可用的cookie")
else:
# song_gen = SongsGen(cookie)
# remaining_count = await song_gen.get_limit_left()
# if remaining_count == -1:
# await db_manager.delete_cookies(cookie)
# raise RuntimeError("该账号剩余次数为 -1，无法使用")
song_gen = SongsGen(cookie)
remaining_count = song_gen.get_limit_left()
if remaining_count == -1:
await db_manager.delete_cookies(cookie)
raise RuntimeError("该账号剩余次数为 -1，无法使用")

# 测试并发集
yield f"""data:""" + ' ' + f"""{json.dumps({"id": f"chatcmpl-{chat_id}", "object":
"chat.completion.chunk", "model": ModelVersion, "created": timeStamp, "choices": [{"index": 0,
"delta": {"content": str(cookie)}, "finish_reason": None}]})}\n\n"""
yield f"""data:""" + ' ' + f"""[DONE]\n\n"""
return
# yield f"""data:""" + ' ' + f"""{json.dumps({"id": f"chatcmpl-{chat_id}", "object":
# "chat.completion.chunk", "model": ModelVersion, "created": timeStamp, "choices": [{"index": 0,
# "delta": {"content": str(cookie)}, "finish_reason": None}]})}\n\n"""
# yield f"""data:""" + ' ' + f"""[DONE]\n\n"""
# return

_return_ids = False
_return_tags = False
Expand All @@ -71,15 +71,14 @@ async def generate_data(db_manager, chat_user_message, chat_id, timeStamp, Model
_return_video_url = False
_return_audio_url = False
_return_Forever_url = False

token, sid = await song_gen.get_auth_token(w=1)
token, sid = song_gen.get_auth_token(w=1)

suno_auth.set_session_id(sid)
suno_auth.load_cookie(cookie)

response = await generate_music(data=data, token=token)
# await asyncio.sleep(3)
clip_ids = await get_clips_ids(response)
clip_ids = get_clips_ids(response)
song_id_1 = clip_ids[0]
song_id_2 = clip_ids[1]

Expand All @@ -88,9 +87,7 @@ async def generate_data(db_manager, chat_user_message, chat_id, timeStamp, Model
for clip_id in clip_ids:
count = 0
while True:
token, sid = await song_gen.get_auth_token(w=1)
now_data = None
more_information_ = None
token, sid = SongsGen(cookie).get_auth_token(w=1)
try:
now_data = await get_feed(ids=clip_id, token=token)
more_information_ = now_data[0]['metadata']
Expand All @@ -102,6 +99,7 @@ async def generate_data(db_manager, chat_user_message, chat_id, timeStamp, Model
if not _return_Forever_url:
try:
if check_status_complete(now_data):
await deleteSongID(db_manager, cookie)
Aideo_Markdown_Conetent = (f""
f"\n### 🎷 CDN音乐链接\n"
f"- **🎧 音乐1️⃣**：{'https://cdn1.suno.ai/' + clip_id + '.mp3'} \n"
Expand All @@ -119,7 +117,7 @@ async def generate_data(db_manager, chat_user_message, chat_id, timeStamp, Model
_return_Forever_url = True
break
except Exception as e:
logger.info(f'CDN音乐链接出错：{e}')
logger.info('CDN音乐链接出错', e)
pass

if not _return_ids:
Expand Down Expand Up @@ -197,22 +195,18 @@ async def generate_data(db_manager, chat_user_message, chat_id, timeStamp, Model

yield f"""data:""" + ' ' + f"""[DONE]\n\n"""
break

except Exception as e:
if cookie is not None:
await deleteSongID(db_manager, cookie)
if try_count < RETRIES - 1:
logger.error(f"第 {try_count + 1} 次尝试歌曲失败，错误为：{str(e)}")
continue
else:
yield f"""data:""" + ' ' + f"""{json.dumps({"id": f"chatcmpl-{chat_id}", "object": "chat.completion.chunk", "model": ModelVersion, "created": timeStamp, "choices": [{"index": 0, "delta": {"content": str("生成歌曲失败: 请打开日志或数据库查看报错信息......")}, "finish_reason": None}]})}\n\n"""
yield f"""data:""" + ' ' + f"""[DONE]\n\n"""
finally:
if song_gen is not None:
await song_gen.close_session()
if cookie is not None:
await deleteSongID(db_manager, cookie)


# 返回消息，使用协程
# 返回消息
async def response_async(db_manager, data, content_all, chat_id, timeStamp, last_user_content, headers):
if not data.stream:
try:
Expand Down Expand Up @@ -262,17 +256,3 @@ async def response_async(db_manager, data, content_all, chat_id, timeStamp, last
return StreamingResponse(data_generator, headers=headers, media_type="text/event-stream")
except Exception as e:
return JSONResponse(status_code=500, content={"detail": f"生成流式响应时出错: {str(e)}"})


# 线程用于请求
def request_chat(db_manager, data, content_all, chat_id, timeStamp, last_user_content, headers):
loop = asyncio.new_event_loop()
try:
asyncio.set_event_loop(loop)
result = loop.run_until_complete(
response_async(db_manager, data, content_all, chat_id, timeStamp, last_user_content, headers))
except Exception as e:
raise HTTPException(status_code=500, detail=f"请求聊天时出错: {str(e)}")
finally:
loop.close()
return result
12 changes: 0 additions & 12 deletions main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
process_cookie = process_cookies.processCookies(SQL_IP, int(SQL_DK), USER_NAME, SQL_PASSWORD, SQL_NAME)


# executor = ThreadPoolExecutor(max_workers=300, thread_name_prefix="Music_thread")


# 刷新cookies函数
async def cron_refresh_cookies():
try:
Expand Down Expand Up @@ -177,19 +174,10 @@ async def get_last_user_message(data: schemas.Data, authorization: str = Header(
}

try:
# 协程处理
return await response_async(db_manager, data, content_all, chat_id, timeStamp, last_user_content, headers)
except HTTPException as http_exc:
raise http_exc

# 线程处理
# try:
# future = executor.submit(request_chat, db_manager, data, content_all, chat_id, timeStamp,
# last_user_content, headers)
# return future.result()
# except Exception as e:
# raise HTTPException(status_code=500, detail=str(e))


# 授权检查
async def verify_auth_header(authorization: str = Header(...)):
Expand Down
Loading

0 comments on commit 1aa4494

Please sign in to comment.