fix: Fix merge conflicts with develop branch

Author: drorganvidez

app/modules/auth/tests/test_unit.py

@@ -221,7 +221,7 @@ def test_confirm_user_active_user(test_client):
 
     url = url_for("confirmemail.confirm_user", token=token, _external=False)
     response = test_client.get(url, follow_redirects=True)
-    assert response.request.path == url_for("auth.show_signup_form", _external=False)
+    assert response.request.path == url_for("public.index", _external=False)
 
     user = UserRepository().get_by_email(user.email)
     assert user.active is True

app/modules/confirmemail/models.py

@@ -0,0 +1,5 @@
+from app import db
+
+
+class Confirmemail():
+    id = db.Column(db.Integer, primary_key=True)

app/modules/confirmemail/repositories.py

@@ -0,0 +1,7 @@
+from app.modules.confirmemail.models import Confirmemail
+from core.repositories.BaseRepository import BaseRepository
+
+
+class ConfirmemailRepository(BaseRepository):
+    def __init__(self):
+        super().__init__(Confirmemail)

app/modules/confirmemail/services.py

@@ -5,6 +5,7 @@
 from dotenv import load_dotenv
 
 from app import mail_service
+from app.modules.confirmemail.repositories import ConfirmemailRepository
 from core.services.BaseService import BaseService
 
 
@@ -16,6 +17,8 @@
 
 class ConfirmemailService(BaseService):
     def __init__(self):
+        super().__init__(ConfirmemailRepository())
+        self.repository = ConfirmemailRepository()
         self.CONFIRM_EMAIL_SALT = os.getenv('CONFIRM_EMAIL_SALT', 'sample_salt')
         self.CONFIRM_EMAIL_TOKEN_MAX_AGE = os.getenv('CONFIRM_EMAIL_TOKEN_MAX_AGE', 3600)
 

app/modules/dataset/routes.py

@@ -3,6 +3,7 @@
 import os
 import json
 import shutil
+import tempfile
 
 from flask import (
     abort,
@@ -221,15 +222,24 @@ def download_dataset(dataset_id):
 
 @dataset_bp.route("/dataset/download/all", methods=["GET"])
 def download_all_dataset():
-    zip_path = dataset_service.zip_all_datasets()
+    # Crear un directorio temporal
+    temp_dir = tempfile.mkdtemp()
+    zip_path = os.path.join(temp_dir, "all_datasets.zip")
 
-    # Obtener la fecha actual en el formato deseado (por ejemplo, YYYYMMDD)
-    current_date = datetime.now().strftime("%Y_%m_%d")
-
-    # Crear el nombre del archivo con la fecha
-    zip_filename = f"uvlhub_bulk_{current_date}.zip"
-
-    return send_file(zip_path, as_attachment=True, download_name=zip_filename)
+    try:
+        # Generar el archivo ZIP
+        dataset_service.zip_all_datasets(zip_path)
+
+        # Crear el nombre del archivo con la fecha
+        current_date = datetime.now().strftime("%Y_%m_%d")
+        zip_filename = f"uvlhub_bulk_{current_date}.zip"
+
+        # Enviar el archivo como respuesta
+        return send_file(zip_path, as_attachment=True, download_name=zip_filename)
+    finally:
+        # Asegurar que la carpeta temporal se elimine después de que Flask sirva el archivo
+        if os.path.exists(temp_dir):
+            shutil.rmtree(temp_dir)
 
 
 @dataset_bp.route("/doi/<path:doi>/", methods=["GET"])

app/modules/dataset/services.py

@@ -326,10 +326,7 @@ def zip_dataset(self, dataset: DataSet) -> str:
 
         return temp_dir
 
-    def zip_all_datasets(self) -> str:
-        temp_dir = tempfile.mkdtemp()
-        zip_path = os.path.join(temp_dir, "all_datasets.zip")
-
+    def zip_all_datasets(self, zip_path: str):
         with ZipFile(zip_path, "w") as zipf:
             for user_dir in os.listdir("uploads"):
                 user_path = os.path.join("uploads", user_dir)
@@ -351,7 +348,6 @@ def zip_all_datasets(self) -> str:
                                             full_path,
                                             arcname=os.path.join(dataset_dir, relative_path),
                                         )
-        return zip_path
 
 
 class AuthorService(BaseService):

