Merged PR 293415: fixes

fixes

Related work items: #295948

Author: cbellot000

ansys/dpf/core/collection.py

@@ -5,6 +5,8 @@
 
 """
 import numpy as np
+from typing import NamedTuple
+
 from ansys import dpf
 from ansys.grpc.dpf import collection_pb2, collection_pb2_grpc
 from ansys.dpf.core.core import base_pb2
@@ -197,6 +199,26 @@ def _get_entries(self, label_space_or_index):
         entries : list[Scoping], list[Field], list[MeshedRegion]
             Entries corresponding to the request.
         """
+        entries = self._get_entries_tuple(label_space_or_index)
+        if isinstance(entries, list):
+            return [entry.entry for entry in entries]
+        else:
+            return entries
+
+    def _get_entries_tuple(self, label_space_or_index):
+        """Retrieve the entries at a requested label space or index.
+
+        Parameters
+        ----------
+        label_space_or_index : dict[str,int]
+            Label space or index. For example,
+            ``{"time": 1, "complex": 0}`` or the index of the field.
+
+        Returns
+        -------
+        entries : list[_CollectionEntry]
+            Entries corresponding to the request.
+        """
         request = collection_pb2.EntryRequest()
         request.collection.CopyFrom(self._message)
 
@@ -209,21 +231,34 @@ def _get_entries(self, label_space_or_index):
         out = self._stub.GetEntries(request)
         list_out = []
         for obj in out.entries:
+            label_space = {}
+            if obj.HasField("label_space"):
+                for key in obj.label_space.label_space:
+                    label_space[key] = obj.label_space.label_space[key]
             if obj.HasField("dpf_type"):
                 if self._type == types.scoping:
                     unpacked_msg = scoping_pb2.Scoping()
                     obj.dpf_type.Unpack(unpacked_msg)
-                    list_out.append(Scoping(scoping=unpacked_msg, server=self._server))
+                    list_out.append(
+                        _CollectionEntry(
+                            label_space=label_space,
+                            entry=Scoping(scoping=unpacked_msg, server=self._server)))
                 elif self._type == types.field:
                     unpacked_msg = field_pb2.Field()
                     obj.dpf_type.Unpack(unpacked_msg)
-                    list_out.append(Field(field=unpacked_msg, server=self._server))
+                    list_out.append(
+                        _CollectionEntry(
+                            label_space=label_space,
+                            entry=Field(field=unpacked_msg, server=self._server)))
                 elif self._type == types.meshed_region:
                     unpacked_msg = meshed_region_pb2.MeshedRegion()
                     obj.dpf_type.Unpack(unpacked_msg)
                     list_out.append(
-                        MeshedRegion(mesh=unpacked_msg, server=self._server)
+                        _CollectionEntry(
+                            label_space=label_space,
+                            entry=MeshedRegion(mesh=unpacked_msg, server=self._server))
                     )
+
         if len(list_out) == 0:
             list_out = None
         return list_out
@@ -265,16 +300,8 @@ def get_label_space(self, index):
             Scoping of the requested entry. For example,
             ``{"time": 1, "complex": 0}``.
         """
-        request = collection_pb2.EntryRequest()
-        request.collection.CopyFrom(self._message)
-        request.index = index
-        out = self._stub.GetEntries(request).entries
-        out = out[0].label_space.label_space
-        dictOut = {}
-        for key in out:
-            dictOut[key] = out[key]
-
-        return dictOut
+        entries = self._get_entries_tuple(index)
+        return entries[0].label_space
 
     def get_available_ids_for_label(self, label="time"):
         """Retrieve the IDs assigned to an input label.
@@ -456,3 +483,7 @@ def __del__(self):
     def __iter__(self):
         for i in range(len(self)):
             yield self[i]
+
+class _CollectionEntry(NamedTuple):
+    label_space: dict
+    entry: object

ansys/dpf/core/field.py

@@ -499,7 +499,7 @@ def __add__(self, field_b):
 
     def __pow__(self, value):
         if value != 2:
