wip: continuos thread logic and functionality.

mledezma · mledezma · commit e17d91cff984 · 2025-01-15T04:11:31.000-06:00
diff --git a/apps/hasura/metadata/databases/masterbots/tables/public_thread.yaml b/apps/hasura/metadata/databases/masterbots/tables/public_thread.yaml
@@ -8,6 +8,9 @@ object_relationships:
   - name: modelsEnum
     using:
       foreign_key_constraint_on: model
+  - name: thread
+    using:
+      foreign_key_constraint_on: parent_thread_id
   - name: user
     using:
       foreign_key_constraint_on: user_id
@@ -19,6 +22,13 @@ array_relationships:
         table:
           name: message
           schema: public
+  - name: threads
+    using:
+      foreign_key_constraint_on:
+        column: parent_thread_id
+        table:
+          name: thread
+          schema: public
 insert_permissions:
   - role: moderator
     permission:
@@ -36,9 +46,7 @@ insert_permissions:
     comment: ""
   - role: user
     permission:
-      check:
-        user_id:
-          _eq: X-Hasura-User-Id
+      check: {}
       columns:
         - chatbot_id
         - thread_id
@@ -104,10 +112,8 @@ update_permissions:
         - chatbot_id
         - is_public
         - model
-      filter:
-        user_id:
-          _eq: X-Hasura-User-Id
-      check: null
+      filter: {}
+      check: {}
     comment: ""
 delete_permissions:
   - role: moderator
@@ -116,7 +122,5 @@ delete_permissions:
     comment: ""
   - role: user
     permission:
-      filter:
-        user_id:
-          _eq: X-Hasura-User-Id
+      filter: {}
     comment: ""
