fix index.html

main.py

@@ -279,6 +279,44 @@ def compute_answers():
         error_msg = str(e).encode('ascii', 'ignore').decode('ascii')
         return jsonify({"error": error_msg}), 500
 
+def validate_folder_structure(files):
+    """Validate the folder structure of uploaded files"""
+    try:
+        # Get unique student folders
+        student_folders = set()
+        for file in files:
+            if not file or not file.filename:
+                continue
+            path_parts = file.filename.split('/')
+            if len(path_parts) >= 2:
+                student_folders.add(path_parts[-2])
+        
+        if not student_folders:
+            return False, "No valid student folders found"
+            
+        # Check if each student folder has the same number of files
+        file_counts = {}
+        for file in files:
+            if not file or not file.filename:
+                continue
+            path_parts = file.filename.split('/')
+            if len(path_parts) >= 2:
+                student = path_parts[-2]
+                file_counts[student] = file_counts.get(student, 0) + 1
+                
+        if not file_counts:
+            return False, "No valid files found in student folders"
+            
+        # Check if all students have the same number of files
+        counts = list(file_counts.values())
+        if len(set(counts)) > 1:
+            return False, "Inconsistent number of files across student folders"
+            
+        return True, f"Valid folder structure with {len(student_folders)} students and {counts[0]} files each"
+        
+    except Exception as e:
+        return False, f"Error validating folder structure: {str(e)}"
+
 @app.route('/compute_marks', methods=['POST'])
 def compute_marks():
     try:
@@ -307,8 +345,19 @@ def compute_marks():
                 "message": "No files uploaded"
             }), 400
 
+        # Validate folder structure
+        is_valid, message = validate_folder_structure(files)
+        if not is_valid:
+            return jsonify({
+                "error": "Invalid folder structure",
+                "message": message
+            }), 400
+            
+        log_print(f"Folder structure validation: {message}")
+
         # Create a temporary directory for processing
         base_temp_dir = tempfile.mkdtemp()
+        log_print(f"Created temporary directory: {base_temp_dir}")
         
         # Dictionary to store results by student folder
         results = {}
@@ -320,31 +369,48 @@ def compute_marks():
                 try:
                     # Validate file
                     if not file or not file.filename:
+                        log_print("Skipping invalid file", "WARNING")
                         continue
 
                     # Get folder structure from file path
                     path_parts = file.filename.split('/')
                     if len(path_parts) < 2:
+                        log_print(f"Invalid file path structure: {file.filename}", "WARNING")
                         continue
                         
                     student_folder = path_parts[-2]
                     filename = path_parts[-1]
                     
+                    # Validate file type
+                    if not is_valid_image_file(filename):
+                        log_print(f"Invalid file type: {filename}", "WARNING")
+                        failed_files.append({
+                            "file": file.filename,
+                            "error": "Invalid file type. Only .jpg, .jpeg, and .png files are allowed."
+                        })
+                        continue
+                    
                     if student_folder not in results:
                         results[student_folder] = [0] * len(correct_answers)
+                        log_print(f"Processing student folder: {student_folder}")
                         
                     # Save and process file
                     student_dir = os.path.join(base_temp_dir, student_folder)
                     os.makedirs(student_dir, exist_ok=True)
                     filepath = os.path.join(student_dir, filename)
+                    
+                    # Ensure filepath is secure
+                    filepath = secure_filename(filepath)
                     file.save(filepath)
+                    log_print(f"Saved file: {filepath}")
                     
                     # Extract text
                     extracted_text = extract_text_from_image(filepath)
                     if not extracted_text:
+                        log_print(f"No text extracted from: {filepath}", "WARNING")
                         failed_files.append({
                             "file": file.filename,
-                            "error": "No text could be extracted"
+                            "error": "No text could be extracted from the image"
                         })
                         continue
                     
@@ -381,6 +447,7 @@ def compute_marks():
                                 
                         except Exception as score_error:
                             error_msg = str(score_error).encode('ascii', 'ignore').decode('ascii')
