Compare commits
1 Commits
codex/add-
...
codex/upda
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b54c2978c3 |
@@ -203,7 +203,10 @@ async def create_audio_dubbing_task(
|
|||||||
"""
|
"""
|
||||||
user_id = require_authenticated_user(current_user)
|
user_id = require_authenticated_user(current_user)
|
||||||
|
|
||||||
task_id = task_manager.create_task("audio_dubbing")
|
task_id = task_manager.create_task(
|
||||||
|
"audio_dubbing",
|
||||||
|
metadata={"owner_user_id": user_id},
|
||||||
|
)
|
||||||
|
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
_execute_dubbing_task,
|
_execute_dubbing_task,
|
||||||
@@ -240,7 +243,7 @@ async def get_dubbing_result(
|
|||||||
"""
|
"""
|
||||||
user_id = require_authenticated_user(current_user)
|
user_id = require_authenticated_user(current_user)
|
||||||
|
|
||||||
task_status = task_manager.get_task_status(task_id)
|
task_status = task_manager.get_task_status(task_id, requester_user_id=user_id)
|
||||||
|
|
||||||
if not task_status:
|
if not task_status:
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
raise HTTPException(status_code=404, detail="Task not found")
|
||||||
@@ -403,7 +406,10 @@ async def create_voice_clone_task(
|
|||||||
"""
|
"""
|
||||||
user_id = require_authenticated_user(current_user)
|
user_id = require_authenticated_user(current_user)
|
||||||
|
|
||||||
task_id = task_manager.create_task("voice_clone")
|
task_id = task_manager.create_task(
|
||||||
|
"voice_clone",
|
||||||
|
metadata={"owner_user_id": user_id},
|
||||||
|
)
|
||||||
|
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
_execute_voice_clone_task,
|
_execute_voice_clone_task,
|
||||||
@@ -434,7 +440,7 @@ async def get_voice_clone_result(
|
|||||||
"""
|
"""
|
||||||
user_id = require_authenticated_user(current_user)
|
user_id = require_authenticated_user(current_user)
|
||||||
|
|
||||||
task_status = task_manager.get_task_status(task_id)
|
task_status = task_manager.get_task_status(task_id, requester_user_id=user_id)
|
||||||
|
|
||||||
if not task_status:
|
if not task_status:
|
||||||
raise HTTPException(status_code=404, detail="Task not found")
|
raise HTTPException(status_code=404, detail="Task not found")
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ def _execute_podcast_video_task(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Verify the task status was updated correctly
|
# Verify the task status was updated correctly
|
||||||
updated_status = task_manager.get_task_status(task_id)
|
updated_status = task_manager.get_task_status(task_id, requester_user_id=user_id)
|
||||||
logger.info(
|
logger.info(
|
||||||
f"[Podcast] Task status after update: task_id={task_id}, status={updated_status.get('status') if updated_status else 'None'}, has_result={bool(updated_status.get('result') if updated_status else False)}, video_url={updated_status.get('result', {}).get('video_url') if updated_status else 'N/A'}"
|
f"[Podcast] Task status after update: task_id={task_id}, status={updated_status.get('status') if updated_status else 'None'}, has_result={bool(updated_status.get('result') if updated_status else False)}, video_url={updated_status.get('result', {}).get('video_url') if updated_status else 'N/A'}"
|
||||||
)
|
)
|
||||||
@@ -358,7 +358,10 @@ async def generate_podcast_video(
|
|||||||
logger.warning(f"[Podcast] Failed to extract auth token from headers: {e}")
|
logger.warning(f"[Podcast] Failed to extract auth token from headers: {e}")
|
||||||
|
|
||||||
# Create async task
|
# Create async task
|
||||||
task_id = task_manager.create_task("podcast_video_generation")
|
task_id = task_manager.create_task(
|
||||||
|
"podcast_video_generation",
|
||||||
|
metadata={"owner_user_id": user_id},
|
||||||
|
)
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
_execute_podcast_video_task,
|
_execute_podcast_video_task,
|
||||||
task_id=task_id,
|
task_id=task_id,
|
||||||
@@ -488,7 +491,10 @@ async def combine_podcast_videos(
|
|||||||
raise HTTPException(status_code=400, detail="No scene videos provided")
|
raise HTTPException(status_code=400, detail="No scene videos provided")
|
||||||
|
|
||||||
# Create async task
|
# Create async task
|
||||||
task_id = task_manager.create_task("podcast_combine_videos")
|
task_id = task_manager.create_task(
|
||||||
|
"podcast_combine_videos",
|
||||||
|
metadata={"owner_user_id": user_id},
|
||||||
|
)
|
||||||
|
|
||||||
# Extract token for authenticated URL building
|
# Extract token for authenticated URL building
|
||||||
auth_token = None
|
auth_token = None
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ Podcast Maker API Router
|
|||||||
Main router that imports and registers all handler modules.
|
Main router that imports and registers all handler modules.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
from typing import Dict, Any
|
from typing import Dict, Any
|
||||||
|
|
||||||
from middleware.auth_middleware import get_current_user
|
from middleware.auth_middleware import get_current_user
|
||||||
@@ -32,5 +32,8 @@ router.include_router(dubbing.router)
|
|||||||
@router.get("/task/{task_id}/status")
|
@router.get("/task/{task_id}/status")
|
||||||
async def podcast_task_status(task_id: str, current_user: Dict[str, Any] = Depends(get_current_user)):
|
async def podcast_task_status(task_id: str, current_user: Dict[str, Any] = Depends(get_current_user)):
|
||||||
"""Expose task status under podcast namespace (reuses shared task manager)."""
|
"""Expose task status under podcast namespace (reuses shared task manager)."""
|
||||||
require_authenticated_user(current_user)
|
user_id = require_authenticated_user(current_user)
|
||||||
return task_manager.get_task_status(task_id)
|
task_status = task_manager.get_task_status(task_id, requester_user_id=user_id)
|
||||||
|
if not task_status:
|
||||||
|
raise HTTPException(status_code=404, detail="Task not found")
|
||||||
|
return task_status
|
||||||
|
|||||||
@@ -34,9 +34,14 @@ class TaskManager:
|
|||||||
del self.task_storage[task_id]
|
del self.task_storage[task_id]
|
||||||
logger.debug(f"[StoryWriter] Cleaned up old task: {task_id}")
|
logger.debug(f"[StoryWriter] Cleaned up old task: {task_id}")
|
||||||
|
|
||||||
def create_task(self, task_type: str = "story_generation") -> str:
|
def create_task(
|
||||||
|
self,
|
||||||
|
task_type: str = "story_generation",
|
||||||
|
metadata: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> str:
|
||||||
"""Create a new task and return its ID."""
|
"""Create a new task and return its ID."""
|
||||||
task_id = str(uuid.uuid4())
|
task_id = str(uuid.uuid4())
|
||||||
|
task_metadata = metadata or {}
|
||||||
|
|
||||||
self.task_storage[task_id] = {
|
self.task_storage[task_id] = {
|
||||||
"status": "pending",
|
"status": "pending",
|
||||||
@@ -45,13 +50,14 @@ class TaskManager:
|
|||||||
"error": None,
|
"error": None,
|
||||||
"progress_messages": [],
|
"progress_messages": [],
|
||||||
"task_type": task_type,
|
"task_type": task_type,
|
||||||
"progress": 0.0
|
"progress": 0.0,
|
||||||
|
"metadata": task_metadata,
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info(f"[StoryWriter] Created task: {task_id} (type: {task_type})")
|
logger.info(f"[StoryWriter] Created task: {task_id} (type: {task_type})")
|
||||||
return task_id
|
return task_id
|
||||||
|
|
||||||
def get_task_status(self, task_id: str) -> Optional[Dict[str, Any]]:
|
def get_task_status(self, task_id: str, requester_user_id: Optional[str] = None) -> Optional[Dict[str, Any]]:
|
||||||
"""Get the status of a task."""
|
"""Get the status of a task."""
|
||||||
self.cleanup_old_tasks()
|
self.cleanup_old_tasks()
|
||||||
|
|
||||||
@@ -62,6 +68,15 @@ class TaskManager:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
task = self.task_storage[task_id]
|
task = self.task_storage[task_id]
|
||||||
|
metadata = task.get("metadata", {}) or {}
|
||||||
|
owner_user_id = metadata.get("owner_user_id")
|
||||||
|
|
||||||
|
if requester_user_id is not None and owner_user_id is not None and requester_user_id != owner_user_id:
|
||||||
|
logger.warning(
|
||||||
|
f"[StoryWriter] Task access denied for task {task_id}: requester does not match owner"
|
||||||
|
)
|
||||||
|
return None
|
||||||
|
|
||||||
response = {
|
response = {
|
||||||
"task_id": task_id,
|
"task_id": task_id,
|
||||||
"status": task["status"],
|
"status": task["status"],
|
||||||
|
|||||||
@@ -16,10 +16,6 @@ REQUIRED_STRIPE_PLAN_KEYS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def _is_truthy_env(var_name: str) -> bool:
|
|
||||||
return os.getenv(var_name, "").strip().lower() in {"1", "true", "yes", "on"}
|
|
||||||
|
|
||||||
|
|
||||||
def _detect_stripe_mode() -> str:
|
def _detect_stripe_mode() -> str:
|
||||||
configured_mode = os.getenv("STRIPE_MODE", "").strip().lower()
|
configured_mode = os.getenv("STRIPE_MODE", "").strip().lower()
|
||||||
if configured_mode in {"test", "live"}:
|
if configured_mode in {"test", "live"}:
|
||||||
@@ -102,16 +98,7 @@ class StripeService:
|
|||||||
self.db = db
|
self.db = db
|
||||||
self.api_key = os.getenv("STRIPE_SECRET_KEY")
|
self.api_key = os.getenv("STRIPE_SECRET_KEY")
|
||||||
self.webhook_secret = os.getenv("STRIPE_WEBHOOK_SECRET")
|
self.webhook_secret = os.getenv("STRIPE_WEBHOOK_SECRET")
|
||||||
self.require_stripe_checkout = _is_truthy_env("REQUIRE_STRIPE_CHECKOUT")
|
|
||||||
if not self.api_key:
|
if not self.api_key:
|
||||||
if self.require_stripe_checkout:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=500,
|
|
||||||
detail=(
|
|
||||||
"REQUIRE_STRIPE_CHECKOUT=true but STRIPE_SECRET_KEY is missing. "
|
|
||||||
"Configure STRIPE_SECRET_KEY to enable Stripe checkout."
|
|
||||||
),
|
|
||||||
)
|
|
||||||
logger.warning("STRIPE_SECRET_KEY is not set. Stripe integration will not work.")
|
logger.warning("STRIPE_SECRET_KEY is not set. Stripe integration will not work.")
|
||||||
else:
|
else:
|
||||||
stripe.api_key = self.api_key
|
stripe.api_key = self.api_key
|
||||||
|
|||||||
@@ -52,10 +52,6 @@ export interface SubscriptionPlan {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const PricingPage: React.FC = () => {
|
const PricingPage: React.FC = () => {
|
||||||
const requireStripeCheckout = ['1', 'true', 'yes', 'on'].includes(
|
|
||||||
(process.env.REACT_APP_REQUIRE_STRIPE_CHECKOUT || '').toLowerCase()
|
|
||||||
);
|
|
||||||
const stripePublishableKey = process.env.REACT_APP_STRIPE_PUBLISHABLE_KEY;
|
|
||||||
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);
|
||||||
@@ -177,7 +173,7 @@ const PricingPage: React.FC = () => {
|
|||||||
const userId = localStorage.getItem('user_id') || 'anonymous';
|
const userId = localStorage.getItem('user_id') || 'anonymous';
|
||||||
|
|
||||||
// Check if Stripe is configured
|
// Check if Stripe is configured
|
||||||
if (stripePublishableKey) {
|
if (process.env.REACT_APP_STRIPE_PUBLISHABLE_KEY) {
|
||||||
console.log('[PricingPage] Initiating Stripe Checkout');
|
console.log('[PricingPage] Initiating Stripe Checkout');
|
||||||
|
|
||||||
const response = await apiClient.post('/api/subscription/create-checkout-session', {
|
const response = await apiClient.post('/api/subscription/create-checkout-session', {
|
||||||
@@ -191,14 +187,6 @@ const PricingPage: React.FC = () => {
|
|||||||
window.location.href = response.data.url;
|
window.location.href = response.data.url;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (requireStripeCheckout) {
|
|
||||||
throw new Error('Stripe checkout is required but checkout URL was not returned.');
|
|
||||||
}
|
|
||||||
} else if (requireStripeCheckout) {
|
|
||||||
throw new Error(
|
|
||||||
'Stripe checkout is required but REACT_APP_STRIPE_PUBLISHABLE_KEY is not configured.'
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('[PricingPage] Making legacy subscription API call:', {
|
console.log('[PricingPage] Making legacy subscription API call:', {
|
||||||
@@ -283,8 +271,7 @@ const PricingPage: React.FC = () => {
|
|||||||
}, 3000);
|
}, 3000);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Error subscribing:', err);
|
console.error('Error subscribing:', err);
|
||||||
const errorMessage = err instanceof Error ? err.message : 'Failed to process subscription';
|
setError('Failed to process subscription');
|
||||||
setError(errorMessage);
|
|
||||||
setSuccessSnackbar({ open: false, message: '', countdown: 0 });
|
setSuccessSnackbar({ open: false, message: '', countdown: 0 });
|
||||||
} finally {
|
} finally {
|
||||||
setSubscribing(false);
|
setSubscribing(false);
|
||||||
|
|||||||
Reference in New Issue
Block a user