If object name matches existing property/method of class, rename it (#459)

Author: h-krishnan

src/ansys/fluent/core/services/settings.py

@@ -1,4 +1,5 @@
 """Wrapper to settings grpc service of Fluent."""
+import collections.abc
 from typing import Any, List
 
 import grpc
@@ -110,12 +111,14 @@ def _set_state_from_value(self, state, value):
             state.real = value
         elif isinstance(value, str):
             state.string = value
-        elif isinstance(value, list):
-            for v in value:
-                self._set_state_from_value(state.value_list.lst.add(), v)
-        elif isinstance(value, dict):
+        elif isinstance(value, collections.abc.Mapping):
             for k, v in value.items():
                 self._set_state_from_value(state.value_map.m[k], v)
+        elif isinstance(value, collections.abc.Iterable):
+            for v in value:
+                self._set_state_from_value(state.value_list.lst.add(), v)
+        else:  # fall back to string (e.g. pathlib.Path)
+            state.string = str(value)
 
     @_trace
     def _get_state_from_value(self, state):

src/ansys/fluent/core/solver/flobject.py

@@ -692,35 +692,44 @@ def get_cls(name, info, parent=None):
         cls = type(pname, (base,), dct)
 
         children = info.get("children")
+        taboo = set(dir(cls))
+        taboo |= set(
+            ["child_names", "command_names", "argument_names", "child_object_type"]
+        )
         if children:
+            taboo.add("child_names")
             cls.child_names = []
             for cname, cinfo in children.items():
                 ccls = get_cls(cname, cinfo, cls)
                 i = 0
                 ccls_name = ccls.__name__
-                while ccls_name in cls.child_names:
+                while ccls_name in taboo:
                     if i > 0:
                         ccls_name = ccls_name[: ccls_name.rfind("_")]
                     i += 1
                     ccls_name += f"_{str(i)}"
                 ccls.__name__ = ccls_name
                 # pylint: disable=no-member
                 cls.child_names.append(ccls.__name__)
+                taboo.add(ccls_name)
                 setattr(cls, ccls.__name__, ccls)
+
         commands = info.get("commands")
         if commands:
             cls.command_names = []
             for cname, cinfo in commands.items():
                 ccls = get_cls(cname, cinfo, cls)
+                i = 0
                 ccls_name = ccls.__name__
-                while ccls_name in cls.command_names:
+                while ccls_name in taboo:
                     if i > 0:
                         ccls_name = ccls_name[: ccls_name.rfind("_")]
                     i += 1
                     ccls_name += f"_{str(i)}"
                 ccls.__name__ = ccls_name
                 # pylint: disable=no-member
                 cls.command_names.append(ccls.__name__)
+                taboo.add(ccls_name)
                 setattr(cls, ccls.__name__, ccls)
 
         arguments = info.get("arguments")
@@ -732,20 +741,23 @@ def get_cls(name, info, parent=None):
             cls.argument_names = []
             for aname, ainfo in arguments.items():
                 ccls = get_cls(aname, ainfo, cls)
+                i = 0
                 th = ccls._state_type
                 th = th.__name__ if hasattr(th, "__name__") else str(th)
                 doc += f"    {ccls.__name__} : {th}\n"
                 doc += f"        {ccls.__doc__}\n"
                 ccls_name = ccls.__name__
-                while ccls_name in cls.argument_names:
+                while ccls_name in taboo:
                     if i > 0:
                         ccls_name = ccls_name[: ccls_name.rfind("_")]
                     i += 1
                     ccls_name += f"_{str(i)}"
                 ccls.__name__ = ccls_name
                 # pylint: disable=no-member
                 cls.argument_names.append(ccls.__name__)
+                taboo.add(ccls_name)
                 setattr(cls, ccls.__name__, ccls)
+
             cls.__doc__ = doc
         object_type = info.get("object-type")
         if object_type: