fix: Fixes ethernal problem with FM Fact Label N!=NP

Author: drorganvidez

app/__init__.py

@@ -62,10 +62,7 @@ def load_user(user_id):
     logging_manager.setup_logging()
 
     # CORS
-    CORS(app, resources={
-        r"/hubfiles/raw/*": {"origins": "https://ide.flamapy.org"}
-    })
-
+    CORS(app, resources={r"/hubfiles/raw/*": {"origins": "https://ide.flamapy.org"}})
 
     # Swagger API
     swagger_template = {

app/modules/factlabel/routes.py

@@ -1,4 +1,4 @@
-import os
+import json
 import uuid
 import logging
 from datetime import datetime
@@ -9,61 +9,59 @@
 from app.modules.factlabel import factlabel_bp
 from app.modules.hubfile.models import HubfileViewRecord
 from app.modules.hubfile.services import HubfileService
-from app.modules.factlabel.services import FactlabelService
 
 logger = logging.getLogger(__name__)
 
 
 @factlabel_bp.route("/factlabel/view/<int:file_id>", methods=["GET"])
 def view_factlabel(file_id):
     file = HubfileService().get_or_404(file_id)
-    filename = file.name
 
-    directory_path = os.path.join(
-        "uploads",
-        f"user_{file.feature_model.dataset.user_id}",
-        f"dataset_{file.feature_model.dataset_id}",
-        "uvl",
-    )
+    try:
+        if not file.factlabel_json:
+            return jsonify({"success": False, "error": "FactLabel not ready yet"}), 404
 
-    file_path = os.path.join(directory_path, filename)
+        # 🔹 Convertir de string a dict
+        try:
+            content = json.loads(file.factlabel_json)
+        except Exception:
+            return (
+                jsonify({"success": False, "error": "Invalid FactLabel JSON in DB"}),
+                500,
+            )
 
-    try:
-        if os.path.exists(file_path):
-            content = FactlabelService().get_characterization(file)
-            # logger.info(f'JSON Content: {content}')
-            user_cookie = request.cookies.get("view_cookie")
-            if not user_cookie:
-                user_cookie = str(uuid.uuid4())
+        # --- Registro de la vista ---
+        user_cookie = request.cookies.get("view_cookie")
+        if not user_cookie:
+            user_cookie = str(uuid.uuid4())
+
+        existing_record = HubfileViewRecord.query.filter_by(
+            user_id=current_user.id if current_user.is_authenticated else None,
+            file_id=file_id,
+            view_cookie=user_cookie,
+        ).first()
 
-            # Check if the view record already exists for this cookie
-            existing_record = HubfileViewRecord.query.filter_by(
+        if not existing_record:
+            new_view_record = HubfileViewRecord(
                 user_id=current_user.id if current_user.is_authenticated else None,
                 file_id=file_id,
+                view_date=datetime.now(),
                 view_cookie=user_cookie,
-            ).first()
+            )
+            db.session.add(new_view_record)
+            db.session.commit()
 
-            if not existing_record:
-                # Register file view
-                new_view_record = HubfileViewRecord(
-                    user_id=current_user.id if current_user.is_authenticated else None,
-                    file_id=file_id,
-                    view_date=datetime.now(),
-                    view_cookie=user_cookie,
-                )
-                db.session.add(new_view_record)
-                db.session.commit()
+        # --- Preparar respuesta ---
+        response = jsonify({"success": True, "content": content})
+        if not request.cookies.get("view_cookie"):
+            response = make_response(response)
+            response.set_cookie(
+                "view_cookie", user_cookie, max_age=60 * 60 * 24 * 365 * 2
+            )
+        return response
 
-            # Prepare response
-            response = jsonify({"success": True, "content": content})
-            if not request.cookies.get("view_cookie"):
-                response = make_response(response)
-                response.set_cookie(
-                    "view_cookie", user_cookie, max_age=60 * 60 * 24 * 365 * 2
-                )
-            return response
-        else:
-            logger.info("path doesn't exist")
-            return jsonify({"success": False, "error": "File not found"}), 404
     except Exception as e:
-        return jsonify({"success": False, "error": str(e)}), 500
+        return (
+            jsonify({"success": False, "error": f"Internal server error: {str(e)}"}),
+            500,
+        )

app/modules/hubfile/models.py

@@ -3,15 +3,14 @@
 from datetime import datetime
 
 import pytz
-from sqlalchemy import event
+from sqlalchemy import event, Text
 from sqlalchemy.orm import joinedload, object_session
 
 from app import db
 from app.modules.auth.models import User
 from app.modules.dataset.models import DataSet
 from core.managers.task_queue_manager import TaskQueueManager
 from dotenv import load_dotenv
-from urllib.parse import urlencode
 from flask import url_for
 
 logger = logging.getLogger(__name__)
@@ -30,6 +29,7 @@ class Hubfile(db.Model):
     )
 
     feature_model = db.relationship("FeatureModel", back_populates="hubfiles")
