Переглянути джерело

fix: user handling in stop api (#2254)

tags/0.5.3
takatost 1 рік тому
джерело
коміт
5a6cb69951
Аккаунт користувача з таким Email не знайдено
1 змінених файлів з 24 додано та 11 видалено
  1. 24
    11
      api/controllers/service_api/app/completion.py

+ 24
- 11
api/controllers/service_api/app/completion.py Переглянути файл

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




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()


parser = reqparse.RequestParser()
parser.add_argument('user', required=True, nullable=False, type=str, location='json')
if end_user is None:
parser = reqparse.RequestParser()
parser.add_argument('user', required=True, nullable=False, type=str, location='json')
args = parser.parse_args()


args = parser.parse_args()
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.")


end_user_id = args.get('user')

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






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()

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



Завантаження…
Відмінити
Зберегти