refactor: Make version method private

src/ansys/fluent/core/session.py

@@ -47,7 +47,7 @@ def _parse_server_info_file(file_name: str):
 def _get_datamodel_attributes(session, attribute: str):
     try:
         preferences_module = importlib.import_module(
-            f"ansys.fluent.core.datamodel_{session.version}." + attribute
+            f"ansys.fluent.core.datamodel_{session._version}." + attribute
         )
         return preferences_module.Root(session._se_service, attribute, [])
     except ImportError:

src/ansys/fluent/core/session_base_meshing.py

@@ -43,19 +43,19 @@ def __init__(
         self._pm_file_management = None
         self._preferences = None
         self._session_execute_tui = session_execute_tui
-        self._version = None
+        self._product_version = None
 
     def get_fluent_version(self):
         """Gets and returns the fluent version."""
         pyfluent_logger.debug("Fluent version = " + str(self._fluent_version))
         return self._fluent_version
 
     @property
-    def version(self):
+    def _version(self):
         """Fluent's product version."""
-        if self._version is None:
-            self._version = get_version_for_file_name(session=self)
-        return self._version
+        if self._product_version is None:
+            self._product_version = get_version_for_file_name(session=self)
+        return self._product_version
 
     @property
     def tui(self):
@@ -64,7 +64,7 @@ def tui(self):
         if self._tui is None:
             try:
                 tui_module = importlib.import_module(
-                    f"ansys.fluent.core.meshing.tui_{self.version}"
+                    f"ansys.fluent.core.meshing.tui_{self._version}"
                 )
                 self._tui = tui_module.main_menu(
                     self._tui_service, self._version, "meshing", []
@@ -79,7 +79,7 @@ def _meshing_root(self):
         """Datamodel root of meshing."""
         try:
             meshing_module = importlib.import_module(
-                f"ansys.fluent.core.datamodel_{self.version}.meshing"
+                f"ansys.fluent.core.datamodel_{self._version}.meshing"
             )
             meshing_root = meshing_module.Root(self._se_service, "meshing", [])
         except ImportError:
@@ -99,7 +99,7 @@ def _meshing_utilities_root(self):
         try:
             if self.get_fluent_version() >= "24.2.0":
                 meshing_utilities_module = importlib.import_module(
-                    f"ansys.fluent.core.datamodel_{self.version}.MeshingUtilities"
+                    f"ansys.fluent.core.datamodel_{self._version}.MeshingUtilities"
                 )
                 meshing_utilities_root = meshing_utilities_module.Root(
                     self._se_service, "MeshingUtilities", []
@@ -123,7 +123,7 @@ def _workflow_se(self):
         """Datamodel root of workflow."""
         try:
             workflow_module = importlib.import_module(
-                f"ansys.fluent.core.datamodel_{self.version}.workflow"
+                f"ansys.fluent.core.datamodel_{self._version}.workflow"
             )
             workflow_se = workflow_module.Root(self._se_service, "workflow", [])
         except ImportError:
@@ -149,7 +149,7 @@ def PartManagement(self):
         if self._part_management is None:
             try:
                 pm_module = importlib.import_module(
-                    f"ansys.fluent.core.datamodel_{self.version}.PartManagement"
+                    f"ansys.fluent.core.datamodel_{self._version}.PartManagement"
                 )
                 self._part_management = pm_module.Root(
                     self._se_service, "PartManagement", []
@@ -167,7 +167,7 @@ def PMFileManagement(self):
         if self._pm_file_management is None:
             try:
                 pmfm_module = importlib.import_module(
-                    f"ansys.fluent.core.datamodel_{self.version}.PMFileManagement"
+                    f"ansys.fluent.core.datamodel_{self._version}.PMFileManagement"
                 )
                 self._pm_file_management = pmfm_module.Root(
                     self._se_service, "PMFileManagement", []

src/ansys/fluent/core/session_solver.py

@@ -93,7 +93,7 @@ def _build_from_fluent_connection(self, fluent_connection):
         self._workflow = None
         self._system_coupling = None
         self._settings_root = None
-        self._version = None
+        self._fluent_version = None
         self._lck = threading.Lock()
         self.svar_service = service_creator("svar").create(
             fluent_connection._channel, fluent_connection._metadata
@@ -102,7 +102,7 @@ def _build_from_fluent_connection(self, fluent_connection):
         self._reduction_service = self.fluent_connection.create_grpc_service(
             ReductionService, self.error_state
         )
-        if FluentVersion(self.version) >= FluentVersion.v241:
+        if FluentVersion(self._version) >= FluentVersion.v241:
             self.reduction = service_creator("reduction").create(
                 self._reduction_service, self
             )
@@ -121,11 +121,11 @@ def svar_data(self) -> SVARData:
         return service_creator("svar_data").create(self.svar_service, self.svar_info)
 
     @property
-    def version(self):
+    def _version(self):
         """Fluent's product version."""
-        if self._version is None:
-            self._version = get_version_for_file_name(session=self)
-        return self._version
+        if self._fluent_version is None:
+            self._fluent_version = get_version_for_file_name(session=self)
+        return self._fluent_version
 
     @property
     def tui(self):
@@ -134,7 +134,7 @@ def tui(self):
         if self._tui is None:
             try:
                 tui_module = importlib.import_module(
-                    f"ansys.fluent.core.solver.tui_{self.version}"
+                    f"ansys.fluent.core.solver.tui_{self._version}"
                 )
                 self._tui = tui_module.main_menu(
                     self._tui_service, self._version, "solver", []
@@ -149,7 +149,7 @@ def _workflow_se(self):
         """Datamodel root for workflow."""
         try:
             workflow_module = importlib.import_module(
-                f"ansys.fluent.core.datamodel_{self.version}.workflow"
+                f"ansys.fluent.core.datamodel_{self._version}.workflow"
             )
             workflow_se = workflow_module.Root(self._se_service, "workflow", [])
         except ImportError:
@@ -169,7 +169,7 @@ def _root(self):
         """Root settings object."""
         if self._settings_root is None:
             self._settings_root = flobject.get_root(
-                flproxy=self._settings_service, version=self.version
+                flproxy=self._settings_service, version=self._version
             )
         return self._settings_root
 

src/ansys/fluent/core/session_solver_icing.py

@@ -31,7 +31,7 @@ def __init__(
             fluent_connection=fluent_connection, remote_file_handler=remote_file_handler
         )
         self._flserver_root = None
-        self._version = None
+        self._fluent_version = None
         self._fluent_connection = fluent_connection
 
     @property
@@ -40,7 +40,7 @@ def _flserver(self):
         if self._flserver_root is None:
             se = self.datamodel_service_se
             dm_module = importlib.import_module(
-                f"ansys.fluent.core.datamodel_{self.version}.flicing"
+                f"ansys.fluent.core.datamodel_{self._version}.flicing"
             )
             self._flserver_root = dm_module.Root(se, "flserver", [])
         return self._flserver_root

tests/test_reduction.py

@@ -228,7 +228,7 @@ def _test_area_integrated_average(solver1, solver2):
 
 
 def _test_error_handling(solver):
-    if int(solver.version) < 241:
+    if int(solver._version) < 241:
         with pytest.raises(RuntimeError) as msg:
             solver.reduction.area_average(
                 expression="AbsoluteVelocity",  # This is a wrong expression intentionally passed

tests/test_search.py

@@ -60,7 +60,7 @@ def test_get_version_path_prefix_from_obj(
 ):
     meshing = new_watertight_workflow_session
     solver = new_solver_session
-    version = solver.version
+    version = solver._version
     assert _get_version_path_prefix_from_obj(meshing) == (
         version,
         ["<meshing_session>"],

tests/test_session.py

@@ -394,7 +394,7 @@ def test_recover_grpc_error_from_connection_error():
 def test_solver_methods(new_solver_session):
     solver = new_solver_session
 
-    if int(solver.version) == 222:
+    if int(solver._version) == 222:
         api_keys = {
             "file",
             "setup",
@@ -404,7 +404,7 @@ def test_solver_methods(new_solver_session):
             "current_parametric_study",
         }
         assert api_keys.issubset(set(dir(solver)))
-    if int(solver.version) == 232:
+    if int(solver._version) == 232:
         api_keys = {
             "file",
             "mesh",
@@ -418,7 +418,7 @@ def test_solver_methods(new_solver_session):
             "report",
         }
         assert api_keys.issubset(set(dir(solver)))
-    if int(solver.version) >= 241:
+    if int(solver._version) >= 241:
         api_keys = {
             "file",
             "mesh",