Fix /api/url_wall and /api/rewrite_share: generate slides properly, remove broken req._body hack, prioritize app_v2_entry routes over ai_patch

app_v2_entry.py

@@ -332,6 +332,11 @@ def _search_all(topic,limit=36):
 for _path in ['/api/article', '/api/hot_topics', '/api/categories', '/api/storage_status']:
     app.router.routes=[r for r in app.router.routes if not(getattr(r,'path',None)==_path and 'GET' in getattr(r,'methods',set()))]
 
+# Remove ai_patch.py's duplicate routes so app_v2_entry's versions take priority
+# Keep ai_patch.py's /api/ai/short/{post_id} and /api/ai/short-file/{file_id} — they work correctly
+for _p, _m in [('/api/url_wall','POST'), ('/api/rewrite_share','POST'), ('/api/topic_post','POST')]:
+    app.router.routes=[r for r in app.router.routes if not(getattr(r,'path',None)==_p and _m in getattr(r,'methods',set()))]
+
 _article_cache = {}
 _article_cache_ttl = 1800
 
@@ -1405,15 +1410,8 @@ async def api_rewrite_slide(request: Request):
     return JSONResponse({"post": post, "slides": slides})
 
 
-@app.post("/api/rewrite_share")
-async def api_rewrite_share(request: Request):
-    """Rewrite article and post to Tường AI with SLIDES + AI text."""
-    body = await request.json()
-    url = _clean(body.get("url", ""))
-    ctx = _clean(body.get("context", ""))
-    preferred_voice = body.get("voice", "")  # Accept custom voice selection
-    if not url and not ctx:
-        return JSONResponse({"error": "Cần URL hoặc nội dung"}, status_code=400)
+async def _do_rewrite(url, ctx="", preferred_voice=""):
+    """Shared rewrite logic used by both /api/rewrite_share and /api/url_wall."""
     data = None
     if url and url.startswith("http"):
         data = _scrape_article_for_rewrite(url)
@@ -1421,12 +1419,12 @@ async def api_rewrite_share(request: Request):
         paragraphs = [_clean(p) for p in ctx.split('\n') if len(_clean(p)) > 40]
         data = {'title': paragraphs[0][:80] if paragraphs else 'Bài viết', 'paragraphs': paragraphs, 'images': [], 'og_img': ''}
     if not data or not data.get('paragraphs'):
-        return JSONResponse({"error": "Không đọc được bài viết"}, status_code=422)
+        return None, JSONResponse({"error": "Không đọc được bài viết"}, status_code=422)
     raw_text = '\n'.join(data['paragraphs'])
     if len(raw_text) < 50:
         raw_text = ctx[:14000]
     if len(raw_text) < 50:
-        return JSONResponse({"error": "Bài viết quá ngắn"}, status_code=422)
+        return None, JSONResponse({"error": "Bài viết quá ngắn"}, status_code=422)
     domain = ''
     try:
         from urllib.parse import urlparse
@@ -1450,7 +1448,7 @@ async def api_rewrite_share(request: Request):
         else:
             ai_text = f"Tóm tắt: {data['title']}\n\n{raw_text[:1200]}\n\nNguồn: {domain}"
     
-    # Build slides from key points (FIX: include slides in rewrite_share too!)
+    # Build slides from key points
     points = _extract_key_points_rw(data['paragraphs'], max_points=12)
     images = data.get('images', [])
     slides = []
@@ -1480,10 +1478,25 @@ async def api_rewrite_share(request: Request):
         "language": lang,
         "ts": int(time.time())
     }
+    return post, None
+
+
+@app.post("/api/rewrite_share")
+async def api_rewrite_share(request: Request):
+    """Rewrite article and post to Tường AI with SLIDES + AI text."""
+    body = await request.json()
+    url = _clean(body.get("url", ""))
+    ctx = _clean(body.get("context", ""))
+    preferred_voice = body.get("voice", "")
+    if not url and not ctx:
+        return JSONResponse({"error": "Cần URL hoặc nội dung"}, status_code=400)
+    post, err = await _do_rewrite(url, ctx, preferred_voice)
+    if err:
+        return err
     posts = _load_wall_posts()
     posts.insert(0, post)
     _save_wall_posts(posts)
-    return JSONResponse({"post": post, "slides": slides})
+    return JSONResponse({"post": post, "slides": post.get("slides", [])})
 
 
 @app.post("/api/url_wall")
@@ -1493,9 +1506,13 @@ async def api_url_wall(request: Request):
     url = _clean(body.get("url", ""))
     if not url or not url.startswith('http'):
         return JSONResponse({"error": "URL không hợp lệ"}, status_code=400)
-    # Reuse rewrite_share logic
-    req._body = json.dumps({"url": url}).encode()
-    return await api_rewrite_share(request)
+    post, err = await _do_rewrite(url, "", "")
+    if err:
+        return err
+    posts = _load_wall_posts()
+    posts.insert(0, post)
+    _save_wall_posts(posts)
+    return JSONResponse({"post": post, "slides": post.get("slides", [])})
 
 
 def _bg():