Compare commits
1 Commits
codex/remo
...
codex/add-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af5a6e0ee3 |
@@ -48,6 +48,9 @@ load_dotenv(backend_dir / '.env') # backend/.env
|
|||||||
load_dotenv(project_root / '.env') # root .env (fallback)
|
load_dotenv(project_root / '.env') # root .env (fallback)
|
||||||
load_dotenv() # CWD .env (fallback)
|
load_dotenv() # CWD .env (fallback)
|
||||||
|
|
||||||
|
# Feature flags (read early so app wiring can rely on a single source of truth)
|
||||||
|
PODCAST_ONLY_DEMO_MODE = os.getenv("PODCAST_ONLY_DEMO_MODE", "false").lower() == "true"
|
||||||
|
|
||||||
# Set up clean logging for end users
|
# Set up clean logging for end users
|
||||||
from logging_config import setup_clean_logging
|
from logging_config import setup_clean_logging
|
||||||
setup_clean_logging()
|
setup_clean_logging()
|
||||||
@@ -405,48 +408,62 @@ async def analyze_urls_ai_endpoint(request: AnalyzeURLsRequest, current_user: di
|
|||||||
"""Run AI-powered SEO analysis on selected URLs."""
|
"""Run AI-powered SEO analysis on selected URLs."""
|
||||||
return await analyze_urls_ai(request, current_user)
|
return await analyze_urls_ai(request, current_user)
|
||||||
|
|
||||||
# Include platform analytics router
|
# Centralized mode helpers for router wiring.
|
||||||
from routers.platform_analytics import router as platform_analytics_router
|
# Keep all mode decisions in this section to avoid scattered env checks.
|
||||||
app.include_router(platform_analytics_router)
|
def is_podcast_only_demo_mode() -> bool:
|
||||||
# Include Bing Analytics Storage router to expose storage-backed endpoints
|
return PODCAST_ONLY_DEMO_MODE
|
||||||
from routers.bing_analytics_storage import router as bing_analytics_storage_router
|
|
||||||
app.include_router(bing_analytics_storage_router)
|
|
||||||
app.include_router(images_router)
|
|
||||||
app.include_router(image_studio_router)
|
|
||||||
app.include_router(product_marketing_router)
|
|
||||||
app.include_router(campaign_creator_router)
|
|
||||||
|
|
||||||
# Include content assets router
|
|
||||||
from api.content_assets.router import router as content_assets_router
|
|
||||||
app.include_router(content_assets_router)
|
|
||||||
|
|
||||||
# Include Podcast Maker router
|
def should_include_non_podcast_routers() -> bool:
|
||||||
|
return not is_podcast_only_demo_mode()
|
||||||
|
|
||||||
|
|
||||||
|
# Include Podcast Maker router (available in all modes)
|
||||||
from api.podcast.router import router as podcast_router
|
from api.podcast.router import router as podcast_router
|
||||||
app.include_router(podcast_router)
|
app.include_router(podcast_router)
|
||||||
|
|
||||||
# Include YouTube Creator Studio router
|
if should_include_non_podcast_routers():
|
||||||
from api.youtube.router import router as youtube_router
|
# Include platform analytics router
|
||||||
app.include_router(youtube_router, prefix="/api")
|
from routers.platform_analytics import router as platform_analytics_router
|
||||||
|
app.include_router(platform_analytics_router)
|
||||||
|
|
||||||
# Include research configuration router
|
# Include Bing Analytics Storage router to expose storage-backed endpoints
|
||||||
app.include_router(research_config_router, prefix="/api/research", tags=["research"])
|
from routers.bing_analytics_storage import router as bing_analytics_storage_router
|
||||||
|
app.include_router(bing_analytics_storage_router)
|
||||||
|
app.include_router(images_router)
|
||||||
|
app.include_router(image_studio_router)
|
||||||
|
app.include_router(product_marketing_router)
|
||||||
|
app.include_router(campaign_creator_router)
|
||||||
|
|
||||||
# Include Research Engine router (standalone AI research module)
|
# Include content assets router
|
||||||
from api.research.router import router as research_engine_router
|
from api.content_assets.router import router as content_assets_router
|
||||||
app.include_router(research_engine_router, tags=["Research Engine"])
|
app.include_router(content_assets_router)
|
||||||
|
|
||||||
# Scheduler dashboard routes
|
# Include YouTube Creator Studio router
|
||||||
from api.scheduler_dashboard import router as scheduler_dashboard_router
|
from api.youtube.router import router as youtube_router
|
||||||
app.include_router(scheduler_dashboard_router)
|
app.include_router(youtube_router, prefix="/api")
|
||||||
app.include_router(oauth_token_monitoring_router)
|
|
||||||
|
|
||||||
# Autonomous Agents API routes (Phase 3A)
|
# Include research configuration router
|
||||||
from api.agents_api import router as agents_router
|
app.include_router(research_config_router, prefix="/api/research", tags=["research"])
|
||||||
app.include_router(agents_router)
|
|
||||||
|
|
||||||
# Today workflow routes
|
# Include Research Engine router (standalone AI research module)
|
||||||
from api.today_workflow import router as today_workflow_router
|
from api.research.router import router as research_engine_router
|
||||||
app.include_router(today_workflow_router)
|
app.include_router(research_engine_router, tags=["Research Engine"])
|
||||||
|
|
||||||
|
# Scheduler dashboard routes
|
||||||
|
from api.scheduler_dashboard import router as scheduler_dashboard_router
|
||||||
|
app.include_router(scheduler_dashboard_router)
|
||||||
|
app.include_router(oauth_token_monitoring_router)
|
||||||
|
|
||||||
|
# Autonomous Agents API routes (Phase 3A)
|
||||||
|
from api.agents_api import router as agents_router
|
||||||
|
app.include_router(agents_router)
|
||||||
|
|
||||||
|
# Today workflow routes
|
||||||
|
from api.today_workflow import router as today_workflow_router
|
||||||
|
app.include_router(today_workflow_router)
|
||||||
|
else:
|
||||||
|
logger.info("PODCAST_ONLY_DEMO_MODE is enabled: non-podcast routers are not registered.")
|
||||||
|
|
||||||
# Setup frontend serving using modular utilities
|
# Setup frontend serving using modular utilities
|
||||||
frontend_serving.setup_frontend_serving()
|
frontend_serving.setup_frontend_serving()
|
||||||
|
|||||||
@@ -298,6 +298,11 @@ def main():
|
|||||||
parser.add_argument("--dev", action="store_true", help="Enable development mode (auto-reload)")
|
parser.add_argument("--dev", action="store_true", help="Enable development mode (auto-reload)")
|
||||||
parser.add_argument("--production", action="store_true", help="Enable production mode (optimized for deployment)")
|
parser.add_argument("--production", action="store_true", help="Enable production mode (optimized for deployment)")
|
||||||
parser.add_argument("--verbose", action="store_true", help="Enable verbose logging for debugging")
|
parser.add_argument("--verbose", action="store_true", help="Enable verbose logging for debugging")
|
||||||
|
parser.add_argument(
|
||||||
|
"--podcast-only-demo",
|
||||||
|
action="store_true",
|
||||||
|
help="Enable podcast-only demo mode (sets PODCAST_ONLY_DEMO_MODE=true before app startup)",
|
||||||
|
)
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
# Determine mode
|
# Determine mode
|
||||||
@@ -307,6 +312,8 @@ def main():
|
|||||||
|
|
||||||
# Set global verbose flag for utilities
|
# Set global verbose flag for utilities
|
||||||
os.environ["ALWRITY_VERBOSE"] = "true" if verbose_mode else "false"
|
os.environ["ALWRITY_VERBOSE"] = "true" if verbose_mode else "false"
|
||||||
|
if args.podcast_only_demo:
|
||||||
|
os.environ["PODCAST_ONLY_DEMO_MODE"] = "true"
|
||||||
|
|
||||||
print("[*] ALwrity Backend Server")
|
print("[*] ALwrity Backend Server")
|
||||||
print("=" * 40)
|
print("=" * 40)
|
||||||
@@ -314,6 +321,8 @@ def main():
|
|||||||
print(f"Auto-reload: {'ENABLED' if enable_reload else 'DISABLED'}")
|
print(f"Auto-reload: {'ENABLED' if enable_reload else 'DISABLED'}")
|
||||||
if verbose_mode:
|
if verbose_mode:
|
||||||
print("Verbose logging: ENABLED")
|
print("Verbose logging: ENABLED")
|
||||||
|
if args.podcast_only_demo:
|
||||||
|
print("Podcast-only demo mode: ENABLED")
|
||||||
print("=" * 40)
|
print("=" * 40)
|
||||||
|
|
||||||
# Check if we're in the right directory
|
# Check if we're in the right directory
|
||||||
|
|||||||
@@ -52,27 +52,6 @@ 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);
|
||||||
@@ -97,11 +76,9 @@ 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 legacy alpha-named plans and enforce tier visibility policy.
|
// Filter out any alpha plans and ensure we only show the 4 main tiers
|
||||||
const filteredPlans = response.data.data.plans.filter(
|
const filteredPlans = response.data.data.plans.filter(
|
||||||
(plan: SubscriptionPlan) =>
|
(plan: SubscriptionPlan) => !plan.name.toLowerCase().includes('alpha')
|
||||||
!plan.name.toLowerCase().includes('alpha') &&
|
|
||||||
activeTierPolicy.visible.includes(plan.tier)
|
|
||||||
);
|
);
|
||||||
setPlans(filteredPlans);
|
setPlans(filteredPlans);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -134,13 +111,10 @@ const PricingPage: React.FC = () => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!activeTierPolicy.selectable.includes(plan.tier)) {
|
// For alpha testing, only allow Free and Basic plans (Pro features not ready)
|
||||||
|
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(
|
setError('This plan is not available for alpha testing');
|
||||||
isAlphaMode
|
|
||||||
? 'This plan is not available during alpha testing'
|
|
||||||
: 'This plan is currently not available for self-serve checkout'
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -377,8 +351,6 @@ 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}
|
||||||
@@ -420,11 +392,10 @@ 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' }} />
|
||||||
{isAlphaMode ? 'Alpha Testing Subscription' : 'Confirm Subscription'}
|
Alpha Testing Subscription
|
||||||
</Typography>
|
</Typography>
|
||||||
|
|
||||||
{isAlphaMode ? (
|
{/* Alpha Testing Notice */}
|
||||||
<>
|
|
||||||
<Alert severity="warning" sx={{ mb: 2 }}>
|
<Alert severity="warning" sx={{ mb: 2 }}>
|
||||||
<Typography variant="body2" sx={{ fontWeight: 600, mb: 0.5 }}>
|
<Typography variant="body2" sx={{ fontWeight: 600, mb: 0.5 }}>
|
||||||
⚠️ Alpha Testing Mode - No Payment Required
|
⚠️ Alpha Testing Mode - No Payment Required
|
||||||
@@ -435,9 +406,10 @@ const PricingPage: React.FC = () => {
|
|||||||
</Alert>
|
</Alert>
|
||||||
|
|
||||||
<Typography variant="body1" sx={{ mb: 2 }}>
|
<Typography variant="body1" sx={{ mb: 2 }}>
|
||||||
Thank you for participating in our alpha testing! We're crediting this plan to your account.
|
Thank you for participating in our alpha testing! We're crediting the Basic plan ($29 value) to your account.
|
||||||
</Typography>
|
</Typography>
|
||||||
|
|
||||||
|
{/* TODO: Payment Integration Notice */}
|
||||||
<Box sx={{
|
<Box sx={{
|
||||||
p: 2,
|
p: 2,
|
||||||
mb: 3,
|
mb: 3,
|
||||||
@@ -456,12 +428,6 @@ const PricingPage: React.FC = () => {
|
|||||||
• Upgrade/downgrade options
|
• Upgrade/downgrade options
|
||||||
</Typography>
|
</Typography>
|
||||||
</Box>
|
</Box>
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
<Typography variant="body1" sx={{ mb: 3 }}>
|
|
||||||
Please confirm to continue with your selected subscription plan.
|
|
||||||
</Typography>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* 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,8 +69,6 @@ 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;
|
||||||
@@ -81,8 +79,6 @@ const PlanCard: React.FC<PlanCardProps> = ({
|
|||||||
yearlyBilling,
|
yearlyBilling,
|
||||||
selectedPlanId,
|
selectedPlanId,
|
||||||
subscribing,
|
subscribing,
|
||||||
canSelectPlan,
|
|
||||||
unavailableLabel,
|
|
||||||
onSelectPlan,
|
onSelectPlan,
|
||||||
onSubscribe,
|
onSubscribe,
|
||||||
openKnowMoreModal,
|
openKnowMoreModal,
|
||||||
@@ -913,9 +909,13 @@ 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 }}>
|
||||||
{!canSelectPlan ? (
|
{plan.tier === 'pro' ? (
|
||||||
<Button variant="outlined" size="large" fullWidth disabled sx={{ mb: 1 }}>
|
<Button variant="outlined" size="large" fullWidth disabled sx={{ mb: 1 }}>
|
||||||
{unavailableLabel || 'Unavailable'}
|
Coming Soon
|
||||||
|
</Button>
|
||||||
|
) : plan.tier === 'enterprise' ? (
|
||||||
|
<Button variant="outlined" size="large" fullWidth disabled sx={{ mb: 1 }}>
|
||||||
|
Contact Sales
|
||||||
</Button>
|
</Button>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
@@ -951,3 +951,4 @@ const PlanCard: React.FC<PlanCardProps> = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default PlanCard;
|
export default PlanCard;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user