fix: create mps account on migrate to v2

api/routes/organization.py

@@ -5,7 +5,11 @@ from loguru import logger
 from pydantic import BaseModel
 from sqlalchemy.exc import IntegrityError
 
-from api.constants import DEFAULT_CAMPAIGN_RETRY_CONFIG, DEFAULT_ORG_CONCURRENCY_LIMIT
+from api.constants import (
+    DEFAULT_CAMPAIGN_RETRY_CONFIG,
+    DEFAULT_ORG_CONCURRENCY_LIMIT,
+    DEPLOYMENT_MODE,
+)
 from api.db import db_client
 from api.db.models import UserModel
 from api.db.telephony_configuration_client import TelephonyConfigurationInUseError
@@ -55,6 +59,7 @@ from api.services.configuration.registry import (
     ServiceProviders,
     ServiceType,
 )
+from api.services.mps_billing import ensure_hosted_mps_billing_account_v2
 from api.services.organization_context import (
     OrganizationContextResponse,
     get_organization_context,
@@ -359,6 +364,23 @@ async def migrate_model_configuration_v2(
     except ValueError as exc:
         raise HTTPException(status_code=422, detail=exc.args[0])
 
+    if DEPLOYMENT_MODE != "oss":
+        try:
+            await ensure_hosted_mps_billing_account_v2(
+                organization_id,
+                created_by=str(user.provider_id),
+            )
+        except Exception as exc:
+            logger.error(
+                "Failed to initialize MPS billing v2 account for organization {}: {}",
+                organization_id,
+                exc,
+            )
+            raise HTTPException(
+                status_code=502,
+                detail="Failed to initialize MPS billing v2 account",
+            )
+
     await upsert_organization_ai_model_configuration_v2(
         organization_id,
         configuration,

api/routes/organization_usage.py

@@ -74,6 +74,10 @@ class MPSBillingCreditsResponse(BaseModel):
     total_quota: float = 0.0
     account: Optional[MPSBillingAccountResponse] = None
     ledger_entries: List[MPSCreditLedgerEntryResponse] = Field(default_factory=list)
+    total_count: int = 0
+    page: int = 1
+    limit: int = 50
+    total_pages: int = 0
 
 
 def _optional_int(value: Any) -> Optional[int]:
@@ -224,10 +228,11 @@ async def _legacy_mps_credits_response(user: UserModel) -> MPSBillingCreditsResp
 
 @router.get("/billing/credits", response_model=MPSBillingCreditsResponse)
 async def get_billing_credits(
+    page: int = Query(1, ge=1),
     limit: int = Query(50, ge=1, le=100),
     user: UserModel = Depends(get_user),
 ):
-    """Return legacy MPS credits or v2 billing ledger details for the org."""
+    """Return legacy MPS credits or paginated v2 billing ledger details for the org."""
     try:
         if DEPLOYMENT_MODE == "oss" or not user.selected_organization_id:
             return await _legacy_mps_credits_response(user)
@@ -239,11 +244,18 @@ async def get_billing_credits(
 
         ledger = await mps_service_key_client.get_credit_ledger(
             organization_id=organization_id,
+            page=page,
             limit=limit,
             created_by=str(user.provider_id),
         )
         account = ledger.get("account") or {}
         ledger_entries = ledger.get("ledger_entries") or []
+        total_count = int(ledger.get("total_count") or len(ledger_entries))
+        response_limit = int(ledger.get("limit") or limit)
+        total_pages = int(
+            ledger.get("total_pages")
+            or ((total_count + response_limit - 1) // response_limit)
+        )
         workflow_ids_by_run_id: dict[int, int] = {}
         workflow_run_ids = {
             workflow_run_id
@@ -266,6 +278,8 @@ async def get_billing_credits(
             for entry in ledger_entries
             if float(entry.get("credits_delta") or 0.0) < 0
         )
+        if ledger.get("total_debits_credits") is not None:
+            total_debits = float(ledger["total_debits_credits"])
 
         return MPSBillingCreditsResponse(
             billing_version="v2",
@@ -308,6 +322,10 @@ async def get_billing_credits(
                 )
                 for entry in ledger_entries
             ],
+            total_count=total_count,
+            page=int(ledger.get("page") or page),
+            limit=response_limit,
+            total_pages=total_pages,
         )
     except HTTPException:
         raise