Update app.py

app.py

@@ -338,30 +338,30 @@ async def update_audio_preview(audio_file):
     return None
 
 # Async function to generate lecture materials and audio
-async def on_generate(api_service, api_key, serpapi_key, title, topic, instructions, lecture_type, speaker_audio, num_slides):
+async def on_generate(api_service, api_key, serpapi_key, title, lecture_content_description, instructions, lecture_type, speaker_audio, num_slides):
     if not serpapi_key:
-        yield {
-            "html": f"""
+        yield (
+            f"""
             <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                 <h2 style="color: #d9534f;">SerpApi key required</h2>
                 <p style="margin-top: 20px;">Please provide a valid SerpApi key and try again.</p>
             </div>
             """,
-            "files": []
-        }
+            []
+        )
         return
 
     if tts is None:
-        yield {
-            "html": f"""
+        yield (
+            f"""
             <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                 <h2 style="color: #d9534f;">TTS model initialization failed</h2>
                 <p style="margin-top: 20px;">The TTS model failed to initialize at startup.</p>
                 <p>Please ensure the Coqui TTS model is properly installed and try restarting the application.</p>
             </div>
             """,
-            "files": []
-        }
+            []
+        )
         return
 
     model_client = get_model_client(api_service, api_key)
@@ -424,21 +424,21 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
     
     progress = 0
     label = "Research: in progress..."
-    yield {
-        "html": html_with_progress(label, progress),
-        "files": []
-    }
+    yield (
+        html_with_progress(label, progress),
+        []
+    )
     await asyncio.sleep(0.1)
     
     initial_message = f"""
     Lecture Title: {title}
-    Topic: {topic}
+    Lecture Content Description: {lecture_content_description}
     Additional Instructions: {instructions}
     Audience: {lecture_type}
     Number of Slides: {total_slides}
     Please start by researching the topic.
     """
-    logger.info("Starting lecture generation for topic: %s with %d slides", topic, total_slides)
+    logger.info("Starting lecture generation for title: %s with %d slides", title, total_slides)
     
     slides = None
     scripts = None
@@ -467,10 +467,10 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                 if source == "research_agent" and message.target == "slide_agent":
                     progress = 25
                     label = "Slides: generating..."
-                    yield {
-                        "html": html_with_progress(label, progress),
-                        "files": []
-                    }
+                    yield (
+                        html_with_progress(label, progress),
+                        []
+                    )
                     await asyncio.sleep(0.1)
                 elif source == "slide_agent" and message.target == "script_agent":
                     if slides is None:
@@ -492,10 +492,10 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                             continue
                     progress = 50
                     label = "Scripts: generating..."
-                    yield {
-                        "html": html_with_progress(label, progress),
-                        "files": []
-                    }
+                    yield (
+                        html_with_progress(label, progress),
+                        []
+                    )
                     await asyncio.sleep(0.1)
                 elif source == "script_agent" and message.target == "feynman_agent":
                     if scripts is None:
@@ -506,20 +506,20 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                             logger.info("Extracted scripts JSON from HandoffMessage context: %s", scripts)
                     progress = 75
                     label = "Review: in progress..."
-                    yield {
-                        "html": html_with_progress(label, progress),
-                        "files": []
-                    }
+                    yield (
+                        html_with_progress(label, progress),
+                        []
+                    )
                     await asyncio.sleep(0.1)
             
             elif source == "research_agent" and isinstance(message, TextMessage) and "handoff_to_slide_agent" in message.content:
                 logger.info("Research Agent completed research")
                 progress = 25
                 label = "Slides: generating..."
-                yield {
-                    "html": html_with_progress(label, progress),
-                    "files": []
-                }
+                yield (
+                    html_with_progress(label, progress),
+                    []
+                )
                 await asyncio.sleep(0.1)
             
             elif source == "slide_agent" and isinstance(message, (TextMessage, StructuredMessage)):
@@ -549,10 +549,10 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                             logger.error("Error saving slide content to %s: %s", content_file, str(e))
                     progress = 50
                     label = "Scripts: generating..."
