Add application file

app.py

@@ -1,5 +1,4 @@
-# app.py
-from flask import Flask, render_template, request, jsonify, send_from_directory
+from flask import Flask, render_template, request, jsonify, send_from_directory, Response
 import g4f
 import os
 import subprocess
@@ -7,6 +6,8 @@ from datetime import datetime
 from typing import List, Tuple
 import uuid
 from werkzeug.utils import secure_filename
+import json
+import time
 
 app = Flask(__name__)
 app.config['UPLOAD_FOLDER'] = 'output'
@@ -143,54 +144,128 @@ def index():
     models = get_available_models()
     return render_template('index.html', models=models)
 
-@app.route('/generate', methods=['POST'])
-def generate():
-    data = request.json
-    research_subject = data.get('subject', '').strip()
-    selected_model = data.get('model', 'gpt-4')
-    structure_type = data.get('structure', 'automatic')
-    
-    if not research_subject:
-        return jsonify({'error': 'Research subject is required'}), 400
-    
-    try:
-        # Generate filenames
-        md_filename, docx_filename = generate_filename()
+@app.route('/stream')
+def stream():
+    def generate():
+        data = request.args
+        research_subject = data.get('subject', '').strip()
+        selected_model = data.get('model', 'gpt-4')
+        structure_type = data.get('structure', 'automatic')
         
-        # Generate sections based on structure type
-        if structure_type == 'automatic':
-            try:
-                sections = generate_automatic_sections(selected_model, research_subject)
-            except Exception:
+        if not research_subject:
+            yield "data: " + json.dumps({"error": "Research subject is required"}) + "\n\n"
+            return
+        
+        try:
+            # Generate filenames
+            md_filename, docx_filename = generate_filename()
+            
+            # Define progress steps
+            steps = [
+                {"id": 0, "text": "Preparing document structure...", "status": "pending"},
+                {"id": 1, "text": "Generating index/table of contents...", "status": "pending"},
+                {"id": 2, "text": "Writing introduction...", "status": "pending"},
+                {"id": 3, "text": "Generating chapters...", "status": "pending"},
+                {"id": 4, "text": "Creating conclusion...", "status": "pending"},
+                {"id": 5, "text": "Finalizing document...", "status": "pending"},
+                {"id": 6, "text": "Converting to Word format...", "status": "pending"}
+            ]
+            
+            # Update progress
+            def update_step(step_id, status, message=None):
+                steps[step_id]["status"] = status
+                if message:
+                    steps[step_id]["message"] = message
+                progress = int((step_id + 1) / len(steps) * 100)
+                yield "data: " + json.dumps({
+                    "steps": steps,
+                    "progress": progress,
+                    "current_step": step_id
+                }) + "\n\n"
+            
+            # Step 0: Prepare
+            for update in update_step(0, "in-progress"):
+                yield update
+            
+            # Generate sections based on structure type
+            if structure_type == 'automatic':
+                try:
+                    for update in update_step(1, "in-progress"):
+                        yield update
+                    sections = generate_automatic_sections(selected_model, research_subject)
+                    for update in update_step(1, "complete"):
+                        yield update
+                except Exception as e:
+                    for update in update_step(1, "error", str(e)):
+                        yield update
+                    sections = get_manual_sections(research_subject)
+                    for update in update_step(1, "in-progress", "Falling back to manual structure"):
+                        yield update
+                    index_content = generate_index_content(selected_model, research_subject, [s[0] for s in sections[1:]])
+                    sections[0] = ("Index", index_content)
+                    for update in update_step(1, "complete"):
+                        yield update
+            else:
                 sections = get_manual_sections(research_subject)
+                for update in update_step(1, "in-progress"):
+                    yield update
                 index_content = generate_index_content(selected_model, research_subject, [s[0] for s in sections[1:]])
                 sections[0] = ("Index", index_content)
