front: add origin to UserMessageType [take 2] (#5763)

* Revert "Revert "front: add origin to UserMessageType (#5734)" (#5758)"

This reverts commit e8581a9.

* remove from internal api signature

* web

* fix

connectors/src/connectors/slack/bot.ts

@@ -403,6 +403,7 @@ async function botAnswerMessage(
         slackChatBotMessage.slackFullName || slackChatBotMessage.slackUserName,
       email: slackChatBotMessage.slackEmail,
       profilePictureUrl: slackChatBotMessage.slackAvatar || null,
+      origin: "slack" as const,
     },
   };
 

front/components/assistant/conversation/lib.ts

@@ -71,6 +71,7 @@ export function createPlaceholderUserMessage({
       profilePictureUrl: image,
       timezone: Intl.DateTimeFormat().resolvedOptions().timeZone ?? "UTC",
       username,
+      origin: "web",
     },
   };
 }

front/components/assistant_builder/AssistantBuilder.tsx

@@ -343,7 +343,7 @@ export default function AssistantBuilder({
           icon,
         })
       ),
-    [screen]
+    [screen, multiActionsEnabled]
   );
   const modalTitle = agentConfigurationId
     ? `Edit @${builderState.handle}`

front/lib/api/assistant/conversation.ts

@@ -727,6 +727,7 @@ export async function* postUserMessage(
                   userContextFullName: context.fullName,
                   userContextEmail: context.email,
                   userContextProfilePictureUrl: context.profilePictureUrl,
+                  userContextOrigin: context.origin,
                   userId: user ? user.id : null,
                 },
                 { transaction: t }
@@ -1189,6 +1190,7 @@ export async function* editUserMessage(
                   userContextEmail: userMessageRow.userContextEmail,
                   userContextProfilePictureUrl:
                     userMessageRow.userContextProfilePictureUrl,
+                  userContextOrigin: userMessageRow.userContextOrigin,
                   userId: userMessageRow.userId,
                 },
                 { transaction: t }

front/lib/api/assistant/messages.ts

@@ -109,6 +109,7 @@ export async function batchRenderUserMessages(
         fullName: userMessage.userContextFullName,
         email: userMessage.userContextEmail,
         profilePictureUrl: userMessage.userContextProfilePictureUrl,
+        origin: userMessage.userContextOrigin,
       },
     } satisfies UserMessageType;
     return { m, rank: message.rank, version: message.version };

front/lib/models/assistant/conversation.ts

@@ -3,6 +3,7 @@ import type {
   ConversationVisibility,
   MessageVisibility,
   ParticipantActionType,
+  UserMessageOrigin,
 } from "@dust-tt/types";
 import type {
   CreationOptional,
@@ -175,6 +176,7 @@ export class UserMessage extends Model<
   declare userContextFullName: string | null;
   declare userContextEmail: string | null;
   declare userContextProfilePictureUrl: string | null;
+  declare userContextOrigin: UserMessageOrigin | null;
 
   declare userId: ForeignKey<User["id"]> | null;
 }
@@ -220,6 +222,10 @@ UserMessage.init(
       type: DataTypes.STRING(2048),
       allowNull: true,
     },
