Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix explore app icon #11742

Merged
merged 126 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
423560b
mermaid front-end rendering initialization exception handling logic o…
Oct 24, 2023
948157c
del mermaid front-end rendering rerender
Oct 25, 2023
d8ca863
application embedded add chrome && ChatBot Chrome plugin update v1.5
Nov 7, 2023
f722800
Style optimization
Nov 7, 2023
e530083
chore: ui
crazywoola Nov 7, 2023
67d2bb0
chore: ui
crazywoola Nov 7, 2023
a2d30d0
Merge remote-tracking branch 'origin/main' into embedded-chrome-plugin
Nov 9, 2023
6457b8f
Merge remote-tracking branch 'origin/embedded-chrome-plugin' into emb…
Nov 9, 2023
a33fbd9
Chrome PlugIn Url Change
Nov 9, 2023
43fa756
azure openai add gpt-4-1106-preview、gpt-4-vision-preview models
Dec 13, 2023
414534c
Update web/i18n/lang/common.en.ts
charli117 Dec 13, 2023
a310fed
Update web/i18n/lang/common.zh.ts
charli117 Dec 13, 2023
07e3e01
change azure chat _generate function replace langchain _convert_messa…
Dec 13, 2023
65e980d
Merge pull request #3 from charli117/azure-openai-add-gpt4v&1106
charli117 Dec 14, 2023
d492e5a
Merge pull request #4 from charli117/mermaid-front-end-optimize
charli117 Dec 14, 2023
5af4ff6
Merge pull request #5 from charli117/embedded-chrome-plugin
charli117 Dec 14, 2023
7c9fd91
Merge branch 'langgenius:main' into main
charli117 Dec 19, 2023
df70726
Merge branch 'langgenius:main' into main
charli117 Dec 21, 2023
9731821
Merge branch 'langgenius:main' into main
charli117 Dec 23, 2023
cd97b61
Merge branch 'langgenius:main' into main
charli117 Dec 26, 2023
c9bebec
Merge branch 'langgenius:main' into main
charli117 Jan 4, 2024
4107879
Merge branch 'langgenius:main' into main
charli117 Jan 4, 2024
8a41876
Merge branch 'langgenius:main' into main
charli117 Jan 5, 2024
7d42fd7
Merge branch 'langgenius:main' into main
charli117 Jan 5, 2024
057c253
Merge branch 'langgenius:main' into main
charli117 Jan 8, 2024
876e431
Merge branch 'langgenius:main' into main
charli117 Jan 8, 2024
27869ca
Merge branch 'langgenius:main' into main
charli117 Jan 9, 2024
304e83d
Merge branch 'langgenius:main' into main
charli117 Jan 15, 2024
eb895f7
Merge branch 'langgenius:main' into main
charli117 Jan 18, 2024
22823b8
Merge branch 'langgenius:main' into main
charli117 Jan 20, 2024
515b5df
Merge branch 'langgenius:main' into main
charli117 Jan 23, 2024
de20db2
Merge branch 'langgenius:main' into main
charli117 Jan 23, 2024
3d57b6d
Merge branch 'langgenius:main' into main
charli117 Jan 24, 2024
1fe2843
Merge branch 'langgenius:main' into main
charli117 Jan 24, 2024
ed66e9d
Merge branch 'langgenius:main' into main
charli117 Jan 24, 2024
767dc1a
Merge branch 'langgenius:main' into main
charli117 Jan 24, 2024
32c4f97
Merge branch 'langgenius:main' into main
charli117 Jan 26, 2024
4168c9a
Merge branch 'langgenius:main' into main
charli117 Jan 26, 2024
c8858de
Merge branch 'langgenius:main' into main
charli117 Jan 26, 2024
5502518
Merge branch 'langgenius:main' into main
charli117 Jan 28, 2024
1615765
Merge branch 'langgenius:main' into main
charli117 Jan 30, 2024
404dcab
Merge branch 'langgenius:main' into main
charli117 Jan 30, 2024
03132ba
Merge branch 'langgenius:main' into main
charli117 Jan 31, 2024
e0f4e70
Merge branch 'langgenius:main' into main
charli117 Feb 5, 2024
859e320
Merge branch 'langgenius:main' into main
charli117 Feb 5, 2024
40122b9
Merge branch 'langgenius:main' into main
charli117 Feb 5, 2024
a052150
Merge branch 'langgenius:main' into main
charli117 Feb 6, 2024
7aa36ef
Merge branch 'langgenius:main' into main
charli117 Feb 7, 2024
4a1d695
Merge branch 'langgenius:main' into main
charli117 Feb 7, 2024
271262e
Merge branch 'langgenius:main' into main
charli117 Feb 8, 2024
09389ee
Merge branch 'langgenius:main' into main
charli117 Feb 9, 2024
2030292
Merge branch 'langgenius:main' into main
charli117 Feb 13, 2024
64a213a
Merge branch 'langgenius:main' into main
charli117 Feb 14, 2024
e499052
Merge branch 'langgenius:main' into main
charli117 Feb 15, 2024
c3380b7
Merge branch 'langgenius:main' into main
charli117 Feb 15, 2024
92505e0
Merge branch 'langgenius:main' into main
charli117 Feb 15, 2024
dd47440
Merge branch 'langgenius:main' into main
charli117 Feb 16, 2024
f22dd96
Merge branch 'langgenius:main' into main
charli117 Feb 18, 2024
f278346
Merge branch 'langgenius:main' into main
charli117 Feb 21, 2024
0f8821e
Merge branch 'langgenius:main' into main
charli117 Feb 28, 2024
8954daf
Merge branch 'langgenius:main' into main
charli117 Feb 28, 2024
6b51618
Merge branch 'langgenius:main' into main
charli117 Mar 3, 2024
decffd5
Merge branch 'langgenius:main' into main
charli117 Mar 4, 2024
d47b669
Merge branch 'langgenius:main' into main
charli117 Mar 6, 2024
4e89118
Merge branch 'langgenius:main' into main
charli117 Mar 13, 2024
7abcb6f
Merge branch 'langgenius:main' into main
charli117 Apr 22, 2024
8ceced9
Merge branch 'langgenius:main' into main
charli117 Apr 26, 2024
f6659d8
optimize the knowledge failed documents query
Apr 26, 2024
b591a43
Merge branch 'langgenius:main' into main
charli117 Apr 26, 2024
3b326e7
add avg rag delay time monitoring curve
Apr 26, 2024
2e5b17d
Merge branch 'langgenius:main' into main
charli117 Apr 26, 2024
effc7a5
add elapsed_time to return_retriever_resource_info
Apr 26, 2024
492c9ab
fix lose elapsed_time
Apr 26, 2024
6920d37
fix I001 error
Apr 26, 2024
fa16bed
fix sort-imports
Apr 26, 2024
959ea62
Merge remote-tracking branch 'langgenius/main'
May 3, 2024
8bf2420
Merge branch 'langgenius:main' into main
charli117 May 6, 2024
8db0669
Merge branch 'langgenius:main' into main
charli117 May 7, 2024
dbba050
Merge remote-tracking branch 'langgenius/main'
May 7, 2024
79d5920
azure_openai add gpt-4-turbo-2024-04-09 model
May 7, 2024
a1d7ba7
Merge remote-tracking branch 'public/main'
May 7, 2024
0a3baec
clear change
May 7, 2024
3920210
Merge branch 'langgenius:main' into main
charli117 May 8, 2024
be709f4
Merge branch 'langgenius:main' into main
charli117 May 9, 2024
9d10fc8
Merge branch 'langgenius:main' into main
charli117 May 11, 2024
ed7d234
Merge branch 'langgenius:main' into main
charli117 May 14, 2024
0d739b9
clear change
May 14, 2024
da90150
Merge branch 'langgenius:main' into main
charli117 May 24, 2024
ec2238f
Merge branch 'langgenius:main' into main
charli117 May 25, 2024
61c816a
Merge branch 'langgenius:main' into main
charli117 May 28, 2024
d20a438
Merge branch 'langgenius:main' into main
charli117 Jun 2, 2024
93a4568
Merge branch 'langgenius:main' into main
charli117 Jun 11, 2024
fddc1ba
Merge branch 'langgenius:main' into main
charli117 Jun 12, 2024
195b554
Merge branch 'langgenius:main' into main
charli117 Jun 12, 2024
26461eb
Merge branch 'langgenius:main' into main
charli117 Jun 17, 2024
071bb64
Merge branch 'langgenius:main' into main
charli117 Jun 26, 2024
fc32bc7
Merge branch 'langgenius:main' into main
charli117 Jul 16, 2024
a2e5f87
Merge branch 'langgenius:main' into main
charli117 Jul 17, 2024
6f104a5
Merge branch 'langgenius:main' into main
charli117 Aug 1, 2024
f7a3ee6
Merge branch 'langgenius:main' into main
charli117 Aug 5, 2024
482919a
Merge branch 'langgenius:main' into main
charli117 Aug 8, 2024
e1ba86f
Merge branch 'langgenius:main' into main
charli117 Aug 8, 2024
c33d70e
Merge branch 'langgenius:main' into main
charli117 Aug 13, 2024
ca2e285
Merge branch 'langgenius:main' into main
charli117 Aug 23, 2024
0e2b058
Merge branch 'langgenius:main' into main
charli117 Aug 23, 2024
8d4632f
Merge branch 'langgenius:main' into main
charli117 Aug 27, 2024
7b3f3ee
Merge branch 'langgenius:main' into main
charli117 Sep 13, 2024
b9cf9ea
Merge branch 'langgenius:main' into main
charli117 Sep 19, 2024
4e7e3f8
Merge branch 'langgenius:main' into main
charli117 Oct 8, 2024
3939f99
Merge branch 'langgenius:main' into main
charli117 Oct 17, 2024
355da0d
Merge branch 'langgenius:main' into main
charli117 Oct 30, 2024
4c9afa1
Merge branch 'langgenius:main' into main
charli117 Oct 30, 2024
8420ef2
Merge branch 'langgenius:main' into main
charli117 Oct 31, 2024
0fdda6e
Merge branch 'langgenius:main' into main
charli117 Nov 1, 2024
6c4f46f
Merge branch 'langgenius:main' into main
charli117 Nov 1, 2024
f0a17b1
Merge branch 'langgenius:main' into main
charli117 Nov 4, 2024
3490610
Merge branch 'langgenius:main' into main
charli117 Nov 24, 2024
3ce951d
Merge branch 'langgenius:main' into main
charli117 Nov 26, 2024
63f14ec
Merge branch 'langgenius:main' into main
charli117 Nov 26, 2024
cb925fa
Merge branch 'langgenius:main' into main
charli117 Dec 4, 2024
a83c1ae
Merge branch 'langgenius:main' into main
charli117 Dec 5, 2024
7c228b9
Merge branch 'langgenius:main' into main
charli117 Dec 8, 2024
39b4b32
Merge branch 'langgenius:main' into main
charli117 Dec 10, 2024
831daef
Merge branch 'langgenius:main' into main
charli117 Dec 10, 2024
bd2efff
Merge branch 'langgenius:main' into main
charli117 Dec 17, 2024
cdb47bb
fix: Update app icon data structure in UI and API
charli117 Dec 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/controllers/console/explore/recommended_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from constants.languages import languages
from controllers.console import api
from controllers.console.wraps import account_initialization_required
from libs.helper import AppIconUrlField
from libs.login import login_required
from services.recommended_app_service import RecommendedAppService

