chore: january 1st release

.gitignore

@@ -5,5 +5,6 @@ node_modules
 .DS_Store
 _dev
 .vercel
-__dev
-.vercel
+__dev
+.vercel
+.vscode/

apps/hasura/metadata/databases/masterbots/tables/public_chatbot.yaml

@@ -29,6 +29,13 @@ array_relationships:
         table:
           name: chat
           schema: public
+  - name: followers
+    using:
+      foreign_key_constraint_on:
+        column: followee_id_chatbot
+        table:
+          name: social_following
+          schema: public
   - name: metadataLabels
     using:
       foreign_key_constraint_on:

apps/hasura/metadata/databases/masterbots/tables/public_social_following.yaml

@@ -2,13 +2,29 @@ table:
   name: social_following
   schema: public
 object_relationships:
+  - name: chatbot
+    using:
+      foreign_key_constraint_on: followee_id_chatbot
   - name: user
     using:
       foreign_key_constraint_on: followee_id
   - name: userByFollowerId
     using:
       foreign_key_constraint_on: follower_id
 insert_permissions:
+  - role: moderator
+    permission:
+      check:
+        _and:
+          - followee_id:
+              _eq: X-Hasura-User-Id
+          - follower_id:
+              _eq: X-Hasura-User-Id
+      columns:
+        - followee_id
+        - followee_id_chatbot
+        - follower_id
+    comment: ""
   - role: user
     permission:
       check:
@@ -19,22 +35,74 @@ insert_permissions:
               _neq: X-Hasura-User-Id
       columns:
         - followee_id
+        - followee_id_chatbot
         - follower_id
     comment: ""
 select_permissions:
+  - role: anonymous
+    permission:
+      columns:
+        - created_at
+        - followee_id
+        - followee_id_chatbot
+        - follower_id
+      filter: {}
+    comment: ""
+  - role: moderator
+    permission:
+      columns:
+        - created_at
+        - followee_id
+        - followee_id_chatbot
+        - follower_id
+      filter: {}
+    comment: ""
   - role: user
     permission:
       columns:
         - followee_id
+        - followee_id_chatbot
         - follower_id
       filter:
         _or:
           - follower_id:
               _eq: X-Hasura-User-Id
           - followee_id:
+              _neq: X-Hasura-User-Id
+    comment: ""
+update_permissions:
+  - role: moderator
+    permission:
+      columns:
+        - followee_id
+        - followee_id_chatbot
+        - follower_id
+      filter:
+        follower_id:
+          _eq: X-Hasura-User-Id
+      check: null
+    comment: ""
+  - role: user
+    permission:
+      columns:
+        - followee_id
+        - followee_id_chatbot
+        - follower_id
+      filter:
+        _and:
+          - follower_id:
               _eq: X-Hasura-User-Id
+          - followee_id:
+              _neq: X-Hasura-User-Id
+      check: null
     comment: ""
 delete_permissions:
+  - role: moderator
+    permission:
+      filter:
+        follower_id:
+          _eq: X-Hasura-User-Id
+    comment: ""
   - role: user
     permission:
       filter:

apps/hasura/metadata/databases/masterbots/tables/public_user.yaml

@@ -1,7 +1,6 @@
 table:
   name: user
   schema: public
-
 array_relationships:
   - name: chats
     using:
@@ -31,31 +30,27 @@ array_relationships:
         table:
           name: preference
           schema: public
-
   - name: prompts
     using:
       foreign_key_constraint_on:
         column: user_id
         table:
           name: prompt_user
           schema: public
-
   - name: referrals
     using:
       foreign_key_constraint_on:
         column: referrer_id
         table:
           name: referral
           schema: public
-
   - name: referralsByUserId
     using:
       foreign_key_constraint_on:
         column: user_id
         table:
           name: referral
           schema: public
-
   - name: threads
     using:
       foreign_key_constraint_on:

apps/hasura/migrations/masterbots/1734184725302_delete_fk_public_social_following_social_following_followee_id_fkey/down.sql

@@ -0,0 +1,5 @@
+alter table "public"."social_following"
+  add constraint "social_following_followee_id_fkey"
+  foreign key ("followee_id")
+  references "public"."user"
+  ("user_id") on update restrict on delete restrict;

apps/hasura/migrations/masterbots/1734184725302_delete_fk_public_social_following_social_following_followee_id_fkey/up.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" drop constraint "social_following_followee_id_fkey";

apps/hasura/migrations/masterbots/1734184748787_run_sql_migration/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 social_following
+-- DROP CONSTRAINT IF EXISTS social_following_followee_id_fkey;

apps/hasura/migrations/masterbots/1734184748787_run_sql_migration/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE social_following 
+DROP CONSTRAINT IF EXISTS social_following_followee_id_fkey;

apps/hasura/migrations/masterbots/1734196561972_alter_table_public_social_following_alter_column_follower_id/down.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" rename column "follower_id_n" to "follower_id";

apps/hasura/migrations/masterbots/1734196561972_alter_table_public_social_following_alter_column_follower_id/up.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" rename column "follower_id" to "follower_id_n";

apps/hasura/migrations/masterbots/1734196575364_alter_table_public_social_following_alter_column_follower_id_n/down.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" rename column "follower_id" to "follower_id_n";

apps/hasura/migrations/masterbots/1734196575364_alter_table_public_social_following_alter_column_follower_id_n/up.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" rename column "follower_id_n" to "follower_id";

apps/hasura/migrations/masterbots/1734292953319_set_fk_public_social_following_followee_id/down.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" drop constraint "social_following_followee_id_fkey";

