Merge pull request #9 from pyansys/fix/info_on_empty

use message from fc

Author: akaszynski

.ci/azure-pipelines.yml

@@ -65,25 +65,28 @@ jobs:
         feedsToUse: 'internal'
         vstsFeed: '705e121a-9631-49f5-8aaf-c7142856f923'
         vstsFeedPackage: 'f913c1d3-1fe4-404c-8c28-15a234e56803'
-        vstsPackageVersion: '21.1.3'
+        vstsPackageVersion: '21.1.4'
 
     - script: |
         @echo on
         dir $(System.DefaultWorkingDirectory)
         set THISDIR=$(System.DefaultWorkingDirectory)
         set PATH=%THISDIR%\server\v211\tp\IntelMKL\2020.0.166\winx64\;%THISDIR%\server\v211\tp\hdf5\1.8.14\winx64\;%THISDIR%\server\v211\tp\CFFSDK\lib\winx64;%THISDIR%\res_files\;%PATH%
         cd %THISDIR%\server\v211\aisol\bin\winx64
-        START /B Ans.Dpf.Grpc.exe --address 127.0.0.1 --port %DPF_PORT%
+        START /B Ans.Dpf.Grpc.exe --address 127.0.0.1 --port %DPF_PORT% > log.txt 2>&1
         python -c "from ansys.dpf import core; core.connect_to_server(port=$(DPF_PORT)); print('Python Connected')"
       displayName: Start DPF Server
 
     - script: |
         pip install -r requirements_test.txt
         cd tests
-        pytest -v --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml --ignore=test_field.py
-        pytest -v test_field.py
+        pytest -v --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml
       displayName: Test Core API
 
+    - script: |
+        type $(System.DefaultWorkingDirectory)\server\v211\aisol\bin\winx64\log.txt
+      displayName:  'Show DPF Server Logs'
+      condition: always()
 
 - job: Linux
   variables:

ansys/dpf/core/collection.py

@@ -7,6 +7,8 @@
 from ansys.dpf.core.scoping import Scoping, scoping_pb2
 from ansys.dpf.core.field import Field, field_pb2
 from ansys.dpf.core.time_freq_support import TimeFreqSupport
+from ansys.dpf.core.errors import protect_grpc
+
 
 class Collection:
     """A class used to represent a Collection which contains
@@ -18,19 +20,19 @@ class Collection:
         Create a collection from a Collection message.
 
     channel : channel, optional
-        Channel connected to the remote or local instance. Defaults to the global channel.
+        Channel connected to the remote or local instance. When
+        ``None``, attempts to use the the global channel.
 
     """
 
-    def __init__(self,dpf_type, collection=None, channel=None):
-        
+    def __init__(self, dpf_type, collection=None, channel=None):
         if channel is None:
             channel = dpf.core._global_channel()
 
         self._channel = channel
         self._stub = self._connect()
         self._type = dpf_type
-        
+
         if collection is None:
             request = collection_pb2.CollectionRequest()
             if hasattr(dpf_type, 'name'):
@@ -39,6 +41,8 @@ def __init__(self,dpf_type, collection=None, channel=None):
                 stype = dpf_type
             request.type = base_pb2.Type.Value(stype.upper())
             self._message = self._stub.Create(request)
+        elif hasattr(collection, '_message'):
+            self._message = collection._message
         else:
             self._message = collection
 
@@ -52,14 +56,14 @@ def set_labels(self, labels):
                 ['time','complex']
 
         """
-        if len(self.__info__()['labels'])!=0:
-            print("the collection has already labels :",self.__info__()['labels'],'deleting existing abels is  not implemented yet')
+        if len(self._info['labels'])!=0:
+            print("the collection has already labels :",self._info['labels'],'deleting existing abels is  not implemented yet')
             return
         request = collection_pb2.UpdateLabelsRequest()
         request.collection.CopyFrom(self._message)
         request.labels.labels.extend(labels)
         self._stub.UpdateLabels(request)
-        
+
     def add_label(self, label):
         """add the requested label to scope the collection
 
@@ -70,12 +74,11 @@ def add_label(self, label):
                 'time'
 
         """
-       
         request = collection_pb2.UpdateLabelsRequest()
         request.collection.CopyFrom(self._message)
         request.labels.labels.extend([label])
         self._stub.UpdateLabels(request)
-    
+
     def _get_labels(self):
         """get the labels scoping the collection
 
