Merge branch 'main' of https://github.com/ansys/pyansys-geometry

smereu · smereu · commit 7a728c4204d5 · 2025-09-25T11:57:54.000-05:00
diff --git a/.github/workflows/backwards_compatibility.yml b/.github/workflows/backwards_compatibility.yml
@@ -92,10 +92,17 @@ jobs:
               docker rm $dockerContainers
           }
 
+      - name: Define SERVER_ENDPOINT variable if needed
+        if: matrix.backend-version == '24.1' || matrix.backend-version == '24.2' || matrix.backend-version == '25.1'
+        run: |
+          $env:SERVER_ENDPOINT = "-e SERVER_ENDPOINT=50051@0.0.0.0"
+          echo "SERVER_ENDPOINT variable set to: $env:SERVER_ENDPOINT"
+          echo "SERVER_ENDPOINT=$env:SERVER_ENDPOINT" | Out-File -FilePath $env:GITHUB_ENV -Append
+
       - name: Start Geometry service and verify start
         run: |
           .\.venv\Scripts\Activate.ps1
-          docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE }}:${{ matrix.image-tag }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
+          docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} ${{ env.SERVER_ENDPOINT }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE }}:${{ matrix.image-tag }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
           Start-Sleep -Seconds 10
           python -c "from ansys.geometry.core.connection.validate import validate; validate()"
 
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -17,7 +17,7 @@ env:
   ANSRV_GEO_PORT: 700
   ANSRV_GEO_LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
   GEO_CONT_NAME: ans_geo
-  RESET_IMAGE_CACHE: 5
+  RESET_IMAGE_CACHE: 6
   IS_WORKFLOW_RUNNING: True
   ARTIFACTORY_VERSION: v261
 
@@ -256,7 +256,7 @@ jobs:
 
       - name: Restore images cache
         if: env.SKIP_UNSTABLE == 'false'
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: .\tests\integration\image_cache
           key: pyvista-image-cache-${{ runner.name }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
@@ -424,7 +424,7 @@ jobs:
 
       - name: Restore images cache
         if: env.SKIP_UNSTABLE == 'false'
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: tests/integration/image_cache
           key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
@@ -769,7 +769,7 @@ jobs:
           pip install -e .[tests]
 
       - name: Restore images cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: .\tests\integration\image_cache
           key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
@@ -864,7 +864,7 @@ jobs:
           python -c "from ansys.geometry.core.connection.validate import validate; validate()"
 
       - name: Restore images cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: .\tests\integration\image_cache
           key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
diff --git a/doc/changelog.d/2252.added.md b/doc/changelog.d/2252.added.md
@@ -0,0 +1 @@
+Loft profiles with guides
diff --git a/doc/changelog.d/2253.dependencies.md b/doc/changelog.d/2253.dependencies.md
@@ -0,0 +1 @@
+Bump ansys-api-geometry from 0.4.76 to 0.4.77
diff --git a/doc/changelog.d/2254.maintenance.md b/doc/changelog.d/2254.maintenance.md
@@ -0,0 +1 @@
+Bump actions/cache from 4.2.4 to 4.3.0 in the actions group
diff --git a/doc/changelog.d/2255.added.md b/doc/changelog.d/2255.added.md
@@ -0,0 +1 @@
+Check for match
diff --git a/doc/changelog.d/2256.maintenance.md b/doc/changelog.d/2256.maintenance.md
@@ -0,0 +1 @@
+Backwards compatibility changes on Docker images
diff --git a/doc/changelog.d/2258.dependencies.md b/doc/changelog.d/2258.dependencies.md
@@ -0,0 +1 @@
+Upgrade grpcio and protobuf
diff --git a/docker/windows/dms/Dockerfile b/docker/windows/dms/Dockerfile
@@ -26,7 +26,7 @@ RUN mkdir tmp_folder && \
 
 # Defining environment variables
 ENV LICENSE_SERVER=""
-ENV SERVER_ENDPOINT="0.0.0.0:50051"
+ENV SERVER_ENDPOINT="50051@0.0.0.0"
 ENV ENABLE_TRACE=0
 ENV LOG_LEVEL=2
 ENV AWP_ROOT252=C:/app/unified
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "ansys-api-geometry==0.4.76",
+    "ansys-api-geometry==0.4.77",
     "ansys-tools-path>=0.3,<1",
     "beartype>=0.11.0,<0.22",
     "geomdl>=5,<6",
@@ -33,7 +33,7 @@ dependencies = [
     "matplotlib>=3,<4",
     "numpy>=1.20.3,<3",
     "Pint>=0.18,<1",
-    "protobuf>=3.20.2,<6",
+    "protobuf>=3.20.2,<7",
     "requests>=2,<3",
     "scipy>=1.7.3,<2",
     "semver>=3,<4",
@@ -62,12 +62,12 @@ tests = [
     "beartype==0.21.0",
     "docker==7.1.0",
     "geomdl==5.4.0",
-    "grpcio==1.71.0",
-    "grpcio-health-checking==1.71.0",
+    "grpcio==1.75.0",
+    "grpcio-health-checking==1.75.0",
     "matplotlib==3.10.6",
     "numpy==2.2.6",
     "Pint==0.24.4",
-    "protobuf==5.29.3",
+    "protobuf==6.32.1",
     "pygltflib==1.16.5",
     "pytest==8.4.2",
     "pytest-cov==6.3.0",
@@ -93,8 +93,8 @@ doc = [
     "beartype==0.21.0",
     "docker==7.1.0",
     "geomdl==5.4.0",
-    "grpcio==1.71.0",
-    "grpcio-health-checking==1.71.0",
+    "grpcio==1.75.0",
+    "grpcio-health-checking==1.75.0",
     "ipyvtklink==0.2.3",
     "jupyter_sphinx==0.5.3",
     "jupytext==1.17.3",
@@ -108,7 +108,7 @@ doc = [
     "panel==1.8.1",
     "pdf2image==1.17.0",
     "Pint==0.24.4",
-    "protobuf==5.29.3",
+    "protobuf==6.32.1",
     "pygltflib==1.16.5",
     "pyvista[jupyter]==0.46.3",
     "quarto-cli==1.8.24",
diff --git a/src/ansys/geometry/core/_grpc/_services/base/bodies.py b/src/ansys/geometry/core/_grpc/_services/base/bodies.py
@@ -218,3 +218,8 @@ def get_tesellation_with_options(self, **kwargs) -> dict:
     def boolean(self, **kwargs) -> dict:
         """Boolean operation."""
         pass
+
+    @abstractmethod
+    def create_body_from_loft_profiles_with_guides(self, **kwargs) -> dict:
+        """Create a body from loft profiles with guides."""
+        pass
diff --git a/src/ansys/geometry/core/_grpc/_services/v0/bodies.py b/src/ansys/geometry/core/_grpc/_services/v0/bodies.py
@@ -759,3 +759,45 @@ def boolean(self, **kwargs) -> dict:  # noqa: D102
 
         # Return the response - formatted as a dictionary
         return {}
+
+    @protect_grpc
+    def create_body_from_loft_profiles_with_guides(self, **kwargs) -> dict:  # noqa: D102
+        from ansys.api.dbu.v0.dbumodels_pb2 import EntityIdentifier
+        from ansys.api.geometry.v0.bodies_pb2 import (
+            CreateBodyFromLoftWithGuidesRequest,
+            CreateBodyFromLoftWithGuidesRequestData,
+        )
+        from ansys.api.geometry.v0.models_pb2 import TrimmedCurveList
+
+        # Create request object - assumes all inputs are valid and of the proper type
+        request = CreateBodyFromLoftWithGuidesRequest(
+            request_data=[
+                CreateBodyFromLoftWithGuidesRequestData(
+                    name=kwargs["name"],
+                    parent=EntityIdentifier(id=kwargs["parent_id"]),
+                    profiles=[
+                        TrimmedCurveList(
+                            curves=[from_trimmed_curve_to_grpc_trimmed_curve(tc) for tc in profile]
+                        )
+                        for profile in kwargs["profiles"]
+                    ],
+                    guides=TrimmedCurveList(
+                        curves=[
+                            from_trimmed_curve_to_grpc_trimmed_curve(tc) for tc in kwargs["guides"]
+                        ]
+                    ),
+                )
+            ]
+        )
+
+        # Call the gRPC service
+        response = self.stub.CreateBodyFromLoftWithGuides(request)
+
+        # Return the response - formatted as a dictionary
+        new_body = response.created_bodies[0]
+        return {
+            "id": new_body.id,
+            "name": new_body.name,
+            "master_id": new_body.master_id,
+            "is_surface": new_body.is_surface,
+        }
diff --git a/src/ansys/geometry/core/_grpc/_services/v1/bodies.py b/src/ansys/geometry/core/_grpc/_services/v1/bodies.py
@@ -191,3 +191,7 @@ def get_tesellation_with_options(self, **kwargs) -> dict:  # noqa: D102
     @protect_grpc
     def boolean(self, **kwargs) -> dict:  # noqa: D102
         raise NotImplementedError
+
+    @protect_grpc
+    def create_body_from_loft_profiles_with_guides(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError
diff --git a/src/ansys/geometry/core/connection/product_instance.py b/src/ansys/geometry/core/connection/product_instance.py
@@ -466,7 +466,7 @@ def prepare_and_start_backend(
             import shutil
 
             if not any(
-                CORE_GEOMETRY_SERVICE_EXE.replace(".exe", "") in file.name
+                CORE_GEOMETRY_SERVICE_EXE.replace(".exe", "") == file.name
                 for file in Path(root_service_folder).iterdir()
             ):
                 if not shutil.which("dotnet"):
diff --git a/src/ansys/geometry/core/designer/component.py b/src/ansys/geometry/core/designer/component.py
@@ -965,6 +965,41 @@ def create_body_from_loft_profile(
         )
         return self.__build_body_from_response(response)
 
+    @check_input_types
+    @ensure_design_is_active
+    @min_backend_version(26, 1, 0)
+    def create_body_from_loft_profiles_with_guides(
+        self,
+        name: str,
+        profiles: list[list[TrimmedCurve]],
+        guides: list[TrimmedCurve],
+    ) -> Body:
+        """Create a lofted body from a collection of trimmed curves with guide curves.
+
+        Parameters
+        ----------
+        name : str
+            Name of the lofted body.
+        profiles : list[list[TrimmedCurve]]
+            Collection of lists of trimmed curves (profiles) defining the lofted body's shape.
+        guides : list[TrimmedCurve]
+            Collection of guide curves to influence the lofting process.
+
+        Returns
+        -------
+        Body
+            Created lofted body object.
+        """
+        self._grpc_client.log.debug(f"Creating a loft profile body with guides on {self.id}.")
+        response = self._grpc_client._services.bodies.create_body_from_loft_profiles_with_guides(
+            name=name,
+            parent_id=self.id,
+            profiles=profiles,
+            guides=guides,
+        )
+
+        return self.__build_body_from_response(response)
+
     @check_input_types
     @ensure_design_is_active
     def create_surface(self, name: str, sketch: Sketch) -> Body:
diff --git a/tests/integration/test_design.py b/tests/integration/test_design.py
@@ -2915,6 +2915,54 @@ def test_create_body_from_loft_profile(modeler: Modeler):
     assert result.volume.m == 0
 
 
+def test_create_body_from_loft_profile_with_guides(modeler: Modeler):
+    """Test the ``create_body_from_loft_profile_with_guides()`` method to create a vase
+    shape.
+    """
+    design_sketch = modeler.create_design("LoftProfileWithGuides")
+
+    circle1 = Circle(origin=[0, 0, 0], radius=8)
+    circle2 = Circle(origin=[0, 0, 10], radius=10)
+
+    profile1 = circle1.trim(Interval(0, 2 * np.pi))
+    profile2 = circle2.trim(Interval(0, 2 * np.pi))
+
+    def circle_point(center, radius, angle_deg):
+        # Returns a point on the circle at the given angle
+        angle_rad = np.deg2rad(angle_deg)
+        return Point3D(
+            [
+                center[0] + radius.m * np.cos(angle_rad),
+                center[1] + radius.m * np.sin(angle_rad),
+                center[2],
+            ]
+        )
+
+    angles = [0, 90, 180, 270]
+    guide_curves = []
+
+    for angle in angles:
+        pt1 = circle_point(circle1.origin, circle1.radius, angle)
+        pt2 = circle_point(circle2.origin, circle2.radius, angle)
+
+        # Create a guide curve (e.g., a line or spline) between pt1 and pt2
+        guide_curve = NURBSCurve.fit_curve_from_points([pt1, pt2], 1).trim(Interval(0, 1))
+        guide_curves.append(guide_curve)
+
+    # Call the method
+    result = design_sketch.create_body_from_loft_profiles_with_guides(
+        "vase", [[profile1], [profile2]], guide_curves
+    )
+
+    # Assert that the resulting body has only one face.
+    assert len(result.faces) == 1
+
+    # check volume of body
+    # expected is 0 since it's not a closed surface
+    assert result.volume.m == 0
+    assert result.is_surface is True
+
+
 def test_revolve_sketch(modeler: Modeler):
     """Test revolving a circular profile for a quarter donut."""
     # Initialize the donut sketch design

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Bump ansys-api-geometry from 0.4.76 to 0.4.77`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Bump actions/cache from 4.2.4 to 4.3.0 in the actions group`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Backwards compatibility changes on Docker images`