From b4713ea3b2e087dd120fb4509b134a54317a6192 Mon Sep 17 00:00:00 2001 From: YasinOnm08 Date: Tue, 24 Sep 2024 09:51:16 +0200 Subject: [PATCH 1/3] Only 1 msg at a time --- app/backend/InputOutputHandler.tsx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/app/backend/InputOutputHandler.tsx b/app/backend/InputOutputHandler.tsx index bf8a191..df2ab1e 100644 --- a/app/backend/InputOutputHandler.tsx +++ b/app/backend/InputOutputHandler.tsx @@ -3,7 +3,9 @@ import React, { useEffect, useRef, useState } from "react"; import ConversationFrontend from "../components/ConversationFrontend"; import InputFrontend from "../components/InputFrontend"; import axios from "axios"; -import { log } from 'console'; + + +let sendable = true const InputOutputBackend: React.FC = () => { type Message = { @@ -37,8 +39,10 @@ const InputOutputBackend: React.FC = () => { postWorkerRef.current.onmessage = (event) => { const status = event.data.status if (status == 200) { + sendable = true endGetWorker() } else if (status == 500) { + sendable = true if (getWorkerRef.current) { addMessage("assistant", "There was an Error with the AI response") getWorkerRef.current.postMessage("terminate") @@ -109,11 +113,14 @@ const InputOutputBackend: React.FC = () => { setMessages(previous => [...previous,{role,content}]) } const handleSendClick = (inputValue: string) => { - if (postWorkerRef.current) { - addMessage("user", inputValue) - console.log("input:",inputValue); - postWorkerRef.current.postMessage({messages:[...messages, { role: "user", content: inputValue }], ai_model:"phi3.5", access_token:accessToken}) - startGetWorker() + if (sendable) { + sendable=false + if (postWorkerRef.current) { + addMessage("user", inputValue) + console.log("input:",inputValue); + postWorkerRef.current.postMessage({messages:[...messages, { role: "user", content: inputValue }], ai_model:"phi3.5", access_token:accessToken}) + startGetWorker() + } } } From d037439b4ce06601f5e9d38da7d040db21579407 Mon Sep 17 00:00:00 2001 From: YasinOnm08 Date: Tue, 24 Sep 2024 10:22:50 +0200 Subject: [PATCH 2/3] no empty msg --- app/backend/InputOutputHandler.tsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/backend/InputOutputHandler.tsx b/app/backend/InputOutputHandler.tsx index df2ab1e..9458f5d 100644 --- a/app/backend/InputOutputHandler.tsx +++ b/app/backend/InputOutputHandler.tsx @@ -113,13 +113,15 @@ const InputOutputBackend: React.FC = () => { setMessages(previous => [...previous,{role,content}]) } const handleSendClick = (inputValue: string) => { - if (sendable) { - sendable=false - if (postWorkerRef.current) { - addMessage("user", inputValue) - console.log("input:",inputValue); - postWorkerRef.current.postMessage({messages:[...messages, { role: "user", content: inputValue }], ai_model:"phi3.5", access_token:accessToken}) - startGetWorker() + if (inputValue != "") { + if (sendable) { + sendable=false + if (postWorkerRef.current) { + addMessage("user", inputValue) + console.log("input:",inputValue); + postWorkerRef.current.postMessage({messages:[...messages, { role: "user", content: inputValue }], ai_model:"phi3.5", access_token:accessToken}) + startGetWorker() + } } } } From 37177a7856c727dd8b5c63b7f6cdcfb358cd1731 Mon Sep 17 00:00:00 2001 From: YasinOnm08 Date: Tue, 24 Sep 2024 10:58:14 +0200 Subject: [PATCH 3/3] OMG FINALY WORKING LIVE TEXT --- app/backend/InputOutputHandler.tsx | 4 ++++ app/backend/threads/GetWorker.js | 2 +- app/backend/threads/PostWorker.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/backend/InputOutputHandler.tsx b/app/backend/InputOutputHandler.tsx index 9458f5d..12f5d10 100644 --- a/app/backend/InputOutputHandler.tsx +++ b/app/backend/InputOutputHandler.tsx @@ -90,11 +90,15 @@ const InputOutputBackend: React.FC = () => { if (getWorkerRef.current) { getWorkerRef.current.postMessage({action:"terminate"}) getWorkerRef.current.terminate() + getWorkerRef.current = null console.log(messages); } } const editLastMessage = (newContent: string) => { + if (newContent == "") { + newContent = "Loading..." + } setMessages((prevMessages) => { const updatedMessages = prevMessages.slice(); // Create a shallow copy of the current messages if (updatedMessages.length > 0) { diff --git a/app/backend/threads/GetWorker.js b/app/backend/threads/GetWorker.js index 23d8e63..fcdcc2f 100644 --- a/app/backend/threads/GetWorker.js +++ b/app/backend/threads/GetWorker.js @@ -29,6 +29,6 @@ const fetchData = () => { .catch(error => { console.log('Error fetching data:', error); postMessage({error:"failed fetching data"}) - + setTimeout(() => fetchData(),1000) }) } \ No newline at end of file diff --git a/app/backend/threads/PostWorker.js b/app/backend/threads/PostWorker.js index 730c852..d6f6b04 100644 --- a/app/backend/threads/PostWorker.js +++ b/app/backend/threads/PostWorker.js @@ -2,7 +2,7 @@ import axios from "axios"; onmessage = (e) => { const { messages = [{ role: "assistant", content: "Hello! How can I help you?" }], ai_model = "phi3.5", access_token } = e.data - messages.unshift({ role: "system", content: "You are a Helpful assistant" }) + messages.unshift({ role: "system", content: "You are a Helpful assistant. you give short answers" }) const Message = { messages: messages,