refactor: More restructuring (#2579)

* refactor: More Restructuring.

* Update stability checker.

* Update reduction tests.

* Introduce is_active check in stability.

* Fix test.

* Fix test.

* Update return.

* Revert stability check.

* Clean Up.

* Clean up.

* Clean up.

* Make fluent_connection private.

* Update tests.

Author: prmukherj

src/ansys/fluent/core/fluent_connection.py

@@ -120,13 +120,13 @@ class ErrorState:
     --------
     >>> import ansys.fluent.core as pyfluent
     >>> session = pyfluent.launch_fluent()
-    >>> session.fluent_connection._error_state.set("test", "test details")
-    >>> session.fluent_connection._error_state.name
+    >>> session._fluent_connection._error_state.set("test", "test details")
+    >>> session._fluent_connection._error_state.name
     'test'
-    >>> session.fluent_connection._error_state.details
+    >>> session._fluent_connection._error_state.details
     'test details'
-    >>> session.fluent_connection._error_state.clear()
-    >>> session.fluent_connection._error_state.name
+    >>> session._fluent_connection._error_state.clear()
+    >>> session._fluent_connection._error_state.name
     ''
     """
 

src/ansys/fluent/core/launcher/standalone_launcher.py

@@ -272,7 +272,7 @@ def __call__(self):
                 inside_container=False,
             )
             start_watchdog = _confirm_watchdog_start(
-                self.start_watchdog, self.cleanup_on_exit, session.fluent_connection
+                self.start_watchdog, self.cleanup_on_exit, session._fluent_connection
             )
             if start_watchdog:
                 logger.info("Launching Watchdog for local Fluent client...")

src/ansys/fluent/core/session.py

@@ -110,10 +110,10 @@ def build_from_fluent_connection(
         file_transfer_service: Optional[Any] = None,
     ):
         """Build a BaseSession object from fluent_connection object."""
-        self.fluent_connection = fluent_connection
+        self._fluent_connection = fluent_connection
         self._file_transfer_service = file_transfer_service
-        self._error_state = self.fluent_connection._error_state
-        self.scheme_eval = self.fluent_connection.scheme_eval
+        self._error_state = fluent_connection._error_state
+        self.scheme_eval = fluent_connection.scheme_eval
         self.rp_vars = RPVars(self.scheme_eval.string_eval)
         self._preferences = None
         self.journal = Journal(self.scheme_eval)
@@ -149,14 +149,14 @@ def build_from_fluent_connection(
             fluent_connection._channel, fluent_connection._metadata
         )
         self.events_manager = EventsManager(
-            self._events_service, self._error_state, self.fluent_connection._id
+            self._events_service, self._error_state, fluent_connection._id
         )
 
         self._monitors_service = service_creator("monitors").create(
             fluent_connection._channel, fluent_connection._metadata, self._error_state
         )
         self.monitors_manager = MonitorsManager(
-            self.fluent_connection._id, self._monitors_service
+            fluent_connection._id, self._monitors_service
         )
 
         self.events_manager.register_callback(
@@ -168,7 +168,7 @@ def build_from_fluent_connection(
 
         self.events_manager.start()
 
-        self._field_data_service = self.fluent_connection.create_grpc_service(
+        self._field_data_service = self._fluent_connection.create_grpc_service(
             FieldDataService, self._error_state
         )
 
@@ -187,7 +187,7 @@ def __init__(self, _session):
                     _session.scheme_eval,
                 )
                 self.field_data_streaming = FieldDataStreaming(
-                    _session.fluent_connection._id, _session._field_data_service
+                    _session._fluent_connection._id, _session._field_data_service
                 )
 
         self.fields = Fields(self)
@@ -202,7 +202,7 @@ def __init__(self, _session):
         self.health_check_service = fluent_connection.health_check_service
         self.connection_properties = fluent_connection.connection_properties
 
-        self.fluent_connection.register_finalizer_cb(
+        self._fluent_connection.register_finalizer_cb(
             self.datamodel_service_se.unsubscribe_all_events
         )
         for obj in (
@@ -211,7 +211,7 @@ def __init__(self, _session):
             self.events_manager,
             self.monitors_manager,
         ):
-            self.fluent_connection.register_finalizer_cb(obj.stop)
+            self._fluent_connection.register_finalizer_cb(obj.stop)
 
     @property
     def field_info(self):
@@ -243,7 +243,7 @@ def field_data_streaming(self):
     @property
     def id(self) -> str:
         """Return the session ID."""
-        return self.fluent_connection._id
+        return self._fluent_connection._id
 
     def start_journal(self, file_name: str):
         """Executes tui command to start journal."""
@@ -301,12 +301,12 @@ def get_fluent_version(self) -> FluentVersion:
     def exit(self, **kwargs) -> None:
         """Exit session."""
         logger.debug("session.exit() called")
-        self.fluent_connection.exit(**kwargs)
+        self._fluent_connection.exit(**kwargs)
 
     def force_exit(self) -> None:
         """Immediately terminates the Fluent session, losing unsaved progress and
         data."""
-        self.fluent_connection.force_exit()
+        self._fluent_connection.force_exit()
 
     def upload(self, file_name: str):
         """Upload a file to the server.

src/ansys/fluent/core/session_meshing.py

@@ -38,7 +38,7 @@ def __init__(
     def _switch_to_solver(self) -> Any:
         self.tui.switch_to_solution_mode("yes")
         solver_session = Solver(
-            fluent_connection=self.fluent_connection,
+            fluent_connection=self._fluent_connection,
             file_transfer_service=self._file_transfer_service,
         )
         delattr(self, "switch_to_solver")

src/ansys/fluent/core/session_pure_meshing.py

@@ -67,7 +67,7 @@ def __init__(
                     rules=_rules,
                     no_commands_diff_state=pyfluent.DATAMODEL_USE_NOCOMMANDS_DIFF_STATE,
                 )
-                self.fluent_connection.register_finalizer_cb(stream.stop)
+                self._fluent_connection.register_finalizer_cb(stream.stop)
 
     @property
     def tui(self):

src/ansys/fluent/core/session_solver.py

@@ -106,7 +106,7 @@ def _build_from_fluent_connection(self, fluent_connection):
         self.fields.solution_variable_info = SolutionVariableInfo(
             self._solution_variable_service
         )
-        self._reduction_service = self.fluent_connection.create_grpc_service(
+        self._reduction_service = self._fluent_connection.create_grpc_service(
             ReductionService, self._error_state
         )
         if FluentVersion(self._version) >= FluentVersion.v241:
@@ -208,7 +208,7 @@ def settings(self):
                 flproxy=self._settings_service,
                 version=self._version,
                 file_transfer_service=self._file_transfer_service,
-                scheme_eval=self.fluent_connection.scheme_eval.scheme_eval,
+                scheme_eval=self._fluent_connection.scheme_eval.scheme_eval,
             )
         return self._settings_root
 
@@ -233,7 +233,7 @@ def _sync_from_future(self, fut: Future):
             except Exception as ex:
                 raise RuntimeError("Unable to read mesh") from ex
             state = self.settings.get_state()
-            self.build_from_fluent_connection(fut_session.fluent_connection)
+            self.build_from_fluent_connection(fut_session._fluent_connection)
             # TODO temporary fix till set_state at settings root is fixed
             _set_state_safe(self.settings, state)
 
@@ -248,7 +248,7 @@ def read_case_lightweight(self, file_name: str):
         import ansys.fluent.core as pyfluent
 
         self.file.read(file_type="case", file_name=file_name, lightweight_setup=True)
-        launcher_args = dict(self.fluent_connection.launcher_args)
+        launcher_args = dict(self._fluent_connection.launcher_args)
         launcher_args.pop("lightweight_mode", None)
         launcher_args["case_file_name"] = file_name
         fut: Future = asynchronous(pyfluent.launch_fluent)(**launcher_args)

src/ansys/fluent/core/session_solver_lite.py

@@ -32,5 +32,5 @@ def __init__(
 
     def switch_to_full_solver(self):
         """A switch to move to the full-solver session from solver-lite."""
-        solver_session = Solver(fluent_connection=self.fluent_connection)
+        solver_session = Solver(fluent_connection=self._fluent_connection)
         return solver_session

src/ansys/fluent/core/systemcoupling.py

@@ -90,7 +90,7 @@ def get_scp_string() -> str:
             )
 
             # download the file locally in case Fluent is in a container
-            if self._solver.fluent_connection._remote_instance != None:
+            if self._solver._fluent_connection._remote_instance != None:
                 self._solver.download(scp_file_name)
 
             assert os.path.exists(

src/ansys/fluent/core/utils/setup_for_fluent.py

@@ -12,7 +12,7 @@ def setup_for_fluent(*args, **kwargs):
         globals["meshing"] = session
         globals["PartManagement"] = session.PartManagement
         globals["PMFileManagement"] = session.PMFileManagement
-        globals["solver"] = Solver(fluent_connection=session.fluent_connection)
+        globals["solver"] = Solver(fluent_connection=session._fluent_connection)
     else:
         globals["solver"] = session
 

src/ansys/fluent/core/workflow.py

@@ -349,7 +349,7 @@ def __getattr__(self, attr):
             camel_attr = snake_to_camel_case(
                 str(attr), [*self._get_camel_case_arg_keys(), *dir(self._task)]
             )
-            attr = camel_attr if camel_attr else attr
+            attr = camel_attr or attr
         try:
             result = getattr(self._task, attr)
             if result:
@@ -706,7 +706,7 @@ def __getattr__(self, attr):
                     f"Try using '{camel_to_snake_case(attr)}' instead."
                 )
             camel_attr = snake_to_camel_case(str(attr), self._get_camel_case_arg_keys())
-            attr = camel_attr if camel_attr else attr
+            attr = camel_attr or attr
         return getattr(self._arg, attr)
 
     def __setattr__(self, attr, value):
@@ -717,7 +717,7 @@ def __setattr__(self, attr, value):
                 camel_attr = snake_to_camel_case(
                     str(attr), self._get_camel_case_arg_keys()
                 )
-                attr = camel_attr if camel_attr else attr
+                attr = camel_attr or attr
             self.set_state({attr: value})
 
     def __dir__(self):
@@ -1185,7 +1185,7 @@ def __getattr__(self, attr):
                     f"Try using '{camel_to_snake_case(attr)}' instead."
                 )
             camel_attr = snake_to_camel_case(str(attr), dir(self._workflow))
-            attr = camel_attr if camel_attr else attr
+            attr = camel_attr or attr
             obj = self._attr_from_wrapped_workflow(attr)
             if obj:
                 return obj