From 737bd1eaeb9bdc5bccd9c085a66617457d2cfdbe Mon Sep 17 00:00:00 2001 From: Ahmed Awelkair A <108264625+a7m-1st@users.noreply.github.com> Date: Thu, 5 Mar 2026 15:35:33 +0000 Subject: [PATCH] fix: patch help_improve bug (#1455) Co-authored-by: Wendong-Fan <133094783+Wendong-Fan@users.noreply.github.com> --- server/app/controller/user/user_controller.py | 4 +- server/app/model/user/privacy.py | 43 +++++++--- server/tests/user.http | 80 +++++++++++++++++++ src/components/ChatBox/index.tsx | 43 +++++----- src/pages/Setting/Privacy.tsx | 16 ++-- 5 files changed, 135 insertions(+), 51 deletions(-) create mode 100644 server/tests/user.http diff --git a/server/app/controller/user/user_controller.py b/server/app/controller/user/user_controller.py index 30345645..9f75d74b 100644 --- a/server/app/controller/user/user_controller.py +++ b/server/app/controller/user/user_controller.py @@ -77,7 +77,7 @@ def get_privacy(session: Session = Depends(session), auth: Auth = Depends(auth_m return UserPrivacySettings.default_settings() logger.debug("Privacy settings retrieved", extra={"user_id": user_id}) - return model.pricacy_setting + return UserPrivacySettings(**model.pricacy_setting).to_response() @router.put("/user/privacy", name="update user privacy") @@ -97,7 +97,7 @@ def put_privacy(data: UserPrivacySettings, session: Session = Depends(session), model.save(session) logger.info("Privacy settings created", extra={"user_id": user_id}) - return model.pricacy_setting + return UserPrivacySettings(**model.pricacy_setting).to_response() @router.get("/user/current_credits", name="get user current credits") diff --git a/server/app/model/user/privacy.py b/server/app/model/user/privacy.py index d4fed768..d38e9c67 100644 --- a/server/app/model/user/privacy.py +++ b/server/app/model/user/privacy.py @@ -1,16 +1,18 @@ -# ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. ========= -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. # ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. ========= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. ========= + +from typing import ClassVar from pydantic import BaseModel from sqlalchemy import JSON @@ -31,6 +33,21 @@ class UserPrivacySettings(BaseModel): access_your_address: bool | None = False password_storage: bool | None = False + # Fields that must all be True for the user to proceed + REQUIRED_FIELDS: ClassVar[list[str]] = [ + 'take_screenshot', + 'access_local_software', + 'access_your_address', + 'password_storage', + ] + @classmethod def default_settings(cls) -> dict: - return cls().model_dump() + instance = cls() + return {**instance.model_dump(), "all_required_granted": instance.all_required_granted()} + + def all_required_granted(self) -> bool: + return all(getattr(self, f) for f in self.REQUIRED_FIELDS) + + def to_response(self) -> dict: + return {**self.model_dump(), "all_required_granted": self.all_required_granted()} diff --git a/server/tests/user.http b/server/tests/user.http new file mode 100644 index 00000000..f518e970 --- /dev/null +++ b/server/tests/user.http @@ -0,0 +1,80 @@ +### ============================================ +### Eigent Server API Tests +### ============================================ +### VSCode Extension: "REST Client" by Huachao Mao +### Extension ID: humao.rest-client +### ============================================ + +@baseUrl = http://localhost:3001/api +@token = YOUR_TOKEN_HERE + +### ────────────────────────────────────────── +### Auth (no token required) +### ────────────────────────────────────────── + +### Register a new user +POST {{baseUrl}}/register +Content-Type: application/json + +{ + "email": "test@example.com", + "password": "testpassword123" +} + +### Login +# @name login +POST {{baseUrl}}/login +Content-Type: application/json + +{ + "email": "test@example.com", + "password": "testpassword123" +} + +### Save token from login response (use this after running login) +@authToken = {{login.response.body.token}} + +### ────────────────────────────────────────── +### User +### ────────────────────────────────────────── + +### Get current user info +GET {{baseUrl}}/user +Authorization: Bearer {{authToken}} + +### ────────────────────────────────────────── +### Privacy Settings +### ────────────────────────────────────────── + +### Get privacy settings +GET {{baseUrl}}/user/privacy +Authorization: Bearer {{authToken}} + +### Update privacy settings +PUT {{baseUrl}}/user/privacy +Authorization: Bearer {{authToken}} +Content-Type: application/json + +{ + "take_screenshot": true, + "access_local_software": false, + "access_your_address": false, + "password_storage": false +} + +### Update only help_improve +PUT {{baseUrl}}/user/privacy +Authorization: Bearer {{authToken}} +Content-Type: application/json + +{ + "help_improve": true +} + +### ────────────────────────────────────────── +### User Stats +### ────────────────────────────────────────── + +### Get user stats +GET {{baseUrl}}/user/stat +Authorization: Bearer {{authToken}} diff --git a/src/components/ChatBox/index.tsx b/src/components/ChatBox/index.tsx index 06fe9f25..7bf6f808 100644 --- a/src/components/ChatBox/index.tsx +++ b/src/components/ChatBox/index.tsx @@ -65,14 +65,7 @@ export default function ChatBox(): JSX.Element { useEffect(() => { proxyFetchGet('/api/user/privacy') .then((res) => { - let _privacy = 0; - Object.keys(res).forEach((key) => { - if (!res[key]) { - _privacy++; - return; - } - }); - setPrivacy(_privacy === 0 ? true : false); + setPrivacy(res.all_required_granted); }) .catch((err) => console.error('Failed to fetch settings:', err)); @@ -989,7 +982,7 @@ export default function ChatBox(): JSX.Element { } return ( -
+
{/* Unified ChatBox Structure */}
{/* Header Box - Always visible */} @@ -1006,10 +999,10 @@ export default function ChatBox(): JSX.Element {
{/* Project Chat Container - Show when has messages (absolute, full height) */}
{/* Welcome Message - Top area, flex-1 to push content down */} -
-
+
+
{t('layout.welcome-to-eigent')}
@@ -1067,24 +1060,24 @@ export default function ChatBox(): JSX.Element { )} {/* Suggestion Area - Bottom area, flex-1 to push content up */} -
+
{!hasModel ? ( -
+
{ navigate('/history?tab=agents'); }} - className="gap-2 rounded-md bg-surface-warning px-sm py-xs flex cursor-pointer items-center" + className="flex cursor-pointer items-center gap-2 rounded-md bg-surface-warning px-sm py-xs" > - + {t('layout.please-select-model')}
) : null} {hasModel && !privacy ? ( -
+
{ const target = e.target as HTMLElement; @@ -1106,13 +1099,13 @@ export default function ChatBox(): JSX.Element { proxyFetchPut('/api/user/privacy', requestData); setPrivacy(true); }} - className="gap-1 rounded-md bg-surface-information px-sm py-xs flex cursor-pointer items-center" + className="flex cursor-pointer items-center gap-1 rounded-md bg-surface-information px-sm py-xs" > - + {t('layout.by-messaging-eigent')}{' '}
) : ( -
+
{[ { label: t('layout.it-ticket-creation'), @@ -1155,7 +1148,7 @@ export default function ChatBox(): JSX.Element { ].map(({ label, message }) => (
{ setMessage(message); }} diff --git a/src/pages/Setting/Privacy.tsx b/src/pages/Setting/Privacy.tsx index 30b2967e..87ce15c5 100644 --- a/src/pages/Setting/Privacy.tsx +++ b/src/pages/Setting/Privacy.tsx @@ -59,19 +59,13 @@ export default function SettingPrivacy() { useEffect(() => { proxyFetchGet('/api/user/privacy') .then((res) => { - let hasFalse = false; setSettings((prev) => - prev.map((item, index) => { - if (!res[API_FIELDS[index]]) { - hasFalse = true; - } - return { - ...item, - checked: res[API_FIELDS[index]] || false, - }; - }) + prev.map((item, index) => ({ + ...item, + checked: res[API_FIELDS[index]] || false, + })) ); - setPrivacy(!hasFalse); + setPrivacy(res.all_required_granted); }) .catch((err) => console.error('Failed to fetch settings:', err)); }, [API_FIELDS]);