ansys-api-geometry v0.3.0 related changes (#746)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com>

Author: 3 people

pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "ansys-api-geometry==0.2.16",
+    "ansys-api-geometry==0.3.0",
     "ansys-tools-path>=0.3",
     "beartype>=0.11.0",
     "google-api-python-client>=1.7.11",

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

@@ -49,5 +49,9 @@
     launch_modeler_with_spaceclaim_and_pimlight,
     launch_remote_modeler,
 )
-from ansys.geometry.core.connection.local_instance import GeometryContainers, LocalDockerInstance
+from ansys.geometry.core.connection.local_instance import (
+    GeometryContainers,
+    LocalDockerInstance,
+    get_geometry_container_type,
+)
 from ansys.geometry.core.connection.product_instance import ProductInstance

src/ansys/geometry/core/connection/client.py

@@ -25,8 +25,11 @@
 from pathlib import Path
 import time
 
+from ansys.api.dbu.v0.admin_pb2 import BackendType as GRPCBackendType
+from ansys.api.dbu.v0.admin_pb2_grpc import AdminStub
 from beartype import beartype as check_input_types
 from beartype.typing import Optional, Union
+from google.protobuf.empty_pb2 import Empty
 import grpc
 from grpc._channel import _InactiveRpcError
 from grpc_health.v1 import health_pb2, health_pb2_grpc
