Merge pull request #885 from ansys/fix/adapt_to_service_pack

Release 0.1.1

- Backport #808, #880, #884 to the `0.1` release.
- Update the poetry lockfile.

Author: greschd

.github/workflows/ci_cd.yml

@@ -100,7 +100,7 @@ jobs:
             os: macos-latest
     steps:
       - name: "Build wheelhouse and perform smoke test"
-        uses: ansys/actions/build-wheelhouse@v8
+        uses: ansys/actions/build-wheelhouse@v10
         with:
           library-name: ${{ env.PACKAGE_NAME }}
           operating-system: ${{ matrix.os }}
@@ -242,11 +242,11 @@ jobs:
         server-version: ["latest"]
         include:
           - python-version: "3.12"
-            server-version: "2024R2"
+            server-version: "2024R2SP5"
           - python-version: "3.12"
-            server-version: "2025R1"
+            server-version: "2025R1SP4"
           - python-version: "3.12"
-            server-version: "2025R2"
+            server-version: "2025R2SP2"
 
     steps:
       - uses: actions/checkout@v4

docker-compose/docker-compose-benchmark.yaml

@@ -9,12 +9,13 @@ services:
       [
         "${PYACP_DELAY:-100ms}",
         "${PYACP_RATE:-1mbit}",
-        "--server-address=0.0.0.0:50051"
+        "--server-address=0.0.0.0:50051",
+        "--allow-remote-access" # Access to the server is limited to '127.0.0.1' by the 'port' option below
       ]
     environment:
       - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE}
     ports:
-      - "${PORT_ACP:-50555}:50051"
+      - "127.0.0.1:${PORT_ACP:-50555}:50051"
     working_dir: /home/container/workdir
     volumes:
       - "acp_data:/home/container/workdir/"
@@ -25,7 +26,7 @@ services:
     restart: unless-stopped
     image: ${IMAGE_NAME_FILETRANSFER:-ghcr.io/ansys/tools-filetransfer:latest}
     ports:
-      - "${PORT_FILETRANSFER:-50556}:50000"
+      - "127.0.0.1:${PORT_FILETRANSFER:-50556}:50000"
     working_dir: /home/container/workdir
     volumes:
       - "acp_data:/home/container/workdir/"

docker-compose/docker-compose-extras.yaml

@@ -8,15 +8,15 @@ services:
     command: ${MAPDL_CMD:--smp -np 1}
     shm_size: '4gb'
     ports:
-    - "${PYMAPDL_PORT:-50557}:50052"
+    - "127.0.0.1:${PYMAPDL_PORT:-50557}:50052"
     environment:
       - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE}
       - ANSYS_LOCK="OFF"
   pydpf-composites-server:
     restart: unless-stopped
     image: ${IMAGE_NAME_DPF_COMPOSITES:-ghcr.io/ansys/pydpf-composites:2023r2_pre1}
     ports:
-    - "${PYDPF_COMPOSITES_DOCKER_CONTAINER_PORT:-50558}:50052"
+    - "127.0.0.1:${PYDPF_COMPOSITES_DOCKER_CONTAINER_PORT:-50558}:50052"
     environment:
       - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE}
       - ANSYS_DPF_ACCEPT_LA=${ANSYS_DPF_ACCEPT_LA}

poetry.lock

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "ansys-acp-core"
-version = "0.1.0"
+version = "0.1.1"
 
 description = "Python library for ACP - Ansys Composite PrepPost"
 readme = "README.rst"
@@ -47,7 +47,7 @@ networkx = ">=3.0.0"
 # Optional dependencies which are included in the 'extras' section.
 # Update also the 'dev' group when these are updated.
 pyvista = { version = ">=0.42.0", optional = true, extras = ["jupyter", "trame"] }
-ansys-mapdl-core = { version = ">=0.68.3", optional = true }
+ansys-mapdl-core = { version = ">=0.68.3", optional = true, extras = ["graphics"] }
 ansys-dpf-composites = { version = ">=0.6", optional = true }
 ansys-dpf-core = { version = ">=0.13", optional = true}
 ansys-mechanical-core = { version = ">=0.10.0", optional = true }

pyproject.toml

@@ -98,7 +98,7 @@ def start(self) -> None:
         self._process = subprocess.Popen(  # nosec B603: documented in 'security_considerations.rst'
             [
                 self._config.binary_path,
-                f"--server-address=0.0.0.0:{port}",
+                f"--server-address=localhost:{port}",
             ],
             stdout=self._stdout,
             stderr=self._stderr,

src/ansys/acp/core/_server/direct.py

@@ -4,8 +4,11 @@ services:
     image: ${IMAGE_NAME_ACP:-ghcr.io/ansys/acp:latest}
     environment:
       - ANSYSLMD_LICENSE_FILE=${ANSYSLMD_LICENSE_FILE}
+    command:
+      - "--server-address=0.0.0.0:50051"
+      - "--allow-remote-access" # Access to the server is limited to '127.0.0.1' by the 'port' option below
     ports:
-      - "${PORT_ACP:-50555}:50051"
+      - "127.0.0.1:${PORT_ACP:-50555}:50051"
     working_dir: /home/container/workdir
     volumes:
       - "acp_data:/home/container/workdir/"
@@ -14,7 +17,7 @@ services:
     restart: unless-stopped
     image: ${IMAGE_NAME_FILETRANSFER:-ghcr.io/ansys/tools-filetransfer:latest}
     ports:
-      - "${PORT_FILETRANSFER:-50556}:50000"
+      - "127.0.0.1:${PORT_FILETRANSFER:-50556}:50000"
     working_dir: /home/container/workdir
     volumes:
       - "acp_data:/home/container/workdir/"

src/ansys/acp/core/_server/docker-compose.yaml

@@ -26,6 +26,7 @@
 import inspect
 from typing import Any, Concatenate, Generic, TypeVar
 
+import grpc
 from grpc import Channel
 from packaging.version import parse as parse_version
 from typing_extensions import ParamSpec, Self
@@ -225,11 +226,26 @@ def clear(self) -> None:
         """Remove all items from the mapping."""
         for obj_info in self._get_objectinfo_list():
             with wrap_grpc_errors():
-                self._stub.Delete(
-                    DeleteRequest(
-                        resource_path=obj_info.info.resource_path, version=obj_info.info.version
+                try:
+                    self._stub.Delete(
+                        DeleteRequest(
+                            resource_path=obj_info.info.resource_path, version=obj_info.info.version
+                        )
                     )
-                )
+                except grpc.RpcError as e:
+                    # The object version may have changed since the 'List' call,
+                    # since the object may become outdated when other objects are deleted.
+                    # In this case, we need to get the object info again and delete it.
+                    if e.code() == grpc.StatusCode.FAILED_PRECONDITION:
+                        obj_info = self._get_objectinfo_by_id(obj_info.info.id)
+                        self._stub.Delete(
+                            DeleteRequest(
+                                resource_path=obj_info.info.resource_path,
+                                version=obj_info.info.version,
+                            )
+                        )
+                    else:
+                        raise e
 
     def pop(self, key: str) -> CreatableValueT:
         """Remove and return the value for key."""