Merge branch 'main' into blitz

RobPasMue · RobPasMue · commit bb11e2f96365 · 2025-01-28T10:49:25.000+01:00
diff --git a/.github/workflows/nightly_docker_test.yml b/.github/workflows/nightly_docker_test.yml
@@ -200,10 +200,7 @@ jobs:
     name: Windows Core Service
     needs: manifests
     if: needs.manifests.outputs.skip_core_windows == 0
-    # runs-on: [self-hosted, Windows, pygeometry]
-    runs-on: # TODO: Waiting for ansys-network runner to be updated
-      group: pyansys-self-hosted
-      labels: [self-hosted, Windows, pygeometry]
+    runs-on: [self-hosted, Windows, pygeometry]
     env:
       PYVISTA_OFF_SCREEN: true
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,13 +7,13 @@ exclude: "tests/integration/files"
 repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.1
+  rev: v0.9.3
   hooks:
     - id: ruff
     - id: ruff-format
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.3.0
+  rev: v2.4.0
   hooks:
   - id: codespell
     args: ["--ignore-words", "doc/styles/config/vocabularies/ANSYS/accept.txt", "-w"]
@@ -27,7 +27,7 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/ansys/pre-commit-hooks
-  rev: v0.4.4
+  rev: v0.5.1
   hooks:
     - id: add-license-headers
       args:
diff --git a/doc/changelog.d/1659.maintenance.md b/doc/changelog.d/1659.maintenance.md
@@ -0,0 +1 @@
+reverting semver package whitelist since problematic version is yanked
diff --git a/doc/changelog.d/1662.dependencies.md b/doc/changelog.d/1662.dependencies.md
@@ -0,0 +1 @@
+bump numpy from 2.2.1 to 2.2.2
diff --git a/doc/changelog.d/1663.dependencies.md b/doc/changelog.d/1663.dependencies.md
@@ -0,0 +1 @@
+bump ansys-api-geometry from 0.4.30 to 0.4.31
diff --git a/doc/changelog.d/1667.maintenance.md b/doc/changelog.d/1667.maintenance.md
@@ -0,0 +1 @@
+pre-commit automatic update
diff --git a/doc/changelog.d/1681.dependencies.md b/doc/changelog.d/1681.dependencies.md
@@ -0,0 +1 @@
+bump ansys-api-geometry from 0.4.31 to 0.4.32
diff --git a/doc/changelog.d/1682.dependencies.md b/doc/changelog.d/1682.dependencies.md
@@ -0,0 +1 @@
+bump panel from 1.5.5 to 1.6.0
diff --git a/doc/changelog.d/1687.dependencies.md b/doc/changelog.d/1687.dependencies.md
@@ -0,0 +1 @@
+bump semver from 3.0.2 to 3.0.4
diff --git a/doc/changelog.d/1691.fixed.md b/doc/changelog.d/1691.fixed.md
@@ -0,0 +1 @@
+disable unimplemented tests
diff --git a/doc/changelog.d/1692.added.md b/doc/changelog.d/1692.added.md
@@ -0,0 +1 @@
+is_core_service BackendType static method
diff --git a/doc/changelog.d/1693.maintenance.md b/doc/changelog.d/1693.maintenance.md
@@ -0,0 +1 @@
+use dedicate pygeometry-ci-2 runner
diff --git a/doc/changelog.d/1695.dependencies.md b/doc/changelog.d/1695.dependencies.md
@@ -0,0 +1 @@
+bump ansys-api-geometry from 0.4.32 to 0.4.33
diff --git a/doc/changelog.d/1696.maintenance.md b/doc/changelog.d/1696.maintenance.md
@@ -0,0 +1 @@
+pre-commit automatic update
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -57,23 +57,30 @@ def get_wheelhouse_assets_dictionary():
                 time.sleep(2)
 
         if content is None:
-            raise requests.exceptions.RequestException("Failed to retrieve the latest release.")
-
-        # Just point to the latest version
-        assets_context_version = json.loads(content)["name"]
+            print("Adapting URL to point to the latest version... (hack)")
+            assets_context_version = "dev"
+        else:
+            # Just point to the latest version
+            assets_context_version = json.loads(content)["name"]
     else:
         assets_context_version = f"v{__version__}"
 
     assets = {}
     for assets_os, assets_runner in zip(assets_context_os, assets_context_runners):
         download_links = []
         for assets_py_ver in assets_context_python_versions:
