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(backend): resolve dev merge conflict and remove credit-based subscription cost
Zamil Majdy611a00d930c1
diff --cc autogpt_platform/backend/backend/api/features/v1.pyindex 52d2efa0ff,d208114f95..2f0b43e8d9--- a/autogpt_platform/backend/backend/api/features/v1.py+++ b/autogpt_platform/backend/backend/api/features/v1.py@@@ -51,13 -50,9 +51,12 @@@ from backend.data.credit importRefundRequest,TransactionHistory,UserCredit,+ create_subscription_checkout,get_auto_top_up,- get_subscription_cost,get_user_credit_model,set_auto_top_up,+ set_subscription_tier,+ sync_subscription_from_stripe,)from backend.data.graph import GraphSettingsfrom backend.data.model import CredentialsMetaInput, UserOnboarding@@@ -687,82 -679,6 +686,77 @@@ async def get_user_auto_top_upreturn await get_auto_top_up(user_id)+class SubscriptionTierRequest(BaseModel):+ tier: Literal["FREE", "PRO", "BUSINESS"]+ success_url: str = ""+ cancel_url: str = ""+++class SubscriptionCheckoutResponse(BaseModel):+ url: str+++class SubscriptionStatusResponse(BaseModel):+ tier: str+ monthly_cost: int+ tier_costs: dict[str, int]+++@v1_router.get(+ path="/credits/subscription",+ summary="Get subscription tier, current cost, and all tier costs",+ operation_id="getSubscriptionStatus",+ tags=["credits"],+ dependencies=[Security(requires_user)],+)+async def get_subscription_status(+ user_id: Annotated[str, Security(get_user_id)],+) -> SubscriptionStatusResponse:+ user = await get_user_by_id(user_id)+ tier = user.subscription_tier or SubscriptionTier.FREE- cost = await get_subscription_cost(user_id, tier)- pro_cost, biz_cost = await asyncio.gather(- get_subscription_cost(user_id, SubscriptionTier.PRO),- get_subscription_cost(user_id, SubscriptionTier.BUSINESS),- )+ return SubscriptionStatusResponse(+ tier=tier.value,- monthly_cost=cost,- tier_costs={"FREE": 0, "PRO": pro_cost, "BUSINESS": biz_cost, "ENTERPRISE": 0},++ monthly_cost=0,++ tier_costs={"FREE": 0, "PRO": 0, "BUSINESS": 0, "ENTERPRISE": 0},+ )+++@v1_router.post(+ path="/credits/subscription",+ summary="Start a Stripe Checkout session to upgrade subscription tier",+ operation_id="updateSubscriptionTier",+ tags=["credits"],+ dependencies=[Security(requires_user)],+)+async def update_subscription_tier(+ request: SubscriptionTierRequest,+ user_id: Annotated[str, Security(get_user_id)],+) -> SubscriptionCheckoutResponse:+ # Pydantic validates tier is one of FREE/PRO/BUSINESS via Literal type.+ tier = SubscriptionTier(request.tier)++ # Downgrade to FREE or beta users (payment not enabled) → update tier directly.+ payment_enabled = await is_feature_enabled(+ Flag.ENABLE_PLATFORM_PAYMENT, user_id, default=False+ )+ if tier == SubscriptionTier.FREE or not payment_enabled:+ await set_subscription_tier(user_id, tier)+ return SubscriptionCheckoutResponse(url="")++ # Paid upgrade → create Stripe Checkout Session.+ try:+ url = await create_subscription_checkout(+ user_id=user_id,+ tier=tier,+ success_url=request.success_url,+ cancel_url=request.cancel_url,+ )+ except ValueError as e:+ raise HTTPException(status_code=422, detail=str(e))++ return SubscriptionCheckoutResponse(url=url)++@v1_router.post(path="/credits/stripe_webhook", summary="Handle Stripe webhooks", tags=["credits"])diff --cc autogpt_platform/backend/backend/data/credit.pyindex b6f78c7437,04f91d8d61..39f58f4d9e--- a/autogpt_platform/backend/backend/data/credit.py+++ b/autogpt_platform/backend/backend/data/credit.py@@@ -1145,13 -1144,6 +1145,8 @@@ class BetaUserCredit(UserCredit)if (snapshot_time.year, snapshot_time.month) == (cur_time.year, cur_time.month):return balance- # Include subscription cost in grant so the upcoming subscription deduction- # does not reduce the user's effective usage credits below num_user_credits_refill.- user = await get_user_by_id(user_id)- tier = user.subscription_tier or SubscriptionTier.FREE- sub_cost = await get_subscription_cost(user_id, tier)- target = self.num_user_credits_refill + sub_cost++ target = self.num_user_credits_refill+try:balance, _ = await self._add_transaction(user_id=user_id,@@@ -1279,88 -1261,6 +1274,74 @@@ async def get_auto_top_up(user_id: strreturn AutoTopUpConfig.model_validate(user.top_up_config)- async def get_subscription_cost(user_id: str, tier: SubscriptionTier) -> int:- """Return monthly subscription cost in credits from LD. 0 = free or disabled."""- flag_map = {- SubscriptionTier.PRO: Flag.SUBSCRIPTION_COST_PRO,- SubscriptionTier.BUSINESS: Flag.SUBSCRIPTION_COST_BUSINESS,- }- flag = flag_map.get(tier)- if flag is None:- return 0-- cost = await get_feature_flag_value(flag.value, user_id, default=0)- return max(0, int(cost)) if isinstance(cost, (int, float)) else 0--+async def get_subscription_price_id(tier: SubscriptionTier) -> str | None:+ """Return Stripe Price ID for a tier from LaunchDarkly. None = not configured."""+ flag_map = {+ SubscriptionTier.PRO: Flag.STRIPE_PRICE_PRO,+ SubscriptionTier.BUSINESS: Flag.STRIPE_PRICE_BUSINESS,+ }+ flag = flag_map.get(tier)+ if flag is None:+ return None+ price_id = await get_feature_flag_value(flag.value, user_id="", default="")+ return price_id if isinstance(price_id, str) and price_id else None+++async def create_subscription_checkout(+ user_id: str,+ tier: SubscriptionTier,+ success_url: str,+ cancel_url: str,+) -> str:+ """Create a Stripe Checkout Session for a subscription. Returns the redirect URL."""+ price_id = await get_subscription_price_id(tier)+ if not price_id:+ raise ValueError(f"Subscription not available for tier {tier.value}")+ customer_id = await get_stripe_customer_id(user_id)+ session = stripe.checkout.Session.create(+ customer=customer_id,+ mode="subscription",+ line_items=[{"price": price_id, "quantity": 1}],+ success_url=success_url,+ cancel_url=cancel_url,+ subscription_data={"metadata": {"user_id": user_id, "tier": tier.value}},+ )+ return session.url or ""+++async def sync_subscription_from_stripe(stripe_subscription: dict) -> None:+ """Update User.subscriptionTier from a Stripe subscription object."""+ customer_id = stripe_subscription["customer"]+ user = await User.prisma().find_first(where={"stripeCustomerId": customer_id})+ if not user:+ logger.warning(+ "sync_subscription_from_stripe: no user for customer %s", customer_id+ )+ return+ status = stripe_subscription.get("status", "")+ if status in ("active", "trialing"):+ price_id = ""+ items = stripe_subscription.get("items", {}).get("data", [])+ if items:+ price_id = items[0].get("price", {}).get("id", "")+ pro_price = await get_subscription_price_id(SubscriptionTier.PRO)+ biz_price = await get_subscription_price_id(SubscriptionTier.BUSINESS)+ if price_id and price_id == pro_price:+ tier = SubscriptionTier.PRO+ elif price_id and price_id == biz_price:+ tier = SubscriptionTier.BUSINESS+ else:+ logger.warning(+ "sync_subscription_from_stripe: unknown price %s for customer %s",+ price_id,+ customer_id,+ )+ return+ else:+ tier = SubscriptionTier.FREE+ await set_subscription_tier(user.id, tier)++async def admin_get_user_history(page: int = 1,page_size: int = 20,diff --cc autogpt_platform/backend/backend/util/feature_flag.pyindex 7c7f06ea87,74a0f960ed..27121304ca--- a/autogpt_platform/backend/backend/util/feature_flag.py+++ b/autogpt_platform/backend/backend/util/feature_flag.py@@@ -43,10 -43,7 +43,9 @@@ class Flag(str, Enum)COPILOT_SDK = "copilot-sdk"COPILOT_DAILY_TOKEN_LIMIT = "copilot-daily-token-limit"COPILOT_WEEKLY_TOKEN_LIMIT = "copilot-weekly-token-limit"- SUBSCRIPTION_COST_PRO = "subscription-cost-pro"- SUBSCRIPTION_COST_BUSINESS = "subscription-cost-business"+ STRIPE_PRICE_PRO = "stripe-price-id-pro"+ STRIPE_PRICE_BUSINESS = "stripe-price-id-business"+ GRAPHITI_MEMORY = "graphiti-memory"def is_configured() -> bool:diff --cc autogpt_platform/frontend/src/app/(platform)/profile/(user)/credits/components/SubscriptionTierSection/useSubscriptionTierSection.tsindex 7534022412,0000000000..b0ee8217e5mode 100644,000000..100644--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/credits/components/SubscriptionTierSection/useSubscriptionTierSection.ts+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/credits/components/SubscriptionTierSection/useSubscriptionTierSection.ts@@@ -1,71 -1,0 +1,59 @@@- import AutoGPTServerAPI from "@/lib/autogpt-server-api";- import { useCallback, useEffect, useMemo, useState } from "react";++import {++ useGetSubscriptionStatus,++ useUpdateSubscriptionTier,++} from "@/app/api/__generated__/endpoints/credits/credits";++import type { SubscriptionStatusResponse } from "@/app/api/__generated__/models/subscriptionStatusResponse";++import type { SubscriptionTierRequestTier } from "@/app/api/__generated__/models/subscriptionTierRequestTier";++import { useCallback } from "react";+- export type SubscriptionStatus = {- tier: string;- monthly_cost: number;- tier_costs: Record<string, number>;- };++export type SubscriptionStatus = SubscriptionStatusResponse;++export function useSubscriptionTierSection() {- const api = useMemo(() => new AutoGPTServerAPI(), []);-- const [subscription, setSubscription] = useState<SubscriptionStatus | null>(- null,- );- const [isLoading, setIsLoading] = useState(true);- const [error, setError] = useState<string | null>(null);- const [isPending, setIsPending] = useState(false);++ const {++ data: subscription,++ isLoading,++ error: queryError,++ refetch,++ } = useGetSubscriptionStatus({++ query: { select: (data) => (data.status === 200 ? data.data : null) },++ });+- const fetchSubscription = useCallback(async () => {- try {- const sub = await api.getSubscription();- setSubscription(sub);- } catch (e) {- setError("Failed to load subscription info");- } finally {- setIsLoading(false);- }- }, [api]);++ const error = queryError ? "Failed to load subscription info" : null;+- useEffect(() => {- fetchSubscription();- }, [fetchSubscription]);++ const { mutateAsync: doUpdateTier, isPending } = useUpdateSubscriptionTier();++ const changeTier = useCallback(+ async (tier: string): Promise<string | null> => {- setIsPending(true);+ try {+ const successUrl = `${window.location.origin}${window.location.pathname}?subscription=success`;+ const cancelUrl = `${window.location.origin}${window.location.pathname}?subscription=cancelled`;- const result = await api.setSubscriptionTier(- tier,- successUrl,- cancelUrl,- );- if (result.url) {- window.location.href = result.url;++ const result = await doUpdateTier({++ data: {++ tier: tier as SubscriptionTierRequestTier,++ success_url: successUrl,++ cancel_url: cancelUrl,++ },++ });++ if (result.status === 200 && result.data.url) {++ window.location.href = result.data.url;+ return null;+ }- await fetchSubscription();++ await refetch();+ return null;+ } catch (e: unknown) {+ const msg =+ e instanceof Error ? e.message : "Failed to change subscription tier";+ return msg;- } finally {- setIsPending(false);+ }+ },- [api, fetchSubscription],++ [doUpdateTier, refetch],+ );++ return {- subscription,++ subscription: subscription ?? null,+ isLoading,+ error,+ isPending,+ changeTier,- refetch: fetchSubscription,+ };+}