Update article_generator.py

article_generator.py

@@ -240,38 +240,34 @@ def generate_text_with_gpt4(prompt):
     )
     return response.choices[0]["message"]["content"].strip()
 
+# 初期データをTavily検索で収集する関数
 # 初期データをTavily検索で収集する関数
 def perform_initial_tavily_search(h2_texts, h3_texts):
     tavily_search_tool = EnhancedTavilySearchTool()
     queries = []
+    
     for idx, h2_text in enumerate(h2_texts):
         h3_for_this_h2 = [h3 for h3 in h3_texts if h3.startswith(f"{idx+1}-")]
-        if not h3_for_this_h2 and h2_text.strip() != "まとめ":
+        if not h3_for_this_h2 and h2_text.strip() != "まとめ":  # "まとめ" セクションを除外
             print(f"No matching h3 elements found for h2: {h2_text} at index {idx+1}")
             continue
+        
         query = f"{h2_text} {' '.join(h3_for_this_h2)}"
         queries.append(query)
     
-    print("Executing Tavily search with queries:", queries)
+    print("Performing Tavily search with queries:", queries)
     responses = tavily_search_tool.search(queries)
-    if isinstance(responses, str):
-        try:
-            responses = json.loads(responses)  # 文字列をJSONとして解析
-        except json.JSONDecodeError:
-            print("Error: Response string is not valid JSON.")
-            return {}
-    if not isinstance(responses, list):
-        print("Error: Response format is incorrect, expected a list.")
-        return {}
 
+    # フィルタリングを適用
     filtered_responses = filter_responses_by_domain(responses, allowed_domains)
+    
     response_dict = {}
     for i, query in enumerate(queries):
-        response = filtered_responses[i] if i < len(filtered_responses) else None
-        if isinstance(response, dict):
-            response_dict[query] = response.get('title', 'No title received')
+        if i < len(filtered_responses):  # 応答リストの範囲内にあることを確認
+            response_dict[query] = filtered_responses[i]
         else:
-            response_dict[query] = "Invalid response format or no response received"
+            response_dict[query] = "No response received"
+    
     return response_dict
 
 def save_preloaded_tavily_data(data):