Merge branch 'develop' into main

Author: drorganvidez

app/modules/generator/routes.py

@@ -388,9 +388,15 @@ def step2():
         # dataclass (note: PROB_SUM/PROB_SUBSTRACT are the arithmetic +/−,
         # while PROB_SUM_FUNCTION/PROB_AVG_FUNCTION are the aggregates).
         _ARITH_KEYS = [
-            "PROB_SUM", "PROB_SUBSTRACT", "PROB_MULTIPLY", "PROB_DIVIDE",
-            "PROB_EQUALS", "PROB_LESS", "PROB_GREATER",
-            "PROB_LESS_EQUALS", "PROB_GREATER_EQUALS",
+            "PROB_SUM",
+            "PROB_SUBSTRACT",
+            "PROB_MULTIPLY",
+            "PROB_DIVIDE",
+            "PROB_EQUALS",
+            "PROB_LESS",
+            "PROB_GREATER",
+            "PROB_LESS_EQUALS",
+            "PROB_GREATER_EQUALS",
         ]
         _AGG_KEYS = ["PROB_SUM_FUNCTION", "PROB_AVG_FUNCTION"]
         _STR_KEYS = ["PROB_LEN_FUNCTION"]
@@ -450,9 +456,7 @@ def step2():
         if _dist_total > 0:
             for k in _dist_keys:
                 params_dict[k] = round(params_dict[k] / _dist_total, 6)
-            params_dict[_dist_keys[-1]] += round(
-                1.0 - sum(params_dict[k] for k in _dist_keys), 6
-            )
+            params_dict[_dist_keys[-1]] += round(1.0 - sum(params_dict[k] for k in _dist_keys), 6)
 
         try:
             from fm_generator.FMGenerator.models.config import Params
@@ -794,28 +798,22 @@ def step3():
                 request.form.get("prob_avg", params_dict.get("PROB_AVG_FUNCTION", 0.0))
             )
 
-            params_dict["PROB_SUM"] = _safe_float(
-                request.form.get("prob_plus"), params_dict.get("PROB_SUM", 0.7)
-            )
+            params_dict["PROB_SUM"] = _safe_float(request.form.get("prob_plus"), params_dict.get("PROB_SUM", 0.7))
             params_dict["PROB_SUBSTRACT"] = _safe_float(
                 request.form.get("prob_minus"), params_dict.get("PROB_SUBSTRACT", 0.2)
             )
             params_dict["PROB_MULTIPLY"] = _safe_float(
                 request.form.get("prob_times"), params_dict.get("PROB_MULTIPLY", 0.1)
             )
-            params_dict["PROB_DIVIDE"] = _safe_float(
-                request.form.get("prob_div"), params_dict.get("PROB_DIVIDE", 0.0)
-            )
+            params_dict["PROB_DIVIDE"] = _safe_float(request.form.get("prob_div"), params_dict.get("PROB_DIVIDE", 0.0))
 
             arithmetic_level_enabled = bool(params_dict.get("ARITHMETIC_LEVEL", False))
 
             if arithmetic_level_enabled:
                 params_dict["PROB_EQUALS"] = _safe_float(
                     request.form.get("prob_eq"), params_dict.get("PROB_EQUALS", 0.1)
                 )
-                params_dict["PROB_LESS"] = _safe_float(
-                    request.form.get("prob_lt"), params_dict.get("PROB_LESS", 0.2)
-                )
+                params_dict["PROB_LESS"] = _safe_float(request.form.get("prob_lt"), params_dict.get("PROB_LESS", 0.2))
                 params_dict["PROB_GREATER"] = _safe_float(
                     request.form.get("prob_gt"), params_dict.get("PROB_GREATER", 0.7)
                 )
@@ -934,9 +932,7 @@ def step3():
         if _bool_total > 0:
             for k in _bool_keys:
                 params_dict[k] = round(params_dict[k] / _bool_total, 6)
-            params_dict[_bool_keys[-1]] += round(
-                1.0 - sum(params_dict[k] for k in _bool_keys), 6
-            )
+            params_dict[_bool_keys[-1]] += round(1.0 - sum(params_dict[k] for k in _bool_keys), 6)
 
         # En step3 solo guardamos el estado; no reconstruimos Params aquí
         # porque params_dict puede contener todavía datos del step4.