@@ -164,7 +167,21 @@ def __init__(
                 logging_file = str(logging_file)
             self._log.log_to_file(filename=logging_file, level=logging_level)
 
-        # Store the backend
+        self._admin_stub = AdminStub(self._channel)
+
+        # if no backend type has been specified, ask the backend which type it is
+        if backend_type == None:
+            grpc_backend_type = self._admin_stub.GetBackend(Empty()).type
+            if grpc_backend_type == GRPCBackendType.DISCOVERY:
+                backend_type = BackendType.DISCOVERY
+            elif grpc_backend_type == GRPCBackendType.SPACECLAIM:
+                backend_type = BackendType.SPACECLAIM
+            elif grpc_backend_type == GRPCBackendType.WINDOWS_DMS:
+                backend_type = BackendType.WINDOWS_SERVICE
+            elif grpc_backend_type == GRPCBackendType.LINUX_DMS:
+                backend_type = BackendType.LINUX_SERVICE
+
+        # Store the backend type
         self._backend_type = backend_type
 
     @property

src/ansys/geometry/core/connection/local_instance.py

@@ -328,3 +328,30 @@ def existed_previously(self) -> bool:
         deployed by this class or ``True`` if it already existed.
         """
         return self._existed_previously
+
+
+def get_geometry_container_type(instance: LocalDockerInstance) -> Union[GeometryContainers, None]:
+    """
+    Given a ``LocalDockerInstance``, provide back the ``GeometryContainers`` value.
+
+    Notes
+    -----
+    This method returns the first hit on the available tags.
+
+    Parameters
+    ----------
+    instance : LocalDockerInstance
+        The LocalDockerInstance object.
+
+    Returns
+    -------
+    Union[GeometryContainers, None]
+        The GeometryContainer value corresponding to the previous image or None
+        if not match.
+    """
+    for tag in instance.container.image.tags:
+        for geom_services in GeometryContainers:
+            if tag == f"{GEOMETRY_SERVICE_DOCKER_IMAGE}:{geom_services.value[2]}":
+                return geom_services
+
+    return None

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

@@ -24,6 +24,7 @@
 from enum import Enum, unique
 from functools import wraps
 
+from ansys.api.dbu.v0.dbumodels_pb2 import EntityIdentifier
 from ansys.api.geometry.v0.bodies_pb2 import (
     BooleanRequest,
     CopyRequest,
@@ -38,7 +39,6 @@
     ProjectCurvesRequest,
 )
 from ansys.api.geometry.v0.commands_pb2_grpc import CommandsStub
-from ansys.api.geometry.v0.models_pb2 import EntityIdentifier
 from beartype import beartype as check_input_types
 from beartype.typing import TYPE_CHECKING, List, Optional, Tuple, Union
 from pint import Quantity

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

@@ -24,6 +24,7 @@
 from enum import Enum, unique
 import uuid  # TODO: Is ID even needed? Maybe use from SC?
 
+from ansys.api.dbu.v0.dbumodels_pb2 import EntityIdentifier
 from ansys.api.geometry.v0.bodies_pb2 import (
     CreateBodyFromFaceRequest,
     CreateExtrudedBodyFromFaceProfileRequest,
@@ -40,7 +41,7 @@
     SetSharedTopologyRequest,
 )
 from ansys.api.geometry.v0.components_pb2_grpc import ComponentsStub
-from ansys.api.geometry.v0.models_pb2 import Direction, EntityIdentifier, Line
+from ansys.api.geometry.v0.models_pb2 import Direction, Line
 from beartype import beartype as check_input_types
 from beartype.typing import TYPE_CHECKING, List, Optional, Tuple, Union
 from pint import Quantity

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

@@ -24,23 +24,25 @@
 from enum import Enum, unique
 from pathlib import Path
 
+from ansys.api.dbu.v0.dbumodels_pb2 import EntityIdentifier, PartExportFormat
+from ansys.api.dbu.v0.designs_pb2 import NewRequest, SaveAsRequest
+from ansys.api.dbu.v0.designs_pb2_grpc import DesignsStub
 from ansys.api.geometry.v0.commands_pb2 import (
     AssignMidSurfaceOffsetTypeRequest,
     AssignMidSurfaceThicknessRequest,
     CreateBeamCircularProfileRequest,
 )
 from ansys.api.geometry.v0.commands_pb2_grpc import CommandsStub
-from ansys.api.geometry.v0.designs_pb2 import ExportRequest, NewRequest, SaveAsRequest
-from ansys.api.geometry.v0.designs_pb2_grpc import DesignsStub
 from ansys.api.geometry.v0.materials_pb2 import AddToDocumentRequest
 from ansys.api.geometry.v0.materials_pb2_grpc import MaterialsStub
-from ansys.api.geometry.v0.models_pb2 import Empty, EntityIdentifier
 from ansys.api.geometry.v0.models_pb2 import Material as GRPCMaterial
 from ansys.api.geometry.v0.models_pb2 import MaterialProperty as GRPCMaterialProperty
-from ansys.api.geometry.v0.models_pb2 import PartExportFormat
 from ansys.api.geometry.v0.namedselections_pb2_grpc import NamedSelectionsStub
+from ansys.api.geometry.v0.parts_pb2 import ExportRequest
+from ansys.api.geometry.v0.parts_pb2_grpc import PartsStub
 from beartype import beartype as check_input_types
 from beartype.typing import Dict, List, Optional, Union
+from google.protobuf.empty_pb2 import Empty
 import numpy as np
 from pint import Quantity
 
@@ -119,6 +121,7 @@ def __init__(self, name: str, grpc_client: GrpcClient, read_existing_design: boo
         self._commands_stub = CommandsStub(self._grpc_client.channel)
         self._materials_stub = MaterialsStub(self._grpc_client.channel)
         self._named_selections_stub = NamedSelectionsStub(self._grpc_client.channel)
+        self._parts_stub = PartsStub(self._grpc_client.channel)
 
         # Initialize needed instance variables
         self._materials = []
@@ -235,7 +238,7 @@ def download(
             DesignFileFormat.IGES,
             DesignFileFormat.PMDB,
         ]:
-            response = self._design_stub.Export(ExportRequest(format=format.value[1]))
+            response = self._parts_stub.Export(ExportRequest(format=format.value[1]))
             received_bytes += response.data
         else:
             self._grpc_client.log.warning(
@@ -585,9 +588,11 @@ def __read_existing_design(self) -> None:
             raise RuntimeError("No existing design available at service level.")
         else:
             self._id = design.main_part.id
-            self._name = design.main_part.name
+            # Here we may take the design's name instead of the main part's name.
+            # Since they're the same in the backend.
+            self._name = design.name
 
-        response = self._design_stub.GetAssembly(EntityIdentifier(id=""))
+        response = self._commands_stub.GetAssembly(EntityIdentifier(id=""))
 
         # Store created objects
         created_parts = {p.id: Part(p.id, p.name, [], []) for p in response.parts}

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

@@ -23,8 +23,8 @@
 
 from enum import Enum, unique
 
+from ansys.api.dbu.v0.dbumodels_pb2 import EntityIdentifier
 from ansys.api.geometry.v0.edges_pb2_grpc import EdgesStub
-from ansys.api.geometry.v0.models_pb2 import EntityIdentifier
 from beartype.typing import TYPE_CHECKING, List
 from pint import Quantity
 

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

@@ -23,11 +23,11 @@
 
 from enum import Enum, unique
 
+from ansys.api.dbu.v0.dbumodels_pb2 import EntityIdentifier
 from ansys.api.geometry.v0.edges_pb2_grpc import EdgesStub
 from ansys.api.geometry.v0.faces_pb2 import EvaluateRequest, GetNormalRequest
 from ansys.api.geometry.v0.faces_pb2_grpc import FacesStub
 from ansys.api.geometry.v0.models_pb2 import Edge as GRPCEdge
-from ansys.api.geometry.v0.models_pb2 import EntityIdentifier
 from beartype.typing import TYPE_CHECKING, List
 from pint import Quantity
 

src/ansys/geometry/core/modeler.py

@@ -24,12 +24,12 @@
 import os
 from pathlib import Path
 
+from ansys.api.dbu.v0.dbuapplication_pb2 import RunScriptFileRequest
+from ansys.api.dbu.v0.dbuapplication_pb2_grpc import DbuApplicationStub
+from ansys.api.dbu.v0.designs_pb2 import OpenRequest
+from ansys.api.dbu.v0.designs_pb2_grpc import DesignsStub
 from ansys.api.geometry.v0.commands_pb2 import UploadFileRequest
 from ansys.api.geometry.v0.commands_pb2_grpc import CommandsStub
-from ansys.api.geometry.v0.designs_pb2 import OpenRequest
-from ansys.api.geometry.v0.designs_pb2_grpc import DesignsStub
-from ansys.api.geometry.v0.geometryapplication_pb2 import RunScriptFileRequest
-from ansys.api.geometry.v0.geometryapplication_pb2_grpc import GeometryApplicationStub
 from beartype.typing import TYPE_CHECKING, Dict, Optional, Tuple, Union
 from grpc import Channel
 
@@ -323,7 +323,7 @@ def run_discovery_script_file(
             ran successfully.
         """
         serv_path = self._upload_file(file_path)
-        ga_stub = GeometryApplicationStub(self._client.channel)
+        ga_stub = DbuApplicationStub(self._client.channel)
         request = RunScriptFileRequest(
             script_path=serv_path,
             script_args=script_args,