Merge branch 'main' into release/0.2

RobPasMue · RobPasMue · commit 032e8b7d1e4d · 2023-06-22T17:08:07.000+02:00
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -75,7 +75,7 @@ jobs:
   testing-windows:
     name: Testing and coverage (Windows)
     needs: [smoke-tests]
-    runs-on: [self-hosted, pygeometry]
+    runs-on: [self-hosted, Windows, pygeometry]
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
@@ -179,7 +179,7 @@ jobs:
   docs:
     name: Documentation
     needs: [docs-style]
-    runs-on: [self-hosted, pygeometry]
+    runs-on: [self-hosted, Windows, pygeometry]
     steps:
       - uses: actions/checkout@v3
 
@@ -347,7 +347,7 @@ jobs:
     needs: [testing-windows, testing-linux, docs]
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
     runs-on:
-      group: ansys-internal
+      group: ansys-network
       labels: [self-hosted, Windows, signtool]
 
     steps:
diff --git a/.github/workflows/docker_push_stable.yml b/.github/workflows/docker_push_stable.yml
@@ -58,8 +58,8 @@ jobs:
     if: inputs.ansyslab
     needs: [windows]
     runs-on:
-      group: ansys-internal
-      labels: Windows
+      group: ansys-network
+      labels: [Windows, pygeometry]
     steps:
       - name: Login in Github Container registry
         uses: docker/login-action@v2
@@ -110,8 +110,8 @@ jobs:
     if: inputs.ansyslab
     needs: [linux]
     runs-on:
-      group: ansys-internal
-      labels: Linux
+      group: ansys-network
+      labels: [Linux, pygeometry]
     steps:
       - name: Login in Github Container registry
         uses: docker/login-action@v2
diff --git a/.github/workflows/docker_test_build.yml b/.github/workflows/docker_test_build.yml
@@ -21,6 +21,7 @@ env:
   ANSRV_GEO_PORT: 700
   ANSRV_GEO_LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
   GEO_CONT_NAME: ans_geo
+  RESET_IMAGE_CACHE: 0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,7 +34,7 @@ jobs:
 
   build-windows:
     name: Building Geometry Service - Windows
-    runs-on: [self-hosted, pygeometry]
+    runs-on: [self-hosted, Windows, pygeometry]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -70,9 +71,21 @@ jobs:
           python -m venv .venv
           .\.venv\Scripts\Activate.ps1
           python -m pip install --upgrade pip
-          pip install .
+          pip install -e .[tests]
           python -c "from ansys.geometry.core.connection.validate import validate; validate()"
 
+      - name: Restore images cache
+        uses: actions/cache@v3
+        with:
+          path: .\tests\integration\image_cache
+          key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
+          restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
+
+      - name: Testing
+        run: |
+          .\.venv\Scripts\Activate.ps1
+          pytest -v --use-existing-service=yes
+
       - name: Stop the Geometry service
         if: always()
         run: |
@@ -122,9 +135,26 @@ jobs:
       - name: Validate connection using PyGeometry
         run: |
           python -m pip install --upgrade pip
-          pip install .
+          pip install -e .[tests]
           python -c "from ansys.geometry.core.connection.validate import validate; validate()"
 
+      - name: Restore images cache
+        uses: actions/cache@v3
+        with:
+          path: .\tests\integration\image_cache
+          key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
+          restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
+
+      - name: Run pytest
+        uses: ansys/actions/tests-pytest@v4
+        env:
+          ALLOW_PLOTTING: true
+        with:
+          python-version: ${{ env.MAIN_PYTHON_VERSION }}
+          pytest-extra-args: "--service-os=linux --use-existing-service=yes"
+          checkout: false
+          requires-xvfb: true
+
       - name: Stop the Geometry service
         if: always()
         run: |
diff --git a/.github/workflows/nightly_docker_test.yml b/.github/workflows/nightly_docker_test.yml
@@ -20,7 +20,7 @@ jobs:
 
   windows-tests:
     name: Nightly unstable testing - Windows
