From 5f7a99f957f27e14a72847d0e897f37e79a1a75c Mon Sep 17 00:00:00 2001 From: zhangshaohu Date: Fri, 22 Mar 2024 22:23:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9E=8B=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E5=BC=82=E5=B8=B8,=E6=A8=A1=E5=9E=8B=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=B6=E7=8A=B6=E6=80=81=E6=9C=AA=E6=94=B9=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serializers/chat_message_serializers.py | 30 +++++++++---------- .../serializers/provider_serializers.py | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/apps/application/serializers/chat_message_serializers.py b/apps/application/serializers/chat_message_serializers.py index d419944ed..d94f633f4 100644 --- a/apps/application/serializers/chat_message_serializers.py +++ b/apps/application/serializers/chat_message_serializers.py @@ -152,21 +152,21 @@ class ChatMessageSerializer(serializers.Serializer): application_id=self.data.get('application_id')).first() if application_access_token.access_num <= access_client.intraday_access_num: raise AppChatNumOutOfBoundsFailed(1002, "访问次数超过今日访问量") - chat_id = self.data.get('chat_id') - chat_info: ChatInfo = chat_cache.get(chat_id) - if chat_info is None: - chat_info = self.re_open_chat(chat_id) - chat_cache.set(chat_id, - chat_info, timeout=60 * 30) - model = chat_info.application.model - model = QuerySet(Model).filter(id=model.id).first() - if model is None: - raise AppApiException(500, "模型不存在") - if model == Status.ERROR: - raise AppApiException(500, "当前模型不可用") - if model == Status.DOWNLOAD: - raise AppApiException(500, "模型正在下载中,请稍后再发起对话") - return chat_info + chat_id = self.data.get('chat_id') + chat_info: ChatInfo = chat_cache.get(chat_id) + if chat_info is None: + chat_info = self.re_open_chat(chat_id) + chat_cache.set(chat_id, + chat_info, timeout=60 * 30) + model = chat_info.application.model + model = QuerySet(Model).filter(id=model.id).first() + if model is None: + raise AppApiException(500, "模型不存在") + if model.status == Status.ERROR: + raise AppApiException(500, "当前模型不可用") + if model.status == Status.DOWNLOAD: + raise AppApiException(500, "模型正在下载中,请稍后再发起对话") + return chat_info def chat(self): self.is_valid(raise_exception=True) diff --git a/apps/setting/serializers/provider_serializers.py b/apps/setting/serializers/provider_serializers.py index e744b0c6b..145b49062 100644 --- a/apps/setting/serializers/provider_serializers.py +++ b/apps/setting/serializers/provider_serializers.py @@ -241,6 +241,7 @@ class ModelSerializer(serializers.Serializer): model.status = Status.DOWNLOAD else: raise e + model.status = Status.SUCCESS update_keys = ['credential', 'name', 'model_type', 'model_name'] for update_key in update_keys: if update_key in instance and instance.get(update_key) is not None: