pythonfmu3 0.3.4__tar.gz → 1.0.0__tar.gz

{pythonfmu3-0.3.4 → pythonfmu3-1.0.0}/MANIFEST.in

@@ -6,3 +6,6 @@ recursive-include pythonfmu3/tests/slaves *
 
 recursive-include pythonfmu3/resources *
 recursive-include pythonfmu3/pythonfmu-export *
+
+prune pythonfmu3/pythonfmu-export/build
+global-exclude __pycache__ *.py[cod]

{pythonfmu3-0.3.4 → pythonfmu3-1.0.0}/PKG-INFO

@@ -1,23 +1,31 @@
 Metadata-Version: 2.4
 Name: pythonfmu3
-Version: 0.3.4
-Summary: A lightweight framework that enables the packaging of Python3.x code as co-simulation FMUs.
-Home-page: https://github.com/stephensmith25/PythonFMU3
+Version: 1.0.0
+Summary: A lightweight framework that enables the packaging of Python 3 code as FMI 3.0 co-simulation and model exchange FMUs.
 Author: Stephen Smith
-License: MIT
-Keywords: FMI
-Classifier: Development Status :: 3 - Alpha
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/StephenSmith25/PythonFMU3
+Project-URL: Documentation, https://pythonfmu3.readthedocs.io/
+Project-URL: Issues, https://github.com/StephenSmith25/PythonFMU3/issues
+Keywords: FMI,FMI3,FMU,co-simulation,model exchange,simulation
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: MacOS
 Classifier: Programming Language :: C++
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: tests
@@ -41,8 +49,30 @@ This project is a fork of the original PythonFMU repository available at https:/
 
 ### Support:
 
-Please take a look at the examples to see the supported features.
-We currently support both the Model exchange and Cosimulation Interfaces.
+Both the Model Exchange and Co-simulation interfaces are supported, with Float64, Int32,
+Int64, UInt64, Boolean, String and Enumeration variables (plus NumPy arrays of the numeric
+types). See the [documentation](https://pythonfmu3.readthedocs.io/) for the full list of
+supported features and current limitations, and the `examples` folder for more models.
+
+See the [changelog](docs/changelog.md) for what changed in each release.
+
+### Where can I run the FMU?
+
+In any FMI 3.0 importer: Python-based tools such as FMPy, and native tools such as
+OMSimulator, `fmusim` or Simulink.
+
+The machine running the simulation needs Python 3 with a **shared** Python library, plus
+the packages your model imports (see `pythonfmu3 deploy` below). Inside a Python-based
+importer the FMU uses that interpreter. Otherwise, on Linux and macOS the FMU finds and
+loads `libpython` itself; if it picks the wrong one, or none, point it at the right library:
+
+```bash
+export PYTHONFMU_PYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython3.12.so.1.0
+```
+
+On Windows, `python3.dll` must be on the `PATH`. See
+[Running FMUs outside Python](docs/install.md#running-fmus-outside-python-linux-and-macos)
+for the full lookup order.
 
 ### How do I build an FMU from python code?
 
@@ -53,35 +83,37 @@ pip install pythonfmu3
 ```
 
 2. Create a new class extending the `Fmi3Slave` class declared in the `pythonfmu3.fmi3slave` module (see below for an example).
+   Keep a single FMU class per script.
 3. Run `pythonfmu3 build` to create the fmu.
 
 ```
-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 ...]]
+usage: pythonfmu3 build [-h] -f SCRIPT_FILE [-d DEST] [--doc DOCUMENTATION_FOLDER] [--terminals TERMINALS]
+                        [--no-external-tool] [--only-one-per-process] [--handle-state] [--serialize-state]
+                        [--no-variable-step] [--needs-completed-step]
+                        [Project files ...]
 
 Build an FMU from a Python script.
 
 positional arguments:
   Project files         Additional project files required by the Python script.
 
-optional arguments:
+options:
   -h, --help            show this help message and exit
   -f SCRIPT_FILE, --file SCRIPT_FILE
                         Path to the Python script.
   -d DEST, --dest DEST  Where to save the FMU.
   --doc DOCUMENTATION_FOLDER
                         Documentation folder to include in the FMU.