+                            log_print(f"Error calculating scores for {filepath}: {error_msg}", "ERROR")
                             failed_files.append({
                                 "file": file.filename,
                                 "error": f"Error calculating scores: {error_msg}"
@@ -389,9 +456,11 @@ def compute_marks():
                     
                     marks = new_value(best_score, 0, 1, 0, 5)
                     results[student_folder][best_answer_index] = round(marks, 2)
+                    log_print(f"Processed {filename} for {student_folder}: {marks} marks")
                     
                 except Exception as e:
                     error_msg = str(e).encode('ascii', 'ignore').decode('ascii')
+                    log_print(f"Error processing file {file.filename}: {error_msg}", "ERROR")
                     failed_files.append({
                         "file": file.filename,
                         "error": error_msg
@@ -402,8 +471,9 @@ def compute_marks():
             # Clean up temp directory
             try:
                 shutil.rmtree(base_temp_dir)
-            except Exception:
-                pass
+                log_print("Cleaned up temporary directory")
+            except Exception as e:
+                log_print(f"Warning: Could not clean up temporary directory: {e}", "WARNING")
                 
         if not results:
             return jsonify({
@@ -429,6 +499,7 @@ def compute_marks():
         
     except Exception as e:
         error_msg = str(e).encode('ascii', 'ignore').decode('ascii')
+        log_print(f"Error in compute_marks: {error_msg}", "ERROR")
         return jsonify({
             "error": "Server error",
             "message": f"Error computing marks: {error_msg}"

templates/index.html

@@ -879,41 +879,49 @@
             
             // Clear previous files
             selectedFiles.clear();
-            folderStructure = createFolderStructure(files);
+            
+            // Validate file types
+            const validImageTypes = ['image/jpeg', 'image/jpg', 'image/png'];
+            let invalidFiles = [];
+            
+            for (let file of files) {
+                if (file.type.startsWith('image/')) {
+                    if (!validImageTypes.includes(file.type)) {
+                        invalidFiles.push(file.name);
+                    } else {
+                        const pathParts = file.webkitRelativePath.split('/');
+                        // Store the full relative path
+                        const fullPath = file.webkitRelativePath;
+                        selectedFiles.set(fullPath, {
+                            file: file,
+                            mainFolder: pathParts[0],
+                            studentFolder: pathParts[1],
+                            fileName: pathParts[pathParts.length - 1],
+                            fullPath: fullPath
+                        });
+                    }
+                }
+            }
+            
+            if (invalidFiles.length > 0) {
+                alert(`Warning: The following files are not valid image files (only .jpg, .jpeg, and .png are allowed):\n${invalidFiles.join('\n')}`);
+            }
+            
+            folderStructure = createFolderStructure(Array.from(selectedFiles.values()).map(info => info.file));
 
             // Update the visual tree
             const treeContainer = document.getElementById('folder-tree');
             treeContainer.innerHTML = '';
             
-            if (files.length === 0) {
-                treeContainer.innerHTML = '<div class="no-files-message">No files uploaded yet</div>';
+            if (selectedFiles.size === 0) {
+                treeContainer.innerHTML = '<div class="no-files-message">No valid image files uploaded yet</div>';
                 return;
             }
 
             renderFolderStructure(folderStructure, treeContainer);
 
-            // Count total image files
-            let imageCount = 0;
-            for (let file of files) {
-                if (file.type.startsWith('image/')) {
-                    imageCount++;
-                    const pathParts = file.webkitRelativePath.split('/');
-                    selectedFiles.set(file.webkitRelativePath, {
-                        file: file,
-                        mainFolder: pathParts[0],
-                        studentFolder: pathParts[1],
-                        fileName: pathParts[pathParts.length - 1],
-                        fullPath: file.webkitRelativePath
-                    });
-                }
-            }
-
             // Show immediate feedback
-            if (imageCount > 0) {
-                alert(`Successfully loaded ${imageCount} image files`);
-            } else {
-                alert('No valid image files found in the selected folder');
-            }
+            alert(`Successfully loaded ${selectedFiles.size} valid image files`);
         });
 
         function removeFile(path) {
@@ -974,11 +982,13 @@
                     formData.append('correct_answers[]', answer);
                 });
 
-                // Add files with their paths
+                // Add files with their folder structure
                 let validFiles = 0;
                 selectedFiles.forEach((fileInfo, path) => {
                     if (fileInfo.file.type.startsWith('image/')) {
-                        formData.append('file', fileInfo.file, path);
+                        // Maintain the folder structure in the file path
+                        const relativePath = fileInfo.fullPath;
+                        formData.append('file', fileInfo.file, relativePath);
                         validFiles++;
                     }
                 });
@@ -996,23 +1006,15 @@
                     body: formData
                 });
 
-                console.log('Response status:', response.status);
-                console.log('Response headers:', Object.fromEntries(response.headers.entries()));
-
-                // Check if the response is JSON
-                const contentType = response.headers.get('content-type');
-                if (!contentType || !contentType.includes('application/json')) {
-                    console.error('Non-JSON response:', await response.text());
-                    throw new Error('Server did not return JSON');
+                if (!response.ok) {
+                    const errorText = await response.text();
+                    console.error('Server error:', errorText);
+                    throw new Error(`Server returned error ${response.status}: ${errorText}`);
                 }
 
                 const result = await response.json();
                 console.log('Parsed response:', result);
 
-                if (!response.ok) {
-                    throw new Error(result.message || result.error || `Server returned error ${response.status}`);
-                }
-
                 if (result.error) {
                     throw new Error(result.message || result.error);
                 }
@@ -1055,7 +1057,7 @@
                 <thead>
                     <tr>
                         <th>Student Folder</th>
-                        <th>Question Number</th>
+                        <th>Image Name</th>
                         <th>Marks</th>
                     </tr>
                 </thead>
@@ -1073,7 +1075,7 @@
                     const row = document.createElement('tr');
                     row.innerHTML = `
                         <td>${student}</td>
-                        <td>Question ${index + 1}</td>
+                        <td>answer${index + 1}.jpg</td>
                         <td>${mark}</td>
                     `;
                     tbody.appendChild(row);