complete migration of design class to mediator pattern for version handling

Author: smereu

src/ansys/geometry/core/_grpc/_services/base/designs.py

@@ -103,3 +103,28 @@ def upload_file_stream(self, **kwargs) -> dict:
     def stream_design_tessellation(self, **kwargs) -> dict:
         """Stream the tessellation of a design."""
         pass
+
+    @abstractmethod
+    def assign_midsurface_thickness(self, **kwargs) -> dict:
+        """ "Add a mid-surface thickness to a list of bodies."""
+        pass
+
+    @abstractmethod
+    def assign_midsurface_offset_type(self, **kwargs) -> dict:
+        """ "Add a mid-surface offset type to a list of bodies."""
+        pass
+
+    @abstractmethod
+    def delete_beam_profile(self, **kwargs) -> dict:
+        """ "Remove a beam profile on the active geometry server instance."""
+        pass
+
+    @abstractmethod
+    def create_beam_circular_profile(self, **kwargs) -> dict:
+        """ "Add a new beam circular profile under the design for creating beams."""
+        pass
+
+    @abstractmethod
+    def download_file(self, **kwargs) -> dict:
+        """ "Download the design from the server."""
+        pass

src/ansys/geometry/core/_grpc/_services/v0/designs.py

@@ -21,6 +21,12 @@
 # SOFTWARE.
 """Module containing the designs service implementation for v0."""
 
+from ansys.api.geometry.v0.commands_pb2 import (
+    AssignMidSurfaceOffsetTypeRequest,
+    AssignMidSurfaceThicknessRequest,
+    CreateBeamCircularProfileRequest,
+)
+from google.protobuf.empty_pb2 import Empty
 import grpc
 
 from ansys.geometry.core.errors import protect_grpc
@@ -36,6 +42,8 @@
     from_grpc_matrix_to_matrix,
     from_grpc_point_to_point3d,
     from_grpc_tess_to_raw_data,
+    from_plane_to_grpc_plane,
+    from_point3d_to_grpc_point,
     from_tess_options_to_grpc_tess_options,
 )
 
@@ -481,3 +489,55 @@ def stream_design_tessellation(self, **kwargs) -> dict:  # noqa: D102
         return {
             "tessellation": tess_map,
         }
+
+    @protect_grpc
+    def assign_midsurface_thickness(self, **kwargs) -> dict:
+        """ "Add a mid-surface thickness to a list of bodies."""
+        # Create the request - assumes all inputs are valid and of the proper type
+        request = AssignMidSurfaceThicknessRequest(
+            bodies_or_faces=kwargs["bodies_or_faces"], thickness=kwargs["thickness"]
+        )
+
+        # Call the gRPC service
+        response = self.commands_stub.AssignMidSurfaceThickness(request)
+
+    @protect_grpc
+    def assign_midsurface_offset_type(self, **kwargs) -> dict:
+        # Create the request - assumes all inputs are valid and of the proper type
+        request = AssignMidSurfaceOffsetTypeRequest(
+            bodies_or_faces=kwargs["bodies_or_faces"], offset_type=kwargs["offset_type"]
+        )
+
+        # Call the gRPC service
+        response = self.commands_stub.AssignMidSurfaceOffsetType(request)
+
+    @protect_grpc
+    def delete_beam_profile(self, **kwargs) -> dict:
+        # Create the request - assumes all inputs are valid and of the proper type
+        request = build_grpc_id(id=kwargs["id"])
+
+        # Call the gRPC service
+        response = self.commands_stub.DeleteBeamProfile(request)
+
+    @protect_grpc
+    def create_beam_circular_profile(self, **kwargs) -> dict:
+        # Create the request - assumes all inputs are valid and of the proper type
+        request = CreateBeamCircularProfileRequest(
+            origin=from_point3d_to_grpc_point(kwargs["center"]),
+            radius=kwargs["radius"],
+            plane=from_plane_to_grpc_plane(kwargs["plane"]), name=kwargs["name"],
+        )
+
+        # Call the gRPC service
+        response = self.commands_stub.CreateBeamCircularProfile(request)
+
+        # Return the response - formatted as a dictionary
+        return {"id": response.id}
+
+    @protect_grpc
+    def download_file(self, **kwargs) -> dict:  # noqa: D102
+        # Call the gRPC service
+        response = self.commands_stub.DownloadFile(Empty())
+
+        # Return the response - formatted as a dictionary
+        return {"data": response.data}

src/ansys/geometry/core/_grpc/_services/v1/designs.py

@@ -98,3 +98,23 @@ def upload_file_stream(self, **kwargs) -> dict:  # noqa: D102
     @protect_grpc
     def stream_design_tessellation(self, **kwargs) -> dict:  # noqa: D102
         raise NotImplementedError
