fix: add quotes for src prop#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzhangpurdue merged 14 commits into from
Jan 9, 2024
Merged

fix: add quotes for src prop #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d67f8cc
feat: update gradio 4
Dec 15, 2023
b49ed4b
feat: chatbot requirement
Dec 15, 2023
d0c5a0c
feat: update app.py to gradio 4
Dec 19, 2023
a534a22
fix: gradio 4 of process_configuration
Dec 20, 2023
8c07a94
fix: typo
Dec 21, 2023
aa9d840
fix: mschatbot
Dec 21, 2023
1f62f56
feat: chatbot support copy
Dec 22, 2023
b04cfdb
feat: fileupload
Dec 25, 2023
1e7ec7d
chore: merge
Dec 27, 2023
ed2c34f
fix: gradio 4 dataframe update
Dec 27, 2023
2f96a3a
fix: appBot
Dec 28, 2023
d24bee6
fix: dataframe display when config update
Col0ring Jan 3, 2024
215719b
fix: src format
Col0ring Jan 8, 2024
d6a37a5
fix: files path
Col0ring Jan 8, 2024
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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: add quotes for src prop#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zzhangpurdue
merged 14 commits into

from

Jan 9, 2024
 Merged


fix: add quotes for src prop
#249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
d67f8cc

feat: update gradio 4

Dec 15, 2023
b49ed4b

feat: chatbot requirement

Dec 15, 2023
d0c5a0c

feat: update app.py to gradio 4

Dec 19, 2023
a534a22

fix: gradio 4 of process_configuration

Dec 20, 2023
8c07a94

fix: typo

Dec 21, 2023
aa9d840

fix: mschatbot

Dec 21, 2023
1f62f56

feat: chatbot support copy

Dec 22, 2023
b04cfdb

feat: fileupload

Dec 25, 2023
1e7ec7d

chore: merge

Dec 27, 2023
ed2c34f

fix: gradio 4 dataframe update

Dec 27, 2023
2f96a3a

fix: appBot

Dec 28, 2023
d24bee6

fix: dataframe display when config update


Col0ring Jan 3, 2024
215719b

fix: src format


Col0ring Jan 8, 2024
d6a37a5

fix: files path


Col0ring Jan 8, 2024

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: add quotes for src prop#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zzhangpurdue
merged 14 commits into

from

Jan 9, 2024
 Merged


fix: add quotes for src prop
#249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
d67f8cc

feat: update gradio 4

Dec 15, 2023
b49ed4b

feat: chatbot requirement

Dec 15, 2023
d0c5a0c

feat: update app.py to gradio 4

Dec 19, 2023
a534a22

fix: gradio 4 of process_configuration

Dec 20, 2023
8c07a94

fix: typo

Dec 21, 2023
aa9d840

fix: mschatbot

Dec 21, 2023
1f62f56

feat: chatbot support copy

Dec 22, 2023
b04cfdb

feat: fileupload

Dec 25, 2023
1e7ec7d

chore: merge

Dec 27, 2023
ed2c34f

fix: gradio 4 dataframe update

Dec 27, 2023
2f96a3a

fix: appBot

Dec 28, 2023
d24bee6

fix: dataframe display when config update


Col0ring Jan 3, 2024
215719b

fix: src format


Col0ring Jan 8, 2024
d6a37a5

fix: files path


Col0ring Jan 8, 2024

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: add quotes for src prop#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zzhangpurdue
merged 14 commits into

from

Jan 9, 2024
 Merged


fix: add quotes for src prop
#249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
d67f8cc

feat: update gradio 4

Dec 15, 2023
b49ed4b

feat: chatbot requirement

Dec 15, 2023
d0c5a0c

feat: update app.py to gradio 4

Dec 19, 2023
a534a22

fix: gradio 4 of process_configuration

Dec 20, 2023
8c07a94

fix: typo

Dec 21, 2023
aa9d840

fix: mschatbot

Dec 21, 2023
1f62f56

feat: chatbot support copy

Dec 22, 2023
b04cfdb

feat: fileupload

Dec 25, 2023
1e7ec7d

chore: merge

Dec 27, 2023
ed2c34f

fix: gradio 4 dataframe update

Dec 27, 2023
2f96a3a

fix: appBot

Dec 28, 2023
d24bee6

fix: dataframe display when config update


Col0ring Jan 3, 2024
215719b

fix: src format


Col0ring Jan 8, 2024
d6a37a5

fix: files path


