Compare commits
1 Commits
codex/asse
...
codex/remo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1ff406d03 |
@@ -462,7 +462,7 @@ async def serve_frontend():
|
|||||||
async def startup_event():
|
async def startup_event():
|
||||||
"""Initialize services on startup."""
|
"""Initialize services on startup."""
|
||||||
try:
|
try:
|
||||||
startup_report = run_startup_health_routine(app)
|
startup_report = run_startup_health_routine()
|
||||||
if startup_report.get("status") != "healthy":
|
if startup_report.get("status") != "healthy":
|
||||||
logger.error(f"Startup readiness finished with failures: {startup_report.get('errors', [])}")
|
logger.error(f"Startup readiness finished with failures: {startup_report.get('errors', [])}")
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ from datetime import datetime, timezone
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Dict, List, Optional
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
from fastapi import FastAPI
|
|
||||||
from fastapi.routing import APIRoute
|
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
from sqlalchemy import inspect, text
|
from sqlalchemy import inspect, text
|
||||||
|
|
||||||
@@ -51,60 +49,6 @@ def _record_check(checks: List[Dict[str, Any]], name: str, ok: bool, detail: str
|
|||||||
checks.append({"name": name, "ok": ok, "detail": detail})
|
checks.append({"name": name, "ok": ok, "detail": detail})
|
||||||
|
|
||||||
|
|
||||||
def _is_demo_mode() -> bool:
|
|
||||||
app_env = os.getenv("APP_ENV", os.getenv("ENV", os.getenv("DEPLOY_ENV", ""))).strip().lower()
|
|
||||||
if app_env == "demo":
|
|
||||||
return True
|
|
||||||
return _env_true("ALWRITY_DEMO_MODE", default=False)
|
|
||||||
|
|
||||||
|
|
||||||
def _check_required_demo_routes(
|
|
||||||
app: Optional[FastAPI],
|
|
||||||
checks: List[Dict[str, Any]],
|
|
||||||
errors: List[str],
|
|
||||||
) -> None:
|
|
||||||
if not _is_demo_mode():
|
|
||||||
_record_check(
|
|
||||||
checks,
|
|
||||||
"demo_required_routes",
|
|
||||||
True,
|
|
||||||
"Skipped (not in demo mode). Set APP_ENV=demo or ALWRITY_DEMO_MODE=true to enforce.",
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
if app is None:
|
|
||||||
errors.append(
|
|
||||||
"Demo startup route check could not run because FastAPI app context was not provided to startup health routine."
|
|
||||||
)
|
|
||||||
_record_check(checks, "demo_required_routes_context", False, "missing app context")
|
|
||||||
return
|
|
||||||
|
|
||||||
required_routes = {
|
|
||||||
"/api/subscription/plans": "GET",
|
|
||||||
"/api/podcast/projects": "GET",
|
|
||||||
}
|
|
||||||
available_routes = {
|
|
||||||
(route.path, method)
|
|
||||||
for route in app.router.routes
|
|
||||||
if isinstance(route, APIRoute)
|
|
||||||
for method in route.methods
|
|
||||||
}
|
|
||||||
|
|
||||||
missing: List[str] = []
|
|
||||||
for path, method in required_routes.items():
|
|
||||||
if (path, method) in available_routes:
|
|
||||||
_record_check(checks, f"demo_route_{path}_{method}", True, "route registered")
|
|
||||||
else:
|
|
||||||
missing.append(f"{method} {path}")
|
|
||||||
_record_check(checks, f"demo_route_{path}_{method}", False, "route missing")
|
|
||||||
|
|
||||||
if missing:
|
|
||||||
errors.append(
|
|
||||||
"Demo mode startup check failed. Missing required API endpoints: "
|
|
||||||
f"{', '.join(missing)}. Ensure subscription and podcast routers are imported and included during app setup."
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _check_workspace_root(checks: List[Dict[str, Any]], errors: List[str]) -> None:
|
def _check_workspace_root(checks: List[Dict[str, Any]], errors: List[str]) -> None:
|
||||||
workspace = Path(WORKSPACE_DIR)
|
workspace = Path(WORKSPACE_DIR)
|
||||||
if not workspace.exists():
|
if not workspace.exists():
|
||||||
@@ -200,7 +144,7 @@ def _check_db_access(checks: List[Dict[str, Any]], errors: List[str], warnings:
|
|||||||
return candidate_user
|
return candidate_user
|
||||||
|
|
||||||
|
|
||||||
def run_startup_health_routine(app: Optional[FastAPI] = None) -> Dict[str, Any]:
|
def run_startup_health_routine() -> Dict[str, Any]:
|
||||||
checks: List[Dict[str, Any]] = []
|
checks: List[Dict[str, Any]] = []
|
||||||
errors: List[str] = []
|
errors: List[str] = []
|
||||||
warnings: List[str] = []
|
warnings: List[str] = []
|
||||||
@@ -208,7 +152,6 @@ def run_startup_health_routine(app: Optional[FastAPI] = None) -> Dict[str, Any]:
|
|||||||
_check_workspace_root(checks, errors)
|
_check_workspace_root(checks, errors)
|
||||||
if not errors:
|
if not errors:
|
||||||
_check_db_access(checks, errors, warnings)
|
_check_db_access(checks, errors, warnings)
|
||||||
_check_required_demo_routes(app, checks, errors)
|
|
||||||
|
|
||||||
status = "healthy" if not errors else "failed"
|
status = "healthy" if not errors else "failed"
|
||||||
report = {
|
report = {
|
||||||
|
|||||||
@@ -52,6 +52,27 @@ export interface SubscriptionPlan {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const PricingPage: React.FC = () => {
|
const PricingPage: React.FC = () => {
|
||||||
|
const pricingMode = (process.env.REACT_APP_PRICING_MODE || 'alpha').toLowerCase();
|
||||||
|
const isAlphaMode = pricingMode === 'alpha';
|
||||||
|
const tierPolicyByMode: Record<string, { visible: string[]; selectable: string[]; unavailableLabels: Record<string, string> }> = {
|
||||||
|
alpha: {
|
||||||
|
visible: ['free', 'basic', 'pro', 'enterprise'],
|
||||||
|
selectable: ['free', 'basic'],
|
||||||
|
unavailableLabels: { pro: 'Coming Soon', enterprise: 'Contact Sales' },
|
||||||
|
},
|
||||||
|
demo: {
|
||||||
|
visible: ['free', 'basic', 'pro', 'enterprise'],
|
||||||
|
selectable: ['free', 'basic', 'pro'],
|
||||||
|
unavailableLabels: { enterprise: 'Contact Sales' },
|
||||||
|
},
|
||||||
|
production: {
|
||||||
|
visible: ['free', 'basic', 'pro', 'enterprise'],
|
||||||
|
selectable: ['free', 'basic', 'pro'],
|
||||||
|
unavailableLabels: { enterprise: 'Contact Sales' },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const activeTierPolicy = tierPolicyByMode[pricingMode] || tierPolicyByMode.alpha;
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const [plans, setPlans] = useState<SubscriptionPlan[]>([]);
|
const [plans, setPlans] = useState<SubscriptionPlan[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
@@ -76,9 +97,11 @@ const PricingPage: React.FC = () => {
|
|||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const response = await apiClient.get('/api/subscription/plans');
|
const response = await apiClient.get('/api/subscription/plans');
|
||||||
// Filter out any alpha plans and ensure we only show the 4 main tiers
|
// Filter out legacy alpha-named plans and enforce tier visibility policy.
|
||||||
const filteredPlans = response.data.data.plans.filter(
|
const filteredPlans = response.data.data.plans.filter(
|
||||||
(plan: SubscriptionPlan) => !plan.name.toLowerCase().includes('alpha')
|
(plan: SubscriptionPlan) =>
|
||||||
|
!plan.name.toLowerCase().includes('alpha') &&
|
||||||
|
activeTierPolicy.visible.includes(plan.tier)
|
||||||
);
|
);
|
||||||
setPlans(filteredPlans);
|
setPlans(filteredPlans);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -111,10 +134,13 @@ const PricingPage: React.FC = () => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// For alpha testing, only allow Free and Basic plans (Pro features not ready)
|
if (!activeTierPolicy.selectable.includes(plan.tier)) {
|
||||||
if (plan.tier !== 'free' && plan.tier !== 'basic') {
|
|
||||||
console.error('[PricingPage] Plan tier not available:', plan.tier);
|
console.error('[PricingPage] Plan tier not available:', plan.tier);
|
||||||
setError('This plan is not available for alpha testing');
|
setError(
|
||||||
|
isAlphaMode
|
||||||
|
? 'This plan is not available during alpha testing'
|
||||||
|
: 'This plan is currently not available for self-serve checkout'
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -351,6 +377,8 @@ const PricingPage: React.FC = () => {
|
|||||||
yearlyBilling={yearlyBilling}
|
yearlyBilling={yearlyBilling}
|
||||||
selectedPlanId={selectedPlan}
|
selectedPlanId={selectedPlan}
|
||||||
subscribing={subscribing}
|
subscribing={subscribing}
|
||||||
|
canSelectPlan={activeTierPolicy.selectable.includes(plan.tier)}
|
||||||
|
unavailableLabel={activeTierPolicy.unavailableLabels[plan.tier]}
|
||||||
onSelectPlan={setSelectedPlan}
|
onSelectPlan={setSelectedPlan}
|
||||||
onSubscribe={handleSubscribe}
|
onSubscribe={handleSubscribe}
|
||||||
openKnowMoreModal={openKnowMoreModal}
|
openKnowMoreModal={openKnowMoreModal}
|
||||||
@@ -392,42 +420,48 @@ const PricingPage: React.FC = () => {
|
|||||||
}}>
|
}}>
|
||||||
<Typography variant="h6" component="h2" gutterBottom sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
<Typography variant="h6" component="h2" gutterBottom sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||||
<Warning sx={{ color: 'warning.main' }} />
|
<Warning sx={{ color: 'warning.main' }} />
|
||||||
Alpha Testing Subscription
|
{isAlphaMode ? 'Alpha Testing Subscription' : 'Confirm Subscription'}
|
||||||
</Typography>
|
</Typography>
|
||||||
|
|
||||||
{/* Alpha Testing Notice */}
|
{isAlphaMode ? (
|
||||||
<Alert severity="warning" sx={{ mb: 2 }}>
|
<>
|
||||||
<Typography variant="body2" sx={{ fontWeight: 600, mb: 0.5 }}>
|
<Alert severity="warning" sx={{ mb: 2 }}>
|
||||||
⚠️ Alpha Testing Mode - No Payment Required
|
<Typography variant="body2" sx={{ fontWeight: 600, mb: 0.5 }}>
|
||||||
|
⚠️ Alpha Testing Mode - No Payment Required
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="caption" sx={{ display: 'block' }}>
|
||||||
|
Payment integration is coming soon. For now, subscriptions are activated without charge.
|
||||||
|
</Typography>
|
||||||
|
</Alert>
|
||||||
|
|
||||||
|
<Typography variant="body1" sx={{ mb: 2 }}>
|
||||||
|
Thank you for participating in our alpha testing! We're crediting this plan to your account.
|
||||||
|
</Typography>
|
||||||
|
|
||||||
|
<Box sx={{
|
||||||
|
p: 2,
|
||||||
|
mb: 3,
|
||||||
|
bgcolor: 'info.lighter',
|
||||||
|
borderRadius: 1,
|
||||||
|
border: '1px solid',
|
||||||
|
borderColor: 'info.light'
|
||||||
|
}}>
|
||||||
|
<Typography variant="body2" color="info.dark">
|
||||||
|
<strong>Coming in Production:</strong>
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="caption" color="info.dark" sx={{ display: 'block', mt: 0.5 }}>
|
||||||
|
• Secure Stripe/PayPal payment processing<br />
|
||||||
|
• Automatic renewal management<br />
|
||||||
|
• Payment verification & receipts<br />
|
||||||
|
• Upgrade/downgrade options
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Typography variant="body1" sx={{ mb: 3 }}>
|
||||||
|
Please confirm to continue with your selected subscription plan.
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="caption" sx={{ display: 'block' }}>
|
)}
|
||||||
Payment integration is coming soon. For now, subscriptions are activated without charge.
|
|
||||||
</Typography>
|
|
||||||
</Alert>
|
|
||||||
|
|
||||||
<Typography variant="body1" sx={{ mb: 2 }}>
|
|
||||||
Thank you for participating in our alpha testing! We're crediting the Basic plan ($29 value) to your account.
|
|
||||||
</Typography>
|
|
||||||
|
|
||||||
{/* TODO: Payment Integration Notice */}
|
|
||||||
<Box sx={{
|
|
||||||
p: 2,
|
|
||||||
mb: 3,
|
|
||||||
bgcolor: 'info.lighter',
|
|
||||||
borderRadius: 1,
|
|
||||||
border: '1px solid',
|
|
||||||
borderColor: 'info.light'
|
|
||||||
}}>
|
|
||||||
<Typography variant="body2" color="info.dark">
|
|
||||||
<strong>Coming in Production:</strong>
|
|
||||||
</Typography>
|
|
||||||
<Typography variant="caption" color="info.dark" sx={{ display: 'block', mt: 0.5 }}>
|
|
||||||
• Secure Stripe/PayPal payment processing<br />
|
|
||||||
• Automatic renewal management<br />
|
|
||||||
• Payment verification & receipts<br />
|
|
||||||
• Upgrade/downgrade options
|
|
||||||
</Typography>
|
|
||||||
</Box>
|
|
||||||
|
|
||||||
{/* Note: Current behavior allows renewal without payment verification */}
|
{/* Note: Current behavior allows renewal without payment verification */}
|
||||||
{/* This is intentional for alpha testing but will be secured in production */}
|
{/* This is intentional for alpha testing but will be secured in production */}
|
||||||
|
|||||||
@@ -69,6 +69,8 @@ interface PlanCardProps {
|
|||||||
yearlyBilling: boolean;
|
yearlyBilling: boolean;
|
||||||
selectedPlanId: number | null;
|
selectedPlanId: number | null;
|
||||||
subscribing: boolean;
|
subscribing: boolean;
|
||||||
|
canSelectPlan: boolean;
|
||||||
|
unavailableLabel?: string;
|
||||||
onSelectPlan: (planId: number) => void;
|
onSelectPlan: (planId: number) => void;
|
||||||
onSubscribe: (planId: number) => void;
|
onSubscribe: (planId: number) => void;
|
||||||
openKnowMoreModal: (title: string, content: React.ReactNode) => void;
|
openKnowMoreModal: (title: string, content: React.ReactNode) => void;
|
||||||
@@ -79,6 +81,8 @@ const PlanCard: React.FC<PlanCardProps> = ({
|
|||||||
yearlyBilling,
|
yearlyBilling,
|
||||||
selectedPlanId,
|
selectedPlanId,
|
||||||
subscribing,
|
subscribing,
|
||||||
|
canSelectPlan,
|
||||||
|
unavailableLabel,
|
||||||
onSelectPlan,
|
onSelectPlan,
|
||||||
onSubscribe,
|
onSubscribe,
|
||||||
openKnowMoreModal,
|
openKnowMoreModal,
|
||||||
@@ -909,13 +913,9 @@ const PlanCard: React.FC<PlanCardProps> = ({
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
|
|
||||||
<CardActions sx={{ justifyContent: 'center', pb: 3, flexDirection: 'column', gap: 1 }}>
|
<CardActions sx={{ justifyContent: 'center', pb: 3, flexDirection: 'column', gap: 1 }}>
|
||||||
{plan.tier === 'pro' ? (
|
{!canSelectPlan ? (
|
||||||
<Button variant="outlined" size="large" fullWidth disabled sx={{ mb: 1 }}>
|
<Button variant="outlined" size="large" fullWidth disabled sx={{ mb: 1 }}>
|
||||||
Coming Soon
|
{unavailableLabel || 'Unavailable'}
|
||||||
</Button>
|
|
||||||
) : plan.tier === 'enterprise' ? (
|
|
||||||
<Button variant="outlined" size="large" fullWidth disabled sx={{ mb: 1 }}>
|
|
||||||
Contact Sales
|
|
||||||
</Button>
|
</Button>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
@@ -951,4 +951,3 @@ const PlanCard: React.FC<PlanCardProps> = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default PlanCard;
|
export default PlanCard;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user