Merge pull request #168 from heshengtao/dev

Dev

Author: heshengtao

server.py

@@ -985,14 +985,19 @@ async def generate_stream_response(client,reasoner_client, request: ChatRequest,
                 chat_vendor = modelProvider['vendor']
                 break
         if chat_vendor == 'Dify':
-            if request.messages[2]['role'] == 'user':
-                if request.messages[1]['role'] == 'assistant':
-                    request.messages[2]['content'] = "你上一次的发言：\n" +request.messages[0]['content'] + "\n你上一次的发言结束\n\n用户：" + request.messages[2]['content']
-                if request.messages[0]['role'] == 'system':
-                    request.messages[2]['content'] = "系统提示：\n" +request.messages[0]['content'] + "\n系统提示结束\n\n" + request.messages[2]['content']
-            if request.messages[1]['role'] == 'user':
-                if request.messages[0]['role'] == 'system':
-                    request.messages[2]['content'] = "系统提示：\n" +request.messages[0]['content'] + "\n系统提示结束\n\n用户：" + request.messages[1]['content']
+            try:
+                if len(request.messages) >= 3:
+                    if request.messages[2]['role'] == 'user':
+                        if request.messages[1]['role'] == 'assistant':
+                            request.messages[2]['content'] = "你上一次的发言：\n" +request.messages[0]['content'] + "\n你上一次的发言结束\n\n用户：" + request.messages[2]['content']
+                        if request.messages[0]['role'] == 'system':
+                            request.messages[2]['content'] = "系统提示：\n" +request.messages[0]['content'] + "\n系统提示结束\n\n" + request.messages[2]['content']
+                elif len(request.messages) >= 2:
+                    if request.messages[1]['role'] == 'user':
+                        if request.messages[0]['role'] == 'system':
+                            request.messages[1]['content'] = "系统提示：\n" +request.messages[0]['content'] + "\n系统提示结束\n\n用户：" + request.messages[1]['content']
+            except Exception as e:
+                print("Dify error:",e)
         model = settings['model']
         extra_params = settings['extra_params']
         # 移除extra_params这个list中"name"不包含非空白符的键值对
@@ -2672,6 +2677,25 @@ async def generate_complete_response(client,reasoner_client, request: ChatReques
         else:
             kb_list = []
         request = await tools_change_messages(request, settings)
+        chat_vendor = 'OpenAI'
+        for modelProvider in settings['modelProviders']: 
+            if modelProvider['id'] == settings['selectedProvider']:
+                chat_vendor = modelProvider['vendor']
+                break
+        if chat_vendor == 'Dify':
+            try:
+                if len(request.messages) >= 3:
+                    if request.messages[2]['role'] == 'user':
+                        if request.messages[1]['role'] == 'assistant':
+                            request.messages[2]['content'] = "你上一次的发言：\n" +request.messages[0]['content'] + "\n你上一次的发言结束\n\n用户：" + request.messages[2]['content']
+                        if request.messages[0]['role'] == 'system':
+                            request.messages[2]['content'] = "系统提示：\n" +request.messages[0]['content'] + "\n系统提示结束\n\n" + request.messages[2]['content']
+                elif len(request.messages) >= 2:
+                    if request.messages[1]['role'] == 'user':
+                        if request.messages[0]['role'] == 'system':
+                            request.messages[1]['content'] = "系统提示：\n" +request.messages[0]['content'] + "\n系统提示结束\n\n用户：" + request.messages[1]['content']
+            except Exception as e:
+                print("Dify error:",e)
         if settings['webSearch']['enabled'] or enable_web_search:
             if settings['webSearch']['when'] == 'before_thinking' or settings['webSearch']['when'] == 'both':
                 if settings['webSearch']['engine'] == 'duckduckgo':