+
+    @protect_grpc
+    def assign_midsurface_thickness(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError
+
+    @protect_grpc
+    def assign_midsurface_offset_type(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError
+
+    @protect_grpc
+    def delete_beam_profile(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError
+
+    @protect_grpc
+    def create_beam_circular_profile(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError
+
+    @protect_grpc
+    def download_file(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError

src/ansys/geometry/core/designer/design.py

@@ -25,23 +25,12 @@
 from pathlib import Path
 from typing import Union
 
-from ansys.api.dbu.v0.dbumodels_pb2 import EntityIdentifier
-from ansys.api.geometry.v0.commands_pb2 import (
-    AssignMidSurfaceOffsetTypeRequest,
-    AssignMidSurfaceThicknessRequest,
-    CreateBeamCircularProfileRequest,
-)
 from ansys.api.geometry.v0.commands_pb2_grpc import CommandsStub
 from beartype import beartype as check_input_types
-from google.protobuf.empty_pb2 import Empty
 import numpy as np
 from pint import Quantity, UndefinedUnitError
 
 from ansys.geometry.core.connection.backend import BackendType
-from ansys.geometry.core.connection.conversions import (
-    plane_to_grpc_plane,
-    point3d_to_grpc_point,
-)
 from ansys.geometry.core.designer.beam import (
     Beam,
     BeamCircularProfile,
@@ -330,9 +319,9 @@ def __export_and_download_legacy(self, format: DesignFileFormat) -> bytes:
         # Process response
         self._grpc_client.log.debug(f"Requesting design download in {format} format.")
         if format is DesignFileFormat.SCDOCX:
-            response = self._commands_stub.DownloadFile(Empty())
+            response = self._grpc_client.services.designs.download_file()
             received_bytes = bytes()
-            received_bytes += response.data
+            received_bytes += response.get("data")
         elif format in [
             DesignFileFormat.PARASOLID_TEXT,
             DesignFileFormat.PARASOLID_BIN,
@@ -818,17 +807,16 @@ def add_beam_circular_profile(
         if not dir_x.is_perpendicular_to(dir_y):
             raise ValueError("Direction X and direction Y must be perpendicular.")
 
-        request = CreateBeamCircularProfileRequest(
-            origin=point3d_to_grpc_point(center),
+        self._grpc_client.log.debug(f"Creating a beam circular profile on {self.id}...")
+
+        response = self._grpc_client._services.designs.create_beam_circular_profile(
+            center=center,
             radius=radius.value.m_as(DEFAULT_UNITS.SERVER_LENGTH),
-            plane=plane_to_grpc_plane(Plane(center, dir_x, dir_y)),
+            plane=Plane(center, dir_x, dir_y),
             name=name,
         )
 
-        self._grpc_client.log.debug(f"Creating a beam circular profile on {self.id}...")
-
-        response = self._commands_stub.CreateBeamCircularProfile(request)
-        profile = BeamCircularProfile(response.id, name, radius, center, dir_x, dir_y)
+        profile = BeamCircularProfile(response.get("id"), name, radius, center, dir_x, dir_y)
         self._beam_profiles[profile.name] = profile
 
         self._grpc_client.log.debug(
@@ -912,10 +900,8 @@ def add_midsurface_thickness(self, thickness: Quantity, bodies: list[Body]) -> N
                 )
 
         # Assign mid-surface thickness
-        self._commands_stub.AssignMidSurfaceThickness(
-            AssignMidSurfaceThicknessRequest(
-                bodies_or_faces=ids, thickness=thickness.m_as(DEFAULT_UNITS.SERVER_LENGTH)
-            )
+        self._grpc_client._services.designs.assign_midsurface_thickness(
+            bodies_or_faces=ids, thickness=thickness.m_as(DEFAULT_UNITS.SERVER_LENGTH)
         )
 
         # Once the assignment has gone fine, store the values
@@ -952,8 +938,8 @@ def add_midsurface_offset(self, offset_type: MidSurfaceOffsetType, bodies: list[
                 )
 
         # Assign mid-surface offset type
-        self._commands_stub.AssignMidSurfaceOffsetType(
-            AssignMidSurfaceOffsetTypeRequest(bodies_or_faces=ids, offset_type=offset_type.value)
+        self._grpc_client._services.designs.assign_midsurface_offset_type(
+            bodies_or_faces=ids, offset_type=offset_type.value
         )
 
         # Once the assignment has gone fine, store the values
@@ -976,7 +962,7 @@ def delete_beam_profile(self, beam_profile: BeamProfile | str) -> None:
         removal_obj = self._beam_profiles.get(removal_name, None)
 
         if removal_obj:
-            self._commands_stub.DeleteBeamProfile(EntityIdentifier(id=removal_obj.id))
+            self._grpc_client._services.designs.delete_beam_profile(id=removal_obj.id)
             self._beam_profiles.pop(removal_name)
             self._grpc_client.log.debug(f"Beam profile {removal_name} successfully deleted.")
         else: