Skip to content
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

Jump to bottom

Instruction multi-modal #1706

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+49 −5
Draft

Instruction multi-modal #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
273bc36
Instruction multi-modal
pseudotensor Jun 20, 2024
bccfcb0
Resolve
pseudotensor Jun 22, 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
52 changes: 48 additions & 4 deletions src/gradio_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@ def ask_block(kwargs, instruction_label, visible_upload, file_types, mic_sources
# info=None,
elem_id='prompt-form',
container=True,
visible=False,
)
instruction_mm = gr.MultimodalTextbox(
lines=kwargs['input_lines'],
label=label_instruction,
info=instruction_label,
# info=None,
elem_id='prompt-form',
container=True,
submit_btn=False,
)
mw0 = 20
mic_button = gr.Button(
Expand Down Expand Up @@ -263,7 +273,7 @@ def clear_audio_state():
.then(fn=lambda: None, **submit_kwargs)
stop_text.change(fn=clear_audio_state, outputs=audio_state) \
.then(fn=lambda: None, **stop_kwargs)
return attach_button, add_button, submit_buttons, instruction, submit, retry_btn, undo, clear_chat_btn, save_chat_btn, stop_btn
return attach_button, add_button, submit_buttons, instruction, instruction_mm, submit, retry_btn, undo, clear_chat_btn, save_chat_btn, stop_btn


def go_gradio(**kwargs):
Expand Down Expand Up @@ -1093,17 +1103,25 @@ def get_df_langchain_mode_paths(selection_docs_state1, db1s, dbs1=None):
text_viewable_doc_count = gr.Textbox(lines=2, label=None, visible=False)

with gr.Accordion("Image/Video Query", open=False, visible=have_vision_models):
image_file = gr.Image(value=kwargs['image_file'] if kwargs['image_file'] and any(
image_file = gr.Gallery(value=kwargs['image_file'] if kwargs['image_file'] and any(
kwargs['image_file'].endswith(y) for y in IMAGE_EXTENSIONS) else None,
label='Upload',
show_label=False,
type='filepath',
elem_id="warning", elem_classes="feedback",
visible=False,
)
video_file = gr.Video(value=None,
label='Upload',
show_label=False,
elem_id="warning", elem_classes="feedback",
visible=False,
)
audio_file = gr.Audio(value=None,
label='Upload',
show_label=False,
elem_id="warning", elem_classes="feedback",
visible=False,
)

col_tabs = gr.Column(elem_id="col-tabs", scale=10)
Expand Down Expand Up @@ -1156,7 +1174,8 @@ def get_df_langchain_mode_paths(selection_docs_state1, db1s, dbs1=None):
col_chat = gr.Column(visible=kwargs['chat'])
with col_chat:
if kwargs['visible_ask_anything_high']:
attach_button, add_button, submit_buttons, instruction, submit, retry_btn, undo, clear_chat_btn, save_chat_btn, stop_btn = \
attach_button, add_button, submit_buttons, instruction, instruction_mm, \
submit, retry_btn, undo, clear_chat_btn, save_chat_btn, stop_btn = \
ask_block(kwargs, instruction_label, visible_upload, file_types, mic_sources_kwargs,
mic_kwargs, noqueue_kwargs2, submit_kwargs, stop_kwargs)
visible_model_choice = bool(kwargs['model_lock']) and \
Expand Down Expand Up @@ -1191,7 +1210,8 @@ def get_df_langchain_mode_paths(selection_docs_state1, db1s, dbs1=None):
**kwargs)

if not kwargs['visible_ask_anything_high']:
attach_button, add_button, submit_buttons, instruction, submit, retry_btn, undo, clear_chat_btn, save_chat_btn, stop_btn = \
attach_button, add_button, submit_buttons, instruction, instruction_mm, \
submit, retry_btn, undo, clear_chat_btn, save_chat_btn, stop_btn = \
ask_block(kwargs, instruction_label, visible_upload, file_types, mic_sources_kwargs,
mic_kwargs, noqueue_kwargs2, submit_kwargs, stop_kwargs)
with gr.Row():
Expand Down Expand Up @@ -2476,6 +2496,30 @@ def set_loaders(max_quality1,
inputs=max_quality,
outputs=[image_audio_loaders, pdf_loaders, url_loaders])

def fun_mm(instruction_mm1, instruction1, image_file1, video_file1, audio_file1):
if 'text' in instruction_mm1:
instruction1 = instruction_mm1['text']
if 'url' in instruction_mm1:
instruction1 = instruction_mm1['url']
if 'files' in instruction_mm1:
image_file2 = [x for x in instruction_mm1['files'] if any(x.endswith(y) for y in IMAGE_EXTENSIONS)]
if image_file2:
image_file1 = image_file2
video_file2 = [x for x in instruction_mm1['files'] if any(x.endswith(y) for y in VIDEO_EXTENSIONS)]
if video_file2:
video_file1 = video_file2
if isinstance(video_file1, list):
if video_file1:
video_file1 = video_file1[0]
else:
video_file1 = None
return instruction1, image_file1, video_file1, audio_file1

instruction_mm.submit(fn=fun_mm,
inputs=[instruction_mm, instruction, image_file, video_file, audio_file],
outputs=[instruction, image_file, video_file, audio_file]). \
then(lambda: gr.MultimodalTextbox(interactive=True), None, [instruction_mm])

# Add to UserData or custom user db
update_db_func = functools.partial(update_user_db_gr,
dbs=dbs,
Expand Down
2 changes: 1 addition & 1 deletion src/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "e1b7e1f5e5a1382b59713ed023298e96bf9df0c0"
__version__ = "273bc363ef61006b47940650cd6cf7096648a24c"
Loading