feat: Update client side 'enhanced' meshing workflow to use server side 'meshing_workflow' root.

doc/changelog.d/4600.added.md

@@ -0,0 +1 @@
+Update client side 'enhanced' meshing workflow to use server side 'meshing_workflow' root.

src/ansys/fluent/core/meshing/meshing_workflow.py

@@ -31,7 +31,6 @@
 from ansys.fluent.core._types import PathType
 from ansys.fluent.core.services.datamodel_se import PyMenuGeneric
 from ansys.fluent.core.utils.fluent_version import FluentVersion
-from ansys.fluent.core.workflow import Workflow
 
 name_to_identifier_map = {
     "Watertight Geometry": "EnableCleanCAD",
@@ -41,7 +40,19 @@
 }
 
 
-class MeshingWorkflow(Workflow):
+def resolve_workflow_base():
+    """Resolve the base workflow based on environment variable."""
+    if os.getenv("USE_SERVER_MW") == "1":
+        from ansys.fluent.core.workflow_new import Workflow
+    else:
+        from ansys.fluent.core.workflow import Workflow
+    return Workflow
+
+
+WorkflowBase = resolve_workflow_base()
+
+
+class MeshingWorkflow(WorkflowBase):
     """Provides meshing specialization of the workflow wrapper that extends the core
     functionality in an object-oriented manner."""
 
@@ -77,22 +88,24 @@ def __init__(
         self._meshing = meshing
         self._name = name
         self._identifier = identifier
-        self._unsubscribe_root_affected_callback()
+        if os.getenv("USE_SERVER_MW") != "1":
+            self._unsubscribe_root_affected_callback()
         if initialize:
             self._new_workflow(name=self._name)
         else:
             self._activate_dynamic_interface(dynamic_interface=True)
         self._initialized = True
 
     def __getattribute__(self, item: str):
-        if (
-            not item.startswith("_")
-            and super().__getattribute__("_initialized")
-            and not getattr(self._meshing.GlobalSettings, self._identifier)()
-        ):
-            raise RuntimeError(
-                f"'{self._name}' objects are inaccessible from other workflows."
-            )
+        if os.getenv("USE_SERVER_MW") != "1":
+            if (
+                not item.startswith("_")
+                and super().__getattribute__("_initialized")
+                and not getattr(self._meshing.GlobalSettings, self._identifier)()
+            ):
+                raise RuntimeError(
+                    f"'{self._name}' objects are inaccessible from other workflows."
+                )
         return super().__getattribute__(item)
 
 
@@ -267,7 +280,7 @@ class WorkflowMode(Enum):
     TOPOLOGY_BASED_MESHING_MODE = TopologyBasedMeshingWorkflow
 
 
-class LoadWorkflow(Workflow):
+class LoadWorkflow(WorkflowBase):
     """Provides a specialization of the workflow wrapper for a loaded workflow."""
 
     def __init__(
@@ -298,7 +311,7 @@ def __init__(
         self._load_workflow(file_path=os.fspath(file_path))
 
 
-class CreateWorkflow(Workflow):
+class CreateWorkflow(WorkflowBase):
     """Provides a specialization of the workflow wrapper for a newly created
     workflow."""
 

src/ansys/fluent/core/session_base_meshing.py

@@ -138,8 +138,11 @@ def meshing_workflow(self):
 
     def watertight_workflow(self, initialize: bool = True):
         """Datamodel root of workflow."""
+        root_module = (
+            "meshing_workflow" if os.getenv("USE_SERVER_MW") == "1" else "workflow"
+        )
         self._current_workflow = WorkflowMode.WATERTIGHT_MESHING_MODE.value(
-            _make_datamodel_module(self, "workflow"),
+            _make_datamodel_module(self, root_module),
             self.meshing,
             self.get_fluent_version(),
             initialize,
@@ -148,8 +151,11 @@ def watertight_workflow(self, initialize: bool = True):
 
     def fault_tolerant_workflow(self, initialize: bool = True):
         """Datamodel root of workflow."""
+        root_module = (
+            "meshing_workflow" if os.getenv("USE_SERVER_MW") == "1" else "workflow"
+        )
         self._current_workflow = WorkflowMode.FAULT_TOLERANT_MESHING_MODE.value(
-            _make_datamodel_module(self, "workflow"),
+            _make_datamodel_module(self, root_module),
             self.meshing,
             self.PartManagement,
             self.PMFileManagement,
@@ -160,8 +166,11 @@ def fault_tolerant_workflow(self, initialize: bool = True):
 
     def two_dimensional_meshing_workflow(self, initialize: bool = True):
         """Data model root of the workflow."""
+        root_module = (
+            "meshing_workflow" if os.getenv("USE_SERVER_MW") == "1" else "workflow"
+        )
         self._current_workflow = WorkflowMode.TWO_DIMENSIONAL_MESHING_MODE.value(
-            _make_datamodel_module(self, "workflow"),
+            _make_datamodel_module(self, root_module),
             self.meshing,
             self.get_fluent_version(),
             initialize,
@@ -170,8 +179,11 @@ def two_dimensional_meshing_workflow(self, initialize: bool = True):
 
     def topology_based_meshing_workflow(self, initialize: bool = True):
         """Datamodel root of workflow."""
+        root_module = (
+            "meshing_workflow" if os.getenv("USE_SERVER_MW") == "1" else "workflow"
+        )
         self._current_workflow = WorkflowMode.TOPOLOGY_BASED_MESHING_MODE.value(
-            _make_datamodel_module(self, "workflow"),
+            _make_datamodel_module(self, root_module),
             self.meshing,
             self.get_fluent_version(),
             initialize,
@@ -180,8 +192,11 @@ def topology_based_meshing_workflow(self, initialize: bool = True):
 
     def load_workflow(self, file_path: PathType):
         """Datamodel root of workflow."""
+        root_module = (
+            "meshing_workflow" if os.getenv("USE_SERVER_MW") == "1" else "workflow"
+        )
         self._current_workflow = LoadWorkflow(
-            _make_datamodel_module(self, "workflow"),
+            _make_datamodel_module(self, root_module),
             self.meshing,
             os.fspath(file_path),
             self.get_fluent_version(),
@@ -190,8 +205,11 @@ def load_workflow(self, file_path: PathType):
 
     def create_workflow(self, initialize: bool = True):
         """Datamodel root of the workflow."""
+        root_module = (
+            "meshing_workflow" if os.getenv("USE_SERVER_MW") == "1" else "workflow"
+        )
         self._current_workflow = CreateWorkflow(
-            _make_datamodel_module(self, "workflow"),
+            _make_datamodel_module(self, root_module),
             self.meshing,
             self.get_fluent_version(),
             initialize,