+    factlabel_json = db.Column(Text, nullable=True)
 
     def get_formatted_size(self):
         from app.modules.dataset.services import SizeService
@@ -65,7 +65,7 @@ def get_full_path(self) -> str:
             "uvl",
             self.name,
         )
-    
+
     def get_ide_url(self) -> str:
         """
         Devuelve la URL lista para abrir este hubfile en Flamapy IDE,
@@ -119,7 +119,7 @@ def __repr__(self):
 
 
 @event.listens_for(Hubfile, "after_insert")
-def hubfile_aupdated_listener(mapper, connection, target):
+def hubfile_after_insert_listener(mapper, connection, target):
     session = object_session(target)
 
     hubfile_with_fm = (
@@ -131,6 +131,13 @@ def hubfile_aupdated_listener(mapper, connection, target):
     path = hubfile_with_fm.get_full_path()
 
     task_manager = TaskQueueManager()
+
+    # Transformación UVL
+    task_manager.enqueue_task(
+        "app.modules.hubfile.tasks.transform_uvl", path=path, timeout=30
+    )
+
+    # Fact Label
     task_manager.enqueue_task(
-        "app.modules.hubfile.tasks.transform_uvl", path=path, timeout=300
+        "app.modules.hubfile.tasks.compute_factlabel", hubfile_id=target.id, timeout=30
     )

app/modules/hubfile/tasks.py

@@ -1,12 +1,17 @@
+import json
 import logging
 import os
+from app.modules.factlabel.services import FactlabelService
+from app.modules.hubfile.models import Hubfile
 from flamapy.metamodels.fm_metamodel.transformations import (
     UVLReader,
     GlencoeWriter,
     SPLOTWriter,
 )
 from flamapy.metamodels.pysat_metamodel.transformations import FmToPysat, DimacsWriter
 import time
+from app import create_app, db
+from sqlalchemy.orm import sessionmaker
 
 logger = logging.getLogger(__name__)
 
@@ -80,3 +85,40 @@ def transform_uvl(path, retries=5, delay=2):
         logger.info(f"CNF file created at: {cnf_path}")
     except Exception as e:
         logger.error(f"Error in CNF transformation: {e}")
+
+
+app = create_app()
+SessionLocal = sessionmaker(bind=db.engine)
+
+
+def compute_factlabel(hubfile_id: int):
+    logger.info(f"[FACTLABEL] Worker DB URL: {db.engine.url}")
+    logger.info(f"[FACTLABEL] Starting computation for Hubfile {hubfile_id}")
+
+    with app.app_context():
+        session = SessionLocal()
+        try:
+            hubfile = session.get(Hubfile, hubfile_id)
+            if not hubfile:
+                logger.warning(f"[FACTLABEL] Hubfile {hubfile_id} not found")
+                return
+
+            # 👉 Generar caracterización real
+            content = FactlabelService().get_characterization(hubfile)
+
+            # Guardar como string JSON (porque factlabel_json es Text)
+            hubfile.factlabel_json = json.dumps(content)
+
+            session.add(hubfile)
+            session.commit()
+
+            logger.info(
+                f"[FACTLABEL] ✅ FactLabel computed and stored for Hubfile {hubfile_id}"
+            )
+        except Exception as e:
+            logger.exception(
+                f"[FACTLABEL] Error computing FactLabel for Hubfile {hubfile_id}: {e}"
+            )
+            session.rollback()
+        finally:
+            session.close()

app/modules/hubfile/templates/hubfile/view_file.html

@@ -214,7 +214,8 @@
                                     alt="UVL Logo"
                                     height="24"
                                     class="ms-auto mb-2" />
-                            <pre class="m-0" style="white-space: pre-wrap;">{{ uvl_content }}</pre>
+                            <pre class="m-0" style="white-space: pre-wrap; font-size: 0.85rem;">{{ uvl_content }}</pre>
+
                         </div>
                     </div>
 
@@ -265,18 +266,35 @@
         .then(response => response.json())
         .then(data => {
             if (data.success) {
-                drawFMFactLabel(data.content); // versión limpia mejorada
+                drawFMFactLabel(data.content); // Fact Label disponible
             } else {
-                console.error("Error:", data.error);
-                d3.select("#FMFactLabelChart").text("Error loading fact label.");
+                console.warn("FM FactLabel not yet available:", data.error);
+                d3.select("#FMFactLabelChart")
+                  .append("text")
+                  .attr("x", "50%")
+                  .attr("y", "50%")
+                  .attr("text-anchor", "middle")
+                  .attr("dominant-baseline", "middle")
+                  .attr("font-size", "14px")
+                  .attr("fill", "#999")
+                  .text("FM FactLabel not yet available");
             }
         })
         .catch(error => {
             console.error("Fetch error:", error);
-            d3.select("#FMFactLabelChart").text("Could not load fact label.");
+            d3.select("#FMFactLabelChart")
+              .append("text")
+              .attr("x", "50%")
+              .attr("y", "50%")
+              .attr("text-anchor", "middle")
+              .attr("dominant-baseline", "middle")
+              .attr("font-size", "14px")
+              .attr("fill", "red")
+              .text("Error loading FM FactLabel");
         });
 }
 
+
 $(function () {
     const table = $('#kt_files_table').DataTable({
         pageLength: 5,

migrations/versions/e70a525896e5_.py

@@ -0,0 +1,38 @@
+"""empty message
+
+Revision ID: e70a525896e5
+Revises: 001
+Create Date: 2025-09-13 00:02:47.603069
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = 'e70a525896e5'
+down_revision = '001'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('hubfiles', schema=None) as batch_op:
+        batch_op.alter_column('factlabel_json',
+               existing_type=mysql.LONGTEXT(charset='utf8mb4', collation='utf8mb4_bin'),
+               type_=sa.Text(),
+               existing_nullable=True)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('hubfiles', schema=None) as batch_op:
+        batch_op.alter_column('factlabel_json',
+               existing_type=sa.Text(),
+               type_=mysql.LONGTEXT(charset='utf8mb4', collation='utf8mb4_bin'),
+               existing_nullable=True)
+
+    # ### end Alembic commands ###

