Fix FR issue

akshata29 · Aug 1, 2023 · ece444f · ece444f
1 parent 3ac77c8
commit ece444f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/api/Python/OpenChatGpt/__init__.py b/api/Python/OpenChatGpt/__init__.py
@@ -100,7 +100,7 @@ def GetRrrAnswer(history, approach, overrides, indexNs, indexType):
     tokenLength = overrides.get('tokenLength') or 500
     firstSession = overrides.get('firstSession') or False
     sessionId = overrides.get('sessionId')
-    promptTemplate = overrides.get('promptTemplate') or ''
+    promptTemplate = overrides.get('promptTemplate') or 'You are an AI assistant that helps people find information.'
     deploymentType = overrides.get('deploymentType') or 'gpt35'
     useInternet = overrides.get('useInternet') or False
     os.environ['BING_SUBSCRIPTION_KEY'] = BingKey
@@ -303,7 +303,7 @@ def GetRrrAnswer(history, approach, overrides, indexNs, indexType):
 
     tokenLimit = getTokenLimit(gptModel)
     messages = getMessagesFromHistory(
-            "You are an AI assistant that helps people find information.",
+            promptTemplate,
             gptModel,
             history,
             lastQuestion,

diff --git a/api/Python/Utilities/formrecognizer.py b/api/Python/Utilities/formrecognizer.py
@@ -27,7 +27,7 @@ def chunk_paragraphs(paragraphs: List[str], fullPath:str,  max_words: int = 300)
             # start a new chunk
             if (
                 sum([list(c.values())[0] for c in chunks[-1]]) + list(p.values())[0]
-                > max_words
+                > int(max_words)
             ):
                 chunks.append([p])
             # If adding the next paragraph will not exceed the max word

diff --git a/app/frontend/src/pages/chatgpt/ChatGpt.tsx b/app/frontend/src/pages/chatgpt/ChatGpt.tsx
@@ -374,6 +374,16 @@ const ChatGpt = () => {
             });
             setSessionListGpt(sessionLists)
         }
+        let promptTemplate = "";
+        if (firstSession) {
+            if (selectedPromptTypeItemGpt?.key == "custom")
+                setPromptTemplateGpt(question);
+
+            promptTemplate = question;
+        }
+        else {
+            promptTemplate = promptTemplateGpt;
+        }
         lastQuestionRefGpt.current = question;
 
         error && setError(undefined);
@@ -385,7 +395,7 @@ const ChatGpt = () => {
                 history: [...history, { user: question, bot: undefined }],
                 approach: Approaches.ReadRetrieveRead,
                 overrides: {
-                    promptTemplate: promptTemplateGpt.length === 0 ? undefined : promptTemplateGpt,
+                    promptTemplate: promptTemplate,
                     temperature: temperatureGpt,
                     tokenLength: tokenLengthGpt,
                     embeddingModelType: String(selectedEmbeddingItemGpt?.key),

diff --git a/app/frontend/src/pages/pib/Pib.tsx b/app/frontend/src/pages/pib/Pib.tsx
@@ -1205,6 +1205,18 @@ const Pib = () => {
             });
             setSessionListGpt(sessionLists)
         }
+
+        let promptTemplate = "";
+        if (firstSession) {
+            if (selectedPromptTypeItemGpt?.key == "custom")
+                setPromptTemplateGpt(question);
+
+            promptTemplate = question;
+        }
+        else {
+            promptTemplate = promptTemplateGpt;
+        }
+
         lastQuestionRefGpt.current = question;
 
         error && setError(undefined);
@@ -1216,7 +1228,7 @@ const Pib = () => {
                 history: [...history, { user: question, bot: undefined }],
                 approach: Approaches.ReadRetrieveRead,
                 overrides: {
-                    promptTemplate: promptTemplateGpt.length === 0 ? undefined : promptTemplateGpt,
+                    promptTemplate: promptTemplate,
                     temperature: temperatureGpt,
                     tokenLength: tokenLengthGpt,
                     embeddingModelType: String(selectedEmbeddingItemGpt?.key),