Merge branch 'main' into release/0.2

Author: RobPasMue

.github/workflows/ci_cd.yml

@@ -412,4 +412,3 @@ jobs:
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}
-          python-version: ${{ env.MAIN_PYTHON_VERSION }}

.github/workflows/docker_push_stable.yml

@@ -23,15 +23,19 @@ concurrency:
 permissions:
   packages: write
 
+env:
+  WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:windows-latest-unstable
+  WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:windows-latest
+  WINDOWS_STABLE_FUJI: azwepsifujiaksacr.azurecr.io/ansys/discovery/geometry:windows-latest
+  LINUX_UNSTABLE: ghcr.io/ansys/geometry:linux-latest-unstable
+  LINUX_STABLE_GHCR: ghcr.io/ansys/geometry:linux-latest
+  LINUX_STABLE_FUJI: azwepsifujiaksacr.azurecr.io/ansys/discovery/geometry:linux-latest
+
 jobs:
   windows:
     name: Publish Windows latest image
     runs-on: windows-latest
     if:  inputs.images == 'all' || inputs.images == 'windows-latest'
-    env:
-      WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:windows-latest-unstable
-      WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:windows-latest
-      WINDOWS_STABLE_FUJI: azwepsifujiaksacr.azurecr.io/ansys/discovery/geometry:windows-latest
     steps:
       - name: Login in Github Container registry
         uses: docker/login-action@v2
@@ -49,30 +53,41 @@ jobs:
       - name: Publish latest stable container in ghcr.io
         run: docker push ${{ env.WINDOWS_STABLE_GHCR }}
 
+  windows-ansyslab:
+    name: Publish Windows latest image on AnsysLab
+    if: inputs.ansyslab
+    needs: [windows]
+    runs-on:
+      group: ansys-internal
+      labels: Windows
+    steps:
+      - name: Login in Github Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull Windows latest unstable container
+        run: docker pull ${{ env.WINDOWS_STABLE_GHCR }}
+
       - name: Login in AnsysLab registry
-        if: ${{ inputs.ansyslab }}
         uses: docker/login-action@v2
         with:
           registry: azwepsifujiaksacr.azurecr.io
           username: ${{ secrets.FUJI_USER }}
           password: ${{ secrets.FUJI_TOKEN }}
 
       - name: Tag container as latest (stable) for AnsysLab registry
-        if: ${{ inputs.ansyslab }}
-        run: docker tag ${{ env.WINDOWS_UNSTABLE }} ${{ env.WINDOWS_STABLE_FUJI }}
+        run: docker tag ${{ env.WINDOWS_STABLE_GHCR }} ${{ env.WINDOWS_STABLE_FUJI }}
 
       - name: Publish latest stable container in AnsysLab registry
-        if: ${{ inputs.ansyslab }}
         run: docker push ${{ env.WINDOWS_STABLE_FUJI }}
 
   linux:
     name: Publish Linux latest image
     runs-on: ubuntu-latest
     if:  inputs.images == 'all' || inputs.images == 'linux-latest'
-    env:
-      LINUX_UNSTABLE: ghcr.io/ansys/geometry:linux-latest-unstable
-      LINUX_STABLE_GHCR: ghcr.io/ansys/geometry:linux-latest
-      LINUX_STABLE_FUJI: azwepsifujiaksacr.azurecr.io/ansys/discovery/geometry:linux-latest
     steps:
       - name: Login in Github Container registry
         uses: docker/login-action@v2
@@ -90,18 +105,33 @@ jobs:
       - name: Publish latest stable container in ghcr.io
         run: docker push ${{ env.LINUX_STABLE_GHCR }}
 
+  linux-ansyslab:
+    name: Publish Linux latest image on AnsysLab
+    if: inputs.ansyslab
+    needs: [linux]
+    runs-on:
+      group: ansys-internal
+      labels: Linux
+    steps:
+      - name: Login in Github Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull Linux latest stable container
+        run: docker pull ${{ env.LINUX_STABLE_GHCR }}
+
       - name: Login in AnsysLab registry
-        if: ${{ inputs.ansyslab }}
         uses: docker/login-action@v2
         with:
           registry: azwepsifujiaksacr.azurecr.io
           username: ${{ secrets.FUJI_USER }}
           password: ${{ secrets.FUJI_TOKEN }}
 
       - name: Tag container as latest (stable) for AnsysLab registry
