From f26a1f5bed767afa6ce8d155db3ed00eadcf9223 Mon Sep 17 00:00:00 2001 From: lparadis Date: Tue, 6 Dec 2022 16:37:46 +0100 Subject: [PATCH 1/4] Fix parsing in case ansys_dpf_server is used --- ansys/dpf/core/server_factory.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ansys/dpf/core/server_factory.py b/ansys/dpf/core/server_factory.py index ebc9295431..a4debdfb11 100644 --- a/ansys/dpf/core/server_factory.py +++ b/ansys/dpf/core/server_factory.py @@ -577,7 +577,9 @@ def get_server_type_from_config(config: ServerConfig = None, # dpf.core.SERVER_CONFIGURATION is required to know what type of connection to set if config is None: # If no SERVER_CONFIGURATION is yet defined, set one with default values - is_server_old = _find_outdated_ansys_version(ansys_path) + is_server_old = False + if not "ansys_dpf_server" 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 From 83a61eb53c702095bc29ab317ab1ae5b245ce06c Mon Sep 17 00:00:00 2001 From: lparadis Date: Tue, 6 Dec 2022 17:48:34 +0100 Subject: [PATCH 2/4] commit --- ansys/dpf/core/server_factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansys/dpf/core/server_factory.py b/ansys/dpf/core/server_factory.py index a4debdfb11..4959cd2fb0 100644 --- a/ansys/dpf/core/server_factory.py +++ b/ansys/dpf/core/server_factory.py @@ -575,7 +575,7 @@ def get_server_type_from_config(config: ServerConfig = None, ) # dpf.core.SERVER_CONFIGURATION is required to know what type of connection to set - if config is None: + if config is None: # If no SERVER_CONFIGURATION is yet defined, set one with default values is_server_old = False if not "ansys_dpf_server" in ansys_path: From d614d686d56e5a8433c4e998393742d0593d07a6 Mon Sep 17 00:00:00 2001 From: lparadis Date: Tue, 6 Dec 2022 17:49:24 +0100 Subject: [PATCH 3/4] remove --- ansys/dpf/core/server_factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansys/dpf/core/server_factory.py b/ansys/dpf/core/server_factory.py index 4959cd2fb0..a4debdfb11 100644 --- a/ansys/dpf/core/server_factory.py +++ b/ansys/dpf/core/server_factory.py @@ -575,7 +575,7 @@ def get_server_type_from_config(config: ServerConfig = None, ) # dpf.core.SERVER_CONFIGURATION is required to know what type of connection to set - if config is None: + if config is None: # If no SERVER_CONFIGURATION is yet defined, set one with default values is_server_old = False if not "ansys_dpf_server" in ansys_path: From 2adf63de10ce8435021cb0ac7affe169bfbed98e Mon Sep 17 00:00:00 2001 From: lparadis Date: Wed, 7 Dec 2022 11:03:42 +0100 Subject: [PATCH 4/4] Add check if ansys_path is None --- ansys/dpf/core/server_factory.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ansys/dpf/core/server_factory.py b/ansys/dpf/core/server_factory.py index a4debdfb11..4646acd8f3 100644 --- a/ansys/dpf/core/server_factory.py +++ b/ansys/dpf/core/server_factory.py @@ -578,8 +578,9 @@ def get_server_type_from_config(config: ServerConfig = None, if config is None: # If no SERVER_CONFIGURATION is yet defined, set one with default values is_server_old = False - if not "ansys_dpf_server" in ansys_path: - is_server_old = _find_outdated_ansys_version(ansys_path) + if ansys_path is not None: + if not "ansys_dpf_server" 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