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.
feat(platform): Add LaunchDarkly flag for platform payment system (#11181)
Zamil Majdy374f35874c11
diff --git a/autogpt_platform/backend/backend/data/credit.py b/autogpt_platform/backend/backend/data/credit.pyindex b118e5d853..65c942b932 100644--- a/autogpt_platform/backend/backend/data/credit.py+++ b/autogpt_platform/backend/backend/data/credit.py@@ -36,6 +36,7 @@ from backend.data.user import get_user_by_id, get_user_email_by_idfrom backend.notifications.notifications import queue_notification_asyncfrom backend.server.v2.admin.model import UserHistoryResponsefrom backend.util.exceptions import InsufficientBalanceError+from backend.util.feature_flag import Flag, is_feature_enabledfrom backend.util.json import SafeJsonfrom backend.util.models import Paginationfrom backend.util.retry import func_retry@@ -993,14 +994,31 @@ class DisabledUserCredit(UserCreditBase):pass-def get_user_credit_model() -> UserCreditBase:+async def get_user_credit_model(user_id: str) -> UserCreditBase:+ """+ Get the credit model for a user, considering LaunchDarkly flags.++ Args:+ user_id (str): The user ID to check flags for.++ Returns:+ UserCreditBase: The appropriate credit model for the user+ """if not settings.config.enable_credit:return DisabledUserCredit()- if settings.config.enable_beta_monthly_credit:- return BetaUserCredit(settings.config.num_user_credits_refill)+ # Check LaunchDarkly flag for payment pilot users+ # Default to False (beta monthly credit behavior) to maintain current behavior+ is_payment_enabled = await is_feature_enabled(+ Flag.ENABLE_PLATFORM_PAYMENT, user_id, default=False+ )- return UserCredit()+ if is_payment_enabled:+ # Payment enabled users get UserCredit (no monthly refills, enable payments)+ return UserCredit()+ else:+ # Default behavior: users get beta monthly credits+ return BetaUserCredit(settings.config.num_user_credits_refill)def get_block_costs() -> dict[str, list["BlockCost"]]:@@ -1090,7 +1108,8 @@ async def admin_get_user_history()reason = metadata.get("reason", "No reason provided")- balance, last_update = await get_user_credit_model()._get_credits(tx.userId)+ user_credit_model = await get_user_credit_model(tx.userId)+ balance, _ = await user_credit_model._get_credits(tx.userId)history.append(UserTransaction(diff --git a/autogpt_platform/backend/backend/data/onboarding.py b/autogpt_platform/backend/backend/data/onboarding.pyindex 2c7c8a5fdd..799b88d03a 100644--- a/autogpt_platform/backend/backend/data/onboarding.py+++ b/autogpt_platform/backend/backend/data/onboarding.py@@ -26,8 +26,6 @@ REASON_MAPPING: dict[str, list[str]] = {POINTS_AGENT_COUNT = 50 # Number of agents to calculate points forMIN_AGENT_COUNT = 2 # Minimum number of marketplace agents to enable onboarding-user_credit = get_user_credit_model()-class UserOnboardingUpdate(pydantic.BaseModel):completedSteps: Optional[list[OnboardingStep]] = None@@ -147,7 +145,8 @@ async def reward_user(user_id: str, step: OnboardingStep):returnonboarding.rewardedFor.append(step)- await user_credit.onboarding_reward(user_id, reward, step)+ user_credit_model = await get_user_credit_model(user_id)+ await user_credit_model.onboarding_reward(user_id, reward, step)await UserOnboarding.prisma().update(where={"userId": user_id},data={diff --git a/autogpt_platform/backend/backend/executor/database.py b/autogpt_platform/backend/backend/executor/database.pyindex 41ac32c051..8f15f73774 100644--- a/autogpt_platform/backend/backend/executor/database.py+++ b/autogpt_platform/backend/backend/executor/database.py@@ -57,7 +57,6 @@ from backend.util.service import (from backend.util.settings import Configconfig = Config()-_user_credit_model = get_user_credit_model()logger = logging.getLogger(__name__)P = ParamSpec("P")R = TypeVar("R")@@ -66,11 +65,13 @@ R = TypeVar("R")async def _spend_credits(user_id: str, cost: int, metadata: UsageTransactionMetadata) -> int:- return await _user_credit_model.spend_credits(user_id, cost, metadata)+ user_credit_model = await get_user_credit_model(user_id)+ return await user_credit_model.spend_credits(user_id, cost, metadata)async def _get_credits(user_id: str) -> int:- return await _user_credit_model.get_credits(user_id)+ user_credit_model = await get_user_credit_model(user_id)+ return await user_credit_model.get_credits(user_id)class DatabaseManager(AppService):diff --git a/autogpt_platform/backend/backend/server/routers/v1.py b/autogpt_platform/backend/backend/server/routers/v1.pyindex 82463a78c9..39c7d9a5e4 100644--- a/autogpt_platform/backend/backend/server/routers/v1.py+++ b/autogpt_platform/backend/backend/server/routers/v1.py@@ -40,6 +40,7 @@ from backend.data.credit import (AutoTopUpConfig,RefundRequest,TransactionHistory,+ UserCredit,get_auto_top_up,get_user_credit_model,set_auto_top_up,@@ -107,9 +108,6 @@ def _create_file_size_error(size_bytes: int, max_size_mb: int) -> HTTPException:settings = Settings()logger = logging.getLogger(__name__)--_user_credit_model = get_user_credit_model()-# Define the API routesv1_router = APIRouter()@@ -478,7 +476,8 @@ async def upload_file(async def get_user_credits(user_id: Annotated[str, Security(get_user_id)],) -> dict[str, int]:- return {"credits": await _user_credit_model.get_credits(user_id)}+ user_credit_model = await get_user_credit_model(user_id)+ return {"credits": await user_credit_model.get_credits(user_id)}@v1_router.post(@@ -490,9 +489,8 @@ async def get_user_credits(async def request_top_up(request: RequestTopUp, user_id: Annotated[str, Security(get_user_id)]):- checkout_url = await _user_credit_model.top_up_intent(- user_id, request.credit_amount- )+ user_credit_model = await get_user_credit_model(user_id)+ checkout_url = await user_credit_model.top_up_intent(user_id, request.credit_amount)return {"checkout_url": checkout_url}@@ -507,7 +505,8 @@ async def refund_top_up(transaction_key: str,metadata: dict[str, str],) -> int:- return await _user_credit_model.top_up_refund(user_id, transaction_key, metadata)+ user_credit_model = await get_user_credit_model(user_id)+ return await user_credit_model.top_up_refund(user_id, transaction_key, metadata)@v1_router.patch(@@ -517,7 +516,8 @@ async def refund_top_up(dependencies=[Security(requires_user)],)async def fulfill_checkout(user_id: Annotated[str, Security(get_user_id)]):- await _user_credit_model.fulfill_checkout(user_id=user_id)+ user_credit_model = await get_user_credit_model(user_id)+ await user_credit_model.fulfill_checkout(user_id=user_id)return Response(status_code=200)@@ -537,12 +537,13 @@ async def configure_user_auto_top_up(if request.amount < request.threshold:raise ValueError("Amount must be greater than or equal to threshold")- current_balance = await _user_credit_model.get_credits(user_id)+ user_credit_model = await get_user_credit_model(user_id)+ current_balance = await user_credit_model.get_credits(user_id)if current_balance < request.threshold:- await _user_credit_model.top_up_credits(user_id, request.amount)+ await user_credit_model.top_up_credits(user_id, request.amount)else:- await _user_credit_model.top_up_credits(user_id, 0)+ await user_credit_model.top_up_credits(user_id, 0)await set_auto_top_up(user_id, AutoTopUpConfig(threshold=request.threshold, amount=request.amount)@@ -590,15 +591,13 @@ async def stripe_webhook(request: Request):event["type"] == "checkout.session.completed"or event["type"] == "checkout.session.async_payment_succeeded"):- await _user_credit_model.fulfill_checkout(- session_id=event["data"]["object"]["id"]- )+ await UserCredit().fulfill_checkout(session_id=event["data"]["object"]["id"])if event["type"] == "charge.dispute.created":- await _user_credit_model.handle_dispute(event["data"]["object"])+ await UserCredit().handle_dispute(event["data"]["object"])if event["type"] == "refund.created" or event["type"] == "charge.dispute.closed":- await _user_credit_model.deduct_credits(event["data"]["object"])+ await UserCredit().deduct_credits(event["data"]["object"])return Response(status_code=200)@@ -612,7 +611,8 @@ async def stripe_webhook(request: Request):async def manage_payment_method(user_id: Annotated[str, Security(get_user_id)],) -> dict[str, str]:- return {"url": await _user_credit_model.create_billing_portal_session(user_id)}+ user_credit_model = await get_user_credit_model(user_id)+ return {"url": await user_credit_model.create_billing_portal_session(user_id)}@v1_router.get(@@ -630,7 +630,8 @@ async def get_credit_history(if transaction_count_limit < 1 or transaction_count_limit > 1000:raise ValueError("Transaction count limit must be between 1 and 1000")- return await _user_credit_model.get_transaction_history(+ user_credit_model = await get_user_credit_model(user_id)+ return await user_credit_model.get_transaction_history(user_id=user_id,transaction_time_ceiling=transaction_time,transaction_count_limit=transaction_count_limit,@@ -647,7 +648,8 @@ async def get_credit_history(async def get_refund_requests(user_id: Annotated[str, Security(get_user_id)],) -> list[RefundRequest]:- return await _user_credit_model.get_refund_requests(user_id)+ user_credit_model = await get_user_credit_model(user_id)+ return await user_credit_model.get_refund_requests(user_id)########################################################@@ -869,7 +871,8 @@ async def execute_graph(graph_version: Optional[int] = None,preset_id: Optional[str] = None,) -> execution_db.GraphExecutionMeta:- current_balance = await _user_credit_model.get_credits(user_id)+ user_credit_model = await get_user_credit_model(user_id)+ current_balance = await user_credit_model.get_credits(user_id)if current_balance <= 0:raise HTTPException(status_code=402,diff --git a/autogpt_platform/backend/backend/server/routers/v1_test.py b/autogpt_platform/backend/backend/server/routers/v1_test.pyindex 42e76683a0..f082bd2e5a 100644--- a/autogpt_platform/backend/backend/server/routers/v1_test.py+++ b/autogpt_platform/backend/backend/server/routers/v1_test.py@@ -194,8 +194,12 @@ def test_get_user_credits(snapshot: Snapshot,) -> None:"""Test get user credits endpoint"""- mock_credit_model = mocker.patch("backend.server.routers.v1._user_credit_model")+ mock_credit_model = Mock()mock_credit_model.get_credits = AsyncMock(return_value=1000)+ mocker.patch(+ "backend.server.routers.v1.get_user_credit_model",+ return_value=mock_credit_model,+ )response = client.get("/credits")@@ -215,10 +219,14 @@ def test_request_top_up(snapshot: Snapshot,) -> None:"""Test request top up endpoint"""- mock_credit_model = mocker.patch("backend.server.routers.v1._user_credit_model")+ mock_credit_model = Mock()mock_credit_model.top_up_intent = AsyncMock(return_value="https://checkout.example.com/session123")+ mocker.patch(+ "backend.server.routers.v1.get_user_credit_model",+ return_value=mock_credit_model,+ )request_data = {"credit_amount": 500}diff --git a/autogpt_platform/backend/backend/server/v2/admin/credit_admin_routes.py b/autogpt_platform/backend/backend/server/v2/admin/credit_admin_routes.pyindex f553a95a0c..e4ea2c7f32 100644--- a/autogpt_platform/backend/backend/server/v2/admin/credit_admin_routes.py+++ b/autogpt_platform/backend/backend/server/v2/admin/credit_admin_routes.py@@ -11,8 +11,6 @@ from backend.util.json import SafeJsonlogger = logging.getLogger(__name__)-_user_credit_model = get_user_credit_model()-router = APIRouter(prefix="/admin",@@ -33,7 +31,8 @@ async def add_user_credits(logger.info(f"Admin user {admin_user_id} is adding {amount} credits to user {user_id}")- new_balance, transaction_key = await _user_credit_model._add_transaction(+ user_credit_model = await get_user_credit_model(user_id)+ new_balance, transaction_key = await user_credit_model._add_transaction(user_id,amount,transaction_type=CreditTransactionType.GRANT,diff --git a/autogpt_platform/backend/backend/server/v2/admin/credit_admin_routes_test.py b/autogpt_platform/backend/backend/server/v2/admin/credit_admin_routes_test.pyindex ba0e98f81b..7ef9c7f16c 100644--- a/autogpt_platform/backend/backend/server/v2/admin/credit_admin_routes_test.py+++ b/autogpt_platform/backend/backend/server/v2/admin/credit_admin_routes_test.py@@ -1,5 +1,5 @@import json-from unittest.mock import AsyncMock+from unittest.mock import AsyncMock, Mockimport fastapiimport fastapi.testclient@@ -37,12 +37,14 @@ def test_add_user_credits_success() -> None:"""Test successful credit addition by admin"""# Mock the credit model- mock_credit_model = mocker.patch(- "backend.server.v2.admin.credit_admin_routes._user_credit_model"- )+ mock_credit_model = Mock()mock_credit_model._add_transaction = AsyncMock(return_value=(1500, "transaction-123-uuid"))+ mocker.patch(+ "backend.server.v2.admin.credit_admin_routes.get_user_credit_model",+ return_value=mock_credit_model,+ )request_data = {"user_id": target_user_id,@@ -81,12 +83,14 @@ def test_add_user_credits_negative_amount() -> None:"""Test credit deduction by admin (negative amount)"""# Mock the credit model- mock_credit_model = mocker.patch(- "backend.server.v2.admin.credit_admin_routes._user_credit_model"- )+ mock_credit_model = Mock()mock_credit_model._add_transaction = AsyncMock(return_value=(200, "transaction-456-uuid"))+ mocker.patch(+ "backend.server.v2.admin.credit_admin_routes.get_user_credit_model",+ return_value=mock_credit_model,+ )request_data = {"user_id": "target-user-id",diff --git a/autogpt_platform/backend/backend/util/feature_flag.py b/autogpt_platform/backend/backend/util/feature_flag.pyindex 6a0af88b1d..34b73ddbf8 100644--- a/autogpt_platform/backend/backend/util/feature_flag.py+++ b/autogpt_platform/backend/backend/util/feature_flag.py@@ -35,6 +35,7 @@ class Flag(str, Enum):AI_ACTIVITY_STATUS = "ai-agent-execution-summary"BETA_BLOCKS = "beta-blocks"AGENT_ACTIVITY = "agent-activity"+ ENABLE_PLATFORM_PAYMENT = "enable-platform-payment"def is_configured() -> bool:diff --git a/autogpt_platform/backend/test/e2e_test_data.py b/autogpt_platform/backend/test/e2e_test_data.pyindex 0a6cceb567..fc6119c4cc 100644--- a/autogpt_platform/backend/test/e2e_test_data.py+++ b/autogpt_platform/backend/test/e2e_test_data.py@@ -749,10 +749,11 @@ class TestDataCreator:"""Add credits to users."""print("Adding credits to users...")- credit_model = get_user_credit_model()-for user in self.users:try:+ # Get user-specific credit model+ credit_model = await get_user_credit_model(user["id"])+# Skip credits for disabled credit model to avoid errorsif (hasattr(credit_model, "__class__")diff --git a/autogpt_platform/frontend/.env.default b/autogpt_platform/frontend/.env.defaultindex aec40c6a46..acc9946a9f 100644--- a/autogpt_platform/frontend/.env.default+++ b/autogpt_platform/frontend/.env.default@@ -11,7 +11,6 @@NEXT_PUBLIC_LAUNCHDARKLY_ENABLED=falseNEXT_PUBLIC_LAUNCHDARKLY_CLIENT_ID=687ab1372f497809b131e06e- NEXT_PUBLIC_SHOW_BILLING_PAGE=falseNEXT_PUBLIC_TURNSTILE=disabledNEXT_PUBLIC_REACT_QUERY_DEVTOOL=truediff --git a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/components/Wallet/Wallet.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/components/Wallet/Wallet.tsxindex 36f019061c..211aae236a 100644--- a/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/components/Wallet/Wallet.tsx+++ b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/components/Wallet/Wallet.tsx@@ -19,6 +19,7 @@ import WalletRefill from "./components/WalletRefill";import { OnboardingStep } from "@/lib/autogpt-server-api";import { storage, Key as StorageKey } from "@/services/storage/local-storage";import { WalletIcon } from "@phosphor-icons/react";+import { useGetFlag, Flag } from "@/services/feature-flags/use-get-flag";export interface Task {id: OnboardingStep;@@ -40,6 +41,7 @@ export interface TaskGroup {export default function Wallet() {const { state, updateState } = useOnboarding();+ const isPaymentEnabled = useGetFlag(Flag.ENABLE_PLATFORM_PAYMENT);const groups = useMemo<TaskGroup[]>(() => {return [@@ -379,9 +381,7 @@ export default function Wallet() {</div><ScrollArea className="max-h-[85vh] overflow-y-auto">{/* Top ups */}- {process.env.NEXT_PUBLIC_SHOW_BILLING_PAGE === "true" && (- <WalletRefill />- )}+ {isPaymentEnabled && <WalletRefill />}{/* Tasks */}<p className="mx-1 my-3 font-sans text-xs font-normal text-zinc-400">Complete the following tasks to earn more credits!diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsxindex 7bd3e5db4a..800028a49f 100644--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx@@ -1,3 +1,5 @@+"use client";+import * as React from "react";import { Sidebar } from "@/components/__legacy__/Sidebar";import {@@ -8,8 +10,11 @@ import {IconCoin,} from "@/components/__legacy__/ui/icons";import { KeyIcon } from "lucide-react";+import { useGetFlag, Flag } from "@/services/feature-flags/use-get-flag";export default function Layout({ children }: { children: React.ReactNode }) {+ const isPaymentEnabled = useGetFlag(Flag.ENABLE_PLATFORM_PAYMENT);+const sidebarLinkGroups = [{links: [@@ -18,7 +23,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {href: "/profile/dashboard",icon: <IconDashboardLayout className="h-6 w-6" />,},- ...(process.env.NEXT_PUBLIC_SHOW_BILLING_PAGE === "true"+ ...(isPaymentEnabled? [{text: "Billing",diff --git a/autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts b/autogpt_platform/frontend/src/services/feature-flags/use-get-flag.tsindex d5a3c0e4f0..4f15118dc2 100644--- a/autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts+++ b/autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts@@ -15,6 +15,7 @@ export enum Flag {SHARE_EXECUTION_RESULTS = "share-execution-results",AGENT_FAVORITING = "agent-favoriting",MARKETPLACE_SEARCH_TERMS = "marketplace-search-terms",+ ENABLE_PLATFORM_PAYMENT = "enable-platform-payment",}export type FlagValues = {@@ -28,6 +29,7 @@ export type FlagValues = {[Flag.SHARE_EXECUTION_RESULTS]: boolean;[Flag.AGENT_FAVORITING]: boolean;[Flag.MARKETPLACE_SEARCH_TERMS]: string[];+ [Flag.ENABLE_PLATFORM_PAYMENT]: boolean;};const isPwMockEnabled = process.env.NEXT_PUBLIC_PW_TEST === "true";@@ -43,6 +45,7 @@ const mockFlags = {[Flag.SHARE_EXECUTION_RESULTS]: false,[Flag.AGENT_FAVORITING]: false,[Flag.MARKETPLACE_SEARCH_TERMS]: DEFAULT_SEARCH_TERMS,+ [Flag.ENABLE_PLATFORM_PAYMENT]: false,};export function useGetFlag<T extends Flag>(flag: T): FlagValues[T] | null {@@ -50,7 +53,9 @@ export function useGetFlag<T extends Flag>(flag: T): FlagValues[T] | null {const flagValue = currentFlags[flag];const isCloud = getBehaveAs() === BehaveAs.CLOUD;- if (isPwMockEnabled && !isCloud) return mockFlags[flag];+ if ((isPwMockEnabled && !isCloud) || flagValue === undefined) {+ return mockFlags[flag];+ }return flagValue;}