CHORE: Make Independent 01 general tests (#6891)

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

Author: Samuelopez-ansys

.github/workflows/manual_draft.yml

@@ -0,0 +1 @@
+Make Independent 01 general tests

doc/changelog.d/6712.documentation.md

@@ -518,29 +518,33 @@ def copy_solid_bodies_from(self, design, assignment=None, no_vacuum=True, no_pec
         self.modeler.refresh_all_ids()
         return True
 
-    @pyaedt_function_handler(filename="input_file")
+    @pyaedt_function_handler(
+        filename="input_file",
+        create_lightweigth_part="create_lightweight_part",
+        point_coicidence_tolerance="point_coincidence_tolerance",
+    )
     def import_3d_cad(
         self,
-        input_file,
-        healing=False,
-        refresh_all_ids=True,
-        import_materials=False,
-        create_lightweigth_part=False,
-        group_by_assembly=False,
-        create_group=True,
-        separate_disjoints_lumped_object=False,
-        import_free_surfaces=False,
-        point_coicidence_tolerance=1e-6,
-        reduce_stl=False,
-        reduce_percentage=0,
-        reduce_error=0,
-        merge_planar_faces=True,
-    ):
+        input_file: Union[str, Path],
+        healing: bool = False,
+        refresh_all_ids: bool = True,
+        import_materials: bool = False,
+        create_lightweight_part: bool = False,
+        group_by_assembly: bool = False,
+        create_group: bool = True,
+        separate_disjoints_lumped_object: bool = False,
+        import_free_surfaces: bool = False,
+        point_coincidence_tolerance: float = 1e-6,
+        reduce_stl: bool = False,
+        reduce_percentage: int = 0,
+        reduce_error: int = 0,
+        merge_planar_faces: bool = True,
+    ) -> bool:
         """Import a CAD model.
 
         Parameters
         ----------
-        input_file : str
+        input_file : str or :class:`pathlib.Path`
             Full path and name of the CAD file.
         healing : bool, optional
             Whether to perform healing. The default is ``False``.
@@ -551,7 +555,7 @@ def import_3d_cad(
         import_materials : bool optional
             Whether to import material names from the file if present. The
             default is ``False``.
-        create_lightweigth_part : bool ,optional
+        create_lightweight_part : bool ,optional
             Whether to import a lightweight part. The default is ``True``.
         group_by_assembly : bool, optional
             Whether to import by subassembly. The default is ``False``, in which
@@ -562,7 +566,7 @@ def import_3d_cad(
             Whether to automatically separate disjoint parts. The default is ``False``.
         import_free_surfaces : bool, optional
             Whether to import free surfaces parts. The default is ``False``.
-        point_coicidence_tolerance : float, optional
+        point_coincidence_tolerance : float, optional
             Tolerance on the point. The default is ``1e-6``.
         reduce_stl : bool, optional
             Whether to reduce the STL file on import. The default is ``True``.
@@ -582,17 +586,19 @@ def import_3d_cad(
         ----------
         >>> oEditor.Import
         """
+        input_file = Path(input_file)
+
         return self.modeler.import_3d_cad(
             input_file=input_file,
             healing=healing,
             refresh_all_ids=refresh_all_ids,
             import_materials=import_materials,
-            create_lightweigth_part=create_lightweigth_part,
+            create_lightweight_part=create_lightweight_part,
             group_by_assembly=group_by_assembly,
             create_group=create_group,
             separate_disjoints_lumped_object=separate_disjoints_lumped_object,
             import_free_surfaces=import_free_surfaces,
-            point_coicidence_tolerance=point_coicidence_tolerance,
+            point_coincidence_tolerance=point_coincidence_tolerance,
             reduce_stl=reduce_stl,
             reduce_percentage=reduce_percentage,
             reduce_error=reduce_error,

doc/changelog.d/6891.maintenance.md

@@ -810,9 +810,9 @@ def project_name(self) -> Optional[str]:
         ----------
         >>> oProject.GetName
         """
-        if self._project_name:
+        if self._project_name and self._project_name in self.desktop_class.project_list:
             return self._project_name
-        if self.oproject:
+        elif self.oproject:
             try:
                 self._project_name = self.oproject.GetName()
                 self._project_path = None
@@ -2007,14 +2007,14 @@ def set_active_dso_config_name(self, product_name="HFSS", config_name="Local"):
             return False
 
     @pyaedt_function_handler()
-    def set_registry_from_file(self, registry_file, make_active=True):
+    def set_registry_from_file(self, registry_file: Union[str, Path], make_active: bool = True) -> bool:
         """Apply desktop registry settings from an ACT file.
 
         One way to get an ACF file is to export a configuration from the AEDT UI and then edit and reuse it.
 
         Parameters
         ----------
-        registry_file : str
+        registry_file : str or :class:`pathlib.Path`
             Full path to the ACF file.
         make_active : bool, optional
             Whether to set the imported configuration as active. The default is ``True``.
@@ -2028,8 +2028,9 @@ def set_registry_from_file(self, registry_file, make_active=True):
         ----------
         >>> oDesktop.SetRegistryFromFile
         """
+        registry_file = Path(registry_file)
         try:
-            self.odesktop.SetRegistryFromFile(registry_file)
+            self.odesktop.SetRegistryFromFile(str(registry_file))
             if make_active:
                 with open_file(registry_file, "r") as f:
                     for line in f:
@@ -2940,12 +2941,18 @@ def create_dataset3d(
         )
 
     @pyaedt_function_handler(filename="input_file", dsname="name")
-    def import_dataset1d(self, input_file, name=None, is_project_dataset=True, sort=True):
+    def import_dataset1d(
+        self,
+        input_file: Union[str, Path],
+        name: Optional[str] = None,
+        is_project_dataset: bool = True,
+        sort: bool = True,
+    ):
         """Import a 1D dataset.
 
         Parameters
         ----------
-        input_file : str
+        input_file : str or :class:`pathlib.Path`
             Full path and name for the TAB file.
         name : str, optional
             Name of the dataset. The default is the file name.
@@ -2963,6 +2970,7 @@ def import_dataset1d(self, input_file, name=None, is_project_dataset=True, sort=
         >>> oProject.AddDataset
         >>> oDesign.AddDataset
         """
+        input_file = Path(input_file)
         with open_file(input_file, "r") as f:
             lines = f.read().splitlines()
         header = lines[0]
@@ -2984,7 +2992,7 @@ def import_dataset1d(self, input_file, name=None, is_project_dataset=True, sort=
             ylist.append(float(item.split()[1]))
 
         if not name:
-            name = Path(input_file).stem
+            name = input_file.stem
 
         if name[0] == "$":
             name = name[1:]
@@ -2995,12 +3003,19 @@ def import_dataset1d(self, input_file, name=None, is_project_dataset=True, sort=
         )
 
     @pyaedt_function_handler(filename="input_file", dsname="name")
-    def import_dataset3d(self, input_file, name=None, encoding="utf-8-sig", is_project_dataset=True, sort=True):
+    def import_dataset3d(
+        self,
+        input_file: Union[str, Path],
+        name: Optional[str] = None,
+        encoding: str = "utf-8-sig",
+        is_project_dataset: bool = True,
+        sort: bool = True,
+    ):
         """Import a 3D dataset.
 
         Parameters
         ----------
-        input_file : str
+        input_file : str or :class:`pathlib.Path`
             Full path and name for the tab/csv/xlsx file.
         name : str, optional
             Name of the dataset. The default is the file name.
@@ -3019,16 +3034,17 @@ def import_dataset3d(self, input_file, name=None, encoding="utf-8-sig", is_proje
         ----------
         >>> oProject.AddDataset
         """
-        index_of_dot = input_file.rfind(".")
-        file_extension = input_file[index_of_dot + 1 :]
+        path = Path(input_file)
+        file_extension = path.suffix.lstrip(".").lower()
+
         xlist = []
         ylist = []
         zlist = []
         vlist = []
 
         if file_extension == "xlsx":
             self.logger.warning("You need pandas and openpyxl library installed for reading excel files")
-            lines = read_xlsx(input_file)
+            lines = read_xlsx(path)
             if list(lines):
                 header = str([lines.columns[i] for i in range(len(lines.columns))])
                 xlist = list((lines.iloc[:, 0]).array)
@@ -3040,7 +3056,7 @@ def import_dataset3d(self, input_file, name=None, encoding="utf-8-sig", is_proje
                 return False
 
         elif file_extension == "csv":
-            lines = read_csv(input_file, encoding)
+            lines = read_csv(path, encoding)
             header = " ".join(lines[0])
             for row in lines[1:]:
                 xlist.append(float(row[0]))
@@ -3049,13 +3065,14 @@ def import_dataset3d(self, input_file, name=None, encoding="utf-8-sig", is_proje
                 vlist.append(float(row[3]))
 
         elif file_extension == "tab":
-            lines = read_tab(input_file)
+            lines = read_tab(path)
             header = lines[0]
             for item in lines[1:]:
-                xlist.append(float(item.split()[0]))
-                ylist.append(float(item.split()[1]))
-                zlist.append(float(item.split()[2]))
-                vlist.append(float(item.split()[3]))
+                cols = item.split()
+                xlist.append(float(cols[0]))
+                ylist.append(float(cols[1]))
+                zlist.append(float(cols[2]))
+                vlist.append(float(cols[3]))
 
         header_list = header.split()
         units = ["", "", "", ""]
@@ -3067,12 +3084,14 @@ def import_dataset3d(self, input_file, name=None, encoding="utf-8-sig", is_proje
             cont += 1
 
         if not name:
-            name = Path(input_file).stem
+            name = path.stem
 
-        if name[0] == "$":
+        is_project_dataset = False
+        if name.startswith("$"):
             name = name[1:]
             is_project_dataset = True
-        if self.design_type != "Maxwell 3D" and self.design_type != "Icepak":
+
+        if self.design_type not in ["Maxwell 3D", "Icepak"]:
             is_project_dataset = True
 
         return self.create_dataset(
@@ -3833,12 +3852,17 @@ def export_design_preview_to_jpg(self, output_file):
     @pyaedt_function_handler(
         filename="output_file", export_project="export_project_variables", export_design="export_design_properties"
     )
-    def export_variables_to_csv(self, output_file, export_project_variables=True, export_design_properties=True):
+    def export_variables_to_csv(
+        self,
+        output_file: Union[str, Path],
+        export_project_variables: bool = True,
+        export_design_properties: bool = True,
+    ) -> bool:
         """Export design properties, project variables, or both to a CSV file.
 
         Parameters
         ----------
-        output_file : str
+        output_file : str or :class:`pathlib.Path`
             Full path and name for the CSV file.
         export_project_variables : bool, optional
             Whether to export project variables. The default is ``True``.
@@ -3858,6 +3882,7 @@ def export_variables_to_csv(self, output_file, export_project_variables=True, ex
         >>> oProject.GetVariableValue
         >>> oDesign.GetVariableValue
         """
+        output_file = Path(output_file)
         varnames = []
         desnames = []
         if export_project_variables:
@@ -3873,7 +3898,7 @@ def export_variables_to_csv(self, output_file, export_project_variables=True, ex
         for el in desnames:
             value = self.odesign.GetVariableValue(el)
             list_full.append([el, value])
-        return write_csv(output_file, list_full)
+        return write_csv(str(output_file), list_full)
 
     @pyaedt_function_handler()
     def read_design_data(self):
@@ -4305,12 +4330,12 @@ def check_if_project_is_loaded(self, input_file):
         return False
 
     @pyaedt_function_handler(temp_dir_path="path")
-    def set_temporary_directory(self, path):
+    def set_temporary_directory(self, path: Union[str, Path]) -> bool:
         """Set temporary directory path.
 
         Parameters
         ----------
-        path : str
+        path : str or :class:`pathlib.Path`
             Temporary directory path.
 
         Returns
@@ -4322,7 +4347,8 @@ def set_temporary_directory(self, path):
         ----------
         >>> oDesktop.SetTempDirectory()
         """
-        self.odesktop.SetTempDirectory(path)
+        path = Path(path)
+        self.odesktop.SetTempDirectory(str(path))
         return True
 
     @pyaedt_function_handler()

doc/changelog.d/6900.test.md

@@ -305,10 +305,7 @@ def main(data: ImportNastranExtensionData):
 
         outfile = simplify_and_preview_stl(str(file_path), decimation=data.decimate)
         aedtapp.modeler.import_3d_cad(
-            outfile,
-            healing=False,
-            create_lightweigth_part=data.lightweight,
-            merge_planar_faces=data.planar,
+            outfile, healing=False, create_lightweight_part=data.lightweight, merge_planar_faces=data.planar
         )
 
     app.logger.info("Geometry imported correctly.")

src/ansys/aedt/core/application/analysis_3d.py

@@ -27,6 +27,7 @@
 import math
 from pathlib import Path
 import tempfile
+from typing import List
 from typing import Optional
 from typing import Union
 import warnings
@@ -7740,24 +7741,24 @@ def set_export_touchstone(
     @pyaedt_function_handler()
     def import_table(
         self,
-        input_file,
-        name,
-        is_real_imag=True,
-        is_field=False,
-        column_names=None,
-        independent_columns=None,
-    ):
+        input_file: Union[str, Path],
+        name: str,
+        is_real_imag: bool = True,
+        is_field: bool = False,
+        column_names: Optional[List[str]] = None,
+        independent_columns: Optional[List[bool]] = None,
+    ) -> bool:
         """Import a data table.
 
             The table can have multiple independent real-valued columns of data,
             and multiple dependent real- or complex-valued columns of data.
-            The data supported is comma delimited format (.csv).
+            The data supported is comma-delimited format (.csv).
             The first row may contain column names. Complex data columns are inferred from the column data format.
-            In comma delimited format, "(double, double)" denotes a complex number.
+            In comma-delimited format, "(double, double)" denotes a complex number.
 
         Parameters
         ----------
-        input_file : str
+        input_file : str or :class:`pathlib.Path`
             Full path to the file. Supported formats is ``".csv"``.
         name : str
             Table name.