Update app.py

app.py

@@ -67,11 +67,19 @@ def process_article(new_keyword, other_keywords, action, edited_article_structur
 
             with open("output3.txt", "r", encoding="utf-8") as f:
                 final_article_content = f.read()
-                final_article_html = final_article_content  # 本文作成の出力がMarkdownとHTMLの両方を更新すると仮定
+                # final_article_htmlをgr.HTMLオブジェクトとして再初期化
+                final_article_html = gr.HTML(value=final_article_content, visible=True)
+
+            # デバッグ出力追加
+            print("After updating from output3.txt - final_article_html value:", final_article_html)
+            print("After updating from output3.txt - final_article_html type:", type(final_article_html))
         except Exception as e:
             final_article_content = f"予期せぬエラーが発生しました：{str(e)}"
-            final_article_html = ""
+            final_article_html = gr.HTML(visible=False)  # ここでも例外が発生した場合に備えて適切なオブジェクトを設定
             print(f"予期せぬエラーが発生しました：{str(e)}")
+            print("final_article_html after error:", final_article_html)
+            print("final_article_html type after error:", type(final_article_html))
+      
         return response_text, final_article_content, final_article_html
 
 def custom_html_to_markdown(html):
@@ -94,17 +102,16 @@ def custom_html_to_markdown(html):
     # 最終的なMarkdownテキストの取得
     return soup.get_text()
 
-def display_content(content, format):
-    if format == "Markdown":
-        return custom_html_to_markdown(content)
-    else:
-        return content
+def display_content(content, formatted_final_article_md, formatted_final_article_html):
+    print("Type of formatted_final_article_html before processing in display_content:", type(formatted_final_article_html))
+    if type(formatted_final_article_html) is not gr.components.HTML:
+        print("Error: formatted_final_article_html is not a gr.HTML object")
+        return formatted_final_article_md, formatted_final_article_html  # エラーがあれば早期リターン
 
-def switch_display_format(format_choice, md_content, html_content):
-    if format_choice == "HTML":
-        return gr.update(value=html_content, visible=True), gr.update(visible=False)
-    else:
-        return gr.update(visible=True), gr.update(value=md_content, visible=False)
+    markdown_content = custom_html_to_markdown(content)
+    formatted_final_article_md.update(value=markdown_content, visible=True)
+    formatted_final_article_html.update(visible=False) # HTMLを非表示にする
+    return formatted_final_article_md, formatted_final_article_html
 
 # Gradioアプリの設定
 with gr.Blocks(css='''
@@ -121,8 +128,8 @@ with gr.Blocks(css='''
             create_structure_button = gr.Button("構成作成")
             editable_output2 = gr.Textbox(label="編集可能な記事構成", lines=10, placeholder="記事構成がここに表示されます")
             create_article_button = gr.Button("本文作成")
-            formatted_final_article_md = gr.Markdown(label="最終的な記事本文")
-            formatted_final_article_html = gr.HTML(label="最終的な記事本文", visible=False)
+            formatted_final_article_md = gr.Markdown(value="", visible=True, label="最終的な記事本文")
+            formatted_final_article_html = gr.HTML(value="", visible=False, label="最終的な記事本文(HTML)")
 
             create_structure_button.click(
                 fn=process_article,
@@ -133,17 +140,10 @@ with gr.Blocks(css='''
             create_article_button.click(
                 fn=process_article,
                 inputs=[new_keyword, other_keywords, gr.State(value="本文作成"), editable_output2],
-                outputs=[editable_output2, formatted_final_article_md, formatted_final_article_html]
+                outputs=[editable_output2, formatted_final_article_md]
             )
 
-            # 表示形式の選択を追加
-            display_format = gr.Radio(label="表示形式", choices=["Markdown", "HTML"], value="Markdown", elem_classes="right-align")
-
-            display_format.change(
-                fn=switch_display_format,
-                inputs=[display_format, formatted_final_article_md, formatted_final_article_html],
-                outputs=[formatted_final_article_md, formatted_final_article_html]
-            )
+            print("Setup change event for display_format with MD and HTML components")
 
         with gr.Column():
             gr.Markdown(" ", elem_id="spacer")  # 空白を作るための見えないMarkdown
@@ -163,4 +163,4 @@ with gr.Blocks(css='''
             search_button.click(tavily_search_interface, inputs=[selected_text, domain_filter], outputs=[search_results_md, search_results_html])
             search_display_format.change(switch_search_display_format, inputs=[search_display_format], outputs=[search_results_md, search_results_html])
 
-    app.launch()
+    app.launch()