-  --terminals TERMINALS_FILE
+  --terminals TERMINALS
                         Terminals file (terminalsAndIcons.xml) to include in the FMU.
   --no-external-tool    If given, needsExecutionTool=false
-  --no-variable-step    If given, canHandleVariableCommunicationStepSize=false
-  --interpolate-inputs  If given, canInterpolateInputs=true
   --only-one-per-process
                         If given, canBeInstantiatedOnlyOncePerProcess=true
-  --handle-state        If given, canGetAndSetFMUstate=true
-  --serialize-state     If given, canSerializeFMUstate=true
+  --handle-state        If given, canGetAndSetFMUState=true
+  --serialize-state     If given, canSerializeFMUState=true
+  --no-variable-step    If given, canHandleVariableCommunicationStepSize=false
+  --needs-completed-step
+                        If given, needsCompletedIntegratorStep=true
 ```
 
 ### How do I build an FMU from python code with third-party dependencies?
@@ -91,7 +123,7 @@ _PythonFMU_ does not package a full environment within the FMU.
 However, you can package a `requirements.txt` or `environment.yml` file within your FMU following these steps:
 
 1. Install _pythonfmu_ package: `pip install pythonfmu3`
-2. Create a new class extending the `Fmi3Slave` class declared in the `pythonfmu3.fmi3slave` module (see below for an example).
+2. Create a new class extending the `Fmi3Slave` class declared in the `pythonfmu3.fmi3slave` module (see the examples below).
 3. Create a `requirements.txt` file (to use _pip_ manager) and/or a `environment.yml` file (to use _conda_ manager) that defines your dependencies.
 4. Run `pythonfmu3 build -f myscript.py requirements.txt` to create the fmu including the dependencies file.
 
@@ -133,6 +165,8 @@ class PythonSlave(Fmi3Slave):
         self.author = "John Doe"
         self.description = "A simple description"
 
+        # Create attributes before registering them: register_variable only adds a setter
+        # (needed for inputs and parameters) for attributes that already exist.
         self.time = 0.0
         self.intOut = 1
         self.realOut = 3.0
@@ -172,7 +206,7 @@ To create a model exchange FMU you must inherit from `Fmi3SlaveBase` and one of
 
 ```python
 
-from pythonfmu3 import Fmi3Causality, Fmi3SlaveBase, Float64, ModelExchange
+from pythonfmu3 import Fmi3Causality, Fmi3Initial, Fmi3SlaveBase, Fmi3Variability, Float64, ModelExchange
 from typing import List
 
 
@@ -207,7 +241,9 @@ class PythonSlaveMX(Fmi3SlaveBase, ModelExchange):
 
 ```
 
-Note: There is a hard requirement that we have a `self.time` member in the derived class.
+Note: Model Exchange classes must define a `self.time` member. Derivative variables give the
+value reference of their state with `derivative=`; value references are assigned in
+registration order starting at 0 (here `time` = 0, `x0` = 1, `x1` = 2).
 
 #### Create the FMU
 

pythonfmu3-0.3.4/pythonfmu3.egg-info/PKG-INFO → pythonfmu3-1.0.0/README.md

@@ -1,30 +1,3 @@
-Metadata-Version: 2.4
-Name: pythonfmu3
-Version: 0.3.4
-Summary: A lightweight framework that enables the packaging of Python3.x code as co-simulation FMUs.
-Home-page: https://github.com/stephensmith25/PythonFMU3
-Author: Stephen Smith
-License: MIT
-Keywords: FMI
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Programming Language :: C++
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Topic :: Scientific/Engineering
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Provides-Extra: tests
-Requires-Dist: pytest; extra == "tests"
-Requires-Dist: fmpy; extra == "tests"
-Dynamic: license-file
-
 # PythonFMU3
 
 > A lightweight framework that enables the packaging of Python 3 code as FMUs (following FMI version 3.0).
@@ -41,8 +14,30 @@ This project is a fork of the original PythonFMU repository available at https:/
 
 ### Support:
 
-Please take a look at the examples to see the supported features.
-We currently support both the Model exchange and Cosimulation Interfaces.
+Both the Model Exchange and Co-simulation interfaces are supported, with Float64, Int32,
+Int64, UInt64, Boolean, String and Enumeration variables (plus NumPy arrays of the numeric
+types). See the [documentation](https://pythonfmu3.readthedocs.io/) for the full list of
+supported features and current limitations, and the `examples` folder for more models.
+
+See the [changelog](docs/changelog.md) for what changed in each release.
+
+### Where can I run the FMU?
+
+In any FMI 3.0 importer: Python-based tools such as FMPy, and native tools such as
+OMSimulator, `fmusim` or Simulink.
+
+The machine running the simulation needs Python 3 with a **shared** Python library, plus
+the packages your model imports (see `pythonfmu3 deploy` below). Inside a Python-based
+importer the FMU uses that interpreter. Otherwise, on Linux and macOS the FMU finds and
+loads `libpython` itself; if it picks the wrong one, or none, point it at the right library:
+
+```bash
+export PYTHONFMU_PYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython3.12.so.1.0
+```
+
+On Windows, `python3.dll` must be on the `PATH`. See
+[Running FMUs outside Python](docs/install.md#running-fmus-outside-python-linux-and-macos)
+for the full lookup order.
 
 ### How do I build an FMU from python code?
 
@@ -53,35 +48,37 @@ pip install pythonfmu3
 ```
 
 2. Create a new class extending the `Fmi3Slave` class declared in the `pythonfmu3.fmi3slave` module (see below for an example).