+    userContextOrigin: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
   },
   {
     modelName: "user_message",

front/lib/workspace_usage.ts

@@ -51,13 +51,7 @@ export async function unsafeGetUsageData(
             WHEN COUNT(DISTINCT arc."id") + COUNT(DISTINCT atqc."id") + COUNT(DISTINCT adarc."id") > 1 THEN 'multiActions'
             ELSE NULL
         END AS "actionType",
-        CASE
-            WHEN um."id" IS NOT NULL THEN
-                CASE
-                    WHEN um."userId" IS NOT NULL THEN 'web'
-                    ELSE 'slack'
-                END
-        END AS "source"
+        um."userContextOrigin" AS "source"
     FROM
         "messages" m
     JOIN

front/migrations/20240620_backfill_user_message_origin.sql

@@ -0,0 +1,5 @@
+UPDATE user_messages SET "userContextOrigin" = 'slack' WHERE "userContextOrigin" IS NULL AND "userContextProfilePictureUrl" ILIKE '%slack%';
+UPDATE user_messages SET "userContextOrigin" = 'web' WHERE "userContextOrigin" IS NULL AND "userId" IS NOT NULL;
+UPDATE user_messages SET "userContextOrigin" = 'api' WHERE "userContextOrigin" IS NULL AND "userId" IS NULL;
+
+SELECT "userContextOrigin", COUNT(*) FROM user_messages GROUP BY "userContextOrigin";

front/migrations/db/migration_24.sql

@@ -0,0 +1,2 @@
+-- Migration created on Jun 20, 2024
+ALTER TABLE "public"."user_messages" ADD COLUMN "userContextOrigin" VARCHAR(255);

front/pages/api/v1/w/[wId]/assistant/conversations/[cId]/messages/index.ts

@@ -103,7 +103,10 @@ async function handler(
           conversation,
           content,
           mentions,
-          context,
+          context: {
+            ...context,
+            origin: context.origin ?? "api",
+          },
         },
         { resolveAfterFullGeneration: blocking === true }
       );

front/pages/api/v1/w/[wId]/assistant/conversations/index.ts

@@ -176,6 +176,7 @@ async function handler(
               fullName: message.context.fullName,
               email: message.context.email,
               profilePictureUrl: message.context.profilePictureUrl,
+              origin: message.context.origin ?? "api",
             },
           },
           { resolveAfterFullGeneration: blocking === true }

front/pages/api/w/[wId]/assistant/conversations/[cId]/messages/index.ts

@@ -156,6 +156,7 @@ async function handler(
             fullName: user.fullName,
             email: user.email,
             profilePictureUrl: context.profilePictureUrl ?? user.image,
+            origin: "web",
           },
         },
         { resolveAfterFullGeneration: false }

front/pages/api/w/[wId]/assistant/conversations/index.ts

@@ -149,10 +149,9 @@ async function handler(
       }
 
       if (message) {
-        /* If a message was provided we do await for the message to be created
-        before returning the conversation along with the message.
-        PostUserMessageWithPubSub returns swiftly since it only waits for the
-        initial message creation event (or error) */
+        // If a message was provided we do await for the message to be created before returning the
+        // conversation along with the message. PostUserMessageWithPubSub returns swiftly since it
+        // only waits for the initial message creation event (or error) */
         const messageRes = await postUserMessageWithPubSub(
           auth,
           {
@@ -165,6 +164,7 @@ async function handler(
               fullName: user.fullName,
               email: user.email,
               profilePictureUrl: message.context.profilePictureUrl,
+              origin: "web",
             },
           },
           { resolveAfterFullGeneration: false }

front/temporal/labs/activities.ts

@@ -257,6 +257,7 @@ export async function processTranscriptActivity(
         fullName: user.name,
         email: user.email,
         profilePictureUrl: user.imageUrl,
+        origin: null,
       },
     },
     contentFragment: {

types/src/front/api_handlers/public/assistant.ts

@@ -18,6 +18,13 @@ export const PublicPostMessagesRequestBodySchema = t.intersection([
       fullName: t.union([t.string, t.null]),
       email: t.union([t.string, t.null]),
       profilePictureUrl: t.union([t.string, t.null]),
+      origin: t.union([
+        t.literal("slack"),
+        t.literal("web"),
+        t.literal("api"),
+        t.null,
+        t.undefined,
+      ]),
     }),
   }),
   t.partial({

types/src/front/assistant/conversation.ts

@@ -52,12 +52,15 @@ export type MessageWithRankType = WithRank<MessageType>;
  * User messages
  */
 
+export type UserMessageOrigin = "slack" | "web" | "api";
+
 export type UserMessageContext = {
   username: string;
   timezone: string;
   fullName: string | null;
   email: string | null;
   profilePictureUrl: string | null;
+  origin: UserMessageOrigin | null;
 };
 
 export type UserMessageType = {