-        else:
-            sections = get_manual_sections(research_subject)
-            index_content = generate_index_content(selected_model, research_subject, [s[0] for s in sections[1:]])
-            sections[0] = ("Index", index_content)
-        
-        # Generate the paper
-        write_research_paper(md_filename, research_subject, sections, selected_model)
-        
-        # Convert to Word
-        try:
-            convert_to_word(md_filename, docx_filename)
+                for update in update_step(1, "complete"):
+                    yield update
+            
+            # Generate the paper
+            for update in update_step(2, "in-progress"):
+                yield update
+            write_research_paper(md_filename, research_subject, sections, selected_model)
+            for update in update_step(2, "complete"):
+                yield update
+            
+            # Generate chapters
+            chapter_sections = [s for s in sections if s[0].startswith("Chapter")]
+            for i, (section_title, prompt) in enumerate(chapter_sections, 3):
+                for update in update_step(i, "in-progress"):
+                    yield update
+                try:
+                    if not (isinstance(prompt, str) and (prompt.startswith("##") or prompt.startswith("#"))):
+                        response = generate_section_content(selected_model, prompt)
+                    for update in update_step(i, "complete"):
+                        yield update
+                except Exception as e:
+                    for update in update_step(i, "error", str(e)):
+                        yield update
+            
+            # Conclusion
+            for update in update_step(5, "in-progress"):
+                yield update
+            for update in update_step(5, "complete"):
+                yield update
+            
+            # Convert to Word
+            for update in update_step(6, "in-progress"):
+                yield update
+            try:
+                convert_to_word(md_filename, docx_filename)
+                for update in update_step(6, "complete"):
+                    yield update
+                yield "data: " + json.dumps({
+                    "status": "complete",
+                    "docx_file": docx_filename,
+                    "md_file": md_filename
+                }) + "\n\n"
+            except Exception as e:
+                for update in update_step(6, "error", str(e)):
+                    yield update
+                yield "data: " + json.dumps({
+                    "status": "partial_success",
+                    "message": f'Paper generated but Word conversion failed: {str(e)}',
+                    "md_file": md_filename
+                }) + "\n\n"
+            
         except Exception as e:
-            return jsonify({
-                'status': 'partial_success',
-                'message': f'Paper generated but Word conversion failed: {str(e)}',
-                'md_file': md_filename
-            })
-        
-        return jsonify({
-            'status': 'success',
-            'docx_file': docx_filename,
-            'md_file': md_filename
-        })
-        
-    except Exception as e:
-        return jsonify({'error': f'Failed to generate paper: {str(e)}'}), 500
+            yield "data: " + json.dumps({"error": f"Failed to generate paper: {str(e)}"}) + "\n\n"
+    
+    return Response(generate(), mimetype="text/event-stream")
 
 @app.route('/download/<filename>')
 def download(filename):
@@ -201,5 +276,5 @@ def download(filename):
         as_attachment=True
     )
 
-if __name__ == '__main__':
-    app.run(debug=True)
+# if __name__ == '__main__':
+#     app.run(debug=True)

templates/index.html

@@ -1,4 +1,3 @@
-<!-- templates/index.html -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -141,26 +140,30 @@
             progressBar.style.width = '0%';
             progressText.textContent = '0%';
             
-            // Show initial progress steps
+            // Define steps
             const steps = [
                 'Preparing document structure...',
                 'Generating index/table of contents...',
                 'Writing introduction...',
-                'Generating chapters...',
+                'Generating Chapter 1...',
+                'Generating Chapter 2...',
+                'Generating Chapter 3...',
                 'Creating conclusion...',
                 'Finalizing document...',
                 'Converting to Word format...'
             ];
             
