resolve merge conflict + style changes from pre-commit

Author: smereu

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

@@ -88,4 +88,3 @@ def get_active(self, **kwargs) -> dict:
     def _serialize_tracker_command_response(self, **kwargs) -> dict:
         """Get a serialized response from the tracker."""
         pass
-    

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

@@ -768,11 +768,13 @@ def boolean(self, **kwargs) -> dict:  # noqa: D102
 
         # Return the response - formatted as a dictionary
         return {"complete_command_response": serialized_tracker_response}
-    
+
     @protect_grpc
     def combine(self, **kwargs) -> dict:  # noqa: D102):
-        from ansys.api.geometry.v0.bodies_pb2 import CombineIntersectBodiesRequest
-        from ansys.api.geometry.v0.bodies_pb2 import CombineMergeBodiesRequest
+        from ansys.api.geometry.v0.bodies_pb2 import (
+            CombineIntersectBodiesRequest,
+            CombineMergeBodiesRequest,
+        )
 
         parent_design = get_design_from_body(self)
         other_bodies = kwargs["other"]
@@ -819,8 +821,8 @@ def combine(self, **kwargs) -> dict:  # noqa: D102):
 
         tracker_response = response.result.complete_command_response
         serialized_tracker_response = parent_design._serialize_tracker_command_response(
-                response=tracker_response)
-        
-                # Return the response - formatted as a dictionary
+            response=tracker_response
+        )
+
+        # Return the response - formatted as a dictionary
         return {"complete_command_response": serialized_tracker_response}
-                  

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

@@ -194,7 +194,7 @@ def get_active(self, **kwargs) -> dict:  # noqa: D102
                 "main_part_id": response.main_part.id,
                 "name": response.name,
             }
-        
+
     def _serialize_tracker_command_response(self, **kwargs) -> dict:
         """Serialize a TrackerCommandResponse object into a dictionary.
 
@@ -244,4 +244,4 @@ def serialize_entity_identifier(entity):
                 serialize_entity_identifier(entity)
                 for entity in getattr(response, "deleted_bodies", [])
             ],
-        }        
+        }

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

@@ -490,7 +490,7 @@ def find_and_fix_extra_edges(self, **kwargs) -> dict:  # noqa: D102
         response = self.stub.FindAndFixExtraEdges(request)
 
         serialized_tracker_response = kwargs["parent_design"]._serialize_tracker_command_response(
-            response = response.complete_command_response
+            response=response.complete_command_response
         )
 
         # Return the response - formatted as a dictionary
@@ -520,7 +520,7 @@ def find_and_fix_split_edges(self, **kwargs) -> dict:  # noqa: D102
         response = self.stub.FindAndFixSplitEdges(request)
 
         serialized_tracker_response = kwargs["parent_design"]._serialize_tracker_command_response(
-            response = response.complete_command_response
+            response=response.complete_command_response
         )
 
         # Return the response - formatted as a dictionary
@@ -585,4 +585,4 @@ def serialize_issue(issue):
                 }
                 for body_issues in response.issues_by_body
             ]
-        }
+        }

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

@@ -191,7 +191,7 @@ def get_tesellation_with_options(self, **kwargs) -> dict:  # noqa: D102
     @protect_grpc
     def boolean(self, **kwargs) -> dict:  # noqa: D102
         raise NotImplementedError
-    
+
     @protect_grpc
     def combine(self, **kwargs) -> dict:  # noqa: D102
-        raise NotImplementedError    
+        raise NotImplementedError

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

@@ -82,7 +82,7 @@ def insert(self, **kwargs) -> dict:  # noqa: D102
     @protect_grpc
     def get_active(self, **kwargs) -> dict:  # noqa: D102
         raise NotImplementedError
-    
-    def _serialize_tracker_command_response(self, **kwargs) -> dict: # noqa: D102
+
+    def _serialize_tracker_command_response(self, **kwargs) -> dict:  # noqa: D102
         """Get a serialized response from the tracker."""
         raise NotImplementedError

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

@@ -31,8 +31,6 @@
 from ansys.api.geometry.v0.commands_pb2 import (
     AssignMidSurfaceOffsetTypeRequest,
     AssignMidSurfaceThicknessRequest,
-    CombineIntersectBodiesRequest,
-    CombineMergeBodiesRequest,
     ImprintCurvesRequest,
     ProjectCurvesRequest,
     RemoveFacesRequest,
@@ -43,6 +41,7 @@
 import matplotlib.colors as mcolors
 from pint import Quantity
 
+from ansys.geometry.core import USE_TRACKER_TO_UPDATE_DESIGN
 from ansys.geometry.core.connection.client import GrpcClient
 from ansys.geometry.core.connection.conversions import (
     plane_to_grpc_plane,
@@ -1916,9 +1915,10 @@ def __generic_boolean_command(
     ) -> None:
         parent_design = get_design_from_body(self)
         other = other if isinstance(other, Iterable) else [other]
-        
+
         response = self._template._grpc_client.services.bodies.combine(
-            target=self, other=other, type_bool_op=method, err_msg=err_msg, keep_other=keep_other)      
+            target=self, other=other, type_bool_op=method, err_msg=err_msg, keep_other=keep_other
+        )
 
         from ansys.geometry.core import USE_TRACKER_TO_UPDATE_DESIGN
 

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

@@ -1044,7 +1044,6 @@ def __repr__(self) -> str:
         lines.append(f"  N Beam Profiles      : {len(self.beam_profiles)}")
         lines.append(f"  N Design Points      : {len(self.design_points)}")
         return "\n".join(lines)
-    
 
     def _serialize_tracker_command_response(self, **kwargs) -> dict:
         """Serialize a TrackerCommandResponse object into a dictionary.
@@ -1059,7 +1058,9 @@ def _serialize_tracker_command_response(self, **kwargs) -> dict:
         dict
             A dictionary representation of the TrackerCommandResponse object.
         """
-        return self._grpc_client.services.designs._serialize_tracker_command_response(response=kwargs["response"])    
+        return self._grpc_client.services.designs._serialize_tracker_command_response(
+            response=kwargs["response"]
+        )
 
     def __read_existing_design(self) -> None:
         """Read an existing ``Design`` located on the server."""