diff --git a/apps/hasura/migrations/masterbots/1736934846590_alter_table_public_thread_add_column_parent_thread/down.sql b/apps/hasura/migrations/masterbots/1736934846590_alter_table_public_thread_add_column_parent_thread/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."thread" add column "parent_thread" uuid
+--  null;
diff --git a/apps/hasura/migrations/masterbots/1736934846590_alter_table_public_thread_add_column_parent_thread/up.sql b/apps/hasura/migrations/masterbots/1736934846590_alter_table_public_thread_add_column_parent_thread/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."thread" add column "parent_thread" uuid
+ null;
diff --git a/apps/hasura/migrations/masterbots/1736934871442_set_fk_public_thread_parent_thread/down.sql b/apps/hasura/migrations/masterbots/1736934871442_set_fk_public_thread_parent_thread/down.sql
@@ -0,0 +1 @@
+alter table "public"."thread" drop constraint "thread_parent_thread_fkey";
diff --git a/apps/hasura/migrations/masterbots/1736934871442_set_fk_public_thread_parent_thread/up.sql b/apps/hasura/migrations/masterbots/1736934871442_set_fk_public_thread_parent_thread/up.sql
@@ -0,0 +1,5 @@
+alter table "public"."thread"
+  add constraint "thread_parent_thread_fkey"
+  foreign key ("parent_thread")
+  references "public"."thread"
+  ("thread_id") on update restrict on delete restrict;
diff --git a/apps/hasura/migrations/masterbots/1736934906237_set_fk_public_thread_parent_thread/down.sql b/apps/hasura/migrations/masterbots/1736934906237_set_fk_public_thread_parent_thread/down.sql
@@ -0,0 +1,5 @@
+alter table "public"."thread" drop constraint "thread_parent_thread_fkey",
+  add constraint "thread_parent_thread_fkey"
+  foreign key ("parent_thread")
+  references "public"."thread"
+  ("thread_id") on update restrict on delete restrict;
diff --git a/apps/hasura/migrations/masterbots/1736934906237_set_fk_public_thread_parent_thread/up.sql b/apps/hasura/migrations/masterbots/1736934906237_set_fk_public_thread_parent_thread/up.sql
@@ -0,0 +1,5 @@
+alter table "public"."thread" drop constraint "thread_parent_thread_fkey",
+  add constraint "thread_parent_thread_fkey"
+  foreign key ("parent_thread")
+  references "public"."thread"
+  ("thread_id") on update no action on delete no action;
diff --git a/apps/hasura/migrations/masterbots/1736935003381_delete_fk_public_thread_thread_parent_thread_fkey/down.sql b/apps/hasura/migrations/masterbots/1736935003381_delete_fk_public_thread_thread_parent_thread_fkey/down.sql
@@ -0,0 +1,5 @@
+alter table "public"."thread"
+  add constraint "thread_parent_thread_fkey"
+  foreign key ("parent_thread")
+  references "public"."thread"
+  ("thread_id") on update no action on delete no action;
diff --git a/apps/hasura/migrations/masterbots/1736935003381_delete_fk_public_thread_thread_parent_thread_fkey/up.sql b/apps/hasura/migrations/masterbots/1736935003381_delete_fk_public_thread_thread_parent_thread_fkey/up.sql
@@ -0,0 +1 @@
+alter table "public"."thread" drop constraint "thread_parent_thread_fkey";
diff --git a/apps/hasura/migrations/masterbots/1736935011585_alter_table_public_thread_drop_column_parent_thread/down.sql b/apps/hasura/migrations/masterbots/1736935011585_alter_table_public_thread_drop_column_parent_thread/down.sql
@@ -0,0 +1,2 @@
+alter table "public"."thread" alter column "parent_thread" drop not null;
+alter table "public"."thread" add column "parent_thread" uuid;
diff --git a/apps/hasura/migrations/masterbots/1736935011585_alter_table_public_thread_drop_column_parent_thread/up.sql b/apps/hasura/migrations/masterbots/1736935011585_alter_table_public_thread_drop_column_parent_thread/up.sql
@@ -0,0 +1 @@
+alter table "public"."thread" drop column "parent_thread" cascade;
diff --git a/apps/hasura/migrations/masterbots/1736935019108_alter_table_public_thread_add_column_parent_thread_id/down.sql b/apps/hasura/migrations/masterbots/1736935019108_alter_table_public_thread_add_column_parent_thread_id/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."thread" add column "parent_thread_id" uuid
+--  null;
diff --git a/apps/hasura/migrations/masterbots/1736935019108_alter_table_public_thread_add_column_parent_thread_id/up.sql b/apps/hasura/migrations/masterbots/1736935019108_alter_table_public_thread_add_column_parent_thread_id/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."thread" add column "parent_thread_id" uuid
+ null;
diff --git a/apps/hasura/migrations/masterbots/1736935030050_set_fk_public_thread_parent_thread_id/down.sql b/apps/hasura/migrations/masterbots/1736935030050_set_fk_public_thread_parent_thread_id/down.sql
@@ -0,0 +1 @@
+alter table "public"."thread" drop constraint "thread_parent_thread_id_fkey";
diff --git a/apps/hasura/migrations/masterbots/1736935030050_set_fk_public_thread_parent_thread_id/up.sql b/apps/hasura/migrations/masterbots/1736935030050_set_fk_public_thread_parent_thread_id/up.sql
@@ -0,0 +1,5 @@
+alter table "public"."thread"
+  add constraint "thread_parent_thread_id_fkey"
+  foreign key ("parent_thread_id")
+  references "public"."thread"
+  ("thread_id") on update no action on delete no action;
diff --git a/apps/masterbots.ai/components/routes/browse/browse-chat-messages.tsx b/apps/masterbots.ai/components/routes/browse/browse-chat-messages.tsx
@@ -19,6 +19,8 @@ import React from 'react'
 import BrowseChatbotDetails from '@/components/routes/browse/browse-chatbot-details'
 import { BrowseChatMessageList } from '@/components/routes/browse/browse-chat-message-list'
 import { getMessages } from '@/services/hasura'
