Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions apps/agentfabric/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ def check_uuid(uuid_str):
create_chatbot = mgr.Chatbot(
show_label=False,
value=[[None, start_text]],
flushing=False,
show_copy_button=True,
llm_thinking_presets=[
qwen(
Expand Down Expand Up @@ -375,10 +376,9 @@ def format_message_with_builder_cfg(_state, chatbot, builder_cfg,
visible=True,
value=format_cover_html(builder_cfg, bot_avatar_path)),
user_chatbot:
mgr.Chatbot(
gr.update(
visible=False,
avatar_images=get_avatar_image(bot_avatar, uuid_str),
_force_update=True),
avatar_images=get_avatar_image(bot_avatar, uuid_str)),
user_chat_bot_suggest:
gr.Dataset(components=[preview_chat_input], samples=suggestion)
}
Expand Down Expand Up @@ -443,7 +443,7 @@ def process_configuration(uuid_str, bot_avatar, name, description,
bot_avatar, bot_avatar_path = save_avatar_image(bot_avatar, uuid_str)
suggestions_filtered = [row for row in suggestions if row[0]]
if len(suggestions_filtered) == 0:
suggestions_filtered == [['']]
suggestions_filtered = [['']]
user_dir = get_user_dir(uuid_str)
if knowledge_files is not None:
new_knowledge_files = [
Expand All @@ -456,7 +456,6 @@ def process_configuration(uuid_str, bot_avatar, name, description,
shutil.copy(src_file.name, dst_file)
else:
new_knowledge_files = []

builder_cfg = {
'name': name,
'avatar': bot_avatar,
Expand Down Expand Up @@ -511,16 +510,13 @@ def process_configuration(uuid_str, bot_avatar, name, description,
visible=True,
value=format_cover_html(builder_cfg, bot_avatar_path)),
user_chatbot:
mgr.Chatbot(
gr.update(
visible=False,
avatar_images=get_avatar_image(bot_avatar, uuid_str),
_force_update=True,
),
avatar_images=get_avatar_image(bot_avatar, uuid_str)),
suggestion_input: [item[:] for item in suggestions_filtered],
user_chat_bot_suggest:
gr.Dataset(
components=[preview_chat_input], samples=suggestions_filtered),
suggestion_input:
gr.DataFrame(value=suggestions_filtered)
}

# 配置 "Configure" 标签页的提交按钮功能
Expand Down
27 changes: 19 additions & 8 deletions apps/agentfabric/appBot.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,20 @@ def send_message(chatbot, input, _state):
# 将发送的消息添加到聊天历史
if 'user_agent' not in _state:
init_user(_state)

# 将发送的消息添加到聊天历史
_uuid_str = check_uuid(uuid_str)
user_agent = _state['user_agent']
append_files = list(map(lambda f: f.path, input.files))
append_files = []
for file in input.files:
file_name = os.path.basename(file.path)
# covert xxx.json to xxx_uuid_str.json
file_name = file_name.replace('.', f'_{_uuid_str}.')
file_path = os.path.join(get_ci_dir(), file_name)
if not os.path.exists(file_path):
# make sure file path's directory exists
os.makedirs(os.path.dirname(file_path), exist_ok=True)
shutil.copy(file.path, file_path)
append_files.append(file_path)
chatbot.append([{'text': input.text, 'files': input.files}, None])
yield {
user_chatbot: chatbot,
Expand Down Expand Up @@ -141,12 +152,12 @@ def send_message(chatbot, input, _state):
chatbot[-1][1] = msg
yield {user_chatbot: chatbot}

gr.on([user_chatbot_input.submit],
fn=send_message,
inputs=[user_chatbot, user_chatbot_input, state],
outputs=[user_chatbot, user_chatbot_input])
gr.on([user_chatbot_input.submit],
fn=send_message,
inputs=[user_chatbot, user_chatbot_input, state],
outputs=[user_chatbot, user_chatbot_input])

demo.load(init_user, inputs=[state], outputs=[state])

demo.queue(concurrency_count=10)
demo.launch(show_error=True)
demo.queue()
demo.launch(show_error=True, max_threads=10)
2 changes: 1 addition & 1 deletion apps/agentfabric/gradio_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def format_cover_html(configuration, bot_avatar_path):
return f"""
<div class="bot_cover">
<div class="bot_avatar">
<img src={image_src} />
<img src="{image_src}" />
</div>
<div class="bot_name">{configuration.get("name", "")}</div>
<div class="bot_desp">{configuration.get("description", "")}</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/msgpt/gradio_chatbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def process_exec_result(self, exec_result: str):
return final_result

match_audio = re.search(
r'<audio id=audio controls= preload=none> <source id=wav src=(.*?)> <\/audio>',
r'<audio id=audio controls= preload=none> <source id=wav src="(.*?)"> <\/audio>',
exec_result)
if match_audio:
audio_path = match_audio.group(1)
Expand Down
2 changes: 1 addition & 1 deletion apps/msgpt/predict.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ def upload_image(file):

return [
gr.HTML.update(
f"<div class=\"uploaded-image-box\"><img src={gr_file_path}></img><div>",
f"<div class=\"uploaded-image-box\"><img src=\"{gr_file_path}\"></img><div>",
visible=True), gr_file_path
]
4 changes: 2 additions & 2 deletions modelscope_agent/output_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def __init__(self, audio) -> None:
with open(self._path, 'wb') as f:
f.write(self._raw_data)

self._repr = f'<audio id=audio controls= preload=none> <source id=wav src={self._path}> </audio>'
self._repr = f'<audio id=audio controls= preload=none> <source id=wav src="{self._path}"> </audio>'


class VideoWrapper(OutputWrapper):
Expand Down Expand Up @@ -178,7 +178,7 @@ def display(llm_result: Union[str, dict], exec_result: Dict, idx: int,
exec_result (Dict): exec result
idx (int): current round
"""
from IPython.display import display, Pretty, Image, Audio, JSON
from IPython.display import JSON, Audio, Image, Pretty, display
idx_info = '*' * 50 + f'round {idx}' + '*' * 50
display(Pretty(idx_info))

Expand Down