main #36

Merged
Patrick_Pluto merged 13 commits from React-Group/interstellar_ai:main into main 2024-10-03 16:16:34 +02:00
8 changed files with 149 additions and 125 deletions

View file

@ -6,7 +6,7 @@ type ChatMessage = {
let chatHistory: ChatMessage[] = []; let chatHistory: ChatMessage[] = [];
function addMessageHistory(name: string, message: any): void { function addMessageToHistory(name: string, message: any): void {
const newMessage: ChatMessage = { const newMessage: ChatMessage = {
name: name, name: name,
messages: message, messages: message,
@ -16,7 +16,7 @@ function addMessageHistory(name: string, message: any): void {
console.log(`Added message from ${name}: ${message}`); console.log(`Added message from ${name}: ${message}`);
} }
function removeMessageHistory(timestamp: number): void { function removeMessageFromHistory(timestamp: number): void {
const index = chatHistory.findIndex((msg) => msg.timestamp === timestamp); const index = chatHistory.findIndex((msg) => msg.timestamp === timestamp);
if (index > -1) { if (index > -1) {
chatHistory.splice(index, 1); chatHistory.splice(index, 1);

View file

@ -24,6 +24,8 @@ const InputOutputBackend: React.FC = () => {
const [dateFormat, setDateFormat] = useState<string>("DD-MM-YYYY"); const [dateFormat, setDateFormat] = useState<string>("DD-MM-YYYY");
const [messages, setMessages] = useState<Message[]>([]); const [messages, setMessages] = useState<Message[]>([]);
const [myBoolean, setMyBoolean] = useState<boolean>(() => localStorage.getItem('myBoolean') === 'true') || false; const [myBoolean, setMyBoolean] = useState<boolean>(() => localStorage.getItem('myBoolean') === 'true') || false;
const apiURL = new URL("http://localhost:5000/interstellar_ai/api/ai_create")
apiURL.hostname = window.location.hostname;
// Fetch local storage values and update state on component mount // Fetch local storage values and update state on component mount
useEffect(() => { useEffect(() => {
@ -72,7 +74,7 @@ const InputOutputBackend: React.FC = () => {
useEffect(() => { useEffect(() => {
getNewToken() getNewToken()
postWorkerRef.current = new Worker(new URL("./threads/PostWorker.js", import.meta.url)) postWorkerRef.current = new Worker(new URL("./threads/PostWorker.ts", import.meta.url))
postWorkerRef.current.onmessage = (event) => { postWorkerRef.current.onmessage = (event) => {
const status = event.data.status const status = event.data.status
@ -101,7 +103,7 @@ const InputOutputBackend: React.FC = () => {
}, []) }, [])
const getNewToken = () => { const getNewToken = () => {
axios.get("http://localhost:5000/interstellar_ai/api/ai_create") axios.get(apiURL.href)
.then(response => { .then(response => {
setAccessToken(response.data.access_token) setAccessToken(response.data.access_token)
}) })
@ -113,9 +115,11 @@ const InputOutputBackend: React.FC = () => {
const startGetWorker = () => { const startGetWorker = () => {
if (!getWorkerRef.current) { if (!getWorkerRef.current) {
getWorkerRef.current = new Worker(new URL("./threads/GetWorker.js", import.meta.url)) getWorkerRef.current = new Worker(new URL("./threads/GetWorker.ts", import.meta.url))
getWorkerRef.current.postMessage({ action: "start", access_token: accessToken }) const windowname = window.location.hostname
getWorkerRef.current.postMessage({ action: "start", access_token: accessToken, windowname })
addMessage("assistant", "") addMessage("assistant", "")
getWorkerRef.current.onmessage = (event) => { getWorkerRef.current.onmessage = (event) => {
@ -178,7 +182,8 @@ const InputOutputBackend: React.FC = () => {
} }
} }
setInputMessage("") setInputMessage("")
postWorkerRef.current.postMessage({ messages: [...messages, { role: "user", content: inputValue }], ai_model: "llama3.2", model_type: type, access_token: accessToken, api_key: api_key }) const windowname = window.location.hostname
postWorkerRef.current.postMessage({ messages: [...messages, { role: "user", content: inputValue }], ai_model: "llama3.2", model_type: type, access_token: accessToken, api_key: api_key, windowname })
startGetWorker() startGetWorker()
} }
} }
@ -246,7 +251,7 @@ const InputOutputBackend: React.FC = () => {
const handleEditClick = () => { const handleEditClick = () => {
let newestMessage = messages[messages.length - 2].content let newestMessage = messages[messages.length - 2].content
setInputMessage(newestMessage) setInputMessage(newestMessage)
const updatedMessages = messages.slice(0, messages.length-2) const updatedMessages = messages.slice(0, messages.length - 2)
setMessages(updatedMessages) setMessages(updatedMessages)
endGetWorker() endGetWorker()
getNewToken() getNewToken()

View file

@ -18,9 +18,12 @@ if all went well, you will get the status 200 in response.data.status
to check if the request was accepted or declined, check response.data.response, it will be either true or false depending on if it worked, or not. to check if the request was accepted or declined, check response.data.response, it will be either true or false depending on if it worked, or not.
*/ */
const apiURL = new URL("http://localhost:5000/interstellar_ai/db")
apiURL.hostname = window.location.hostname;
export const sendToDatabase = async (data: any): Promise<boolean> => { export const sendToDatabase = async (data: any): Promise<boolean> => {
try { try {
const response = await axios.post("http://localhost:5000/interstellar_ai/db", data); const response = await axios.post(apiURL.href, data);
const status = response.data.status; const status = response.data.status;
const success = response.data.response; const success = response.data.response;
postMessage({ status, success }); postMessage({ status, success });
@ -33,7 +36,7 @@ export const sendToDatabase = async (data: any): Promise<boolean> => {
export const sendToDatabaseAndGetString = async (data: any): Promise<string> => { export const sendToDatabaseAndGetString = async (data: any): Promise<string> => {
try { try {
const response = await axios.post("http://localhost:5000/interstellar_ai/db", data); const response = await axios.post(apiURL.href, data);
const status = response.data.status; const status = response.data.status;
const success = response.data.response; const success = response.data.response;
postMessage({ status, success }); postMessage({ status, success });

View file

@ -1,10 +1,14 @@
import axios from "axios"; import axios from "axios";
let accesstoken let windownameGlobal = ""
let accesstoken = ""
onmessage = (event) => { onmessage = (event) => {
const { action, access_token } = event.data const { action, access_token, windowname } = event.data
accesstoken = access_token accesstoken = access_token
windownameGlobal = windowname
if (action === "start") { if (action === "start") {
fetchData() fetchData()
} else if (action === "terminate") { } else if (action === "terminate") {
@ -14,9 +18,12 @@ onmessage = (event) => {
const fetchData = () => { const fetchData = () => {
const apiURL = "http://localhost:5000/interstellar_ai/api/ai_get?access_token=" + accesstoken const apiURL = new URL("http://localhost:5000/interstellar_ai/api/ai_get?access_token=" + accesstoken)
apiURL.hostname = windownameGlobal;
axios.get(apiURL) console.log(apiURL.href)
axios.get(apiURL.href)
.then(response => { .then(response => {
const data = response.data const data = response.data
postMessage(data) postMessage(data)

View file

@ -1,7 +1,7 @@
import axios from "axios"; import axios from "axios";
onmessage = (e) => { onmessage = (e) => {
const { messages, ai_model, model_type, access_token, api_key } = e.data const { messages, ai_model, model_type, access_token, api_key, windowname } = e.data
const Message = { const Message = {
@ -12,7 +12,13 @@ onmessage = (e) => {
api_key: api_key api_key: api_key
} }
axios.post("http://localhost:5000/interstellar_ai/api/ai_send", Message) const apiURL = new URL("http://localhost:5000/interstellar_ai/api/ai_send")
console.log(windowname)
apiURL.hostname = windowname;
console.log(apiURL.href)
axios.post(apiURL.href, Message)
.then(response => { .then(response => {
const status = response.data.status const status = response.data.status
postMessage({ status }) postMessage({ status })

View file

@ -5,7 +5,10 @@ export const sendToVoiceRecognition = (audio_data: Blob): Promise<string> => {
const formdata = new FormData() const formdata = new FormData()
formdata.append("audio", audio_data) formdata.append("audio", audio_data)
return axios.post("http://localhost:5000/interstellar_ai/api/voice_recognition", formdata) const apiURL = new URL("http://localhost:5000/interstellar_ai/api/voice_recognition")
apiURL.hostname = window.location.hostname;
return axios.post(apiURL.href, formdata)
.then((response) => { .then((response) => {
return response.data.response return response.data.response
}) })

View file

@ -135,10 +135,10 @@ const modelList = {
Image: 'pixtral-12b-2409' Image: 'pixtral-12b-2409'
} }
} }
// Define the keys of modelList // Define the keys of modelList
type ModelKeys = keyof typeof modelList; type ModelKeys = keyof typeof modelList;
const ModelSection: React.FC = () => { const ModelSection: React.FC = () => {
// Initialize state with value from localStorage or default to '' // Initialize state with value from localStorage or default to ''
const [selectedModelDropdown, setSelectedModelDropdown] = useState<ModelKeys>('Offline Fast'); const [selectedModelDropdown, setSelectedModelDropdown] = useState<ModelKeys>('Offline Fast');
const [radioSelection, setRadioSelection] = useState<string | null>(""); const [radioSelection, setRadioSelection] = useState<string | null>("");
@ -250,6 +250,6 @@ const modelList = {
</div> </div>
</div> </div>
); );
}; };
export default ModelSection; export default ModelSection;

View file

@ -84,9 +84,9 @@ header{
.header-login-button{ .header-login-button{
height: 100%; height: 100%;
width:4vw; width:max-content;
font-size: var(--font-size); font-size: var(--font-size);
padding: 3px; padding: 0.5vw 1vw;
background-color: var(--input-button-color); background-color: var(--input-button-color);
color: var(--text-color); color: var(--text-color);
border: none; border: none;