-        if: ${{ inputs.ansyslab }}
-        run: docker tag ${{ env.LINUX_UNSTABLE }} ${{ env.LINUX_STABLE_FUJI }}
+        run: docker tag ${{ env.LINUX_STABLE_GHCR }} ${{ env.LINUX_STABLE_FUJI }}
 
       - name: Publish latest stable container in AnsysLab registry
-        if: ${{ inputs.ansyslab }}
         run: docker push ${{ env.LINUX_STABLE_FUJI }}

AUTHORS.md

@@ -16,3 +16,4 @@
 * [Jorge Martínez](https://github.com/jorgepiloto)
 * [Alejandro Fernández](https://github.com/AlejandroFernandezLuces)
 * [Lance Lance](https://github.com/LanceX2214)
+* [Dastan Abdulla](https://github.com/dastan-ansys)

docker/Dockerfile.linux

@@ -16,6 +16,13 @@ RUN unzip -qqju linux-binaries.zip -d . && rm linux-binaries.zip
 # Let the dynamic link loader where to search for shared libraries
 ENV LD_LIBRARY_PATH="/app"
 
+# Define env variables
+ENV ANS_DSCO_REMOTE_PORT=50051
+ENV ANS_DSCO_REMOTE_IP="0.0.0.0"
+ENV LOG_LEVEL=2
+ENV ENABLE_TRACE=0
+ENV ANSYSLMD_LICENSE_FILE=""
+
 # Add container labels
 LABEL org.opencontainers.image.authors="ANSYS Inc."
 LABEL org.opencontainers.image.vendor="ANSYS Inc."

docker/Dockerfile.windows

@@ -20,7 +20,7 @@ RUN for /R "tmp_folder" %f in (*) do move /Y "%f" .
 RUN del windows-binaries.zip && rmdir /s /q tmp_folder
 
 # Defining environment variables
-ENV LICENSE_SERVER = ""
+ENV LICENSE_SERVER=""
 ENV SERVER_ENDPOINT="0.0.0.0:50051"
 ENV ENABLE_TRACE=0
 ENV LOG_LEVEL=2

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

@@ -1,10 +1,10 @@
 """Provides the PyGeometry ``designer`` subpackage."""
 
-from ansys.geometry.core.designer.body import Body, MidSurfaceOffsetType, TemplateBody
+from ansys.geometry.core.designer.body import Body, MasterBody, MidSurfaceOffsetType
 from ansys.geometry.core.designer.component import Component, SharedTopologyType
 from ansys.geometry.core.designer.design import Design, DesignFileFormat
 from ansys.geometry.core.designer.designpoint import DesignPoint
 from ansys.geometry.core.designer.edge import CurveType, Edge
 from ansys.geometry.core.designer.face import Face, SurfaceType
-from ansys.geometry.core.designer.part import Part, TransformedPart
+from ansys.geometry.core.designer.part import MasterComponent, Part
 from ansys.geometry.core.designer.selection import NamedSelection

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

@@ -58,7 +58,7 @@ class IBody(ABC):
     """
     Abstract Body interface.
 
-    Defines the common methods for a body. TemplateBody and Body both inherit from this.
+    Defines the common methods for a body. MasterBody and Body both inherit from this.
     All child classes must implement all abstract methods.
     """
 
@@ -443,7 +443,7 @@ def unite(self, other: "Body") -> None:
         return
 
 
-class TemplateBody(IBody):
+class MasterBody(IBody):
     """
     Represents solids and surfaces organized within the design assembly.
 
@@ -460,7 +460,7 @@ class TemplateBody(IBody):
     grpc_client : GrpcClient
         An active supporting geometry service instance for design modeling.
     is_surface : bool, default: False
-        Boolean indicating whether the ``TemplateBody`` is in fact a surface or an actual
+        Boolean indicating whether the ``MasterBody`` is in fact a surface or an actual
         3D object (with volume).
     """
 
@@ -471,7 +471,7 @@ def __init__(
         grpc_client: GrpcClient,
         is_surface: bool = False,
     ):
-        """Initialize ``TemplateBody`` class."""
+        """Initialize ``MasterBody`` class."""
         check_type(id, str)
         check_type(name, str)
         check_type(grpc_client, GrpcClient)
@@ -489,7 +489,7 @@ def __init__(
         self._tessellation = None
 
     def reset_tessellation_cache(func):
-        """Decorate ``TemplateBody`` methods that require a tessellation cache update.
+        """Decorate ``MasterBody`` methods that require a tessellation cache update.
 
         Parameters
         ----------
@@ -503,7 +503,7 @@ def reset_tessellation_cache(func):
         """
 
         @wraps(func)
-        def wrapper(self: "TemplateBody", *args, **kwargs):
+        def wrapper(self: "MasterBody", *args, **kwargs):
             self._tessellation = None
             return func(self, *args, **kwargs)
 
@@ -614,7 +614,7 @@ def imprint_curves(
     ) -> Tuple[List[Edge], List[Face]]:  # noqa: D102
         raise NotImplementedError(
             """
-            imprint_curves is not implemented at the TemplateBody level.
+            imprint_curves is not implemented at the MasterBody level.
             Instead, call this method on a Body.
             """
         )
@@ -630,7 +630,7 @@ def project_curves(
     ) -> List[Face]:  # noqa: D102
         raise NotImplementedError(
             """
-            project_curves is not implemented at the TemplateBody level.
+            project_curves is not implemented at the MasterBody level.
             Instead, call this method on a Body.
             """
         )
@@ -676,7 +676,7 @@ def copy(self, parent: "Component", name: str = None) -> "Body":  # noqa: D102
         )
 
         # Assign the new body to its specified parent (and return the new body)
-        tb = TemplateBody(
+        tb = MasterBody(
             response.master_id, copy_name, self._grpc_client, is_surface=self.is_surface
         )
         parent._transformed_part.part.bodies.append(tb)
@@ -726,23 +726,23 @@ def plot(
 
     def intersect(self, other: "Body") -> None:  # noqa: D102
         raise NotImplementedError(
-            "TemplateBody does not implement boolean methods. Call this method on a Body instead."
+            "MasterBody does not implement boolean methods. Call this method on a Body instead."
         )
 
     def subtract(self, other: "Body") -> None:  # noqa: D102
         raise NotImplementedError(
-            "TemplateBody does not implement boolean methods. Call this method on a Body instead."
+            "MasterBody does not implement boolean methods. Call this method on a Body instead."
         )
 
     def unite(self, other: "Body") -> None:
         # noqa: D102
         raise NotImplementedError(
-            "TemplateBody does not implement boolean methods. Call this method on a Body instead."
+            "MasterBody does not implement boolean methods. Call this method on a Body instead."
         )
 
     def __repr__(self) -> str:
-        """Represent the ``TemplateBody`` as a string."""
-        lines = [f"ansys.geometry.core.designer.TemplateBody {hex(id(self))}"]
+        """Represent the ``MasterBody`` as a string."""
+        lines = [f"ansys.geometry.core.designer.MasterBody {hex(id(self))}"]
         lines.append(f"  Name                 : {self.name}")
         lines.append(f"  Exists               : {self.is_alive}")
         lines.append(f"  Surface body         : {self.is_surface}")
@@ -767,11 +767,11 @@ class Body(IBody):
         User-defined label for the body.
     parent : Component
         Parent component to nest the new component under within the design assembly.
-    template : TemplateBody
+    template : MasterBody
         The master body that this body is an occurrence of.
     """
 
-    def __init__(self, id, name, parent: "Component", template: TemplateBody) -> None:
+    def __init__(self, id, name, parent: "Component", template: MasterBody) -> None:
         """Initialize ``Body`` class."""
         self._id = id
         self._name = name
@@ -1016,7 +1016,7 @@ def __repr__(self) -> str:
         lines.append(f"  Name                 : {self.name}")
         lines.append(f"  Exists               : {self.is_alive}")
         lines.append(f"  Parent component     : {self._parent.name}")
-        lines.append(f"  TemplateBody         : {self._template.id}")
+        lines.append(f"  MasterBody         : {self._template.id}")
         lines.append(f"  Surface body         : {self.is_surface}")
         if self.is_surface:
             lines.append(f"  Surface thickness    : {self.surface_thickness}")