Remove priority to AWPROOT+__ansys_version__ (#972)

* Update core.misc.get_ansys_path as discussed

* Refactor server_types.py/_get_dll_path to actually use core.misc.get_ansys_path and ensure the logic is the same

* Refactor test_launcher.py/test_launch_server_full_path to use core.misc.get_ansys_path()

* Refactor get_server_type_from_config to also use get_ansys_path()

* Revert change to ServerFactory.get_server_type_from_config

Author: PProfizi

src/ansys/dpf/core/misc.py

@@ -62,8 +62,8 @@ def is_ubuntu():
 
 
 def get_ansys_path(ansys_path=None):
-    """Give input path back if given, else look for ANSYS_DPF_PATH, then AWP_ROOT+__ansys_version__,
-    then calls for find_ansys as a last resort.
+    """Give input path back if given, else look for ANSYS_DPF_PATH,
+    then among AWP_ROOT and installed ansys-dpf-server modules to take the latest available.
 
     Parameters
     ----------
@@ -80,9 +80,7 @@ def get_ansys_path(ansys_path=None):
     # First check the environment variable for a custom path
     if ansys_path is None:
         ansys_path = os.environ.get("ANSYS_DPF_PATH")
-    # Then check for usual installation folders with AWP_ROOT and find_ansys
-    if ansys_path is None:
-        ansys_path = os.environ.get("AWP_ROOT" + __ansys_version__)
+    # Then check for usual installation folders with AWP_ROOT and installed modules
     if ansys_path is None:
         ansys_path = find_ansys()
     # If still no install has been found, throw an exception

src/ansys/dpf/core/server_factory.py

@@ -595,15 +595,15 @@ def get_server_type_from_config(
             # If no SERVER_CONFIGURATION is yet defined, set one with default values
             is_server_old = False
             if ansys_path is not None:
-                if not "ansys_dpf_server" in ansys_path:
+                if "ansys_dpf_server" not in ansys_path:
                     is_server_old = _find_outdated_ansys_version(ansys_path)
             config = get_default_server_config(is_server_old, docker_config)
         if config.protocol == CommunicationProtocols.gRPC and config.legacy:
             return LegacyGrpcServer
         elif config.protocol == CommunicationProtocols.gRPC and not config.legacy:
-            from ansys.dpf.core.misc import __ansys_version__
-
             if ansys_path is None:
+                from ansys.dpf.core.misc import __ansys_version__
+
                 ansys_path = os.environ.get("AWP_ROOT" + str(__ansys_version__), None)
             if ansys_path is not None:
                 sub_folders = os.path.join(ansys_path, _get_path_in_install())

src/ansys/dpf/core/server_types.py

@@ -24,7 +24,6 @@
     server_to_ansys_grpc_dpf_version,
     server_to_ansys_version,
 )
-from ansys.dpf.core.misc import __ansys_version__
 from ansys.dpf.core import server_context
 from ansys.dpf.gate import load_api, data_processing_grpcapi
 
@@ -42,17 +41,7 @@
 def _get_dll_path(name, ansys_path=None):
     """Helper function to get the right dll path for Linux or Windows"""
     ISPOSIX = os.name == "posix"
-    if ansys_path is None:
-        ansys_path = os.environ.get("ANSYS_DPF_PATH")
-    if ansys_path is None:
-        awp_root = "AWP_ROOT" + str(__ansys_version__)
-        ANSYS_INSTALL = os.environ.get(awp_root, None)
-        if ANSYS_INSTALL is None:
-            ANSYS_INSTALL = core.misc.find_ansys()
-    else:
-        ANSYS_INSTALL = ansys_path
-    if ANSYS_INSTALL is None:
-        raise ImportError(f"Could not find ansys installation path using {awp_root}.")
+    ANSYS_INSTALL = core.misc.get_ansys_path(ansys_path)
     api_path = load_api._get_path_in_install()
     if api_path is None:
         raise ImportError(f"Could not find API path in install.")

tests/test_launcher.py

@@ -168,9 +168,7 @@ def test_start_local_wrong_ansys_path(self, server_config):
 
     @pytest.mark.skipif(running_docker, reason="Not made to work on docker")
     def test_launch_server_full_path(self, server_config):
-        ansys_path = os.environ.get(
-            "AWP_ROOT" + core.misc.__ansys_version__, core.misc.find_ansys()
-        )
+        ansys_path = core.misc.get_ansys_path()
         if os.name == "nt":
             path = os.path.join(ansys_path, "aisol", "bin", "winx64")
         else: