Merge branch 'main' into refactor/outdated-local-config-parameters

eblanco-ansys · eblanco-ansys · commit 054dc37872fc · 2025-10-24T11:09:00.000+02:00
diff --git a/doc/changelog.d/6575.added.md b/doc/changelog.d/6575.added.md
@@ -0,0 +1 @@
+Flux lines plot
diff --git a/doc/changelog.d/6783.dependencies.md b/doc/changelog.d/6783.dependencies.md
@@ -0,0 +1 @@
+Update pydantic requirement from <2.12,>=2.6.4 to >=2.6.4,<2.13
diff --git a/doc/changelog.d/6793.test.md b/doc/changelog.d/6793.test.md
@@ -0,0 +1 @@
+Extend flaky_linux test set
diff --git a/doc/changelog.d/6798.documentation.md b/doc/changelog.d/6798.documentation.md
@@ -0,0 +1 @@
+Fix typos in modeler user guide
diff --git a/doc/changelog.d/6802.fixed.md b/doc/changelog.d/6802.fixed.md
@@ -0,0 +1 @@
+Settings.aedt_version in desktop and design class fix
diff --git a/doc/source/User_guide/modeler.rst b/doc/source/User_guide/modeler.rst
@@ -10,7 +10,7 @@ The following code creates a box and changes the color to red:
      from ansys.aedt.core.hfss import Hfss
      hfss = Hfss()
      box = hfss.modeler.create_box(origin=[0, 0, 0],
-                                   sizes=[10, "dim", 10],
+                                   sizes=[10, 10, 10],
                                    name="mybox",
                                    material="aluminum")
      print(box.faces)
@@ -40,15 +40,15 @@ This example shows how easily you can go deeper into edges and vertices of faces
 
 .. code:: python
 
-     box = hfss.modeler["mybox2"]
+     box = hfss.modeler["mybox"]
      for face in box.faces:
         print(face.center)
-        for edge in face:
+        for edge in face.edges:
             print(edge.midpoint)
             for vertice in edge.vertices:
-                print(edge.position)
+                print(vertice.position)
      for vertice in box.vertices:
-        print(edge.position)
+        print(vertice.position)
 
 
 All objects support executing any modeler operation, such as union or subtraction:
diff --git a/pyproject.toml b/pyproject.toml
@@ -41,7 +41,7 @@ dependencies = [
     "pyyaml",
     "defusedxml>=0.7,<8.0",
     "numpy>=1.20.0,<2.3",
-    "pydantic>=2.6.4,<2.12",
+    "pydantic>=2.6.4,<2.13",
 ]
 
 [project.optional-dependencies]