Expand All @@ -12,6 +13,7 @@
"name": fields.String,
"mode": fields.String,
"icon": fields.String,
"icon_url": AppIconUrlField,
"icon_background": fields.String,
}

Expand Down
8 changes: 1 addition & 7 deletions api/services/recommend_app/database/database_retrieval.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,7 @@ def fetch_recommended_apps_from_db(cls, language: str) -> dict:

recommended_app_result = {
"id": recommended_app.id,
"app": {
"id": app.id,
"name": app.name,
"mode": app.mode,
"icon": app.icon,
"icon_background": app.icon_background,
},
"app": recommended_app.app,
"app_id": recommended_app.app_id,
"description": site.description,
"copyright": site.copyright,
Expand Down
8 changes: 4 additions & 4 deletions web/app/components/app/create-app-dialog/app-card/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ const AppCard = ({
<div className='relative shrink-0'>
<AppIcon
size='large'
iconType={app.app.icon_type}
icon={app.app.icon}
background={app.app.icon_background}
imageUrl={app.app.icon_url}
iconType={appBasicInfo.icon_type}
icon={appBasicInfo.icon}
background={appBasicInfo.icon_background}
imageUrl={appBasicInfo.icon_url}
/>
<AppTypeIcon wrapperClassName='absolute -bottom-0.5 -right-0.5 w-4 h-4 rounded-[4px] border border-divider-regular outline outline-components-panel-on-panel-item-bg'
className='w-3 h-3' type={appBasicInfo.mode} />
Expand Down
8 changes: 4 additions & 4 deletions web/app/components/explore/app-card/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ const AppCard = ({
<div className='relative shrink-0'>
<AppIcon
size='large'
iconType={app.app.icon_type}
icon={app.app.icon}
background={app.app.icon_background}
imageUrl={app.app.icon_url}
iconType={appBasicInfo.icon_type}
icon={appBasicInfo.icon}
background={appBasicInfo.icon_background}
imageUrl={appBasicInfo.icon_url}
/>
<span className='absolute bottom-[-3px] right-[-3px] w-4 h-4 p-0.5 bg-white rounded border-[0.5px] border-[rgba(0,0,0,0.02)] shadow-sm'>
{appBasicInfo.mode === 'advanced-chat' && (
Expand Down
Loading