apps/hasura/migrations/masterbots/1734292953319_set_fk_public_social_following_followee_id/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."social_following"
+  add constraint "social_following_followee_id_fkey"
+  foreign key ("followee_id")
+  references "public"."user"
+  ("user_id") on update restrict on delete restrict;

apps/hasura/migrations/masterbots/1734300490458_alter_table_public_social_following_add_column_followee_id_chatbot/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"."social_following" add column "followee_id_chatbot" integer
+--  null;

apps/hasura/migrations/masterbots/1734300490458_alter_table_public_social_following_add_column_followee_id_chatbot/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."social_following" add column "followee_id_chatbot" integer
+ null;

apps/hasura/migrations/masterbots/1734300526426_set_fk_public_social_following_followee_id_chatbot/down.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" drop constraint "social_following_followee_id_chatbot_fkey";

apps/hasura/migrations/masterbots/1734300526426_set_fk_public_social_following_followee_id_chatbot/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."social_following"
+  add constraint "social_following_followee_id_chatbot_fkey"
+  foreign key ("followee_id_chatbot")
+  references "public"."chatbot"
+  ("chatbot_id") on update restrict on delete restrict;

apps/hasura/migrations/masterbots/1734356983533_alter_table_public_social_following_alter_column_followee_id/down.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" alter column "followee_id" set not null;

apps/hasura/migrations/masterbots/1734356983533_alter_table_public_social_following_alter_column_followee_id/up.sql

@@ -0,0 +1 @@
+alter table "public"."social_following" alter column "followee_id" drop not null;

apps/masterbots.ai/app/(browse)/page.tsx

@@ -1,5 +1,6 @@
 import BrowseList from '@/components/routes/browse/browse-list'
 import { BrowseSearchInput } from '@/components/routes/browse/browse-search-input'
+// export { generateMbMetadata as generateMetadata } from '@/lib/metadata'
 
 export default async function HomePage() {
   return (

apps/masterbots.ai/app/actions/ai-executers.ts

@@ -127,33 +127,19 @@ export async function getWebSearchTool({
       throw new Error('Web Search could not be completed.')
     }
 
-    if (!response.outputs['web search']?.output) {
+    if (
+      !response.outputs['web search']?.output &&
+      !response.outputs['web search']?.logs
+    ) {
       throw new Error('No output given. Web search could not be completed')
     }
 
-    return `${response.outputs['web search'].output}
-
-    ## EXAMPLE:
-
-    **Resume:**  
-    Brewers: 9  
-    Dodgers: 2
-
-    **Summary**  
-    Yelich, Perkins power Brewers to 9-2 victory over Dodgers and avoid being swept in weekend series. — Christian Yelich and Blake Perkins both homered, had three hits and drove in three runs as the Milwaukee Brewers beat the Los Angeles Dodgers 9-2 Sunday to snap a seven-game losing streak at Dodger Stadium.  
-
-    **Homeruns:**  
-    Yelich
-
-    **Winning Pitcher:**  
-    J. Junis
-
-    **Sources**:
-
-    1. [https://website1.com/](https://website1.com/)
-    2. [https://website2.com/](https://website2.com/)`
+    return `## INPUT:
+
+    ${response.outputs['web search']?.output ?? response.outputs['web search']?.logs}`
   } catch (error) {
-    console.error('Error fetching app data: ', error)
-    throw error
+    return `Something went wrong with web search that failed to provide results. Please try again later.
+
+    [ERROR LOG]: ${JSON.stringify(error, null, 2)}`
   }
 }

apps/masterbots.ai/app/actions/ai-main-call.ts

@@ -223,7 +223,7 @@ export async function createResponseStream(
           temperature: 0.4,
           tools,
           maxRetries: 2,
-          maxToolRoundtrips: 1
+          maxToolRoundtrips: 2
         })
         responseStream = response.toDataStreamResponse().body as ReadableStream
         break
@@ -242,7 +242,7 @@ export async function createResponseStream(
           maxTokens: 300,
           tools,
           maxRetries: 2,
-          maxToolRoundtrips: 1
+          maxToolRoundtrips: 2
         })
         responseStream = response.toDataStreamResponse().body as ReadableStream
         break
@@ -262,7 +262,7 @@ export async function createResponseStream(
           maxTokens: 1000,
           tools,
           maxRetries: 2,
-          maxToolRoundtrips: 1
+          maxToolRoundtrips: 2
         })
         responseStream = response.toDataStreamResponse().body as ReadableStream
         break

apps/masterbots.ai/app/api/og/edge-client.ts

@@ -0,0 +1,57 @@
+import { endpoints } from "mb-env"
+import { UUID } from '@/types/types'
+
+export async function getThreadForOG(threadId: UUID) {
+
+   const env = process.env.NEXT_PUBLIC_APP_ENV
+   if (!env || !['prod', 'test', 'local'].includes(env)) {
+     throw new Error('Invalid environment configuration')
+   }
+   const endpoint = endpoints[env as 'prod' | 'test' | 'local']
+   if (!endpoint) {
+     throw new Error('API endpoint not configured')
+   }
+
+    try {
+      const response = await fetch(endpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          query: `
+            query GetThread($threadId: uuid!) {
+              thread(where: {threadId: {_eq: $threadId}}) {
+                chatbot {
+                  name
+                  avatar
+                  categories {
+                    category {
+                      name
+                    }
+                  }
+                }
+                user {
+                  username
+                  profilePicture
+                }
+                messages {
+                  content
+                  role
+                }
+              }
+            }
+          `,
+          variables: { threadId }
+        })
+      })
+      const data = await response.json()
+      if (data.errors) {
+        throw new Error(data.errors[0].message)
+      }
+      return data.data
+    } catch (error: any) {
+      throw new Error('Unknown error occurred while fetching thread')
+    }
+  }
+