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): address remaining review comments on subscription billing

Zamil Majdy8d31bdb2dce8
diff --git a/autogpt_platform/backend/backend/api/features/v1.py b/autogpt_platform/backend/backend/api/features/v1.py
index fcda163555..52d2efa0ff 100644
--- a/autogpt_platform/backend/backend/api/features/v1.py
+++ b/autogpt_platform/backend/backend/api/features/v1.py
@@ -5,7 +5,7 @@ import time
import uuid
from collections import defaultdict
from datetime import datetime, timezone
-from typing import Annotated, Any, Sequence, get_args
+from typing import Annotated, Any, Literal, Sequence, get_args
import pydantic
import stripe
@@ -24,6 +24,7 @@ from fastapi import (
UploadFile,
)
from fastapi.concurrency import run_in_threadpool
+from prisma.enums import SubscriptionTier
from pydantic import BaseModel
from starlette.status import HTTP_204_NO_CONTENT, HTTP_404_NOT_FOUND
from typing_extensions import Optional, TypedDict
@@ -687,7 +688,7 @@ async def get_user_auto_top_up(
class SubscriptionTierRequest(BaseModel):
- tier: str
+ tier: Literal["FREE", "PRO", "BUSINESS"]
success_url: str = ""
cancel_url: str = ""
@@ -712,10 +713,6 @@ class SubscriptionStatusResponse(BaseModel):
async def get_subscription_status(
user_id: Annotated[str, Security(get_user_id)],
) -> SubscriptionStatusResponse:
- from prisma.enums import SubscriptionTier
-
- from backend.data.user import get_user_by_id
-
user = await get_user_by_id(user_id)
tier = user.subscription_tier or SubscriptionTier.FREE
cost = await get_subscription_cost(user_id, tier)
@@ -741,24 +738,8 @@ async def update_subscription_tier(
request: SubscriptionTierRequest,
user_id: Annotated[str, Security(get_user_id)],
) -> SubscriptionCheckoutResponse:
- from prisma.enums import SubscriptionTier
-
- from backend.util.feature_flag import Flag, is_feature_enabled
-
- _SELF_SERVICE_TIERS = {"FREE", "PRO", "BUSINESS"}
- if request.tier.upper() not in _SELF_SERVICE_TIERS:
- raise HTTPException(
- status_code=422,
- detail=f"Invalid tier '{request.tier}'. Valid values: {sorted(_SELF_SERVICE_TIERS)}",
- )
-
- try:
- tier = SubscriptionTier(request.tier.upper())
- except ValueError:
- raise HTTPException(
- status_code=422,
- detail=f"Invalid tier '{request.tier}'. Valid values: {sorted(_SELF_SERVICE_TIERS)}",
- )
+ # 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(
diff --git a/autogpt_platform/backend/backend/data/credit.py b/autogpt_platform/backend/backend/data/credit.py
index 3e2cb835f9..b6f78c7437 100644
--- a/autogpt_platform/backend/backend/data/credit.py
+++ b/autogpt_platform/backend/backend/data/credit.py
@@ -1258,7 +1258,7 @@ async def set_auto_top_up(user_id: str, config: AutoTopUpConfig):
where={"id": user_id},
data={"topUpConfig": SafeJson(config.model_dump())},
)
- get_user_by_id.cache_delete(user_id) # type: ignore[attr-defined]
+ get_user_by_id.cache_delete(user_id)
async def set_subscription_tier(user_id: str, tier: SubscriptionTier) -> None:
@@ -1267,7 +1267,7 @@ async def set_subscription_tier(user_id: str, tier: SubscriptionTier) -> None:
where={"id": user_id},
data={"subscriptionTier": tier},
)
- get_user_by_id.cache_delete(user_id) # type: ignore[attr-defined]
+ get_user_by_id.cache_delete(user_id)
async def get_auto_top_up(user_id: str) -> AutoTopUpConfig:
@@ -1290,7 +1290,7 @@ async def get_subscription_cost(user_id: str, tier: SubscriptionTier) -> int:
return 0
cost = await get_feature_flag_value(flag.value, user_id, default=0)
- return int(cost) if isinstance(cost, (int, float)) else 0
+ return max(0, int(cost)) if isinstance(cost, (int, float)) else 0
async def get_subscription_price_id(tier: SubscriptionTier) -> str | None:
diff --git a/autogpt_platform/backend/backend/data/credit_subscription_test.py b/autogpt_platform/backend/backend/data/credit_subscription_test.py
index b583e2bc07..bb3507b1cc 100644
--- a/autogpt_platform/backend/backend/data/credit_subscription_test.py
+++ b/autogpt_platform/backend/backend/data/credit_subscription_test.py
@@ -53,6 +53,14 @@ async def test_sync_subscription_from_stripe_active():
"status": "active",
"items": {"data": [{"price": {"id": "price_pro_monthly"}}]},
}
+
+ async def mock_price_id(tier: SubscriptionTier) -> str | None:
+ if tier == SubscriptionTier.PRO:
+ return "price_pro_monthly"
+ if tier == SubscriptionTier.BUSINESS:
+ return "price_biz_monthly"
+ return None
+
with (
patch(
"backend.data.credit.User.prisma",
@@ -60,13 +68,7 @@ async def test_sync_subscription_from_stripe_active():
),
patch(
"backend.data.credit.get_subscription_price_id",
- side_effect=lambda tier: AsyncMock(
- return_value=(
- "price_pro_monthly"
- if tier == SubscriptionTier.PRO
- else "price_biz_monthly"
- )
- )(),
+ side_effect=mock_price_id,
),
patch(
"backend.data.credit.set_subscription_tier", new_callable=AsyncMock
diff --git a/autogpt_platform/frontend/src/app/api/openapi.json b/autogpt_platform/frontend/src/app/api/openapi.json
index 3589e7ccc1..5374dd38f4 100644
--- a/autogpt_platform/frontend/src/app/api/openapi.json
+++ b/autogpt_platform/frontend/src/app/api/openapi.json
@@ -13718,7 +13718,11 @@
},
"SubscriptionTierRequest": {
"properties": {
- "tier": { "type": "string", "title": "Tier" },
+ "tier": {
+ "type": "string",
+ "enum": ["FREE", "PRO", "BUSINESS"],
+ "title": "Tier"
+ },
"success_url": {
"type": "string",
"title": "Success Url",