Skip to content

Commit 74a6788

Browse files
committed
fix: Issues related to the deletion of conversation_id (#12488)
1 parent 831459b commit 74a6788

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

api/core/app/apps/advanced_chat/app_generator.py

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from models.account import Account
3030
from models.model import App, Conversation, EndUser, Message
3131
from models.workflow import Workflow
32+
from services.errors.conversation import ConversationNotExistsError
3233
from services.errors.message import MessageNotExistsError
3334

3435
logger = logging.getLogger(__name__)
@@ -108,6 +109,8 @@ def generate(
108109
conversation = self._get_conversation_by_user(
109110
app_model=app_model, conversation_id=conversation_id, user=user
110111
)
112+
if conversation and conversation.is_deleted:
113+
raise ConversationNotExistsError()
111114

112115
# parse files
113116
files = args["files"] if args.get("files") else []

api/core/app/apps/agent_chat/app_generator.py

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from extensions.ext_database import db
2424
from factories import file_factory
2525
from models import Account, App, EndUser
26+
from services.errors.conversation import ConversationNotExistsError
2627
from services.errors.message import MessageNotExistsError
2728

2829
logger = logging.getLogger(__name__)
@@ -99,6 +100,8 @@ def generate(
99100
conversation = None
100101
if args.get("conversation_id"):
101102
conversation = self._get_conversation_by_user(app_model, args.get("conversation_id", ""), user)
103+
if conversation and conversation.is_deleted:
104+
raise ConversationNotExistsError()
102105

103106
# get app model config
104107
app_model_config = self._get_app_model_config(app_model=app_model, conversation=conversation)

api/core/app/apps/chat/app_generator.py

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from factories import file_factory
2525
from models.account import Account
2626
from models.model import App, EndUser
27+
from services.errors.conversation import ConversationNotExistsError
2728
from services.errors.message import MessageNotExistsError
2829

2930
logger = logging.getLogger(__name__)
@@ -93,6 +94,8 @@ def generate(
9394
conversation = None
9495
if args.get("conversation_id"):
9596
conversation = self._get_conversation_by_user(app_model, args.get("conversation_id", ""), user)
97+
if conversation and conversation.is_deleted:
98+
raise ConversationNotExistsError()
9699

97100
# get app model config
98101
app_model_config = self._get_app_model_config(app_model=app_model, conversation=conversation)

0 commit comments

Comments
 (0)