ansys-saf-testing 0.11.dev0__tar.gz → 0.11.dev2__tar.gz

{ansys_saf_testing-0.11.dev0 → ansys_saf_testing-0.11.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansys-saf-testing
-Version: 0.11.dev0
+Version: 0.11.dev2
 Summary: Collection of test utilities for the Solution Application Framework.
 License: Apache-2.0
 License-File: AUTHORS
@@ -28,24 +28,20 @@ Provides-Extra: pim
 Provides-Extra: selenium
 Provides-Extra: solution
 Requires-Dist: ansys-hps-client (>=0.12,<1.0) ; extra == "hps" or extra == "all"
-Requires-Dist: ansys-saf-glow-engine[dash] (>=1.41.dev1,<2.0) ; extra == "solution" or extra == "all"
+Requires-Dist: ansys-saf-glow-engine[dash] (>=2.0.dev1,<3.0) ; extra == "solution" or extra == "all"
 Requires-Dist: ansys-saf-product-configuration (>=0.20.dev0,<1.0) ; extra == "hps" or extra == "pim" or extra == "all"
 Requires-Dist: click (>=8.1.7,<9.0.0)
-Requires-Dist: cryptography (>=46.0.0,<47.0.0)
-Requires-Dist: dash (>=2.18.2,<3.4.0) ; extra == "solution" or extra == "all"
+Requires-Dist: cryptography (>=49.0.0,<50.0.0)
 Requires-Dist: docker (>=7.1.0,<8.0.0) ; extra == "hps" or extra == "docker" or extra == "all"
-Requires-Dist: fastapi (>=0.115.2,<1.0) ; extra == "solution" or extra == "all"
 Requires-Dist: grpcio (>=1.47.0,<2.0.0) ; extra == "pim" or extra == "all"
 Requires-Dist: grpcio-health-checking (>=1.24.0,<2.0.0) ; extra == "pim" or extra == "all"
 Requires-Dist: httpx (>=0,<1)
-Requires-Dist: marshmallow (>=3.20.2,<4.0.0) ; extra == "hps" or extra == "all"
 Requires-Dist: psutil (>=6.0,<7.0)
 Requires-Dist: pydantic (>=2.7,<3.0)
 Requires-Dist: pytest (>=9.0.3,<10.0.0)
 Requires-Dist: pytest-mock (>=3.14.1,<4.0.0)
 Requires-Dist: pyyaml (>=6.0.0,<7.0.0)
 Requires-Dist: selenium (>=4.0,<5.0) ; extra == "selenium" or extra == "all"
-Requires-Dist: starlette (>=0.49.1,<0.50.0) ; extra == "solution" or extra == "all"
 Requires-Dist: tenacity (>=8.2.3,<9.0.0)
 Requires-Dist: typing-extensions (>=4.14.0,<5.0.0)
 Description-Content-Type: text/x-rst

{ansys_saf_testing-0.11.dev0 → ansys_saf_testing-0.11.dev2}/pyproject.toml

@@ -7,7 +7,7 @@ build-system-version = "2.3.2"
 
 [tool.poetry]
 name = "ansys-saf-testing"
-version = "0.11.dev0"
+version = "0.11.dev2"
 description = "Collection of test utilities for the Solution Application Framework."
 license = "Apache-2.0"
 authors = [ "ANSYS, Inc. <pyansys.core@ansys.com>" ]
@@ -38,7 +38,7 @@ priority = "primary"
 [tool.poetry.dependencies]
 python = ">=3.10,<4"
 click = "^8.1.7"
-cryptography = "^46.0.0"
+cryptography = "^49.0.0"
 httpx = "^0"
 psutil = "^6.0"
 pydantic = "^2.7"
@@ -48,12 +48,8 @@ pyyaml = "^6.0.0"
 tenacity = "^8.2.3"  # has to be <9.0.0 to be compatible with ansys-conceptev-core 0.9.4
 typing-extensions = "^4.14.0"
 selenium = { version = "^4.0", optional = true }  # for testing web frontends
-ansys-saf-glow-engine = { version = "^1.41.dev1", allow-prereleases = true, optional = true, extras=["dash"] }  # for testing Solution API
-dash = { version = ">=2.18.2, <3.4.0", optional = true}  # for testing Dash callbacks. min version due to support for ctx.headers. max version due to incompatibility with dash-extensions < 2.0.5.
-fastapi = { version = ">=0.115.2, <1.0", optional = true }  # for testing solutions
-starlette = { version = "^0.49.1", optional = true }  # for testing solutions
+ansys-saf-glow-engine = { version = "^2.0.dev1", allow-prereleases = true, optional = true, extras=["dash"] }  # for testing Solution API and Dash-based UI
 docker = { version ="^7.1.0", optional = true }
-marshmallow = { version = "^3.20.2", optional = true }  # for HPS
 ansys-hps-client = { version = ">=0.12, <1.0", optional = true }
 ansys-saf-product-configuration = { version = ">=0.20.dev0, <1.0", allow-prereleases = true, optional = true }  # for HPS and PIM Light Server
 grpcio = { version = "^1.47.0", optional = true }  # for PIM Light Server
@@ -62,19 +58,15 @@ grpcio-health-checking = { version = "^1.24.0", optional = true }  # for PIM Lig
 
 [tool.poetry.extras]
 selenium = ["selenium"]
-solution = ["ansys-saf-glow-engine", "dash", "fastapi", "starlette"]
-hps = ["ansys-hps-client", "marshmallow", "ansys-saf-product-configuration", "docker"]
+solution = ["ansys-saf-glow-engine"]
+hps = ["ansys-hps-client", "ansys-saf-product-configuration", "docker"]
 docker = ["docker"]
 pim = ["grpcio", "grpcio-health-checking", "ansys-saf-product-configuration"]
 # didn't find a way to dynamically include previous groups, so we need to copy all dependencies
 all = [
   "selenium",
   "ansys-saf-glow-engine",
-  "dash",
-  "fastapi",
-  "starlette",
   "ansys-hps-client",
-  "marshmallow",
   "ansys-saf-product-configuration",
   "docker",
   "grpcio",
@@ -92,15 +84,12 @@ ruff-lsp = "^0.0"
 pre-commit = "^4.2.0"
 
 [tool.poetry.group.tests.dependencies]
-dash = { version = ">=2.18.2, <3.4.0", extras = ["diskcache"]}  # diskcache needed for background callbacks
-pytest-cov = "^6.1.1"
+dash = { version = "^3.0.0, <3.4.0", extras = ["diskcache"]}  # diskcache needed for background callbacks
+pytest-cov = "^7.0.0"
 pytest-html = "^4.1.1"
 pytest-md = "^0.2.0"
 pytest-rerunfailures = "^16.1.0"
-pyaedt = { version = "^1.0.0" }  # for testing product instances
-rpyc = { version = "^6.0" }  # for using AEDT instance manager. missing subdependency in pyaedt 0.22.2. We could use [all] but that would install a lot more stuff. Hopefully, in the future, they will create a new optional group that includes it.
-ansys-mechanical-core = { version = ">=0.12.9, <1.0", python = ">=3.10, <3.15" }  # for testing product instances
-ansys-platform-instancemanagement = { version = "^1.0.2" }  # for testing product instances
+ansys-saf-glow-engine = { version = "^2.0.dev1", allow-prereleases = true, optional = true, extras=["pim"] }  # for testing product instances
 
 [tool.poetry.group.doc]
 optional = true

{ansys_saf_testing-0.11.dev0 → ansys_saf_testing-0.11.dev2}/src/ansys/saf/testing/_hps/hps_client.py

@@ -15,17 +15,12 @@
 
 from collections.abc import Callable
 from typing import Protocol
-import warnings
 
-import marshmallow.warnings
+from ansys.hps.client import Client  # pyright: ignore[reportMissingTypeStubs]
+from ansys.hps.client.jms import JmsApi, ProjectApi  # pyright: ignore[reportMissingTypeStubs]
+from ansys.hps.client.rms import RmsApi  # pyright: ignore[reportMissingTypeStubs]
 import pytest
 
-with warnings.catch_warnings():
-    warnings.simplefilter("ignore", category=marshmallow.warnings.RemovedInMarshmallow4Warning)
-    from ansys.hps.client import Client  # type: ignore
-    from ansys.hps.client.jms import JmsApi, ProjectApi  # type: ignore
-    from ansys.hps.client.rms import RmsApi  # type: ignore
-
 
 class GetHpsJobIdsType(Protocol):
     """Interface for a function that retrieves HPS job IDs based on job name, status, and previous job IDs."""

{ansys_saf_testing-0.11.dev0 → ansys_saf_testing-0.11.dev2}/src/ansys/saf/testing/_pim/process/pim_process.py

@@ -22,7 +22,6 @@ from tempfile import mkdtemp
 from time import sleep
 import typing
 from unittest.mock import patch
-import warnings
 
 import psutil
 
@@ -154,10 +153,7 @@ class PimProcess(Process):
 
         instance_config_mgr = ProductInstanceConfigurationsManager()
         if self._product_configs_dir and self._product_configs_dir.is_dir():
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore", DeprecationWarning)  # dir may contain deprecated product configs
-                print(f"Loading custom product configurations from dir {self._product_configs_dir}.")
-                instance_config_mgr.load_configurations(self._product_configs_dir)
+            instance_config_mgr.load_configurations(self._product_configs_dir)
         self._definitions_dir = Path(mkdtemp())
         configurations_dir = self._definitions_dir / "Configurations"
         configurations_dir.mkdir()

{ansys_saf_testing-0.11.dev0 → ansys_saf_testing-0.11.dev2}/src/ansys/saf/testing/_solution/solution.py

@@ -26,11 +26,9 @@ from ansys.saf.glow._config.settings import Settings
 from ansys.saf.glow._core.client_exceptions import raise_for_graphql_status
 from ansys.saf.glow._server.dependencies import get_graphql_client, get_http_client, get_settings
 from ansys.saf.glow._server.server import create_app
-from ansys.saf.glow.client import Client, DashClient, callback
+from ansys.saf.glow.client import Client, callback
 from ansys.saf.glow.solution import Solution
 from ansys.saf.glow.solution.beta import ProductInstanceManager
-from dash._callback_context import context_value  # pyright: ignore[reportUnknownVariableType, reportMissingTypeStubs]
-from dash._utils import AttributeDict  # pyright: ignore[reportMissingTypeStubs]
 from fastapi.testclient import TestClient
 from httpx import Response
 import pytest
@@ -42,9 +40,6 @@ T = TypeVar("T", bound=Solution)
 is_within_dash_callback_context = contextvars.ContextVar("dash_callback_context", default=False)
 original_callback_call = callback.__call__
 
-is_within_dashclient_initialize_context = contextvars.ContextVar("dashclient_initialize_context", default=False)
-original_dashclient_initialize = DashClient.initialize
-
 
 class NotVersionArgFoundError(Exception): ...
 
@@ -52,17 +47,6 @@ class NotVersionArgFoundError(Exception): ...
 class NotServiceNameAttrFoundError(Exception): ...
 
 
-def patched_initialize(*args: Any, **kwargs: Any) -> None:
-    token = is_within_dashclient_initialize_context.set(True)
-    try:
-        original_dashclient_initialize(*args, **kwargs)
-    finally:
-        is_within_dashclient_initialize_context.reset(token)
-
-
-DashClient.initialize = patched_initialize
-
-
 def patched_call(*args: Any, **kwargs: Any) -> Callable[..., Any]:
     decorated = original_callback_call(*args, **kwargs)
 
@@ -160,13 +144,19 @@ def _api_testclient(_solution_settings: Settings) -> Iterator[TestClient]:  # py
         yield client
 
 
+@pytest.fixture(scope="session")
+def _created_method_clients() -> list[TestClient]:  # pyright: ignore[reportUnusedFunction]
+    return []
+
+
 @pytest.fixture(scope="session")
 def _method_client_factory(  # pyright: ignore[reportUnusedFunction]
     _solution_settings: Settings,
+    _created_method_clients: list[TestClient],
 ) -> Callable[[], TestClient]:
     def create_method_client() -> TestClient:
         client = TestClient(create_app(_solution_settings))
-        client.headers = {"shared-volume": "true"}
+        _created_method_clients.append(client)
         return client
 
     return create_method_client
@@ -178,7 +168,7 @@ def _validate_product_manager_class(product_manager_class: type[ProductInstanceM
     internal_product_manager = product_manager_class._instance_manager_impl_type  # type: ignore
 
     initialize_signature = inspect.signature(internal_product_manager.initialize)  # type: ignore
-    if "version" not in initialize_signature.parameters and "osl_version" not in initialize_signature.parameters:
+    if "version" not in initialize_signature.parameters:
         raise NotVersionArgFoundError("The 'version' argument is required in the product manager's initialize method.")
 
     service_name = getattr(internal_product_manager, "SERVICE_NAME", None)
@@ -192,7 +182,7 @@ def mock_product_instance(mocker: pytest_mock.MockerFixture, request: pytest.Fix
         raise ValueError("The 'mock_product_instance' fixture requires being parametrized.")
 
     def patched_initialize(self: Any, *args: Any, **kwargs: Any) -> None:
-        self.initialize_service(self.SERVICE_NAME, kwargs.get("version") or kwargs.get("osl_version"))
+        self.initialize_service(self.SERVICE_NAME, kwargs.get("version"))
         self.recovery_state_info = self.recovery_state_info_type()
 
     for product_manager_class, product_client_class in request.param.items():
@@ -252,13 +242,20 @@ def _solution_api_client(  # pyright: ignore[reportUnusedFunction]
     return _api_testclient
 
 
+@pytest.fixture(scope="session")
+def _created_dash_callback_clients() -> list[TestClient]:  # pyright: ignore[reportUnusedFunction]
+    return []
+
+
 @pytest.fixture(scope="session")
 def _dash_callback_client_factory(  # pyright: ignore[reportUnusedFunction]
     _solution_settings: Settings,
     _method_client_factory: Callable[[], TestClient],
+    _created_dash_callback_clients: list[TestClient],
 ) -> Callable[[], TestClient]:
     def create_callback_client() -> TestClient:
         client = TestClient(create_app(_solution_settings))
+        _created_dash_callback_clients.append(client)
         _apply_dependency_overrides(
             app=client.app,
             _solution_settings=_solution_settings,
@@ -270,13 +267,12 @@ def _dash_callback_client_factory(  # pyright: ignore[reportUnusedFunction]
     return create_callback_client
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture
 def dash_http_client(
     _solution_settings: Settings,
     _method_client_factory: Callable[[], TestClient],
 ) -> Iterator[TestClient]:
     with TestClient(create_app(_solution_settings)) as client:
-        client.event_hooks["request"] = DashClient._add_auth_from_headers  # type: ignore
         _apply_dependency_overrides(
             app=client.app,
             _solution_settings=_solution_settings,
@@ -288,7 +284,6 @@ def dash_http_client(
 @pytest.fixture(scope="session")
 def _mock_glow_client_internal_clients(  # pyright: ignore[reportUnusedFunction]
     _solution_api_client: TestClient,
-    dash_http_client: TestClient,
     _dash_callback_client_factory: Callable[[], TestClient],
     session_mocker: pytest_mock.MockerFixture,
 ) -> None:
@@ -302,23 +297,9 @@ def _mock_glow_client_internal_clients(  # pyright: ignore[reportUnusedFunction]
         # affects all Client instances in different contexts. In here we know in which
         # context is the Client being initialized, so we can use the right TestClient.
         is_from_dash_callback = is_within_dash_callback_context.get()
-        is_from_dashclient_initialize = is_within_dashclient_initialize_context.get()
 
         client = None
-        if is_from_dash_callback:
-            client = _dash_callback_client_factory()
-        elif is_from_dashclient_initialize:
-            client = dash_http_client
-            # On dashclient.py::_auth_header_from_ctx we access ctx.headers.
-            # In a real scenario, that attribute dict is set automatically by Dash
-            # to include the request headers, but not in this testing scenario.
-            context_value.set(  # pyright: ignore[reportUnknownMemberType]
-                AttributeDict(
-                    {"headers": {}},
-                ),
-            )
-        else:
-            client = _solution_api_client
+        client = _dash_callback_client_factory() if is_from_dash_callback else _solution_api_client
 
         object.__setattr__(self, "_http_client", client)
         object.__setattr__(self, "_graphql_client", GraphQLClientMock(client=client))
@@ -331,13 +312,13 @@ def init_dashclient(
     monkeysession: pytest.MonkeyPatch,
     _solution_settings: Settings,
     _mock_glow_client_internal_clients: None,
+    session_mocker: pytest_mock.MockerFixture,
 ):
     monkeysession.setenv("GLOW_SOLUTION_DEFINITION", _solution_settings.glow_solution_definition)
     monkeysession.setenv("GLOW_API_URL", "http://testserver")
     monkeysession.setenv("GLOW_EXTERNAL_API_URL", "http://testserver")
     monkeysession.setenv("GLOW_WS_EVENTS_ADDR", "ws://testserver")
-
-    DashClient.initialize()
+    session_mocker.patch("ansys.saf.glow._client.dashclient.DashClient._auth_header_from_ctx", return_value=None)
 
 
 @pytest.fixture(scope="session")
@@ -386,16 +367,23 @@ def solution_logs(tmp_path: Path, request: pytest.FixtureRequest) -> Iterator[Pa
 
     temp_log_path = tmp_path / "solution.log"
 
+    # To capture logs from solutions, which can be be in any namespace
+    root_logger = logging.getLogger()
+    # To capture logs from GLOW. By default, it configures two different loggers and logs from ansys
+    # are not propagated to root logger.
     ansys_logger = logging.getLogger("ansys")
+    root_logger.setLevel(logging_level)
     ansys_logger.setLevel(logging_level)
     file_handler = logging.FileHandler(temp_log_path)
     file_handler.setLevel(logging_level)
     formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s")
     file_handler.setFormatter(formatter)
+    root_logger.addHandler(file_handler)
     ansys_logger.addHandler(file_handler)
 
     yield temp_log_path
 
+    root_logger.removeHandler(file_handler)
     ansys_logger.removeHandler(file_handler)
 
 

{ansys_saf_testing-0.11.dev0 → ansys_saf_testing-0.11.dev2}/src/ansys/saf/testing/hps/__init__.py

@@ -44,7 +44,7 @@ __all__ = [
     "restore_default_hps_deployment",
 ]
 
-if has_modules_installed(["ansys.hps.client", "marshmallow"]):
+if has_modules_installed(["ansys.hps.client"]):
     from ansys.saf.testing._hps.hps_client import (
         GetHpsJobIdsType,
         get_available_application_on_hps,

{ansys_saf_testing-0.11.dev0 → ansys_saf_testing-0.11.dev2}/src/ansys/saf/testing/solution/__init__.py

@@ -22,6 +22,8 @@ if has_modules_installed(["dash", "ansys.saf.glow"]):
     from ansys.saf.testing._solution.solution import (
         # Import private fixtures so that pytest can discover them
         _api_testclient,  # type: ignore   # noqa: F401
+        _created_dash_callback_clients,  # type: ignore   # noqa: F401
+        _created_method_clients,  # type: ignore   # noqa: F401
         _dash_callback_client_factory,  # type: ignore   # noqa: F401
         _glow_client,  # type: ignore   # noqa: F401
         _method_client_factory,  # type: ignore   # noqa: F401