@@ -86,10 +89,10 @@ def _get_labels(self):
                 ['time','complex']
 
         """
-        return self.__info__()['labels']
-    
+        return self._info['labels']
+
     labels = property(_get_labels, set_labels, "labels")
-    
+
     def _get_entries(self, label_space_or_index):
         """Returns the entry at a requested index or label space
 
@@ -162,10 +165,11 @@ def get_label_space(self, index):
             dictOut[key]=out[key]
 
         return dictOut
-        
+
     def get_ids(self, label="time"):
-        
-        """
+        """Get the IDs corresponding to the input label.
+
+
         Parameters
         ----------
         label : str
@@ -176,13 +180,13 @@ def get_ids(self, label="time"):
         ids : list of int
             ids corresponding to the input label
         """
-        ids =[]
-        for i in range(0,self.__len__()):
-            current_scop =self.get_label_space(i)
-            if label in current_scop and current_scop[label] not in ids: 
+        ids = []
+        for i in range(len(self)):
+            current_scop = self.get_label_space(i)
+            if label in current_scop and current_scop[label] not in ids:
                 ids.append(current_scop[label])
         return ids
-    
+
     def __getitem__(self, key):
         """Returns the entry at a requested index
 
@@ -222,7 +226,7 @@ def _add_entry(self, label_space, entry):
         for key in label_space:
             request.label_space.label_space[key] = label_space[key]
         self._stub.UpdateEntry(request)
-        
+
     def _get_time_freq_support(self):
         """
         Returns
@@ -235,19 +239,20 @@ def _get_time_freq_support(self):
         message = self._stub.GetSupport(request)
         return TimeFreqSupport(time_freq_support=message)
 
-
     def _connect(self):
         """Connect to the grpc service"""
         return collection_pb2_grpc.CollectionServiceStub(self._channel)
 
-    def __info__(self):
-        list = self._stub.List(self._message)
-        out = {"len":list.count_entries, "labels":list.labels.labels}
-        return out
-    
+    @property
+    @protect_grpc
+    def _info(self):
+        """Length and labels of this container"""
+        list_stub = self._stub.List(self._message)
+        return {"len": list_stub.count_entries, "labels": list_stub.labels.labels}
+
     def __len__(self):
         """Return number of entries"""
-        return self.__info__()["len"]
+        return self._info["len"]
 
     def __del__(self):
         try:
@@ -258,7 +263,3 @@ def __del__(self):
     def __iter__(self):
         for i in range(len(self)):
             yield self[i]
-
-    
-# -*- coding: utf-8 -*-
-

ansys/dpf/core/common.py

@@ -6,26 +6,32 @@
 
 from ansys.grpc.dpf import base_pb2 as base_pb2
 
+
 def camel_to_snake_case(name):
     return re.sub(r'(?<!^)(?=[A-Z])', '_', name).lower()
 
+
 def remove_spaces(name):
     out = name.lower()
-    out = out.replace(" ", "_") 
-    out = out.replace("-", "_") 
+    out = out.replace(" ", "_")
+    out = out.replace("-", "_")
     return out
 
+
 def snake_to_camel_case(name):
     return ''.join(word.title() for word in name.split('_'))
 
+
 class smart_dict_camel(dict):
     def __missing__(self, key):
         return camel_to_snake_case(key)
-    
+
+
 class smart_dict_unit_system(dict):
     def __missing__(self, key):
         return 'unknown'
 
+
 names = [m.lower() for m in base_pb2.Type.keys()]
 names.append("fields_container")
 types = Enum('types', names)
@@ -49,10 +55,10 @@ class locations:
 
     # one per time step
     time_freq = "TimeFreq_sets"
-    
+
     #applies everywhere
-    overall="overall"
-            
+    overall = "overall"
+
 
 
 def field_from_array(arr):
@@ -92,17 +98,8 @@ def field_from_array(arr):
     else:
         raise shp_err
 
-    # TODO: speedup, very inefficient
-    nentities = arr.shape[0]
-    ids=[]
-    field = Field(nentities=nentities, nature=nature)
+    n_entities = arr.shape[0]
+    field = Field(nentities=n_entities, nature=nature)
     field.data = arr
-        
-    for i in range(nentities):
-        ids.append(i+1)
-    
-    field.scoping.ids =ids
-
+    field.scoping.ids = np.arange(1, n_entities + 1)
     return field
-
-

ansys/dpf/core/errors.py

@@ -1,11 +1,18 @@
 from grpc._channel import _InactiveRpcError, _MultiThreadedRendezvous
 
 
-class DPFServerError(RuntimeError):
+class DPFServerException(Exception):
     """Raised when the DPF Server has encountered an error"""
 
     def __init__(self, msg=''):
-        RuntimeError.__init__(self, msg)
+        Exception.__init__(self, msg)
+
+
+class DPFServerNullObject(Exception):
+    """Raised when the DPF Server has encountered an error"""
+
+    def __init__(self, msg=''):
+        Exception.__init__(self, msg)
 
 
 class InvalidPortError(OSError):
@@ -25,7 +32,10 @@ def wrapper(*args, **kwargs):
         try:
             out = func(*args, **kwargs)
         except (_InactiveRpcError, _MultiThreadedRendezvous) as error:
-            raise DPFServerError(error.details()) from None
+            details = error.details()
+            if 'object is null in the dataBase' in details:
+                raise DPFServerNullObject(details) from None
+            raise DPFServerException(details) from None
 
         return out
 

ansys/dpf/core/fields_container.py

@@ -3,6 +3,7 @@
 from ansys.dpf.core.collection import Collection
 from ansys.dpf.core.common import types
 
+
 class FieldsContainer(Collection):
     """A class used to represent a FieldsContainer which contains
     fields belonging to an analysis.
