fix(chat): fix prompts duplication (Issue #2201) (#2241)

epam · Oct 2, 2024 · ac6462c · ac6462c
1 parent c1e1a79
commit ac6462c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 36 deletions.
diff --git a/apps/chat/src/store/conversations/conversations.epics.ts b/apps/chat/src/store/conversations/conversations.epics.ts
@@ -810,7 +810,6 @@ const updateFolderEpic: AppEpic = (action$, state$) =>
     filter(ConversationsActions.updateFolder.match),
     switchMap(({ payload }) => {
       const folder = getFolderFromId(payload.folderId, FolderType.Chat);
-
       const newFolder = addGeneratedFolderId({ ...folder, ...payload.values });
 
       if (payload.folderId === newFolder.id) {
@@ -2354,9 +2353,7 @@ const recreateConversationEpic: AppEpic = (action$) =>
 const updateConversationEpic: AppEpic = (action$, state$) =>
   action$.pipe(
     filter(ConversationsActions.updateConversation.match),
-    mergeMap(({ payload }) => {
-      return getOrUploadConversation(payload, state$.value);
-    }),
+    mergeMap(({ payload }) => getOrUploadConversation(payload, state$.value)),
     mergeMap(({ payload, conversation }) => {
       const { id, values } = payload as {
         id: string;

diff --git a/apps/chat/src/store/prompts/prompts.epics.ts b/apps/chat/src/store/prompts/prompts.epics.ts
@@ -408,20 +408,7 @@ const updateFolderEpic: AppEpic = (action$, state$) =>
           );
 
           const actions: Observable<AnyAction>[] = [];
-          actions.push(
-            of(
-              PromptsActions.updateFolderSuccess({
-                folders: updatedFolders,
-                prompts: updatedPrompts,
-              }),
-            ),
-            of(
-              UIActions.setOpenedFoldersIds({
-                openedFolderIds: updatedOpenedFoldersIds,
-                featureType: FeatureType.Prompt,
-              }),
-            ),
-          );
+
           if (prompts.length) {
             prompts.forEach((prompt) => {
               actions.push(
@@ -437,6 +424,21 @@ const updateFolderEpic: AppEpic = (action$, state$) =>
             });
           }
 
+          actions.push(
+            of(
+              PromptsActions.updateFolderSuccess({
+                folders: updatedFolders,
+                prompts: updatedPrompts,
+              }),
+            ),
+            of(
+              UIActions.setOpenedFoldersIds({
+                openedFolderIds: updatedOpenedFoldersIds,
+                featureType: FeatureType.Prompt,
+              }),
+            ),
+          );
+
           return concat(...actions);
         }),
         catchError((err) => {

diff --git a/apps/chat/src/utils/app/data/storages/api/conversation-api-storage.ts b/apps/chat/src/utils/app/data/storages/api/conversation-api-storage.ts
@@ -68,9 +68,9 @@ export const getOrUploadConversation = (
   const conversation = ConversationsSelectors.selectConversation(
     state,
     payload.id,
-  ) as Conversation;
+  );
 
-  if (conversation?.status !== UploadStatus.LOADED) {
+  if (conversation && conversation?.status !== UploadStatus.LOADED) {
     return forkJoin({
       conversation: ConversationService.getConversation(conversation).pipe(
         catchError((err) => {
@@ -82,7 +82,7 @@ export const getOrUploadConversation = (
     });
   } else {
     return forkJoin({
-      conversation: of(conversation),
+      conversation: of((conversation as Conversation) ?? null),
       payload: of(payload),
     });
   }

diff --git a/apps/chat/src/utils/app/data/storages/api/prompt-api-storage.ts b/apps/chat/src/utils/app/data/storages/api/prompt-api-storage.ts
@@ -2,9 +2,6 @@ import { Observable, catchError, forkJoin, of } from 'rxjs';
 
 import { cleanPrompt } from '@/src/utils/app/clean';
 import { PromptService } from '@/src/utils/app/data/prompt-service';
-import { constructPath } from '@/src/utils/app/file';
-import { splitEntityId } from '@/src/utils/app/folders';
-import { regeneratePromptId } from '@/src/utils/app/prompts';
 import { getPromptApiKey, parsePromptApiKey } from '@/src/utils/server/api';
 
 import { ApiKeys } from '@/src/types/common';
@@ -47,13 +44,7 @@ export const getOrUploadPrompt = (
 }> => {
   const prompt = PromptsSelectors.selectPrompt(state, payload.id);
 
-  if (prompt?.status !== UploadStatus.LOADED) {
-    const { apiKey, bucket, name, parentPath } = splitEntityId(payload.id);
-    const prompt = regeneratePromptId({
-      name,
-      folderId: constructPath(apiKey, bucket, parentPath),
-    });
-
+  if (prompt && prompt?.status !== UploadStatus.LOADED) {
     return forkJoin({
       prompt: PromptService.getPrompt(prompt).pipe(
         catchError((err) => {
@@ -65,7 +56,7 @@ export const getOrUploadPrompt = (
     });
   } else {
     return forkJoin({
-      prompt: of(prompt),
+      prompt: of(prompt ?? null),
       payload: of(payload),
     });
   }

diff --git a/apps/chat/src/utils/server/api.ts b/apps/chat/src/utils/server/api.ts
@@ -47,7 +47,7 @@ const getModelApiIdFromConversation = (conversation: Conversation): string => {
   return conversation.model.id;
 };
 
-// Format key: {modelId}__{name}
+// Format key: {modelId}__{name} or {modelId}__{name}__{version} if conversation is public
 export const getConversationApiKey = (
   conversation: Omit<ConversationInfo, 'id' | 'folderId'>,
 ): string => {
@@ -103,9 +103,16 @@ export const parseConversationApiKey = (
   return parsedApiKey;
 };
 
-// Format key: {name}
-export const getPromptApiKey = (prompt: Omit<PromptInfo, 'id'>): string => {
-  return prompt.name;
+// Format key: {name} or {name}__{version} if prompt is public
+export const getPromptApiKey = (prompt: Omit<PromptInfo, 'id'>) => {
+  if (
+    !prompt.publicationInfo ||
+    prompt.publicationInfo.version === NA_VERSION
+  ) {
+    return prompt.name;
+  }
+
+  return [prompt.name, prompt.publicationInfo.version].join(pathKeySeparator);
 };
 
 // Format key: {name}