Merge pull request #35 from flamapy/develop

Develop

Author: sebasruii

package-lock.json

@@ -13,6 +13,7 @@
     "@monaco-editor/react": "^4.6.0",
     "dom-to-svg": "^0.12.2",
     "file-saver": "^2.0.5",
+    "jszip": "^3.10.1",
     "react": "^18.3.1",
     "react-d3-tree": "^3.6.2",
     "react-dom": "^18.3.1",

package.json

@@ -29,6 +29,7 @@ class Flamapy {
   await micropip.install("flamapy/uvlparser-2.0.1-py3-none-any.whl", deps=False)
   await micropip.install("flamapy/afmparser-1.0.3-py3-none-any.whl", deps=False)
   await micropip.install("flamapy/antlr4_python3_runtime-4.13.1-py3-none-any.whl", deps=False)
+  await micropip.install("flamapy/flamapy_configurator-2.0.1-py3-none-any.whl", deps=False)
   `);
     await pyodideInstance.runPythonAsync(await pythonFile.text());
     pyodideInstance.FS.mkdir("export");
@@ -122,4 +123,23 @@ class Flamapy {
       }
     }
   }
+
+  async startConfigurator() {
+    const result = await this.pyodide.runPythonAsync(`
+  start_configurator()`);
+    return JSON.parse(result);
+  }
+
+  async answerQuestion(answer) {
+    this.pyodide.globals.set("answer", answer);
+    const result = await this.pyodide.runPythonAsync(`
+  answer_question(answer)`);
+    return JSON.parse(result);
+  }
+
+  async undoAnswer() {
+    const result = await this.pyodide.runPythonAsync(`
+  undo_answer()`);
+    return JSON.parse(result);
+  }
 }

public/assets/flamapy.conf.zip

@@ -8,9 +8,12 @@
 from flamapy.core.discover import DiscoverMetamodels
 from flamapy.metamodels.fm_metamodel.transformations import GlencoeReader, AFMReader, FeatureIDEReader, JSONReader, XMLReader, UVLReader, GlencoeWriter
 from flamapy.metamodels.configuration_metamodel.models import Configuration
+from flamapy.metamodels.configurator_metamodel.transformation import FmToConfigurator
 from collections import defaultdict
 
 fm = None
+configurator = None
+
 
 # Custom error listener
 class CustomErrorListener(ErrorListener):
@@ -211,4 +214,30 @@ def execute_configurator_operation(name: str, conf):
     result = operation.get_result()
     if type(result) is list:
         return [str(conf) for conf in result]
-    return result
+    return result
+
+def start_configurator():
+    global configurator
+    configurator = FmToConfigurator(fm.fm_model).transform()
+    configurator.start()
+    
+    return json.dumps(configurator.get_current_status())
+
+def answer_question(answer):
+    valid = configurator.answer_question(answer)
+
+    result = dict()
+    result['valid'] = valid
+    if valid:
+        if configurator.next_question():
+            result['nextQuestion'] = configurator.get_current_status()
+        else:
+            result['configuration'] = configurator._get_configuration()
+    else:
+        result['contradiction'] = {'msg': 'The selected choice is incompatible with the model definition. Please choose another option.'}
+    
+    return json.dumps(result)
+
+def undo_answer():
+    configurator.previous_question()
+    return json.dumps(configurator.get_current_status())

public/flamapy/flamapy.js

@@ -33,6 +33,12 @@ self.onmessage = async (event) => {
       results = await self.flamapy.getFeatures();
     } else if (action === "executeActionWithConf") {
       results = await self.flamapy.executeActionWithConf(data);
+    } else if (action === "startConfigurator") {
+      results = await self.flamapy.startConfigurator();
+    } else if (action === "answerQuestion") {
+      results = await self.flamapy.answerQuestion(data);
+    } else if (action === "undoAnswer") {
+      results = await self.flamapy.undoAnswer();
     }
 
     self.postMessage({ results, action });

public/flamapy/flamapy_configurator-2.0.1-py3-none-any.whl

@@ -1,6 +1,7 @@
 flamapy==2.0.1
 ./public/flamapy/flamapy_fw-2.0.2.dev0-py3-none-any.whl
 ./public/flamapy/flamapy_fm-2.0.2.dev0-py3-none-any.whl
+./public/flamapy/flamapy_configurator-2.0.1-py3-none-any.whl
 flamapy_sat==2.0.1
 flamapy_bdd==2.0.1
 pytest==8.3.3

public/flamapy/flamapy_ide.py

@@ -0,0 +1,67 @@
+function Configuration({ configuration }) {
+  const categorizedConfig = {
+    selected: [],
+    deselected: [],
+    undecided: [],
+  };
+
+  Object.entries(configuration).forEach(([feature, status]) => {
+    if (status === true) {
+      categorizedConfig.selected.push(feature);
+    } else if (status === false) {
+      categorizedConfig.deselected.push(feature);
+    } else {
+      categorizedConfig.undecided.push(feature);
+    }
+  });
+
+  return (
+    <div className="bg-white w-full rounded-xl p-4 text-xl shadow-md overflow-auto">
+      <h2 className="text-2xl font-bold text-gray-800 mb-4">
+        Feature Configuration
+      </h2>
+      <div className="text-lg">
+        <div className="mb-2">
+          <h3 className="font-semibold text-green-600">Selected Features:</h3>
+          <ul className="list-disc list-inside text-black">
+            {categorizedConfig.selected.length > 0 ? (
+              categorizedConfig.selected.map((feature, index) => (
+                <li key={index}>{feature}</li>
+              ))
+            ) : (
+              <p className="text-gray-500">None</p>
+            )}
+          </ul>
+        </div>
+
+        <div className="mb-2">
+          <h3 className="font-semibold text-red-600">Deselected Features:</h3>
+          <ul className="list-disc list-inside text-black">
+            {categorizedConfig.deselected.length > 0 ? (
+              categorizedConfig.deselected.map((feature, index) => (
+                <li key={index}>{feature}</li>
+              ))
+            ) : (
+              <p className="text-gray-500">None</p>
+            )}
+          </ul>
+        </div>
+
+        <div>
+          <h3 className="font-semibold text-yellow-600">Undecided Features:</h3>
+          <ul className="list-disc list-inside text-black">
+            {categorizedConfig.undecided.length > 0 ? (
+              categorizedConfig.undecided.map((feature, index) => (
+                <li key={index}>{feature}</li>
+              ))
+            ) : (
+              <p className="text-gray-500">None</p>
+            )}
+          </ul>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default Configuration;

public/webworker.js

@@ -0,0 +1,19 @@
+/* eslint-disable react/prop-types */
+function CustomButton({ active = true, onClick, children }) {
+  const baseClasses =
+    "w-max text-white py-2 px-4 m-2 rounded shadow-lg transition-colors duration-200";
+  const activeClasses = "bg-[#356C99] hover:bg-[#0D486C]";
+  const disabledClasses = "bg-gray-400 cursor-not-allowed";
+
+  return (
+    <button
+      className={`${baseClasses} ${active ? activeClasses : disabledClasses}`}
+      onClick={active ? onClick : undefined}
+      disabled={!active}
+    >
+      {children}
+    </button>
+  );
+}
+
+export default CustomButton;