Make model more permissive (#132)

Author: cbellot000

ansys/dpf/core/core.py

@@ -15,6 +15,7 @@
 from ansys.dpf.core import server as serverlib
 from ansys.dpf.core import misc
 from ansys.dpf.core.common import _common_progress_bar
+from ansys.dpf.core.cache import class_handling_cache
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel("DEBUG")
@@ -262,6 +263,7 @@ def _description(dpf_entity_message, server=None):
     return BaseService(server, load_operators=False)._description(dpf_entity_message)
 
 
+@class_handling_cache
 class BaseService:
     """The Base Service class allows to make generic requests to dpf's server.
     For example, information about the server can be requested,
@@ -401,6 +403,9 @@ def server_info(self):
             dictionary with "server_ip", "server_port", "server_process_id"
             "server_version" keys
         """
+        return self._get_server_info()
+
+    def _get_server_info(self):
         request = base_pb2.ServerInfoRequest()
         try:
             response = self._stub.GetServerInfo(request)
@@ -736,3 +741,7 @@ def __file_chunk_yielder(self, file_path, to_server_file_path, use_tmp_dir=False
                 bar.finish()
             except:
                 pass
+
+    _to_cache = {
+        _get_server_info: None
+    }

ansys/dpf/core/errors.py

@@ -116,3 +116,25 @@ def wrapper(*args, **kwargs):
         return out
 
     return wrapper
+
+
+def protect_source_op_not_found(func):
+    """Capture gRPC server exceptions when a source operator is not found
+    and return a more succinct error message.
+    """
+
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        """Capture gRPC exceptions."""
+        # Capture gRPC exceptions
+        try:
+            out = func(*args, **kwargs)
+        except DPFServerException as error:
+            details = str(error)
+            if "source operator not found" in details:
+                return None
+            raise DPFServerException(details)
+
+        return out
+
+    return wrapper

ansys/dpf/core/model.py

@@ -15,6 +15,7 @@
 from ansys.dpf.core.results import Results, CommonResults
 from ansys.dpf.core.server import LOG
 from ansys.dpf.core import misc
+from ansys.dpf.core.errors import protect_source_op_not_found
 from grpc._channel import _InactiveRpcError
 
 
@@ -267,6 +268,7 @@ def _cache_streams_provider(self):
             self._stream_provider.inputs.connect(self._data_sources)
 
     @property
+    @protect_source_op_not_found
     def time_freq_support(self):
         """Time frequency support.
 
@@ -384,6 +386,7 @@ def _load_result_info(self):
         return result_info
 
     @property
+    @protect_source_op_not_found
     def meshed_region(self):
         """Meshed region instance.
 
@@ -425,6 +428,7 @@ def mesh_provider(self):
         return mesh_provider
 
     @property
+    @protect_source_op_not_found
     def result_info(self):
         """Result Info instance.
 

ansys/dpf/core/server.py

@@ -339,14 +339,15 @@ def __init__(
         self._input_ip = ip
         self._input_port = port
         self._own_process = launch_server
+        self._base_service_instance = None
 
     @property
     def _base_service(self):
-        if not hasattr(self, "__base_service"):
+        if not self._base_service_instance:
             from ansys.dpf.core.core import BaseService
 
-            self.__base_service = BaseService(self, timeout=1)
-        return self.__base_service
+            self._base_service_instance = BaseService(self, timeout=1)
+        return self._base_service_instance
 
     @property
     def info(self):

tests/test_cache.py

@@ -53,4 +53,12 @@ def test_physics_type_cache(simple_bar):
     res_info.unit_system
     assert len(res_info._cache.cached) == 1
     res_info.physics_type
-    assert len(res_info._cache.cached) == 1
+    assert len(res_info._cache.cached) == 1
+
+
+def test_server_info_cache():
+    if not dpf.SERVER:
+        dpf.start_local_server()
+    dpf.SERVER.info
+    identifier = dpf.cache.MethodIdentifier("_get_server_info", (), {})
+    assert identifier in dpf.SERVER._base_service._cache.cached