From 34e0c249ed8e3f03cbebc9dc56c2e30b1eb27052 Mon Sep 17 00:00:00 2001
From: dolphin <78075021@qq.com>
Date: Wed, 3 Jul 2024 17:24:24 +0800
Subject: [PATCH 1/2] feat: remove chatlog

---
 .../src/components/bs-comp/chatComponent/MessagePanne.tsx      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/components/bs-comp/chatComponent/MessagePanne.tsx b/src/frontend/src/components/bs-comp/chatComponent/MessagePanne.tsx
index 707532270..7db39cc1e 100644
--- a/src/frontend/src/components/bs-comp/chatComponent/MessagePanne.tsx
+++ b/src/frontend/src/components/bs-comp/chatComponent/MessagePanne.tsx
@@ -71,7 +71,8 @@ export default function MessagePanne({ useName, guideWord, loadMore }) {
                 } else if (msg.files?.length) {
                     type = 'file'
                 } else if (['tool', 'flow', 'knowledge'].includes(msg.category)
-                    || msg.category === 'processing') { // 项目演示？
+                    // || msg.category === 'processing'
+                ) { // 项目演示？
                     type = 'runLog'
                 } else if (msg.thought) {
                     type = 'system'

From 18aa22256f81ba2bd45f88bae4953b7de1bec737 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 3 Jul 2024 18:09:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=B8=8BAzureOpenAIEmbeddings=E7=9A=84=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/backend/bisheng/utils/embedding.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/backend/bisheng/utils/embedding.py b/src/backend/bisheng/utils/embedding.py
index 50457a89d..85105b3f0 100644
--- a/src/backend/bisheng/utils/embedding.py
+++ b/src/backend/bisheng/utils/embedding.py
@@ -1,10 +1,13 @@
 import httpx
-from bisheng.settings import settings
-from bisheng_langchain.embeddings import CustomHostEmbedding, HostEmbeddings
+
+from langchain_openai import AzureOpenAIEmbeddings
 from langchain.embeddings.base import Embeddings
 from langchain_community.utils.openai import is_openai_v1
 from langchain_openai.embeddings import OpenAIEmbeddings
 
+from bisheng.settings import settings
+from bisheng_langchain.embeddings import CustomHostEmbedding, HostEmbeddings
+
 
 def decide_embeddings(model: str) -> Embeddings:
     """embed method"""
@@ -15,7 +18,10 @@ def decide_embeddings(model: str) -> Embeddings:
         if is_openai_v1() and params.get('openai_proxy'):
             params['http_client'] = httpx.Client(proxies=params.get('openai_proxy'))
             params['http_async_client'] = httpx.AsyncClient(proxies=params.get('openai_proxy'))
-        return OpenAIEmbeddings(**params)
+        if params.get('openai_api_type') in ("azure", "azure_ad", "azuread"):
+            return AzureOpenAIEmbeddings(**params)
+        else:
+            return OpenAIEmbeddings(**params)
     elif component == 'custom':
         return CustomHostEmbedding(**params)
     else: