From eef551fce6f0ecff10e04383f3d73c033d2f9a3e Mon Sep 17 00:00:00 2001
From: z30057876 <zhouweitong@huawei.com>
Date: Mon, 17 Feb 2025 11:43:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/routers/auth.py                        | 18 +++++-------------
 deploy/chart/euler_copilot/configs/rag/.env | 10 +++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/apps/routers/auth.py b/apps/routers/auth.py
index 252462a81..561f80651 100644
--- a/apps/routers/auth.py
+++ b/apps/routers/auth.py
@@ -70,23 +70,15 @@ async def oidc_login(request: Request, code: str, redirect_index: Optional[str]
 
     await UserManager.update_userinfo_by_user_sub(user_sub)
 
-    current_session = request.cookies["ECSESSION"]
     try:
+        current_session = request.cookies["ECSESSION"]
         await SessionManager.delete_session(current_session)
-        current_session = await SessionManager.create_session(user_host, extra_keys={
-            "user_sub": user_sub,
-        })
     except Exception as e:
         LOGGER.error(f"Change session failed: {e}")
-        data = Audit(
-            user_sub=user_sub,
-            http_method="get",
-            module="auth",
-            client_ip=user_host,
-            message="/api/auth/login: Change session failed.",
-        )
-        await AuditLogManager.add_audit_log(data)
-        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User login failed.") from e
+
+    current_session = await SessionManager.create_session(user_host, extra_keys={
+        "user_sub": user_sub,
+    })
 
     new_csrf_token = await SessionManager.create_csrf_token(current_session)
     if config["COOKIE_MODE"] == "DEBUG":
diff --git a/deploy/chart/euler_copilot/configs/rag/.env b/deploy/chart/euler_copilot/configs/rag/.env
index 79f7b3b77..489cd6dbf 100644
--- a/deploy/chart/euler_copilot/configs/rag/.env
+++ b/deploy/chart/euler_copilot/configs/rag/.env
@@ -43,8 +43,8 @@ HALF_KEY2=${halfKey2}
 HALF_KEY3=${halfKey3}
 
 #LLM config
-MODEL_NAME={{ .Values.models.answer.name }}
-OPENAI_API_BASE={{ .Values.models.answer.url }}/v1
-OPENAI_API_KEY={{ default "" .Values.models.answer.key }}
-REQUEST_TIMEOUT=60
-MAX_TOKENS={{ default 2048 .Values.models.answer.max_tokens }}
+MODULE_1_MODEL_NAME={{ .Values.models.answer.name }}
+MODULE_1_MODEL_TYPE=deepseek
+MODULE_1_OPENAI_API_BASE={{ .Values.models.answer.url }}/v1
+MODULE_1_OPENAI_API_KEY={{ default "" .Values.models.answer.key }}
+MODULE_1_MAX_TOKENS={{ default 2048 .Values.models.answer.max_tokens }}
-- 
Gitee


From 8d156dcdb143e1755e6a10cb71649b239bcf22cb Mon Sep 17 00:00:00 2001
From: z30057876 <zhouweitong@huawei.com>
Date: Mon, 17 Feb 2025 13:26:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/chart/euler_copilot/configs/rag/.env | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/chart/euler_copilot/configs/rag/.env b/deploy/chart/euler_copilot/configs/rag/.env
index 489cd6dbf..ca0a9c33c 100644
--- a/deploy/chart/euler_copilot/configs/rag/.env
+++ b/deploy/chart/euler_copilot/configs/rag/.env
@@ -43,8 +43,8 @@ HALF_KEY2=${halfKey2}
 HALF_KEY3=${halfKey3}
 
 #LLM config
-MODULE_1_MODEL_NAME={{ .Values.models.answer.name }}
-MODULE_1_MODEL_TYPE=deepseek
-MODULE_1_OPENAI_API_BASE={{ .Values.models.answer.url }}/v1
-MODULE_1_OPENAI_API_KEY={{ default "" .Values.models.answer.key }}
-MODULE_1_MAX_TOKENS={{ default 2048 .Values.models.answer.max_tokens }}
+MODEL_1_MODEL_NAME={{ .Values.models.answer.name }}
+MODEL_1_MODEL_TYPE=deepseek
+MODEL_1_OPENAI_API_BASE={{ .Values.models.answer.url }}/v1
+MODEL_1_OPENAI_API_KEY={{ default "" .Values.models.answer.key }}
+MODEL_1_MAX_TOKENS={{ default 2048 .Values.models.answer.max_tokens }}
-- 
Gitee