+import { ExternalLink } from '@/components/shared/external-link'
+import { toSlug } from 'mb-lib'
 
 export type MessagePair = {
   userMessage: Message
@@ -44,6 +46,8 @@ export function BrowseChatMessages({
   chatbot?: Chatbot
 }) {
   const [messages, setMessages] = React.useState<Message[]>([])
+  const { name: categoryName } = chatbot?.categories[0].category || { name: '' }
+  const { name: chatBotName } = chatbot || { name: '' }
 
   // Fetch messages for the specified thread ID
   const fetchMessages = async () => {
@@ -76,6 +80,9 @@ export function BrowseChatMessages({
           isThread
         />
       </div>
+      <div className="border-t border-t-iron dark:border-t-mirage pt-6 text-center mt-44 lg:mt-96">
+        <ExternalLink href={`/c/${toSlug(categoryName)}/${toSlug(chatBotName)}?continuousThreadId=${threadId}`}>Continue Thread</ExternalLink>
+      </div>
     </div>
   )
 }
diff --git a/apps/masterbots.ai/components/routes/chat/chat-chatbot-details.tsx b/apps/masterbots.ai/components/routes/chat/chat-chatbot-details.tsx
@@ -3,7 +3,6 @@ import { useSidebar } from '@/lib/hooks/use-sidebar'
 import { useThread } from '@/lib/hooks/use-thread'
 import { getCategory, getThreads, chatbotFollowOrUnfollow } from '@/services/hasura'
 import { useSession } from 'next-auth/react'
-import { useParams } from 'next/navigation'
 import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import type { SocialFollowing } from 'mb-genql'
@@ -59,15 +58,15 @@ export default function ChatChatbotDetails() {
             followeeIdChatbot: followeeId,
             chatbot: null,
             createdAt: new Date().toISOString(),
-            userByFollowerId: null as unknown, 
+            userByFollowerId: null as unknown,
             user: null,
             __typename: 'SocialFollowing'
-        } as SocialFollowing  
+        } as SocialFollowing
     ]);
    }else{
     setFollowers(followers.filter(follower => !(follower.followerId === followerId && follower.followeeIdChatbot === followeeId)))
     }
