|
@@ -275,7 +275,7 @@ def ai_chat_text(token_id,app_id,wxid,msg_data,msg_content): |
|
|
messages_to_send=[{"role": "user", "content": msg_content}] |
|
|
messages_to_send=[{"role": "user", "content": msg_content}] |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
|
|
|
|
|
|
reply_content=res["choices"][0]["message"]["content"] |
|
|
|
|
|
|
|
|
reply_content=remove_markdown_symbol(res["choices"][0]["message"]["content"]) |
|
|
|
|
|
|
|
|
description = '' |
|
|
description = '' |
|
|
userSelectOptions = [] |
|
|
userSelectOptions = [] |
|
@@ -314,7 +314,7 @@ def ai_chat_text(token_id,app_id,wxid,msg_data,msg_content): |
|
|
redis_helper.redis_helper.update_hash_field(hash_key,"data",json.dumps(cache_messages,ensure_ascii=False)) |
|
|
redis_helper.redis_helper.update_hash_field(hash_key,"data",json.dumps(cache_messages,ensure_ascii=False)) |
|
|
messages_to_send=gewe_chat.wxchat.save_session_messages_to_cache(hash_key, prompt) |
|
|
messages_to_send=gewe_chat.wxchat.save_session_messages_to_cache(hash_key, prompt) |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
reply_content=res["choices"][0]["message"]["content"] |
|
|
|
|
|
|
|
|
reply_content=remove_markdown_symbol(res["choices"][0]["message"]["content"]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if isinstance(reply_content, list) : |
|
|
if isinstance(reply_content, list) : |
|
@@ -403,7 +403,7 @@ def handle_text_group(token_id,app_id, wxid,msg_data,from_wxid, to_wxid): |
|
|
messages_to_send=[{"role": "user", "content": msg_content}] |
|
|
messages_to_send=[{"role": "user", "content": msg_content}] |
|
|
|
|
|
|
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
reply_content=res["choices"][0]["message"]["content"] |
|
|
|
|
|
|
|
|
reply_content=remove_markdown_symbol(res["choices"][0]["message"]["content"]) |
|
|
|
|
|
|
|
|
description = '' |
|
|
description = '' |
|
|
userSelectOptions = [] |
|
|
userSelectOptions = [] |
|
@@ -442,7 +442,7 @@ def handle_text_group(token_id,app_id, wxid,msg_data,from_wxid, to_wxid): |
|
|
redis_helper.redis_helper.update_hash_field(hash_key,"data",json.dumps(cache_messages,ensure_ascii=False)) |
|
|
redis_helper.redis_helper.update_hash_field(hash_key,"data",json.dumps(cache_messages,ensure_ascii=False)) |
|
|
messages_to_send=gewe_chat.wxchat.save_session_messages_to_cache(hash_key, prompt) |
|
|
messages_to_send=gewe_chat.wxchat.save_session_messages_to_cache(hash_key, prompt) |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
reply_content=res["choices"][0]["message"]["content"] |
|
|
|
|
|
|
|
|
reply_content=remove_markdown_symbol(res["choices"][0]["message"]["content"]) |
|
|
else: |
|
|
else: |
|
|
reply_content=text |
|
|
reply_content=text |
|
|
else: |
|
|
else: |
|
@@ -529,7 +529,7 @@ def handle_voice(token_id,app_id, wxid,msg_data,from_wxid, to_wxid): |
|
|
hash_key = f'__AI_OPS_WX__:MESSAGES:{wxid}:{callback_to_user}' |
|
|
hash_key = f'__AI_OPS_WX__:MESSAGES:{wxid}:{callback_to_user}' |
|
|
messages=gewe_chat.wxchat.save_session_messages_to_cache(hash_key, {"role": "user", "content": react_voice_text}) |
|
|
messages=gewe_chat.wxchat.save_session_messages_to_cache(hash_key, {"role": "user", "content": react_voice_text}) |
|
|
ai_res=fast_gpt_api(messages,wxid,callback_to_user) |
|
|
ai_res=fast_gpt_api(messages,wxid,callback_to_user) |
|
|
ai_res_content=ai_res["choices"][0]["message"]["content"] |
|
|
|
|
|
|
|
|
ai_res_content=remove_markdown_symbol(ai_res["choices"][0]["message"]["content"]) |
|
|
has_url=contains_url(ai_res_content) |
|
|
has_url=contains_url(ai_res_content) |
|
|
if not has_url: |
|
|
if not has_url: |
|
|
voice_during,voice_url=utils.wx_voice(ai_res_content) |
|
|
voice_during,voice_url=utils.wx_voice(ai_res_content) |
|
@@ -606,7 +606,7 @@ def handle_xml_reference(token_id,app_id, wxid,msg_data,from_wxid, to_wxid): |
|
|
|
|
|
|
|
|
# 回复的对话 |
|
|
# 回复的对话 |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
reply_content=res["choices"][0]["message"]["content"] |
|
|
|
|
|
|
|
|
reply_content=remove_markdown_symbol(res["choices"][0]["message"]["content"]) |
|
|
input_wx_content_dialogue_message=[{"type": "text", "text": reply_content}] |
|
|
input_wx_content_dialogue_message=[{"type": "text", "text": reply_content}] |
|
|
input_message=utils.dialogue_message(wxid,callback_to_user,input_wx_content_dialogue_message,True) |
|
|
input_message=utils.dialogue_message(wxid,callback_to_user,input_wx_content_dialogue_message,True) |
|
|
kafka_helper.kafka_client.produce_message(input_message) |
|
|
kafka_helper.kafka_client.produce_message(input_message) |
|
@@ -658,7 +658,7 @@ def handle_add_friend_notice(token_id,app_id, wxid,msg_data,from_wxid, to_wxid): |
|
|
|
|
|
|
|
|
callback_to_user=to_contact_wxid |
|
|
callback_to_user=to_contact_wxid |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
res=fast_gpt_api(messages_to_send,wxid,callback_to_user) |
|
|
reply_content=res["choices"][0]["message"]["content"] |
|
|
|
|
|
|
|
|
reply_content=remove_markdown_symbol(res["choices"][0]["message"]["content"]) |
|
|
|
|
|
|
|
|
#保存好友信息 |
|
|
#保存好友信息 |
|
|
gewe_chat.wxchat.save_contacts_brief_to_cache(token_id,app_id, wxid,[to_contact_wxid]) |
|
|
gewe_chat.wxchat.save_contacts_brief_to_cache(token_id,app_id, wxid,[to_contact_wxid]) |
|
@@ -866,4 +866,10 @@ def check_chatroom(userName): |
|
|
pattern = r'^\d+@chatroom$' |
|
|
pattern = r'^\d+@chatroom$' |
|
|
if re.match(pattern, userName): |
|
|
if re.match(pattern, userName): |
|
|
return True |
|
|
return True |
|
|
return False |
|
|
|
|
|
|
|
|
return False |
|
|
|
|
|
|
|
|
|
|
|
def remove_markdown_symbol(text: str): |
|
|
|
|
|
# 移除markdown格式,目前先移除** |
|
|
|
|
|
if not text: |
|
|
|
|
|
return text |
|
|
|
|
|
return re.sub(r'\*\*(.*?)\*\*', r'\1', text) |