-                    yield {
-                        "html": html_with_progress(label, progress),
-                        "files": []
-                    }
+                    yield (
+                        html_with_progress(label, progress),
+                        []
+                    )
                     await asyncio.sleep(0.1)
                 else:
                     logger.warning("No JSON extracted from slide_agent message")
@@ -583,10 +583,10 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                             logger.error("Error saving raw script to %s: %s", script_file, str(e))
                     progress = 75
                     label = "Scripts generated and saved. Reviewing..."
-                    yield {
-                        "html": html_with_progress(label, progress),
-                        "files": []
-                    }
+                    yield (
+                        html_with_progress(label, progress),
+                        []
+                    )
                     await asyncio.sleep(0.1)
                 else:
                     logger.warning("No JSON extracted from script_agent message")
@@ -605,10 +605,10 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                 logger.info("Feynman Agent completed lecture review: %s", message.content)
                 progress = 90
                 label = "Lecture materials ready. Generating audio..."
-                yield {
-                    "html": html_with_progress(label, progress),
-                    "files": []
-                }
+                yield (
+                    html_with_progress(label, progress),
+                    []
+                )
                 await asyncio.sleep(0.1)
         
         logger.info("Slides state: %s", "Generated" if slides else "None")
@@ -621,83 +621,83 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
             for msg in task_result.messages:
                 source = getattr(msg, 'source', getattr(msg, 'sender', None))
                 logger.debug("Message from %s, type: %s, content: %s", source, type(msg), msg.to_text() if hasattr(msg, 'to_text') else str(msg))
-            yield {
-                "html": f"""
+            yield (
+                f"""
                 <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                     <h2 style="color: #d9534f;">{error_message}</h2>
                     <p style="margin-top: 20px;">Please try again with a different model (e.g., Anthropic-claude-3-sonnet-20240229) or simplify the topic/instructions.</p>
                 </div>
                 """,
-                "files": []
-            }
+                []
+            )
             return
         
         if len(slides) != total_slides:
             logger.error("Expected %d slides, but received %d", total_slides, len(slides))
-            yield {
-                "html": f"""
+            yield (
+                f"""
                 <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                     <h2 style="color: #d9534f;">Incorrect number of slides</h2>
                     <p style="margin-top: 20px;">Expected {total_slides} slides, but generated {len(slides)}. Please try again.</p>
                 </div>
                 """,
-                "files": []
-            }
+                []
+            )
             return
         
         if not isinstance(scripts, list) or not all(isinstance(s, str) for s in scripts):
             logger.error("Scripts are not a list of strings: %s", scripts)
-            yield {
-                "html": f"""
+            yield (
+                f"""
                 <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                     <h2 style="color: #d9534f;">Invalid script format</h2>
                     <p style="margin-top: 20px;">Scripts must be a list of strings. Please try again.</p>
                 </div>
                 """,
-                "files": []
-            }
+                []
+            )
             return
         
         if len(scripts) != total_slides:
             logger.error("Mismatch between number of slides (%d) and scripts (%d)", len(slides), len(scripts))
-            yield {
-                "html": f"""
+            yield (
+                f"""
                 <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                     <h2 style="color: #d9534f;">Mismatch in slides and scripts</h2>
                     <p style="margin-top: 20px;">Generated {len(slides)} slides but {len(scripts)} scripts. Please try again.</p>
                 </div>
                 """,
-                "files": []
-            }
+                []
+            )
             return
         
         markdown_slides = generate_markdown_slides(slides, title)
         if not markdown_slides:
             logger.error("Failed to generate Markdown slides")
-            yield {
-                "html": f"""
+            yield (
+                f"""
                 <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                     <h2 style="color: #d9534f;">Failed to generate slides</h2>
                     <p style="margin-top: 20px;">Please try again.</p>
                 </div>
                 """,
-                "files": []
-            }
+                []
+            )
             return
         
         audio_files = []
         validated_speaker_wav = await validate_and_convert_speaker_audio(speaker_audio)
         if not validated_speaker_wav:
             logger.error("Invalid speaker audio after conversion, skipping TTS")
-            yield {
-                "html": f"""
+            yield (
+                f"""
                 <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                     <h2 style="color: #d9534f;">Invalid speaker audio</h2>
                     <p style="margin-top: 20px;">Please upload a valid MP3 or WAV audio file and try again.</p>
                 </div>
                 """,
-                "files": []
-            }
+                []
+            )
             return
         
         for i, script in enumerate(scripts):