+            if assets_context_version == "dev":
+                prefix_url = "https://github.com/ansys/pyansys-geometry/releases/latest/download"
+            else:
+                prefix_url = (
+                    f"https://github.com/ansys/pyansys-geometry/releases/download/{assets_context_version}",
+                )
             temp_dict = {
                 "os": assets_os,
                 "runner": assets_runner,
                 "python_versions": assets_py_ver,
                 "latest_released_version": assets_context_version,
-                "prefix_url": f"https://github.com/ansys/pyansys-geometry/releases/download/{assets_context_version}",  # noqa: E501
+                "prefix_url": prefix_url,
             }
             download_links.append(temp_dict)
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "ansys-api-geometry==0.4.32",
+    "ansys-api-geometry==0.4.33",
     "ansys-tools-path>=0.3,<1",
     "ansys-tools-visualization-interface>=0.2.6,<1",
     "attrs!=24.3.0",
@@ -58,7 +58,7 @@ tests = [
     "geomdl==5.3.1",
     "grpcio==1.67.1",
     "grpcio-health-checking==1.67.1",
-    "numpy==2.2.1",
+    "numpy==2.2.2",
     "Pint==0.24.4",
     "protobuf==5.29.3",
     "pytest==8.3.4",
@@ -68,7 +68,7 @@ tests = [
     "pyvista[jupyter]==0.44.2",
     "requests==2.32.3",
     "scipy==1.15.1",
-    "semver==3.0.2",
+    "semver==3.0.4",
     "six==1.17.0",
     "vtk==9.3.1",
 ]
@@ -95,14 +95,14 @@ doc = [
     "nbsphinx==0.9.6",
     "notebook==7.3.2",
     "numpydoc==1.8.0",
-    "numpy==2.2.1",
-    "panel==1.5.5",
+    "numpy==2.2.2",
+    "panel==1.6.0",
     "Pint==0.24.4",
     "protobuf==5.29.3",
     "pyvista[jupyter]==0.44.2",
     "requests==2.32.3",
     "scipy==1.15.1",
-    "semver==3.0.2",
+    "semver==3.0.4",
     "six==1.17.0",
     "sphinx==8.1.3",
     "sphinx-autodoc-typehints==3.0.1",
diff --git a/src/ansys/geometry/core/connection/backend.py b/src/ansys/geometry/core/connection/backend.py
@@ -33,6 +33,29 @@ class BackendType(Enum):
     SPACECLAIM = 1
     WINDOWS_SERVICE = 2
     LINUX_SERVICE = 3
+    CORE_WINDOWS = 4
+    CORE_LINUX = 5
+    DISCOVERY_HEADLESS = 6
+
+    @staticmethod
+    def is_core_service(backend_type: "BackendType") -> bool:
+        """Determine whether the backend is CoreService based or not.
+
+        Parameters
+        ----------
+        backend_type : BackendType
+            The backend type to check whether or not it's a CoreService type.
+
+        Returns
+        -------
+        bool
+            True if the backend is CoreService based, False otherwise.
+        """
+        return backend_type in (
+            BackendType.LINUX_SERVICE,
+            BackendType.CORE_WINDOWS,
+            BackendType.CORE_LINUX,
+        )
 
 
 class ApiVersions(Enum):
diff --git a/src/ansys/geometry/core/connection/client.py b/src/ansys/geometry/core/connection/client.py
@@ -215,11 +215,26 @@ def __init__(
                 backend_type = BackendType.WINDOWS_SERVICE
             elif grpc_backend_type == GRPCBackendType.LINUX_DMS:
                 backend_type = BackendType.LINUX_SERVICE
+            elif grpc_backend_type == GRPCBackendType.CORE_SERVICE_LINUX:
+                backend_type = BackendType.CORE_LINUX
+            elif grpc_backend_type == GRPCBackendType.CORE_SERVICE_WINDOWS:
+                backend_type = BackendType.CORE_WINDOWS
+            elif grpc_backend_type == GRPCBackendType.DISCOVERY_HEADLESS:
+                backend_type = BackendType.DISCOVERY_HEADLESS
 
         # Store the backend type
         self._backend_type = backend_type
         self._multiple_designs_allowed = (
-            False if backend_type in (BackendType.DISCOVERY, BackendType.LINUX_SERVICE) else True
+            False
+            if backend_type
+            in (
+                BackendType.DISCOVERY,
+                BackendType.LINUX_SERVICE,
+                BackendType.CORE_LINUX,
+                BackendType.CORE_WINDOWS,
+                BackendType.DISCOVERY_HEADLESS,
+            )
+            else True
         )
 
         # retrieve the backend version
diff --git a/src/ansys/geometry/core/connection/product_instance.py b/src/ansys/geometry/core/connection/product_instance.py
@@ -263,7 +263,10 @@ def prepare_and_start_backend(
     """
     from ansys.geometry.core.modeler import Modeler
 
-    if os.name != "nt" and backend_type != BackendType.LINUX_SERVICE:  # pragma: no cover
+    if os.name != "nt" and backend_type not in (
+        BackendType.LINUX_SERVICE,
+        BackendType.CORE_LINUX,
+    ):  # pragma: no cover
         raise RuntimeError(
             "Method 'prepare_and_start_backend' is only available on Windows."
             "A Linux version is only available for the Core Geometry Service."
@@ -362,7 +365,7 @@ def prepare_and_start_backend(
             )
         )
     # This should be modified to Windows Core Service in the future
-    elif backend_type == BackendType.LINUX_SERVICE:
+    elif BackendType.is_core_service(backend_type):
         # Define several Ansys Geometry Core Service folders needed
         root_service_folder = Path(installations[product_version], CORE_GEOMETRY_SERVICE_FOLDER)
         native_folder = root_service_folder / "Native"
diff --git a/src/ansys/geometry/core/modeler.py b/src/ansys/geometry/core/modeler.py
@@ -126,9 +126,9 @@ def __init__(
         # Initialize the RepairTools - Not available on Linux
         # TODO: delete "if" when Linux service is able to use repair tools
         # https://github.com/ansys/pyansys-geometry/issues/1319
-        if self.client.backend_type == BackendType.LINUX_SERVICE:
+        if BackendType.is_core_service(self.client.backend_type):
             self._measurement_tools = None
-            LOG.warning("Linux backend does not support measurement tools.")
+            LOG.warning("CoreService backend does not support measurement tools.")
         else:
             self._measurement_tools = MeasurementTools(self._grpc_client)
 
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -49,11 +49,11 @@
 FILES_DIR = Path(Path(__file__).parent, "files")
 
 
-def skip_if_linux(modeler: Modeler, test_name: str, element_not_available: str):
-    """Skip test if running on Linux."""
-    if modeler.client.backend_type == BackendType.LINUX_SERVICE:
+def skip_if_core_service(modeler: Modeler, test_name: str, element_not_available: str):
+    """Skip test if running on CoreService."""
+    if BackendType.is_core_service(modeler.client.backend_type):
         pytest.skip(
-            reason=f"Skipping '{test_name}'. '{element_not_available}' not on Linux service."
+            reason=f"Skipping '{test_name}'. '{element_not_available}' not on CoreService."
         )  # skip!
 
 
diff --git a/tests/integration/test_design.py b/tests/integration/test_design.py
diff --git a/tests/integration/test_design_export.py b/tests/integration/test_design_export.py
diff --git a/tests/integration/test_design_import.py b/tests/integration/test_design_import.py
diff --git a/tests/integration/test_issues.py b/tests/integration/test_issues.py
diff --git a/tests/integration/test_measurement_tools.py b/tests/integration/test_measurement_tools.py
diff --git a/tests/integration/test_prepare_tools.py b/tests/integration/test_prepare_tools.py
diff --git a/tests/integration/test_repair_tools.py b/tests/integration/test_repair_tools.py
diff --git a/tests/integration/test_runscript.py b/tests/integration/test_runscript.py
diff --git a/tests/integration/test_tessellation.py b/tests/integration/test_tessellation.py
diff --git a/tests/integration/test_trimmed_geometry.py b/tests/integration/test_trimmed_geometry.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+reverting semver package whitelist since problematic version is yanked`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+bump ansys-api-geometry from 0.4.30 to 0.4.31`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+bump ansys-api-geometry from 0.4.31 to 0.4.32`