FIX: Solved issue #6801, improved desktop.save_project() (#6847)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pyansys-ci-bot <[email protected]>

Author: 3 people

doc/changelog.d/6847.fixed.md

@@ -0,0 +1 @@
+Solved issue #6801, improved desktop.save_project()

src/ansys/aedt/core/desktop.py

@@ -1006,9 +1006,9 @@ def save_project(self, project_name=None, project_path=None):
         project_name : str, optional
             Project name. The default is ``None``, in which case the active project
             is used.
-        project_path : str, optional
-            Full path to the project. The default is ``None``. If a path is
-            provided, ``save as`` is used.
+        project_path : str, Path, optional
+            Full path to the project. The default is ``None``, in which case the current project is saved.
+            If a path is provided, "save as" is used.
 
         Returns
         -------
@@ -1017,10 +1017,17 @@ def save_project(self, project_name=None, project_path=None):
         """
         if not project_name:
             oproject = self.odesktop.GetActiveProject()
+            project_name = oproject.GetName()
         else:
             oproject = self.odesktop.SetActiveProject(project_name)
         if project_path:
-            oproject.SaveAs(project_path, True)
+            project_path = Path(project_path)
+            # check if the path ends with a file (by verifying if it has an extension)
+            if project_path.suffix:
+                final_path = project_path
+            else:
+                final_path = project_path / (project_name + ".aedt")
+            oproject.SaveAs(str(final_path), True)
         else:
             oproject.Save()
         return True
@@ -1691,7 +1698,7 @@ def submit_job(
         project_path = Path(project_file).parent
         project_name = Path(project_file).stem
         if project_name in self.project_list:
-            self.save_project(project_path, project_path)
+            self.save_project(project_name, project_path)
         if not aedt_full_exe_path:
             version = self.odesktop.GetVersion()[2:6]
             if version >= "22.2":
@@ -1812,8 +1819,7 @@ def submit_ansys_cloud_job(
         project_path = Path(project_file).parent
         project_name = Path(project_file).stem
         if project_name in self.project_list:
-            self.save_project(project_path, project_path)
-
+            self.save_project(project_name, project_path)
         if not job_name:
             job_name = generate_unique_name(project_name)
         if project_name in self.project_list:

tests/system/general/test_01_Design.py

@@ -23,6 +23,7 @@
 # SOFTWARE.
 
 import os
+from pathlib import Path
 import tempfile
 
 import pytest
@@ -519,6 +520,35 @@ def test_42_save_project_with_file_name(self, aedtapp, local_scratch):
         aedtapp.save_project(file_name=new_project)
         assert os.path.isfile(new_project)
 
+        aedtapp.close_project(aedtapp.project_name)
+
+    def test_desktop_save_as(self, aedtapp, local_scratch):
+        # Save as passing a string
+        aedtapp.create_new_project("test_desktop_save_as")
+        new_project = os.path.join(local_scratch.path, "new.aedt")
+        assert os.path.exists(local_scratch.path)
+        assert aedtapp.desktop_class.save_project(project_path=new_project)
+        assert os.path.isfile(new_project)
+
+        # Test using Path instead of string
+        new_project_path = Path(local_scratch.path) / "new_2.aedt"
+        assert aedtapp.desktop_class.save_project(project_path=new_project_path)
+        assert new_project_path.exists()
+
+        # Test using Path with only dir
+        only_project_path = Path(local_scratch.path)
+        assert aedtapp.desktop_class.save_project(project_path=only_project_path)
+        assert new_project_path.exists()
+
+        # Test using Path and providing a project name
+        new_project_path = Path(local_scratch.path) / "new_3.aedt"
+        project_name = aedtapp.project_name
+        assert aedtapp.desktop_class.save_project(project_name=project_name, project_path=new_project_path)
+        assert new_project_path.exists()
+
+        aedtapp.close_project(aedtapp.project_name)
+
     def test_43_edit_notes(self, aedtapp):
+        aedtapp.create_new_project("Test_notes")
         assert aedtapp.edit_notes("this a test")
         assert not aedtapp.edit_notes(1)