update_

main.py

@@ -280,26 +280,41 @@ def compute_marks():
                 processed_answers.append(ans)
         answers = processed_answers
 
-        # Initialize data structure and parent folder
+        # Get files from the request
+        files = request.files.getlist('files[]')
+        if not files:
+            log_print("No files were uploaded", "ERROR")
+            return jsonify({"error": "No files were uploaded"}), 400
+
+        # Create student folders and save files
         data = {}
-        parent_folder = ans_image_dir  # Use the temp directory path defined earlier
-        
-        # Check if answers exist
-        if not answers:
-            log_print("No answers found", "ERROR")
-            return jsonify({"error": "Missing required files"}), 400
-
-        # Process student folders and images
-        for student_folder in os.listdir(parent_folder):
-            student_path = os.path.join(parent_folder, student_folder)
-            if os.path.isdir(student_path):
-                for image_file in os.listdir(student_path):
-                    if image_file.endswith('.jpg'):  # Correct syntax for single extension
-                        full_path = os.path.join(student_path, image_file).replace("\\", "/")
-                        if student_folder in data:
-                            data[student_folder].append(full_path)
-                        else:
-                            data[student_folder] = [full_path]
+        for file in files:
+            if file and is_valid_image_file(file.filename):
+                # Extract student folder from the path
+                path_parts = file.filename.split('/')
+                if len(path_parts) >= 2:
+                    student_folder = path_parts[-2]  # Get the parent folder name
+                    filename = path_parts[-1]  # Get the actual filename
+                    
+                    # Create student directory if it doesn't exist
+                    student_dir = os.path.join(ans_image_dir, student_folder)
+                    os.makedirs(student_dir, exist_ok=True)
+                    
+                    # Save the file
+                    filepath = os.path.join(student_dir, filename)
+                    file.save(filepath)
+                    
+                    # Add to data structure
+                    if student_folder not in data:
+                        data[student_folder] = []
+                    data[student_folder].append(filepath.replace("\\", "/"))
+                    log_print(f"Saved file: {filepath}")
+
+        if not data:
+            log_print("No valid image files were found in the upload", "ERROR")
+            return jsonify({"error": "No valid image files were found"}), 400
+
+        log_print(f"Processed files structure: {data}")
 
         # Initialize vectors for answers
         sen_vec_answers = []
@@ -315,10 +330,10 @@ def compute_marks():
 
         # Calculate marks
         s_marks = {}
-        for student_folder in data:
+        for student_folder, file_paths in data.items():
             s_marks[student_folder] = []
             count = 0
-            for image_path in data[student_folder]:
+            for image_path in file_paths:
                 try:
                     s_answer = extract_text_from_image(image_path)
                     log_print(f"\nProcessing {student_folder}/{os.path.basename(image_path)}:")
@@ -344,18 +359,14 @@ def compute_marks():
                     log_print(f"Error processing {image_path}: {str(e)}", "ERROR")
                     s_marks[student_folder].append(0)
 
+        if not s_marks:
+            log_print("No marks were computed", "ERROR")
+            return jsonify({"error": "No marks were computed. Please check your input files and answers."}), 400
+
         log_print("\nFinal Results:")
         for student, marks_list in s_marks.items():
             log_print(f"{student}: {marks_list}")
 
-        # Add cleanup at the end
-        try:
-            import shutil
-            shutil.rmtree(ans_image_dir)
-            os.makedirs(ans_image_dir, exist_ok=True)
-        except Exception as e:
-            log_print(f"Warning: Could not clean up ans_image directory: {e}", "WARNING")
-            
         return jsonify({"message": s_marks}), 200
 
     except Exception as e:

templates/index.html

@@ -499,6 +499,39 @@
             margin-top: 0;
             color: #4361ee;
         }
+
+        .loading-overlay {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: rgba(0, 0, 0, 0.7);
+            display: none;
+            justify-content: center;
+            align-items: center;
+            z-index: 1000;
+        }
+
+        .loading-spinner {
+            width: 50px;
+            height: 50px;
+            border: 5px solid #f3f3f3;
+            border-top: 5px solid #4361ee;
+            border-radius: 50%;
+            animation: spin 1s linear infinite;
+        }
+
+        .loading-text {
+            color: white;
+            margin-top: 20px;
+            font-size: 18px;
+        }
+
+        @keyframes spin {
+            0% { transform: rotate(0deg); }
+            100% { transform: rotate(360deg); }
+        }
     </style>
 </head>
 <body>
@@ -570,6 +603,13 @@
         </div>
     </div>
 
