Refacto imports (#146)

doc/source/examples/aedt_common/api_aedt_connect_session.py

@@ -10,7 +10,7 @@
 
 import sys
 from ansys.aedt.toolkits.common.backend.api import AEDTCommon
-import pyaedt
+import ansys.aedt.core
 
 
 # ## Initialize toolkit
@@ -28,8 +28,8 @@
 # ## Initialize AEDT
 #
 # Initialize AEDT using PyAEDT and then release it.
-pyaedt.settings.enable_logger = False
-app = pyaedt.Desktop(specified_version=properties_from_backend["aedt_version"],
+ansys.aedt.core.settings.enable_logger = False
+app = ansys.aedt.core.Desktop(specified_version=properties_from_backend["aedt_version"],
                      non_graphical=properties_from_backend["non_graphical"])
 app.release_desktop(close_projects=False, close_on_exit=False)
 

doc/source/examples/aedt_common/api_aedt_open_project.py

@@ -12,7 +12,7 @@
 import os
 import shutil
 
-from pyaedt import generate_unique_folder_name
+from ansys.aedt.core import generate_unique_folder_name
 
 from ansys.aedt.toolkits.common.utils import download_file
 from ansys.aedt.toolkits.common.backend.api import AEDTCommon

doc/source/examples/edb_common/api_edb.py

@@ -7,11 +7,10 @@
 #
 # Perform the required imports.
 
-import sys
 import os
 import shutil
 
-from pyaedt import generate_unique_folder_name
+from ansys.aedt.core import generate_unique_folder_name
 
 from ansys.aedt.toolkits.common.utils import download_file
 from ansys.aedt.toolkits.common.backend.api import EDBCommon

examples/toolkit/pyaedt_toolkit/backend/api.py

@@ -70,7 +70,7 @@ def draw_box(self):
 
         Returns
         -------
-        :class:`pyaedt.modeler.object3d.Object3d`
+        :class:`ansys.aedt.core.modeler.object3d.Object3d`
             3D object.
 
         Examples
@@ -89,8 +89,8 @@ def draw_box(self):
         pos_z = props[0][2]
 
         box = self.aedtapp.modeler.create_box(
-            position=[pos_x, pos_y, pos_z],
-            dimensions_list=[1 * self.multiplier, 1 * self.multiplier, 1 * self.multiplier],
+            origin=[pos_x, pos_y, pos_z],
+            sizes=[1 * self.multiplier, 1 * self.multiplier, 1 * self.multiplier],
         )
 
         box.color = (props[1][0], props[1][1], props[1][2])
@@ -102,7 +102,7 @@ def draw_sphere(self):
 
         Returns
         -------
-        :class:`pyaedt.modeler.object3d.Object3d`
+        :class:`ansys.aedt.core.modeler.object3d.Object3d`
             3D object.
 
         Examples
@@ -122,7 +122,7 @@ def draw_sphere(self):
         pos_z = props[0][2]
 
         sp = self.aedtapp.modeler.create_sphere(
-            position=[pos_x, pos_y, pos_z],
+            origin=[pos_x, pos_y, pos_z],
             radius=1 * self.multiplier,
         )
 

examples/toolkit/pyaedt_toolkit/ui/actions.py

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

pyproject.toml

@@ -33,21 +33,21 @@ dependencies = [
 
 [project.optional-dependencies]
 all = [
-    "pyaedt[all]>=0.8.0,<0.10",
+    "pyaedt[all]>=0.8.0,<0.11",
     "flask",
     "PySide6-Essentials",
     "pyqtgraph",
     "qdarkstyle",
     "pyvistaqt",
 ]
 tests = [
-    "pyaedt[all]>=0.8.0,<0.10",
+    "pyaedt[all]>=0.8.0,<0.11",
     "flask",
     "pytest>=7.4.0,<8.4",
     "pytest-cov>=4.0.0,<5.1",
 ]
 doc = [
-    "pyaedt[all]>=0.8.0,<0.10",
+    "pyaedt[all]>=0.8.0,<0.11",
     "recommonmark>=0.7.0,<0.8",
     "PySide6-Essentials",
     "ansys-sphinx-theme>=0.10.0,<0.17",

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

@@ -31,10 +31,10 @@
 from typing import Optional
 from typing import Tuple
 
-import pyaedt
-from pyaedt import Desktop
-from pyaedt.generic.general_methods import active_sessions
-from pyaedt.misc import list_installed_ansysem
+import ansys.aedt.core
+from ansys.aedt.core import Desktop
+from ansys.aedt.core.generic.general_methods import active_sessions
+from ansys.aedt.core.misc import list_installed_ansysem
 from pydantic import ValidationError
 
 from ansys.aedt.toolkits.common.backend.constants import NAME_TO_AEDT_APP
@@ -384,8 +384,8 @@ def launch_aedt(self) -> bool:
         connected, msg = self.is_aedt_connected()
         if not connected:
             logger.debug("Launching AEDT.")
-            pyaedt.settings.use_grpc_api = self.properties.use_grpc
-            pyaedt.settings.enable_logger = self.properties.debug
+            ansys.aedt.core.settings.use_grpc_api = self.properties.use_grpc
+            ansys.aedt.core.settings.enable_logger = self.properties.debug
 
             version, is_student = self.__get_aedt_version()
 
@@ -405,7 +405,7 @@ def launch_aedt(self) -> bool:
             else:  # pragma: no cover
                 desktop_args["new_desktop_session"] = False
                 desktop_args["aedt_process_id"] = self.properties.selected_process
-            self.desktop = pyaedt.Desktop(**desktop_args)
+            self.desktop = ansys.aedt.core.Desktop(**desktop_args)
 
             if not self.desktop:  # pragma: no cover
                 logger.error("AEDT not launched.")
@@ -458,8 +458,8 @@ def connect_aedt(self) -> bool:
             return True
 
         # Connect to AEDT
-        pyaedt.settings.use_grpc_api = self.properties.use_grpc
-        pyaedt.settings.enable_logger = self.properties.debug
+        ansys.aedt.core.settings.use_grpc_api = self.properties.use_grpc
+        ansys.aedt.core.settings.enable_logger = self.properties.debug
         logger.debug("Connecting AEDT.")
 
         version, is_student = self.__get_aedt_version()
@@ -477,7 +477,7 @@ def connect_aedt(self) -> bool:
 
         gc.collect()
 
-        self.desktop = pyaedt.Desktop(**desktop_args)
+        self.desktop = ansys.aedt.core.Desktop(**desktop_args)
 
         if not self.desktop:  # pragma: no cover
             logger.error("Toolkit is not connected to AEDT.")
@@ -536,14 +536,14 @@ def connect_design(self, app_name: Optional[str] = None):
         if self.properties.active_design:
             design_name = self.properties.active_design
 
-        pyaedt.settings.use_grpc_api = self.properties.use_grpc
-        pyaedt.settings.enable_logger = self.properties.debug
+        ansys.aedt.core.settings.use_grpc_api = self.properties.use_grpc
+        ansys.aedt.core.settings.enable_logger = self.properties.debug
 
         if not app_name:
             app_name = "HFSS"
 
         # Select app
-        aedt_app = pyaedt.Hfss
+        aedt_app = ansys.aedt.core.Hfss
         if design_name != "No Design":
             project_name = self.get_project_name(project_name)
             active_design = design_name
@@ -555,12 +555,12 @@ def connect_design(self, app_name: Optional[str] = None):
                     return False
                 active_design = self.aedtapp.design_name
         elif app_name in list(NAME_TO_AEDT_APP.keys()):
-            design_name = pyaedt.generate_unique_name(app_name)
-            aedt_app = getattr(pyaedt, NAME_TO_AEDT_APP[app_name])
+            design_name = ansys.aedt.core.generate_unique_name(app_name)
+            aedt_app = getattr(ansys.aedt.core, NAME_TO_AEDT_APP[app_name])
             active_design = design_name
         else:
             logger.info("AEDT application is not available in PyAEDT. Creating HFSS design.")
-            design_name = pyaedt.generate_unique_name("Hfss")
+            design_name = ansys.aedt.core.generate_unique_name("Hfss")
             active_design = design_name
 
         if not self.aedtapp and aedt_app:
@@ -823,14 +823,14 @@ def export_aedt_model(
         if self.aedtapp:
             self.aedtapp.save_project()
             files = self.aedtapp.post.export_model_obj(
-                obj_list=obj_list,
+                assignment=obj_list,
                 export_path=export_path,
                 export_as_single_objects=export_as_single_objects,
                 air_objects=air_objects,
             )
             self.release_aedt(False, False)
             # Plot exported files using the following code
-            # from pyaedt.generic.plot import ModelPlotter
+            # from ansys.aedt.core.generic.plot import ModelPlotter
             # model = ModelPlotter()
             # for file in files:
             #     model.add_object(file[0], file[1], file[2])
@@ -961,10 +961,10 @@ def load_edb(self, edb_path=None):
 
         if os.path.exists(edb_path):
             aedt_version = self.properties.aedt_version
-            pyaedt.settings.enable_logger = self.properties.debug
-            pyaedt.settings.enable_debug_edb_logger = self.properties.debug
+            ansys.aedt.core.settings.enable_logger = self.properties.debug
+            ansys.aedt.core.settings.enable_debug_edb_logger = self.properties.debug
             self.properties.active_project = edb_path
-            self.edb = pyaedt.Edb(edbversion=aedt_version, edbpath=edb_path)
+            self.edb = ansys.aedt.core.Edb(edbversion=aedt_version, edbpath=edb_path)
             logger.debug("Project {} is opened".format(edb_path))
             return True
         else:

tests/backend/conftest.py

@@ -26,7 +26,7 @@
 import shutil
 from typing import Optional
 
-from pyaedt import settings
+from ansys.aedt.core import settings
 import pytest
 
 DEFAULT_CONFIG = {

tests/backend/tests_aedt_api/conftest.py

@@ -42,7 +42,7 @@
 """
 
 import pytest
-from pyaedt import generate_unique_project_name
+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