app/modules/flamapy/routes.py

@@ -2,77 +2,12 @@
 from app.modules.hubfile.services import HubfileService
 from flask import send_file, jsonify
 from app.modules.flamapy import flamapy_bp
-from flamapy.interfaces.python.flamapy_feature_model import FLAMAFeatureModel
-from flamapy.core.exceptions import FlamaException
 import os
 
-from antlr4 import CommonTokenStream, FileStream
-from uvl.UVLCustomLexer import UVLCustomLexer
-from uvl.UVLPythonParser import UVLPythonParser
-from antlr4.error.ErrorListener import ErrorListener
-
 logger = logging.getLogger(__name__)
 
 
-@flamapy_bp.route("/flamapy/check_uvl/<int:file_id>", methods=["GET"])
-def check_uvl(file_id):
-    class CustomErrorListener(ErrorListener):
-        def __init__(self):
-            self.errors = []
-
-        def syntaxError(self, recognizer, offendingSymbol, line, column, msg, e):
-            if "\\t" in msg:
-                warning_message = (
-                    f"The UVL has the following warning that prevents reading it: "
-                    f"Line {line}:{column} - {msg}"
-                )
-                print(warning_message)
-                self.errors.append(warning_message)
-            else:
-                error_message = (
-                    f"The UVL has the following error that prevents reading it: "
-                    f"Line {line}:{column} - {msg}"
-                )
-                self.errors.append(error_message)
-
-    try:
-        hubfile = HubfileService().get_by_id(file_id)
-        input_stream = FileStream(hubfile.get_path())
-        lexer = UVLCustomLexer(input_stream)
-
-        error_listener = CustomErrorListener()
-
-        lexer.removeErrorListeners()
-        lexer.addErrorListener(error_listener)
-
-        stream = CommonTokenStream(lexer)
-        parser = UVLPythonParser(stream)
-
-        parser.removeErrorListeners()
-        parser.addErrorListener(error_listener)
-
-        # Optional: Commented out for now
-        # tree = parser.featureModel()
-
-        if error_listener.errors:
-            return jsonify({"errors": error_listener.errors}), 400
-
-        # After parsing, try transforming the model
-        try:
-            # Assuming some logic here like loading and validating the model
-            # This part should contain your logic for using the Flamapy transformation
-            FLAMAFeatureModel(hubfile.get_path())  # Example usage
-            # You can optionally print or process the model here
-            return jsonify({"message": "Valid Model"}), 200
-
-        except FlamaException as fe:
-            return jsonify({"error": f"Model transformation failed: {str(fe)}"}), 400
-
-    except Exception as e:
-        return jsonify({"error": str(e)}), 500
-
-
-@flamapy_bp.route("/flamapy/valid/<int:file_id>", methods=["GET"])
+@flamapy_bp.route('/flamapy/valid/<int:file_id>', methods=['GET'])
 def valid(file_id):
     return jsonify({"success": True, "file_id": file_id})
 
@@ -104,7 +39,7 @@ def to_glencoe(file_id):
     return download_transformed_file(file_id, '.json', 'glencoe')
 
 
-@flamapy_bp.route("/flamapy/to_cnf/<int:file_id>", methods=["GET"])
+@flamapy_bp.route('/flamapy/to_cnf/<int:file_id>', methods=['GET'])
 def to_cnf(file_id):
     return download_transformed_file(file_id, '.cnf', 'dimacs')
 

app/modules/flamapy/services.py

@@ -2,6 +2,13 @@
 import logging
 from app.modules.flamapy.repositories import FlamapyRepository
 from core.services.BaseService import BaseService
+from flamapy.interfaces.python.flamapy_feature_model import FLAMAFeatureModel
+from flamapy.core.exceptions import FlamaException
+
+from antlr4 import CommonTokenStream, FileStream
+from uvl.UVLCustomLexer import UVLCustomLexer
+from uvl.UVLPythonParser import UVLPythonParser
+from antlr4.error.ErrorListener import ErrorListener
 
 from flamapy.metamodels.fm_metamodel.models import FeatureModel
 from flamapy.metamodels.fm_metamodel.operations import FMMetrics
@@ -29,3 +36,52 @@ def get_metrics(self, fm_model: FeatureModel) -> list[dict[str, Any]]:
     def get_analysis_results(self, fm_model: FeatureModel) -> list[dict[str, Any]]:
         fm_results = BDDMetrics().execute(fm_model).get_result()
         return fm_results