diff --git a/src/ansys/aedt/core/application/design.py b/src/ansys/aedt/core/application/design.py
@@ -202,7 +202,7 @@ def __init__(
         self.close_on_exit: bool = close_on_exit
         self._desktop_class = None
         self._desktop_class = self.__init_desktop_from_design(
-            version,
+            settings.aedt_version if settings.aedt_version else version,
             non_graphical,
             new_desktop,
             close_on_exit,
diff --git a/src/ansys/aedt/core/desktop.py b/src/ansys/aedt/core/desktop.py
@@ -388,7 +388,10 @@ class Desktop(PyAedtBase):
     def __new__(cls, *args, **kwargs):
         # The following commented lines will be useful when we will need to search among multiple saved desktop.
         specified_version = (
-            kwargs.get("specified_version") or kwargs.get("version") or None if (not args or len(args) < 1) else args[0]
+            kwargs.get("specified_version")
+            or kwargs.get("version")
+            or settings.aedt_version
+            or (None if (not args or args[0] is None) else args[0])
         )
         if "new_desktop_session" in kwargs or "new_desktop" in kwargs:
             new_desktop = kwargs.get("new_desktop_session") or kwargs.get("new_desktop")
diff --git a/src/ansys/aedt/core/visualization/post/compliance.py b/src/ansys/aedt/core/visualization/post/compliance.py
@@ -852,101 +852,6 @@ def _get_sweep_name(self, design, solution_name):
                 sweep_name = solution_names[0]
         return sweep_name
 
-    @pyaedt_function_handler()
-    def _create_derived_reports(self):
-        _design = None
-        if not self._reports_parameters:
-            return
-        compliance_reports = self.report_data.add_chapter("Report Derived Parameters Results")
-        for tpx, template_report in enumerate(self._reports_parameters.values()):
-            if self._desktop_class:
-                time.sleep(1)
-                self._desktop_class.odesktop.CloseAllWindows()
-            settings.logger.info(f"Adding report {template_report.name}.")
-            config_file = template_report.config_file
-            if not os.path.exists(config_file) and not os.path.exists(os.path.join(self._template_folder, config_file)):
-                self._desktop_class.logger.error(f"{config_file} is not found.")
-                continue
-            name = template_report.name
-            traces = template_report.traces
-            pass_fail = template_report.pass_fail
-            design_name = template_report.design_name
-            report_type = template_report.report_type
-            if template_report.project_name:
-                if template_report.project_name not in self._desktop_class.project_list:
-                    self._desktop_class.load_project(template_report.project)
-            else:
-                template_report.project_name = self._project_name
-            if _design and _design.design_name != design_name or _design is None:
-                try:
-                    _design = get_pyaedt_app(template_report.project_name, design_name)
-                    self._desktop_class.odesktop.CloseAllWindows()
-                except Exception:  # pragma: no cover
-                    self._desktop_class.logger.error(f"Failed to retrieve design {design_name}")
-                    continue
-            if os.path.exists(os.path.join(self._template_folder, config_file)):
-                config_file = os.path.join(self._template_folder, config_file)
-            if not os.path.exists(config_file):
-                continue
-            local_config = read_configuration_file(config_file)
-            new_dict = {}
-            idx = 0
-            for trace in traces:
-                if local_config.get("expressions", {}):
-                    if isinstance(local_config["expressions"], dict):
-                        if trace in local_config["expressions"]:
-                            new_dict[trace] = local_config["expressions"][trace]
-                        elif len(local_config["expressions"]) > idx:
-                            new_dict[trace] = list(local_config["expressions"].values())[idx]
-                        else:
-                            new_dict[trace] = {}
-                idx += 1
-            local_config["expressions"] = new_dict
-            sw_name = self._get_sweep_name(_design, local_config.get("solution_name", None))
-            _design.logger.info(f"Creating report {name}")
-            aedt_report = _design.post.create_report_from_configuration(
-                report_settings=local_config, solution_name=sw_name
-            )
-            if not aedt_report or not aedt_report.traces:  # pragma: no cover
-                _design.logger.error(f"Failed to create report {name}")
-                self._summary.append([template_report.name, "FAILED TO CREATE THE REPORT"])
-                self._summary_font.append([[255, 255, 255], [255, 0, 0]])
-                continue
-            aedt_report.hide_legend()
-
-            time.sleep(1)
-            if tpx > 0:
-                compliance_reports.add_section()
-            compliance_reports.add_subchapter(f"{name}")
-            if pass_fail and template_report.parameter_name:
-                if template_report.parameter_name == "skew":
-                    self._add_skew(
-                        _design,
-                        aedt_report,
-                        compliance_reports,
-                        template_report.name,
-                        template_report.pass_fail_criteria,
-                    )
-            else:
-                self._summary.append([template_report.name, "NO PASS/FAIL"])
-                self._summary_font.append(["", None])
-            out = _design.post.export_report_to_jpg(
-                self._output_folder, aedt_report.plot_name, width=self.image_width, height=self.image_height
-            )
-            if out:
-                compliance_reports.add_image(
-                    {
-                        "path": os.path.join(self._output_folder, aedt_report.plot_name + ".jpg"),
-                        "caption": f"Plot {report_type} for {name}",
-                    }
-                )
-            if self.local_config["general"].get("delete_after_export", True):
-                aedt_report.delete()
-            else:
-                _design.save_project()
-            _design.logger.info(f"Successfully parsed report {name}")
-            settings.logger.info(f"Report {template_report.name} added to the pdf.")
-
     def _add_skew(self, _design, aedt_report, chapter, name, pass_fail_criteria):
         _design.logger.info("Adding single lines violations")
         font_table = [["", None]]
diff --git a/src/ansys/aedt/core/visualization/post/field_data.py b/src/ansys/aedt/core/visualization/post/field_data.py
@@ -1151,6 +1151,8 @@ def plotsettings(self):
             List of plot settings.
         """
         if self.surfaces or self.cutplanes or (self.layer_nets and self.layer_plot_type == "LayerNetsExtFace"):
+            if self.quantity == "Flux_Lines":
+                self.IsoVal = "Line"
             arg = [
                 "NAME:PlotOnSurfaceSettings",
                 "Filled:=",
diff --git a/tests/system/extensions/test_export_layout.py b/tests/system/extensions/test_export_layout.py
@@ -93,6 +93,7 @@ def test_export_layout_all_options(add_app, local_scratch):
         assert isinstance(config_data, dict), "Configuration file is not valid JSON"
 
 
+@pytest.mark.flaky_linux
 def test_export_layout_ipc_only(add_app, local_scratch):
     """Test export layout with only IPC2581 option enabled."""
     data = ExportLayoutExtensionData(
@@ -171,6 +172,7 @@ def test_export_layout_bom_only(add_app, local_scratch):
     assert bom_file.stat().st_size > 0, "BOM file is empty"
 
 
+@pytest.mark.flaky_linux
 def test_export_layout_config_only(add_app, local_scratch):
     """Test export layout with only configuration option enabled."""
     data = ExportLayoutExtensionData(
diff --git a/tests/system/extensions/test_post_layout_design.py b/tests/system/extensions/test_post_layout_design.py
@@ -164,6 +164,7 @@ def test_layout_design_toolkit_unknown_action(add_app, local_scratch):
     h3d.close_project()
 
 
+@pytest.mark.flaky_linux
 def test_layout_design_toolkit_microvia(add_app, local_scratch):
     """Test microvia creation with conical shape."""
     file_path = Path(local_scratch.path) / "ANSYS-HSD_V1_microvia.aedb"
diff --git a/tests/system/visualization/test_12_1_PostProcessing.py b/tests/system/visualization/test_12_1_PostProcessing.py
@@ -46,20 +46,27 @@
 test_subfolder = "T12"
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture()
 def aedtapp(add_app):
     app = add_app(project_name=test_project_name, subfolder=test_subfolder)
     yield app
     app.close_project(app.project_name)
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture()
 def m2d_app(add_app):
     app = add_app(project_name=m2d_trace_export_table, subfolder=test_subfolder, application=ansys.aedt.core.Maxwell2d)
     yield app
     app.close_project(app.project_name)
 
 
+@pytest.fixture()
+def m2d_blank(add_app):
+    app = add_app(application=ansys.aedt.core.Maxwell2d)
+    yield app
+    app.close_project(app.project_name)
+
+
 class TestClass:
     def test_export_model_picture(self, aedtapp, local_scratch):
         path = aedtapp.post.export_model_picture(full_name=Path(local_scratch.path) / "images2.jpg")
@@ -339,11 +346,13 @@ def test_export_touchstone_3(self, aedtapp):
         assert aedtapp.export_touchstone(setup_name, sweep_name)
 
     def test_export_report_to_jpg(self, aedtapp, local_scratch):
+        aedtapp.create_scattering("MyTestScattering")
         aedtapp.post.export_report_to_jpg(local_scratch.path, "MyTestScattering")
         output_file = Path(local_scratch.path) / "MyTestScattering.jpg"
         assert output_file.is_file()
 
     def test_export_report_to_csv(self, aedtapp, local_scratch):
+        aedtapp.create_scattering("MyTestScattering")
         aedtapp.post.export_report_to_csv(
             local_scratch.path,
             "MyTestScattering",
@@ -357,6 +366,7 @@ def test_export_report_to_csv(self, aedtapp, local_scratch):
         assert output_file.is_file()
 
     def test_export_report_to_rdat(self, aedtapp, local_scratch):
+        aedtapp.create_scattering("MyTestScattering")
         output_file = Path(local_scratch.path) / "MyTestScattering.rdat"
         aedtapp.post.export_report_to_file(local_scratch.path, "MyTestScattering", ".rdat")
         assert output_file.is_file()
@@ -450,14 +460,17 @@ def test_ModelPlotter_clean_cache_and_files(self, aedtapp, local_scratch):
         assert model_pv.clean_cache_and_files(clean_cache=True)
 
     def test_copydata(self, aedtapp, local_scratch):
+        aedtapp.create_scattering("MyTestScattering")
         assert aedtapp.post.copy_report_data("MyTestScattering")
 
     def test_rename_report(self, aedtapp):
+        aedtapp.create_scattering("MyTestScattering")
         assert aedtapp.post.rename_report("MyTestScattering", "MyNewScattering")
 
     def test_rename_report_1(self, aedtapp):
-        assert [plot for plot in aedtapp.post.plots if plot.plot_name == "MyNewScattering"]
-        assert not aedtapp.post.rename_report("invalid", "MyNewScattering")
+        aedtapp.create_scattering("MyTestScattering")
+        assert [plot for plot in aedtapp.post.plots if plot.plot_name == "MyTestScattering"]
+        assert not aedtapp.post.rename_report("invalid", "MyTestScattering")
 
     def test_create_report(self, aedtapp, local_scratch):
         plot = aedtapp.post.create_report("dB(S(1,1))")
@@ -504,6 +517,7 @@ def test_create_report_from_configuration_2(self, aedtapp):
         )
 
     def test_get_solution_data_2(self, aedtapp):
+        aedtapp.post.create_report("dB(S(1,1))")
         data = aedtapp.post.get_solution_data("S(1,1)")
         assert data.primary_sweep == "Freq"
         assert data.expressions[0] == "S(1,1)"
@@ -729,9 +743,11 @@ def test_add_note(self, aedtapp):  # pragma: no cover
         )
 
     def test_delete_report(self, aedtapp):
+        aedtapp.create_scattering("MyTestScattering")
         plots_number = len(aedtapp.post.plots)
-        assert aedtapp.post.delete_report("MyNewScattering")
+        assert aedtapp.post.delete_report("MyTestScattering")
         assert len(aedtapp.post.plots) == plots_number - 1
+        aedtapp.create_scattering("MyTestScattering1")
         assert aedtapp.post.delete_report()
         assert len(aedtapp.post.plots) == 0
 
@@ -1085,3 +1101,11 @@ def test_trace_export_table_1(self, m2d_app, local_scratch):
             m2d_app.post.plots[0].export_table_to_file(plot_name, "Invalid Path", "Legend")
         with pytest.raises(AEDTRuntimeError):
             m2d_app.post.plots[0].export_table_to_file(plot_name, str(output_file_path), "Invalid Export Type")
+
+    def test_create_fieldplot_surface_5(self, m2d_blank):
+        circ = m2d_blank.modeler.create_circle(origin=[0, 0, 0], radius=5, material="copper")
+        m2d_blank.assign_current(assignment=circ.name, amplitude=5)
+        region = m2d_blank.modeler.create_region(pad_value=100)
+        m2d_blank.assign_balloon(assignment=region.edges)
+        m2d_blank.create_setup()
+        assert m2d_blank.post.create_fieldplot_surface(assignment=m2d_blank.modeler.object_list, quantity="Flux_Lines")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Update pydantic requirement from <2.12,>=2.6.4 to >=2.6.4,<2.13`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Settings.aedt_version in desktop and design class fix`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ dependencies = [`
`41`	`41`	`"pyyaml",`
`42`	`42`	`"defusedxml>=0.7,<8.0",`
`43`	`43`	`"numpy>=1.20.0,<2.3",`
`44`		`- "pydantic>=2.6.4,<2.12",`
	`44`	`+ "pydantic>=2.6.4,<2.13",`
`45`	`45`	`]`
`46`	`46`
`47`	`47`	`[project.optional-dependencies]`