+    <div class="loading-overlay" id="loading-overlay">
+        <div style="text-align: center;">
+            <div class="loading-spinner"></div>
+            <div class="loading-text">Processing... This may take a few minutes.</div>
+        </div>
+    </div>
+
     <script>
         document.addEventListener('DOMContentLoaded', function() {
             const fileTypeSelect = document.getElementById('file-type');
@@ -613,8 +653,17 @@
             handleFileTypeChange();
         });
 
+        function showLoading() {
+            document.getElementById('loading-overlay').style.display = 'flex';
+        }
+
+        function hideLoading() {
+            document.getElementById('loading-overlay').style.display = 'none';
+        }
+
         async function computeAnswers() {
             try {
+                showLoading();
                 const fileType = document.getElementById('file-type').value;
                 const queryfile = document.getElementById('query-file').files[0];
                 const anscsvFile = document.getElementById('csv-file').files[0];
@@ -622,6 +671,7 @@
 
                 if (!queryfile) {
                     alert("Please upload a query file first!");
+                    hideLoading();
                     return;
                 }
 
@@ -632,20 +682,22 @@
                 if (fileType === 'csv') {
                     if (!anscsvFile) {
                         alert("Please upload a CSV file for answers!");
+                        hideLoading();
                         return;
                     }
                     formData.append('ans_csv_file', anscsvFile);
                 } else if (fileType === 'pdf') {
                     if (!pdfFiles || pdfFiles.length < 2) {
                         alert("Please upload at least 2 PDF files!");
+                        hideLoading();
                         return;
                     }
-                    // PDF files will be handled by the backend
+                    for (let file of pdfFiles) {
+                        formData.append('pdf_files[]', file);
+                    }
                 }
 
-                // Show loading state
                 const computeBtn = document.getElementById('compute-btn');
-                computeBtn.textContent = 'Processing...';
                 computeBtn.disabled = true;
 
                 const response = await fetch('/compute_answers', { 
@@ -668,17 +720,12 @@
                     throw new Error('No answers received from server');
                 }
 
-                // Reset button state
-                computeBtn.textContent = 'Compute Answers';
-                computeBtn.disabled = false;
-
             } catch (error) {
                 console.error('Error:', error);
                 alert('Error: ' + error.message);
-                
-                // Reset button state on error
+            } finally {
+                hideLoading();
                 const computeBtn = document.getElementById('compute-btn');
-                computeBtn.textContent = 'Compute Answers';
                 computeBtn.disabled = false;
             }
         }
@@ -896,37 +943,34 @@
 
         async function computeMarks() {
             try {
+                showLoading();
                 const answerBoxes = document.querySelectorAll('.answer-box');
                 if (answerBoxes.length === 0) {
                     alert("Please generate answers first!");
+                    hideLoading();
                     return;
                 }
 
-                // Validate that answers are not empty
                 const answerValues = Array.from(answerBoxes).map(box => box.value.trim());
                 if (answerValues.some(answer => !answer)) {
                     alert("Please ensure all answer boxes are filled!");
+                    hideLoading();
                     return;
                 }
 
                 if (selectedFiles.size === 0) {
                     alert("Please upload student answer files!");
+                    hideLoading();
                     return;
                 }
 
-                // Show loading state
                 const computeBtn = document.getElementById('compute-marks-btn');
-                computeBtn.textContent = 'Processing...';
                 computeBtn.disabled = true;
 
-                // Get answers from textboxes
-                const answers = Array.from(answerBoxes).map(box => box.value);
-                console.log("Sending answers:", answers);
-
                 const formData = new FormData();
-                formData.append('answers', JSON.stringify(answers));
+                formData.append('answers', JSON.stringify(answerValues));
 
-                // Add files with their paths and validate file types
+                // Add files with their paths
                 let validFiles = 0;
                 selectedFiles.forEach((fileInfo, path) => {
                     if (fileInfo.file.type.startsWith('image/')) {
@@ -950,8 +994,6 @@
                 }
 
                 const result = await response.json();
-                console.log("Received result:", result);
-
                 if (result.error) {
                     throw new Error(result.error);
                 }
@@ -962,16 +1004,12 @@
 
                 displayMarks(result.message);
 
-                // Reset button
-                computeBtn.textContent = 'Compute Marks';
-                computeBtn.disabled = false;
-
             } catch (error) {
                 console.error('Error:', error);
                 alert('Error computing marks: ' + error.message);
-                
+            } finally {
+                hideLoading();
                 const computeBtn = document.getElementById('compute-marks-btn');
-                computeBtn.textContent = 'Compute Marks';
                 computeBtn.disabled = false;
             }
         }