Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return rocky version through a function #124

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Return rocky version through a function #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/ansys/rocky/core/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@

DEFAULT_SERVER_PORT: Final[int] = 50615
_ROCKY_API: Pyro5.api.Proxy | None = None
_ROCKY_VERSION: int | None = (
None # Rocky version as integer (24R2 becomes 242, 25R1 becomes 251, ...)
)


def connect_to_rocky(
Expand All @@ -60,13 +57,12 @@ def connect_to_rocky(
Client object for interacting with the Rocky app.
"""
uri = f"PYRO:rocky.api@{host}:{port}"
global _ROCKY_API, _ROCKY_VERSION
global _ROCKY_API

if _ROCKY_API is None:
register_proxies()

_ROCKY_API = Pyro5.api.Proxy(uri)
_ROCKY_VERSION = _get_numerical_version(_ROCKY_API)

rocky_client = RockyClient(_ROCKY_API)
return rocky_client
Expand Down
5 changes: 3 additions & 2 deletions src/ansys/rocky/core/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@ def _ApiElementProxySerializer(obj: ApiElementProxy) -> dict:
Serialize an `ApiElementProxy` ensuring backward compatibility with
ROCKY 24.2 and older versions.
"""
from .client import _ROCKY_VERSION
from ansys.rocky.core.client import _ROCKY_API, _get_numerical_version

ROCKY_VERSION = _get_numerical_version(_ROCKY_API)
serialized = ApiElementProxy.serialize(obj)

if _ROCKY_VERSION is not None and _ROCKY_VERSION < 250:
if ROCKY_VERSION is not None and ROCKY_VERSION < 250:
serialized["__class__"] = f'_{serialized["__class__"]}'
return serialized

Expand Down
15 changes: 6 additions & 9 deletions tests/test_pyrocky.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,13 @@ def test_minimal_simulation(version, expected_version, tmp_path, request):
"""
short_v = version.replace(".", "")
exe_file = f"C:\\Program Files\\ANSYS Inc\\v{short_v}\\Rocky\\bin\\Rocky.exe"
pyrocky.launch_rocky(exe_file)
rocky = pyrocky.connect_to_rocky()
rocky = pyrocky.launch_rocky(exe_file)
request.addfinalizer(rocky.close)

from ansys.rocky.core.client import _ROCKY_VERSION
from ansys.rocky.core.client import _ROCKY_API, _get_numerical_version

global _ROCKY_VERSION
assert _ROCKY_VERSION == expected_version
ROCKY_VERSION = _get_numerical_version(_ROCKY_API)
assert ROCKY_VERSION == expected_version

study = create_basic_project_with_results(
rocky.api, str(tmp_path / "rocky-testing.rocky")
Expand All @@ -105,8 +104,7 @@ def test_minimal_simulation(version, expected_version, tmp_path, request):

def test_sequences_interface(rocky_session):
"""Ensure that API objects that are sequences have their dunder methods exposed."""
rocky = pyrocky.connect_to_rocky()
project = rocky.api.CreateProject()
project = rocky_session.api.CreateProject()

study = project.GetStudy()

Expand All @@ -128,9 +126,8 @@ def test_sequences_interface(rocky_session):


def test_export_toolkit(rocky_session, tmp_path):
rocky = pyrocky.connect_to_rocky()
study = create_basic_project_with_results(
rocky.api,
rocky_session.api,
str(tmp_path / "rocky-testing-export.rocky"),
simulation_duration=0.1,
time_interval=0.1,
Expand Down
Loading