@@ -1250,9 +1246,7 @@ def _collect_step4_attributes(form, params_dict):
             use_in_constraints = raw_use and params_dict.get("ARITHMETIC_LEVEL", False)
         elif type_ == "string":
             use_in_constraints = (
-                raw_use
-                and params_dict.get("TYPE_LEVEL", False)
-                and params_dict.get("STRING_CONSTRAINTS", False)
+                raw_use and params_dict.get("TYPE_LEVEL", False) and params_dict.get("STRING_CONSTRAINTS", False)
             )
         else:
             use_in_constraints = False

app/modules/generator/tests/test_params_contract.py

@@ -10,6 +10,7 @@
    dict that Params can accept without raising. This is the contract test
    that would have caught 1.0007 and EXTRA_CONSTRAINT_REPRESENTATIVENESS=0.5.
 """
+
 from dataclasses import fields
 
 from fm_generator.FMGenerator.models.config import Params
@@ -25,9 +26,15 @@ def test_arith_keys_exist_in_params():
     # function body in routes.py, not at module scope. We re-declare the
     # contract here so the test is self-documenting.
     arith = {
-        "PROB_SUM", "PROB_SUBSTRACT", "PROB_MULTIPLY", "PROB_DIVIDE",
-        "PROB_EQUALS", "PROB_LESS", "PROB_GREATER",
-        "PROB_LESS_EQUALS", "PROB_GREATER_EQUALS",
+        "PROB_SUM",
+        "PROB_SUBSTRACT",
+        "PROB_MULTIPLY",
+        "PROB_DIVIDE",
+        "PROB_EQUALS",
+        "PROB_LESS",
+        "PROB_GREATER",
+        "PROB_LESS_EQUALS",
+        "PROB_GREATER_EQUALS",
     }
     agg = {"PROB_SUM_FUNCTION", "PROB_AVG_FUNCTION"}
     str_keys = {"PROB_LEN_FUNCTION"}

app/modules/generator/tests/test_selenium.py

@@ -9,6 +9,7 @@
 resolves, the browser-side stack is healthy — the actual `generate_models`
 call is already exercised server-side by `test_wizard_flow.py`.
 """
+
 import pytest
 from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.common.by import By
@@ -25,14 +26,12 @@ def _submit_next(driver, expected_url_fragment, wait):
     We bypass `button.click()` because on steps 1-4 the Pyodide loading modal
     sits on top of the Next button and intercepts pointer events."""
     before = driver.current_url
-    driver.execute_script(
-        """
+    driver.execute_script("""
         const btn = document.querySelector("button[name='nav'][value='next']");
         const form = btn && btn.form;
         if (!form) throw new Error("next button or parent form missing");
         form.requestSubmit(btn);
-        """
-    )
+        """)
     try:
         wait.until(EC.url_contains(expected_url_fragment))
     except TimeoutException:
@@ -102,16 +101,12 @@ def test_wizard_reaches_step5_with_pyodide_ready():
         # Wait for Pyodide to finish booting. The bundle stores a Promise at
         # window.__generatorRuntime and resolves it once wheels + wrapper are
         # loaded; catching the resolution is the contract we care about.
-        pyodide_wait.until(
-            lambda d: d.execute_script(
-                """
+        pyodide_wait.until(lambda d: d.execute_script("""
                 const rt = window.__generatorRuntime;
                 if (!rt) return false;
                 return rt.then(() => window.__pyodideReady = true, () => window.__pyodideError = true),
                        !!window.__pyodideReady || !!window.__pyodideError;
-                """
-            )
-        )
+                """))
         boot_error = driver.execute_script("return window.__pyodideError === true;")
         assert not boot_error, "Pyodide bootstrap rejected — check browser console"
         has_runtime = driver.execute_script(

app/modules/generator/tests/test_validators.py

@@ -4,6 +4,7 @@
 and drive each branch with parametrised inputs. A regression here catches
 the kind of locale/tolerance bugs that reached production.
 """
+
 from werkzeug.datastructures import MultiDict
 
 from app.modules.generator.routes import (
@@ -13,9 +14,9 @@
     validate_step3_form,
 )
 
-
 # ── _safe_float ───────────────────────────────────────────────────────────
 
+
 def test_safe_float_accepts_dot():
     assert _safe_float("0.5") == 0.5
 