-  
+
     customSonner({type: 'success', text: follow ? `You have followed ${activeChatbot?.name} successfully` : `You have  unfollowed  ${activeChatbot?.name}`})
    }  catch (error) {
     setIsFollowLoading(false)
@@ -132,7 +131,6 @@ export default function ChatChatbotDetails() {
     console.log('Starting new chat with:', botName)
   }
 
-  
   const sharedProps = {
     botName,
     avatar: activeChatbot?.avatar || randomChatbot?.avatar || '',
@@ -148,7 +146,6 @@ export default function ChatChatbotDetails() {
     followers
   }
 
- 
   return (
     <>
       <OnboardingChatbotDetails {...sharedProps} />
diff --git a/apps/masterbots.ai/components/routes/chat/chat.tsx b/apps/masterbots.ai/components/routes/chat/chat.tsx
@@ -2,7 +2,7 @@
 
 /**
  * Chat Component
- * 
+ *
  * A complex chat interface that handles:
  * - Message management for new and existing chat threads
  * - Integration with AI models for message processing and responses
@@ -14,15 +14,15 @@
  * - Chat thread creation and state management
  * - Message improvement and metadata extraction using AI
  * - Automatic scrolling behavior
- * 
+ *
  * Key Features:
  * - Supports both popup and inline chat modes
  * - Handles message processing states (processing, digesting, generating, etc.)
  * - Manages chat thread creation and persistence
  * - Integrates with multiple chatbot models
  * - Provides real-time message streaming
  * - Maintains chat history and system prompts
- * 
+ *
  * State Management:
  * - Uses useChat for message handling
  * - Manages loading states for UI feedback
@@ -40,10 +40,12 @@ import { useAtBottom } from "@/lib/hooks/use-at-bottom";
 import { useMBChat } from "@/lib/hooks/use-mb-chat";
 import { useSidebar } from "@/lib/hooks/use-sidebar";
 import { useThread } from "@/lib/hooks/use-thread";
+import { useThreadVisibility } from "@/lib/hooks/use-thread-visibility";
 import { cn, scrollToBottomOfElement } from "@/lib/utils";
 import type {
   ChatProps
 } from "@/types/types";
+import type { Message as UiUtilsMessage } from '@ai-sdk/ui-utils'
 import { useScroll } from "framer-motion";
 import { Chatbot } from "mb-genql";
 import { useParams } from "next/navigation";
@@ -68,12 +70,13 @@ export function Chat({
     setLoadingState,
   } = useThread();
   const { activeChatbot } = useSidebar();
+  const { isContinuosThread } = useThreadVisibility()
   const containerRef = React.useRef<HTMLDivElement>();
   const params = useParams<{ chatbot: string; threadId: string }>();
   const chatbot = chatbotProps || activeThread?.chatbot || activeChatbot as Chatbot
   const [
     { newChatThreadId: threadId, input, isLoading, allMessages, isNewChat },
-    { appendWithMbContextPrompts, reload, setInput }
+    { appendWithMbContextPrompts, appendAsContinuousThread, reload, setInput }
   ] = useMBChat({
     chatbot,
   });
@@ -112,6 +115,17 @@ export function Chat({
     }
   };
 
+  const chatSearchMessage = (isNewChat: boolean, isContinuosThread: boolean, allMessages: UiUtilsMessage[] ) => {
+    const threadTitle = allMessages.filter(m => m.role === 'user')[0]?.content
+    if (isContinuosThread && allMessages) {
+      return `Create new thread from "${threadTitle}" by making a new question.`
+    } else if (isNewChat) {
+      return `Start New Chat with ${chatbot.name}`
+    } else {
+      return `Continue This Chat with ${chatbot.name}`
+    }
+  }
+
   useEffect(() => {
     if (
       params.chatbot &&
@@ -172,17 +186,15 @@ export function Chat({
         id={params.threadId || isNewChat ? threadId : activeThread?.threadId}
         isLoading={isLoading}
         stop={stop}
-        append={appendWithMbContextPrompts}
+        append={isContinuosThread ? appendAsContinuousThread : appendWithMbContextPrompts}
         reload={reload}
         messages={allMessages}
         input={input}
         setInput={setInput}
         chatbot={chatbot}
         placeholder={
           chatbot
-            ? isNewChat
-              ? `Start New Chat with ${chatbot.name}`
-              : `Continue This Chat with ${chatbot.name}`
+            ? chatSearchMessage(isNewChat, isContinuosThread, allMessages)
             : ""
         }
         showReload={!isNewChat}
diff --git a/apps/masterbots.ai/components/routes/chat/onboarding-chatbot-details.tsx b/apps/masterbots.ai/components/routes/chat/onboarding-chatbot-details.tsx
@@ -13,14 +13,13 @@ export function OnboardingChatbotDetails({
   threadCount = 0,
   followersCount = 3200,
   isWelcomeView = true,
-  categoryName,
   onNewChat,
   onFollow,
   followers
 }: ChatbotDetailsProps) {
 
-   const { data: session } = useSession()
-  const followed = isFollowed({followers, userId: session?.user?.id || ''}) 
+  const { data: session } = useSession()
+  const followed = isFollowed({followers, userId: session?.user?.id || ''})
 
   return (
     <div className="hidden h-[calc(100vh-196px)] md:flex items-center justify-center -translate-y-8">
diff --git a/apps/masterbots.ai/components/routes/thread/user-thread-panel.tsx b/apps/masterbots.ai/components/routes/thread/user-thread-panel.tsx
diff --git a/apps/masterbots.ai/components/shared/alert-dialogue.tsx b/apps/masterbots.ai/components/shared/alert-dialogue.tsx
diff --git a/apps/masterbots.ai/components/shared/external-link.tsx b/apps/masterbots.ai/components/shared/external-link.tsx
diff --git a/apps/masterbots.ai/lib/constants/prompts.ts b/apps/masterbots.ai/lib/constants/prompts.ts
diff --git a/apps/masterbots.ai/lib/hooks/use-mb-chat.ts b/apps/masterbots.ai/lib/hooks/use-mb-chat.ts
diff --git a/apps/masterbots.ai/lib/hooks/use-thread-visibility.tsx b/apps/masterbots.ai/lib/hooks/use-thread-visibility.tsx
diff --git a/apps/masterbots.ai/services/hasura/hasura.service.ts b/apps/masterbots.ai/services/hasura/hasura.service.ts
diff --git a/apps/masterbots.ai/services/hasura/hasura.service.type.ts b/apps/masterbots.ai/services/hasura/hasura.service.type.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+alter table "public"."thread" add column "parent_thread" uuid`
	`2`	`+ null;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+alter table "public"."thread" drop constraint "thread_parent_thread_fkey";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+alter table "public"."thread" alter column "parent_thread" drop not null;`
	`2`	`+alter table "public"."thread" add column "parent_thread" uuid;`