Revert compile option (#27)

* Revert "Fix deadlock issue"

This reverts commit daa7935.

* Revert "fix getClassName for compiled files (#24)"

This reverts commit b264035.

* Revert "Add compile option to compile project files to bytecode ref #22 (#23)"

This reverts commit cf6bc1d.

Author: StephenSmith25

README.md

@@ -36,7 +36,7 @@ pip install pythonfmu3
 3. Run `pythonfmu3 build` to create the fmu.
 
 ```
-usage: pythonfmu3 build [-h] -f SCRIPT_FILE [-d DEST] [--doc DOCUMENTATION_FOLDER] [--terminals TERMINALS_FILE] [--compile] [--no-external-tool]
+usage: pythonfmu3 build [-h] -f SCRIPT_FILE [-d DEST] [--doc DOCUMENTATION_FOLDER] [--terminals TERMINALS_FILE] [--no-external-tool]
                        [--no-variable-step] [--interpolate-inputs] [--only-one-per-process] [--handle-state]
                        [--serialize-state] [--use-memory-management]
                        [Project files [Project files ...]]
@@ -55,7 +55,6 @@ optional arguments:
                         Documentation folder to include in the FMU.
   --terminals TERMINALS_FILE
                         Terminals file (terminalsAndIcons.xml) to include in the FMU.
-  --compile             If given, the script file and project files will be compiled to byte code.
   --no-external-tool    If given, needsExecutionTool=false
   --no-variable-step    If given, canHandleVariableCommunicationStepSize=false
   --interpolate-inputs  If given, canInterpolateInputs=true

pythonfmu3/builder.py

@@ -3,7 +3,6 @@
 import importlib
 import itertools
 import logging
-import py_compile
 import re
 import shutil
 import sys
@@ -21,29 +20,11 @@
 
 logger = logging.getLogger(__name__)
 
-def compile_source_file(source_file: FilePath, clean_existing: bool = False) -> Path:
-    compiled_file = source_file.with_suffix(".pyc")
-    py_compile.compile(source_file, cfile=compiled_file)
-    if clean_existing:
-        source_file.unlink(missing_ok=True)
-    return compiled_file
 
 def get_class_name(file_name: Path) -> str:
-
-    if file_name.suffix == ".py":
-        with open(str(file_name), 'r') as file:
-            data = file.read()
-            return re.search(r'class (\w+)\(\s*Fmi3Slave\s*\)\s*:', data).group(1)
-
-    elif file_name.suffix == ".pyc":
-        # For .pyc files, use importlib to load the module and inspect its classes
-        import importlib.util
-        spec = importlib.util.spec_from_file_location("module_name", file_name)
-        module = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(module)
-        for name, obj in vars(module).items():
-            if isinstance(obj, type) and issubclass(obj, Fmi3Slave) and obj is not Fmi3Slave:
-                return name
+    with open(str(file_name), 'r') as file:
+        data = file.read()
+        return re.search(r'class (\w+)\(\s*Fmi3Slave\s*\)\s*:', data).group(1)
 
 
 def get_model_description(filepath: Path, module_name: str) -> Tuple[str, Element]:
@@ -105,7 +86,7 @@ def build_FMU(
                 raise ValueError(
                     f"The documentation folder does not exists {documentation_folder!s}"
                 )
-
+        
         if terminals is not None:
             terminals = Path(terminals)
             if not terminals.exists():
@@ -118,14 +99,11 @@ def build_FMU(
                 )
 
         module_name = script_file.stem
-        compile_flag = options.get("compile", False)
 
         with tempfile.TemporaryDirectory(prefix="pythonfmu_") as tempd:
             temp_dir = Path(tempd)
             shutil.copy2(script_file, temp_dir)
 
-            if compile_flag:
-                script_file = compile_source_file(temp_dir / script_file.name, clean_existing=True)
             # Embed pythonfmu in the FMU so it does not need to be included
             dep_folder = temp_dir / "pythonfmu3"
             dep_folder.mkdir()
@@ -152,11 +130,6 @@ def build_FMU(
                     else:
                         shutil.copy2(file_, temp_dir)
 
-            for f in temp_dir.rglob("*.py"):
-                if f.suffix == ".py" and compile_flag:
-                    compile_source_file(f, clean_existing=True)
-
-
             model_identifier, xml = get_model_description(
                 temp_dir.absolute() / script_file.name, module_name
             )
@@ -221,7 +194,7 @@ def build_FMU(
                     terminalsFolder = Path("terminalsAndIcons")
                     relative_f = terminals.relative_to(terminals.parent)
                     zip_fmu.write(f, arcname=(terminalsFolder / relative_f))
-
+                    
 
                 # Add the model description
                 xml_str = parseString(tostring(xml, "UTF-8"))
@@ -267,13 +240,6 @@ def create_command_parser(parser: argparse.ArgumentParser):
         default=None
     )
 
-    parser.add_argument(
-        "--compile",
-        dest="compile",
-        help="If given, the Python script and project files will be compiled to bytecode.",
-        action="store_true"
-    )
-
     for option in FMI3_MODEL_OPTIONS:
         action = "store_false" if option.value else "store_true"
         parser.add_argument(

pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp

@@ -24,79 +24,28 @@ inline std::string getline(const std::string& fileName)
     return line;
 }
 
-std::string getClassName(PyObject * pModule)
-{
-    std::string className = "";
-    PyObject* dict = PyModule_GetDict(pModule);
-    PyObject* keys = PyDict_Keys(dict);
-    // Iterate through the dictionary keys to find classes derived from Fmi3Slave
-    for (int i = 0; i < PyList_Size(keys); i++) {
-        PyObject* key = PyList_GetItem(keys, i);
-        if (PyUnicode_Check(key)) {
-        PyObject* utf8Str = PyUnicode_AsEncodedString(key, "utf-8", nullptr);
-        if (utf8Str == nullptr) {
-            return "";
-        }
-        std::string classNameCandidate = PyBytes_AsString(utf8Str);
-        Py_DECREF(utf8Str);
-
-        // Check if the class is a subclass of Fmi3Slave
-        PyObject* obj = PyDict_GetItem(dict, key);
-        if (PyObject_HasAttrString(obj, "__bases__")) {
-            PyObject* bases = PyObject_GetAttrString(obj, "__bases__");
-            if (PyTuple_Check(bases)) {
-            for (int j = 0; j < PyTuple_Size(bases); j++) {
-                PyObject* base = PyTuple_GetItem(bases, j);
-                PyObject* baseNameObj = PyObject_GetAttrString(base, "__name__");
-                if (baseNameObj && PyUnicode_Check(baseNameObj)) {
-                PyObject* baseUtf8Str = PyUnicode_AsEncodedString(baseNameObj, "utf-8", nullptr);
-                if (baseUtf8Str != nullptr) {
-                    std::string baseName = PyBytes_AsString(baseUtf8Str);
-                    Py_DECREF(baseUtf8Str);
-                    if (baseName == "Fmi3Slave") {
-                    className = classNameCandidate;
-                    Py_DECREF(baseNameObj);
-                    Py_DECREF(bases);
-                    Py_DECREF(keys);
-                    return className;
-                    }
-                }
-                Py_DECREF(baseNameObj);
-                }
-            }
-            }
-            Py_DECREF(bases);
-        }
-
-        if (!className.empty()) {
-            break; // Break after finding the first subclass
-        }
+inline std::string findClassName(const std::string& fileName)
+{
+    std::string line;
+    std::ifstream infile(fileName);
+    std::string regexStr(R"(^class (\w+)\(\s*Fmi3Slave\s*\)\s*:)");
+    while (getline(infile, line)) {
+        std::smatch m;
+        std::regex re(regexStr);
+        if (std::regex_search(line, m, re)) {
+            return m[1];
         }
     }
-    return className;
-}
-
-class GILStateGuard {
-public:
-    GILStateGuard() : gil_state_(PyGILState_Ensure()) {}
-    ~GILStateGuard() { PyGILState_Release(gil_state_); }
-    
-    GILStateGuard(const GILStateGuard&) = delete;
-    GILStateGuard& operator=(const GILStateGuard&) = delete;
-    
-    PyGILState_STATE get() const { return gil_state_; }
-    
-private:
-    PyGILState_STATE gil_state_;
-};
+    return "";
+}
 
 inline void py_safe_run(const std::function<void(PyGILState_STATE gilState)>& f)
 {
-    GILStateGuard guard;
-    f(guard.get());
+    PyGILState_STATE gil_state = PyGILState_Ensure();
+    f(gil_state);
+    PyGILState_Release(gil_state);
 }
 
-
 PySlaveInstance::PySlaveInstance(std::string instanceName, std::string resources, const cppfmu::Logger& logger, const bool visible, std::shared_ptr<IPyState> pyState)
     : pyState_{ std::move(pyState) }
     , instanceName_(std::move(instanceName))
@@ -128,7 +77,7 @@ PySlaveInstance::PySlaveInstance(std::string instanceName, std::string resources
             handle_py_exception("[ctor] PyImport_ImportModule", gilState);
         }
 
-        std::string className = getClassName(pModule);
+        std::string className = findClassName(resources_ + "/" + moduleName + ".py");
         if (className.empty()) {
             cleanPyObject();
             throw cppfmu::FatalError("Unable to find class extending Fmi3Slave!");

pythonfmu3/tests/test_builder.py

@@ -22,18 +22,16 @@
 )
 
 
-@pytest.mark.parametrize("compile", [False, True])
-def test_zip_content(tmp_path, compile):
-    extension = ".pyc" if compile else ".py" 
+def test_zip_content(tmp_path):
+
     script_name = "pythonslave.py"
     script_file = Path(__file__).parent / "slaves" / script_name
-    fmu = FmuBuilder.build_FMU(script_file, dest=tmp_path, compile=compile)
+    fmu = FmuBuilder.build_FMU(script_file, dest=tmp_path)
     assert fmu.exists()
     assert zipfile.is_zipfile(fmu)
 
     with zipfile.ZipFile(fmu) as files:
         names = files.namelist()
-        script_name = script_name.replace(".py", extension)
 
         assert "modelDescription.xml" in names
         assert "/".join(("resources", script_name)) in names
@@ -62,11 +60,8 @@ def test_zip_content(tmp_path, compile):
 
         # Check pythonfmu is embedded
         pkg_folder = Path(pythonfmu3.__path__[0])
-        for f in pkg_folder.rglob(f"*.py"):
+        for f in pkg_folder.rglob("*.py"):
             relative_f = f.relative_to(pkg_folder).as_posix()
-            # change relative f suffix
-            if relative_f.endswith(".py"):
-                relative_f = relative_f.replace(".py", extension)
             if "test" not in relative_f:
                 assert "/".join(("resources", "pythonfmu3", relative_f)) in names
 
@@ -106,6 +101,7 @@ def build():
                     project_files.add(full_name.parent)
 
             return FmuBuilder.build_FMU(script_file, dest=tmp_path, project_files=project_files)
+
     fmu = build()
     with zipfile.ZipFile(fmu) as files:
         names = files.namelist()
@@ -123,8 +119,7 @@ def build():
 
 
 @pytest.mark.parametrize("pfiles", PROJECT_TEST_CASES)
-@pytest.mark.parametrize("compile", [False, True])
-def test_project_files_containing_script(tmp_path, pfiles, compile):
+def test_project_files_containing_script(tmp_path, pfiles):
     orig_script_file = Path(__file__).parent / "slaves/pythonslave.py"
     pfiles = map(Path, pfiles)
 
@@ -144,7 +139,7 @@ def build():
                     full_name.mkdir(parents=True, exist_ok=True)
 
             return FmuBuilder.build_FMU(
-                script_file, dest=tmp_path, project_files=[script_file.parent], compile=compile
+                script_file, dest=tmp_path, project_files=[script_file.parent]
             )
 
     fmu = build()