REFACTOR: Nastran import refactoring (#6236)

Co-authored-by: pyansys-ci-bot <[email protected]>

Author: Alberto-DM

MANIFEST.in

@@ -1 +1,4 @@
 global-include ansys.aedt.core *.txt *.md *.toml *.json *.png *.xml *.areg *.joblib *.acf *.m *.ipynb *.py_build
+include src/ansys/aedt/core/syslib/**/*.so
+include src/ansys/aedt/core/syslib/**/*.pyd
+include src/ansys/aedt/core/syslib/**/*.license

doc/changelog.d/6236.miscellaneous.md

@@ -0,0 +1 @@
+Nastran import refactoring

pyproject.toml

@@ -132,6 +132,12 @@ examples = [
     "rpyc>=6.0.0,<6.1",
 ]
 
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-data]
+"ansys.aedt.core.syslib" = ["**/*.so", "**/*.pyd", "**/*.license"]
+
 [tool.setuptools.dynamic]
 version = {attr = "ansys.aedt.core.__version__"}
 

src/ansys/aedt/core/extensions/common/import_nastran.py

@@ -39,8 +39,7 @@
 from ansys.aedt.core.extensions.misc import get_process_id
 from ansys.aedt.core.extensions.misc import is_student
 from ansys.aedt.core.internal.errors import AEDTRuntimeError
-from ansys.aedt.core.visualization.advanced.misc import nastran_to_stl
-from ansys.aedt.core.visualization.advanced.misc import simplify_stl
+from ansys.aedt.core.syslib.nastran_import import nastran_to_stl
 
 PORT = get_port()
 VERSION = get_aedt_version()
@@ -53,6 +52,7 @@
     "lightweight": False,
     "decimate": 0.0,
     "planar": True,
+    "remove_multiple_connections": False,
 }
 EXTENSION_TITLE = "Import Nastran"
 
@@ -65,6 +65,7 @@ class ImportNastranExtensionData(ExtensionCommonData):
     lightweight: bool = EXTENSION_DEFAULT_ARGUMENTS["lightweight"]
     decimate: float = EXTENSION_DEFAULT_ARGUMENTS["decimate"]
     planar: bool = EXTENSION_DEFAULT_ARGUMENTS["planar"]
+    remove_multiple_connections: bool = EXTENSION_DEFAULT_ARGUMENTS["remove_multiple_connections"]
 
 
 class ImportNastranExtension(ExtensionProjectCommon):
@@ -85,6 +86,7 @@ def __init__(self, withdraw: bool = False):
         self.__decimation_text = None
         self.__lightweight_var = None
         self.__planar_var = None
+        self.__remove_multiple_connections_var = None
 
         # Add extension content
         self.add_extension_content()
@@ -155,6 +157,21 @@ def add_extension_content(self):
             name="check_planar_merge",
         ).grid(row=3, column=1, pady=10, padx=5)
 
+        # Remove multiple connections option
+        ttk.Label(
+            self.root,
+            text="Remove multiple connections:",
+            style="PyAEDT.TLabel",
+        ).grid(row=4, column=0, padx=15, pady=10)
+
+        self.__remove_multiple_connections_var = tkinter.IntVar(self.root, name="var_remove_multiple_connections")
+        ttk.Checkbutton(
+            self.root,
+            variable=self.__remove_multiple_connections_var,
+            style="PyAEDT.TCheckbutton",
+            name="check_remove_multiple_connections",
+        ).grid(row=4, column=1, pady=10, padx=5)
+
         # Preview button
         ttk.Button(
             self.root,
@@ -163,7 +180,7 @@ def add_extension_content(self):
             command=self.__preview,
             style="PyAEDT.TButton",
             name="preview_button",
-        ).grid(row=4, column=0, pady=10, padx=10)
+        ).grid(row=5, column=0, pady=10, padx=10)
 
         # Import button
         ttk.Button(
@@ -173,10 +190,10 @@ def add_extension_content(self):
             command=self.__import_callback,
             style="PyAEDT.TButton",
             name="import_button",
-        ).grid(row=4, column=1, pady=10, padx=10)
+        ).grid(row=5, column=1, pady=10, padx=10)
 
     def __browse_files(self):
-        """Open file dialog to select Nastran or STL file."""
+        """Open the file dialog to select Nastran or STL file."""
         filename = filedialog.askopenfilename(
             initialdir="/",
             title="Select a Nastran or STL File",
@@ -205,13 +222,16 @@ def __preview(self):
         if file_path_ui.endswith(".nas"):
             nastran_to_stl(file_path_ui, decimation=decimate_ui, preview=True)
         else:
-            simplify_stl(file_path_ui, decimation=decimate_ui, preview=True)
+            from ansys.aedt.core.visualization.advanced.misc import simplify_and_preview_stl
+
+            simplify_and_preview_stl(file_path_ui, decimation=decimate_ui, preview=True)
 
     def __import_callback(self):
         """Callback for import button."""
         file_path = self.__file_path_text.get("1.0", tkinter.END).strip()
         lightweight_val = self.__lightweight_var.get() == 1
         planar_val = self.__planar_var.get() == 1
+        remove_multiple_connections_val = self.__remove_multiple_connections_var.get() == 1
 
         # Validation
         if not file_path:
@@ -231,6 +251,7 @@ def __import_callback(self):
             decimate=decimate_val,
             lightweight=lightweight_val,
             planar=planar_val,
+            remove_multiple_connections=remove_multiple_connections_val,
         )
         self.root.destroy()
 
