ngskcloud
/
gcgj-dify-1.7.0
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: completed test explore apps

Browse Source
pull/182/head
John Wang 3 years ago
parent 488f6b6d70
commit 1bbd5d9393
8 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
api/commands.py
Unescape Escape View File

@ -134,7 +134,7 @@ def generate_upper_string():
@click.command('gen-recommended-apps', help='Number of records to generate') @click.command('gen-recommended-apps', help='Number of records to generate')
def generate_recommended_apps(): def generate_recommended_apps():
print('Generating recommended app data...') print('Generating recommended app data...')
apps = App.query.all() apps = App.query.filter(App.is_public == True).all()
for app in apps: for app in apps:
recommended_app = RecommendedApp( recommended_app = RecommendedApp(
app_id=app.id, app_id=app.id,

2
api/controllers/console/__init__.py
Unescape Escape View File

@ -21,4 +21,4 @@ from .datasets import datasets, datasets_document, datasets_segments, file, hit_
from .workspace import workspace, members, providers, account from .workspace import workspace, members, providers, account
# Import explore controllers # Import explore controllers
from .explore import installed_app, recommended_app from .explore import installed_app, recommended_app, completion, conversation, message, parameter

8
api/controllers/console/explore/completion.py
Unescape Escape View File

@ -174,7 +174,7 @@ def compact_response(response: Union[dict | Generator]) -> Response:
mimetype='text/event-stream') mimetype='text/event-stream')
api.add_resource(CompletionApi, '/completion-messages') api.add_resource(CompletionApi, '/installed-apps/<uuid:installed_app_id>/completion-messages', endpoint='installed_app_completion')
api.add_resource(CompletionStopApi, '/completion-messages/<string:task_id>/stop') api.add_resource(CompletionStopApi, '/installed-apps/<uuid:installed_app_id>/completion-messages/<string:task_id>/stop', endpoint='installed_app_stop_completion')
api.add_resource(ChatApi, '/chat-messages') api.add_resource(ChatApi, '/installed-apps/<uuid:installed_app_id>/chat-messages', endpoint='installed_app_chat_completion')
api.add_resource(ChatStopApi, '/chat-messages/<string:task_id>/stop') api.add_resource(ChatStopApi, '/installed-apps/<uuid:installed_app_id>/chat-messages/<string:task_id>/stop', endpoint='installed_app_stop_chat_completion')

10
api/controllers/console/explore/conversation.py
Unescape Escape View File

@ -120,8 +120,8 @@ class ConversationUnPinApi(InstalledAppResource):
return {"result": "success"} return {"result": "success"}
api.add_resource(ConversationRenameApi, '/installed-apps/<uuid:installed_app_id>/conversations/<uuid:c_id>/name') api.add_resource(ConversationRenameApi, '/installed-apps/<uuid:installed_app_id>/conversations/<uuid:c_id>/name', endpoint='installed_app_conversation_rename')
api.add_resource(ConversationListApi, '/installed-apps/<uuid:installed_app_id>/conversations') api.add_resource(ConversationListApi, '/installed-apps/<uuid:installed_app_id>/conversations', endpoint='installed_app_conversations')
api.add_resource(ConversationApi, '/installed-apps/<uuid:installed_app_id>/conversations/<uuid:c_id>') api.add_resource(ConversationApi, '/installed-apps/<uuid:installed_app_id>/conversations/<uuid:c_id>', endpoint='installed_app_conversation')
api.add_resource(ConversationPinApi, '/installed-apps/<uuid:installed_app_id>/conversations/<uuid:c_id>/pin') api.add_resource(ConversationPinApi, '/installed-apps/<uuid:installed_app_id>/conversations/<uuid:c_id>/pin', endpoint='installed_app_conversation_pin')
api.add_resource(ConversationUnPinApi, '/installed-apps/<uuid:installed_app_id>/conversations/<uuid:c_id>/unpin') api.add_resource(ConversationUnPinApi, '/installed-apps/<uuid:installed_app_id>/conversations/<uuid:c_id>/unpin', endpoint='installed_app_conversation_unpin')