@@ -39,6 +40,7 @@ def test_safe_float_empty_returns_default():
 
 # ── step1 ─────────────────────────────────────────────────────────────────
 
+
 def test_step1_happy_path():
     errors, _ = validate_step1_form(MultiDict({"num_models_val": "5", "seed": "42"}))
     assert errors == {}
@@ -61,6 +63,7 @@ def test_step1_rejects_negative_seed():
 
 # ── step2 ─────────────────────────────────────────────────────────────────
 
+
 def _valid_step2(**overrides):
     base = {
         "num_features_min": "5",
@@ -81,9 +84,7 @@ def test_step2_happy_path():
 
 
 def test_step2_rejects_min_gt_max():
-    errors, _ = validate_step2_form(
-        _valid_step2(num_features_min="30", num_features_max="10")
-    )
+    errors, _ = validate_step2_form(_valid_step2(num_features_min="30", num_features_max="10"))
     assert "num_features_max" in errors
 
 
@@ -116,6 +117,7 @@ def test_step2_rejects_clearly_wrong_sum():
 
 # ── step3 ─────────────────────────────────────────────────────────────────
 
+
 def _valid_step3(**overrides):
     base = {
         "num_constraints_min": "1",
@@ -146,9 +148,7 @@ def test_step3_rejects_extra_constraint_repr_as_decimal():
 
 
 def test_step3_rejects_extra_constraint_repr_gt_vars_max():
-    errors, _ = validate_step3_form(
-        _valid_step3(extra_constraint_repr="10", vars_per_ctc_max="3")
-    )
+    errors, _ = validate_step3_form(_valid_step3(extra_constraint_repr="10", vars_per_ctc_max="3"))
     assert "extra_constraint_repr" in errors
 
 
@@ -161,26 +161,25 @@ def test_step3_boolops_sum_within_tolerance():
 
 
 def test_step3_boolops_sum_wildly_wrong():
-    errors, _ = validate_step3_form(
-        _valid_step3(prob_and="0.9", prob_or="0.9", prob_implies="0", prob_equiv="0")
-    )
+    errors, _ = validate_step3_form(_valid_step3(prob_and="0.9", prob_or="0.9", prob_implies="0", prob_equiv="0"))
     assert "boolop_sum" in errors
     assert "Current sum" in errors["boolop_sum"]
 
 
 def test_step3_arithmetic_only_when_level_enabled():
     """If arithmetic_level is off, the arithmetic-sum check should not fire."""
-    errors, _ = validate_step3_form(
-        _valid_step3(prob_plus="0", prob_minus="0", prob_times="0", prob_div="0")
-    )
+    errors, _ = validate_step3_form(_valid_step3(prob_plus="0", prob_minus="0", prob_times="0", prob_div="0"))
     assert "arithmetic_sum" not in errors
 
 
 def test_step3_arithmetic_sum_enforced_when_level_on():
     errors, _ = validate_step3_form(
         _valid_step3(
             arithmetic_level="on",
-            prob_plus="0.9", prob_minus="0.9", prob_times="0", prob_div="0",
+            prob_plus="0.9",
+            prob_minus="0.9",
+            prob_times="0",
+            prob_div="0",
         )
     )
     assert "arithmetic_sum" in errors

app/modules/generator/tests/test_wizard_flow.py

@@ -10,13 +10,12 @@
 - Back navigation preserving state
 - /generator/random and /generator/llm routes
 """
+
 import json
 
 import pytest
-
 from fm_generator.FMGenerator.models.config import Params
 
-
 STEP1 = {"num_models_val": "3", "seed": "42", "name_prefix": "fm"}
 STEP2 = {
     "num_features_min": "5",
@@ -66,6 +65,7 @@ def _walk_happy_path(client, step2=None, step3=None, step4=None):
 
 # ── Routes & top-level shape ─────────────────────────────────────────────
 
+
 def test_landing_is_reachable(client):
     assert client.get("/generator").status_code == 200
     assert client.get("/generator/").status_code == 200
@@ -85,6 +85,7 @@ def test_llm_placeholder_renders(client):
 
 # ── Session recovery ─────────────────────────────────────────────────────
 
+
 def test_advancing_with_no_session_redirects_to_landing(client):
     """Formerly returned a 400 "Error: Params missing in session" — now we
     redirect the user back to /generator so they can restart cleanly. This
@@ -97,6 +98,7 @@ def test_advancing_with_no_session_redirects_to_landing(client):
 
 # ── Happy path + contract ────────────────────────────────────────────────
 
+
 def test_full_happy_path_produces_valid_params(client):
     _walk_happy_path(client)
     r = client.get("/generator/random/params-json")
@@ -114,49 +116,51 @@ def test_step5_renders_when_session_ready(client):
 
 # ── Regression: 1.0007 slider sum ─────────────────────────────────────────
 
+
 def test_parent_child_slider_sum_1p0007_renormalises(client):
     """The slider rounds each segment to 4 decimals, which can leave up to
     0.0007 residue. The route must renormalise to exactly 1.0 before
     constructing Params."""
     client.post("/generator/random/step1", data=STEP1)
     poisoned = dict(STEP2)
-    poisoned.update({
-        "dist_optional": "0.2502",
-        "dist_mandatory": "0.2502",
-        "dist_alternative": "0.2502",
-        "dist_or": "0.2501",
-    })
+    poisoned.update(
+        {
+            "dist_optional": "0.2502",
+            "dist_mandatory": "0.2502",
+            "dist_alternative": "0.2502",
+            "dist_or": "0.2501",
+        }
+    )
     r = client.post("/generator/random/step2", data=poisoned)
     assert r.status_code == 302  # reached step3, Params built OK
 
     params = json.loads(client.get("/generator/random/params-json").data)
     total = (
-        params["DIST_OPTIONAL"] + params["DIST_MANDATORY"]
-        + params["DIST_ALTERNATIVE"] + params["DIST_OR"]
+        params["DIST_OPTIONAL"]
+        + params["DIST_MANDATORY"]
+        + params["DIST_ALTERNATIVE"]
+        + params["DIST_OR"]
         + params["DIST_GROUP_CARDINALITY"]
     )
     assert abs(total - 1.0) < 1e-6
 
 
 # ── Regression: boolean-ops sum residue ───────────────────────────────────
 
+
 def test_boolean_ops_residue_renormalises(client):
     _walk_happy_path(
         client,
-        step3={**STEP3,
-               "prob_and": "0.3334", "prob_or": "0.3333",
-               "prob_implies": "0.1667", "prob_equiv": "0.1666"},
+        step3={**STEP3, "prob_and": "0.3334", "prob_or": "0.3333", "prob_implies": "0.1667", "prob_equiv": "0.1666"},
     )
     params = json.loads(client.get("/generator/random/params-json").data)
-    total = (
-        params["PROB_AND"] + params["PROB_OR_CT"]
-        + params["PROB_IMPLICATION"] + params["PROB_EQUIVALENCE"]
-    )
+    total = params["PROB_AND"] + params["PROB_OR_CT"] + params["PROB_IMPLICATION"] + params["PROB_EQUIVALENCE"]
     assert abs(total - 1.0) < 1e-6
 
 
 # ── Regression: EXTRA_CONSTRAINT_REPRESENTATIVENESS "0.5" ─────────────────
 
+
 def test_extra_constraint_representativeness_is_int_in_session(client):
     _walk_happy_path(client)
     params = json.loads(client.get("/generator/random/params-json").data)
@@ -166,20 +170,26 @@ def test_extra_constraint_representativeness_is_int_in_session(client):
 
 # ── Regression: Spanish-locale decimal comma ──────────────────────────────
 
+
 def test_spanish_locale_decimal_comma_is_accepted(client):
     _walk_happy_path(
         client,
-        step3={**STEP3,
-               "prob_not": "0,3",
-               "prob_and": "0,4", "prob_or": "0,2",
-               "prob_implies": "0,2", "prob_equiv": "0,2"},
+        step3={
+            **STEP3,
+            "prob_not": "0,3",
+            "prob_and": "0,4",
+            "prob_or": "0,2",
+            "prob_implies": "0,2",
+            "prob_equiv": "0,2",
+        },
     )
     params = json.loads(client.get("/generator/random/params-json").data)
     assert params["PROB_NOT"] == pytest.approx(0.3)
 
 
 # ── Regression: back navigation keeps state ───────────────────────────────
 
+
 def test_back_nav_from_step3_preserves_step2_choices(client):
     # Advance to step3 with a specific max_features
     client.post("/generator/random/step1", data=STEP1)