Skip to content

Commit

Permalink
Merge pull request #1635 from hlohaus/flow
Browse files Browse the repository at this point in the history
Fix filter messages in gui
  • Loading branch information
hlohaus authored Feb 26, 2024
2 parents c2f2927 + 0bfaede commit d44238e
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions g4f/gui/client/js/chat.v1.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ const remove_cancel_button = async () => {
const filter_messages = (messages) => {
// Removes none user messages at end
let last_message;
while (last_message = new_messages.pop()) {
while (last_message = messages.pop()) {
if (last_message["role"] == "user") {
new_messages.push(last_message);
messages.push(last_message);
break;
}
}
Expand Down Expand Up @@ -430,9 +430,12 @@ const load_conversation = async (conversation_id) => {
`;
}

let count_total = GPTTokenizer_cl100k_base?.encodeChat(filter_messages(messages), "gpt-3.5-turbo").length
if (count_total > 0) {
elements += `<div class="count_total">(${count_total} tokens used)</div>`;
const filtered = filter_messages(messages);
if (filtered.length > 0) {
let count_total = GPTTokenizer_cl100k_base?.encodeChat(filtered, "gpt-3.5-turbo").length
if (count_total > 0) {
elements += `<div class="count_total">(${count_total} tokens used)</div>`;
}
}

message_box.innerHTML = elements;
Expand Down

0 comments on commit d44238e

Please sign in to comment.