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.
hotfix: Patch onboarding (#11299)
Krzysztof Czerwinskif97e19f41803
diff --git a/autogpt_platform/backend/backend/data/onboarding.py b/autogpt_platform/backend/backend/data/onboarding.pyindex 6bfc9b494d..ecbb44bab0 100644--- a/autogpt_platform/backend/backend/data/onboarding.py+++ b/autogpt_platform/backend/backend/data/onboarding.py@@ -52,10 +52,36 @@ async def get_user_onboarding(user_id: str):)+async def reset_user_onboarding(user_id: str):+ return await UserOnboarding.prisma().upsert(+ where={"userId": user_id},+ data={+ "create": UserOnboardingCreateInput(userId=user_id),+ "update": {+ "completedSteps": [],+ "walletShown": False,+ "notified": [],+ "usageReason": None,+ "integrations": [],+ "otherIntegrations": None,+ "selectedStoreListingVersionId": None,+ "agentInput": prisma.Json({}),+ "onboardingAgentExecutionId": None,+ "agentRuns": 0,+ "lastRunAt": None,+ "consecutiveRunDays": 0,+ },+ },+ )++async def update_user_onboarding(user_id: str, data: UserOnboardingUpdate):update: UserOnboardingUpdateInput = {}+ onboarding = await get_user_onboarding(user_id)if data.completedSteps is not None:- update["completedSteps"] = list(set(data.completedSteps))+ update["completedSteps"] = list(+ set(data.completedSteps + onboarding.completedSteps)+ )for step in (OnboardingStep.AGENT_NEW_RUN,OnboardingStep.MARKETPLACE_VISIT,@@ -71,11 +97,11 @@ async def update_user_onboarding(user_id: str, data: UserOnboardingUpdate):OnboardingStep.RUN_AGENTS_100,):if step in data.completedSteps:- await reward_user(user_id, step)- if data.walletShown is not None:+ await reward_user(user_id, step, onboarding)+ if data.walletShown:update["walletShown"] = data.walletShownif data.notified is not None:- update["notified"] = list(set(data.notified))+ update["notified"] = list(set(data.notified + onboarding.notified))if data.usageReason is not None:update["usageReason"] = data.usageReasonif data.integrations is not None:@@ -88,7 +114,7 @@ async def update_user_onboarding(user_id: str, data: UserOnboardingUpdate):update["agentInput"] = SafeJson(data.agentInput)if data.onboardingAgentExecutionId is not None:update["onboardingAgentExecutionId"] = data.onboardingAgentExecutionId- if data.agentRuns is not None:+ if data.agentRuns is not None and data.agentRuns > onboarding.agentRuns:update["agentRuns"] = data.agentRunsif data.lastRunAt is not None:update["lastRunAt"] = data.lastRunAt@@ -104,7 +130,7 @@ async def update_user_onboarding(user_id: str, data: UserOnboardingUpdate):)-async def reward_user(user_id: str, step: OnboardingStep):+async def reward_user(user_id: str, step: OnboardingStep, onboarding: UserOnboarding):reward = 0match step:# Reward user when they clicked New Run during onboarding@@ -138,8 +164,6 @@ async def reward_user(user_id: str, step: OnboardingStep):if reward == 0:return- onboarding = await get_user_onboarding(user_id)-# Skip if already rewardedif step in onboarding.rewardedFor:returndiff --git a/autogpt_platform/backend/backend/server/routers/v1.py b/autogpt_platform/backend/backend/server/routers/v1.pyindex b4cdb0905b..6cf00cbb5f 100644--- a/autogpt_platform/backend/backend/server/routers/v1.py+++ b/autogpt_platform/backend/backend/server/routers/v1.py@@ -52,6 +52,7 @@ from backend.data.onboarding import (get_recommended_agents,get_user_onboarding,onboarding_enabled,+ reset_user_onboarding,update_user_onboarding,)from backend.data.user import (@@ -259,6 +260,16 @@ async def is_onboarding_enabled():return await onboarding_enabled()+@v1_router.post(+ "/onboarding/reset",+ summary="Reset onboarding progress",+ tags=["onboarding"],+ dependencies=[Security(requires_user)],+)+async def reset_onboarding(user_id: Annotated[str, Security(get_user_id)]):+ return await reset_user_onboarding(user_id)++############################################################################# Blocks ###################################################################################diff --git a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/reset/page.ts b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/reset/page.tsindex a35d9aec86..493ce44ed5 100644--- a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/reset/page.ts+++ b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/reset/page.ts@@ -1,18 +1,7 @@-import BackendAPI from "@/lib/autogpt-server-api";+import { postV1ResetOnboardingProgress } from "@/app/api/__generated__/endpoints/onboarding/onboarding";import { redirect } from "next/navigation";export default async function OnboardingResetPage() {- const api = new BackendAPI();- await api.updateUserOnboarding({- completedSteps: [],- walletShown: false,- notified: [],- usageReason: null,- integrations: [],- otherIntegrations: "",- selectedStoreListingVersionId: null,- agentInput: {},- onboardingAgentExecutionId: null,- });+ await postV1ResetOnboardingProgress();redirect("/onboarding/1-welcome");}diff --git a/autogpt_platform/frontend/src/app/api/openapi.json b/autogpt_platform/frontend/src/app/api/openapi.jsonindex 86de904112..3f9c487aeb 100644--- a/autogpt_platform/frontend/src/app/api/openapi.json+++ b/autogpt_platform/frontend/src/app/api/openapi.json@@ -906,6 +906,23 @@"security": [{ "HTTPBearerJWT": [] }]}},+ "/api/onboarding/reset": {+ "post": {+ "tags": ["v1", "onboarding"],+ "summary": "Reset onboarding progress",+ "operationId": "postV1Reset onboarding progress",+ "responses": {+ "200": {+ "description": "Successful Response",+ "content": { "application/json": { "schema": {} } }+ },+ "401": {+ "$ref": "#/components/responses/HTTP401NotAuthenticatedError"+ }+ },+ "security": [{ "HTTPBearerJWT": [] }]+ }+ },"/api/blocks": {"get": {"tags": ["v1", "blocks"],diff --git a/autogpt_platform/frontend/src/providers/onboarding/helpers.ts b/autogpt_platform/frontend/src/providers/onboarding/helpers.tsindex 8b8ce0469c..34d7e6f5d0 100644--- a/autogpt_platform/frontend/src/providers/onboarding/helpers.ts+++ b/autogpt_platform/frontend/src/providers/onboarding/helpers.ts@@ -52,10 +52,10 @@ export function getRunMilestoneSteps(): OnboardingStep[] {const steps: OnboardingStep[] = [];- if (newRunCount === 10) steps.push("RUN_AGENTS");- if (newRunCount === 100) steps.push("RUN_AGENTS_100");- if (consecutiveDays === 3) steps.push("RUN_3_DAYS");- if (consecutiveDays === 14) steps.push("RUN_14_DAYS");+ if (newRunCount >= 10) steps.push("RUN_AGENTS");+ if (newRunCount >= 100) steps.push("RUN_AGENTS_100");+ if (consecutiveDays >= 3) steps.push("RUN_3_DAYS");+ if (consecutiveDays >= 14) steps.push("RUN_14_DAYS");return steps;}diff --git a/autogpt_platform/frontend/src/providers/onboarding/onboarding-provider.tsx b/autogpt_platform/frontend/src/providers/onboarding/onboarding-provider.tsxindex b4504bb88c..bf40003f98 100644--- a/autogpt_platform/frontend/src/providers/onboarding/onboarding-provider.tsx+++ b/autogpt_platform/frontend/src/providers/onboarding/onboarding-provider.tsx@@ -188,7 +188,9 @@ export default function OnboardingProvider({updateState({agentRuns: newRunCount,- completedSteps: [...state.completedSteps, ...milestoneSteps],+ completedSteps: Array.from(+ new Set([...state.completedSteps, ...milestoneSteps]),+ ),...consecutiveData,});}, [state, updateState]);