Skip to content

Webui - change setText command from parent window to also send the message. #13309

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.

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
merged 7 commits into from
May 5, 2025

Conversation

igardev
Copy link
Contributor

@igardev igardev commented May 5, 2025

  • setText command from parent window (for llama-vscode) now sends the message automatically.
  • Upgrade packages versions to fix vulnerabilities with "npm audit fix" command.

Comment on lines 46 to 52
textarea.focus();
if (onSend && data?.text) {
// Use setTimeout to ensure state updates are processed
setTimeout(() => {
onSend();
}, 50);
}
Copy link
Collaborator

@ngxson ngxson May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tbh I don't quite like this approach because it makes the logic looks kinda circular dependency.

A cleaner approach is to simply extend useChatTextarea to temporary hold a callback let's say textarea.onSubmit, then call it here:

Suggested change
textarea.focus();
if (onSend && data?.text) {
// Use setTimeout to ensure state updates are processed
setTimeout(() => {
onSend();
}, 50);
}
textarea.focus();
textarea.onSubmit();

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. It is cleaner.

@@ -132,7 +128,7 @@ export default function ChatScreen() {
scrollToBottom(true);
};

const sendNewMessage = async () => {
const sendNewMessage = useCallback(async () => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need useCallback here. We can simply update textarea.onSubmit = sendNewMessage each time

@ngxson
Copy link
Collaborator

ngxson commented May 5, 2025

I'll push a commit to implement my suggestions

@ngxson
Copy link
Collaborator

ngxson commented May 5, 2025

@igardev can you test this?

@igardev
Copy link
Contributor Author

igardev commented May 5, 2025

@igardev can you test this?

@ngxson The send message works (textarea.refOnSubmit.current?.(); ), but the Extra Context is now lost:
image

Should be:
image

Thanks for the cleaner implementation. If the extra context appears too - will be great.

Comment on lines +36 to +38
setTimeout(() => {
textarea.refOnSubmit.current?.();
}, 10); // wait for setExtraContext to finish
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok seems like if this is called right away, setExtraContext hasn't yet finished, hence why you don't see it. Can you give it a try now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works now. Thanks!

@ngxson ngxson merged commit b34c859 into ggml-org:master May 5, 2025
6 checks passed
gabe-l-hart added a commit to gabe-l-hart/llama.cpp that referenced this pull request May 6, 2025
* origin/master: (27 commits)
llama : fix build_ffn without gate (ggml-org#13336)
CUDA: fix bad asserts for partial offload (ggml-org#13337)
convert : qwen2/3moe : set yarn metadata if present (ggml-org#13331)
CUDA: fix --split-mode row for MMQ (ggml-org#13323)
gguf-py : avoid requiring pyside6 for other scripts (ggml-org#13036)
CUDA: fix logic for clearing padding with -ngl 0 (ggml-org#13320)
sampling : Integrate Top-nσ into main sampling chain (and add it to the server) (ggml-org#13264)
server : Webui - change setText command from parent window to also send the message. (ggml-org#13309)
mtmd : rename llava directory to mtmd (ggml-org#13311)
clip : fix confused naming ffn_up and ffn_down (ggml-org#13290)
convert : bailingmoe : set yarn metadata if present (ggml-org#13312)
SYCL: Disable mul_mat kernels for noncontiguous tensor b (ggml-org#13308)
mtmd : add C public API (ggml-org#13184)
rpc : use backend registry, support dl backends (ggml-org#13304)
ggml : activate s390x simd for Q3_K (ggml-org#13301)
llava/mtmd : fixes to fully support dl backends (ggml-org#13303)
llama : build windows releases with dl backends (ggml-org#13220)
CUDA: fix race condition in MMQ stream-k fixup (ggml-org#13299)
CUDA: fix race condition in MMQ ids_dst (ggml-org#13294)
vulkan: Additional type support for unary, binary, and copy (ggml-org#13266)
...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants