Datamodel attr caching

ansys · Apr 5, 2023 · e4c498d · e4c498d
1 parent 0645893
commit e4c498d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/ansys/fluent/core/__init__.py b/src/ansys/fluent/core/__init__.py
@@ -78,5 +78,11 @@ def version_info() -> str:
 
 pydoc.text.docother = fldoc.docother.__get__(pydoc.text, pydoc.TextDoc)
 
+# Whether to use datamodel state caching
 DATAMODEL_USE_STATE_CACHE = True
+
+# Whether to use datamodel attribute caching
 DATAMODEL_USE_ATTR_CACHE = True
+
+# Whether stream and cache commands state
+DATAMODEL_USE_NOCOMMANDS_DIFF_STATE = True
diff --git a/src/ansys/fluent/core/services/datamodel_se.py b/src/ansys/fluent/core/services/datamodel_se.py
@@ -345,7 +345,6 @@ def __init__(self, service: DatamodelService, rules: str, path: Path = None):
         else:
             self.path = path
         self.cached_attrs = {}
-        self.event_subscriptions = []
 
     docstring = None
 
@@ -390,11 +389,9 @@ def _get_cached_attr(self, attrib: str) -> Any:
         if cached_val is None:
             cached_val = self._get_remote_attr(attrib)
             self.cached_attrs[attrib] = cached_val
-            self.event_subscriptions.append(
-                self.add_on_attribute_changed(
-                    attrib,
-                    functools.partial(dict.__setitem__, self.cached_attrs, attrib),
-                )
+            self.add_on_attribute_changed(
+                attrib,
+                functools.partial(dict.__setitem__, self.cached_attrs, attrib),
             )
         return cached_val
 
@@ -411,7 +408,9 @@ def get_attr(self, attrib: str) -> Any:
         Any
             Value of the attribute.
         """
-        if pyfluent.DATAMODEL_USE_ATTR_CACHE:
+        if pyfluent.DATAMODEL_USE_ATTR_CACHE and hasattr(
+            DataModelProtoModule, "SubscribeEventsRequest"
+        ):
             return self._get_cached_attr(attrib)
         return self._get_remote_attr(attrib)
 

diff --git a/src/ansys/fluent/core/session_pure_meshing.py b/src/ansys/fluent/core/session_pure_meshing.py
@@ -40,9 +40,8 @@ def __init__(self, fluent_connection: FluentConnection):
             for rules in self.__class__.rules:
                 request = datamodel_se_pb2.DataModelRequest()
                 request.rules = rules
-                request.diffstate = (
-                    datamodel_se_pb2.DIFFSTATE_NOCOMMANDS
-                )  # DIFFSTATE_FULL?
+                if pyfluent.DATAMODEL_USE_NOCOMMANDS_DIFF_STATE:
+                    request.diffstate = datamodel_se_pb2.DIFFSTATE_NOCOMMANDS
                 streaming = StreamingService(
                     stub=datamodel_service_se._stub,
                     request=request,