Update scheduler.py

scheduler.py

@@ -39,7 +39,7 @@ class NewsScheduler:
         logger.info("新聞排程器已啟動 - 每30分鐘自動爬取")
         
         # 立即執行一次爬取
-        threading.Thread(target=self._run_crawl_task, daemon=True).start()
+        threading.Thread(target=self.run_crawl_task, daemon=True).start()
     
     def stop(self):
         """停止排程器"""
@@ -59,109 +59,156 @@ class NewsScheduler:
                 time.sleep(60)
     
     def _run_crawl_task(self):
-        """執行爬蟲任務"""
+        """內部爬蟲任務（不回傳結果）"""
+        try:
+            self.run_crawl_task()
+        except Exception as e:
+            logger.error(f"內部爬蟲任務錯誤: {e}")
+    
+    def run_crawl_task(self):
+        """執行爬蟲任務（可被外部調用）"""
         try:
             start_time = time.time()
-            logger.info("開始執行定時爬蟲任務")
+            logger.info("🚀 開始執行爬蟲任務")
             
             # 爬取所有分類
-            all_news = self.crawler.crawl_all_categories(max_articles_per_category=15)
+            all_news = self.crawler.crawl_all_categories(max_articles_per_category=8)
             
             total_articles = 0
             total_inserted = 0
+            total_success = 0
             
             for category, articles in all_news.items():
                 if not articles:
+                    logger.warning(f"⚠️ {category} 分類沒有獲取到文章")
                     continue
                 
+                logger.info(f"📊 開始處理 {category} 分類的 {len(articles)} 篇文章")
+                
                 # 情緒分析
-                analyzed_articles = self._analyze_articles_sentiment(articles)
+                try:
+                    logger.info(f"🧠 開始對 {category} 分類進行情緒分析")
+                    analyzed_articles = self._analyze_articles_sentiment(articles)
+                    logger.info(f"✅ {category} 分類情緒分析完成")
+                except Exception as e:
+                    logger.error(f"❌ {category} 分類情緒分析錯誤: {e}")
+                    analyzed_articles = articles  # 使用原始文章
                 
                 # 轉換為資料庫格式
-                db_articles = self._convert_to_db_format(analyzed_articles)
+                try:
+                    db_articles = self._convert_to_db_format(analyzed_articles)
+                    logger.info(f"🔄 {category} 分類轉換為資料庫格式: {len(db_articles)} 篇")
+                except Exception as e:
+                    logger.error(f"❌ {category} 分類格式轉換錯誤: {e}")
+                    continue
                 
                 # 插入資料庫
-                inserted, duplicates = self.db.insert_news(db_articles)
-                
-                total_articles += len(articles)
-                total_inserted += inserted
-                
-                # 記錄統計
-                execution_time = time.time() - start_time
-                self.db.record_crawl_stats(
-                    category=category,
-                    articles_count=len(articles),
-                    success_count=inserted,
-                    error_count=len(articles) - inserted,
-                    execution_time=execution_time
-                )
-                
-                logger.info(f"{category} 分類: {len(articles)} 篇文章, {inserted} 篇新增")
+                try:
+                    if db_articles:
+                        inserted, duplicates = self.db.insert_news(db_articles)
+                        logger.info(f"💾 {category} 分類資料庫操作完成: 新增 {inserted} 篇, 重複 {duplicates} 篇")
+                        
+                        total_articles += len(articles)
+                        total_inserted += inserted
+                        total_success += len(analyzed_articles)
+                        
+                        # 記錄統計
+                        execution_time = time.time() - start_time
+                        self.db.record_crawl_stats(
+                            category=category,
+                            articles_count=len(articles),
+                            success_count=inserted,
+                            error_count=len(articles) - inserted,
+                            execution_time=execution_time
+                        )
+                    else:
+                        logger.warning(f"⚠️ {category} 分類沒有有效的文章數據")
+                except Exception as e:
+                    logger.error(f"❌ {category} 分類資料庫插入錯誤: {e}")
+                    continue
             
             execution_time = time.time() - start_time
-            logger.info(f"爬蟲任務完成 - 總計: {total_articles} 篇, 新增: {total_inserted} 篇, 耗時: {execution_time:.2f}秒")
+            result_message = f"🎉 爬蟲任務完成 - 總計: {total_articles} 篇, 成功: {total_success} 篇, 新增: {total_inserted} 篇, 耗時: {execution_time:.2f}秒"
+            logger.info(result_message)
             
-            return f"成功爬取 {total_articles} 篇文章，新增 {total_inserted} 篇"
+            return result_message
             
         except Exception as e:
