- 
+ 
-
+ Chat On Your Data
+Clew
+
+ Chat history
+
+
+
+
+
+
+
+
+
+
+ Conversations
++
-
-
+
+
-
+ {showHistoryPanel && (
+
-
- {!lastQuestionRef.current ? (
-
- {/*
-
- ) : (
- Conversación con datos
*/} -
- {answers.map((answer, index) => (
-
---
.env.template | 3 +
backend/app.py | 28 ++++-
frontend/public/favicon.ico | Bin 4286 -> 15406 bytes
frontend/src/api/api.ts | 28 ++++-
frontend/src/api/models.ts | 6 +
frontend/src/assets/pencil.png | Bin 0 -> 1082 bytes
frontend/src/assets/trash.png | Bin 0 -> 734 bytes
.../HistoryPannel/ChatHistoryListItem.tsx | 110 ++++++++++++++++++
.../HistoryPannel/ChatHistoryPanel.tsx | 30 ++---
.../ChatHistoryPannel.module.css | 69 +++++++++++
frontend/src/pages/chat/Chat.module.css | 27 +++++
frontend/src/pages/layout/Layout.tsx | 1 +
frontend/src/providers/AppProviders.tsx | 7 +-
13 files changed, 286 insertions(+), 23 deletions(-)
create mode 100644 frontend/src/assets/pencil.png
create mode 100644 frontend/src/assets/trash.png
create mode 100644 frontend/src/components/HistoryPannel/ChatHistoryListItem.tsx
diff --git a/.env.template b/.env.template
index a8fb5735..19e037f7 100644
--- a/.env.template
+++ b/.env.template
@@ -1,5 +1,8 @@
# orchestrator's endpoint: use http://localhost:7071/api/orc when running everything locally.
ORCHESTRATOR_ENDPOINT="http://localhost:7071/api/orc"
+# conversation history endpoint: use http://localhost:7071/api/conversations when running everything locally.
+HISTORY_ENDPOINT="http://localhost:7071/api/conversations"
+
AZURE_KEY_VAULT_NAME="key_vault_name"
# Speech sythesis and recognition
diff --git a/backend/app.py b/backend/app.py
index 24c33593..ff05977c 100644
--- a/backend/app.py
+++ b/backend/app.py
@@ -16,6 +16,7 @@
SPEECH_REGION = os.getenv('SPEECH_REGION')
ORCHESTRATOR_ENDPOINT = os.getenv('ORCHESTRATOR_ENDPOINT')
+HISTORY_ENDPOINT = os.getenv('HISTORY_ENDPOINT')
SETTINGS_ENDPOINT = os.getenv('SETTINGS_ENDPOINT')
ORCHESTRATOR_URI = os.getenv('ORCHESTRATOR_URI')
STORAGE_ACCOUNT = os.getenv('STORAGE_ACCOUNT')
@@ -84,7 +85,32 @@ def chatgpt():
logging.exception("[webbackend] exception in /chatgpt")
return jsonify({"error": str(e)}), 500
-
+@app.route("/api/get-chat-history", methods=["GET"])
+def getChatHistory():
+ client_principal_id = request.headers.get('X-MS-CLIENT-PRINCIPAL-ID')
+ try:
+ # keySecretName is the name of the secret in Azure Key Vault which holds the key for the orchestrator function
+ # It is set during the infrastructure deployment.
+ keySecretName = 'orchestrator-host--functionKey'
+ functionKey = get_secret(keySecretName)
+ except Exception as e:
+ logging.exception("[webbackend] exception in /api/orchestrator-host--functionKey")
+ return jsonify({"error": f"Check orchestrator's function key was generated in Azure Portal and try again. ({keySecretName} not found in key vault)"}), 500
+ try:
+ url = HISTORY_ENDPOINT
+ headers = {
+ 'Content-Type': 'application/json',
+ 'x-functions-key': functionKey
+ }
+ payload = json.dumps({
+ "user_id": client_principal_id
+ })
+ response = requests.request("GET",url,headers=headers,data=payload)
+ logging.info(f"[webbackend] response: {response.text[:500]}...")
+ return(response.text)
+ except Exception as e:
+ logging.exception("[webbackend] exception in /get-chat-history")
+ return jsonify({"error": str(e)}), 500
# methods to provide access to speech services and blob storage account blobs
@app.route("/api/get-speech-token", methods=["GET"])
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
index f1fe50511ca0c33d95783506d4af99426dfc10bf..94cc94600468f1bd5fd20b41d5e460be8f139944 100644
GIT binary patch
literal 15406
zcmeI235-?c702JGym$Bg-M0^Kh8bo+0y9o!P^_UlU_=n4zw_X>FUBfXj4`=4`Eu|5mh=73
z|D5l;-#h0e5;cka6ONPMUQV2IKq4_Pkw}!wyWgALMB)zWT3YtB_f901q!Wo|`Y?nM
zyX(2d*O$ORI-NFr+y1s;7^7_4?q!;0lWiL(Te^NK<#gLHPO>cRm{8Xn?73C4fF-Pz`)YP>HEJK@Z>grs}(C;eJPuH~DZBw7<+V*%uQ&;F}
zYNcfuQ;>I?W$M4wRpl;CQMx?OJk-#%<(}hQ=vdZR%1xBHx~4AYJ`0(Pe9Jo6)U@w;
zo^>=>2C1p!tD2H}+OzFTXd7r6+WpKiOUBUe)=VbTkN3sW&YX8cVNErS9)b)->C{wZ
zo$I=_hM`TRu4J0p2*)%>2tQz&>RQ%mj-^ki9$Wp)m_w`IB#YqBzbD!EPO*EQuC&P3zF&>Jc^Y}2@p^UM~?Hs&AZTE;0n
zch}a|a!TGkKYH(??gQ60CJh-fgp+fne!6MskAP<+b7YzS9m;xewi&wi1pHj*qdRiy
zv-Dy7_WDxk8=TetPTO?HaV~(Qv^+lP3ahLJ@Pi((147@9O
zzrI(mUM2Xv9}X_&{J9kUmWDwvP3}^_{4xN{4XDdLvr-?3sl=~KvNzg5iTMhBjI8~(XH
zT0j2_gV+hVJNDq%iErI3Ye)K9x^}0oaRzpr$>L+o{W!WUp1%H^^G7uPFde@$H-jloYc=`Sb#3OBOO
z#*7)GSJz8hM@NSuZL%(h4b{2llrAm(fr3{4(UmGGhi}24V(c24V&x
z1|&{Gh&ItdiQ^=Y5MMC^F#|CJF#|CJF#|CJF#|CJ`QdQ)kk&m9>w0J
zE*j5cB_7|<(2$Z6y??Bayhhi45@(b6SX5CxSM@XP6^wF^`bPIYefs2l-#MRH<<(Lo
zuV3%Fl~_Nrla6CuNSyd$FjaB`#Fx*J_<0ZnCUL|b#HCM=af4f1^MT`xATE59rD->l
z%O5HDL>Je!PC?F9f=T8j##kgicqwt@*^K?M#5{=whty3Zzkgn-RO-d^<$>p&C39qb
z|6uw}AwJ$7;gl=QYZP6H$~@6+Pjc=?t(q}
zgoB!!n|*K&mfS-HzY2aO^}gW8UL#Z`xe+@p96WfiNt}GT=mOWB+`B{`_w7d
z)DU~W4E)>4tz61`#fA}n`tL&aI_z~rU0uG3d_kkcx2y5P#TGdIGqK>`_9Ny`4rV_2
zg4MY&=mhhtg&^q7_$T3FIewLwIU`^BIDYa$qrtYB+`x@82e|`yPwvET=aDm73zjaP
zuU3=Ejl`{&H8s^WabGDovEyT57-nQ#HGXMB#)sJPNn*ywM05X#e|XO2!g0jlPa;oN
zM_hb7{Uryqi8%dSiSc``eJk(X*lrSek+H0iYkK$Y-AoQ)ti;g4wXIw#jVk1F<9L1(
zy;p&KH1>X!aho$~|0md`3#_kz;S!!VklT4Ko%XMw{R7{z=i|)(%BH+j$U0wi#NHadvJ`)RH!9@X#xrjpWIaRM8?4RI(pP+4@;u1fBzUmJ
zli2ctXk6uv->@}Yfo{{7=PmkeVa;r0ZQk2hF1KqbWXfFB(Y`ht23Hz}zL2%~EF5L=
zxw*EXKg}9>-uJwR^ZERF!X@nwiho5qSf;sHFyX%n_L}Iq?mbe--(22ME)T&+j)$X>
zl8@?%F0%f`-^qQP=DYT%mbT-3&$*p`B6C##
z{{3~yerShTA4p8;Mlq1Ot@JEzl5D|7vZ
zachwIKKs^v(S8w)`>Z<{+mP`vvUf&0$UOMLE3!W2n<+91>2wQre~o=$4eMYGHfope
zJ2Z(<_OmR4B0Pao$#)+myP4>F)11gM+cg^J|iml$`y=n;2U-x-@x1Px7pb8yHWrD
z^IpT=?c-AuglEyA8o$Vt?=k#p)n`RHcM9%m-<5W$i*Q7Jq%JD7Rldz4PtJGp9`*mC
zcl>1lTrF}Pd(jt_^;L~$f6MdTJn^fVe_za7{rhBJ$ctsf48#n?48#n?48#n?48#n?
P48#n?48#n4JsJ2n-pT47
literal 4286
zcmeH}dr(y88OA?KWOvysX{UdrX?5Dk2n0}AK@g0WnRH4JL8DO=m3RY_c8nwq(U1w#
zblPb%a#2_oP(cAfxywyJkeD=zq)sBaX_L6ZDzLE2?us@Vd!D}Eo;|v0z+{sC8JwT*
z@$8=Sd*0_P<1*$&e`d{M{BKsRW9;XQF@J(ivBd;G&wsM$wa4g1&W}I$8|c~T?c4qQ
zLmRqMWkp?SJ~>@Ge6l;!e6l+@sXjS`p?#Yy_Wl*$JQ~=;HeYy=6c%Kf!Ux=ZJCigSyTk
z@tp5xu(*$Rv#qzA
zCYq+a+3TcxoJ^Ce$lKy}3f$YeO^%kWGB1y
-
@@ -42,7 +51,7 @@ const Layout = () => {
*/}
-
diff --git a/frontend/src/providers/AppProviders.tsx b/frontend/src/providers/AppProviders.tsx
new file mode 100644
index 00000000..57cc4980
--- /dev/null
+++ b/frontend/src/providers/AppProviders.tsx
@@ -0,0 +1,25 @@
+import React, { createContext, useContext, useState, ReactNode, Dispatch, SetStateAction } from "react";
+interface AppContextType {
+ showHistoryPanel: boolean;
+ setShowHistoryPanel: Dispatch>;
+}
+
+const AppContext = createContext(undefined);
+
+export const AppProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
+ const [showHistoryPanel, setShowHistoryPanel] = useState(false);
+
+ return (
+
+ {children}
+
+ );
+};
+
+export const useAppContext = (): AppContextType => {
+ const context = useContext(AppContext);
+ if (!context) {
+ throw new Error("useAppContext must be used inside AppProvider");
+ }
+ return context;
+};
From e50c9c650acf63bb1ebf7166d5f7e3506ea19632 Mon Sep 17 00:00:00 2001
From: Pedro Labrador <25873364+PedroLabrador@users.noreply.github.com>
Date: Mon, 1 Apr 2024 10:35:04 -0400
Subject: [PATCH 006/820] SFC- 39 Settings UI and connection (#6)
---
.gitignore | 4 +-
backend/app.py | 79 ++++++++++
frontend/src/api/api.ts | 74 +++++++++-
frontend/src/api/models.ts | 16 ++
.../SettingsModal/SettingsModal.module.css | 74 ++++++++++
.../src/components/SettingsModal/index.tsx | 139 ++++++++++++++++++
frontend/src/pages/layout/Layout.tsx | 8 +-
7 files changed, 390 insertions(+), 4 deletions(-)
create mode 100644 frontend/src/components/SettingsModal/SettingsModal.module.css
create mode 100644 frontend/src/components/SettingsModal/index.tsx
diff --git a/.gitignore b/.gitignore
index 5187a348..b9ea4e13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,4 +150,6 @@ cython_debug/
# NPM
npm-debug.log*
node_modules
-static/
\ No newline at end of file
+static/
+
+settings.json
\ No newline at end of file
diff --git a/backend/app.py b/backend/app.py
index 89dbe758..24c33593 100644
--- a/backend/app.py
+++ b/backend/app.py
@@ -16,6 +16,7 @@
SPEECH_REGION = os.getenv('SPEECH_REGION')
ORCHESTRATOR_ENDPOINT = os.getenv('ORCHESTRATOR_ENDPOINT')
+SETTINGS_ENDPOINT = os.getenv('SETTINGS_ENDPOINT')
ORCHESTRATOR_URI = os.getenv('ORCHESTRATOR_URI')
STORAGE_ACCOUNT = os.getenv('STORAGE_ACCOUNT')
LOGLEVEL = os.environ.get('LOGLEVEL', 'INFO').upper()
@@ -130,5 +131,83 @@ def getBlob():
logging.exception(blob_name)
return jsonify({"error": str(e)}), 500
+@app.route("/api/settings", methods=["GET"])
+def getSettings():
+ client_principal_id = request.headers.get('X-MS-CLIENT-PRINCIPAL-ID')
+ client_principal_name = request.headers.get('X-MS-CLIENT-PRINCIPAL-NAME')
+
+ if not client_principal_id or not client_principal_name:
+ return jsonify({"error": "Missing required parameters, client_principal_id or client_principal_name"}), 400
+
+ try:
+ # keySecretName is the name of the secret in Azure Key Vault which holds the key for the orchestrator function
+ # It is set during the infrastructure deployment.
+ keySecretName = 'orchestrator-host--functionKey'
+ functionKey = get_secret(keySecretName)
+ except Exception as e:
+ logging.exception("[webbackend] exception in /api/orchestrator-host--functionKey")
+ return jsonify({"error": f"Check orchestrator's function key was generated in Azure Portal and try again. ({keySecretName} not found in key vault)"}), 500
+
+ try:
+ url = SETTINGS_ENDPOINT
+ payload = json.dumps({
+ "client_principal_id": client_principal_id,
+ "client_principal_name": client_principal_name
+ })
+ headers = {
+ 'Content-Type': 'application/json',
+ 'x-functions-key': functionKey
+ }
+ response = requests.request("GET", url, headers=headers, data=payload)
+ logging.info(f"[webbackend] response: {response.text[:500]}...")
+ return(response.text)
+ except Exception as e:
+ logging.exception("[webbackend] exception in /api/settings")
+ return jsonify({"error": str(e)}), 500
+
+@app.route("/api/settings", methods=["POST"])
+def setSettings():
+ client_principal_id = request.headers.get('X-MS-CLIENT-PRINCIPAL-ID')
+ client_principal_name = request.headers.get('X-MS-CLIENT-PRINCIPAL-NAME')
+
+ if not client_principal_id or not client_principal_name:
+ return jsonify({"error": "Missing required parameters, client_principal_id or client_principal_name"}), 400
+
+ temperature = request.json["temperature"]
+ presence_penalty = request.json["presence_penalty"]
+ frequency_penalty = request.json["frequency_penalty"]
+
+ if not temperature or not presence_penalty or not frequency_penalty:
+ return jsonify({"error": "Missing required parameters, temperature, presence_penalty or frequency_penalty"}), 400
+
+ try:
+ # keySecretName is the name of the secret in Azure Key Vault which holds the key for the orchestrator function
+ # It is set during the infrastructure deployment.
+ keySecretName = 'orchestrator-host--functionKey'
+ functionKey = get_secret(keySecretName)
+ except Exception as e:
+ logging.exception("[webbackend] exception in /api/orchestrator-host--functionKey")
+ return jsonify({"error": f"Check orchestrator's function key was generated in Azure Portal and try again. ({keySecretName} not found in key vault)"}), 500
+
+ try:
+ url = SETTINGS_ENDPOINT
+ payload = json.dumps({
+ "client_principal_id": client_principal_id,
+ "client_principal_name": client_principal_name,
+ "temperature": temperature,
+ "presence_penalty": presence_penalty,
+ "frequency_penalty": frequency_penalty
+ })
+ headers = {
+ 'Content-Type': 'application/json',
+ 'x-functions-key': functionKey
+ }
+ response = requests.request("POST", url, headers=headers, data=payload)
+ logging.info(f"[webbackend] response: {response.text[:500]}...")
+ return(response.text)
+ except Exception as e:
+ logging.exception("[webbackend] exception in /api/settings")
+ return jsonify({"error": str(e)}), 500
+
if __name__ == "__main__":
app.run(host='0.0.0.0', port=8000)
diff --git a/frontend/src/api/api.ts b/frontend/src/api/api.ts
index 7d666853..19af781a 100644
--- a/frontend/src/api/api.ts
+++ b/frontend/src/api/api.ts
@@ -1,9 +1,79 @@
-import { AskRequest, AskResponse, AskResponseGpt, ChatRequest, ChatRequestGpt } from "./models";
+import {
+ AskRequest,
+ AskResponse,
+ AskResponseGpt,
+ ChatRequest,
+ ChatRequestGpt,
+ GetSettingsProps,
+ PostSettingsProps
+} from "./models";
+const loadModule = async (modulePath : string) => {
+ try {
+ return (await import(/* @vite-ignore */modulePath))?.default;
+ } catch (e) {
+ console.log("Error loading " + modulePath, e);
+ }
+}
+
+export async function getSettings({ user }: GetSettingsProps): Promise {
+ const settings = await loadModule("./settings.json");
+ const baseUrl = settings?.ENVIRONMENT === "development" ? settings?.LOCAL_API : "";
+
+ const user_id = user ? user.id : "00000000-0000-0000-0000-000000000000";
+ const user_name = user ? user.name : "anonymous";
+ const url = baseUrl + "/api/settings";
+ try {
+ const response = await fetch(url, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ "X-MS-CLIENT-PRINCIPAL-ID": user_id,
+ "X-MS-CLIENT-PRINCIPAL-NAME": user_name
+ }
+ });
+ const fetchedData = await response.json();
+ return fetchedData;
+ } catch (error) {
+ console.error("Error fetching settings", error);
+ return {};
+ }
+}
+export async function postSettings({ user, temperature, presence_penalty, frequency_penalty } : PostSettingsProps): Promise {
+ const settings = await loadModule("./settings.json");
+ const baseUrl = settings?.ENVIRONMENT === "development" ? settings?.LOCAL_API : "";
+
+ const user_id = user ? user.id : "00000000-0000-0000-0000-000000000000";
+ const user_name = user ? user.name : "anonymous";
+ const url = baseUrl + "/api/settings";
+ try {
+ const response = await fetch(url, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ "X-MS-CLIENT-PRINCIPAL-ID": user_id,
+ "X-MS-CLIENT-PRINCIPAL-NAME": user_name
+ },
+ body: JSON.stringify({
+ temperature,
+ presence_penalty,
+ frequency_penalty
+ })
+ });
+ const fetchedData = await response.json();
+ console.log("Settings posted", fetchedData);
+ return fetchedData;
+ } catch (error) {
+ console.error("Error posting settings", error);
+ return {};
+ }
+}
export async function chatApiGpt(options: ChatRequestGpt): Promise {
- const response = await fetch("/chatgpt", {
+ const settings = await loadModule("./settings.json");
+ const baseUrl = settings?.ENVIRONMENT === "development" ? settings?.LOCAL_API : "";
+ const response = await fetch(baseUrl + "/chatgpt", {
method: "POST",
headers: {
"Content-Type": "application/json"
diff --git a/frontend/src/api/models.ts b/frontend/src/api/models.ts
index 74b0a639..fc36b441 100644
--- a/frontend/src/api/models.ts
+++ b/frontend/src/api/models.ts
@@ -64,3 +64,19 @@ export type ChatRequestGpt = {
overrides?: AskRequestOverrides;
};
+export type GetSettingsProps = {
+ user: {
+ id: string;
+ name: string;
+ } | null;
+}
+
+export type PostSettingsProps = {
+ user: {
+ id: string;
+ name: string;
+ } | null;
+ temperature: number;
+ presence_penalty: number;
+ frequency_penalty: number;
+}
diff --git a/frontend/src/components/SettingsModal/SettingsModal.module.css b/frontend/src/components/SettingsModal/SettingsModal.module.css
new file mode 100644
index 00000000..d0fe3efd
--- /dev/null
+++ b/frontend/src/components/SettingsModal/SettingsModal.module.css
@@ -0,0 +1,74 @@
+.button {
+ color: rgb(63, 63, 63);
+ font-size: 24px;
+ border: none;
+ width: 100%;
+ display: flex;
+}
+
+.buttonText {
+ font-weight: 500;
+ padding-left: 10px
+}
+
+.disabled {
+ opacity: 0.4
+}
+
+.answerContainer {
+ padding: 40px;
+ background: rgb(249, 249, 249);
+ border-radius: 16px;
+ box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.14), 0px 0px 2px rgba(0, 0, 0, 0.12);
+ outline: transparent solid 1px;
+ width: 300px;
+}
+
+.saveButton {
+ background: rgb(0, 0, 0);
+ color: white;
+ border-radius: 8px;
+ padding: 10px;
+ font-size: 20px;
+ width: 100%;
+ border: none;
+ cursor: pointer;
+ margin-top: 20px;
+}
+
+.saveButton:hover {
+ background: rgb(0, 0, 0, 0.8);
+ color: white;
+}
+
+.closeButton {
+ background: rgb(249, 249, 249);
+ color: rgb(0, 0, 0);
+ font-size: 20px;
+ border: none;
+ cursor: pointer;
+ position: absolute;
+ top: 1rem;
+ right: 0;
+}
+
+.closeButton:hover {
+ background: rgb(249, 249, 249);
+ color: rgb(0, 0, 0, 0.8);
+}
+
+.closeButton:focus {
+ outline: none;
+}
+
+.header {
+ padding: 10px;
+ display: flex;
+}
+
+.modal-title {
+ font-size: 24px;
+ font-weight: 500;
+ padding-left: 10px;
+ color: red;
+}
\ No newline at end of file
diff --git a/frontend/src/components/SettingsModal/index.tsx b/frontend/src/components/SettingsModal/index.tsx
new file mode 100644
index 00000000..76819493
--- /dev/null
+++ b/frontend/src/components/SettingsModal/index.tsx
@@ -0,0 +1,139 @@
+import React, { useState, useEffect } from "react";
+import { SettingsFilled, SaveFilled } from "@fluentui/react-icons";
+import styles from "./SettingsModal.module.css";
+import { getSettings, postSettings } from "../../api/api";
+
+import { DefaultButton, Modal, Stack, Text, TextField, Spinner } from "@fluentui/react";
+
+interface Props {
+ user: {
+ id: string;
+ name: string;
+ } | null;
+}
+
+const SettingsModal = ({ user }: Props) => {
+ const [isModalOpen, setIsModalOpen] = useState(true);
+ const [temperature, setTemperature] = useState("");
+ const [presencePenalty, setPresencePenalty] = useState("");
+ const [frequencyPenalty, setFrequencyPenalty] = useState("");
+ const [loading, setLoading] = useState(true);
+
+ useEffect(() => {
+ const fetchData = async () => {
+ getSettings({ user }).then(data => {
+ setTemperature(data.temperature);
+ setPresencePenalty(data.presencePenalty);
+ setFrequencyPenalty(data.frequencyPenalty);
+ setLoading(false);
+ });
+ };
+
+ setLoading(true);
+ fetchData();
+ }, [user]);
+
+ const showModal = () => {
+ setIsModalOpen(true);
+ };
+
+ const hideModal = () => {
+ setIsModalOpen(false);
+ };
+
+ const handleSubmit = () => {
+ if (!temperature || !presencePenalty || !frequencyPenalty) {
+ return;
+ }
+
+ const parsedTemperature = parseFloat(temperature);
+ const parsedPresencePenalty = parseFloat(presencePenalty);
+ const parsedFrequencyPenalty = parseFloat(frequencyPenalty);
+
+ postSettings({
+ user,
+ temperature: parsedTemperature,
+ presence_penalty: parsedPresencePenalty,
+ frequency_penalty: parsedFrequencyPenalty
+ });
+
+ hideModal();
+ };
+
+ const validateValue = (val: any, func: any) => {
+ if (val.match(/^[0]+$/)) {
+ func("0");
+ return false;
+ }
+
+ if (val.match(/[^0-9.]/) || val < 0 || val > 1 || val.split(".").length > 2 || val === "1." || val.length > 4) {
+ return false;
+ }
+
+ return true;
+ };
+
+ const handleSetTemperature = (val: any) => {
+ if (validateValue(val.target.value, setTemperature)) {
+ setTemperature(val.target.value);
+ }
+ };
+
+ const handleSetPresencePenalty = (val: any) => {
+ if (validateValue(val.target.value, setPresencePenalty)) {
+ setPresencePenalty(val.target.value);
+ }
+ };
+
+ const handleSetFrequencyPenalty = (val: any) => {
+ if (validateValue(val.target.value, setFrequencyPenalty)) {
+ setFrequencyPenalty(val.target.value);
+ }
+ };
+
+ return (
+
+
From 0901a747ed3ce62e041cb6ad75f5343070d51dc7 Mon Sep 17 00:00:00 2001
From: Kenyer Ramirez <124545052+KenyerRamirez@users.noreply.github.com>
Date: Mon, 1 Apr 2024 11:27:21 -0400
Subject: [PATCH 007/820] SFC 50 populate conversation list (#5)
* add local enpoint to call orchestrator
* fix URL add HISTORY ENV endpoint
* SFC-50 list of history conversation and favicon done
* add client id to the request
* conflict resolved
---------
Co-authored-by: Alejandro Lopez
- onShowCitation(c, n, index)}
- onThoughtProcessClicked={() => onToggleTab(AnalysisPanelTabs.ThoughtProcessTab, index)}
- onSupportingContentClicked={() => onToggleTab(AnalysisPanelTabs.SupportingContentTab, index)}
- onFollowupQuestionClicked={q => makeApiRequestGpt(q)}
- showFollowupQuestions={false}
- showSources={true}
- />
-
+
+
);
diff --git a/frontend/src/pages/layout/Layout.module.css b/frontend/src/pages/layout/Layout.module.css
index cda5f9cf..86a4ad1d 100644
--- a/frontend/src/pages/layout/Layout.module.css
+++ b/frontend/src/pages/layout/Layout.module.css
@@ -5,16 +5,15 @@
}
.header {
- background-color: #FFFFFF;
+ background-color: #f1f1f1;
color: #f2f2f2;
}
.headerContainer {
display: flex;
align-items: center;
- justify-content: space-around;
- margin-right: 12px;
- margin-left: 12px;
+ justify-content: space-between;
+ margin: 10px 12px;
}
.headerTitleContainer {
diff --git a/frontend/src/pages/layout/Layout.tsx b/frontend/src/pages/layout/Layout.tsx
index 9b609604..508adfa9 100644
--- a/frontend/src/pages/layout/Layout.tsx
+++ b/frontend/src/pages/layout/Layout.tsx
@@ -4,8 +4,17 @@ import salesLogo from "../../img/logo.png";
import github from "../../assets/github.svg";
import styles from "./Layout.module.css";
+import { ChatHistoryButton } from "../../components/ChatHistoryButton/ChatHistoryButton";
+import { useAppContext } from "../../providers/AppProviders";
const Layout = () => {
+
+ const {showHistoryPanel, setShowHistoryPanel} = useAppContext()
+
+ const handleShowHistoryPanel = () => {
+ setShowHistoryPanel(!showHistoryPanel)
+ }
+
return (
+ onToggleTab(x, selectedAnswer)}
- citationHeight="810px"
- answer={answers[selectedAnswer][1]}
- activeTab={activeAnalysisPanelTab}
- fileType={fileType}
- />
- )}
-
- setIsConfigPanelOpen(false)}
- closeButtonAriaLabel="Close"
- onRenderFooterContent={() => setIsConfigPanelOpen(false)}>Close }
- isFooterAtBottom={true}
- >
-
+ {!lastQuestionRef.current ? (
+ onToggleTab(x, selectedAnswer)}
+ citationHeight="810px"
+ answer={answers[selectedAnswer][1]}
+ activeTab={activeAnalysisPanelTab}
+ fileType={fileType}
+ />
)}
- setIsConfigPanelOpen(false)}
+ closeButtonAriaLabel="Close"
+ onRenderFooterContent={() => setIsConfigPanelOpen(false)}>Close }
+ isFooterAtBottom={true}
+ >
+
-
- {answers.length > 0 && fileType !== "" && activeAnalysisPanelTab && (
-
+
+
+ {answers.length > 0 && fileType !== "" && activeAnalysisPanelTab && (
+
+
+
- ))}
- {isLoading && (
- <>
- Clew
+Your AI-driven Home Improvement expert who boosts marketing performance by synthesizing multiple data sources to deliver actionable insights.
-
-
- )}
- {error ? (
- <>
-
- makeApiRequestGpt(lastQuestionRef.current)} />
+
+ ) : (
+
+ {answers.map((answer, index) => (
+
+ )}
+
+
+
-
- ) : null}
-
+ ))}
+ {isLoading && (
+ <>
+
+ onShowCitation(c, n, index)}
+ onThoughtProcessClicked={() => onToggleTab(AnalysisPanelTabs.ThoughtProcessTab, index)}
+ onSupportingContentClicked={() => onToggleTab(AnalysisPanelTabs.SupportingContentTab, index)}
+ onFollowupQuestionClicked={q => makeApiRequestGpt(q)}
+ showFollowupQuestions={false}
+ showSources={true}
+ />
+
+
+
+ )}
+ {error ? (
+ <>
+
+ makeApiRequestGpt(lastQuestionRef.current)} />
+
+
+ ) : null}
+
+
+ makeApiRequestGpt(question)} />
+
- makeApiRequestGpt(question)} />
-
+ Clew
+
+
+ Settings
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default SettingsModal;
diff --git a/frontend/src/pages/layout/Layout.tsx b/frontend/src/pages/layout/Layout.tsx
index 508adfa9..15f11614 100644
--- a/frontend/src/pages/layout/Layout.tsx
+++ b/frontend/src/pages/layout/Layout.tsx
@@ -7,6 +7,8 @@ import styles from "./Layout.module.css";
import { ChatHistoryButton } from "../../components/ChatHistoryButton/ChatHistoryButton";
import { useAppContext } from "../../providers/AppProviders";
+import SettingsModal from "../../components/SettingsModal";
+
const Layout = () => {
const {showHistoryPanel, setShowHistoryPanel} = useAppContext()
@@ -51,7 +53,11 @@ const Layout = () => {
*/}
-
+
+ ✖
+
+
+ {loading ? (
+ Adjust your settings
+
+
+ ) : (
+ Loading your settings
+
+ handleSetTemperature(e)} />
+ handleSetFrequencyPenalty(e)} />
+ handleSetPresencePenalty(e)} />
+
+
+
+ )}
+
+ {/* needs an user to be sent ↓ */}
+
+