update_new

main.py

@@ -12,7 +12,7 @@ from dotenv import load_dotenv
 load_dotenv()
 
 # Create directories in /tmp which is writable
-BASE_DIR = tempfile.gettempdir()
+BASE_DIR = '/tmp'  # Use direct /tmp path for Hugging Face
 log_dir = os.path.join(BASE_DIR, 'app_logs')
 cache_dir = os.path.join(BASE_DIR, 'app_cache')
 
@@ -22,7 +22,8 @@ try:
 except Exception as e:
     print(f"Warning: Could not create log directory: {e}")
     # Fallback to temp directory
-    log_dir = tempfile.mkdtemp(prefix='app_logs_')
+    log_dir = os.path.join(BASE_DIR, 'app_logs')
+    os.makedirs(log_dir, exist_ok=True)
 
 # Create a log file with timestamp
 log_file = os.path.join(log_dir, f'app_{datetime.now().strftime("%Y%m%d_%H%M%S")}.log')
@@ -62,26 +63,29 @@ def log_print(message, level="INFO"):
 
 # Set up all cache and data directories in /tmp
 try:
-    nltk_data_dir = os.path.join(cache_dir, 'nltk_data')
-    gensim_data_dir = os.path.join(cache_dir, 'gensim-data')
-    upload_dir = os.path.join(cache_dir, 'uploads')
-    ans_image_dir = os.path.join(cache_dir, 'ans_image')
-    htr_images_dir = os.path.join(cache_dir, 'images')
+    nltk_data_dir = os.path.join(BASE_DIR, 'nltk_data')
+    gensim_data_dir = os.path.join(BASE_DIR, 'gensim-data')
+    upload_dir = os.path.join(BASE_DIR, 'uploads')
+    ans_image_dir = os.path.join(BASE_DIR, 'ans_image')
+    images_dir = os.path.join(BASE_DIR, 'images')  # Direct in /tmp for HTR
 
     # Create directories with correct permissions
-    for directory in [cache_dir, nltk_data_dir, gensim_data_dir, upload_dir, ans_image_dir, htr_images_dir]:
+    for directory in [cache_dir, nltk_data_dir, gensim_data_dir, upload_dir, ans_image_dir, images_dir]:
         os.makedirs(directory, exist_ok=True)
-        # Ensure directory has write permissions
-        os.chmod(directory, 0o777)
+
 except Exception as e:
     print(f"Warning: Could not create cache directories: {e}")
-    # Fallback to temporary directories
-    cache_dir = tempfile.mkdtemp(prefix='app_cache_')
-    nltk_data_dir = tempfile.mkdtemp(prefix='nltk_data_')
-    gensim_data_dir = tempfile.mkdtemp(prefix='gensim_data_')
-    upload_dir = tempfile.mkdtemp(prefix='uploads_')
-    ans_image_dir = tempfile.mkdtemp(prefix='ans_image_')
-    htr_images_dir = tempfile.mkdtemp(prefix='htr_images_')
+    # Don't use tempfile in Hugging Face environment
+    cache_dir = os.path.join(BASE_DIR, 'cache')
+    nltk_data_dir = os.path.join(BASE_DIR, 'nltk_data')
+    gensim_data_dir = os.path.join(BASE_DIR, 'gensim_data')
+    upload_dir = os.path.join(BASE_DIR, 'uploads')
+    ans_image_dir = os.path.join(BASE_DIR, 'ans_image')
+    images_dir = os.path.join(BASE_DIR, 'images')
+    
+    # Create directories
+    for directory in [cache_dir, nltk_data_dir, gensim_data_dir, upload_dir, ans_image_dir, images_dir]:
+        os.makedirs(directory, exist_ok=True)
 
 # Set environment variables
 os.environ['HF_HOME'] = cache_dir
@@ -251,30 +255,6 @@ def compute_marks():
             log_print("Invalid JSON format in answers", "ERROR")
             return jsonify({"error": "Invalid JSON format in answers"}), 400
 
-        # Add validation for answers
-        def validate_answers(answers):
-            try:
-                if not isinstance(answers, list):
-                    return False
-                # Check if each answer is a string or a list of strings
-                for ans in answers:
-                    if isinstance(ans, str):
-                        continue
-                    elif isinstance(ans, list):
-                        if not all(isinstance(a, str) for a in ans):
-                            return False
-                    else:
-                        return False
-                return True
-            except Exception as e:
-                log_print(f"Validation error: {str(e)}", "ERROR")
-                return False
-
-        if not validate_answers(answers):
-            log_print("Invalid answer format", "ERROR")
-            log_print(f"Received answer structure: {answers}", "ERROR")
-            return jsonify({"error": "Invalid answer format"}), 400
-
         # Process answers to ensure consistent format
         processed_answers = []
         for ans in answers:
@@ -284,47 +264,40 @@ def compute_marks():
                 processed_answers.append(ans)
         answers = processed_answers
 
-        # Create HTR images directory if it doesn't exist
-        os.makedirs(htr_images_dir, exist_ok=True)
-        os.chmod(htr_images_dir, 0o777)  # Ensure write permissions
-
-        # 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 = {}
-        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)
-                    os.chmod(student_dir, 0o777)  # Ensure write permissions
-                    
-                    # Save the file
-                    filepath = os.path.join(student_dir, filename)
-                    file.save(filepath)
-                    os.chmod(filepath, 0o666)  # Ensure file is readable/writable
-                    
-                    # Create symlink in HTR images directory
-                    htr_filepath = os.path.join(htr_images_dir, f"{student_folder}_{filename}")
-                    if os.path.exists(htr_filepath):
-                        os.remove(htr_filepath)
-                    os.symlink(filepath, htr_filepath)
-                    
-                    # Add to data structure
-                    if student_folder not in data:
-                        data[student_folder] = []
-                    data[student_folder].append(htr_filepath.replace("\\", "/"))
-                    log_print(f"Saved file: {filepath} and linked to {htr_filepath}")
+        # Create necessary directories
+        try:
+            # Ensure the images directory exists in the HTR expected location
+            os.makedirs(images_dir, exist_ok=True)
+            
+            # 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 = {}
+            
+            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
+                        
+                        # Save directly to the images directory with a unique name
+                        htr_filename = f"{student_folder}_{filename}"
+                        htr_filepath = os.path.join(images_dir, htr_filename)
+                        
+                        # Save the file
+                        file.save(htr_filepath)
+                        log_print(f"Saved file: {htr_filepath}")
+                        
+                        # Add to data structure
+                        if student_folder not in data:
+                            data[student_folder] = []
+                        data[student_folder].append(htr_filepath)
 
         if not data:
             log_print("No valid image files were found in the upload", "ERROR")
@@ -454,13 +427,15 @@ def allowed_file(filename, allowed_extensions):
 
 def cleanup_temp_files():
     try:
-        import shutil
-        temp_dirs = [ans_image_dir, upload_dir, htr_images_dir]
-        for directory in temp_dirs:
-            if os.path.exists(directory):
-                shutil.rmtree(directory)
-                os.makedirs(directory, exist_ok=True)
-                os.chmod(directory, 0o777)  # Ensure write permissions
+        # Clean up only the images directory
+        if os.path.exists(images_dir):
+            for file in os.listdir(images_dir):
+                file_path = os.path.join(images_dir, file)
+                try:
+                    if os.path.isfile(file_path):
+                        os.unlink(file_path)
+                except Exception as e:
+                    log_print(f"Error deleting file {file_path}: {e}", "ERROR")
         log_print("Successfully cleaned up temporary files")
     except Exception as e:
         log_print(f"Error cleaning up temporary files: {e}", "ERROR")