+   Keep a single FMU class per script.
 3. Run `pythonfmu3 build` to create the fmu.
 
 ```
-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 ...]]
+usage: pythonfmu3 build [-h] -f SCRIPT_FILE [-d DEST] [--doc DOCUMENTATION_FOLDER] [--terminals TERMINALS]
+                        [--no-external-tool] [--only-one-per-process] [--handle-state] [--serialize-state]
+                        [--no-variable-step] [--needs-completed-step]
+                        [Project files ...]
 
 Build an FMU from a Python script.
 
 positional arguments:
   Project files         Additional project files required by the Python script.
 
-optional arguments:
+options:
   -h, --help            show this help message and exit
   -f SCRIPT_FILE, --file SCRIPT_FILE
                         Path to the Python script.
   -d DEST, --dest DEST  Where to save the FMU.
   --doc DOCUMENTATION_FOLDER
                         Documentation folder to include in the FMU.
-  --terminals TERMINALS_FILE
+  --terminals TERMINALS
                         Terminals file (terminalsAndIcons.xml) to include in the FMU.
   --no-external-tool    If given, needsExecutionTool=false
-  --no-variable-step    If given, canHandleVariableCommunicationStepSize=false
-  --interpolate-inputs  If given, canInterpolateInputs=true
   --only-one-per-process
                         If given, canBeInstantiatedOnlyOncePerProcess=true
-  --handle-state        If given, canGetAndSetFMUstate=true
-  --serialize-state     If given, canSerializeFMUstate=true
+  --handle-state        If given, canGetAndSetFMUState=true
+  --serialize-state     If given, canSerializeFMUState=true
+  --no-variable-step    If given, canHandleVariableCommunicationStepSize=false
+  --needs-completed-step
+                        If given, needsCompletedIntegratorStep=true
 ```
 
 ### How do I build an FMU from python code with third-party dependencies?
@@ -91,7 +88,7 @@ _PythonFMU_ does not package a full environment within the FMU.
 However, you can package a `requirements.txt` or `environment.yml` file within your FMU following these steps:
 
 1. Install _pythonfmu_ package: `pip install pythonfmu3`
-2. Create a new class extending the `Fmi3Slave` class declared in the `pythonfmu3.fmi3slave` module (see below for an example).
+2. Create a new class extending the `Fmi3Slave` class declared in the `pythonfmu3.fmi3slave` module (see the examples below).
 3. Create a `requirements.txt` file (to use _pip_ manager) and/or a `environment.yml` file (to use _conda_ manager) that defines your dependencies.
 4. Run `pythonfmu3 build -f myscript.py requirements.txt` to create the fmu including the dependencies file.
 
@@ -133,6 +130,8 @@ class PythonSlave(Fmi3Slave):
         self.author = "John Doe"
         self.description = "A simple description"
 
