fix: cleanup unsupported module (#1690)

Co-authored-by: pyansys-ci-bot <[email protected]>

Author: RobPasMue

doc/changelog.d/1690.fixed.md

@@ -0,0 +1 @@
+cleanup unsupported module

src/ansys/geometry/core/modeler.py

@@ -40,10 +40,10 @@
 from ansys.geometry.core.logger import LOG
 from ansys.geometry.core.misc.checks import check_type, min_backend_version
 from ansys.geometry.core.misc.options import ImportOptions
-from ansys.geometry.core.misc.unsupported import UnsupportedCommands
 from ansys.geometry.core.tools.measurement_tools import MeasurementTools
 from ansys.geometry.core.tools.prepare_tools import PrepareTools
 from ansys.geometry.core.tools.repair_tools import RepairTools
+from ansys.geometry.core.tools.unsupported import UnsupportedCommands
 from ansys.geometry.core.typing import Real
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -120,6 +120,9 @@ def __init__(
             backend_type=backend_type,
         )
 
+        # Maintaining references to all designs within the modeler workspace
+        self._designs: dict[str, "Design"] = {}
+
         # Initialize the RepairTools - Not available on Linux
         # TODO: delete "if" when Linux service is able to use repair tools
         # https://github.com/ansys/pyansys-geometry/issues/1319
@@ -135,9 +138,6 @@ def __init__(
         self._geometry_commands = GeometryCommands(self._grpc_client)
         self._unsupported = UnsupportedCommands(self._grpc_client, self)
 
-        # Maintaining references to all designs within the modeler workspace
-        self._designs: dict[str, "Design"] = {}
-
         # Check if the backend allows for multiple designs and throw warning if needed
         if not self.client.multiple_designs_allowed:
             LOG.warning(

src/ansys/geometry/core/tools/__init__.py

@@ -30,3 +30,4 @@
 )
 from ansys.geometry.core.tools.repair_tool_message import RepairToolMessage
 from ansys.geometry.core.tools.repair_tools import RepairTools
+from ansys.geometry.core.tools.unsupported import PersistentIdType, UnsupportedCommands

src/ansys/geometry/core/misc/unsupported.py renamed to src/ansys/geometry/core/tools/unsupported.py

@@ -29,7 +29,7 @@
 from ansys.api.geometry.v0.unsupported_pb2_grpc import UnsupportedStub
 from ansys.geometry.core.connection import GrpcClient
 from ansys.geometry.core.errors import protect_grpc
-from ansys.geometry.core.misc import auxiliary
+from ansys.geometry.core.misc.auxiliary import get_all_bodies_from_design
 from ansys.geometry.core.misc.checks import (
     min_backend_version,
 )
@@ -38,6 +38,7 @@
     from ansys.geometry.core.designer.body import Body
     from ansys.geometry.core.designer.edge import Edge
     from ansys.geometry.core.designer.face import Face
+    from ansys.geometry.core.modeler import Modeler
 
 
 @unique
@@ -58,17 +59,17 @@ class UnsupportedCommands:
     """
 
     @protect_grpc
-    def __init__(self, grpc_client: GrpcClient, modeler):
+    def __init__(self, grpc_client: GrpcClient, modeler: "Modeler"):
         """Initialize an instance of the ``UnsupportedCommands`` class."""
         self._grpc_client = grpc_client
         self._unsupported_stub = UnsupportedStub(self._grpc_client.channel)
         self.__id_map = {}
         self.__modeler = modeler
-        self.__current_design = None
+        self.__current_design = modeler.get_active_design()
 
     @protect_grpc
     @min_backend_version(25, 2, 0)
-    def __fill_imported_id_map(self, id_type: "PersistentIdType") -> None:
+    def __fill_imported_id_map(self, id_type: PersistentIdType) -> None:
         """Populate the persistent id map for caching.
 
         Parameters
@@ -96,7 +97,7 @@ def __clear_cache(self) -> None:
 
     @protect_grpc
     @min_backend_version(25, 2, 0)
-    def __is_occurrence(self, master: "EntityIdentifier", occ: "str") -> bool:
+    def __is_occurrence(self, master: EntityIdentifier, occ: str) -> bool:
         """Determine if the master is the master of the occurrence.
 
         Parameters
@@ -118,7 +119,7 @@ def __is_occurrence(self, master: "EntityIdentifier", occ: "str") -> bool:
     @protect_grpc
     @min_backend_version(25, 2, 0)
     def __get_moniker_from_import_id(
-        self, id_type: "PersistentIdType", import_id: "str"
+        self, id_type: PersistentIdType, import_id: str
     ) -> "EntityIdentifier | None":
         """Look up the moniker from the id map.
 
@@ -148,7 +149,7 @@ def __get_moniker_from_import_id(
 
     @protect_grpc
     @min_backend_version(25, 2, 0)
-    def set_export_id(self, moniker: "str", id_type: "PersistentIdType", value: "str") -> None:
+    def set_export_id(self, moniker: str, id_type: PersistentIdType, value: str) -> None:
         """Set the persistent id for the moniker.
 
         Parameters
@@ -175,7 +176,7 @@ def set_export_id(self, moniker: "str", id_type: "PersistentIdType", value: "str
     @protect_grpc
     @min_backend_version(25, 2, 0)
     def get_body_occurrences_from_import_id(
-        self, import_id: "str", id_type: "PersistentIdType"
+        self, import_id: str, id_type: PersistentIdType
     ) -> list["Body"]:
         """Get all body occurrences whose master has the given import id.
 
@@ -194,19 +195,19 @@ def get_body_occurrences_from_import_id(
         moniker = self.__get_moniker_from_import_id(id_type, import_id)
 
         if moniker is None:
-            return list()
+            return []
 
         design = self.__modeler.get_active_design()
         return [
             body
-            for body in auxiliary.get_all_bodies_from_design(design)
+            for body in get_all_bodies_from_design(design)
             if self.__is_occurrence(moniker, body.id)
         ]
 
     @protect_grpc
     @min_backend_version(25, 2, 0)
     def get_face_occurrences_from_import_id(
-        self, import_id: "str", id_type: "PersistentIdType"
+        self, import_id: str, id_type: PersistentIdType
     ) -> list["Face"]:
         """Get all face occurrences whose master has the given import id.
 
@@ -225,20 +226,20 @@ def get_face_occurrences_from_import_id(
         moniker = self.__get_moniker_from_import_id(id_type, import_id)
 
         if moniker is None:
-            return list()
+            return []
 
         design = self.__modeler.get_active_design()
         return [
             face
-            for body in auxiliary.get_all_bodies_from_design(design)
+            for body in get_all_bodies_from_design(design)
             for face in body.faces
             if self.__is_occurrence(moniker, face.id)
         ]
 
     @protect_grpc
     @min_backend_version(25, 2, 0)
     def get_edge_occurrences_from_import_id(
-        self, import_id: "str", id_type: "PersistentIdType"
+        self, import_id: str, id_type: PersistentIdType
     ) -> list["Edge"]:
         """Get all edge occurrences whose master has the given import id.
 
@@ -257,12 +258,12 @@ def get_edge_occurrences_from_import_id(
         moniker = self.__get_moniker_from_import_id(id_type, import_id)
 
         if moniker is None:
-            return list()
+            return []
 
         design = self.__modeler.get_active_design()
         return [
             edge
-            for body in auxiliary.get_all_bodies_from_design(design)
+            for body in get_all_bodies_from_design(design)
             for edge in body.edges
             if self.__is_occurrence(moniker, edge.id)
         ]

tests/integration/test_design_import.py

@@ -33,8 +33,8 @@
 from ansys.geometry.core.designer.design import DesignFileFormat
 from ansys.geometry.core.math import Plane, Point2D, Point3D, UnitVector3D, Vector3D
 from ansys.geometry.core.misc import UNITS
-from ansys.geometry.core.misc.unsupported import PersistentIdType
 from ansys.geometry.core.sketch import Sketch
+from ansys.geometry.core.tools.unsupported import PersistentIdType
 
 from .conftest import FILES_DIR, IMPORT_FILES_DIR, skip_if_linux