@@ -277,9 +298,12 @@ def main(data: ImportNastranExtensionData):
             import_as_light_weight=data.lightweight,
             decimation=data.decimate,
             enable_planar_merge=str(data.planar),
+            remove_multiple_connections=data.remove_multiple_connections,
         )
     else:
-        outfile = simplify_stl(str(file_path), decimation=data.decimate)
+        from ansys.aedt.core.visualization.advanced.misc import simplify_and_preview_stl
+
+        outfile = simplify_and_preview_stl(str(file_path), decimation=data.decimate)
         aedtapp.modeler.import_3d_cad(
             outfile,
             healing=False,

src/ansys/aedt/core/generic/general_methods.py

@@ -32,6 +32,7 @@
 import itertools
 import logging
 import os
+import platform
 import re
 import sys
 import time
@@ -47,8 +48,11 @@
 from ansys.aedt.core.internal.errors import GrpcApiError
 from ansys.aedt.core.internal.errors import MethodNotSupportedError
 
-is_linux = os.name == "posix"
-is_windows = not is_linux
+system = platform.system()
+is_linux = system == "Linux"
+is_windows = system == "Windows"
+is_macos = system == "Darwin"
+
 inside_desktop_ironpython_console = True if "4.0.30319.42000" in sys.version else False
 
 inclusion_list = [

src/ansys/aedt/core/generic/settings.py

@@ -48,6 +48,7 @@
 import uuid
 import warnings
 
+from ansys.aedt.core import pyaedt_path
 from ansys.aedt.core.generic.scheduler import DEFAULT_CUSTOM_SUBMISSION_STRING
 from ansys.aedt.core.generic.scheduler import DEFAULT_NUM_CORES
 
@@ -112,6 +113,8 @@
     "skip_license_check",
     "num_cores",
     "use_local_example_data",
+    "pyd_libraries_path",
+    "pyd_libraries_user_path",
 ]
 
 ALLOWED_AEDT_ENV_VAR_SETTINGS = [
@@ -184,7 +187,7 @@ def __init__(self):
         self.__lsf_queue: Optional[str] = None
         self.__custom_lsf_command = DEFAULT_CUSTOM_SUBMISSION_STRING
         # Settings related to environment variables that are set before launching a new AEDT session
-        # This includes those that enable the beta features !
+        # This includes those that enable the beta features!
         self.__aedt_environment_variables: dict[str, str] = {
             "ANSYSEM_FEATURE_SF6694_NON_GRAPHICAL_COMMAND_EXECUTION_ENABLE": "1",
             "ANSYSEM_FEATURE_SF159726_SCRIPTOBJECT_ENABLE": "1",
@@ -229,6 +232,8 @@ def __init__(self):
         self.__block_figure_plot = False
         self.__local_example_folder = None
         self.__use_local_example_data = False
+        self.__pyd_libraries_path: Path = Path(pyaedt_path) / "syslib"
+        self.__pyd_libraries_user_path: Optional[str] = None
 
         # Load local settings if YAML configuration file exists.
         pyaedt_settings_path = os.environ.get("PYAEDT_LOCAL_SETTINGS_PATH", "")
@@ -848,6 +853,34 @@ def local_example_folder(self):
     def local_example_folder(self, value):
         self.__local_example_folder = value
 
+    @property
+    def pyd_libraries_path(self):
+        if self.__pyd_libraries_user_path is not None:
+            # If the user path is set, return it
+            return Path(self.__pyd_libraries_user_path)
+        return Path(self.__pyd_libraries_path)
+
+    @property
+    def pyd_libraries_user_path(self):
+        # Get the user path for PyAEDT libraries.
+        if self.__pyd_libraries_user_path is not None:
+            return Path(self.__pyd_libraries_user_path)
+        return None
+
+    @pyd_libraries_user_path.setter
+    def pyd_libraries_user_path(self, val):
+        if val is None:
+            # If the user path is None, set it to None
+            self.__pyd_libraries_user_path = None
+        else:
+            lib_path = Path(str(val))
+            if not lib_path.exists():
+                # If the user path does not exist, return None
+                raise ValueError("The user path for PyAEDT libraries does not exist. Please set a valid path.")
+            else:
+                # If the user path exists, set it as a Path object
+                self.__pyd_libraries_user_path = lib_path
+
     # yaml setting file IO methods
 
     def load_yaml_configuration(self, path: Union[Path, str], raise_on_wrong_key: bool = False):
@@ -898,19 +931,17 @@ def write_yaml_configuration(self, path: Union[Path, str]):
         configuration_file = Path(path)
 
         data = {}
-        data["log"] = {}
-        for key in ALLOWED_LOG_SETTINGS:
-            value = getattr(self, key)
-            data["log"][key] = str(value) if isinstance(value, Path) else value
-        data["lsf"] = {}
-        for key in ALLOWED_LSF_SETTINGS:
-            value = getattr(self, key)
-            data["lsf"][key] = str(value) if isinstance(value, Path) else value
+        data["log"] = {
+            key: str(value) if isinstance(value := getattr(self, key), Path) else value for key in ALLOWED_LOG_SETTINGS
+        }
+        data["lsf"] = {
+            key: str(value) if isinstance(value := getattr(self, key), Path) else value for key in ALLOWED_LSF_SETTINGS
+        }
         data["aedt_env_var"] = getattr(self, "aedt_environment_variables")
-        data["general"] = {}
-        for key in ALLOWED_GENERAL_SETTINGS:
-            value = getattr(self, key)
-            data["general"][key] = str(value) if isinstance(value, Path) else value
+        data["general"] = {
+            key: str(value) if isinstance(value := getattr(self, key), Path) else value
+            for key in ALLOWED_GENERAL_SETTINGS
+        }
 
         with open(configuration_file, "w") as file:
             yaml.safe_dump(data, file, sort_keys=False)

src/ansys/aedt/core/modeler/modeler_3d.py

@@ -37,7 +37,7 @@
 from ansys.aedt.core.internal.errors import GrpcApiError
 from ansys.aedt.core.modeler.cad.primitives_3d import Primitives3D
 from ansys.aedt.core.modeler.geometry_operators import GeometryOperators
-from ansys.aedt.core.visualization.advanced.misc import nastran_to_stl
+from ansys.aedt.core.syslib.nastran_import import nastran_to_stl
 
 
 class Modeler3D(Primitives3D):
@@ -1031,6 +1031,7 @@ def import_nastran(
         save_only_stl=False,
         preview=False,
         merge_angle=1e-3,
+        remove_multiple_connections=False,
     ):
         """Import Nastran file into 3D Modeler by converting the faces to stl and reading it.
 
@@ -1062,6 +1063,8 @@ def import_nastran(
             Whether to preview the model in pyvista or skip it.
         merge_angle : float, optional
             Angle in radians for which faces will be considered planar. Default is ``1e-3``.
+        remove_multiple_connections : bool, optional
+            Whether to remove multiple connections in the mesh. Default is ``False``.
 
         Returns
         -------
@@ -1080,6 +1083,7 @@ def import_nastran(
             output_folder=self._app.working_directory,
             enable_planar_merge=enable_planar_merge,
             preview=preview,
+            remove_multiple_connections=remove_multiple_connections,
         )
         if save_only_stl:
             return output_stls, nas_to_dict

src/ansys/aedt/core/syslib/__init__.py

@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2021 - 2025 ANSYS, Inc. and/or its affiliates.
+# SPDX-License-Identifier: MIT
+#
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import importlib.util
+from pathlib import Path
+import sys
+
+from ansys.aedt.core.generic.general_methods import is_windows
+
+
+def load_native_module(module_name: str, base_dir: Path | str) -> object:
+    """
+    Dynamically load a compiled native Python module (.pyd or .so) from a base directory.
+    Automatically choose the correct file extension based on the platform and Python version.
+
+    The module name must end with '_lib' or '_dynload'.
+
+    Example:
+        module_name='nastran_import_lib' on Python 3.11 → loads 'nastran_import_lib_311.so' on Linux
+
+    Parameters
+    ----------
+        module_name: str
+            The name of the module to load (e.g. 'nastran_import').
+
+        base_dir: Path, str
+            Path to the directory containing the compiled module.
+
+    Returns
+    -------
+        The loaded module object.
+
+    Raises
+    ------
+        FileNotFoundError: If the compiled module file is not found.
+        ImportError: If the module cannot be imported.
+    """
+    base_path = Path(base_dir)
+
+    # Validate the module name
+    if not module_name.endswith(("_lib", "_dynload")):
+        raise ValueError("Module name must end with '_lib' or '_dynload'.")
+
+    # Get Python version as suffix (e.g., '311' for Python 3.11)
+    version_suffix = f"{sys.version_info.major}{sys.version_info.minor}"
+
+    if version_suffix not in ["310", "311", "312", "313"]:
+        raise ValueError(
+            f"Unsupported Python version for {module_name}: {sys.version_info.major}.{sys.version_info.minor} \n"
+            f"Supported versions are 3.10, 3.11, 3.12, and 3.13."
+        )
+
+    # Determine the platform-specific extension
+    ext = ".pyd" if is_windows else ".so"
+
+    # Construct the full module path
+    file_name = f"{module_name}_{version_suffix}{ext}"
+    module_path = base_path / file_name
+
+    if not module_path.is_file():
+        raise FileNotFoundError(f"Module file not found at: {module_path}")
+
+    spec = importlib.util.spec_from_file_location(module_name, str(module_path))
+    if spec is None or spec.loader is None:
+        raise ImportError(f"Failed to create import spec for {module_path}")
+
+    mod = importlib.util.module_from_spec(spec)
+    sys.modules[module_name] = mod
+    spec.loader.exec_module(mod)
+
+    return mod