+        # Create attributes before registering them: register_variable only adds a setter
+        # (needed for inputs and parameters) for attributes that already exist.
         self.time = 0.0
         self.intOut = 1
         self.realOut = 3.0
@@ -172,7 +171,7 @@ To create a model exchange FMU you must inherit from `Fmi3SlaveBase` and one of
 
 ```python
 
-from pythonfmu3 import Fmi3Causality, Fmi3SlaveBase, Float64, ModelExchange
+from pythonfmu3 import Fmi3Causality, Fmi3Initial, Fmi3SlaveBase, Fmi3Variability, Float64, ModelExchange
 from typing import List
 
 
@@ -207,7 +206,9 @@ class PythonSlaveMX(Fmi3SlaveBase, ModelExchange):
 
 ```
 
-Note: There is a hard requirement that we have a `self.time` member in the derived class.
+Note: Model Exchange classes must define a `self.time` member. Derivative variables give the
+value reference of their state with `derivative=`; value references are assigned in
+registration order starting at 0 (here `time` = 0, `x0` = 1, `x1` = 2).
 
 #### Create the FMU
 

pythonfmu3-1.0.0/pyproject.toml

@@ -0,0 +1,70 @@
+[build-system]
+# >= 77 for the SPDX `license` expression (PEP 639)
+requires = ["setuptools>=77"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pythonfmu3"
+dynamic = ["version"]
+description = "A lightweight framework that enables the packaging of Python 3 code as FMI 3.0 co-simulation and model exchange FMUs."
+readme = "README.md"
+requires-python = ">=3.9"
+license = "MIT"
+license-files = ["LICENSE"]
+authors = [{ name = "Stephen Smith" }]
+keywords = ["FMI", "FMI3", "FMU", "co-simulation", "model exchange", "simulation"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: End Users/Desktop",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Natural Language :: English",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: MacOS",
+    "Programming Language :: C++",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Scientific/Engineering",
+]
+dependencies = []
+
+[project.optional-dependencies]
+tests = ["pytest", "fmpy"]
+
+[project.urls]
+Homepage = "https://github.com/StephenSmith25/PythonFMU3"
+Documentation = "https://pythonfmu3.readthedocs.io/"
+Issues = "https://github.com/StephenSmith25/PythonFMU3/issues"
+
+[project.scripts]
+pythonfmu3 = "pythonfmu3.__main__:cli_main"
+
+[tool.setuptools.dynamic]
+version = { attr = "pythonfmu3._version.__version__" }
+
+[tool.setuptools.packages.find]
+include = ["pythonfmu3*"]
+
+[tool.setuptools.package-data]
+# Prebuilt wrapper libraries, the wrapper sources (embedded in every FMU) and test data
+pythonfmu3 = [
+    "resources/binaries/*/*",
+    "pythonfmu-export/**/*",
+    "tests/data/*",
+    "tests/slaves/*",
+]
+
+[tool.setuptools.exclude-package-data]
+pythonfmu3 = ["pythonfmu-export/build/**", "**/__pycache__/*"]
+
+[tool.pytest.ini_options]
+markers = [
+    "integration: marks integration tests",
+    "doc: marks documentation tests",
+]

pythonfmu3-1.0.0/pythonfmu3/_version.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

{pythonfmu3-0.3.4 → pythonfmu3-1.0.0}/pythonfmu3/builder.py

@@ -1,15 +1,16 @@
 """Python FMU builder"""
 import argparse
-import importlib
+import importlib.util
 import itertools
 import logging
 import re
 import shutil
 import sys
+import sysconfig
 import tempfile
 import zipfile
 from pathlib import Path
-from typing import Iterable, Optional, Tuple, Union
+from typing import Iterable, List, Optional, Tuple, Union
 from xml.dom.minidom import parseString
 from xml.etree.ElementTree import Element, SubElement, tostring
 from .osutil import get_lib_extension, get_platform
@@ -21,13 +22,49 @@ HERE = Path(__file__).parent
 logger = logging.getLogger(__name__)
 
 
+_SLAVE_CLASS_RE = re.compile(r'^class (\w+)\(([^)]*\bFmi3Slave(?:Base)?\b[^)]*)\)\s*:', re.MULTILINE)
+
+
 def get_class_name(file_name: Path) -> str:
-    with open(str(file_name), 'r') as file:
-        data = file.read()
-        return re.search(r'class (\w+)\(([^)]*\bFmi3Slave(?:Base)?\b[^)]*)\)\s*:', data).group(1)
+    """Find the name of the first class in *file_name* that textually extends Fmi3Slave/Fmi3SlaveBase."""
+    data = Path(file_name).read_text(encoding="utf-8")
+    match = _SLAVE_CLASS_RE.search(data)
+    if match is None:
+        raise ValueError(f"Unable to find a class extending Fmi3Slave or Fmi3SlaveBase in {file_name!s}")
+    return match.group(1)
+
 
+def _find_slave_class(module, filepath: Path) -> type:
+    """Locate the FMU class in an imported module.
 
-def get_model_description(filepath: Path, module_name: str) -> Tuple[str, Element]:
+    Classes defined in the module that inherit from Fmi3SlaveBase are candidates. If the
+    regex-based lookup (also used by the native wrapper as a fallback) matches one of them
+    it wins, so behaviour stays identical for existing scripts; otherwise a single
+    candidate is accepted (this handles multi-line base lists and indirect inheritance).
+    """
+    candidates = {
+        name: obj for name, obj in vars(module).items()
+        if isinstance(obj, type)
+        and obj.__module__ == module.__name__
+        and any(base.__name__ == Fmi3SlaveBase.__name__ for base in obj.__mro__)
+    }
+    try:
+        preferred = get_class_name(filepath)
+    except ValueError:
+        preferred = None
+    if preferred in candidates:
+        return candidates[preferred]
+    if len(candidates) == 1:
+        return next(iter(candidates.values()))
+    if not candidates:
+        raise ValueError(f"No class inheriting from {Fmi3SlaveBase.__qualname__} found in {filepath!s}")
+    raise ValueError(
+        f"Several FMU classes found in {filepath!s} ({', '.join(sorted(candidates))}); "
+        "keep a single Fmi3Slave subclass per script."
+    )
+
+
+def get_model_description(filepath: Path, module_name: str) -> Tuple[str, Element, str]:
     """Extract the FMU model description as XML.
 
     Args:
@@ -35,7 +72,7 @@ def get_model_description(filepath: Path, module_name: str) -> Tuple[str, Elemen
         module_name (str) : python module to load
 
     Returns:
-        Tuple[str, xml.etree.TreeElement.Element] : FMU model name, model description
+        Tuple[str, xml.etree.TreeElement.Element, str] : FMU model name, model description, class name
     """
     # Add current folder to handle local dependencies
     sys.path.insert(0, str(filepath.parent))
@@ -45,8 +82,9 @@ def get_model_description(filepath: Path, module_name: str) -> Tuple[str, Elemen
         fmu_interface = importlib.util.module_from_spec(spec)
         spec.loader.exec_module(fmu_interface)
         # Instantiate the interface
-        class_name = get_class_name(filepath)
-        instance = getattr(fmu_interface, class_name)(instance_name="dummyInstance", resources=str(filepath.parent))
+        slave_class = _find_slave_class(fmu_interface, filepath)
+        class_name = slave_class.__name__
+        instance = slave_class(instance_name="dummyInstance", resources=str(filepath.parent))
     finally:
         sys.path.remove(str(filepath.parent))  # remove inserted temporary path
 
@@ -55,7 +93,30 @@ def get_model_description(filepath: Path, module_name: str) -> Tuple[str, Elemen
             f"The provided class '{class_name}' does not inherit from {Fmi3SlaveBase.__qualname__}"
         )
     # Produce the xml
-    return instance.modelName, instance.to_xml()
+    return instance.modelName, instance.to_xml(), class_name
+
+
+def _is_fmu_entry_library(path: Path) -> bool:
+    """True for the library exporting the FMI functions (renamed to the model identifier)."""
+    return path.stem in ("pythonfmu-export", "libpythonfmu-export")
+
+
+def _libpython_candidates() -> List[str]:
+    """Paths of the shared libpython of the running interpreter, if it has one."""
+    if sys.platform == "win32":
+        return []  # the Windows library links python3.dll directly
+    libdir = sysconfig.get_config_var("LIBDIR") or ""
+    framework_prefix = sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX") or ""
+    candidates = []
+    for name in (sysconfig.get_config_var("INSTSONAME"), sysconfig.get_config_var("LDLIBRARY")):
+        if not name or name.endswith(".a"):
+            continue  # statically linked interpreter: nothing to point at
+        for base in (libdir, framework_prefix):
+            if base:
+                candidate = Path(base) / name
+                if candidate.is_file() and str(candidate) not in candidates:
+                    candidates.append(str(candidate))
+    return candidates
 
 
 class FmuBuilder:
@@ -64,7 +125,7 @@ class FmuBuilder:
     def build_FMU(
         script_file: FilePath,
         dest: FilePath = ".",
-        project_files: Iterable[FilePath] = set(),
+        project_files: Iterable[FilePath] = (),
         documentation_folder: Optional[FilePath] = None,
         terminals : Optional[FilePath] = None,
         **options,
@@ -130,7 +191,7 @@ class FmuBuilder:
                     else:
                         shutil.copy2(file_, temp_dir)
 
-            model_identifier, xml = get_model_description(
+            model_identifier, xml, class_name = get_model_description(
                 temp_dir.absolute() / script_file.name, module_name
             )
 
@@ -163,8 +224,20 @@ class FmuBuilder:
                         relative_f = f.relative_to(temp_dir)
                         zip_fmu.write(f, arcname=(resource / relative_f))
 
-                # Add information for the Python loader
-                zip_fmu.writestr(str(resource.joinpath("slavemodule.txt")), module_name)
+                # Hint for the Linux/macOS shim: where the Python that built this FMU
+                # keeps its shared library (used when the importer is not Python itself).
+                libpython_hints = _libpython_candidates()
+                if libpython_hints:
+                    zip_fmu.writestr(
+                        str(resource.joinpath("pythonfmu_libpython.txt")),
+                        "\n".join(libpython_hints) + "\n",
+                    )
+
+                # Add information for the Python loader: line 1 is the module, line 2 the class.
+                # Older wrappers only read the first line, so this stays backward compatible.
+                zip_fmu.writestr(
+                    str(resource.joinpath("slavemodule.txt")), f"{module_name}\n{class_name}\n"
+                )
 
                 # Add FMI API wrapping Python class source
                 sources = Path("sources")
@@ -174,7 +247,7 @@ class FmuBuilder:
                 ):
                     relative_f = f.relative_to(src)
                     if "build" in relative_f.parts:
-                        continue;
+                        continue
                     zip_fmu.write(f, arcname=(sources / relative_f))
 
                 # Add FMI API wrapping Python class library
@@ -186,12 +259,13 @@ class FmuBuilder:
                     src_binaries.rglob("*.dylib"),
                 ):
                     relative_f = f.relative_to(src_binaries)
-                    arcname = (
-                        binaries
-                        / relative_f.parent
-                        / f"{model_identifier}{relative_f.suffix}"
-                    )
-                    zip_fmu.write(f, arcname=arcname)
+                    # Only the FMI entry-point library takes the model identifier's name;
+                    # helper libraries (the Linux/macOS backend) keep their own name.
+                    if _is_fmu_entry_library(f):
+                        name = f"{model_identifier}{relative_f.suffix}"
+                    else:
+                        name = relative_f.name
+                    zip_fmu.write(f, arcname=(binaries / relative_f.parent / name))
 
                 # Add the documentation folder
                 if documentation_folder is not None:
@@ -203,9 +277,7 @@ class FmuBuilder:
 
                 if terminals is not None:
                     terminalsFolder = Path("terminalsAndIcons")
-                    relative_f = terminals.relative_to(terminals.parent)
-                    zip_fmu.write(f, arcname=(terminalsFolder / relative_f))
-                    
+                    zip_fmu.write(terminals, arcname=(terminalsFolder / terminals.name))
 
                 # Add the model description
                 xml_str = parseString(tostring(xml, "UTF-8"))