Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(platform): show avatar defaults before optional generation (#15008)

Ubbe2ad70a3df824
diff --git a/autogpt_platform/backend/backend/api/features/experts/avatar_generation.py b/autogpt_platform/backend/backend/api/features/experts/avatar_generation.py
index a46fa16c83..003f333206 100644
--- a/autogpt_platform/backend/backend/api/features/experts/avatar_generation.py
+++ b/autogpt_platform/backend/backend/api/features/experts/avatar_generation.py
@@ -96,7 +96,7 @@ async def generate_avatar(request: ExpertAvatarRequest) -> io.BytesIO:
image=reference_images(request.category),
prompt=avatar_prompt(request),
size="1024x1024",
- quality="high",
+ quality="medium",
background="opaque",
output_format="png",
n=1,
diff --git a/autogpt_platform/backend/backend/api/features/experts/avatar_generation_test.py b/autogpt_platform/backend/backend/api/features/experts/avatar_generation_test.py
index 2a6b3cf0d1..a13f5a8c66 100644
--- a/autogpt_platform/backend/backend/api/features/experts/avatar_generation_test.py
+++ b/autogpt_platform/backend/backend/api/features/experts/avatar_generation_test.py
@@ -180,7 +180,7 @@ async def test_provider_edit_round_trip_uses_managed_references_and_returns_vali
assert b'name="background"\r\n\r\nopaque' in request.content
assert b'name="output_format"\r\n\r\npng' in request.content
assert b'name="size"\r\n\r\n1024x1024' in request.content
- assert b'name="quality"\r\n\r\nhigh' in request.content
+ assert b'name="quality"\r\n\r\nmedium' in request.content
for peer in peers:
assert f"{peer}.png".encode() in request.content
assert (
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/avatar-picker.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/avatar-picker.test.tsx
index ceee392b97..ac384f4c95 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/avatar-picker.test.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/avatar-picker.test.tsx
@@ -1,5 +1,6 @@
import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";
import { getListCopilotSkillsMockHandler } from "@/app/api/__generated__/endpoints/skills/skills.msw";
+import { MANAGED_IDENTITIES } from "@/components/molecules/ExpertAvatar/helpers";
import { Toaster } from "@/components/molecules/Toast/toaster";
import { server } from "@/mocks/mock-server";
import {
@@ -152,12 +153,58 @@ test("the area beat answers the color first and asks for a job title", async ()
expect(requests).toHaveLength(0);
});
-test("the avatar is generated in the area picked at the start", async () => {
+test.each([
+ "marketing",
+ "sales",
+ "finance",
+ "support",
+ "operations",
+ "research",
+ "content",
+ "development",
+ "general",
+] as const)(
+ "%s starts with a ready-made avatar without generating",
+ async (category) => {
+ const requests: unknown[] = [];
+ server.use(...generationHandlers(requests));
+ seedAtAvatar(category);
+ renderRaise();
+ const confirm = await screen.findByRole("button", {
+ name: "Use this avatar",
+ });
+ expect((confirm as HTMLButtonElement).disabled).toBe(false);
+ expect(screen.queryByRole("status")).toBeNull();
+ const candidates = MANAGED_IDENTITIES.filter(
+ (identity) =>
+ identity.visual_category === category ||
+ identity.categories.includes(category),
+ );
+ const preview = screen
+ .getByRole("img", { name: "Maria, AI Expert" })
+ .getAttribute("src");
+ expect(candidates.some((identity) => preview?.includes(identity.id))).toBe(
+ true,
+ );
+ await userEvent.click(confirm);
+ await waitFor(() =>
+ expect(
+ candidates.some((identity) => identity.url === loadDraft().avatarUrl),
+ ).toBe(true),
+ );
+ expect(requests).toHaveLength(0);
+ },
+);
+
+test("regeneration uses the area picked at the start", async () => {
const requests: unknown[] = [];
server.use(...generationHandlers(requests));
seedAtAvatar("finance");
renderRaise();
+ await userEvent.click(
+ await screen.findByRole("button", { name: "Regenerate" }),
+ );
await waitFor(() => expect(requests).toHaveLength(1));
expect(requests[0]).toMatchObject({ category: "finance" });
});
@@ -166,6 +213,9 @@ test("the generated avatar is saved only after confirmation", async () => {
server.use(...generationHandlers());
seedAtAvatar("finance");
renderRaise();
+ await userEvent.click(
+ await screen.findByRole("button", { name: "Regenerate" }),
+ );
await waitFor(() =>
expect(
@@ -189,6 +239,9 @@ test("regenerating asks for another avatar in the same category", async () => {
seedAtAvatar("finance");
renderRaise();
+ await userEvent.click(
+ await screen.findByRole("button", { name: "Regenerate" }),
+ );
await waitFor(() => expect(requests).toHaveLength(1));
await userEvent.click(
await screen.findByRole("button", { name: "Regenerate" }),
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/AvatarStep/AvatarStep.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/AvatarStep/AvatarStep.tsx
index e8b81335f2..3413bf36af 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/AvatarStep/AvatarStep.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/AvatarStep/AvatarStep.tsx
@@ -41,12 +41,5 @@ export function AvatarStep({
);
}
- return (
- <ExpertAvatarPicker
- name={name}
- category={category}
- autoGenerate
- onPick={onPick}
- />
- );
+ return <ExpertAvatarPicker name={name} category={category} onPick={onPick} />;
}
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts
index de8f7e6fa8..b3ebb16ccb 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts
@@ -67,7 +67,7 @@ export const RAISE_PROMPTS = {
jobTitleQuestion: "And what's their job title?",
nameQuestion: "Good pick. What do you want to call them?",
avatarQuestion: (name: string) =>
- `I'm sculpting a face for ${name || "them"}. Regenerate until one feels right, or upload a picture.`,
+ `Here's an avatar for ${name || "your expert"}. Use it, generate another, or upload a picture.`,
aboutQuestion: (name: string) =>
`Anything else I should know about ${name || "your expert"}? How they should work, what matters to you — or skip it.`,
voiceQuestion: (name: string) =>
diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.stories.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.stories.tsx
index 6512b2b180..5f15262f93 100644
--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.stories.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.stories.tsx
@@ -1,6 +1,6 @@
import type { Meta, StoryObj } from "@storybook/nextjs";
import { delay, http, HttpResponse } from "msw";
-import { fn } from "storybook/test";
+import { fn, userEvent, within } from "storybook/test";
import {
DEFAULT_EXPERT_AVATAR_URL,
MANAGED_IDENTITIES,
@@ -43,8 +43,15 @@ const meta = {
export default meta;
type Story = StoryObj<typeof meta>;
-/** The raise flow: one avatar, sculpted the moment the beat opens. */
-export const Generating: Story = { args: { autoGenerate: true } };
+export const Default: Story = {};
+
+export const Generating: Story = {
+ play: async ({ canvasElement }) => {
+ await userEvent.click(
+ within(canvasElement).getByRole("button", { name: "Regenerate" }),
+ );
+ },
+};
/** The team page: the expert already has a face until it is regenerated. */
export const ExistingAvatar: Story = {
diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.test.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.test.tsx
index 01c485df16..e72a4a0b74 100644
--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.test.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.test.tsx
@@ -6,7 +6,7 @@ import { expect, test, vi } from "vitest";
import { StrictMode } from "react";
import { ExpertAvatarPicker } from "./ExpertAvatarPicker";
-import { DEFAULT_EXPERT_AVATAR_URL } from "../ExpertAvatar/helpers";
+import { defaultAvatarUrl } from "./helpers";
function completesAs(url: string, requests: unknown[] = []) {
return [
@@ -27,21 +27,15 @@ function completesAs(url: string, requests: unknown[] = []) {
];
}
-test("auto-generates on mount, showing the General artwork until it lands", async () => {
+test("generates only on request, keeping the default until it lands", async () => {
const onPick = vi.fn();
server.use(...completesAs("https://cdn.test/generated.png"));
- render(
- <ExpertAvatarPicker
- name="Nova"
- category="finance"
- autoGenerate
- onPick={onPick}
- />,
- );
- await screen.findByRole("status");
+ render(<ExpertAvatarPicker name="Nova" category="finance" onPick={onPick} />);
expect(
screen.getByRole("img", { name: "Nova, AI Expert" }).getAttribute("src"),
- ).toContain("expert-general-01");
+ ).toContain(defaultAvatarUrl("finance", "Nova").split("/")[3]);
+ expect(screen.queryByRole("status")).toBeNull();
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
await waitFor(() =>
expect(
@@ -55,20 +49,17 @@ test("auto-generates on mount, showing the General artwork until it lands", asyn
expect(onPick).toHaveBeenCalledWith("https://cdn.test/generated.png");
});
-test("StrictMode starts one automatic job and still allows regeneration", async () => {
+test("StrictMode does not generate until asked", async () => {
const requests: unknown[] = [];
server.use(...completesAs("https://cdn.test/generated.png", requests));
render(
<StrictMode>
- <ExpertAvatarPicker
- name="Nova"
- category="finance"
- autoGenerate
- onPick={vi.fn()}
- />
+ <ExpertAvatarPicker name="Nova" category="finance" onPick={vi.fn()} />
</StrictMode>,
);
+ expect(requests).toHaveLength(0);
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
await waitFor(() =>
expect(
screen.getByRole("img", { name: "Nova" }).getAttribute("src"),
@@ -105,7 +96,7 @@ test("regenerating rolls every trait but the category", async () => {
}
});
-test("a failed generation leaves the General artwork ready to keep", async () => {
+test("a failed generation leaves the category artwork ready to keep", async () => {
const onPick = vi.fn();
server.use(
http.post("*/api/experts/avatars/generations", () =>
@@ -119,21 +110,15 @@ test("a failed generation leaves the General artwork ready to keep", async () =>
}),
),
);
- render(
- <ExpertAvatarPicker
- name="Nova"
- category="finance"
- autoGenerate
- onPick={onPick}
- />,
- );
+ render(<ExpertAvatarPicker name="Nova" category="finance" onPick={onPick} />);
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
expect((await screen.findByRole("alert")).textContent).toContain(
"Could not generate avatar",
);
await userEvent.click(
screen.getByRole("button", { name: "Use this avatar" }),
);
- expect(onPick).toHaveBeenCalledWith(DEFAULT_EXPERT_AVATAR_URL);
+ expect(onPick).toHaveBeenCalledWith(defaultAvatarUrl("finance", "Nova"));
});
test("an existing avatar is kept until a generation replaces it", async () => {
@@ -207,7 +192,7 @@ test("rejects oversized uploads before making a request", async () => {
expect(upload).not.toHaveBeenCalled();
});
-test("a pending generation disables uploads and confirmation", async () => {
+test("a pending generation allows uploads and confirmation", async () => {
server.use(
http.post("*/api/experts/avatars/generations", () =>
HttpResponse.json(
@@ -220,24 +205,20 @@ test("a pending generation disables uploads and confirmation", async () => {
),
);
render(
- <ExpertAvatarPicker
- name="Nova"
- category="content"
- autoGenerate
- onPick={vi.fn()}
- />,
+ <ExpertAvatarPicker name="Nova" category="content" onPick={vi.fn()} />,
);
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
await screen.findByRole("status");
expect(
(screen.getByLabelText("Upload avatar") as HTMLInputElement).disabled,
- ).toBe(true);
+ ).toBe(false);
expect(
(
screen.getByRole("button", {
name: "Use this avatar",
}) as HTMLButtonElement
).disabled,
- ).toBe(true);
+ ).toBe(false);
});
test("offers one avatar with no catalog or trait controls", () => {
diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.tsx
index 09f368e4fb..5616aa9e7e 100644
--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/ExpertAvatarPicker.tsx
@@ -11,12 +11,11 @@ interface Props {
name: string;
category: ExpertAvatarRequestCategory;
avatarUrl?: string | null;
- autoGenerate?: boolean;
onPick: (url: string) => void;
}
export function ExpertAvatarPicker({ name, ...props }: Props) {
- const picker = useExpertAvatarPicker(props);
+ const picker = useExpertAvatarPicker({ name, ...props });
return (
<div className="flex w-full flex-col items-center gap-4 rounded-2xl border border-border bg-background p-5">
<ExpertAvatar
@@ -27,7 +26,8 @@ export function ExpertAvatarPicker({ name, ...props }: Props) {
/>
{picker.isGenerating && (
<p role="status" className="text-sm text-muted-foreground">
- Sculpting your avatar. This takes a couple of minutes.
+ Creating another avatar. You can keep this one or upload a picture
+ while you wait.
</p>
)}
{picker.error && (
@@ -38,7 +38,7 @@ export function ExpertAvatarPicker({ name, ...props }: Props) {
<input
ref={picker.fileInputRef}
type="file"
- disabled={picker.isBusy}
+ disabled={picker.isUploading}
accept={ACCEPTED_AVATAR_TYPES}
aria-label="Upload avatar"
className="sr-only"
@@ -54,7 +54,7 @@ export function ExpertAvatarPicker({ name, ...props }: Props) {
variant="ghost"
size="small"
onClick={picker.openFilePicker}
- disabled={picker.isBusy}
+ disabled={picker.isUploading}
>
Upload a picture
</Button>
@@ -68,7 +68,11 @@ export function ExpertAvatarPicker({ name, ...props }: Props) {
>
Regenerate
</Button>
- <Button size="small" onClick={picker.confirm} disabled={picker.isBusy}>
+ <Button
+ size="small"
+ onClick={picker.confirm}
+ disabled={picker.isUploading}
+ >
Use this avatar
</Button>
</div>
diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/generation.test.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/generation.test.tsx
index cb6dd22634..0b9d3eb6ae 100644
--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/generation.test.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/generation.test.tsx
@@ -1,5 +1,6 @@
import { server } from "@/mocks/mock-server";
import { render, screen, waitFor } from "@/tests/integrations/test-utils";
+import userEvent from "@testing-library/user-event";
import { http, HttpResponse } from "msw";
import { expect, test, vi } from "vitest";
import { ExpertAvatarPicker } from "./ExpertAvatarPicker";
@@ -36,11 +37,11 @@ test(
<ExpertAvatarPicker
name="Nova"
category="development"
- autoGenerate
onPick={vi.fn()}
/>,
);
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
await waitFor(() => expect(polls).toBe(1));
expect(screen.queryByRole("status")).not.toBeNull();
await waitFor(
@@ -69,14 +70,10 @@ test("offers regeneration when polling fails", async () => {
),
);
render(
- <ExpertAvatarPicker
- name="Nova"
- category="development"
- autoGenerate
- onPick={vi.fn()}
- />,
+ <ExpertAvatarPicker name="Nova" category="development" onPick={vi.fn()} />,
);
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
expect((await screen.findByRole("alert")).textContent).toBe(
"Could not check generation. Try again or regenerate.",
);
diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.ts b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.ts
index b07ae826d4..56795784f8 100644
--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.ts
+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/helpers.ts
@@ -5,10 +5,33 @@ import { ExpertAvatarRequestExpression } from "@/app/api/__generated__/models/ex
import { ExpertAvatarRequestInlay } from "@/app/api/__generated__/models/expertAvatarRequestInlay";
import { ExpertAvatarRequestShape } from "@/app/api/__generated__/models/expertAvatarRequestShape";
import { ExpertAvatarRequestTilt } from "@/app/api/__generated__/models/expertAvatarRequestTilt";
+import {
+ DEFAULT_EXPERT_AVATAR_URL,
+ MANAGED_IDENTITIES,
+} from "../ExpertAvatar/helpers";
export const ACCEPTED_AVATAR_TYPES = "image/png,image/jpeg,image/webp";
export const MAX_AVATAR_BYTES = 5 * 1024 * 1024;
+export function defaultAvatarUrl(
+ category: ExpertAvatarRequestCategory,
+ name: string,
+) {
+ const family = MANAGED_IDENTITIES.filter(
+ (identity) => identity.visual_category === category,
+ );
+ const candidates = family.length
+ ? family
+ : MANAGED_IDENTITIES.filter((identity) =>
+ identity.categories.includes(category),
+ );
+ let hash = 0;
+ for (const character of name.trim().toLowerCase()) {
+ hash = (hash * 31 + character.charCodeAt(0)) >>> 0;
+ }
+ return candidates[hash % candidates.length]?.url ?? DEFAULT_EXPERT_AVATAR_URL;
+}
+
/** Everything except the category is left to chance, so regenerating shuffles
* the figure while the hue stays the one the category answered for. */
export function randomAvatarRequest(
diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/selection.test.tsx b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/selection.test.tsx
new file mode 100644
index 0000000000..7d23766ab3
--- /dev/null
+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/selection.test.tsx
@@ -0,0 +1,130 @@
+import { server } from "@/mocks/mock-server";
+import { act, render, screen, waitFor } from "@/tests/integrations/test-utils";
+import userEvent from "@testing-library/user-event";
+import { http, HttpResponse } from "msw";
+import { expect, test, vi } from "vitest";
+import { ExpertAvatarPicker } from "./ExpertAvatarPicker";
+import { defaultAvatarUrl } from "./helpers";
+
+function pendingGeneration() {
+ return [
+ http.post("*/api/experts/avatars/generations", () =>
+ HttpResponse.json({ id: "pending", status: "pending" }, { status: 202 }),
+ ),
+ http.get("*/api/experts/avatars/generations/pending", () =>
+ HttpResponse.json({ id: "pending", status: "pending" }),
+ ),
+ ];
+}
+
+test("can keep the default while generation is pending", async () => {
+ const onPick = vi.fn();
+ server.use(...pendingGeneration());
+ render(<ExpertAvatarPicker name="Nova" category="finance" onPick={onPick} />);
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
+ await screen.findByRole("status");
+ await userEvent.click(
+ screen.getByRole("button", { name: "Use this avatar" }),
+ );
+ expect(onPick).toHaveBeenCalledWith(defaultAvatarUrl("finance", "Nova"));
+ expect(screen.queryByRole("status")).toBeNull();
+});
+
+test("keeps an uploaded preview through a failed regeneration", async () => {
+ const onPick = vi.fn();
+ server.use(
+ http.post("*/api/store/submissions/media", () =>
+ HttpResponse.json("https://cdn.test/upload.png"),
+ ),
+ http.post("*/api/experts/avatars/generations", () =>
+ HttpResponse.json({ detail: "Try again later" }, { status: 429 }),
+ ),
+ );
+ render(<ExpertAvatarPicker name="Nova" category="finance" onPick={onPick} />);
+ await userEvent.upload(
+ screen.getByLabelText("Upload avatar"),
+ new File(["png"], "avatar.png", { type: "image/png" }),
+ );
+ await waitFor(() =>
+ expect(
+ screen.getByRole("img", { name: "Nova" }).getAttribute("src"),
+ ).toContain("upload.png"),
+ );
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
+ await screen.findByRole("alert");
+ await userEvent.click(
+ screen.getByRole("button", { name: "Use this avatar" }),
+ );
+ expect(onPick).toHaveBeenCalledWith("https://cdn.test/upload.png");
+});
+
+test("a late generation response cannot replace an upload", async () => {
+ const onPick = vi.fn();
+ const poll = vi.fn();
+ let release = () => {};
+ const pending = new Promise<void>((resolve) => {
+ release = resolve;
+ });
+ let respond = () => {};
+ const responded = new Promise<void>((resolve) => {
+ respond = resolve;
+ });
+ server.use(
+ http.post("*/api/experts/avatars/generations", async () => {
+ await pending;
+ return HttpResponse.json(
+ { id: "late", status: "pending" },
+ { status: 202 },
+ );
+ }),
+ http.get("*/api/experts/avatars/generations/late", () => {
+ poll();
+ return HttpResponse.json({
+ id: "late",
+ status: "complete",
+ avatar_url: "https://cdn.test/late.png",
+ });
+ }),
+ http.post("*/api/store/submissions/media", () =>
+ HttpResponse.json("https://cdn.test/upload.png"),
+ ),
+ );
+ function onResponse({ request }: { request: Request }) {
+ if (request.url.endsWith("/avatars/generations")) respond();
+ }
+ server.events.on("response:mocked", onResponse);
+ try {
+ render(
+ <ExpertAvatarPicker name="Nova" category="finance" onPick={onPick} />,
+ );
+ await userEvent.click(screen.getByRole("button", { name: "Regenerate" }));
+ await screen.findByRole("status");
+ await userEvent.upload(
+ screen.getByLabelText("Upload avatar"),
+ new File(["png"], "avatar.png", { type: "image/png" }),
+ );
+ await waitFor(() =>
+ expect(
+ screen.getByRole("img", { name: "Nova" }).getAttribute("src"),
+ ).toContain("upload.png"),
+ );
+ await act(async () => {
+ release();
+ await responded;
+ });
+ await userEvent.click(
+ screen.getByRole("button", { name: "Use this avatar" }),
+ );
+ expect(onPick).toHaveBeenCalledWith("https://cdn.test/upload.png");
+ expect(screen.queryByRole("status")).toBeNull();
+ expect(poll).not.toHaveBeenCalled();
+ } finally {
+ release();
+ server.events.removeListener("response:mocked", onResponse);
+ }
+});
+
+vi.mock("@/lib/auth/actions", async (importOriginal) => ({
+ ...(await importOriginal<typeof import("@/lib/auth/actions")>()),
+ getWebSocketToken: async () => ({ token: "test-token" }),
+}));
diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useAvatarGeneration.ts b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useAvatarGeneration.ts
index 1f29083243..9f45f98fe1 100644
--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useAvatarGeneration.ts
+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useAvatarGeneration.ts
@@ -3,10 +3,11 @@ import {
useGetExpertAvatarGeneration,
} from "@/app/api/__generated__/endpoints/experts/experts";
import type { ExpertAvatarRequest } from "@/app/api/__generated__/models/expertAvatarRequest";
-import { useState } from "react";
+import { useRef, useState } from "react";
export function useAvatarGeneration() {
const [jobID, setJobID] = useState("");
+ const requestVersion = useRef(0);
const mutation = useGenerateExpertAvatar<Error>({
mutation: { retry: false },
});
@@ -35,12 +36,17 @@ export function useAvatarGeneration() {
: job?.error);
function generate(request: ExpertAvatarRequest) {
+ const version = ++requestVersion.current;
setJobID("");
mutation.mutate(
{ data: request },
{
onSuccess: (response) => {
- if (response.status === 202 && response.data.id)
+ if (
+ version === requestVersion.current &&
+ response.status === 202 &&
+ response.data.id
+ )
setJobID(response.data.id);
},
},
@@ -48,6 +54,7 @@ export function useAvatarGeneration() {
}
function reset() {
+ requestVersion.current += 1;
setJobID("");
mutation.reset();
}
diff --git a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useExpertAvatarPicker.ts b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useExpertAvatarPicker.ts
index ee5132b7b5..749107ca65 100644
--- a/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useExpertAvatarPicker.ts
+++ b/autogpt_platform/frontend/src/components/molecules/ExpertAvatarPicker/useExpertAvatarPicker.ts
@@ -1,5 +1,4 @@
import type { ExpertAvatarRequestCategory } from "@/app/api/__generated__/models/expertAvatarRequestCategory";
-import { useMountEffect } from "@/hooks/useMountEffect";
import { uploadSubmissionMediaDirect } from "@/lib/direct-upload";
import { useMutation } from "@tanstack/react-query";
import { useRef, useState } from "react";
@@ -7,24 +6,25 @@ import { resolveExpertAvatarUrl } from "../ExpertAvatar/helpers";
import {
ACCEPTED_AVATAR_TYPES,
MAX_AVATAR_BYTES,
+ defaultAvatarUrl,
randomAvatarRequest,
} from "./helpers";
import { useAvatarGeneration } from "./useAvatarGeneration";
interface Args {
+ name: string;
category: ExpertAvatarRequestCategory;
avatarUrl?: string | null;
- autoGenerate?: boolean;
onPick: (url: string) => void;
}
export function useExpertAvatarPicker({
+ name,
category,
avatarUrl,
- autoGenerate,
onPick,
}: Args) {
- const [uploadedUrl, setUploadedUrl] = useState<string | null>(null);
+ const [previewUrl, setPreviewUrl] = useState<string | null>(null);
const [uploadError, setUploadError] = useState<string | null>(null);
const fileInputRef = useRef<HTMLInputElement>(null);
const generation = useAvatarGeneration();
@@ -33,22 +33,17 @@ export function useExpertAvatarPicker({
uploadSubmissionMediaDirect(file, "expert-avatar"),
});
- // Generating resets the upload and uploading resets the generation, so the
- // two never both hold a result and the preview needs no synchronising.
const generatedUrl =
generation.job?.status === "complete" ? generation.job.avatar_url : null;
const selectedUrl =
- generatedUrl ?? uploadedUrl ?? resolveExpertAvatarUrl(avatarUrl);
-
- useMountEffect(() => {
- if (!autoGenerate) return;
- // Let StrictMode finish its cleanup before attaching a mutation observer.
- const timeout = setTimeout(generate, 0);
- return () => clearTimeout(timeout);
- });
+ generatedUrl ??
+ previewUrl ??
+ (avatarUrl
+ ? resolveExpertAvatarUrl(avatarUrl)
+ : defaultAvatarUrl(category, name));
function generate() {
- setUploadedUrl(null);
+ setPreviewUrl(selectedUrl);
setUploadError(null);
generation.generate(randomAvatarRequest(category));
}
@@ -63,18 +58,21 @@ export function useExpertAvatarPicker({
return;
}
setUploadError(null);
+ setPreviewUrl(selectedUrl);
+ generation.reset();
try {
const response = await upload.mutateAsync(file);
if (typeof response !== "string" || !response.trim())
throw new Error("No image URL");
- generation.reset();
- setUploadedUrl(response.trim());
+ setPreviewUrl(response.trim());
} catch {
setUploadError("Could not upload that picture. Try again or regenerate.");
}
}
function confirm() {
+ setPreviewUrl(selectedUrl);
+ generation.reset();
onPick(selectedUrl);
}
@@ -90,6 +88,7 @@ export function useExpertAvatarPicker({
fileInputRef,
uploadFile,
isBusy: generation.isGenerating || upload.isPending,
+ isUploading: upload.isPending,
isGenerating: generation.isGenerating,
error: uploadError ?? generation.error,
};