Merge remote-tracking branch 'origin/next' into openai

2024-10-02 20:10:21 +05:30
parent caeb923d00 1ec44f047d
commit 3d8c8671e1
18 changed files with 264 additions and 117 deletions
--- a/src/hooks/useMessageOption.tsx
+++ b/src/hooks/useMessageOption.tsx
@@ -455,7 +455,11 @@ export const useMessageOption = () => {
        )
      }

-      if (selectedPrompt) {
+      const isTempSystemprompt =
+        currentChatModelSettings.systemPrompt &&
+        currentChatModelSettings.systemPrompt?.trim().length > 0
+
+      if (!isTempSystemprompt && selectedPrompt) {
        applicationChatHistory.unshift(
          new SystemMessage({
            content: [
@@ -468,6 +472,19 @@ export const useMessageOption = () => {
        )
      }

+      if (isTempSystemprompt) {
+        applicationChatHistory.unshift(
+          new SystemMessage({
+            content: [
+              {
+                text: currentChatModelSettings.systemPrompt,
+                type: "text"
+              }
+            ]
+          })
+        )
+      }
+
      const chunks = await ollama.stream(
        [...applicationChatHistory, humanMessage],
        {