Update article_generator.py

article_generator.py

@@ -138,7 +138,7 @@ def setup_plan_and_execute_agent():
 def generate_text_with_gpt4(prompt):
     response = openai.ChatCompletion.create(
         model="gpt-4o",
-        messages=[{"role": "system", "content": "以下についての詳細な情報をまとめ、適宜<li>タグを用いて箇所書き、もしくは表を使ってオリジナルの内容にしてください。"},
+        messages=[{"role": "system", "content": "以下についての詳細な情報をまとめ、適宜箇所書き、もしくは表を使ってオリジナルの内容にしてください。"},
                   {"role": "user", "content": prompt}],
         temperature=0.7,
         max_tokens=1000
@@ -148,14 +148,18 @@ def generate_text_with_gpt4(prompt):
 # 記事のセクションをGPT-4で拡張する関数
 def expand_section_with_gpt4(h2_text, h3_texts, preloaded_data):
     prompts = []
+    h3_to_text = {}
     for h3_text in h3_texts:
         key = f"{h2_text} {h3_text}"
         if key in preloaded_data:
             context = preloaded_data[key]
-            prompt = f"「{h3_text}」をそのまま記述し、「{h3_text}」に続く本文も生成してください。その本文は「{h3_text}」についての（初期の情報）から得られた詳細な情報を加えた本文としてください。以下は初期の情報です：\n{context}"
+            prompt = f"「{h3_text}」について詳しく説明してください。こちらが背景情報です：\n{context}"
             prompts.append(prompt)
+            h3_to_text[h3_text] = prompt  # プロンプトではなく後で置き換えるテキストを格納するための準備
         else:
-            prompts.append(f"「{h3_text}」をそのまま記述し、「{h3_text}」に続く本文も生成してください。その本文は「{h3_text}」についての（初期の情報）から得られた詳細な情報を加えた本文としてください。")
+            prompt = f"「{h3_text}」について詳しく説明してください。"
+            prompts.append(prompt)
+            h3_to_text[h3_text] = prompt
 
     if not prompts:  # promptsが空の場合
         print("No prompts to process.")
@@ -164,36 +168,32 @@ def expand_section_with_gpt4(h2_text, h3_texts, preloaded_data):
     expanded_texts = []
     # ThreadPoolExecutorのmax_workersに最小値を設定
     with ThreadPoolExecutor(max_workers=max(1, len(prompts))) as executor:
-        future_to_prompt = {executor.submit(generate_text_with_gpt4, prompt): prompt for prompt in prompts}
+        future_to_prompt = {executor.submit(generate_text_with_gpt4, prompt): h3_text for prompt, h3_text in zip(prompts, h3_texts)}
         for future in as_completed(future_to_prompt):
-            prompt = future_to_prompt[future]
+            h3_text = future_to_prompt[future]
             try:
                 expanded_text = future.result()
                 expanded_texts.append(expanded_text)
+                h3_to_text[h3_text] = expanded_text  # 実際に生成されたテキストを保存
             except Exception as e:
-                error_message = f"Error in generating text for {prompt}: {str(e)}"
+                error_message = f"Error generating text for {h3_text}: {str(e)}"
                 print(error_message)
                 expanded_texts.append("Error in text generation.")
 
-    return expanded_texts
+    return h3_to_text
 
 # 記事を拡張する関数
-def generate_expanded_article(article_html):
+def generate_expanded_article(article_html, h3_to_text):
     print("Expanding article...")
     soup = BeautifulSoup(article_html, 'html.parser')
-    h2_elements = soup.find_all('h2')
-    preloaded_data = load_preloaded_tavily_data()
-    
-    for h2 in h2_elements:
-        h3_texts = [h3.get_text() for h3 in h2.find_next_siblings('h3')]
-        expanded_texts = expand_section_with_gpt4(h2.get_text(), h3_texts, preloaded_data)
-        
-        for h3, expanded_text in zip(h3_texts, expanded_texts):
-            h3_tag = soup.find('h3', text=h3)
+    h3_elements = soup.find_all('h3')
+
+    for h3 in h3_elements:
+        if h3.get_text() in h3_to_text:
             new_paragraph = soup.new_tag('p')
-            new_paragraph.string = expanded_text
-            h3_tag.insert_after(new_paragraph)
-    
+            new_paragraph.string = h3_to_text[h3.get_text()]  # 生成されたテキストを挿入
+            h3.insert_after(new_paragraph)
+
     return str(soup)
 
 # 記事を生成する関数
@@ -314,7 +314,8 @@ def generate_article(editable_output2):
     final_result = "\n".join(results)
 
     # 生成された初期記事を拡張
-    expanded_article = generate_expanded_article(final_result)
+    h3_to_text = expand_section_with_gpt4(final_result, h3_texts, cached_responses)
+    expanded_article = generate_expanded_article(final_result, h3_to_text)
 
     with open("output3.txt", "w", encoding="utf-8") as f:
         f.write(expanded_article)
@@ -376,7 +377,8 @@ def continue_generate_article():
     final_result = "\n".join(results)
 
     # 生成された初期記事を拡張
-    expanded_article = generate_expanded_article(final_result)
+    h3_to_text = expand_section_with_gpt4(final_result, h3_texts, cached_responses)
+    expanded_article = generate_expanded_article(final_result, h3_to_text)
 
     with open("output3.txt", "w", encoding="utf-8") as f:
         f.write(expanded_article)