Col0ring Jan 8, 2024

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: add quotes for src prop#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zzhangpurdue
merged 14 commits into

from

Jan 9, 2024
 Merged


fix: add quotes for src prop
#249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
d67f8cc

feat: update gradio 4

Dec 15, 2023
b49ed4b

feat: chatbot requirement

Dec 15, 2023
d0c5a0c

feat: update app.py to gradio 4

Dec 19, 2023
a534a22

fix: gradio 4 of process_configuration

Dec 20, 2023
8c07a94

fix: typo

Dec 21, 2023
aa9d840

fix: mschatbot

Dec 21, 2023
1f62f56

feat: chatbot support copy

Dec 22, 2023
b04cfdb

feat: fileupload

Dec 25, 2023
1e7ec7d

chore: merge

Dec 27, 2023
ed2c34f

fix: gradio 4 dataframe update

Dec 27, 2023
2f96a3a

fix: appBot

Dec 28, 2023
d24bee6

fix: dataframe display when config update


Col0ring Jan 3, 2024
215719b

fix: src format


Col0ring Jan 8, 2024
d6a37a5

fix: files path


Col0ring Jan 8, 2024

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: add quotes for src prop#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zzhangpurdue
merged 14 commits into

from

Jan 9, 2024
 Merged


fix: add quotes for src prop
#249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
d67f8cc

feat: update gradio 4

Dec 15, 2023
b49ed4b

feat: chatbot requirement

Dec 15, 2023
d0c5a0c

feat: update app.py to gradio 4

Dec 19, 2023
a534a22

fix: gradio 4 of process_configuration

Dec 20, 2023
8c07a94

fix: typo

Dec 21, 2023
aa9d840

fix: mschatbot

Dec 21, 2023
1f62f56

feat: chatbot support copy

Dec 22, 2023
b04cfdb

feat: fileupload

Dec 25, 2023
1e7ec7d

chore: merge

Dec 27, 2023
ed2c34f

fix: gradio 4 dataframe update

Dec 27, 2023
2f96a3a

fix: appBot

Dec 28, 2023
d24bee6

fix: dataframe display when config update


Col0ring Jan 3, 2024
215719b

fix: src format


Col0ring Jan 8, 2024
d6a37a5

fix: files path


Col0ring Jan 8, 2024

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: add quotes for src prop#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zzhangpurdue
merged 14 commits into

from

Jan 9, 2024
 Merged


fix: add quotes for src prop
#249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
d67f8cc

feat: update gradio 4

Dec 15, 2023
b49ed4b

feat: chatbot requirement

Dec 15, 2023
d0c5a0c

feat: update app.py to gradio 4

Dec 19, 2023
a534a22

fix: gradio 4 of process_configuration

Dec 20, 2023
8c07a94

fix: typo

Dec 21, 2023
aa9d840

fix: mschatbot

Dec 21, 2023
1f62f56

feat: chatbot support copy

Dec 22, 2023
b04cfdb

feat: fileupload

Dec 25, 2023
1e7ec7d

chore: merge

Dec 27, 2023
ed2c34f

fix: gradio 4 dataframe update

Dec 27, 2023
2f96a3a

fix: appBot

Dec 28, 2023
d24bee6

fix: dataframe display when config update


Col0ring Jan 3, 2024
215719b

fix: src format


Col0ring Jan 8, 2024
d6a37a5

fix: files path


Col0ring Jan 8, 2024

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: add quotes for src prop#249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

zzhangpurdue
merged 14 commits into

from

Jan 9, 2024
 Merged


fix: add quotes for src prop
#249
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
d67f8cc

feat: update gradio 4

Dec 15, 2023
b49ed4b

feat: chatbot requirement

Dec 15, 2023
d0c5a0c

feat: update app.py to gradio 4

Dec 19, 2023
a534a22

fix: gradio 4 of process_configuration

Dec 20, 2023
8c07a94

fix: typo

Dec 21, 2023
aa9d840

fix: mschatbot

Dec 21, 2023
1f62f56

feat: chatbot support copy

Dec 22, 2023
b04cfdb

feat: fileupload

Dec 25, 2023
1e7ec7d

chore: merge

Dec 27, 2023
ed2c34f

fix: gradio 4 dataframe update

Dec 27, 2023
2f96a3a

fix: appBot

Dec 28, 2023
d24bee6

fix: dataframe display when config update


Col0ring Jan 3, 2024
215719b

fix: src format


Col0ring Jan 8, 2024
d6a37a5

fix: files path


Col0ring Jan 8, 2024

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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