-            logger.error(f"爬蟲任務執行錯誤: {e}")
-            return f"爬蟲任務失敗: {str(e)}"
+            error_message = f"❌ 爬蟲任務執行錯誤: {e}"
+            logger.error(error_message)
+            return error_message
     
     def _analyze_articles_sentiment(self, articles: List[NewsItem]) -> List[NewsItem]:
         """對文章進行情緒分析"""
         try:
-            logger.info(f"開始分析 {len(articles)} 篇文章的情緒")
+            logger.info(f"🔍 開始分析 {len(articles)} 篇文章的情緒")
             
-            for article in articles:
-                sentiment_result = self.sentiment_analyzer.analyze_sentiment(
-                    article.content, 
-                    article.title
-                )
-                
-                article.sentiment = sentiment_result['sentiment']
-                article.sentiment_score = sentiment_result['confidence']
+            for i, article in enumerate(articles, 1):
+                try:
+                    logger.debug(f"分析第 {i}/{len(articles)} 篇: {article.title[:30]}...")
+                    
+                    sentiment_result = self.sentiment_analyzer.analyze_sentiment(
+                        article.content, 
+                        article.title
+                    )
+                    
+                    article.sentiment = sentiment_result['sentiment']
+                    article.sentiment_score = sentiment_result['confidence']
+                    
+                    logger.debug(f"情緒分析結果: {sentiment_result['sentiment']} (信心度: {sentiment_result['confidence']:.2f})")
+                    
+                except Exception as e:
+                    logger.error(f"分析第 {i} 篇文章時發生錯誤: {e}")
+                    # 設置默認值
+                    article.sentiment = 'neutral'
+                    article.sentiment_score = 0.5
             
-            logger.info("情緒分析完成")
+            logger.info("✅ 情緒分析完成")
             return articles
             
         except Exception as e:
-            logger.error(f"情緒分析錯誤: {e}")
+            logger.error(f"❌ 情緒分析過程錯誤: {e}")
             return articles
     
     def _convert_to_db_format(self, articles: List[NewsItem]) -> List[Dict]:
         """轉換為資料庫格式"""
         db_articles = []
         
-        for article in articles:
-            # 檢查重複
-            if self.db.check_duplicate_by_title(article.title):
-                logger.info(f"跳過重複文章: {article.title[:50]}...")
+        logger.info(f"🔄 開始轉換 {len(articles)} 篇文章為資料庫格式")
+        
+        for i, article in enumerate(articles, 1):
+            try:
+                # 檢查重複
+                if self.db.check_duplicate_by_title(article.title):
+                    logger.info(f"⏭️ 跳過重複文章 {i}: {article.title[:30]}...")
+                    continue
+                
+                db_article = {
+                    'title': article.title,
+                    'content': article.content,
+                    'url': article.url,
+                    'source': article.source,
+                    'category': article.category,
+                    'published_date': article.published_date.isoformat() if article.published_date else datetime.now().isoformat(),
+                    'sentiment': article.sentiment,
+                    'sentiment_score': article.sentiment_score,
+                    'sentiment_method': 'auto'
+                }
+                
+                db_articles.append(db_article)
+                logger.debug(f"✅ 轉換文章 {i}: {article.title[:30]}...")
+                
+            except Exception as e:
+                logger.error(f"❌ 轉換第 {i} 篇文章時發生錯誤: {e}")
                 continue
-            
-            db_article = {
-                'title': article.title,
-                'content': article.content,
-                'url': article.url,
-                'source': article.source,
-                'category': article.category,
-                'published_date': article.published_date.isoformat(),
-                'sentiment': article.sentiment,
-                'sentiment_score': article.sentiment_score,
-                'sentiment_method': 'auto'
-            }
-            
-            db_articles.append(db_article)
         
+        logger.info(f"🔄 轉換完成，有效文章: {len(db_articles)} 篇")
         return db_articles
     
     def _cleanup_old_news(self):
         """清理舊新聞"""
         try:
             deleted_count = self.db.cleanup_old_news(days=14)
-            logger.info(f"清理任務完成，刪除了 {deleted_count} 條舊新聞")
+            logger.info(f"🧹 清理任務完成，刪除了 {deleted_count} 條舊新聞")
         except Exception as e:
-            logger.error(f"清理舊新聞錯誤: {e}")
-    
-    def run_crawl_task(self):
-        """手動執行爬蟲任務（用於UI）"""
-        return self._run_crawl_task()
+            logger.error(f"❌ 清理舊新聞錯誤: {e}")