-            raise ValueError('Only the value "2" is suppported.')
+            raise ValueError('Only the value "2" is supported.')
         from ansys.dpf.core import dpf_operator, operators
 
         if hasattr(operators, "math") and hasattr(operators.math, "sqr"):

ansys/dpf/core/time_freq_support.py

@@ -346,7 +346,6 @@ def __check_if_field_id(self, field):
         else:
             return field.id.id != 0
 
-    @protect_grpc
     def _get_frequencies(self, cplx=False):
         """Retrieves a field of all the frequencies in the model
         (complex or real).
@@ -361,17 +360,13 @@ def _get_frequencies(self, cplx=False):
         field : dpf.core.Field
             Field of all the frequencies in the model (complex or real).
         """
-        request = time_freq_support_pb2.ListRequest()
-        request.time_freq_support.CopyFrom(self._message)
 
-        list_response = self._stub.List(request)
-        if cplx is True and self.__check_if_field_id(list_response.freq_complex):
-            return dpf.core.Field(server=self._server, field=list_response.freq_complex)
-        elif cplx is False and self.__check_if_field_id(list_response.freq_real):
-            return dpf.core.Field(server=self._server, field=list_response.freq_real)
-        return None
+        attributes_list = self._get_attributes_list()
+        if cplx and "freq_complex" in attributes_list:
+            return attributes_list["freq_complex"]
+        elif cplx!=True and "freq_real" in attributes_list:
+            return attributes_list["freq_real"]
 
-    @protect_grpc
     def _get_rpms(self):
         """Retrieves a field of all the RPMs in the model.
 
@@ -380,15 +375,10 @@ def _get_rpms(self):
         field : dpf.core.Field
             Field of all the RPMs in the model (complex or real).
         """
-        request = time_freq_support_pb2.ListRequest()
-        request.time_freq_support.CopyFrom(self._message)
+        attributes_list = self._get_attributes_list()
+        if "rpm" in attributes_list:
+            return attributes_list["rpm"]
 
-        list_response = self._stub.List(request)
-        if self.__check_if_field_id(list_response.rpm):
-            return dpf.core.Field(server=self._server, field=list_response.rpm)
-        return None
-
-    @protect_grpc
     def _get_harmonic_indices(self, stage_num=0):
         """Retrieves a field of all the harmonic indices in the model.
 
@@ -400,16 +390,34 @@ def _get_harmonic_indices(self, stage_num=0):
         stage_num: int, optional, default = 0
             Targeted stage number.
         """
+        attributes_list = self._get_attributes_list(stage_num)
+        if "cyc_harmonic_index" in attributes_list:
+            return attributes_list["cyc_harmonic_index"]
+
+    @protect_grpc
+    def _get_attributes_list(self, stage_num=None):
         request = time_freq_support_pb2.ListRequest()
         request.time_freq_support.CopyFrom(self._message)
-        request.cyclic_stage_num = stage_num
-
+        if stage_num:
+            request.cyclic_stage_num = stage_num
         list_response = self._stub.List(request)
-        if self.__check_if_field_id(list_response.cyc_harmonic_index):
-            return dpf.core.Field(
-                server=self._server, field=list_response.cyc_harmonic_index
-            )
-        return None
+        out = {}
+        if list_response.HasField("freq_real"):
+            out["freq_real"] = dpf.core.Field(
+                server=self._server, field=list_response.freq_real)
+        if list_response.HasField("freq_complex"):
+            out["freq_complex"] = dpf.core.Field(
+                server=self._server, field=list_response.freq_complex)
+        if list_response.HasField("rpm"):
+            out["rpm"] = dpf.core.Field(
+                server=self._server, field=list_response.rpm)
+        if list_response.HasField("cyc_harmonic_index"):
+            out["cyc_harmonic_index"] = dpf.core.Field(
+                server=self._server, field=list_response.cyc_harmonic_index)
+        if list_response.HasField("cyclic_harmonic_index_scoping"):
+            out["cyclic_harmonic_index_scoping"] = dpf.core.Scoping(
+                server=self._server, scoping=list_response.cyclic_harmonic_index_scoping)
+        return out
 
     def append_step(
             self,