-    runs-on: [self-hosted, pygeometry]
+    runs-on: [self-hosted, Windows, pygeometry]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/doc/Makefile b/doc/Makefile
@@ -32,6 +32,7 @@ pdf:
 
 # Build HTML files and generate examples as .py files
 html:
+	@$(SPHINXBUILD) -M linkcheck "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	@$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	cd $(BUILDDIR)/html/examples
 	for d in */ ; do
diff --git a/doc/make.bat b/doc/make.bat
@@ -32,6 +32,7 @@ if errorlevel 9009 (
 goto end
 
 :html
+%SPHINXBUILD% -M linkcheck %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 %SPHINXBUILD% -M html %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 goto build-examples-py
 
diff --git a/doc/source/examples/01_getting_started/02_units.mystnb b/doc/source/examples/01_getting_started/02_units.mystnb
@@ -37,7 +37,7 @@ Now, with this ``UnitRegistry`` object called ``UNITS``, we will create
 ``Quantity`` objects also have convenience methods for: transforming to different units, comparing
 magnitudes/values, units, etc. For more information on their functioning please refer to the
 [pint.Quantity](https://pint.readthedocs.io/en/stable/api/base.html#most-important-classes)
-docs or the [Pint tutorial](https://pint.readthedocs.io/en/stable/getting/tutorial.html?#tutorial).
+docs or the [Pint tutorial](https://pint.readthedocs.io/en/stable/getting/tutorial.html).
 
 ```{code-cell} ipython3
 from pint import Quantity
diff --git a/doc/source/getting_started/docker.rst b/doc/source/getting_started/docker.rst
@@ -49,7 +49,7 @@ Docker container.
 
 #. If you have Docker installed, use a GitHub personal access token (PAT) with packages read permission to authorize Docker
    to access this repository. For more information,
-   see `creating a personal access token <https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token>`_.
+   see `creating a personal access token <https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens>`_.
 
 #. Save the token to a file:
 
diff --git a/docker/README.rst b/docker/README.rst
@@ -64,5 +64,5 @@ In order to build your images, follow the next instructions:
      docker images
 
      >>> REPOSITORY                                               TAG                                IMAGE ID       CREATED          SIZE
-     >>> ghcr.io/ansys/geometry                                 *******-latest                     ............   X seconds ago    6.43GB
+     >>> ghcr.io/ansys/geometry                                   *******-latest                     ............   X seconds ago    6.43GB
      >>> ......                                                   ......                             ............   ..............   ......
diff --git a/pyproject.toml b/pyproject.toml
@@ -49,17 +49,17 @@ all = [
 
 tests = [
     "ansys-platform-instancemanagement==1.1.1",
-    "beartype==0.14.0",
-    "docker==6.1.2",
-    "google-api-python-client==2.86.0",
-    "googleapis-common-protos==1.59.0",
+    "beartype==0.14.1",
+    "docker==6.1.3",
+    "google-api-python-client==2.90.0",
+    "googleapis-common-protos==1.59.1",
     "grpcio==1.50.0",
     "grpcio-health-checking==1.48.2",
-    "numpy==1.24.3",
-    "Pint==0.21",
+    "numpy==1.25.0",
+    "Pint==0.22",
     "protobuf==3.20.3",
-    "pytest==7.3.1",
-    "pytest-cov==4.0.0",
+    "pytest==7.3.2",
+    "pytest-cov==4.1.0",
     "pytest-pyvista==0.1.8",
     "pyvista[trame]==0.39.1",
     "requests==2.31.0",
@@ -69,20 +69,20 @@ tests = [
 ]
 doc = [
     "ansys-sphinx-theme==0.9.9",
-    "docker==6.1.2",
+    "docker==6.1.3",
     "ipyvtklink==0.2.3",
     "jupyter_sphinx==0.4.0",
-    "jupytext==1.14.5",
+    "jupytext==1.14.6",
     "myst-parser==1.0.0",
-    "nbconvert==7.4.0",
-    "nbsphinx==0.9.1",
+    "nbconvert==7.6.0",
+    "nbsphinx==0.9.2",
     "notebook==6.5.4",
     "numpydoc==1.5.0",
-    "panel==1.0.2",
+    "panel==1.1.1",
     "pyvista[trame]==0.39.1",
     "requests==2.31.0",
     "Sphinx==6.1.3",
-    "sphinx-autoapi==2.1.0",
+    "sphinx-autoapi==2.1.1",
     "sphinx-autodoc-typehints==1.22.0",
     "sphinx-copybutton==0.5.2",
     "sphinx_design==0.4.1",
diff --git a/src/ansys/geometry/core/designer/body.py b/src/ansys/geometry/core/designer/body.py
@@ -679,8 +679,7 @@ def copy(self, parent: "Component", name: str = None) -> "Body":  # noqa: D102
         tb = MasterBody(
             response.master_id, copy_name, self._grpc_client, is_surface=self.is_surface
         )
-        parent._transformed_part.part.bodies.append(tb)
-        # TODO: fix when DMS ObjectPath is fixed - previously we return the body with response.id
+        parent._master_component.part.bodies.append(tb)
         body_id = f"{parent.id}/{tb.id}" if parent.parent_component else tb.id
         return Body(body_id, response.name, parent, tb)
 
diff --git a/src/ansys/geometry/core/designer/component.py b/src/ansys/geometry/core/designer/component.py
@@ -87,9 +87,9 @@ class Component:
         If a component already exists on the server, you can pass in its ID to create it on the
         client-side data model. If this is argument is present, a new Component will not be created
         on the server.
-    transformed_part : MasterComponent, optional
+    master_component : MasterComponent, optional
         This argument should be present when creating a nested instance component. It will use the
-        given transformed_part instead of creating a new one.
+        given master_component instead of creating a new one.
     read_existing_comp : bool, optional
         Indicates whether an existing component on the service should be read
         or not. By default, ``False``. This is only valid when connecting
@@ -112,7 +112,7 @@ def __init__(
         grpc_client: GrpcClient,
         template: Optional["Component"] = None,
         preexisting_id: Optional[str] = None,
-        transformed_part: Optional[MasterComponent] = None,
+        master_component: Optional[MasterComponent] = None,
         read_existing_comp: bool = False,
     ):
         """Initialize ``Component`` class."""
@@ -146,32 +146,31 @@ def __init__(
         self._parent_component = parent_component
         self._is_alive = True
         self._shared_topology = None
-        self._transformed_part = transformed_part
+        self._master_component = master_component
 
         # Populate client data model
         if template:
             # If this is not a nested instance
-            if not transformed_part:
+            if not master_component:
                 # Create new MasterComponent, but use template's Part
-                tp = MasterComponent(
+                master = MasterComponent(
                     uuid.uuid4(),
-                    f"tp_{name}",
-                    template._transformed_part.part,
-                    template._transformed_part.transform,
+                    f"master_{name}",
+                    template._master_component.part,
+                    template._master_component.transform,
                 )
-                tp.part.parts.append(tp)
-                self._transformed_part = tp
+                self._master_component = master
 
             # Recurse - Create more children components from template's remaining children
             self.__create_children(template)
-            return
 
         elif not read_existing_comp:
             # This is an independent Component - Create new Part and MasterComponent
             p = Part(uuid.uuid4(), f"p_{name}", [], [])
-            tp = MasterComponent(uuid.uuid4(), f"tp_{name}", p)
-            p.parts.append(tp)
-            self._transformed_part = tp
+            master = MasterComponent(uuid.uuid4(), f"master_{name}", p)
+            self._master_component = master
+
+        self._master_component.occurrences.append(self)
 
     @property
     def id(self) -> str:
@@ -192,7 +191,7 @@ def components(self) -> List["Component"]:
     def bodies(self) -> List[Body]:
         """``Body`` objects inside of the component."""
         bodies = []
-        for body in self._transformed_part.part.bodies:
+        for body in self._master_component.part.bodies:
             id = f"{self.id}/{body.id}" if self.parent_component else body.id
             bodies.append(Body(id, body.name, self, body))
         return bodies
@@ -242,7 +241,7 @@ def __create_children(self, template: "Component") -> None:
                 self._grpc_client,
                 template=template_comp,
                 preexisting_id=new_id,
-                transformed_part=template_comp._transformed_part,
+                master_component=template_comp._master_component,
             )
             self.components.append(new)
 
@@ -257,7 +256,7 @@ def get_world_transform(self) -> Matrix44:
         """
         if self.parent_component is None:
             return IDENTITY_MATRIX44
-        return self.parent_component.get_world_transform() * self._transformed_part.transform
+        return self.parent_component.get_world_transform() * self._master_component.transform
 
     @protect_grpc
     def modify_placement(
@@ -308,7 +307,7 @@ def modify_placement(
                 rotation_angle=angle.value.m,
             )
         )
-        self._transformed_part.transform = grpc_matrix_to_matrix(response.matrix)
+        self._master_component.transform = grpc_matrix_to_matrix(response.matrix)
 
     def reset_placement(self):
         """
@@ -336,7 +335,25 @@ def add_component(self, name: str, template: Optional["Component"] = None) -> "C
         Component
             New component with no children in the design assembly.
         """
-        self._components.append(Component(name, self, self._grpc_client, template=template))
+        new_comp = Component(name, self, self._grpc_client, template=template)
+        master = new_comp._master_component
+        master_id = new_comp.id.split("/")[-1]
+
+        for comp in self._master_component.occurrences:
+            if comp.id != self.id:
+                comp.components.append(
+                    Component(
+                        name,
+                        comp,
+                        self._grpc_client,
+                        template,
+                        preexisting_id=f"{comp.id}/{master_id}",
+                        master_component=master,
+                        read_existing_comp=True,
+                    )
+                )
+
+        self.components.append(new_comp)
         return self._components[-1]
 
     @protect_grpc
@@ -402,7 +419,7 @@ def extrude_sketch(
         self._grpc_client.log.debug(f"Extruding sketch provided on {self.id}. Creating body...")
         response = self._bodies_stub.CreateExtrudedBody(request)
         tb = MasterBody(response.master_id, name, self._grpc_client, is_surface=False)
-        self._transformed_part.part.bodies.append(tb)
+        self._master_component.part.bodies.append(tb)
         return Body(response.id, response.name, self, tb)
 
     @protect_grpc
@@ -449,7 +466,7 @@ def extrude_face(self, name: str, face: Face, distance: Union[Quantity, Distance
         response = self._bodies_stub.CreateExtrudedBodyFromFaceProfile(request)
 
         tb = MasterBody(response.master_id, name, self._grpc_client, is_surface=False)
-        self._transformed_part.part.bodies.append(tb)
+        self._master_component.part.bodies.append(tb)
         return Body(response.id, response.name, self, tb)
 
     @protect_grpc
@@ -486,7 +503,7 @@ def create_surface(self, name: str, sketch: Sketch) -> Body:
         response = self._bodies_stub.CreatePlanarBody(request)
 
         tb = MasterBody(response.master_id, name, self._grpc_client, is_surface=True)
-        self._transformed_part.part.bodies.append(tb)
+        self._master_component.part.bodies.append(tb)
         return Body(response.id, response.name, self, tb)
 
     @protect_grpc
@@ -526,7 +543,7 @@ def create_surface_from_face(self, name: str, face: Face) -> Body:
         response = self._bodies_stub.CreateBodyFromFace(request)
 
         tb = MasterBody(response.master_id, name, self._grpc_client, is_surface=True)
-        self._transformed_part.part.bodies.append(tb)
+        self._master_component.part.bodies.append(tb)
         return Body(response.id, response.name, self, tb)
 
     @check_input_types
diff --git a/src/ansys/geometry/core/designer/design.py b/src/ansys/geometry/core/designer/design.py
diff --git a/src/ansys/geometry/core/designer/part.py b/src/ansys/geometry/core/designer/part.py
diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/integration/test_design.py b/tests/integration/test_design.py
