Austin/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2024-11-16 19:59:50 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: user handling in stop api (#2254)

Browse Source
This commit is contained in:
takatost 2024-01-27 19:05:37 +08:00 committed by GitHub
parent 11a75ee78a
commit 5a6cb69951
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/controllers/service_api/app/completion.py
View File

@ -13,7 +13,7 @@ from core.application_queue_manager import ApplicationQueueManager
from core.entities.application_entities import InvokeFrom from core.entities.application_entities import InvokeFrom
from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
from core.model_runtime.errors.invoke import InvokeError from core.model_runtime.errors.invoke import InvokeError
from flask import Response, stream_with_context, request from flask import Response, stream_with_context
from flask_restful import reqparse from flask_restful import reqparse
from libs.helper import uuid_value from libs.helper import uuid_value
from services.completion_service import CompletionService from services.completion_service import CompletionService
@ -75,18 +75,22 @@ class CompletionApi(AppApiResource):
class CompletionStopApi(AppApiResource): class CompletionStopApi(AppApiResource):
def post(self, app_model, _, task_id): def post(self, app_model, end_user, task_id):
if app_model.mode != 'completion': if app_model.mode != 'completion':
raise AppUnavailableError() raise AppUnavailableError()
if end_user is None:
parser = reqparse.RequestParser() parser = reqparse.RequestParser()
parser.add_argument('user', required=True, nullable=False, type=str, location='json') parser.add_argument('user', required=True, nullable=False, type=str, location='json')
args = parser.parse_args() args = parser.parse_args()
end_user_id = args.get('user') user = args.get('user')
if user is not None:
end_user = create_or_update_end_user_for_user_id(app_model, user)
else:
raise ValueError("arg user muse be input.")
ApplicationQueueManager.set_stop_flag(task_id, InvokeFrom.SERVICE_API, end_user_id) ApplicationQueueManager.set_stop_flag(task_id, InvokeFrom.SERVICE_API, end_user.id)
return {'result': 'success'}, 200 return {'result': 'success'}, 200
@ -146,13 +150,22 @@ class ChatApi(AppApiResource):
class ChatStopApi(AppApiResource): class ChatStopApi(AppApiResource):
def post(self, app_model, _, task_id): def post(self, app_model, end_user, task_id):
if app_model.mode != 'chat': if app_model.mode != 'chat':
raise NotChatAppError() raise NotChatAppError()
end_user_id = request.get_json().get('user') if end_user is None:
parser = reqparse.RequestParser()
parser.add_argument('user', required=True, nullable=False, type=str, location='json')
args = parser.parse_args()
ApplicationQueueManager.set_stop_flag(task_id, InvokeFrom.SERVICE_API, end_user_id) user = args.get('user')
if user is not None:
end_user = create_or_update_end_user_for_user_id(app_model, user)
else:
raise ValueError("arg user muse be input.")
ApplicationQueueManager.set_stop_flag(task_id, InvokeFrom.SERVICE_API, end_user.id)
return {'result': 'success'}, 200 return {'result': 'success'}, 200