Browse Source

refactor createThread()

Shun Miyazawa 11 months ago
parent
commit
6750774cdd

+ 2 - 3
apps/app/src/features/openai/client/components/AiAssistant/AiAssistantSidebar/AiAssistantSidebar.tsx

@@ -55,7 +55,6 @@ const AiAssistantSidebarSubstance: React.FC<AiAssistantSidebarSubstanceProps> =
   const [generatingAnswerMessage, setGeneratingAnswerMessage] = useState<MessageLog>();
   const [errorMessage, setErrorMessage] = useState<string | undefined>();
   const [isErrorDetailCollapsed, setIsErrorDetailCollapsed] = useState<boolean>(false);
-  const [selectedAiAssistant, setSelectedAiAssistant] = useState<AiAssistantHasId>();
 
   const { t } = useTranslation();
   const { data: growiCloudUri } = useGrowiCloudUri();
@@ -98,7 +97,7 @@ const AiAssistantSidebarSubstance: React.FC<AiAssistantSidebarSubstanceProps> =
 
   const createThread = useCallback(async(initialUserMessage: string) => {
     if (isEditorAssistant) {
-      const thread = await createThreadForEditorAssistant(selectedAiAssistant?._id);
+      const thread = await createThreadForEditorAssistant();
       return thread;
     }
 
@@ -107,7 +106,7 @@ const AiAssistantSidebarSubstance: React.FC<AiAssistantSidebarSubstanceProps> =
     }
     const thread = await createThreadForKnowledgeAssistant(aiAssistantData._id, initialUserMessage);
     return thread;
-  }, [aiAssistantData, createThreadForEditorAssistant, createThreadForKnowledgeAssistant, isEditorAssistant, selectedAiAssistant?._id]);
+  }, [aiAssistantData, createThreadForEditorAssistant, createThreadForKnowledgeAssistant, isEditorAssistant]);
 
   const initialView = useMemo(() => {
     return isEditorAssistant

+ 4 - 5
apps/app/src/features/openai/client/services/editor-assistant.tsx

@@ -37,7 +37,7 @@ import { QuickMenuList } from '../components/AiAssistant/AiAssistantSidebar/Quic
 import { useAiAssistantSidebar } from '../stores/ai-assistant';
 
 interface CreateThread {
-  (aiAssistantId?: string): Promise<IThreadRelationHasId>;
+  (): Promise<IThreadRelationHasId>;
 }
 interface PostMessage {
   (threadId: string, userMessage: string): Promise<Response>;
@@ -147,13 +147,13 @@ export const useEditorAssistant: UseEditorAssistant = () => {
   const { data: aiAssistantSidebarData } = useAiAssistantSidebar();
 
   // Functions
-  const createThread: CreateThread = useCallback(async(aiAssistantId) => {
+  const createThread: CreateThread = useCallback(async() => {
     const response = await apiv3Post<IThreadRelationHasId>('/openai/thread', {
       type: ThreadType.EDITOR,
-      aiAssistantId,
+      aiAssistantId: selectedAiAssistant?._id,
     });
     return response.data;
-  }, []);
+  }, [selectedAiAssistant?._id]);
 
   const postMessage: PostMessage = useCallback(async(threadId, userMessage) => {
     const response = await fetch('/_api/v3/openai/edit', {
@@ -209,7 +209,6 @@ export const useEditorAssistant: UseEditorAssistant = () => {
     lineRef.current = selectedTextFirstLineNumber;
   }, []);
 
-
   const isActionButtonShown: IsActionButtonShown = useCallback((messageId: string, messageLogs: MessageLog[], generatingAnswerMessage: MessageLog) => {
     if (!aiAssistantSidebarData?.isEditorAssistant) {
       return false;