From 9ad39f58823a7c8e3ea72ad0542e17cacc7780b0 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Tue, 22 Nov 2022 08:03:01 +0100
Subject: [PATCH 01/26] Refactor server context

---
 ansys/dpf/core/__init__.py       |  2 +-
 ansys/dpf/core/core.py           | 16 +++---
 ansys/dpf/core/server_context.py | 91 ++++++++++++++++++++------------
 ansys/dpf/core/server_types.py   | 21 ++++++--
 tests/conftest.py                |  2 +-
 tests/test_multi_server.py       |  4 +-
 tests/test_service.py            | 36 +++++++++++--
 7 files changed, 117 insertions(+), 55 deletions(-)

diff --git a/ansys/dpf/core/__init__.py b/ansys/dpf/core/__init__.py
index 3f3fb732ba..c4e3947691 100644
--- a/ansys/dpf/core/__init__.py
+++ b/ansys/dpf/core/__init__.py
@@ -81,7 +81,7 @@
 from ansys.dpf.core import path_utilities
 from ansys.dpf.core import settings
 from ansys.dpf.core.server_factory import ServerConfig, AvailableServerConfigs
-from ansys.dpf.core.server_context import apply_server_context, AvailableServerContexts
+from ansys.dpf.core.server_context import set_default_server_context, AvailableServerContexts
 
 # for matplotlib
 # solves "QApplication: invalid style override passed, ignoring it."
diff --git a/ansys/dpf/core/core.py b/ansys/dpf/core/core.py
index 81dda33228..179dd7ad5d 100644
--- a/ansys/dpf/core/core.py
+++ b/ansys/dpf/core/core.py
@@ -439,12 +439,12 @@ def apply_context(self, context):
         if not self._server().meet_version("6.0"):
             raise errors.DpfVersionNotSupported("6.0")
         if self._server().has_client():
