FEAT: Use GetDataModel to improve the way information are cached into…

… the API (#5488)

Co-authored-by: Samuelopez-ansys <samuel.lopez@ansys.com>

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

@@ -21,3 +21,36 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+from ansys.aedt.core.generic.general_methods import pyaedt_function_handler
+
+
+@pyaedt_function_handler()
+def _get_data_model(child_object, level=-1):
+    import json
+
+    def _fix_dict(p_list, p_out):
+        for p, val in p_list.items():
+            if p == "properties":
+                for prop in val:
+                    if "value" in prop:
+                        p_out[prop["name"]] = prop["value"]
+                    elif "values" in prop:
+                        p_out[prop["name"]] = prop["values"]
+                    else:
+                        p_out[prop["name"]] = None
+            elif isinstance(val, dict):
+                _fix_dict(val, p_out[p])
+            elif isinstance(val, list):
+                p_out[p] = []
+                for el in val:
+                    children = {}
+                    _fix_dict(el, children)
+                    p_out[p].append(children)
+            else:
+                p_out[p] = val
+
+    input_str = child_object.GetDataModel(level, 1, 1)
+    props_list = json.loads(input_str)
+    props = {}
+    _fix_dict(props_list, props)
+    return props

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

@@ -55,9 +55,9 @@
 from ansys.aedt.core.generic.general_methods import open_file
 from ansys.aedt.core.generic.general_methods import pyaedt_function_handler
 from ansys.aedt.core.generic.settings import settings
-from ansys.aedt.core.modules.boundary import MaxwellParameters
-from ansys.aedt.core.modules.boundary import NativeComponentObject
-from ansys.aedt.core.modules.boundary import NativeComponentPCB
+from ansys.aedt.core.modules.boundary.layout_boundary import NativeComponentObject
+from ansys.aedt.core.modules.boundary.layout_boundary import NativeComponentPCB
+from ansys.aedt.core.modules.boundary.maxwell_boundary import MaxwellParameters
 from ansys.aedt.core.modules.design_xploration import OptimizationSetups
 from ansys.aedt.core.modules.design_xploration import ParametricSetups
 from ansys.aedt.core.modules.solve_setup import Setup
@@ -1537,14 +1537,16 @@ def get_setup(self, name):
             setup = SetupSBR(self, setuptype, name, is_new_setup=False)
         elif self.design_type in ["Q3D Extractor", "2D Extractor", "HFSS"]:
             setup = SetupHFSS(self, setuptype, name, is_new_setup=False)
-            if setup.props and setup.props.get("SetupType", "") == "HfssDrivenAuto":
+            if setup.properties:
+                if "Auto Solver Setting" in setup.properties:
+                    setup = SetupHFSSAuto(self, 0, name, is_new_setup=False)
+            elif setup.props and setup.props.get("SetupType", "") == "HfssDrivenAuto":
                 setup = SetupHFSSAuto(self, 0, name, is_new_setup=False)
         elif self.design_type in ["Maxwell 2D", "Maxwell 3D"]:
             setup = SetupMaxwell(self, setuptype, name, is_new_setup=False)
         else:
             setup = Setup(self, setuptype, name, is_new_setup=False)
-        if setup.props:
-            self.active_setup = name
+        self.active_setup = name
         return setup
 
     @pyaedt_function_handler()

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

@@ -26,14 +26,14 @@
 from ansys.aedt.core.generic.general_methods import pyaedt_function_handler
 from ansys.aedt.core.generic.settings import settings
 from ansys.aedt.core.modeler.circuits.object_3d_circuit import CircuitComponent
-from ansys.aedt.core.modules.boundary import CurrentSinSource
-from ansys.aedt.core.modules.boundary import Excitations
-from ansys.aedt.core.modules.boundary import PowerIQSource
-from ansys.aedt.core.modules.boundary import PowerSinSource
-from ansys.aedt.core.modules.boundary import Sources
-from ansys.aedt.core.modules.boundary import VoltageDCSource
-from ansys.aedt.core.modules.boundary import VoltageFrequencyDependentSource
-from ansys.aedt.core.modules.boundary import VoltageSinSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import CurrentSinSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import Excitations
+from ansys.aedt.core.modules.boundary.circuit_boundary import PowerIQSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import PowerSinSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import Sources
+from ansys.aedt.core.modules.boundary.circuit_boundary import VoltageDCSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import VoltageFrequencyDependentSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import VoltageSinSource
 from ansys.aedt.core.modules.setup_templates import SetupKeys
 from ansys.aedt.core.modules.solve_setup import SetupCircuit
 

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

@@ -77,9 +77,9 @@
 from ansys.aedt.core.generic.general_methods import settings
 from ansys.aedt.core.generic.general_methods import write_csv
 from ansys.aedt.core.generic.load_aedt_file import load_entire_aedt_file
-from ansys.aedt.core.modules.boundary import BoundaryObject
-from ansys.aedt.core.modules.boundary import MaxwellParameters
-from ansys.aedt.core.modules.boundary import NetworkObject
+from ansys.aedt.core.modules.boundary.circuit_boundary import NetworkObject
+from ansys.aedt.core.modules.boundary.common import BoundaryObject
+from ansys.aedt.core.modules.boundary.maxwell_boundary import MaxwellParameters
 
 if sys.version_info.major > 2:
     import base64
@@ -376,6 +376,12 @@ def boundaries(self):
             current_excitation_types = ee[1::2]
             ff = [i.split(":")[0] for i in ee]
             bb.extend(ff)
+            for i in set(current_excitation_types):
+                if "GetExcitationsOfType" in self.oboundary.__dir__():
+                    ports = list(self.oboundary.GetExcitationsOfType(i))
+                    for p in ports:
+                        bb.append(p)
+                        bb.append(i)
         elif (
             self.oboundary
             and "Excitations" in self.get_oo_name(self.odesign)
@@ -431,6 +437,7 @@ def boundaries(self):
                     del self._boundaries[k]
         for boundary, boundarytype in zip(current_boundaries, current_types):
             if boundary in self._boundaries:
+                self._boundaries[boundary]._initialize_bynary_tree()
                 continue
             if boundarytype == "MaxwellParameters":
                 maxwell_parameter_type = self.get_oo_property_value(self.odesign, f"Parameters\\{boundary}", "Type")
@@ -3796,7 +3803,7 @@ def save_project(self, file_name=None, overwrite=True, refresh_ids=False):
             self.oproject.Save()
         if refresh_ids:
             self.modeler.refresh_all_ids()
-            self.modeler._refresh_all_ids_from_aedt_file()
+            self.modeler._refresh_all_ids_wrapper()
             self.mesh._refresh_mesh_operations()
         self._project_name = None
         self._project_path = None

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

@@ -1353,7 +1353,7 @@ def _find_used_variable_history(self, history, var_name):
 
         """
         used = False
-        for _, v in history.props.items():
+        for _, v in history.properties.items():
             if isinstance(v, str) and var_name in re.findall("[a-zA-Z0-9_]+", v):
                 return True
         for el in history.children.values():

src/ansys/aedt/core/circuit.py

@@ -47,13 +47,13 @@
 from ansys.aedt.core.generic.general_methods import read_configuration_file
 from ansys.aedt.core.generic.settings import settings
 from ansys.aedt.core.hfss3dlayout import Hfss3dLayout
-from ansys.aedt.core.modules.boundary import CurrentSinSource
-from ansys.aedt.core.modules.boundary import PowerIQSource
-from ansys.aedt.core.modules.boundary import PowerSinSource
-from ansys.aedt.core.modules.boundary import Sources
-from ansys.aedt.core.modules.boundary import VoltageDCSource
-from ansys.aedt.core.modules.boundary import VoltageFrequencyDependentSource
-from ansys.aedt.core.modules.boundary import VoltageSinSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import CurrentSinSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import PowerIQSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import PowerSinSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import Sources
+from ansys.aedt.core.modules.boundary.circuit_boundary import VoltageDCSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import VoltageFrequencyDependentSource
+from ansys.aedt.core.modules.boundary.circuit_boundary import VoltageSinSource
 from ansys.aedt.core.modules.circuit_templates import SourceKeys
 
 

src/ansys/aedt/core/generic/configurations.py

@@ -43,10 +43,10 @@
 from ansys.aedt.core.modeler.cad.components_3d import UserDefinedComponent
 from ansys.aedt.core.modeler.cad.modeler import CoordinateSystem
 from ansys.aedt.core.modeler.geometry_operators import GeometryOperators
-from ansys.aedt.core.modules.boundary import BoundaryObject
-from ansys.aedt.core.modules.boundary import BoundaryProps
-from ansys.aedt.core.modules.boundary import NativeComponentObject
-from ansys.aedt.core.modules.boundary import NativeComponentPCB
+from ansys.aedt.core.modules.boundary.common import BoundaryObject
+from ansys.aedt.core.modules.boundary.common import BoundaryProps
+from ansys.aedt.core.modules.boundary.layout_boundary import NativeComponentObject
+from ansys.aedt.core.modules.boundary.layout_boundary import NativeComponentPCB
 from ansys.aedt.core.modules.design_xploration import SetupOpti
 from ansys.aedt.core.modules.design_xploration import SetupParam
 from ansys.aedt.core.modules.material_lib import Material

src/ansys/aedt/core/generic/data_handlers.py

@@ -205,61 +205,6 @@ def _arg2dict(arg, dict_out):
         raise ValueError("Incorrect data argument format")
 
 
-@pyaedt_function_handler()
-def create_list_for_csharp(input_list, return_strings=False):
-    """
-
-    Parameters
-    ----------
-    input_list :
-
-    return_strings :
-         (Default value = False)
-
-    Returns
-    -------
-
-    """
-    from ansys.aedt.core.generic.clr_module import Double
-    from ansys.aedt.core.generic.clr_module import List
-
-    if return_strings:
-        col = List[str]()
-    else:
-        col = List[Double]()
-
-    for el in input_list:
-        if return_strings:
-            col.Add(str(el))
-        else:
-            col.Add(el)
-    return col
-
-
-@pyaedt_function_handler()
-def create_table_for_csharp(input_list_of_list, return_strings=True):
-    """
-
-    Parameters
-    ----------
-    input_list_of_list :
-
-    return_strings :
-         (Default value = True)
-
-    Returns
-    -------
-
-    """
-    from ansys.aedt.core.generic.clr_module import List
-
-    new_table = List[List[str]]()
-    for col in input_list_of_list:
-        newcol = create_list_for_csharp(col, return_strings)
-        new_table.Add(newcol)
-    return new_table
-
-
 @pyaedt_function_handler()
 def format_decimals(el):
     """

src/ansys/aedt/core/hfss.py

@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""This module contains these classes: ``Hfss`` and ``BoundaryType``."""
+"""This module contains the ``Hfss`` class."""
 
 from __future__ import absolute_import  # noreorder
 
@@ -49,10 +49,10 @@
 from ansys.aedt.core.modeler.cad.component_array import ComponentArray
 from ansys.aedt.core.modeler.cad.components_3d import UserDefinedComponent
 from ansys.aedt.core.modeler.geometry_operators import GeometryOperators
-from ansys.aedt.core.modules.boundary import BoundaryObject
-from ansys.aedt.core.modules.boundary import FarFieldSetup
-from ansys.aedt.core.modules.boundary import NativeComponentObject
-from ansys.aedt.core.modules.boundary import NearFieldSetup
+from ansys.aedt.core.modules.boundary.common import BoundaryObject
+from ansys.aedt.core.modules.boundary.hfss_boundary import FarFieldSetup
+from ansys.aedt.core.modules.boundary.hfss_boundary import NearFieldSetup
+from ansys.aedt.core.modules.boundary.layout_boundary import NativeComponentObject
 from ansys.aedt.core.modules.setup_templates import SetupKeys
 
 
@@ -249,10 +249,17 @@ def field_setups(self):
         Returns
         -------
         List of :class:`ansys.aedt.core.modules.boundary.FarFieldSetup` and
-        :class:`ansys.aedt.core.modules.boundary.NearFieldSetup`
+        :class:`ansys.aedt.core.modules.hfss_boundary.NearFieldSetup`
         """
-        if not self._field_setups:
-            self._field_setups = self._get_rad_fields()
+        for field in self.field_setup_names:
+            obj_field = self.odesign.GetChildObject("Radiation").GetChildObject(field)
+            type_field = obj_field.GetPropValue("Type")
+            if type_field == "Infinite Sphere":
+                self._field_setups.append(FarFieldSetup(self, field, {}, "FarFieldSphere"))
+            else:
+                self._field_setups.append(NearFieldSetup(self, field, {}, f"NearField{type_field}"))
+        # if not self._field_setups:
+        #     self._field_setups = self._get_rad_fields()
         return self._field_setups
 
     @property
@@ -372,31 +379,6 @@ def _get_unique_source_name(self, source_name, root_name):
             source_name = generate_unique_name(source_name)
         return source_name
 
-    @pyaedt_function_handler()
-    def _get_rad_fields(self):
-        if not self.design_properties:
-            return []
-        fields = []
-        if self.design_properties.get("RadField"):
-            if self.design_properties["RadField"].get("FarFieldSetups"):
-                for val in self.design_properties["RadField"]["FarFieldSetups"]:
-                    p = self.design_properties["RadField"]["FarFieldSetups"][val]
-                    if isinstance(p, dict) and p.get("Type") == "Infinite Sphere":
-                        fields.append(FarFieldSetup(self, val, p, "FarFieldSphere"))
-            if self.design_properties["RadField"].get("NearFieldSetups"):
-                for val in self.design_properties["RadField"]["NearFieldSetups"]:
-                    p = self.design_properties["RadField"]["NearFieldSetups"][val]
-                    if isinstance(p, dict):
-                        if p["Type"] == "Near Rectangle":
-                            fields.append(NearFieldSetup(self, val, p, "NearFieldRectangle"))
-                        elif p["Type"] == "Near Line":
-                            fields.append(NearFieldSetup(self, val, p, "NearFieldLine"))
-                        elif p["Type"] == "Near Box":
-                            fields.append(NearFieldSetup(self, val, p, "NearFieldBox"))
-                        elif p["Type"] == "Near Sphere":
-                            fields.append(NearFieldSetup(self, val, p, "NearFieldSphere"))
-        return fields
-
     @pyaedt_function_handler()
     def _create_boundary(self, name, props, boundary_type):
         """Create a boundary.
@@ -1482,7 +1464,7 @@ def create_sbr_antenna(
 
         Returns
         -------
-        :class:`ansys.aedt.core.modules.boundary.NativeComponentObject`
+        :class:`ansys.aedt.core.modules.layout_boundary.NativeComponentObject`
             NativeComponentObject object.
 
         References
@@ -1608,7 +1590,7 @@ def create_sbr_file_based_antenna(
 
         Returns
         -------
-        :class:`ansys.aedt.core.modules.boundary.NativeComponentObject`
+        :class:`ansys.aedt.core.modules.layout_boundary.NativeComponentObject`
 
         References
         ----------
@@ -5139,7 +5121,7 @@ def insert_infinite_sphere(
 
         Returns
         -------
-        :class:`ansys.aedt.core.modules.boundary.FarFieldSetup`
+        :class:`ansys.aedt.core.modules.hfss_boundary.FarFieldSetup`
         """
         if not self.oradfield:
             self.logger.error("Radiation Field not available in this solution.")
@@ -5231,7 +5213,7 @@ def insert_near_field_sphere(
 
         Returns
         -------
-        :class:`ansys.aedt.core.modules.boundary.NearFieldSetup`
+        :class:`ansys.aedt.core.modules.hfss_boundary.NearFieldSetup`
         """
         if not self.oradfield:
             self.logger.error("Radiation Field not available in this solution.")
@@ -5308,7 +5290,7 @@ def insert_near_field_box(
 
         Returns
         -------
-        :class:`ansys.aedt.core.modules.boundary.NearFieldSetup`
+        :class:`ansys.aedt.core.modules.hfss_boundary.NearFieldSetup`
         """
         if not self.oradfield:
             self.logger.error("Radiation Field not available in this solution.")
@@ -5377,7 +5359,7 @@ def insert_near_field_rectangle(
 
         Returns
         -------
-        :class:`ansys.aedt.core.modules.boundary.NearFieldSetup`
+        :class:`ansys.aedt.core.modules.hfss_boundary.NearFieldSetup`
         """
         if not self.oradfield:
             self.logger.error("Radiation Field not available in this solution.")
@@ -5432,7 +5414,7 @@ def insert_near_field_line(
 
         Returns
         -------
-        :class:`ansys.aedt.core.modules.boundary.NearFieldSetup`
+        :class:`ansys.aedt.core.modules.hfss_boundary.NearFieldSetup`
         """
         if not self.oradfield:
             self.logger.error("Radiation Field not available in this solution.")