rosemary/commands/factlabel_generate_missing.py

@@ -0,0 +1,53 @@
+import click
+from flask.cli import with_appcontext
+
+
+@click.command(
+    "factlabel:generate-missing",
+    help="Enqueue tasks to generate FactLabels for all Hubfiles that do not have one yet.",
+)
+@with_appcontext
+def factlabel_generate_missing():
+    from app.modules.hubfile.models import Hubfile
+    from core.managers.task_queue_manager import TaskQueueManager
+
+    click.echo(click.style("🔎 Looking for hubfiles without FactLabel...", fg="cyan"))
+
+    missing = Hubfile.query.filter(
+        (Hubfile.factlabel_json.is_(None)) | (Hubfile.factlabel_json == "")
+    ).all()
+
+    if not missing:
+        click.echo(click.style("✅ All hubfiles already have FactLabels!", fg="green"))
+        return
+
+    click.echo(
+        click.style(f"Found {len(missing)} hubfiles missing FactLabels.", fg="yellow")
+    )
+
+    task_manager = TaskQueueManager()
+    count_enqueued = 0
+
+    for hubfile in missing:
+        try:
+            task_manager.enqueue_task(
+                "app.modules.hubfile.tasks.compute_factlabel",
+                hubfile_id=hubfile.id,
+                timeout=30,  # ⏱️ límite de 30s
+            )
+            count_enqueued += 1
+            click.echo(
+                click.style(
+                    f"📤 Hubfile {hubfile.id} enqueued for FactLabel", fg="cyan"
+                )
+            )
+        except Exception as e:
+            click.echo(
+                click.style(f"❌ Could not enqueue Hubfile {hubfile.id}: {e}", fg="red")
+            )
+
+    click.echo(
+        click.style(
+            f"\n🎉 Enqueued {count_enqueued} jobs for FactLabel generation.", fg="green"
+        )
+    )