@@ -11,28 +12,29 @@ class FieldsContainer(Collection):
     ----------
     fields_container : ansys.grpc.dpf.fields_container_pb2.FieldsContainer, optional
         Create a fields container from a FieldsContainer message.
-        
+
     channel : channel, optional
-        Channel connected to the remote or local instance. Defaults to the global channel.
-       
+        Channel connected to the remote or local instance. When
+        ``None``, attempts to use the the global channel.
+
     """
 
     def __init__(self, fields_container=None, channel=None):
         """Intialize the scoping with either optional scoping message,
         or by connecting to a stub.
         """
         if channel is None:
-            channel = dpf.core._global_channel()   
-        self._channel=channel
+            channel = dpf.core._global_channel()
+        self._channel = channel
         self._stub = self._connect()
-        
-        
+
         self._component_index = None  # component index
         self._component_info = None  # for norm/max/min
-        
-        Collection.__init__(self,types.field, collection=fields_container, channel= channel)
-        
-    def get_fields_by_time_complex_ids(self,timeid=None, complexid=None):
+
+        Collection.__init__(self, types.field,
+                            collection=fields_container, channel=channel)
+
+    def get_fields_by_time_complex_ids(self, timeid=None, complexid=None):
         """Returns the fields at a requested index or scoping
 
         Parameters

tests/test_field.py

@@ -4,10 +4,10 @@
 
 from ansys import dpf
 
-# true when running on Azure Virtual enviornment on windows
-ON_AZURE = False
-if os.name == 'nt':
-    ON_AZURE = os.environ.get('ON_AZURE', '').lower() == 'true'
+# # true when running on Azure Virtual enviornment on windows
+# ON_WINDOWS_AZURE = False
+# if os.name == 'nt':
+#     ON_WINDOWS_AZURE = os.environ.get('ON_AZURE', '').lower() == 'true'
 
 
 def test_create_field():
@@ -172,11 +172,11 @@ def test_resize_field():
     assert field.elementary_data_count == 20
     assert field.size == 20
 
-   
+
 def test_fromarray_field():
-    data = np.empty((100,6))
+    data = np.empty((100, 6))
     f = dpf.core.field_from_array(data)
-    assert f.shape ==(100,6)
+    assert f.shape == (100, 6)
 
 
 def test_field_definition_field(allkindofcomplexity):
@@ -240,13 +240,9 @@ def test_mesh_support_field(allkindofcomplexity):
     assert len(mesh.elements.scoping) == 10292
 
 
-@pytest.mark.skip(ON_AZURE, reason='Seems to cause segfault on Azure')
+# @pytest.mark.skipif(ON_WINDOWS_AZURE, reason='Causes segfault on Azure')
 def test_delete_auto_field():
     field = dpf.core.Field()
     field2 = dpf.core.Field(field=field)
     del field
     assert field2.location == 'Nodal'
-
-
-if __name__ == '__main__':
-    test_create_field()