+
+    def check_uvl(self, filepath: str):
+
+        class CustomErrorListener(ErrorListener):
+
+            def __init__(self):
+                self.errors = []
+
+            def syntaxError(self, recognizer, offendingSymbol, line, column, msg, e):
+                if "\\t" in msg:
+                    warning_message = (
+                        f"The UVL has the following warning that prevents reading it: "
+                        f"Line {line}:{column} - {msg}"
+                    )
+                    self.errors.append(warning_message)
+                else:
+                    error_message = (
+                        f"The UVL has the following error that prevents reading it: "
+                        f"Line {line}:{column} - {msg}"
+                    )
+                    self.errors.append(error_message)
+
+        try:
+            input_stream = FileStream(filepath)
+            lexer = UVLCustomLexer(input_stream)
+
+            error_listener = CustomErrorListener()
+
+            lexer.removeErrorListeners()
+            lexer.addErrorListener(error_listener)
+
+            stream = CommonTokenStream(lexer)
+            parser = UVLPythonParser(stream)
+
+            parser.removeErrorListeners()
+            parser.addErrorListener(error_listener)
+
+            if error_listener.errors:
+                return {"errors": error_listener.errors}, 400
+
+            try:
+                FLAMAFeatureModel(filepath)
+                return {"message": "Valid Model"}, 200
+
+            except FlamaException as fe:
+                return {"error": f"Model transformation failed: {str(fe)}"}, 400
+
+        except Exception as e:
+            return {"error": str(e)}, 500

app/modules/hubfile/assets/js/scripts.js

@@ -33,46 +33,55 @@ let dropzone = Dropzone.options.myDropzone = {
             let ext = file.name.split('.').pop();
             if (ext !== 'uvl') {
                 this.removeFile(file);
-
+        
                 let alert = document.createElement('p');
                 alert.textContent = 'Invalid file extension: ' + file.name;
                 alerts.appendChild(alert);
                 alerts.style.display = 'block';
-            }  else {
+            } else {
                 // Read the file as text to pass it to the UVL parser
                 let reader = new FileReader();
                 reader.onload = function(event) {
                     const fileContent = event.target.result;  // This contains the UVL file content
-
+        
                     // Now, use uvl-parser to parse the content
                     try {
                         const featureModel = new FeatureModel(fileContent);
                         const tree = featureModel.getFeatureModel();  // This is your parsed UVL tree
-
+        
                         console.log("Parsed UVL Feature Model:", tree);
                         valid = true;
-
+        
+                        
                         // You can now manipulate `tree` or display it in the UI as needed
                     } catch (error) {
-                        if (error instanceof TypeError) {
-                            console.error("Caught a TypeError:", error.message);
+                        // Verificar si el error es debido a `Error.captureStackTrace`
+                        if (error.message.includes("Error.captureStackTrace is not a function")) {
+                            console.warn("Error.captureStackTrace is not supported in this environment.");
+                            valid = false;
+                            let alert = document.createElement('p');
+                            alert.innerHTML = 'Syntax error in <b>' + file.name + '</b>';
+                            alerts.appendChild(alert);
+                            alerts.style.display = 'block';
                         } else {
+                            // Si es un error de sintaxis en el UVL, mostrar mensaje personalizado
                             valid = false;
                             console.error("Error parsing UVL file:", error.message);
-                            invalid_uvl_message = error.message
+                            invalid_uvl_message = error.message;
+                            
+                            // Muestra el mensaje de error de sintaxis en el UI
                             let alert = document.createElement('p');
                             alert.innerHTML = 'Syntax error in <b>' + file.name + '</b><br>&nbsp;>&nbsp;>&nbsp;>&nbsp;' + error.message;
                             alerts.appendChild(alert);
                             alerts.style.display = 'block';
                         }
-
                     }
                 };
                 reader.readAsText(file);  // Read the file as text
             }
-
+        
         });
-
+        
         this.on('error', function (file, response) {
             console.error("Error uploading file: ", response);
             let alert = document.createElement('p');
@@ -81,7 +90,6 @@ let dropzone = Dropzone.options.myDropzone = {
             alerts.style.display = 'block';
         });
 
-
         this.on('success', function (file, response) {
 
             if(valid){