Merge branch 'main' into Sparkle27

front/components/assistant/conversation/DustAppRunAction.tsx

@@ -64,9 +64,16 @@ export default function DustAppRunAction({
         <div className="grid-cols-auto grid items-center">
           {!dustAppRunAction.output ? (
             <div>
-              <div className="pb-2 text-xs font-bold text-element-600">
-                Executing {dustAppRunAction.appName}...
-              </div>
+              {dustAppRunAction.runningBlock ? (
+                <div className="pb-2 text-xs font-bold text-element-600">
+                  Executing app {dustAppRunAction.appName}: running block{" "}
+                  {dustAppRunAction.runningBlock.name}...
+                </div>
+              ) : (
+                <div className="pb-2 text-xs font-bold text-element-600">
+                  Executing app {dustAppRunAction.appName}...
+                </div>
+              )}
               <Spinner size="sm" />
             </div>
           ) : (

front/lib/api/assistant/actions/dust_app_run.ts

@@ -400,14 +400,17 @@ export async function* runDustApp(
     useLocalInDev: true,
   });
 
+  // As we run the app (using a system API key here), we do force using the workspace credentials so
+  // that the app executes in the exact same conditions in which they were developed.
   const runRes = await api.runAppStreamed(
     {
       workspaceId: c.appWorkspaceId,
       appId: c.appId,
       appHash: "latest",
     },
     appConfig,
-    [params]
+    [params],
+    { useWorkspaceCredentials: true }
   );
 
   if (runRes.isErr()) {

front/lib/models/user.ts

@@ -21,6 +21,8 @@ export class User extends Model<
   declare username: string;
   declare email: string;
   declare name: string;
+  declare firstName: string | null;
+  declare lastName: string | null;
 
   declare isDustSuperUser: CreationOptional<boolean>;
 }
@@ -61,6 +63,14 @@ User.init(
       type: DataTypes.STRING,
       allowNull: false,
     },
+    firstName: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
+    lastName: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
     isDustSuperUser: {
       type: DataTypes.BOOLEAN,
       defaultValue: false,

front/lib/user.ts

@@ -58,3 +58,18 @@ export function setUserMetadataFromClient(metadata: UserMetadataType) {
     }
   })();
 }
+
+export const guessFirstandLastNameFromFullName = (
+  fullName: string
+): { firstName: string | null; lastName: string | null } => {
+  if (!fullName) return { firstName: null, lastName: null };
+
+  const nameParts = fullName.split(" ");
+
+  if (nameParts.length === 1) return { firstName: fullName, lastName: null };
+
+  const firstName = nameParts.shift() || null;
+  const lastName = nameParts.join(" ");
+
+  return { firstName, lastName };
+};

front/pages/api/login.ts

@@ -11,6 +11,7 @@ import {
   User,
   Workspace,
 } from "@app/lib/models";
+import { guessFirstandLastNameFromFullName } from "@app/lib/user";
 import { generateModelSId } from "@app/lib/utils";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
@@ -129,18 +130,33 @@ async function handler(
         user.username = session.user.username;
         user.email = session.user.email;
         user.name = session.user.name;
+
+        if (!user.firstName && !user.lastName) {
+          const { firstName, lastName } = guessFirstandLastNameFromFullName(
+            session.user.name
+          );
+          user.firstName = firstName;
+          user.lastName = lastName;
+        }
+
         await user.save();
       }
 
       // The user does not exist. We create it and create a personal workspace if there is no invite
       // associated with the login request.
       if (!user) {
+        const { firstName, lastName } = guessFirstandLastNameFromFullName(
+          session.user.name
+        );
+
         user = await User.create({
           provider: session.provider.provider,
           providerId: session.provider.id.toString(),
           username: session.user.username,
           email: session.user.email,
           name: session.user.name,
+          firstName,
+          lastName,
         });
 
         // If there is no invte, we create a personal workspace for the user, otherwise the user

front/pages/api/v1/w/[wId]/apps/[aId]/runs/index.ts

@@ -120,7 +120,7 @@ async function handler(
 
   // This variable is used in the context of the DustAppRun action to use the workspace credentials
   // instead of our managed credentials when running an app with a system API key.
-  const useWorkspaceCredentials = !!req.query.useWorkspaceCredentials;
+  const useWorkspaceCredentials = !!req.query["use_workspace_credentials"];
 
   switch (req.method) {
     case "POST":