Merge branch 'main' into release/0.9

# Conflicts:
#	src/ansys/aedt/toolkits/common/__init__.py

Author: Samuelopez-ansys

.github/workflows/ci_cd.yml

@@ -164,7 +164,7 @@ jobs:
     runs-on: [self-hosted, pyaedt, toolkits, Linux]
     needs: [ smoke-tests ]
     env:
-      ANSYSEM_ROOT242: '/opt/AnsysEM/v242/Linux64'
+      ANSYSEM_ROOT251: '/opt/AnsysEM/v251/AnsysEM'
       ANS_NODEPCHECK: '1'
     steps:
       - uses: actions/checkout@v4

examples/toolkit/pyaedt_toolkit/ui/actions.py

@@ -1,4 +1,4 @@
-from ansys.aedt.core.generic.general_methods import generate_unique_project_name
+from ansys.aedt.core.generic.file_utils import generate_unique_project_name
 import requests
 
 from ansys.aedt.toolkits.common.ui.actions_generic import FrontendGeneric

pyproject.toml

@@ -26,29 +26,29 @@ classifiers = [
 dependencies = [
     "build==1.2.2.post1",
     "twine==6.1.0",
-    "pyaedt>=0.13.0,<0.16",
+    "pyaedt>=0.15.2",
     "pydantic>=2.0,<2.11",
     "tomli; python_version < '3.12'",
     "attrs<25.2.0"
 ]
 
 [project.optional-dependencies]
 all = [
-    "pyaedt[all]>=0.13.0,<0.16",
+    "pyaedt[all]>=0.15.2",
     "flask",
     "pyside6==6.8.2.1",
     "pyqtgraph",
     "qdarkstyle",
     "pyvistaqt",
 ]
 tests = [
-    "pyaedt[all]>=0.13.0,<0.16",
+    "pyaedt[all]>=0.15.2",
     "flask",
     "pytest>=7.4.0,<8.4",
     "pytest-cov>=4.0.0,<6.1",
 ]
 doc = [
-    "pyaedt[all]>=0.13.0,<0.16",
+    "pyaedt[all]>=0.15.2",
     "recommonmark>=0.7.0,<0.8",
     "pyside6==6.8.2.1",
     "ansys-sphinx-theme>=0.10.0,<1.4",

src/ansys/aedt/toolkits/common/__init__.py

@@ -26,4 +26,4 @@
 ansys.aedt.toolkits.common
 """
 
-__version__ = "0.9.1"
+__version__ = "0.9.2"

src/ansys/aedt/toolkits/common/backend/api.py

@@ -40,7 +40,7 @@
 
     list_installed_aedt = list_installed_ansysem()
 else:
-    from ansys.aedt.core.generic.aedt_versions import aedt_versions
+    from ansys.aedt.core.internal.aedt_versions import aedt_versions
 
     list_installed_aedt = aedt_versions.list_installed_ansysem
 
@@ -91,7 +91,7 @@ class Common:
     >>> from ansys.aedt.toolkits.common.backend.api import Common
     >>> toolkit_api = Common()
     >>> toolkit_properties = toolkit_api.get_properties()
-    >>> new_properties = {"aedt_version": "2024.2"}
+    >>> new_properties = {"aedt_version": "2025.1"}
     >>> toolkit_api.set_properties(new_properties)
     >>> new_properties = toolkit_api.get_properties()
     """
@@ -224,7 +224,7 @@ def installed_aedt_version() -> List:
         >>> from ansys.aedt.toolkits.common.backend.api import Common
         >>> toolkit_api = Common()
         >>> toolkit_api.installed_aedt_version()
-        ["2023.2", "2024.1", "2024.2"]
+        ["2024.2", "2025.1"]
         """
 
         # Detect existing AEDT installation
@@ -757,6 +757,13 @@ def save_project(self, project_path=None, release_aedt=True):
                     del self.properties.design_list[old_project_name]
             else:
                 self.desktop.save_project()
+
+            # In non-graphical mode sometimes the active project and design does not set correctly
+            if self.properties.active_project:
+                oproject = self.desktop.active_project(self.get_project_name(self.properties.active_project))
+                if self.properties.active_design:
+                    self.desktop.active_design(oproject, self.properties.active_design)
+
             self.__save_project_info()
             if release_aedt:
                 self.release_aedt(False, False)

src/ansys/aedt/toolkits/common/backend/common_properties.toml

@@ -1,4 +1,4 @@
-aedt_version= "2024.2"
+aedt_version= "2025.1"
 non_graphical= true
 active_project= ""
 active_design= ""

src/ansys/aedt/toolkits/common/backend/models.py

@@ -38,7 +38,7 @@
 class CommonProperties(BaseModel):
     """Stores common AEDT properties."""
 
-    aedt_version: str = "2024.2"
+    aedt_version: str = "2025.1"
     non_graphical: bool = False
     active_project: str = ""
     active_design: str = ""

tests/backend/conftest.py

@@ -9,7 +9,7 @@
 The default configuration can be changed by placing a file called local_config.json in the same
 directory as this module. An example of the contents of local_config.json
 {
-  "desktop_version": "2024.2",
+  "desktop_version": "2025.1",
   "non_graphical": false,
   "use_grpc": true
 }
@@ -30,13 +30,12 @@
 import pytest
 
 DEFAULT_CONFIG = {
-    "desktop_version": "2024.2",
+    "desktop_version": "2025.1",
     "non_graphical": True,
     "use_grpc": True,
     "debug": False
 }
 LOCAL_CFG_FILE = "local_config.json"
-PROJECT_NAME = "Test"
 
 
 def read_local_config() -> dict:

tests/backend/tests_aedt_api/conftest.py

@@ -32,7 +32,7 @@
 An example of the contents of local_config.json:
 
 {
-  "desktop_version": "2024.2",
+  "desktop_version": "2025.1",
   "non_graphical": false,
   "use_grpc": true
 }
@@ -45,7 +45,7 @@
 from ansys.aedt.core import generate_unique_project_name
 from ansys.aedt.toolkits.common.backend.api import AEDTCommon
 from ansys.aedt.toolkits.common.backend.models import Properties
-from tests.backend.conftest import read_local_config, setup_aedt_settings, DEFAULT_CONFIG, PROJECT_NAME
+from tests.backend.conftest import read_local_config, setup_aedt_settings, DEFAULT_CONFIG
 
 # Setup config
 config = DEFAULT_CONFIG.copy()
@@ -72,10 +72,10 @@ def aedt_common(logger, common_temp_dir):
     is_aedt_launched = aedt_common.wait_to_be_idle()
 
     aedt_common.active_project = generate_unique_project_name(common_temp_dir, project_name="Test_Common")
-    aedt_common.connect_aedt()
-    aedt_common.desktop.odesktop.NewProject(aedt_common.active_project)
-    aedt_common.save_project()
-    aedt_common.release_aedt(False, False)
+    properties.active_project = aedt_common.active_project
+    aedt_common.connect_design("HFSS")
+    aedt_common.aedtapp.odesktop.CloseProject("Test_Common")
+    aedt_common.release_aedt(True, False)
 
     if is_aedt_launched:
         yield aedt_common

tests/backend/tests_aedt_api/test_aedt.py

@@ -23,8 +23,6 @@
 import os
 import pytest
 
-from tests.backend.conftest import PROJECT_NAME
-
 pytestmark = [pytest.mark.aedt_common_api]
 
 
@@ -36,9 +34,14 @@ def test_00_connect_aedt(self, aedt_common):
 
         assert aedt_common.connect_aedt()
         assert aedt_common.connect_aedt()
-        assert aedt_common.release_aedt()
 
-    def test_01_connect_design(self, aedt_common):
+    def test_01_open_project(self, aedt_common):
+        """Open AEDT project."""
+
+        assert aedt_common.open_project(aedt_common.properties.active_project)
+        assert not aedt_common.open_project(aedt_common.properties.active_project)
+
+    def test_02_connect_design(self, aedt_common):
         """Connect design."""
 
         assert aedt_common.connect_design()
@@ -50,13 +53,6 @@ def test_01_connect_design(self, aedt_common):
         aedt_common.properties.active_design = "No Design"
         assert aedt_common.connect_design("Tesla")
 
-    def test_02_open_project(self, aedt_common, common_temp_dir):
-        """Open AEDT project."""
-
-        aedt_file = os.path.join(common_temp_dir, "input_data", f"{PROJECT_NAME}.aedt")
-        aedt_common.open_project(aedt_file)
-        assert not aedt_common.open_project(aedt_file)
-
     def test_03_save_project(self, aedt_common, common_temp_dir):
         """Save AEDT project."""
 

tests/backend/tests_common_api/conftest.py

@@ -32,7 +32,7 @@
 An example of the contents of local_config.json:
 
 {
-  "desktop_version": "2024.2",
+  "desktop_version": "2025.1",
   "non_graphical": false,
   "use_grpc": true
 }

tests/backend/tests_edb_api/conftest.py

@@ -32,7 +32,7 @@
 An example of the contents of local_config.json:
 
 {
-  "desktop_version": "2024.2",
+  "desktop_version": "2025.1",
   "non_graphical": false,
   "use_grpc": true
 }

tests/backend/tests_rest_api/conftest.py

@@ -32,7 +32,7 @@
 An example of the contents of local_config.json:
 
 {
-  "desktop_version": "2024.2",
+  "desktop_version": "2025.1",
   "non_graphical": false,
   "use_grpc": true
 }
@@ -44,7 +44,7 @@
 import os
 import pytest
 
-from tests.backend.conftest import read_local_config, setup_aedt_settings, DEFAULT_CONFIG, PROJECT_NAME
+from tests.backend.conftest import read_local_config, setup_aedt_settings, DEFAULT_CONFIG
 from ansys.aedt.toolkits.common.backend.rest_api import app
 
 # Setup config
@@ -73,9 +73,14 @@ def client(logger, common_temp_dir):
         client.post("/launch_aedt")
         timeout = 60
         client.get("/wait_thread", json=timeout)
-        aedt_file = os.path.join(common_temp_dir, "input_data", f"{PROJECT_NAME}.aedt")
-        response = client.post("/open_project", data=aedt_file)
-        assert response.status_code == 200
+
+        aedt_file = os.path.join(common_temp_dir, "input_data", f"Test_REST_API.aedt")
+        properties = {
+            "active_project": aedt_file
+        }
+        client.put("/properties", json=properties)
+
+        client.post("/connect_design", json={"aedtapp": "Icepak"})
 
         yield client