@@ -717,10 +717,10 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                 audio_files.append(None)
                 progress = 90 + ((i + 1) / len(scripts)) * 10
                 label = f"Generating speech for slide {i + 1}/{len(scripts)}..."
-                yield {
-                    "html": html_with_progress(label, progress),
-                    "files": []
-                }
+                yield (
+                    html_with_progress(label, progress),
+                    []
+                )
                 await asyncio.sleep(0.1)
                 continue
             
@@ -742,10 +742,10 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                     audio_files.append(audio_file)
                     progress = 90 + ((i + 1) / len(scripts)) * 10
                     label = f"Generated audio for slide {i + 1}/{len(scripts)}..."
-                    yield {
-                        "html": html_with_progress(label, progress),
-                        "files": []
-                    }
+                    yield (
+                        html_with_progress(label, progress),
+                        []
+                    )
                     await asyncio.sleep(0.1)
                     break
                 except Exception as e:
@@ -755,10 +755,10 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
                         audio_files.append(None)
                         progress = 90 + ((i + 1) / len(scripts)) * 10
                         label = f"Generated audio for slide {i + 1}/{len(scripts)}..."
-                        yield {
-                            "html": html_with_progress(label, progress),
-                            "files": []
-                        }
+                        yield (
+                            html_with_progress(label, progress),
+                            []
+                        )
                         await asyncio.sleep(0.1)
                         break
         
@@ -893,23 +893,23 @@ Example: 'Received {total_slides} slides and {total_slides} scripts. Lecture is
         </script>
         """
         logger.info("Lecture generation completed successfully")
-        yield {
-            "html": html_output,
-            "files": txt_file_paths
-        }
+        yield (
+            html_output,
+            txt_file_paths
+        )
     
     except Exception as e:
         logger.error("Error during lecture generation: %s\n%s", str(e), traceback.format_exc())
-        yield {
-            "html": f"""
+        yield (
+            f"""
             <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%; min-height: 700px; padding: 20px; text-align: center; border: 1px solid #ddd; border-radius: 8px;">
                 <h2 style="color: #d9534f;">Error during lecture generation</h2>
                 <p style="margin-top: 10px; font-size: 16px;">{str(e)}</p>
                 <p style="margin-top: 20px;">Please try again or adjust your inputs.</p>
             </div>
             """,
-            "files": []
-        }
+            []
+        )
         return
 
 # Gradio interface
@@ -919,8 +919,8 @@ with gr.Blocks(title="Agent Feynman") as demo:
         with gr.Column(scale=1):
             with gr.Group():
                 title = gr.Textbox(label="Lecture Title", placeholder="e.g. Introduction to AI")
-                topic = gr.Textbox(label="Topic", placeholder="e.g. Artificial Intelligence")
-                instructions = gr.Textbox(label="Additional Instructions", placeholder="e.g. Focus on recent advancements")
+                lecture_content_description = gr.Textbox(label="Lecture Content Description", placeholder="e.g. Focus on recent advancements")
+                instructions = gr.Textbox(label="Additional Instructions", placeholder="e.g. Include examples")
                 lecture_type = gr.Dropdown(["Conference", "University", "High school"], label="Audience", value="University")
                 api_service = gr.Dropdown(
                     choices=[
@@ -955,7 +955,7 @@ with gr.Blocks(title="Agent Feynman") as demo:
     
     generate_btn.click(
         fn=on_generate,
-        inputs=[api_service, api_key, serpapi_key, title, topic, instructions, lecture_type, speaker_audio, num_slides],
+        inputs=[api_service, api_key, serpapi_key, title, lecture_content_description, instructions, lecture_type, speaker_audio, num_slides],
         outputs=[slide_display, file_output]
     )