-            error = self._api.data_processing_apply_context_on_client(
-                self._server().client, context.context_type.value, context.xml_path
+            self._api.data_processing_apply_context_on_client(
+                self._server().client, int(context.licensing_context_type), context.xml_path
             )
         else:
-            error = self._api.data_processing_apply_context(
-                context.context_type.value, context.xml_path
+            self._api.data_processing_apply_context(
+                int(context.licensing_context_type), context.xml_path
             )
 
     def initialize_with_context(self, context):
@@ -464,14 +464,14 @@ def initialize_with_context(self, context):
         if self._server().has_client():
             if not self._server().meet_version("6.0"):
                 raise errors.DpfVersionNotSupported("6.0")
-            error = self._api.data_processing_initialize_with_context_on_client(
-                self._server().client, context.context_type.value, context.xml_path
+            self._api.data_processing_initialize_with_context_on_client(
+                self._server().client, int(context.licensing_context_type), context.xml_path
             )
         else:
             if not self._server().meet_version("4.0"):
                 raise errors.DpfVersionNotSupported("4.0")
-            error = self._api.data_processing_initialize_with_context(
-                context.context_type.value, context.xml_path
+            self._api.data_processing_initialize_with_context(
+                int(context.licensing_context_type), context.xml_path
             )
 
     @version_requires("6.0")
diff --git a/ansys/dpf/core/server_context.py b/ansys/dpf/core/server_context.py
index 135e9ba4c6..c019500c2f 100644
--- a/ansys/dpf/core/server_context.py
+++ b/ansys/dpf/core/server_context.py
@@ -5,21 +5,28 @@
 Gives the ability to choose the context with which the server should be started.
 The context allows to choose which capabilities are available.
 """
+import os.path
 from enum import Enum
 
 
-class EContextType(Enum):
-    pre_defined_environment = 0
-    """DataProcessingCore.xml that is next to DataProcessingCore.dll/libDataProcessingCore.so will
-    be taken"""
+class LicensingContextType(Enum):
     premium = 1
-    """Gets the Specific premium DataProcessingCore.xml."""
-    user_defined = 2
-    """Load a user defined xml using its path."""
-    custom_defined = 3
-    """Loads the xml named "DpfCustomDefined.xml" that the user can modify."""
+    """Allows capabilities requiring Licenses check out."""
     entry = 4
-    """Loads the minimum number of plugins for a basic usage."""
+    """Loads minimum capabilities without requiring any Licenses check out."""
+
+    def __int__(self):
+        return self.value
+
+    @staticmethod
+    def same_licensing_context(first, second):
+        if int(first) == int(LicensingContextType.entry) and int(second) != int(
+                LicensingContextType.entry):
+            return False
+        elif int(second) == int(LicensingContextType.entry) and int(first) != int(
+                LicensingContextType.entry):
+            return False
+        return True
 
 
 class ServerContext:
@@ -32,45 +39,66 @@ class ServerContext:
     xml_path : str, optional
         Path to the xml to load.
     """
-    def __init__(self, context_type=EContextType.user_defined, xml_path=""):
+
+    def __init__(self, context_type=LicensingContextType.premium, xml_path=""):
         self._context_type = context_type
         self._xml_path = xml_path
 
     @property
-    def context_type(self):
+    def licensing_context_type(self):
+        """Whether capabilities requiring Licenses check out should be allowed.
+
+        Returns
+        -------
+        LicensingContextType
+        """
         return self._context_type
 
     @property
     def xml_path(self):
+        """Path to the xml listing the capabilities to load on the server.
+
+        Returns
+        -------
+        str
+        """
         return self._xml_path
 
     def __str__(self):
-        return f"Server Context of type {self.context_type}" \
-               f" with {'no' if len(self.xml_path)==0 else ''} xml path" \
-               f"{'' if len(self.xml_path)==0 else ': ' + self.xml_path}"
+        return f"Server Context of type {self.licensing_context_type}" \
+               f" with {'no' if len(self.xml_path) == 0 else ''} xml path" \
+               f"{'' if len(self.xml_path) == 0 else ': ' + self.xml_path}"
+
+    def __eq__(self, other):
+        if not isinstance(other, ServerContext):
+            return False
+        return os.path.normpath(self.xml_path) == os.path.normpath(other.xml_path) \
+               and LicensingContextType.same_licensing_context(self.licensing_context_type,
+                                                               other.licensing_context_type)
+
+    def __ne__(self, other):
+        return not self == other
 
 
 class AvailableServerContexts:
-    pre_defined_environment = ServerContext(EContextType.pre_defined_environment)
+    pre_defined_environment = ServerContext(0)
     """DataProcessingCore.xml that is next to DataProcessingCore.dll/libDataProcessingCore.so will
     be taken"""
-    premium = ServerContext(EContextType.premium)
+    premium = ServerContext(LicensingContextType.premium)
     """Gets the Specific premium DataProcessingCore.xml to load most plugins with their
     environments."""
-    custom_defined = ServerContext(EContextType.custom_defined)
+    custom_defined = ServerContext(3)
     """Loads the xml named "DpfCustomDefined.xml" that the user can modify."""
-    entry = ServerContext(EContextType.entry)
+    entry = ServerContext(LicensingContextType.entry)
     """Loads the minimum number of plugins for a basic usage. Is the default."""
 
 
 SERVER_CONTEXT = AvailableServerContexts.entry
 
 
-def apply_server_context(context=AvailableServerContexts.entry, server=None) -> None:
-    """Allows to apply a context globally (if no server is specified) or to a
-    given server.
-    When called before any server is started, the context will be applied by default to any
-    new server.
+def set_default_server_context(context=AvailableServerContexts.entry) -> None:
+    """This context will be applied by default to any new server as well as
+    the global server, if it's running.
 
     The context allows to choose which capabilities are available server side.
 
@@ -79,20 +107,13 @@ def apply_server_context(context=AvailableServerContexts.entry, server=None) ->
     context : ServerContext
         Context to apply to the given server or to the newly started servers (when no server
         is given).
-    server : server.DPFServer, optional
-        Server with channel connected to the remote or local instance. When
-        ``None``, attempts to use the global server.
 
     Notes
     -----
     Available with server's version starting at 6.0 (Ansys 2023R2).
     """
     from ansys.dpf.core import SERVER
-    if server is None:
-        server = SERVER
-        global SERVER_CONTEXT
-        SERVER_CONTEXT = context
-    if server is not None:
-        from ansys.dpf.core.core import BaseService
-        base = BaseService(server, load_operators=False)
-        base.apply_context(context)
+    global SERVER_CONTEXT
+    SERVER_CONTEXT = context
+    if SERVER is not None:
+        SERVER.apply_context(context)
diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index cd0bb77b5f..5c55d78622 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -342,6 +342,7 @@ def __init__(self):
         self._server_id = None
         self._session_instance = None
         self._base_service_instance = None
+        self._context = None
         self._docker_config = server_factory.RunningDockerConfig()
 
     def set_as_global(self, as_global=True):
@@ -468,6 +469,19 @@ def apply_context(self, context):
         Available with server's version starting at 6.0 (Ansys 2023R2).
         """
         self._base_service.apply_context(context)
+        self._context = context
+
+    @property
+    def context(self):
+        """Returns the settings used to load DPF's plugins.
+        To update the context server side, use
+        :func:`ansys.dpf.core.BaseServer.server_types.apply_context`
+
+        Returns
+        -------
+        ServerContext
+        """
+        return self._context
 
     def check_version(self, required_version, msg=None):
         """Check if the server version matches with a required version.
@@ -639,7 +653,7 @@ def __init__(self,
         self._check_first_call(num_connection_tryouts)
         self.set_as_global(as_global=as_global)
         try:
-            self._base_service.initialize_with_context(server_context.SERVER_CONTEXT)
+            self.apply_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
             pass
 
@@ -804,11 +818,12 @@ def __init__(self,
             raise e
         self.set_as_global(as_global=as_global)
         try:
-            self._base_service.apply_context(server_context.SERVER_CONTEXT)
+            self.apply_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
             self._base_service.initialize_with_context(
                 server_context.AvailableServerContexts.premium
             )
+            self._context = server_context.AvailableServerContexts.premium
             pass
 
     @property
@@ -950,7 +965,7 @@ def __init__(
         check_ansys_grpc_dpf_version(self, timeout)
         self.set_as_global(as_global=as_global)
         try:
-            self._base_service.initialize_with_context(server_context.SERVER_CONTEXT)
+            self.apply_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
             pass
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 4ed8e8d742..6e43b6af0e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -446,6 +446,6 @@ def count_servers():
 if SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_6_0:
     core.server.shutdown_all_session_servers()
     try:
-        core.apply_server_context(core.AvailableServerContexts.premium)
+        core.set_default_server_context(core.AvailableServerContexts.premium)
     except core.errors.DpfVersionNotSupported:
         pass
diff --git a/tests/test_multi_server.py b/tests/test_multi_server.py
index 596b1fe901..a744b69bfb 100644
--- a/tests/test_multi_server.py
+++ b/tests/test_multi_server.py
@@ -8,7 +8,7 @@
 from ansys.dpf.core.server_factory import ServerConfig, CommunicationProtocols
 
 if conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_6_0:
-    dpf.apply_server_context(dpf.AvailableServerContexts.entry)
+    dpf.set_default_server_context(dpf.AvailableServerContexts.entry)
 
 
 @pytest.fixture(scope="module", params=[
@@ -32,7 +32,7 @@ def other_remote_server(request):
 
 if conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_6_0:
     dpf.server.shutdown_all_session_servers()
-    dpf.apply_server_context(dpf.AvailableServerContexts.premium)
+    dpf.set_default_server_context(dpf.AvailableServerContexts.premium)
 
 
 @pytest.fixture()
diff --git a/tests/test_service.py b/tests/test_service.py
index 9b06cc2077..48b07f79e8 100644
--- a/tests/test_service.py
+++ b/tests/test_service.py
@@ -446,7 +446,7 @@ def set_context_back_to_premium(request):
 
     dpf.core.server.shutdown_all_session_servers()
     try:
-        dpf.core.apply_server_context(dpf.core.AvailableServerContexts.entry)
+        dpf.core.set_default_server_context(dpf.core.AvailableServerContexts.entry)
     except dpf.core.errors.DpfVersionNotSupported:
         pass
 
@@ -454,7 +454,7 @@ def revert():
         dpf.core.SERVER_CONFIGURATION = None
         dpf.core.server.shutdown_all_session_servers()
         try:
-            dpf.core.apply_server_context(dpf.core.AvailableServerContexts.premium)
+            dpf.core.set_default_server_context(dpf.core.AvailableServerContexts.premium)
         except dpf.core.errors.DpfVersionNotSupported:
             pass
 
@@ -474,11 +474,23 @@ def test_apply_context(set_context_back_to_premium):
     if conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_6_0:
         with pytest.raises(KeyError):
             dpf.core.Operator("core::field::high_pass")
+        with pytest.raises(dpf.core.errors.DPFServerException):
+            if dpf.core.SERVER.os == "nt":
+                dpf.core.load_library("Ans.Dpf.Math.dll", "math_operators")
+            else:
+                dpf.core.load_library("libAns.Dpf.Math.so", "math_operators")
+        assert dpf.core.SERVER.context == dpf.core.AvailableServerContexts.entry
     else:
         dpf.core.start_local_server()
 
-    dpf.core.apply_server_context(dpf.core.AvailableServerContexts.premium, dpf.core.SERVER)
+    dpf.core.set_default_server_context(dpf.core.AvailableServerContexts.premium)
+    assert dpf.core.SERVER.context == dpf.core.AvailableServerContexts.premium
     dpf.core.Operator("core::field::high_pass")
+    with pytest.raises(dpf.core.errors.DPFServerException):
+        dpf.core.set_default_server_context(dpf.core.AvailableServerContexts.entry)
+    with pytest.raises(dpf.core.errors.DPFServerException):
+        dpf.core.SERVER.apply_context(dpf.core.AvailableServerContexts.entry)
+    assert dpf.core.SERVER.context == dpf.core.AvailableServerContexts.premium
 
 
 @pytest.mark.order(2)
@@ -491,17 +503,31 @@ def test_apply_context_remote(remote_config_server_type, set_context_back_to_pre
     if conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_6_0:
         with pytest.raises(dpf.core.errors.DPFServerException):
             dpf.core.Operator("core::field::high_pass")
+        with pytest.raises(dpf.core.errors.DPFServerException):
+            if dpf.core.SERVER.os == "nt":
+                dpf.core.load_library("Ans.Dpf.Math.dll", "math_operators")
+            else:
+                dpf.core.load_library("libAns.Dpf.Math.so", "math_operators")
+
+            assert dpf.core.SERVER.context == dpf.core.AvailableServerContexts.entry
     else:
         dpf.core.start_local_server()
 
-    dpf.core.apply_server_context(dpf.core.AvailableServerContexts.premium, dpf.core.SERVER)
+    dpf.core.SERVER.apply_context(dpf.core.AvailableServerContexts.premium)
     dpf.core.Operator("core::field::high_pass")
+    assert dpf.core.SERVER.context == dpf.core.AvailableServerContexts.premium
 
     dpf.core.server.shutdown_all_session_servers()
     with pytest.raises(dpf.core.errors.DPFServerException):
         dpf.core.Operator("core::field::high_pass")
-    dpf.core.apply_server_context(dpf.core.AvailableServerContexts.premium)
+    dpf.core.set_default_server_context(dpf.core.AvailableServerContexts.premium)
     dpf.core.Operator("core::field::high_pass")
+    with pytest.raises(dpf.core.errors.DPFServerException):
+        dpf.core.set_default_server_context(dpf.core.AvailableServerContexts.entry)
+    with pytest.raises(dpf.core.errors.DPFServerException):
+        dpf.core.SERVER.apply_context(dpf.core.AvailableServerContexts.entry)
+
+    assert dpf.core.SERVER.context == dpf.core.AvailableServerContexts.premium
 
 
 @pytest.mark.order("last")

From 477a2f73bc059b7d6e96b4631583128ee5cda58f Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Tue, 22 Nov 2022 09:10:44 +0100
Subject: [PATCH 02/26] not set as global if apply context didn't work

---
 ansys/dpf/core/server_types.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 5c55d78622..0586edf043 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -651,11 +651,11 @@ def __init__(self,
         self.live = True
         self._create_shutdown_funcs()
         self._check_first_call(num_connection_tryouts)
-        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
             pass
+        self.set_as_global(as_global=as_global)
 
     def _check_first_call(self, num_connection_tryouts):
         for i in range(num_connection_tryouts):
@@ -816,7 +816,6 @@ def __init__(self,
                     f"DPF directory not found at {os.path.dirname(path)}"
                     f"Unable to locate the following file: {path}")
             raise e
-        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
@@ -825,6 +824,7 @@ def __init__(self,
             )
             self._context = server_context.AvailableServerContexts.premium
             pass
+        self.set_as_global(as_global=as_global)
 
     @property
     def version(self):
@@ -963,11 +963,11 @@ def __init__(
         self._create_shutdown_funcs()
 
         check_ansys_grpc_dpf_version(self, timeout)
-        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
             pass
+        self.set_as_global(as_global=as_global)
 
     def _create_shutdown_funcs(self):
         self._core_api = data_processing_grpcapi.DataProcessingGRPCAPI

From a4bdba90c9b6ee2fb4b587729c84fb87d9867a8a Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Tue, 22 Nov 2022 09:52:56 +0100
Subject: [PATCH 03/26] fix python plugins

---
 ansys/dpf/core/custom_operator.py |  3 ++-
 ansys/dpf/core/server.py          | 37 +++++++++++++++++++++++++------
 ansys/dpf/core/server_types.py    | 12 ++++++----
 ansys/dpf/core/settings.py        |  1 +
 tests/test_service.py             | 15 ++++++++++++-
 5 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/ansys/dpf/core/custom_operator.py b/ansys/dpf/core/custom_operator.py
index 750fe086f2..a8af8616a6 100644
--- a/ansys/dpf/core/custom_operator.py
+++ b/ansys/dpf/core/custom_operator.py
@@ -19,6 +19,7 @@
     operator_specification,
     dpf_operator,
     collection,
+    AvailableServerContexts,
 )
 from ansys.dpf.core._custom_operators_helpers import __operator_main__, functions_registry, \
     external_operator_api, _type_to_output_method, _type_to_input_method
@@ -46,7 +47,7 @@ def record_operator(operator_type, *args) -> None:
         operator = operator_type
     if dpf.SERVER is None:
         settings.set_server_configuration(server_factory.ServerConfig(None, False))
-        server.start_local_server()
+        server.start_local_server(context=AvailableServerContexts.premium)
     if len(args) == 2:
         external_operator_api.external_operator_record_with_abstract_core_and_wrapper(
             operator._call_back(),
diff --git a/ansys/dpf/core/server.py b/ansys/dpf/core/server.py
index 53139daf64..56f3f8dfbe 100644
--- a/ansys/dpf/core/server.py
+++ b/ansys/dpf/core/server.py
@@ -18,6 +18,7 @@
 
 from ansys.dpf.core.server_factory import ServerConfig, ServerFactory, CommunicationProtocols
 from ansys.dpf.core.server_types import DPF_DEFAULT_PORT, LOCALHOST, RUNNING_DOCKER
+from ansys.dpf.core import server_context
 
 
 def shutdown_global_server():
@@ -129,7 +130,8 @@ def start_local_server(
         docker_config=RUNNING_DOCKER,
         timeout=20.,
         config=None,
-        use_pypim_by_default=True
+        use_pypim_by_default=True,
+        context=None
 ):
     """Start a new local DPF server at a given port and IP address.
 
@@ -168,6 +170,10 @@ def start_local_server(
     use_pypim_by_default: bool, optional
         Whether to use PyPIM functionalities by default when a PyPIM environment is detected.
         Defaults to True.
+    context: ServerContext, optional
+        Defines the settings that will be used to load DPF's plugins.
+        A DPF xml file can be used to list the plugins and set up variables. Default is
+        `server_context.SERVER_CONTEXT`.
 
     Returns
     -------
@@ -207,6 +213,9 @@ def start_local_server(
     else:
         docker_config.use_docker = False
 
+    if context is None:
+        context = server_context.SERVER_CONTEXT
+
     server = None
     n_attempts = 3
     timed_out = False
@@ -221,11 +230,11 @@ def start_local_server(
                 server = server_type(
                     ansys_path, ip, port, as_global=as_global, launch_server=True,
                     load_operators=load_operators, docker_config=docker_config, timeout=timeout,
-                    use_pypim=use_pypim)
+                    use_pypim=use_pypim, context=context)
             else:
                 server = server_type(
                     ansys_path, as_global=as_global,
-                    load_operators=load_operators, timeout=timeout)
+                    load_operators=load_operators, timeout=timeout, context=context)
             break
         except errors.InvalidPortError:  # allow socket in use errors
             port += 1
@@ -249,7 +258,14 @@ def start_local_server(
     return server
 
 
-def connect_to_server(ip=LOCALHOST, port=DPF_DEFAULT_PORT, as_global=True, timeout=5, config=None):
+def connect_to_server(
+        ip=LOCALHOST,
+        port=DPF_DEFAULT_PORT,
+        as_global=True,
+        timeout=5,
+        config=None,
+        context=None,
+):
     """Connect to an existing DPF server.
 
     This method sets the global default channel that is then used for the
@@ -273,6 +289,10 @@ def connect_to_server(ip=LOCALHOST, port=DPF_DEFAULT_PORT, as_global=True, timeo
         passes, the connection fails.
     config: ServerConfig, optional
         Manages the type of server connection to use.
+    context: ServerContext, optional
+        Defines the settings that will be used to load DPF's plugins.
+        A DPF xml file can be used to list the plugins and set up variables. Default is
+        `server_context.SERVER_CONTEXT`.
 
     Examples
     --------
@@ -293,17 +313,20 @@ def connect_to_server(ip=LOCALHOST, port=DPF_DEFAULT_PORT, as_global=True, timeo
     >>> #unspecified_server = dpf.connect_to_server(as_global=False)
 
     """
-
+    if context is None:
+        context = server_context.SERVER_CONTEXT
     def connect():
         server_init_signature = inspect.signature(server_type.__init__)
         if "ip" in server_init_signature.parameters.keys() \
                 and "port" in server_init_signature.parameters.keys():
             server = server_type(
-                ip=ip, port=port, as_global=as_global, launch_server=False
+                ip=ip, port=port, as_global=as_global, launch_server=False,
+                context=context
             )
         else:
             server = server_type(
-                as_global=as_global
+                as_global=as_global,
+                context=context
             )
         dpf.core._server_instances.append(weakref.ref(server))
         return server
diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 0586edf043..754eba7a19 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -614,6 +614,7 @@ def __init__(self,
                  docker_config=RUNNING_DOCKER,
                  use_pypim=True,
                  num_connection_tryouts=3,
+                 context=server_context.SERVER_CONTEXT
                  ):
         # Load DPFClientAPI
         from ansys.dpf.core.misc import is_pypim_configured
@@ -652,7 +653,7 @@ def __init__(self,
         self._create_shutdown_funcs()
         self._check_first_call(num_connection_tryouts)
         try:
-            self.apply_context(server_context.SERVER_CONTEXT)
+            self.apply_context(context)
         except errors.DpfVersionNotSupported:
             pass
         self.set_as_global(as_global=as_global)
@@ -801,7 +802,9 @@ def __init__(self,
                  ansys_path=None,
                  as_global=True,
                  load_operators=True,
-                 timeout=None):
+                 timeout=None,
+                 context=server_context.SERVER_CONTEXT
+    ):
         # Load DPFClientAPI
         super().__init__(ansys_path=ansys_path, load_operators=load_operators)
         # Load DataProcessingCore
@@ -817,7 +820,7 @@ def __init__(self,
                     f"Unable to locate the following file: {path}")
             raise e
         try:
-            self.apply_context(server_context.SERVER_CONTEXT)
+            self.apply_context(context)
         except errors.DpfVersionNotSupported:
             self._base_service.initialize_with_context(
                 server_context.AvailableServerContexts.premium
@@ -911,6 +914,7 @@ def __init__(
             launch_server=True,
             docker_config=RUNNING_DOCKER,
             use_pypim=True,
+            context=server_context.SERVER_CONTEXT
     ):
         """Start the DPF server."""
         # Use ansys.grpc.dpf
@@ -964,7 +968,7 @@ def __init__(
 
         check_ansys_grpc_dpf_version(self, timeout)
         try:
-            self.apply_context(server_context.SERVER_CONTEXT)
+            self.apply_context(context)
         except errors.DpfVersionNotSupported:
             pass
         self.set_as_global(as_global=as_global)
diff --git a/ansys/dpf/core/settings.py b/ansys/dpf/core/settings.py
index 58d34d51da..14de522e33 100644
--- a/ansys/dpf/core/settings.py
+++ b/ansys/dpf/core/settings.py
@@ -8,6 +8,7 @@
 from ansys.dpf.core.misc import module_exists
 from ansys.dpf.core import misc
 from ansys.dpf.core.server import set_server_configuration  # noqa: F401
+from ansys.dpf.core.server_context import set_default_server_context  # noqa: F401
 from ansys.dpf.core.server_factory import ServerConfig  # noqa: F401
 from ansys.dpf.core import core
 
diff --git a/tests/test_service.py b/tests/test_service.py
index 48b07f79e8..e48269eeb6 100644
--- a/tests/test_service.py
+++ b/tests/test_service.py
@@ -462,6 +462,19 @@ def revert():
 
 
 @pytest.mark.order(1)
+@pytest.mark.skipif(os.environ.get("ANSYS_DPF_ACCEPT_LA", None) is None,
+                    reason="Tests ANSYS_DPF_ACCEPT_LA")
+@conftest.raises_for_servers_version_under("6.0")
+def test_license_agr(config_server_type, set_context_back_to_premium):
+    init_val = os.environ["ANSYS_DPF_ACCEPT_LA"]
+    del os.environ["ANSYS_DPF_ACCEPT_LA"]
+    with pytest.raises(dpf.core.errors.DPFServerException):
+        rst = examples.find_static_rst()  # starts a server
+    os.environ["ANSYS_DPF_ACCEPT_LA"] = init_val
+    assert "static" in examples.find_static_rst()
+
+
+@pytest.mark.order(2)
 @pytest.mark.skipif(running_docker or not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
                     reason="AWP ROOT is not set with Docker")
 @conftest.raises_for_servers_version_under("6.0")
@@ -493,7 +506,7 @@ def test_apply_context(set_context_back_to_premium):
     assert dpf.core.SERVER.context == dpf.core.AvailableServerContexts.premium
 
 
-@pytest.mark.order(2)
+@pytest.mark.order(3)
 @pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
                     reason="not supported")
 @conftest.raises_for_servers_version_under("6.0")

From 67c4186796f79d6502b06e1933d48af12c2b4a6f Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Tue, 22 Nov 2022 11:06:40 +0100
Subject: [PATCH 04/26] styling

---
 ansys/dpf/core/server.py       | 1 +
 ansys/dpf/core/server_types.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansys/dpf/core/server.py b/ansys/dpf/core/server.py
index 56f3f8dfbe..e6e71bebb6 100644
--- a/ansys/dpf/core/server.py
+++ b/ansys/dpf/core/server.py
@@ -315,6 +315,7 @@ def connect_to_server(
     """
     if context is None:
         context = server_context.SERVER_CONTEXT
+
     def connect():
         server_init_signature = inspect.signature(server_type.__init__)
         if "ip" in server_init_signature.parameters.keys() \
diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 754eba7a19..55f0283416 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -804,7 +804,7 @@ def __init__(self,
                  load_operators=True,
                  timeout=None,
                  context=server_context.SERVER_CONTEXT
-    ):
+                 ):
         # Load DPFClientAPI
         super().__init__(ansys_path=ansys_path, load_operators=load_operators)
         # Load DataProcessingCore

From 9f5eb0370893d4e22e266a07d5badadcf2119eff Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Tue, 22 Nov 2022 11:10:13 +0100
Subject: [PATCH 05/26] improve unit test

---
 tests/test_service.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_service.py b/tests/test_service.py
index e48269eeb6..9d45a7da3c 100644
--- a/tests/test_service.py
+++ b/tests/test_service.py
@@ -470,8 +470,11 @@ def test_license_agr(config_server_type, set_context_back_to_premium):
     del os.environ["ANSYS_DPF_ACCEPT_LA"]
     with pytest.raises(dpf.core.errors.DPFServerException):
         rst = examples.find_static_rst()  # starts a server
+    with pytest.raises((dpf.core.errors.DPFServerException, KeyError)):
+        dpf.core.Operator("stream_provider")
     os.environ["ANSYS_DPF_ACCEPT_LA"] = init_val
     assert "static" in examples.find_static_rst()
+    assert dpf.core.Operator("stream_provider") is not None
 
 
 @pytest.mark.order(2)

From 8c345d57c6e325d110d11a9c25cb3b7b6ca6135e Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Tue, 22 Nov 2022 15:50:11 +0100
Subject: [PATCH 06/26] fix tests for docker

---
 ansys/dpf/core/server_factory.py | 16 +++++++++++-----
 ansys/dpf/core/server_types.py   | 24 +++++++++++++++++-------
 tests/test_service.py            | 32 +++++++++++++++++++++++++++-----
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/ansys/dpf/core/server_factory.py b/ansys/dpf/core/server_factory.py
index 46f78add4a..738047693c 100644
--- a/ansys/dpf/core/server_factory.py
+++ b/ansys/dpf/core/server_factory.py
@@ -548,7 +548,7 @@ def remove_docker_image(self):
                     run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
                 )
 
-    def init_with_stdout(self, docker_config, LOG, lines, timeout):
+    def listen_to_process(self, docker_config, LOG, cmd_lines, lines, timeout, stdout:bool = True):
         """Search inside the Docker Container stdout log to fill in this instance's attributes.
 
         Parameters
@@ -562,16 +562,22 @@ def init_with_stdout(self, docker_config, LOG, lines, timeout):
             When to stop searching for stdout.
         """
         self._docker_config = docker_config
-        self.server_id = lines[0].replace("\n", "")
+        self.server_id = cmd_lines[0].replace("\n", "")
         t_timeout = time.time() + timeout
         while time.time() < t_timeout:
             docker_process = subprocess.Popen(f"docker logs {self.server_id}",
                                               stdout=subprocess.PIPE,
                                               stderr=subprocess.PIPE, shell=(os.name == 'posix'))
             self._use_docker = True
-            for line in io.TextIOWrapper(docker_process.stdout, encoding="utf-8"):
-                LOG.debug(line)
-                lines.append(line)
+            if stdout:
+                for line in io.TextIOWrapper(docker_process.stdout, encoding="utf-8"):
+                    LOG.debug(line)
+                    lines.append(line)
+            else:
+                for line in io.TextIOWrapper(docker_process.stderr, encoding="utf-8"):
+                    if line not in lines:
+                        # LOG.error(line)
+                        lines.append(line)
 
     def __str__(self):
         return str(self._docker_config) + f"\t- server_id: {self.server_id}\n"
diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 55f0283416..5fc40efa39 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -12,8 +12,8 @@
 import time
 import warnings
 import traceback
+import threading
 from abc import ABC
-from threading import Thread
 
 import psutil
 
@@ -144,8 +144,8 @@ def read_stdout():
         stdout = read_stdout
 
     # must be in the background since the process reader is blocking
-    Thread(target=stdout, daemon=True).start()
-    Thread(target=stderr, daemon=True).start()
+    threading.Thread(target=stdout, daemon=True).start()
+    threading.Thread(target=stderr, daemon=True).start()
 
     t_timeout = time.time() + timeout
     started = False
@@ -231,19 +231,29 @@ def launch_dpf_on_docker(docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_
     process = _run_launch_server_process(ip, port, ansys_path, docker_config)
 
     # check to see if the service started
+    cmd_lines = []
+    # Creating lock for threads
+    lock = threading.Lock()
+    lock.acquire()
     lines = []
-    docker_id = []
     current_errors = []
     running_docker_config = server_factory.RunningDockerConfig(docker_server_port=port)
 
     def read_stdout():
         for line in io.TextIOWrapper(process.stdout, encoding="utf-8"):
             LOG.debug(line)
-            lines.append(line)
-            running_docker_config.init_with_stdout(docker_config, LOG, lines, timeout)
+            cmd_lines.append(line)
+            lock.release()
+            running_docker_config.listen_to_process(docker_config, LOG, cmd_lines, lines, timeout)
+
+    def read_stderr():
+        while lock.locked():
+            pass
+        running_docker_config.listen_to_process(docker_config, LOG, cmd_lines, current_errors,
+                                                timeout, False)
 
     _wait_and_check_server_connection(
-        process, port, timeout, lines, current_errors, stderr=None, stdout=read_stdout)
+        process, port, timeout, lines, current_errors, stderr=read_stderr, stdout=read_stdout)
 
     return running_docker_config
 
diff --git a/tests/test_service.py b/tests/test_service.py
index 9d45a7da3c..095f0d7ef1 100644
--- a/tests/test_service.py
+++ b/tests/test_service.py
@@ -445,12 +445,15 @@ def set_context_back_to_premium(request):
     """Count servers once we are finished."""
 
     dpf.core.server.shutdown_all_session_servers()
+    init_val = os.environ.get("ANSYS_DPF_ACCEPT_LA", None)
     try:
         dpf.core.set_default_server_context(dpf.core.AvailableServerContexts.entry)
     except dpf.core.errors.DpfVersionNotSupported:
         pass
 
     def revert():
+        if init_val:
+            os.environ["ANSYS_DPF_ACCEPT_LA"] = init_val
         dpf.core.SERVER_CONFIGURATION = None
         dpf.core.server.shutdown_all_session_servers()
         try:
@@ -462,22 +465,41 @@ def revert():
 
 
 @pytest.mark.order(1)
-@pytest.mark.skipif(os.environ.get("ANSYS_DPF_ACCEPT_LA", None) is None,
+@pytest.mark.skipif(running_docker or os.environ.get("ANSYS_DPF_ACCEPT_LA", None) is None,
                     reason="Tests ANSYS_DPF_ACCEPT_LA")
 @conftest.raises_for_servers_version_under("6.0")
-def test_license_agr(config_server_type, set_context_back_to_premium):
+def test_license_agr(set_context_back_to_premium):
+    config = dpf.core.AvailableServerConfigs.InProcessServer
     init_val = os.environ["ANSYS_DPF_ACCEPT_LA"]
     del os.environ["ANSYS_DPF_ACCEPT_LA"]
     with pytest.raises(dpf.core.errors.DPFServerException):
-        rst = examples.find_static_rst()  # starts a server
-    with pytest.raises((dpf.core.errors.DPFServerException, KeyError)):
+        dpf.core.start_local_server(config=config, as_global=True)
+    with pytest.raises(dpf.core.errors.DPFServerException):
         dpf.core.Operator("stream_provider")
     os.environ["ANSYS_DPF_ACCEPT_LA"] = init_val
+    dpf.core.start_local_server(config=config, as_global=True)
     assert "static" in examples.find_static_rst()
     assert dpf.core.Operator("stream_provider") is not None
 
 
 @pytest.mark.order(2)
+@pytest.mark.skipif(os.environ.get("ANSYS_DPF_ACCEPT_LA", None) is None,
+                    reason="Tests ANSYS_DPF_ACCEPT_LA")
+@conftest.raises_for_servers_version_under("6.0")
+def test_license_agr_remote(remote_config_server_type, set_context_back_to_premium):
+    init_val = os.environ["ANSYS_DPF_ACCEPT_LA"]
+    del os.environ["ANSYS_DPF_ACCEPT_LA"]
+    with pytest.raises(RuntimeError):  # runtime error raised when server is started
+        dpf.core.start_local_server(config=remote_config_server_type, as_global=True)
+    with pytest.raises((dpf.core.errors.DPFServerException, RuntimeError)):
+        dpf.core.Operator("stream_provider")
+    os.environ["ANSYS_DPF_ACCEPT_LA"] = init_val
+    dpf.core.start_local_server(config=remote_config_server_type, as_global=True)
+    assert "static" in examples.find_static_rst()
+    assert dpf.core.Operator("stream_provider") is not None
+
+
+@pytest.mark.order(3)
 @pytest.mark.skipif(running_docker or not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
                     reason="AWP ROOT is not set with Docker")
 @conftest.raises_for_servers_version_under("6.0")
@@ -509,7 +531,7 @@ def test_apply_context(set_context_back_to_premium):
     assert dpf.core.SERVER.context == dpf.core.AvailableServerContexts.premium
 
 
-@pytest.mark.order(3)
+@pytest.mark.order(4)
 @pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
                     reason="not supported")
 @conftest.raises_for_servers_version_under("6.0")

From fef10ad448f081649711a83c2ea77accff138b77 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Tue, 22 Nov 2022 17:36:43 +0100
Subject: [PATCH 07/26] docker errors

---
 ansys/dpf/core/server_types.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 5fc40efa39..b6cc206650 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -247,6 +247,9 @@ def read_stdout():
             running_docker_config.listen_to_process(docker_config, LOG, cmd_lines, lines, timeout)
 
     def read_stderr():
+        for line in io.TextIOWrapper(process.stderr, encoding="utf-8"):
+            LOG.error(line)
+            current_errors.append(line)
         while lock.locked():
             pass
         running_docker_config.listen_to_process(docker_config, LOG, cmd_lines, current_errors,

From 71ee972a7a165048df44e194873ed77a3b45fee1 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 08:22:25 +0100
Subject: [PATCH 08/26] typo

---
 ansys/dpf/core/server_context.py |  6 +++---
 ansys/dpf/core/server_factory.py | 10 +++++++---
 tests/test_service.py            |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ansys/dpf/core/server_context.py b/ansys/dpf/core/server_context.py
index 78111cb97d..87dc1f143f 100644
--- a/ansys/dpf/core/server_context.py
+++ b/ansys/dpf/core/server_context.py
@@ -39,7 +39,7 @@ class ServerContext:
 
     Parameters
     ----------
-    context_type : EContextType
+    context_type : LicensingContextType
         Type of context.
     xml_path : str, optional
         Path to the xml to load.
@@ -109,8 +109,8 @@ class AvailableServerContexts:
         warnings.warn(UserWarning(
                       f"{DPF_SERVER_CONTEXT_ENV} is set to {default_context}, which is not "
                       f"recognized as an available DPF ServerContext type. \n"
-                      f"Accepted values are: {[t.name.upper() for t in EContextType]}.\n"
-                      f"Using {EContextType.entry.name.upper()} "
+                      f"Accepted values are: {[t.name.upper() for t in LicensingContextType]}.\n"
+                      f"Using {LicensingContextType.entry.name.upper()} "
                       f"as the default ServerContext type."))
 
 
diff --git a/ansys/dpf/core/server_factory.py b/ansys/dpf/core/server_factory.py
index 738047693c..0ae56f0aaa 100644
--- a/ansys/dpf/core/server_factory.py
+++ b/ansys/dpf/core/server_factory.py
@@ -548,18 +548,22 @@ def remove_docker_image(self):
                     run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
                 )
 
-    def listen_to_process(self, docker_config, LOG, cmd_lines, lines, timeout, stdout:bool = True):
+    def listen_to_process(self, docker_config, log, cmd_lines, lines, timeout, stdout: bool = True):
         """Search inside the Docker Container stdout log to fill in this instance's attributes.
 
         Parameters
         ----------
         docker_config :  DockerConfig
-        LOG
+        log
             Instance of ``logging`` to add debug info to.
+        cmd_lines: list
+            Stdout of the shell process run ``docker run`` command.
         lines : list
             Internal Container's stdout are copied into ``lines``.
         timeout : time
             When to stop searching for stdout.
+        stdout : bool, optional
+            Whether to check stdout or stderr.
         """
         self._docker_config = docker_config
         self.server_id = cmd_lines[0].replace("\n", "")
@@ -571,7 +575,7 @@ def listen_to_process(self, docker_config, LOG, cmd_lines, lines, timeout, stdou
             self._use_docker = True
             if stdout:
                 for line in io.TextIOWrapper(docker_process.stdout, encoding="utf-8"):
-                    LOG.debug(line)
+                    log.debug(line)
                     lines.append(line)
             else:
                 for line in io.TextIOWrapper(docker_process.stderr, encoding="utf-8"):
diff --git a/tests/test_service.py b/tests/test_service.py
index 319107a33e..5fb2e7753e 100644
--- a/tests/test_service.py
+++ b/tests/test_service.py
@@ -500,7 +500,7 @@ def test_context_environment_variable(reset_context_environment_variable):
     assert s_c.SERVER_CONTEXT == s_c.AvailableServerContexts.entry
 
     # Test each possible value is correctly understood and sets SERVER_CONTEXT
-    for context in s_c.EContextType:
+    for context in s_c.LicensingContextType:
         os.environ[key] = context.name.upper()
         reload(s_c)
         try:

From f1470fc278666d7e091596b2b377302c199fd667 Mon Sep 17 00:00:00 2001
From: anslpa <74727146+anslpa@users.noreply.github.com>
Date: Wed, 23 Nov 2022 08:55:09 +0100
Subject: [PATCH 09/26] Update doc (#636)

---
 ansys/dpf/core/server_context.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansys/dpf/core/server_context.py b/ansys/dpf/core/server_context.py
index 87dc1f143f..f080b44c61 100644
--- a/ansys/dpf/core/server_context.py
+++ b/ansys/dpf/core/server_context.py
@@ -36,6 +36,7 @@ def same_licensing_context(first, second):
 
 class ServerContext:
     """The context allows to choose which capabilities are available server side.
+    xml_path argument won't be taken into account if using LicensingContextType.entry.
 
     Parameters
     ----------

From aa0733be03caabb1cd248f09c5c2dd6031755e38 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 14:03:13 +0100
Subject: [PATCH 10/26] docker rm even when server failed

---
 ansys/dpf/core/server_factory.py | 10 ++++++--
 ansys/dpf/core/server_types.py   | 43 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/ansys/dpf/core/server_factory.py b/ansys/dpf/core/server_factory.py
index 0ae56f0aaa..a8e092544d 100644
--- a/ansys/dpf/core/server_factory.py
+++ b/ansys/dpf/core/server_factory.py
@@ -455,6 +455,10 @@ def docker_server_port(self):
         """
         return self._port
 
+    @docker_server_port.setter
+    def docker_server_port(self, val):
+        self._port = val
+
     @property
     def server_id(self):
         """Running Docker Container id.
@@ -548,7 +552,7 @@ def remove_docker_image(self):
                     run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
                 )
 
-    def listen_to_process(self, docker_config, log, cmd_lines, lines, timeout, stdout: bool = True):
+    def listen_to_process(self, log, cmd_lines, lines, timeout, stdout: bool = True):
         """Search inside the Docker Container stdout log to fill in this instance's attributes.
 
         Parameters
@@ -565,7 +569,6 @@ def listen_to_process(self, docker_config, log, cmd_lines, lines, timeout, stdou
         stdout : bool, optional
             Whether to check stdout or stderr.
         """
-        self._docker_config = docker_config
         self.server_id = cmd_lines[0].replace("\n", "")
         t_timeout = time.time() + timeout
         while time.time() < t_timeout:
@@ -583,6 +586,9 @@ def listen_to_process(self, docker_config, log, cmd_lines, lines, timeout, stdou
                         # LOG.error(line)
                         lines.append(line)
 
+    def docker_run_cmd_command(self, docker_server_port, local_port):
+        return self._docker_config.docker_run_cmd_command(docker_server_port, local_port)
+
     def __str__(self):
         return str(self._docker_config) + f"\t- server_id: {self.server_id}\n"
 
diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index b6cc206650..11ee11766d 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -95,7 +95,7 @@ def _verify_ansys_path_is_valid(ansys_path, executable, path_in_install=None):
 
 
 def _run_launch_server_process(ip, port, ansys_path=None,
-                               docker_config=server_factory.DockerConfig()):
+                               docker_config=server_factory.RunningDockerConfig()):
     bShell = False
     if docker_config.use_docker:
         docker_server_port = int(os.environ.get("DOCKER_SERVER_PORT", port))
@@ -201,7 +201,7 @@ def launch_dpf(ansys_path, ip=LOCALHOST, port=DPF_DEFAULT_PORT, timeout=10):
         process, port, timeout, lines, current_errors, stderr=None, stdout=None)
 
 
-def launch_dpf_on_docker(docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_DEFAULT_PORT,
+def launch_dpf_on_docker(running_docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_DEFAULT_PORT,
                          timeout=10):
     """Launch Ansys DPF.
 
@@ -223,12 +223,8 @@ def launch_dpf_on_docker(docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_
     docker_config : server_factory.DockerConfig, optional
         To start DPF server as a docker, specify the docker configurations here.
 
-    Returns
-    -------
-    running_docker_config : server_factory.RunningDockerConfig
-
     """
-    process = _run_launch_server_process(ip, port, ansys_path, docker_config)
+    process = _run_launch_server_process(ip, port, ansys_path, running_docker_config)
 
     # check to see if the service started
     cmd_lines = []
@@ -237,14 +233,14 @@ def launch_dpf_on_docker(docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_
     lock.acquire()
     lines = []
     current_errors = []
-    running_docker_config = server_factory.RunningDockerConfig(docker_server_port=port)
+    running_docker_config.docker_server_port = port
 
     def read_stdout():
         for line in io.TextIOWrapper(process.stdout, encoding="utf-8"):
             LOG.debug(line)
             cmd_lines.append(line)
             lock.release()
-            running_docker_config.listen_to_process(docker_config, LOG, cmd_lines, lines, timeout)
+            running_docker_config.listen_to_process(LOG, cmd_lines, lines, timeout)
 
     def read_stderr():
         for line in io.TextIOWrapper(process.stderr, encoding="utf-8"):
@@ -252,14 +248,12 @@ def read_stderr():
             current_errors.append(line)
         while lock.locked():
             pass
-        running_docker_config.listen_to_process(docker_config, LOG, cmd_lines, current_errors,
+        running_docker_config.listen_to_process(LOG, cmd_lines, current_errors,
                                                 timeout, False)
 
     _wait_and_check_server_connection(
         process, port, timeout, lines, current_errors, stderr=read_stderr, stdout=read_stdout)
 
-    return running_docker_config
-
 
 def launch_remote_dpf(version=None):
     try:
@@ -649,8 +643,9 @@ def __init__(self,
                 port = int(address.split(":")[-1])
 
             elif docker_config.use_docker:
-                self.docker_config = launch_dpf_on_docker(
-                    docker_config=docker_config,
+                self.docker_config = server_factory.RunningDockerConfig(docker_config)
+                launch_dpf_on_docker(
+                    running_docker_config=self.docker_config,
                     ansys_path=ansys_path, ip=ip, port=port, timeout=timeout)
             else:
                 launch_dpf(ansys_path, ip, port, timeout=timeout)
@@ -707,11 +702,13 @@ def shutdown(self):
         if self._remote_instance:
             self._remote_instance.delete()
         try:
-            self._preparing_shutdown_func[0](self._preparing_shutdown_func[1])
+            if hasattr(self, "_preparing_shutdown_func"):
+                self._preparing_shutdown_func[0](self._preparing_shutdown_func[1])
         except Exception as e:
             warnings.warn("couldn't prepare shutdown: " + str(e.args))
         try:
-            self._shutdown_func[0](self._shutdown_func[1])
+            if hasattr(self, "_shutdown_func"):
+                self._shutdown_func[0](self._shutdown_func[1])
         except Exception as e:
             warnings.warn("couldn't shutdown server: " + str(e.args))
         self._docker_config.remove_docker_image()
@@ -960,9 +957,11 @@ def __init__(
             else:
 
                 if docker_config.use_docker:
-                    self.docker_config = launch_dpf_on_docker(docker_config=docker_config,
-                                                              ansys_path=ansys_path, ip=ip,
-                                                              port=port, timeout=timeout)
+                    self.docker_config = server_factory.RunningDockerConfig(docker_config)
+                    launch_dpf_on_docker(
+                        running_docker_config=self.docker_config,
+                        ansys_path=ansys_path, ip=ip,
+                        port=port, timeout=timeout)
                 else:
                     launch_dpf(ansys_path, ip, port, timeout=timeout)
                     self._local_server = True
@@ -1108,7 +1107,8 @@ def local_server(self, val):
     def shutdown(self):
         if self._own_process and self.live:
             try:
-                self._preparing_shutdown_func[0](self._preparing_shutdown_func[1])
+                if hasattr(self, "_preparing_shutdown_func"):
+                    self._preparing_shutdown_func[0](self._preparing_shutdown_func[1])
             except Exception as e:
                 warnings.warn("couldn't prepare shutdown: " + str(e.args))
 
@@ -1116,7 +1116,8 @@ def shutdown(self):
                 self._remote_instance.delete()
             else:
                 try:
-                    self._shutdown_func[0](self._shutdown_func[1])
+                    if hasattr(self, "_shutdown_func"):
+                        self._shutdown_func[0](self._shutdown_func[1])
                 except Exception as e:
                     try:
                         if self.meet_version("4.0"):

From 6baadeef9c290b0b9f0b72dddc202f55502d28ac Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 14:04:15 +0100
Subject: [PATCH 11/26] Revert "not set as global if apply context didn't work"

This reverts commit 477a2f73bc059b7d6e96b4631583128ee5cda58f.
---
 ansys/dpf/core/server_types.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index b6cc206650..742f7bfbc0 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -665,11 +665,11 @@ def __init__(self,
         self.live = True
         self._create_shutdown_funcs()
         self._check_first_call(num_connection_tryouts)
+        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(context)
         except errors.DpfVersionNotSupported:
             pass
-        self.set_as_global(as_global=as_global)
 
     def _check_first_call(self, num_connection_tryouts):
         for i in range(num_connection_tryouts):
@@ -832,6 +832,7 @@ def __init__(self,
                     f"DPF directory not found at {os.path.dirname(path)}"
                     f"Unable to locate the following file: {path}")
             raise e
+        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(context)
         except errors.DpfVersionNotSupported:
@@ -840,7 +841,6 @@ def __init__(self,
             )
             self._context = server_context.AvailableServerContexts.premium
             pass
-        self.set_as_global(as_global=as_global)
 
     @property
     def version(self):
@@ -980,11 +980,11 @@ def __init__(
         self._create_shutdown_funcs()
 
         check_ansys_grpc_dpf_version(self, timeout)
+        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(context)
         except errors.DpfVersionNotSupported:
             pass
-        self.set_as_global(as_global=as_global)
 
     def _create_shutdown_funcs(self):
         self._core_api = data_processing_grpcapi.DataProcessingGRPCAPI

From 4d543857c038814200fac7f294b0491bb3587bb6 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 14:28:41 +0100
Subject: [PATCH 12/26] try

---
 .github/workflows/tests.yml    | 16 ++++++++--------
 ansys/dpf/core/server_types.py |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b59b3f55c8..879a8a485a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -122,7 +122,7 @@ jobs:
         shell: bash
         working-directory: tests
         run: |
-          pytest $DEBUG --cov=ansys.dpf.${{env.MODULE}} --cov-report=xml --cov-report=html --log-level=ERROR --junitxml=junit/test-results.xml --reruns 2 .
+          pytest $DEBUG --cov=ansys.dpf.${{env.MODULE}} --cov-report=xml --cov-report=html --log-level=ERROR --junitxml=junit/test-results.xml .
 
       - name: "Kill all servers"
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
@@ -132,7 +132,7 @@ jobs:
         shell: bash
         working-directory: test_launcher
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml --reruns 2 .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml .
         if: always()
 
       - name: "Kill all servers"
@@ -143,7 +143,7 @@ jobs:
         shell: bash
         working-directory: test_server
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results4.xml --reruns 2 .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results4.xml .
         if: always()
 
       - name: "Kill all servers"
@@ -154,7 +154,7 @@ jobs:
         shell: bash
         working-directory: test_local_server
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results5.xml --reruns 2 .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results5.xml .
         if: always()
 
       - name: "Kill all servers"
@@ -165,7 +165,7 @@ jobs:
         shell: bash
         working-directory: test_multi_server
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results6.xml --reruns 2 .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results6.xml .
         if: always()
 
       - name: "Kill all servers"
@@ -176,7 +176,7 @@ jobs:
         shell: bash
         working-directory: test_remote_workflow
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results7.xml --reruns 2 .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results7.xml .
         if: always()
 
       - name: "Kill all servers"
@@ -187,7 +187,7 @@ jobs:
         shell: bash
         working-directory: test_remote_operator
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results8.xml --reruns 2 .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results8.xml .
         if: always()
 
       - name: "Kill all servers"
@@ -198,7 +198,7 @@ jobs:
         shell: bash
         working-directory: test_workflow
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results3.xml --reruns 3 .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results3.xml .
         if: always()
 
       - name: "Kill all servers"
diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 742f7bfbc0..240690db64 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -355,7 +355,7 @@ def __init__(self):
         self._server_id = None
         self._session_instance = None
         self._base_service_instance = None
-        self._context = None
+        self._context = server_context.SERVER_CONTEXT
         self._docker_config = server_factory.RunningDockerConfig()
 
     def set_as_global(self, as_global=True):

From 0690cfb4a6d287b675936e303dfbd8a559f71a29 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 14:59:01 +0100
Subject: [PATCH 13/26] revert

---
 ansys/dpf/core/server_types.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 240690db64..a49902ea20 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -12,7 +12,7 @@
 import time
 import warnings
 import traceback
-import threading
+from threading import Thread, Lock
 from abc import ABC
 
 import psutil
@@ -144,8 +144,8 @@ def read_stdout():
         stdout = read_stdout
 
     # must be in the background since the process reader is blocking
-    threading.Thread(target=stdout, daemon=True).start()
-    threading.Thread(target=stderr, daemon=True).start()
+    Thread(target=stdout, daemon=True).start()
+    Thread(target=stderr, daemon=True).start()
 
     t_timeout = time.time() + timeout
     started = False
@@ -233,7 +233,7 @@ def launch_dpf_on_docker(docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_
     # check to see if the service started
     cmd_lines = []
     # Creating lock for threads
-    lock = threading.Lock()
+    lock = Lock()
     lock.acquire()
     lines = []
     current_errors = []
@@ -667,7 +667,7 @@ def __init__(self,
         self._check_first_call(num_connection_tryouts)
         self.set_as_global(as_global=as_global)
         try:
-            self.apply_context(context)
+            self._base_service.initialize_with_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
             pass
 
@@ -834,12 +834,11 @@ def __init__(self,
             raise e
         self.set_as_global(as_global=as_global)
         try:
-            self.apply_context(context)
+            self._base_service.apply_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
             self._base_service.initialize_with_context(
                 server_context.AvailableServerContexts.premium
             )
-            self._context = server_context.AvailableServerContexts.premium
             pass
 
     @property
@@ -982,7 +981,7 @@ def __init__(
         check_ansys_grpc_dpf_version(self, timeout)
         self.set_as_global(as_global=as_global)
         try:
-            self.apply_context(context)
+            self._base_service.initialize_with_context(server_context.SERVER_CONTEXT)
         except errors.DpfVersionNotSupported:
             pass
 

From 31ec8cc7614f62e18f94e1e885c6ae1138d608af Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 15:09:27 +0100
Subject: [PATCH 14/26] Revert "revert"

This reverts commit 0690cfb4a6d287b675936e303dfbd8a559f71a29.
---
 ansys/dpf/core/server_types.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index a49902ea20..240690db64 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -12,7 +12,7 @@
 import time
 import warnings
 import traceback
-from threading import Thread, Lock
+import threading
 from abc import ABC
 
 import psutil
@@ -144,8 +144,8 @@ def read_stdout():
         stdout = read_stdout
 
     # must be in the background since the process reader is blocking
-    Thread(target=stdout, daemon=True).start()
-    Thread(target=stderr, daemon=True).start()
+    threading.Thread(target=stdout, daemon=True).start()
+    threading.Thread(target=stderr, daemon=True).start()
 
     t_timeout = time.time() + timeout
     started = False
@@ -233,7 +233,7 @@ def launch_dpf_on_docker(docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_
     # check to see if the service started
     cmd_lines = []
     # Creating lock for threads
-    lock = Lock()
+    lock = threading.Lock()
     lock.acquire()
     lines = []
     current_errors = []
@@ -667,7 +667,7 @@ def __init__(self,
         self._check_first_call(num_connection_tryouts)
         self.set_as_global(as_global=as_global)
         try:
-            self._base_service.initialize_with_context(server_context.SERVER_CONTEXT)
+            self.apply_context(context)
         except errors.DpfVersionNotSupported:
             pass
 
@@ -834,11 +834,12 @@ def __init__(self,
             raise e
         self.set_as_global(as_global=as_global)
         try:
-            self._base_service.apply_context(server_context.SERVER_CONTEXT)
+            self.apply_context(context)
         except errors.DpfVersionNotSupported:
             self._base_service.initialize_with_context(
                 server_context.AvailableServerContexts.premium
             )
+            self._context = server_context.AvailableServerContexts.premium
             pass
 
     @property
@@ -981,7 +982,7 @@ def __init__(
         check_ansys_grpc_dpf_version(self, timeout)
         self.set_as_global(as_global=as_global)
         try:
-            self._base_service.initialize_with_context(server_context.SERVER_CONTEXT)
+            self.apply_context(context)
         except errors.DpfVersionNotSupported:
             pass
 

From 449885f75483087f44d4e39e0f1a6ceb51b965dd Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 15:10:11 +0100
Subject: [PATCH 15/26] Revert "try"

This reverts commit 4d543857c038814200fac7f294b0491bb3587bb6.
---
 .github/workflows/tests.yml    | 16 ++++++++--------
 ansys/dpf/core/server_types.py |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 879a8a485a..b59b3f55c8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -122,7 +122,7 @@ jobs:
         shell: bash
         working-directory: tests
         run: |
-          pytest $DEBUG --cov=ansys.dpf.${{env.MODULE}} --cov-report=xml --cov-report=html --log-level=ERROR --junitxml=junit/test-results.xml .
+          pytest $DEBUG --cov=ansys.dpf.${{env.MODULE}} --cov-report=xml --cov-report=html --log-level=ERROR --junitxml=junit/test-results.xml --reruns 2 .
 
       - name: "Kill all servers"
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
@@ -132,7 +132,7 @@ jobs:
         shell: bash
         working-directory: test_launcher
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml --reruns 2 .
         if: always()
 
       - name: "Kill all servers"
@@ -143,7 +143,7 @@ jobs:
         shell: bash
         working-directory: test_server
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results4.xml .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results4.xml --reruns 2 .
         if: always()
 
       - name: "Kill all servers"
@@ -154,7 +154,7 @@ jobs:
         shell: bash
         working-directory: test_local_server
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results5.xml .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results5.xml --reruns 2 .
         if: always()
 
       - name: "Kill all servers"
@@ -165,7 +165,7 @@ jobs:
         shell: bash
         working-directory: test_multi_server
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results6.xml .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results6.xml --reruns 2 .
         if: always()
 
       - name: "Kill all servers"
@@ -176,7 +176,7 @@ jobs:
         shell: bash
         working-directory: test_remote_workflow
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results7.xml .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results7.xml --reruns 2 .
         if: always()
 
       - name: "Kill all servers"
@@ -187,7 +187,7 @@ jobs:
         shell: bash
         working-directory: test_remote_operator
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results8.xml .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results8.xml --reruns 2 .
         if: always()
 
       - name: "Kill all servers"
@@ -198,7 +198,7 @@ jobs:
         shell: bash
         working-directory: test_workflow
         run: |
-          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results3.xml .
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results3.xml --reruns 3 .
         if: always()
 
       - name: "Kill all servers"
diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 240690db64..742f7bfbc0 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -355,7 +355,7 @@ def __init__(self):
         self._server_id = None
         self._session_instance = None
         self._base_service_instance = None
-        self._context = server_context.SERVER_CONTEXT
+        self._context = None
         self._docker_config = server_factory.RunningDockerConfig()
 
     def set_as_global(self, as_global=True):

From e57eb2452f7a9a2aeeb5c79f143fb36e867641d0 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 15:11:04 +0100
Subject: [PATCH 16/26] Revert "Revert "not set as global if apply context
 didn't work""

This reverts commit 6baadeef9c290b0b9f0b72dddc202f55502d28ac.
---
 ansys/dpf/core/server_types.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 742f7bfbc0..b6cc206650 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -665,11 +665,11 @@ def __init__(self,
         self.live = True
         self._create_shutdown_funcs()
         self._check_first_call(num_connection_tryouts)
-        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(context)
         except errors.DpfVersionNotSupported:
             pass
+        self.set_as_global(as_global=as_global)
 
     def _check_first_call(self, num_connection_tryouts):
         for i in range(num_connection_tryouts):
@@ -832,7 +832,6 @@ def __init__(self,
                     f"DPF directory not found at {os.path.dirname(path)}"
                     f"Unable to locate the following file: {path}")
             raise e
-        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(context)
         except errors.DpfVersionNotSupported:
@@ -841,6 +840,7 @@ def __init__(self,
             )
             self._context = server_context.AvailableServerContexts.premium
             pass
+        self.set_as_global(as_global=as_global)
 
     @property
     def version(self):
@@ -980,11 +980,11 @@ def __init__(
         self._create_shutdown_funcs()
 
         check_ansys_grpc_dpf_version(self, timeout)
-        self.set_as_global(as_global=as_global)
         try:
             self.apply_context(context)
         except errors.DpfVersionNotSupported:
             pass
+        self.set_as_global(as_global=as_global)
 
     def _create_shutdown_funcs(self):
         self._core_api = data_processing_grpcapi.DataProcessingGRPCAPI

From 430fadec226af2df53e4f1c4369ebc000fe2e9fb Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 15:15:55 +0100
Subject: [PATCH 17/26] threading

---
 ansys/dpf/core/server_types.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index b6cc206650..5e0bd80a0a 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -12,7 +12,7 @@
 import time
 import warnings
 import traceback
-import threading
+from threading import Thread, Lock
 from abc import ABC
 
 import psutil

From 3745a23ee99a1b5f1581304db8a0f4b0dd088e23 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 15:21:27 +0100
Subject: [PATCH 18/26] initialize

---
 ansys/dpf/core/server_types.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 5e0bd80a0a..1c71ef6b96 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -144,8 +144,8 @@ def read_stdout():
         stdout = read_stdout
 
     # must be in the background since the process reader is blocking
-    threading.Thread(target=stdout, daemon=True).start()
-    threading.Thread(target=stderr, daemon=True).start()
+    Thread(target=stdout, daemon=True).start()
+    Thread(target=stderr, daemon=True).start()
 
     t_timeout = time.time() + timeout
     started = False
@@ -233,7 +233,7 @@ def launch_dpf_on_docker(docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_
     # check to see if the service started
     cmd_lines = []
     # Creating lock for threads
-    lock = threading.Lock()
+    lock = Lock()
     lock.acquire()
     lines = []
     current_errors = []
@@ -666,7 +666,8 @@ def __init__(self,
         self._create_shutdown_funcs()
         self._check_first_call(num_connection_tryouts)
         try:
-            self.apply_context(context)
+            self._base_service.initialize_with_context(context)
+            self._context = context
         except errors.DpfVersionNotSupported:
             pass
         self.set_as_global(as_global=as_global)
@@ -981,7 +982,8 @@ def __init__(
 
         check_ansys_grpc_dpf_version(self, timeout)
         try:
-            self.apply_context(context)
+            self._base_service.initialize_with_context(context)
+            self._context = context
         except errors.DpfVersionNotSupported:
             pass
         self.set_as_global(as_global=as_global)

From c03214bfd6478c214543d76e72e4f92cf1da05c1 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 15:47:01 +0100
Subject: [PATCH 19/26] fix service unit tests

---
 tests/test_service.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/test_service.py b/tests/test_service.py
index 5fb2e7753e..b41553a473 100644
--- a/tests/test_service.py
+++ b/tests/test_service.py
@@ -5,6 +5,7 @@
 import pkgutil
 import datetime
 import platform
+from importlib import reload
 
 from ansys import dpf
 from ansys.dpf.core import path_utilities
@@ -479,6 +480,13 @@ def reset_context_environment_variable(request):
     def revert():
         if init_context:
             os.environ[key] = init_context
+        else:
+            del os.environ[key]
+        reload(s_c)
+        try:
+            dpf.core.set_default_server_context(dpf.core.AvailableServerContexts.premium)
+        except dpf.core.errors.DpfVersionNotSupported:
+            pass
 
     request.addfinalizer(revert)
 
@@ -487,7 +495,6 @@ def revert():
                     reason="AWP ROOT is not set with Docker")
 @conftest.raises_for_servers_version_under("6.0")
 def test_context_environment_variable(reset_context_environment_variable):
-    from importlib import reload
     from ansys.dpf.core import server_context as s_c
 
     key = s_c.DPF_SERVER_CONTEXT_ENV

From a89aa5b3ab4e8dabee0290ccd888ba7a3c98f6d7 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 16:47:02 +0100
Subject: [PATCH 20/26] skip failing test

---
 tests/test_remote_workflow.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/test_remote_workflow.py b/tests/test_remote_workflow.py
index 875dbf1db1..d67c16a564 100644
--- a/tests/test_remote_workflow.py
+++ b/tests/test_remote_workflow.py
@@ -1,3 +1,5 @@
+import os
+
 import numpy as np
 import pytest
 
@@ -506,9 +508,11 @@ def test_multi_process_transparent_api_connect_local_op_remote_workflow():
 
 
 @pytest.mark.xfail(raises=ServerTypeError)
-@pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
-                    reason='Connecting data from different servers is '
-                           'supported starting server version 3.0')
+@pytest.mark.skipif(
+    (conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_4_0 and os.name == "posix") and
+    not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
+    reason='Connecting data from different servers is '
+           'supported starting server version 3.0')
 def test_multi_process_transparent_api_create_on_local_remote_workflow():
     files = examples.download_distributed_files()
     wf = core.Workflow()

From e844c142635e2e7ed16da155ced296a63b579649 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 17:00:14 +0100
Subject: [PATCH 21/26] skip failing test

---
 tests/test_remote_workflow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_remote_workflow.py b/tests/test_remote_workflow.py
index d67c16a564..8f5ae8757b 100644
--- a/tests/test_remote_workflow.py
+++ b/tests/test_remote_workflow.py
@@ -509,7 +509,7 @@ def test_multi_process_transparent_api_connect_local_op_remote_workflow():
 
 @pytest.mark.xfail(raises=ServerTypeError)
 @pytest.mark.skipif(
-    (conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_4_0 and os.name == "posix") and
+    (not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_4_0 and os.name == "posix") and
     not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
     reason='Connecting data from different servers is '
            'supported starting server version 3.0')

From dacfa707ff65ed63a03ddc1945de6808f6ddd6a4 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 18:03:28 +0100
Subject: [PATCH 22/26] API change

---
 tests/test_server.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_server.py b/tests/test_server.py
index 851e758ef5..9e62ed93a1 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -146,8 +146,11 @@ def test_docker_busy_port(remote_config_server_type, clean_up):
     my_serv = start_local_server(config=remote_config_server_type)
     busy_port = my_serv.external_port
     with pytest.raises(errors.InvalidPortError):
+        running_docker_config = dpf.core.server_factory.RunningDockerConfig(
+            docker_config=dpf.core.server.RUNNING_DOCKER
+        )
         server_types.launch_dpf_on_docker(port=busy_port,
-                                          docker_config=dpf.core.server.RUNNING_DOCKER
+                                          running_docker_config=running_docker_config
                                           )
     server = start_local_server(as_global=False, port=busy_port,
                                 config=remote_config_server_type)

From 74469aa78dd9a35aa57a870e4d73025d79e1d4bd Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Wed, 23 Nov 2022 18:10:55 +0100
Subject: [PATCH 23/26] styling

---
 ansys/dpf/core/server_types.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansys/dpf/core/server_types.py b/ansys/dpf/core/server_types.py
index 06a357aabe..2238886be9 100644
--- a/ansys/dpf/core/server_types.py
+++ b/ansys/dpf/core/server_types.py
@@ -201,7 +201,8 @@ def launch_dpf(ansys_path, ip=LOCALHOST, port=DPF_DEFAULT_PORT, timeout=10):
         process, port, timeout, lines, current_errors, stderr=None, stdout=None)
 
 
-def launch_dpf_on_docker(running_docker_config, ansys_path=None, ip=LOCALHOST, port=DPF_DEFAULT_PORT,
+def launch_dpf_on_docker(running_docker_config,
+                         ansys_path=None, ip=LOCALHOST, port=DPF_DEFAULT_PORT,
                          timeout=10):
     """Launch Ansys DPF.
 

From 525e895a1786d42fe4b45cd44f32d6ad8220ae4b Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Thu, 24 Nov 2022 06:26:57 +0100
Subject: [PATCH 24/26] split tests service

---
 .../workflows/scripts/separate_long_core_tests.ps1    |  6 +++++-
 .github/workflows/tests.yml                           | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/separate_long_core_tests.ps1 b/.github/workflows/scripts/separate_long_core_tests.ps1
index 16db460dc9..096b90cd11 100644
--- a/.github/workflows/scripts/separate_long_core_tests.ps1
+++ b/.github/workflows/scripts/separate_long_core_tests.ps1
@@ -5,6 +5,7 @@ New-Item -Path ".\" -Name "test_multi_server" -ItemType "directory"
 New-Item -Path ".\" -Name "test_workflow" -ItemType "directory"
 New-Item -Path ".\" -Name "test_remote_workflow" -ItemType "directory"
 New-Item -Path ".\" -Name "test_remote_operator" -ItemType "directory"
+New-Item -Path ".\" -Name "test_service" -ItemType "directory"
 Copy-Item -Path "tests\conftest.py" -Destination ".\test_launcher\"
 Copy-Item -Path "tests\conftest.py" -Destination ".\test_server\"
 Copy-Item -Path "tests\conftest.py" -Destination ".\test_local_server\"
@@ -12,6 +13,7 @@ Copy-Item -Path "tests\conftest.py" -Destination ".\test_multi_server\"
 Copy-Item -Path "tests\conftest.py" -Destination ".\test_workflow\"
 Copy-Item -Path "tests\conftest.py" -Destination ".\test_remote_workflow\"
 Copy-Item -Path "tests\conftest.py" -Destination ".\test_remote_operator\"
+Copy-Item -Path "tests\conftest.py" -Destination ".\test_service\"
 Copy-Item -Path "tests\test_launcher.py" -Destination ".\test_launcher\"
 Copy-Item -Path "tests\test_server.py" -Destination ".\test_server\"
 Copy-Item -Path "tests\test_local_server.py" -Destination ".\test_local_server\"
@@ -19,10 +21,12 @@ Copy-Item -Path "tests\test_multi_server.py" -Destination ".\test_multi_server\"
 Copy-Item -Path "tests\test_workflow.py" -Destination ".\test_workflow\"
 Copy-Item -Path "tests\test_remote_workflow.py" -Destination ".\test_remote_workflow\"
 Copy-Item -Path "tests\test_remote_operator.py" -Destination ".\test_remote_operator\"
+Copy-Item -Path "tests\test_service.py" -Destination ".\test_service\"
 Remove-Item -Path "tests\test_server.py"
 Remove-Item -Path "tests\test_launcher.py"
 Remove-Item -Path "tests\test_local_server.py"
 Remove-Item -Path "tests\test_multi_server.py"
 Remove-Item -Path "tests\test_workflow.py"
 Remove-Item -Path "tests\test_remote_workflow.py"
-Remove-Item -Path "tests\test_remote_operator.py"
\ No newline at end of file
+Remove-Item -Path "tests\test_remote_operator.py"
+Remove-Item -Path "tests\test_service.py"
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b59b3f55c8..125f128f19 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -205,6 +205,17 @@ jobs:
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
         if: always()
 
+      - name: "Test API test_service"
+        shell: bash
+        working-directory: test_service
+        run: |
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results9.xml --reruns 3 .
+        if: always()
+
+      - name: "Kill all servers"
+        uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
+        if: always()
+
       - name: "Upload Test Results"
         uses: actions/upload-artifact@v3
         with:

From 1c1000858580f4e8ecf0b8857b23578e4dea51ce Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Thu, 24 Nov 2022 06:45:17 +0100
Subject: [PATCH 25/26] test_service docker

---
 .github/workflows/test_docker.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
index 6ca1dcb3e8..fd4091593e 100644
--- a/.github/workflows/test_docker.yml
+++ b/.github/workflows/test_docker.yml
@@ -107,6 +107,13 @@ jobs:
         if: always()
         timeout-minutes: 20
 
+      - name: "Test API test_service"
+        shell: bash
+        working-directory: test_service
+        run: |
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results9.xml --reruns 3 .
+        if: always()
+
       - name: "Upload Test Results"
         uses: actions/upload-artifact@v3
         with:

From 2596a31e87a1b4c8c43f0e3fa0aaba71972a2353 Mon Sep 17 00:00:00 2001
From: cbellot <camille.bellot@ansys.com>
Date: Thu, 24 Nov 2022 08:00:23 +0100
Subject: [PATCH 26/26] add time out and disable always

---
 .github/workflows/test_docker.yml | 7 +------
 .github/workflows/tests.yml       | 6 ------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
index fd4091593e..b4ceed0022 100644
--- a/.github/workflows/test_docker.yml
+++ b/.github/workflows/test_docker.yml
@@ -59,7 +59,6 @@ jobs:
         working-directory: test_launcher
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml --reruns 2 .
-        if: always()
         timeout-minutes: 20
 
       - name: "Test API test_server"
@@ -67,7 +66,6 @@ jobs:
         working-directory: test_server
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results4.xml --reruns 2 .
-        if: always()
         timeout-minutes: 10
 
       - name: "Test API test_local_server"
@@ -75,7 +73,6 @@ jobs:
         working-directory: test_local_server
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results5.xml --reruns 2 .
-        if: always()
         timeout-minutes: 20
 
       - name: "Test API test_multi_server"
@@ -104,7 +101,6 @@ jobs:
         working-directory: test_workflow
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results3.xml --reruns 3 .
-        if: always()
         timeout-minutes: 20
 
       - name: "Test API test_service"
@@ -112,14 +108,13 @@ jobs:
         working-directory: test_service
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results9.xml --reruns 3 .
-        if: always()
 
       - name: "Upload Test Results"
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ env.ANSYS_VERSION }}_docker
           path: tests/junit/test-results.xml
-        if: always()
+        timeout-minutes: 20
 
       - name: "Upload coverage to Codecov"
         uses: codecov/codecov-action@v3
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 125f128f19..2bc07e05cf 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -133,7 +133,6 @@ jobs:
         working-directory: test_launcher
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml --reruns 2 .
-        if: always()
 
       - name: "Kill all servers"
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
@@ -155,7 +154,6 @@ jobs:
         working-directory: test_local_server
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results5.xml --reruns 2 .
-        if: always()
 
       - name: "Kill all servers"
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
@@ -166,7 +164,6 @@ jobs:
         working-directory: test_multi_server
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results6.xml --reruns 2 .
-        if: always()
 
       - name: "Kill all servers"
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
@@ -177,7 +174,6 @@ jobs:
         working-directory: test_remote_workflow
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results7.xml --reruns 2 .
-        if: always()
 
       - name: "Kill all servers"
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
@@ -188,7 +184,6 @@ jobs:
         working-directory: test_remote_operator
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results8.xml --reruns 2 .
-        if: always()
 
       - name: "Kill all servers"
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
@@ -210,7 +205,6 @@ jobs:
         working-directory: test_service
         run: |
           pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results9.xml --reruns 3 .
-        if: always()
 
       - name: "Kill all servers"
         uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2