Merge branch 'feat/grpc-common-layer-refactoring' of https://github.com/ansys/pyansys-geometry into feat/grpc-common-layer-refactoring

Author: umutsoysalansys

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ exclude: "tests/integration/files"
 repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.4
+  rev: v0.11.5
   hooks:
     - id: ruff
     - id: ruff-format
@@ -35,7 +35,7 @@ repos:
 
 # this validates our github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.32.1
+  rev: 0.33.0
   hooks:
     - id: check-github-workflows
 

doc/changelog.d/1911.maintenance.md

@@ -0,0 +1 @@
+pre-commit automatic update

doc/changelog.d/1912.added.md

@@ -0,0 +1 @@
+repair tools refactoring

src/ansys/geometry/core/_grpc/_services/_service.py

@@ -182,6 +182,7 @@ def named_selection(self) -> GRPCNamedSelectionService:
     def repair_tools(self) -> GRPCRepairToolsService:
         if not self._repair_tools:
             from .v0.repair_tools import GRPCRepairToolsServiceV0
+
             # TODO: Add V1 later
             self._repair_tools = GRPCRepairToolsServiceV0(self.channel)
         return self._repair_tools

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

@@ -26,9 +26,6 @@
 import grpc
 
 
-from abc import ABC, abstractmethod
-import grpc
-
 class GRPCRepairToolsService(ABC):
     def __init__(self, channel: grpc.Channel):
         pass

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

@@ -26,16 +26,15 @@
 geometry issues, such as split edges, extra edges, duplicate faces, and more.
 """
 
-from abc import ABC, abstractmethod
+from google.protobuf.wrappers_pb2 import BoolValue, DoubleValue
 import grpc
-from ..base.repair_tools import GRPCRepairToolsService
+
 from ansys.geometry.core.errors import protect_grpc
-from google.protobuf.wrappers_pb2 import BoolValue, DoubleValue
 
+from ..base.repair_tools import GRPCRepairToolsService
 
 
 class GRPCRepairToolsServiceV0(GRPCRepairToolsService):
-
     @protect_grpc
     def __init__(self, channel: grpc.Channel):
         from ansys.api.geometry.v0.repairtools_pb2_grpc import RepairToolsStub
@@ -44,9 +43,8 @@ def __init__(self, channel: grpc.Channel):
 
     @protect_grpc
     def find_split_edges(self, **kwargs):
-
         from ansys.api.geometry.v0.repairtools_pb2 import FindSplitEdgesRequest
-        
+
         request = FindSplitEdgesRequest(
             bodies_or_faces=kwargs["bodies_or_faces"],
             angle=kwargs["angle"],
@@ -57,86 +55,101 @@ def find_split_edges(self, **kwargs):
     @protect_grpc
     def find_extra_edges(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindExtraEdgesRequest
+
         request = FindExtraEdgesRequest(selection=kwargs["selection"])
         return self.stub.FindExtraEdges(request)
 
     @protect_grpc
     def find_inexact_edges(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindInexactEdgesRequest
+
         request = FindInexactEdgesRequest(selection=kwargs["selection"])
-        return self.stub.FindInexactEdges(request)    
-    
-    
+        return self.stub.FindInexactEdges(request)
+
     @protect_grpc
     def find_short_edges(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindShortEdgesRequest
+
         request = FindShortEdgesRequest(
             selection=kwargs["selection"],
             max_edge_length=DoubleValue(value=kwargs["length"]),
         )
         return self.stub.FindShortEdges(request)
-    
+
     @protect_grpc
     def find_duplicate_faces(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindDuplicateFacesRequest
+
         request = FindDuplicateFacesRequest(faces=kwargs["faces"])
         return self.stub.FindDuplicateFaces(request)
 
-
     @protect_grpc
     def find_missing_faces(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindMissingFacesRequest
+
         request = FindMissingFacesRequest(faces=kwargs["faces"])
-        return self.stub.FindMissingFaces(request)    
+        return self.stub.FindMissingFaces(request)
 
     @protect_grpc
     def find_small_faces(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindSmallFacesRequest
+
         request = FindSmallFacesRequest(selection=kwargs["selection"])
         return self.stub.FindSmallFaces(request)
-    
+
     @protect_grpc
     def find_stitch_faces(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindStitchFacesRequest
+
         request = FindStitchFacesRequest(faces=kwargs["faces"])
         return self.stub.FindStitchFaces(request)
-    
+
     @protect_grpc
     def find_simplify(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindAdjustSimplifyRequest
+
         request = FindAdjustSimplifyRequest(selection=kwargs["selection"])
         return self.stub.FindAdjustSimplify(request)
-    
+
     @protect_grpc
     def find_and_fix_simplify(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindAdjustSimplifyRequest
+
         request = FindAdjustSimplifyRequest(
             selection=kwargs["selection"],
             comprehensive=kwargs["comprehensive_result"],
         )
-        return self.stub.FindAndSimplify(request) 
-    
+        return self.stub.FindAndSimplify(request)
+
     @protect_grpc
     def inspect_geometry(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import InspectGeometryRequest
+
         request = InspectGeometryRequest(bodies=kwargs.get("bodies", []))
         return self.stub.InspectGeometry(request)
-    
+
     @protect_grpc
     def repair_geometry(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import RepairGeometryRequest
+
         request = RepairGeometryRequest(bodies=kwargs.get("bodies", []))
         return self.stub.RepairGeometry(request)
-    
+
     @protect_grpc
     def find_interferences(self, **kwargs):
         from ansys.api.geometry.v0.repairtools_pb2 import FindInterferenceRequest
+
         request = FindInterferenceRequest(
             bodies=kwargs["bodies"],
             cut_smaller_body=BoolValue(value=kwargs["cut_smaller_body"]),
         )
-        return self.stub.FindInterference(request)    
+        return self.stub.FindInterference(request)
+
+    def find_and_fix_short_edges(self, **kwargs):
+        raise NotImplementedError
+
+    def find_and_fix_extra_edges(self, **kwargs):
+        raise NotImplementedError
 
-    def find_and_fix_short_edges(self, **kwargs): raise NotImplementedError
-    def find_and_fix_extra_edges(self, **kwargs): raise NotImplementedError
-    def find_and_fix_split_edges(self, **kwargs): raise NotImplementedError
+    def find_and_fix_split_edges(self, **kwargs):
+        raise NotImplementedError

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

@@ -21,13 +21,14 @@
 # SOFTWARE.
 """Module containing the repair tools service implementation (abstraction layer)."""
 
-from abc import ABC, abstractmethod
+from abc import ABC
 
 import grpc
 
 
 class GRPCRepairToolsServiceV1(ABC):
     """Repair tools service for gRPC communication with the Geometry server.
