From 1bbd5d9393a4782c64999301f7932d617de6ce8c Mon Sep 17 00:00:00 2001 From: John Wang Date: Thu, 18 May 2023 13:31:34 +0800 Subject: [PATCH] feat: completed test explore apps --- api/commands.py | 2 +- api/controllers/console/__init__.py | 2 +- api/controllers/console/explore/completion.py | 8 ++++---- api/controllers/console/explore/conversation.py | 10 +++++----- api/controllers/console/explore/message.py | 8 ++++---- api/controllers/console/explore/parameter.py | 2 +- api/controllers/console/explore/recommended_app.py | 8 ++++++-- api/controllers/console/explore/saved_message.py | 4 ++-- 8 files changed, 24 insertions(+), 20 deletions(-) diff --git a/api/commands.py b/api/commands.py index b67b4f8676..2e883ada8d 100644 --- a/api/commands.py +++ b/api/commands.py @@ -134,7 +134,7 @@ def generate_upper_string(): @click.command('gen-recommended-apps', help='Number of records to generate') def generate_recommended_apps(): print('Generating recommended app data...') - apps = App.query.all() + apps = App.query.filter(App.is_public == True).all() for app in apps: recommended_app = RecommendedApp( app_id=app.id, diff --git a/api/controllers/console/__init__.py b/api/controllers/console/__init__.py index c8894c2cb8..438c6bada4 100644 --- a/api/controllers/console/__init__.py +++ b/api/controllers/console/__init__.py @@ -21,4 +21,4 @@ from .datasets import datasets, datasets_document, datasets_segments, file, hit_ from .workspace import workspace, members, providers, account # Import explore controllers -from .explore import installed_app, recommended_app +from .explore import installed_app, recommended_app, completion, conversation, message, parameter diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py index ae8d65fbf3..9eddda28b7 100644 --- a/api/controllers/console/explore/completion.py +++ b/api/controllers/console/explore/completion.py @@ -174,7 +174,7 @@ def compact_response(response: Union[dict | Generator]) -> Response: mimetype='text/event-stream') -api.add_resource(CompletionApi, '/completion-messages') -api.add_resource(CompletionStopApi, '/completion-messages//stop') -api.add_resource(ChatApi, '/chat-messages') -api.add_resource(ChatStopApi, '/chat-messages//stop') +api.add_resource(CompletionApi, '/installed-apps//completion-messages', endpoint='installed_app_completion') +api.add_resource(CompletionStopApi, '/installed-apps//completion-messages//stop', endpoint='installed_app_stop_completion') +api.add_resource(ChatApi, '/installed-apps//chat-messages', endpoint='installed_app_chat_completion') +api.add_resource(ChatStopApi, '/installed-apps//chat-messages//stop', endpoint='installed_app_stop_chat_completion') diff --git a/api/controllers/console/explore/conversation.py b/api/controllers/console/explore/conversation.py index dc7004e5f1..1e25acc14e 100644 --- a/api/controllers/console/explore/conversation.py +++ b/api/controllers/console/explore/conversation.py @@ -120,8 +120,8 @@ class ConversationUnPinApi(InstalledAppResource): return {"result": "success"} -api.add_resource(ConversationRenameApi, '/installed-apps//conversations//name') -api.add_resource(ConversationListApi, '/installed-apps//conversations') -api.add_resource(ConversationApi, '/installed-apps//conversations/') -api.add_resource(ConversationPinApi, '/installed-apps//conversations//pin') -api.add_resource(ConversationUnPinApi, '/installed-apps//conversations//unpin') +api.add_resource(ConversationRenameApi, '/installed-apps//conversations//name', endpoint='installed_app_conversation_rename') +api.add_resource(ConversationListApi, '/installed-apps//conversations', endpoint='installed_app_conversations') +api.add_resource(ConversationApi, '/installed-apps//conversations/', endpoint='installed_app_conversation') +api.add_resource(ConversationPinApi, '/installed-apps//conversations//pin', endpoint='installed_app_conversation_pin') +api.add_resource(ConversationUnPinApi, '/installed-apps//conversations//unpin', endpoint='installed_app_conversation_unpin') diff --git a/api/controllers/console/explore/message.py b/api/controllers/console/explore/message.py index 4cf853c388..b5b9547ff7 100644 --- a/api/controllers/console/explore/message.py +++ b/api/controllers/console/explore/message.py @@ -190,7 +190,7 @@ class MessageSuggestedQuestionApi(InstalledAppResource): return {'data': questions} -api.add_resource(MessageListApi, '/installed-apps//messages') -api.add_resource(MessageFeedbackApi, '/installed-apps//messages//feedbacks') -api.add_resource(MessageMoreLikeThisApi, '/installed-apps//messages//more-like-this') -api.add_resource(MessageSuggestedQuestionApi, '/installed-apps//messages//suggested-questions') +api.add_resource(MessageListApi, '/installed-apps//messages', endpoint='installed_app_messages') +api.add_resource(MessageFeedbackApi, '/installed-apps//messages//feedbacks', endpoint='installed_app_message_feedback') +api.add_resource(MessageMoreLikeThisApi, '/installed-apps//messages//more-like-this', endpoint='installed_app_more_like_this') +api.add_resource(MessageSuggestedQuestionApi, '/installed-apps//messages//suggested-questions', endpoint='installed_app_suggested_question') diff --git a/api/controllers/console/explore/parameter.py b/api/controllers/console/explore/parameter.py index d363c98a22..2d0459ed40 100644 --- a/api/controllers/console/explore/parameter.py +++ b/api/controllers/console/explore/parameter.py @@ -40,4 +40,4 @@ class AppParameterApi(InstalledAppResource): } -api.add_resource(AppParameterApi, '/installed-apps//parameters') +api.add_resource(AppParameterApi, '/installed-apps//parameters', endpoint='installed_app_parameters') diff --git a/api/controllers/console/explore/recommended_app.py b/api/controllers/console/explore/recommended_app.py index 57a8f90090..d3942c90bf 100644 --- a/api/controllers/console/explore/recommended_app.py +++ b/api/controllers/console/explore/recommended_app.py @@ -58,6 +58,10 @@ class RecommendedAppListApi(Resource): ) ).first() is not None + app = recommended_app.app + if not app or not app.is_public: + continue + language_prefix = current_user.interface_language.split('-')[0] desc = None if recommended_app.description: @@ -68,7 +72,7 @@ class RecommendedAppListApi(Resource): recommended_app_result = { 'id': recommended_app.id, - 'app': recommended_app.app, + 'app': app, 'app_id': recommended_app.app_id, 'description': desc, 'copyright': recommended_app.copyright, @@ -125,7 +129,7 @@ class RecommendedAppApi(Resource): # get app detail app = db.session.query(App).filter(App.id == app_id).first() - if not app: + if not app or not app.is_public: raise AppNotFoundError return app diff --git a/api/controllers/console/explore/saved_message.py b/api/controllers/console/explore/saved_message.py index 40f30b6612..3f9bc63096 100644 --- a/api/controllers/console/explore/saved_message.py +++ b/api/controllers/console/explore/saved_message.py @@ -75,5 +75,5 @@ class SavedMessageApi(InstalledAppResource): return {'result': 'success'} -api.add_resource(SavedMessageListApi, '/installed-apps//saved-messages') -api.add_resource(SavedMessageApi, '/installed-apps//saved-messages/') +api.add_resource(SavedMessageListApi, '/installed-apps//saved-messages', endpoint='installed_app_saved_messages') +api.add_resource(SavedMessageApi, '/installed-apps//saved-messages/', endpoint='installed_app_saved_message')