Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions src/conversations/conversations.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,23 +220,11 @@ export class ConversationsService {
return detail;
}

const system_message: Message = messages[0];
if (system_message.message.role !== OpenAIMessageRole.SYSTEM) {
const message = this.i18n.t('system.errors.firstMessageNotSystem');
throw new AppException(
message,
'FIRST_MESSAGE_NOT_SYSTEM',
HttpStatus.INTERNAL_SERVER_ERROR,
);
}
const childrenMap: Record<string, string[]> = {};
for (const msg of messages) {
if (msg.id === system_message.id) {
if (msg.message.role === OpenAIMessageRole.SYSTEM) {
continue;
}
if (msg.parentId === system_message.id) {
msg.parentId = null;
}
if (msg.parentId) {
if (!childrenMap[msg.parentId]) {
childrenMap[msg.parentId] = [];
Expand All @@ -245,7 +233,7 @@ export class ConversationsService {
}
}
for (const msg of messages) {
if (msg.id === system_message.id) {
if (msg.message.role === OpenAIMessageRole.SYSTEM) {
continue;
}
detail.mapping[msg.id] = {
Expand Down
4 changes: 0 additions & 4 deletions src/wizard/stream.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,6 @@ export class StreamService {
chunk.userId = userId || undefined;
chunk.namespaceId = namespaceId;

if (context.message?.role === OpenAIMessageRole.SYSTEM) {
chunk.parentId = undefined;
}

context.messageId = message.id;
context.message = message.message;
} else if (chunk.response_type === 'delta') {
Expand Down