+
     Parameters
     ----------
     channel : grpc.Channel
@@ -38,19 +39,50 @@ def __init__(self, channel: grpc.Channel):
         """Initialize the MeasurementToolsService class."""
         pass  # pragma: no cover
 
-    def find_split_edges(self, **kwargs): raise NotImplementedError
-    def find_extra_edges(self, **kwargs): raise NotImplementedError
-    def find_inexact_edges(self, **kwargs): raise NotImplementedError
-    def find_short_edges(self, **kwargs): raise NotImplementedError
-    def find_duplicate_faces(self, **kwargs): raise NotImplementedError
-    def find_missing_faces(self, **kwargs): raise NotImplementedError
-    def find_small_faces(self, **kwargs): raise NotImplementedError
-    def find_stitch_faces(self, **kwargs): raise NotImplementedError
-    def find_simplify(self, **kwargs): raise NotImplementedError
-    def find_interferences(self, **kwargs): raise NotImplementedError
-    def find_and_fix_short_edges(self, **kwargs): raise NotImplementedError
-    def find_and_fix_extra_edges(self, **kwargs): raise NotImplementedError
-    def find_and_fix_split_edges(self, **kwargs): raise NotImplementedError
-    def find_and_fix_simplify(self, **kwargs): raise NotImplementedError
-    def inspect_geometry(self, **kwargs): raise NotImplementedError
-    def repair_geometry(self, **kwargs): raise NotImplementedError
+    def find_split_edges(self, **kwargs):
+        raise NotImplementedError
+
+    def find_extra_edges(self, **kwargs):
+        raise NotImplementedError
+
+    def find_inexact_edges(self, **kwargs):
+        raise NotImplementedError
+
+    def find_short_edges(self, **kwargs):
+        raise NotImplementedError
+
+    def find_duplicate_faces(self, **kwargs):
+        raise NotImplementedError
+
+    def find_missing_faces(self, **kwargs):
+        raise NotImplementedError
+
+    def find_small_faces(self, **kwargs):
+        raise NotImplementedError
+
+    def find_stitch_faces(self, **kwargs):
+        raise NotImplementedError
+
+    def find_simplify(self, **kwargs):
+        raise NotImplementedError
+
+    def find_interferences(self, **kwargs):
+        raise NotImplementedError
+
+    def find_and_fix_short_edges(self, **kwargs):
+        raise NotImplementedError
+
+    def find_and_fix_extra_edges(self, **kwargs):
+        raise NotImplementedError
+
+    def find_and_fix_split_edges(self, **kwargs):
+        raise NotImplementedError
+
+    def find_and_fix_simplify(self, **kwargs):
+        raise NotImplementedError
+
+    def inspect_geometry(self, **kwargs):
+        raise NotImplementedError
+
+    def repair_geometry(self, **kwargs):
+        raise NotImplementedError