Upload ai_patch.py

ai_patch.py

@@ -286,7 +286,6 @@ _PATCHED_PATHS = {
     ('/api/url_wall', 'POST'),
     ('/api/rewrite_share', 'POST'),
     ('/api/ai/short/{post_id}', 'POST'),
-    ('/api/auto_poster/run', 'POST'),
 }
 app.router.routes = [
     r for r in app.router.routes
@@ -328,7 +327,7 @@ Nội dung bài:
         if 'Nguồn tham khảo:' not in text:
             text += "\n\n" + _source_line(src)
         post = base.make_post(art['title'], text, art.get('image') or base.pollinations_image_url(art['title']), art.get('url') or '', 'topic_article', sources=src)
-
+        
         # Generate slides for this post so they persist after page reload
         try:
             page_data = _scrape_article_images(art.get('url', ''))
@@ -345,7 +344,7 @@ Nội dung bài:
                     post['slides'] = slides
         except Exception:
             pass
-
+        
         new_posts.append(post)
     posts = new_posts + posts
     base._save_ai_wall(posts)
@@ -372,7 +371,7 @@ async def compat_url_wall(request: Request):
     if 'Nguồn tham khảo:' not in text:
         text += "\n\n" + _source_line(src)
     post = base.make_post(data.get('title') or 'Bài viết', text, data.get('image') or '', url, 'url', sources=src)
-
+    
     # Generate slides so they persist after page reload
     slides = []
     try:
@@ -389,7 +388,7 @@ async def compat_url_wall(request: Request):
     except Exception:
         pass
     post['slides'] = slides
-
+    
     posts = base._load_ai_wall(); posts.insert(0, post); base._save_ai_wall(posts)
     return JSONResponse({'post': post, 'slides': slides})
 
@@ -437,7 +436,7 @@ def _extract_key_points_for_slides(paragraphs, max_points=12):
         # Split paragraph into sentences using Vietnamese + English punctuation - GET ALL SENTENCES
         sentences = re.split(r'(?<=[.!?])\s+(?=[A-ZÀ-Ỹ0-9])', p)
         sentences = [s.strip() for s in sentences if s.strip()]
-
+        
         for sentence in sentences:
             if len(points) >= max_points:
                 break
@@ -547,7 +546,7 @@ async def compat_rewrite_share(request: Request):
 
 def _emotion_script(text, emotion):
     """Prepend emotion-appropriate prefix to text based on emotion type.
-
+    
     NOTE: Prefix is NOT added to avoid cluttering Short AI speech.
     The emotion is still used for voice selection but content is read cleanly.
     """
@@ -713,7 +712,7 @@ def _make_scene_frame(post, segment, idx, total, img_path, out_path, emotion='ne
         if ratio>target:
             nh=H; nw=int(nh*ratio)
         else:
-            nw=W; nh=int(nw*ratio)
+            nw=W; nh=int(nw/ratio)
         cover=im.resize((nw,nh)); left=(nw-W)//2; top=(nh-H)//2
         cover=cover.crop((left,top,left+W,top+H))
         bg.paste(cover,(0,0))
@@ -767,77 +766,21 @@ def _estimate_audio_duration(path, fallback=15.0):
         return fallback
 
 
-_EDGE_VOICE_MAP = {
-    # Vietnamese
-    'vi-vn-hoaimyneural': 'vi-VN-HoaiMyNeural',
-    'vi-vn-namminhneural': 'vi-VN-NamMinhNeural',
-    'hoaimy': 'vi-VN-HoaiMyNeural',
-    'namminh': 'vi-VN-NamMinhNeural',
-    'nam': 'vi-VN-NamMinhNeural',
-    'male': 'vi-VN-NamMinhNeural',
-    'nu': 'vi-VN-HoaiMyNeural',
-    'female': 'vi-VN-HoaiMyNeural',
-    'mien-nam': 'vi-VN-HoaiMyNeural',
-    # English - Multilingual
-    'en-us-andrewmultilingualneural': 'en-US-AndrewMultilingualNeural',
-    'en-au-williammultilingualneural': 'en-AU-WilliamMultilingualNeural',
-    'andrew': 'en-US-AndrewMultilingualNeural',
-    'en_andrew': 'en-US-AndrewMultilingualNeural',
-    'jenny': 'en-US-AndrewMultilingualNeural',
-    'en_jenny': 'en-US-AndrewMultilingualNeural',
-    # Portuguese - Multilingual (ONLY Thalita)
-    'pt-br-thalitamultilingualneural': 'pt-BR-ThalitaMultilingualNeural',
-    'thalita': 'pt-BR-ThalitaMultilingualNeural',
-    'pt_thalita': 'pt-BR-ThalitaMultilingualNeural',
-    'pt_br_thalita': 'pt-BR-ThalitaMultilingualNeural',
-    'pt': 'pt-BR-ThalitaMultilingualNeural',
-    'pt_francisco': 'pt-BR-ThalitaMultilingualNeural',
-    # French - Multilingual
-    'fr-fr-viviennemultilingualneural': 'fr-FR-VivienneMultilingualNeural',
-    'fr-fr-remymultilingualneural': 'fr-FR-RemyMultilingualNeural',
-    'denise': 'fr-FR-VivienneMultilingualNeural',
-    'fr': 'fr-FR-VivienneMultilingualNeural',
-    'fr_denise': 'fr-FR-VivienneMultilingualNeural',
-    # German - Multilingual
-    'de-de-seraphinamultilingualneural': 'de-DE-SeraphinaMultilingualNeural',
-    'de-de-florianmultilingualneural': 'de-DE-FlorianMultilingualNeural',
-    'katja': 'de-DE-SeraphinaMultilingualNeural',
-    'de': 'de-DE-SeraphinaMultilingualNeural',
-    'de_katja': 'de-DE-SeraphinaMultilingualNeural',
-    # Korean - Multilingual (Hyunsu, NOT SunHee)
-    'ko-kr-hyusumultilingualneural': 'ko-KR-HyunsuMultilingualNeural',
-    'ko-kr-hyunsuneural': 'ko-KR-HyunsuMultilingualNeural',
-    'sunhee': 'ko-KR-HyunsuMultilingualNeural',
-    'ko': 'ko-KR-HyunsuMultilingualNeural',
-    'ko_sunhee': 'ko-KR-HyunsuMultilingualNeural',
-    # Italian - Multilingual
-    'it-it-giuseppemultilingualneural': 'it-IT-GiuseppeMultilingualNeural',
-    # Spanish (keep for backward compat)
-    'ela': 'en-US-AndrewMultilingualNeural',
-    'es_ela': 'en-US-AndrewMultilingualNeural',
-    'es': 'en-US-AndrewMultilingualNeural',
-    'es_carlos': 'en-US-AndrewMultilingualNeural',
-    # Japanese (keep for backward compat)
-    'nanami': 'en-US-AndrewMultilingualNeural',
-    'ja': 'en-US-AndrewMultilingualNeural',
-    'ja_nanami': 'en-US-AndrewMultilingualNeural',
-    # Chinese (keep for backward compat)
-    'xiaochen': 'en-US-AndrewMultilingualNeural',
-    'zh': 'en-US-AndrewMultilingualNeural',
-    'zh_xiaochen': 'en-US-AndrewMultilingualNeural',
-}
-
-
-def _generate_short_for_post(post_id: str, voice: str = 'nu', emotion: str = 'neutral', speed: float = 1.0):
-    """Hàm sinh short dùng chung (route /api/ai/short và auto_poster đều gọi). Trả về dict kết quả."""
-    voice = str(voice).strip().lower()
-    emotion = str(emotion).strip().lower()
-    speed = max(0.85, min(1.35, float(speed or 1.0)))
+@app.post('/api/ai/short/{post_id}')
+async def patched_ai_short(post_id: str, request: Request):
+    try:
+        body = await request.json()
+    except Exception:
+        body = {}
+    voice = str(body.get('voice', 'nu')).strip().lower()
+    emotion = str(body.get('emotion', 'neutral')).strip().lower()
+    speed = float(body.get('speed', 1.0) or 1.0)
+    speed = max(0.85, min(1.35, speed))
 
     posts = base._load_ai_wall()
     post = next((p for p in posts if str(p.get('id')) == str(post_id)), None)
     if not post:
-        return {'error': 'post not found'}
+        return JSONResponse({'error': 'post not found'}, status_code=404)
 
     segments = _summary_segments_from_post(post, max_segments=25)
     seg_hash = hashlib.md5(('|'.join(segments)+voice+emotion+str(speed)).encode('utf-8')).hexdigest()[:8]
@@ -852,41 +795,99 @@ def _generate_short_for_post(post_id: str, voice: str = 'nu', emotion: str = 'ne
         post['short_segments'] = segments
         post['short_subtitles'] = False
         base._save_ai_wall(posts)
-        return {'video': post['video'], 'voice': voice, 'emotion': emotion, 'speed': speed, 'subtitles': False, 'segments': segments, 'cached': True}
+        return JSONResponse({'video': post['video'], 'voice': voice, 'emotion': emotion, 'speed': speed, 'subtitles': False, 'segments': segments})
     if base.gTTS is None:
-        return {'error': 'gTTS chưa sẵn sàng'}
+        return JSONResponse({'error': 'gTTS chưa sẵn sàng'}, status_code=503)
 
-    edge_voice = _EDGE_VOICE_MAP.get(voice, 'vi-VN-HoaiMyNeural')
     work = os.path.join(base.SHORTS_DIR, base._safe_name(post_id + suffix))
     os.makedirs(work, exist_ok=True)
     img = os.path.join(work, 'image.jpg')
     try:
         base._download_image(post.get('img'), post.get('title', 'AI news'), img)
-        part_files = []
+        edge_voice = {
+            # Vietnamese
+            'vi-vn-hoaimyneural': 'vi-VN-HoaiMyNeural',
+            'vi-vn-namminhneural': 'vi-VN-NamMinhNeural',
+            'hoaimy': 'vi-VN-HoaiMyNeural',
+            'namminh': 'vi-VN-NamMinhNeural',
+            'nam': 'vi-VN-NamMinhNeural',
+            'male': 'vi-VN-NamMinhNeural',
+            'nu': 'vi-VN-HoaiMyNeural',
+            'female': 'vi-VN-HoaiMyNeural',
+            'mien-nam': 'vi-VN-HoaiMyNeural',
+            # English - Multilingual
+            'en-us-andrewmultilingualneural': 'en-US-AndrewMultilingualNeural',
+            'en-au-williammultilingualneural': 'en-AU-WilliamMultilingualNeural',
+            'andrew': 'en-US-AndrewMultilingualNeural',
+            'en_andrew': 'en-US-AndrewMultilingualNeural',
+            'jenny': 'en-US-AndrewMultilingualNeural',
+            'en_jenny': 'en-US-AndrewMultilingualNeural',
+            # Portuguese - Multilingual (ONLY Thalita)
+            'pt-br-thalitamultilingualneural': 'pt-BR-ThalitaMultilingualNeural',
+            'thalita': 'pt-BR-ThalitaMultilingualNeural',
+            'pt_thalita': 'pt-BR-ThalitaMultilingualNeural',
+            'pt_br_thalita': 'pt-BR-ThalitaMultilingualNeural',
+            'pt': 'pt-BR-ThalitaMultilingualNeural',
+            'pt_francisco': 'pt-BR-ThalitaMultilingualNeural',
+            # French - Multilingual
+            'fr-fr-viviennemultilingualneural': 'fr-FR-VivienneMultilingualNeural',
+            'fr-fr-remymultilingualneural': 'fr-FR-RemyMultilingualNeural',
+            'denise': 'fr-FR-VivienneMultilingualNeural',
+            'fr': 'fr-FR-VivienneMultilingualNeural',
+            'fr_denise': 'fr-FR-VivienneMultilingualNeural',
+            # German - Multilingual
+            'de-de-seraphinamultilingualneural': 'de-DE-SeraphinaMultilingualNeural',
+            'de-de-florianmultilingualneural': 'de-DE-FlorianMultilingualNeural',
+            'katja': 'de-DE-SeraphinaMultilingualNeural',
+            'de': 'de-DE-SeraphinaMultilingualNeural',
+            'de_katja': 'de-DE-SeraphinaMultilingualNeural',
+            # Korean - Multilingual (Hyunsu, NOT SunHee)
+            'ko-kr-hyusumultilingualneural': 'ko-KR-HyunsuMultilingualNeural',
+            'ko-kr-hyunsuneural': 'ko-KR-HyunsuMultilingualNeural',
+            'sunhee': 'ko-KR-HyunsuMultilingualNeural',
+            'ko': 'ko-KR-HyunsuMultilingualNeural',
+            'ko_sunhee': 'ko-KR-HyunsuMultilingualNeural',
+            # Italian - Multilingual
+            'it-it-giuseppemultilingualneural': 'it-IT-GiuseppeMultilingualNeural',
+            # Spanish (keep for backward compat)
+            'ela': 'en-US-AndrewMultilingualNeural',
+            'es_ela': 'en-US-AndrewMultilingualNeural',
+            'es': 'en-US-AndrewMultilingualNeural',
+            'es_carlos': 'en-US-AndrewMultilingualNeural',
+            # Japanese (keep for backward compat)
+            'nanami': 'en-US-AndrewMultilingualNeural',
+            'ja': 'en-US-AndrewMultilingualNeural',
+            'ja_nanami': 'en-US-AndrewMultilingualNeural',
+            # Chinese (keep for backward compat)
+            'xiaochen': 'en-US-AndrewMultilingualNeural',
+            'zh': 'en-US-AndrewMultilingualNeural',
+            'zh_xiaochen': 'en-US-AndrewMultilingualNeural',
+        }.get(voice, 'vi-VN-HoaiMyNeural')
+        part_files=[]
         for idx, seg in enumerate(segments):
-            frame = os.path.join(work, f'frame_{idx:02d}.jpg')
-            aud = os.path.join(work, f'voice_{idx:02d}.mp3')
-            aud_fast = os.path.join(work, f'voice_{idx:02d}_fast.mp3')
-            part = os.path.join(work, f'part_{idx:02d}.mp4')
+            frame=os.path.join(work,f'frame_{idx:02d}.jpg')
+            aud=os.path.join(work,f'voice_{idx:02d}.mp3')
+            aud_fast=os.path.join(work,f'voice_{idx:02d}_fast.mp3')
+            part=os.path.join(work,f'part_{idx:02d}.mp4')
             _make_scene_frame(post, seg, idx, len(segments), img, frame, emotion=emotion)
-            spoken = _emotion_script(seg, emotion)
+            spoken=_emotion_script(seg, emotion)
             try:
-                subprocess.run(['python', '-m', 'edge_tts', '--voice', edge_voice, '--text', spoken, '--write-media', aud], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=120)
+                subprocess.run(['python','-m','edge_tts','--voice',edge_voice,'--text',spoken,'--write-media',aud], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=120)
             except Exception:
-                tld = 'com.vn' if voice in ('nu', 'female', 'mien-nam', 'hoaimy') else 'com'
+                tld='com.vn' if voice in ('nu','female','mien-nam','hoaimy') else 'com'
                 try:
                     base.gTTS(spoken, lang='vi', tld=tld, slow=False).save(aud)
                 except TypeError:
                     base.gTTS(spoken, lang='vi', slow=False).save(aud)
-            subprocess.run(['ffmpeg', '-y', '-i', aud, '-filter:a', f'atempo={speed}', '-vn', aud_fast], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=90)
-            dur = _estimate_audio_duration(aud_fast, fallback=15.0) + 0.35
-            subprocess.run(['ffmpeg', '-y', '-loop', '1', '-t', str(dur), '-i', frame, '-i', aud_fast, '-shortest', '-c:v', 'libx264', '-tune', 'stillimage', '-pix_fmt', 'yuv420p', '-c:a', 'aac', '-b:a', '128k', part], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=150)
+            subprocess.run(['ffmpeg','-y','-i',aud,'-filter:a',f'atempo={speed}','-vn',aud_fast], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=90)
+            dur=_estimate_audio_duration(aud_fast, fallback=15.0)+0.35
+            subprocess.run(['ffmpeg','-y','-loop','1','-t',str(dur),'-i',frame,'-i',aud_fast,'-shortest','-c:v','libx264','-tune','stillimage','-pix_fmt','yuv420p','-c:a','aac','-b:a','128k',part], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=150)
             part_files.append(part)
-        concat = os.path.join(work, 'concat.txt')
-        with open(concat, 'w', encoding='utf-8') as f:
+        concat=os.path.join(work,'concat.txt')
+        with open(concat,'w',encoding='utf-8') as f:
             for p in part_files:
                 f.write("file '" + p.replace("'", "'\\''") + "'\n")
-        subprocess.run(['ffmpeg', '-y', '-f', 'concat', '-safe', '0', '-i', concat, '-c', 'copy', out_mp4], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=180)
+        subprocess.run(['ffmpeg','-y','-f','concat','-safe','0','-i',concat,'-c','copy',out_mp4], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=180)
         post['video'] = '/api/ai/short-file/' + post_id + suffix
         post['short_voice'] = voice
         post['short_emotion'] = emotion
@@ -894,25 +895,9 @@ def _generate_short_for_post(post_id: str, voice: str = 'nu', emotion: str = 'ne
         post['short_segments'] = segments
         post['short_subtitles'] = False
         base._save_ai_wall(posts)
-        return {'video': post['video'], 'voice': voice, 'emotion': emotion, 'speed': speed, 'subtitles': False, 'segments': segments, 'cached': False}
+        return JSONResponse({'video': post['video'], 'voice': voice, 'emotion': emotion, 'speed': speed, 'subtitles': False, 'segments': segments})
     except Exception as e:
-        return {'error': 'Không tạo được shorts: ' + str(e)[:220]}
-
-
-@app.post('/api/ai/short/{post_id}')
-async def patched_ai_short(post_id: str, request: Request):
-    try:
-        body = await request.json()
-    except Exception:
-        body = {}
-    voice = str(body.get('voice', 'nu')).strip().lower()
-    emotion = str(body.get('emotion', 'neutral')).strip().lower()
-    speed = float(body.get('speed', 1.0) or 1.0)
-    result = _generate_short_for_post(post_id, voice=voice, emotion=emotion, speed=speed)
-    if 'error' in result:
-        code = 404 if result['error'] == 'post not found' else (503 if 'gTTS' in result['error'] else 500)
-        return JSONResponse({'error': result['error']}, status_code=code)
-    return JSONResponse(result)
+        return JSONResponse({'error': 'Không tạo được shorts: ' + str(e)[:220]}, status_code=500)
 
 
 @app.get('/api/ai/short-file/{file_id}')
@@ -929,40 +914,4 @@ def api_ai_shorts():
     return JSONResponse({'posts': posts[:80]})
 
 
-# ============================================================
-# AUTO POSTER — đăng tự động rewrite + short lúc 7h, 13h, 19h
-# ============================================================
-try:
-    import auto_poster
-    _AUTO_POSTER_OK = True
-except Exception as _ap_err:
-    _AUTO_POSTER_OK = False
-    print("[auto_poster] import failed:", _ap_err)
-
-
-@app.post('/api/auto_poster/run')
-async def api_auto_poster_run(request: Request):
-    if not _AUTO_POSTER_OK:
-        return JSONResponse({'error': 'auto_poster chưa sẵn sàng'}, status_code=503)
-    try:
-        body = await request.json()
-    except Exception:
-        body = {}
-    topic = (body or {}).get('topic')
-    with_short = bool((body or {}).get('with_short', True))
-    result = auto_poster.run_once(topic=topic, with_short=with_short)
-    return JSONResponse(result)
-
-
-@app.get('/api/auto_poster/status')
-def api_auto_poster_status():
-    if not _AUTO_POSTER_OK:
-        return JSONResponse({'running': False, 'error': 'auto_poster import failed'}, status_code=503)
-    return JSONResponse(auto_poster.status())
-
-
-if _AUTO_POSTER_OK:
-    auto_poster.start()
-
-
 app.router.routes = [r for r in app.router.routes if not (getattr(r, 'path', None) == '/' and 'GET' in getattr(r, 'methods', set()))]