Compare commits
1 Commits
codex/upda
...
codex/wrap
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec9d2f922e |
@@ -203,10 +203,7 @@ async def create_audio_dubbing_task(
|
||||
"""
|
||||
user_id = require_authenticated_user(current_user)
|
||||
|
||||
task_id = task_manager.create_task(
|
||||
"audio_dubbing",
|
||||
metadata={"owner_user_id": user_id},
|
||||
)
|
||||
task_id = task_manager.create_task("audio_dubbing")
|
||||
|
||||
background_tasks.add_task(
|
||||
_execute_dubbing_task,
|
||||
@@ -243,7 +240,7 @@ async def get_dubbing_result(
|
||||
"""
|
||||
user_id = require_authenticated_user(current_user)
|
||||
|
||||
task_status = task_manager.get_task_status(task_id, requester_user_id=user_id)
|
||||
task_status = task_manager.get_task_status(task_id)
|
||||
|
||||
if not task_status:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
@@ -406,10 +403,7 @@ async def create_voice_clone_task(
|
||||
"""
|
||||
user_id = require_authenticated_user(current_user)
|
||||
|
||||
task_id = task_manager.create_task(
|
||||
"voice_clone",
|
||||
metadata={"owner_user_id": user_id},
|
||||
)
|
||||
task_id = task_manager.create_task("voice_clone")
|
||||
|
||||
background_tasks.add_task(
|
||||
_execute_voice_clone_task,
|
||||
@@ -440,7 +434,7 @@ async def get_voice_clone_result(
|
||||
"""
|
||||
user_id = require_authenticated_user(current_user)
|
||||
|
||||
task_status = task_manager.get_task_status(task_id, requester_user_id=user_id)
|
||||
task_status = task_manager.get_task_status(task_id)
|
||||
|
||||
if not task_status:
|
||||
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
|
||||
updated_status = task_manager.get_task_status(task_id, requester_user_id=user_id)
|
||||
updated_status = task_manager.get_task_status(task_id)
|
||||
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'}"
|
||||
)
|
||||
@@ -358,10 +358,7 @@ async def generate_podcast_video(
|
||||
logger.warning(f"[Podcast] Failed to extract auth token from headers: {e}")
|
||||
|
||||
# Create async task
|
||||
task_id = task_manager.create_task(
|
||||
"podcast_video_generation",
|
||||
metadata={"owner_user_id": user_id},
|
||||
)
|
||||
task_id = task_manager.create_task("podcast_video_generation")
|
||||
background_tasks.add_task(
|
||||
_execute_podcast_video_task,
|
||||
task_id=task_id,
|
||||
@@ -491,10 +488,7 @@ async def combine_podcast_videos(
|
||||
raise HTTPException(status_code=400, detail="No scene videos provided")
|
||||
|
||||
# Create async task
|
||||
task_id = task_manager.create_task(
|
||||
"podcast_combine_videos",
|
||||
metadata={"owner_user_id": user_id},
|
||||
)
|
||||
task_id = task_manager.create_task("podcast_combine_videos")
|
||||
|
||||
# Extract token for authenticated URL building
|
||||
auth_token = None
|
||||
|
||||
@@ -4,7 +4,7 @@ Podcast Maker API Router
|
||||
Main router that imports and registers all handler modules.
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from fastapi import APIRouter, Depends
|
||||
from typing import Dict, Any
|
||||
|
||||
from middleware.auth_middleware import get_current_user
|
||||
@@ -32,8 +32,5 @@ router.include_router(dubbing.router)
|
||||
@router.get("/task/{task_id}/status")
|
||||
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)."""
|
||||
user_id = require_authenticated_user(current_user)
|
||||
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
|
||||
require_authenticated_user(current_user)
|
||||
return task_manager.get_task_status(task_id)
|
||||
|
||||
@@ -34,14 +34,9 @@ class TaskManager:
|
||||
del self.task_storage[task_id]
|
||||
logger.debug(f"[StoryWriter] Cleaned up old task: {task_id}")
|
||||
|
||||
def create_task(
|
||||
self,
|
||||
task_type: str = "story_generation",
|
||||
metadata: Optional[Dict[str, Any]] = None,
|
||||
) -> str:
|
||||
def create_task(self, task_type: str = "story_generation") -> str:
|
||||
"""Create a new task and return its ID."""
|
||||
task_id = str(uuid.uuid4())
|
||||
task_metadata = metadata or {}
|
||||
|
||||
self.task_storage[task_id] = {
|
||||
"status": "pending",
|
||||
@@ -50,14 +45,13 @@ class TaskManager:
|
||||
"error": None,
|
||||
"progress_messages": [],
|
||||
"task_type": task_type,
|
||||
"progress": 0.0,
|
||||
"metadata": task_metadata,
|
||||
"progress": 0.0
|
||||
}
|
||||
|
||||
logger.info(f"[StoryWriter] Created task: {task_id} (type: {task_type})")
|
||||
return task_id
|
||||
|
||||
def get_task_status(self, task_id: str, requester_user_id: Optional[str] = None) -> Optional[Dict[str, Any]]:
|
||||
def get_task_status(self, task_id: str) -> Optional[Dict[str, Any]]:
|
||||
"""Get the status of a task."""
|
||||
self.cleanup_old_tasks()
|
||||
|
||||
@@ -68,15 +62,6 @@ class TaskManager:
|
||||
return None
|
||||
|
||||
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 = {
|
||||
"task_id": task_id,
|
||||
"status": task["status"],
|
||||
|
||||
@@ -48,6 +48,8 @@ load_dotenv(backend_dir / '.env') # backend/.env
|
||||
load_dotenv(project_root / '.env') # root .env (fallback)
|
||||
load_dotenv() # CWD .env (fallback)
|
||||
|
||||
PODCAST_ONLY_DEMO_MODE = os.getenv("PODCAST_ONLY_DEMO_MODE", "false").lower() in {"1", "true", "yes", "on"}
|
||||
|
||||
# Set up clean logging for end users
|
||||
from logging_config import setup_clean_logging
|
||||
setup_clean_logging()
|
||||
@@ -110,7 +112,8 @@ from services.startup_health import (
|
||||
# Import OAuth token monitoring routes
|
||||
from api.oauth_token_monitoring_routes import router as oauth_token_monitoring_router
|
||||
|
||||
# Import SEO Dashboard endpoints
|
||||
if not PODCAST_ONLY_DEMO_MODE:
|
||||
# Import SEO Dashboard endpoints only when non-demo features are enabled
|
||||
from api.seo_dashboard import (
|
||||
get_seo_dashboard_data,
|
||||
get_seo_health_score,
|
||||
@@ -259,12 +262,17 @@ async def onboarding_status():
|
||||
return onboarding_manager.get_onboarding_status()
|
||||
|
||||
# Include routers using modular utilities
|
||||
if not PODCAST_ONLY_DEMO_MODE:
|
||||
router_manager.include_core_routers()
|
||||
router_manager.include_optional_routers()
|
||||
else:
|
||||
logger.info("PODCAST_ONLY_DEMO_MODE enabled: including only podcast and subscription feature routers.")
|
||||
app.include_router(subscription_router)
|
||||
|
||||
# Include assets serving router (must be mounted to serve generated images)
|
||||
app.include_router(assets_serving_router)
|
||||
|
||||
if not PODCAST_ONLY_DEMO_MODE:
|
||||
# SEO Dashboard endpoints
|
||||
@app.get("/api/seo-dashboard/data")
|
||||
async def seo_dashboard_data():
|
||||
@@ -332,8 +340,6 @@ async def refresh_analytics_data_endpoint(current_user: dict = Depends(get_curre
|
||||
"""Refresh analytics data by invalidating cache and fetching fresh data."""
|
||||
return await refresh_analytics_data(current_user, site_url)
|
||||
|
||||
|
||||
|
||||
@app.get("/api/seo-dashboard/onboarding-task-health")
|
||||
async def onboarding_task_health_endpoint(current_user: dict = Depends(get_current_user), site_url: str = None):
|
||||
"""Get consolidated health for onboarding-scheduled SEO tasks."""
|
||||
@@ -347,31 +353,17 @@ async def seo_dashboard_health():
|
||||
# Phase 2B: Semantic health monitoring endpoint (24-hour polling)
|
||||
@app.get("/api/seo-dashboard/semantic-health")
|
||||
async def semantic_health_endpoint(current_user: dict = Depends(get_current_user)):
|
||||
"""
|
||||
Get real-time semantic health metrics for content and competitors.
|
||||
This endpoint provides Phase 2B semantic intelligence monitoring data.
|
||||
|
||||
Returns semantic health score, status, and recommendations.
|
||||
Data is cached and updated every 24 hours via scheduler.
|
||||
"""
|
||||
"""Get real-time semantic health metrics for content and competitors."""
|
||||
return await get_semantic_health(current_user)
|
||||
|
||||
|
||||
@app.get("/api/seo-dashboard/cache-stats")
|
||||
async def semantic_cache_stats_endpoint(current_user: dict = Depends(get_current_user)):
|
||||
"""
|
||||
Get semantic cache performance statistics.
|
||||
Returns hit rate, memory usage, and eviction counts.
|
||||
"""
|
||||
"""Get semantic cache performance statistics."""
|
||||
return await get_semantic_cache_stats(current_user)
|
||||
|
||||
|
||||
@app.get("/api/seo-dashboard/sif-health")
|
||||
async def sif_indexing_health_endpoint(current_user: dict = Depends(get_current_user)):
|
||||
"""
|
||||
Get SIF indexing health summary for the current user.
|
||||
Used by the Semantic Indexing Status widget on the dashboard.
|
||||
"""
|
||||
"""Get SIF indexing health summary for the current user."""
|
||||
return await get_sif_indexing_health(current_user)
|
||||
|
||||
# Comprehensive SEO Analysis endpoints
|
||||
@@ -424,6 +416,7 @@ app.include_router(content_assets_router)
|
||||
from api.podcast.router import router as podcast_router
|
||||
app.include_router(podcast_router)
|
||||
|
||||
if not PODCAST_ONLY_DEMO_MODE:
|
||||
# Include YouTube Creator Studio router
|
||||
from api.youtube.router import router as youtube_router
|
||||
app.include_router(youtube_router, prefix="/api")
|
||||
|
||||
Reference in New Issue
Block a user