8
api/controllers/console/explore/message.py
Unescape Escape View File

@ -190,7 +190,7 @@ class MessageSuggestedQuestionApi(InstalledAppResource):
return {'data': questions} return {'data': questions}
api.add_resource(MessageListApi, '/installed-apps/<uuid:installed_app_id>/messages') api.add_resource(MessageListApi, '/installed-apps/<uuid:installed_app_id>/messages', endpoint='installed_app_messages')
api.add_resource(MessageFeedbackApi, '/installed-apps/<uuid:installed_app_id>/messages/<uuid:message_id>/feedbacks') api.add_resource(MessageFeedbackApi, '/installed-apps/<uuid:installed_app_id>/messages/<uuid:message_id>/feedbacks', endpoint='installed_app_message_feedback')
api.add_resource(MessageMoreLikeThisApi, '/installed-apps/<uuid:installed_app_id>/messages/<uuid:message_id>/more-like-this') api.add_resource(MessageMoreLikeThisApi, '/installed-apps/<uuid:installed_app_id>/messages/<uuid:message_id>/more-like-this', endpoint='installed_app_more_like_this')
api.add_resource(MessageSuggestedQuestionApi, '/installed-apps/<uuid:installed_app_id>/messages/<uuid:message_id>/suggested-questions') api.add_resource(MessageSuggestedQuestionApi, '/installed-apps/<uuid:installed_app_id>/messages/<uuid:message_id>/suggested-questions', endpoint='installed_app_suggested_question')

2
api/controllers/console/explore/parameter.py
Unescape Escape View File

@ -40,4 +40,4 @@ class AppParameterApi(InstalledAppResource):
} }
api.add_resource(AppParameterApi, '/installed-apps/<uuid:installed_app_id>/parameters') api.add_resource(AppParameterApi, '/installed-apps/<uuid:installed_app_id>/parameters', endpoint='installed_app_parameters')

8
api/controllers/console/explore/recommended_app.py
Unescape Escape View File

@ -58,6 +58,10 @@ class RecommendedAppListApi(Resource):
) )
).first() is not None ).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] language_prefix = current_user.interface_language.split('-')[0]
desc = None desc = None
if recommended_app.description: if recommended_app.description:
@ -68,7 +72,7 @@ class RecommendedAppListApi(Resource):
recommended_app_result = { recommended_app_result = {
'id': recommended_app.id, 'id': recommended_app.id,
'app': recommended_app.app, 'app': app,
'app_id': recommended_app.app_id, 'app_id': recommended_app.app_id,
'description': desc, 'description': desc,
'copyright': recommended_app.copyright, 'copyright': recommended_app.copyright,
@ -125,7 +129,7 @@ class RecommendedAppApi(Resource):
# get app detail # get app detail
app = db.session.query(App).filter(App.id == app_id).first() app = db.session.query(App).filter(App.id == app_id).first()
if not app: if not app or not app.is_public:
raise AppNotFoundError raise AppNotFoundError
return app return app

4
api/controllers/console/explore/saved_message.py
Unescape Escape View File

@ -75,5 +75,5 @@ class SavedMessageApi(InstalledAppResource):
return {'result': 'success'} return {'result': 'success'}
api.add_resource(SavedMessageListApi, '/installed-apps/<uuid:installed_app_id>/saved-messages') api.add_resource(SavedMessageListApi, '/installed-apps/<uuid:installed_app_id>/saved-messages', endpoint='installed_app_saved_messages')
api.add_resource(SavedMessageApi, '/installed-apps/<uuid:installed_app_id>/saved-messages/<uuid:message_id>') api.add_resource(SavedMessageApi, '/installed-apps/<uuid:installed_app_id>/saved-messages/<uuid:message_id>', endpoint='installed_app_saved_message')

Write Preview
Loading…
Cancel
Save