+            // Create step elements
             steps.forEach((step, index) => {
                 const stepElement = document.createElement('div');
                 stepElement.className = 'flex items-center';
                 stepElement.innerHTML = `
                     <div class="flex-shrink-0 h-5 w-5 text-gray-400">
-                        <i class="far fa-circle"></i>
+                        <i class="far fa-circle" id="step-icon-${index}"></i>
                     </div>
                     <div class="ml-3">
-                        <p class="text-sm font-medium text-gray-700">${step}</p>
+                        <p class="text-sm font-medium text-gray-700" id="step-text-${index}">${step}</p>
+                        <p class="text-xs text-gray-500 hidden" id="step-message-${index}"></p>
                     </div>
                 `;
                 stepElement.id = `step-${index}`;
@@ -174,86 +177,72 @@
                 structure: form.structure.value
             };
             
-            // Simulate progress updates (in a real app, you'd use SSE or websockets)
-            const totalSteps = steps.length;
-            let currentStep = 0;
+            // Create SSE connection
+            const eventSource = new EventSource(`/stream?subject=${encodeURIComponent(formData.subject)}&model=${encodeURIComponent(formData.model)}&structure=${encodeURIComponent(formData.structure)}`);
             
-            const updateProgress = () => {
-                const progress = Math.min(100, Math.round((currentStep / totalSteps) * 100));
-                progressBar.style.width = `${progress}%`;
-                progressText.textContent = `${progress}%`;
+            eventSource.onmessage = function(event) {
+                const data = JSON.parse(event.data);
                 
-                // Update step icons
-                if (currentStep > 0) {
-                    const prevStepElement = document.getElementById(`step-${currentStep-1}`);
-                    if (prevStepElement) {
-                        prevStepElement.querySelector('i').className = 'fas fa-check-circle text-green-500';
-                    }
+                if (data.error) {
+                    document.getElementById('errorMessage').textContent = data.error;
+                    errorContainer.classList.remove('hidden');
+                    eventSource.close();
+                    generateBtn.disabled = false;
+                    return;
                 }
                 
-                if (currentStep < totalSteps) {
-                    const currentStepElement = document.getElementById(`step-${currentStep}`);
-                    if (currentStepElement) {
-                        currentStepElement.querySelector('i').className = 'fas fa-spinner fa-spin text-indigo-500';
+                if (data.status === 'complete' || data.status === 'partial_success') {
+                    // Show download links
+                    if (data.docx_file) {
+                        document.getElementById('downloadDocx').href = `/download/${data.docx_file}`;
                     }
-                }
-            };
-            
-            const interval = setInterval(() => {
-                currentStep++;
-                updateProgress();
-                
-                if (currentStep >= totalSteps) {
-                    clearInterval(interval);
-                }
-            }, 1000);
-            
-            // Send request to server
-            fetch('/generate', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify(formData)
-            })
-            .then(response => response.json())
-            .then(data => {
-                clearInterval(interval);
-                updateProgress();
-                
-                if (data.error) {
-                    throw new Error(data.error);
+                    if (data.md_file) {
+                        document.getElementById('downloadMd').href = `/download/${data.md_file}`;
+                    }
+                    
+                    resultContainer.classList.remove('hidden');
+                    eventSource.close();
+                    generateBtn.disabled = false;
                 }
                 
-                // Show download links
-                if (data.docx_file) {
-                    document.getElementById('downloadDocx').href = `/download/${data.docx_file}`;
-                }
-                if (data.md_file) {
-                    document.getElementById('downloadMd').href = `/download/${data.md_file}`;
+                // Update progress
+                if (data.progress) {
+                    progressBar.style.width = `${data.progress}%`;
+                    progressText.textContent = `${data.progress}%`;
                 }
                 
-                // Mark all steps as complete
-                for (let i = 0; i < steps.length; i++) {
-                    const stepElement = document.getElementById(`step-${i}`);
-                    if (stepElement) {
-                        stepElement.querySelector('i').className = 'fas fa-check-circle text-green-500';
-                    }
+                // Update steps
+                if (data.steps) {
+                    data.steps.forEach(step => {
+                        const icon = document.getElementById(`step-icon-${step.id}`);
+                        const text = document.getElementById(`step-text-${step.id}`);
+                        const message = document.getElementById(`step-message-${step.id}`);
+                        
+                        if (icon) {
+                            if (step.status === 'pending') {
+                                icon.className = 'far fa-circle text-gray-400';
+                            } else if (step.status === 'in-progress') {
+                                icon.className = 'fas fa-spinner fa-spin text-indigo-500';
+                            } else if (step.status === 'complete') {
+                                icon.className = 'fas fa-check-circle text-green-500';
+                            } else if (step.status === 'error') {
+                                icon.className = 'fas fa-exclamation-circle text-red-500';
+                            }
+                        }
+                        
+                        if (message && step.message) {
+                            message.textContent = step.message;
+                            message.classList.remove('hidden');
+                        }
+                    });
                 }
-                
-                progressBar.style.width = '100%';
-                progressText.textContent = '100%';
-                resultContainer.classList.remove('hidden');
-            })
-            .catch(error => {
-                clearInterval(interval);
-                document.getElementById('errorMessage').textContent = error.message;
-                errorContainer.classList.remove('hidden');
-            })
-            .finally(() => {
+            };
+            
+            eventSource.onerror = function() {
+                eventSource.close();
                 generateBtn.disabled = false;
-            });
+            };
         });
     </script>
 </body>
-</html>
+</html>