feat: detect container image and revise timeout values

Author: moe-ad

src/ansys/dpf/core/server.py

@@ -164,7 +164,7 @@ def start_local_server(
     load_operators=True,
     use_docker_by_default=True,
     docker_config=RUNNING_DOCKER,
-    timeout=100.0,
+    timeout=20.0,
     config=None,
     use_pypim_by_default=True,
     context=None,
@@ -310,7 +310,7 @@ def connect_to_server(
     ip=LOCALHOST,
     port=DPF_DEFAULT_PORT,
     as_global=True,
-    timeout=100.0,
+    timeout=10.0,
     config=None,
     context=None,
 ):

src/ansys/dpf/core/server_factory.py

@@ -32,6 +32,7 @@
 import os
 import subprocess
 import time
+import json
 
 from ansys.dpf.gate.load_api import (
     _find_outdated_ansys_version,
@@ -90,9 +91,19 @@ def __init__(
     ):
         from ansys.dpf.core import LOCAL_DOWNLOADED_EXAMPLES_PATH
 
-        if mounted_volumes is None:
-            # mounted_volumes = {LOCAL_DOWNLOADED_EXAMPLES_PATH: "/tmp/downloaded_examples"}
-            mounted_volumes = {LOCAL_DOWNLOADED_EXAMPLES_PATH: "C:\\Users\\ContainerAdministrator\\AppData\\Local\\Temp\\downloaded_examples"}
+        if use_docker:
+            args = ['docker', 'inspect', '-f', 'json', docker_name]
+            inspect_docker_image = subprocess.run(args, capture_output=True)
+            if inspect_docker_image.stderr:
+                raise Exception(f"Specified docker image not found. Verify that the image name '{docker_name}' is valid and the image file is available locally.")
+
+            output = json.loads(inspect_docker_image.stdout)
+            image_os = output[0]['Os']
+            if mounted_volumes is None:
+                if image_os == 'linux':
+                    mounted_volumes = {LOCAL_DOWNLOADED_EXAMPLES_PATH: "/tmp/downloaded_examples"}
+                else: # image is windows
+                    mounted_volumes = {LOCAL_DOWNLOADED_EXAMPLES_PATH: "C:\\Users\\ContainerAdministrator\\AppData\\Local\\Temp\\downloaded_examples"}
 
         self._use_docker = use_docker
         self._docker_name = docker_name

src/ansys/dpf/core/server_types.py

@@ -222,7 +222,7 @@ def read_stdout():
 
 
 def launch_dpf(
-    ansys_path, ip=LOCALHOST, port=DPF_DEFAULT_PORT, timeout=100, context: ServerContext = None
+    ansys_path, ip=LOCALHOST, port=DPF_DEFAULT_PORT, timeout=10, context: ServerContext = None
 ):
     """Launch Ansys DPF.
 
@@ -258,7 +258,7 @@ def launch_dpf_on_docker(
     ansys_path=None,
     ip=LOCALHOST,
     port=DPF_DEFAULT_PORT,
-    timeout=100.0,
+    timeout=50.0,
 ):
     """Launch Ansys DPF.
 
@@ -277,7 +277,7 @@ def launch_dpf_on_docker(
         ``"DPF_DEFAULT_PORT"``, which is 50054.
     timeout : float, optional
         Maximum number of seconds for the initialization attempt.
-        The default is ``10``. Once the specified number of seconds
+        The default is ``50``. Once the specified number of seconds
         passes, the connection fails.
 
     """
@@ -791,7 +791,7 @@ def __init__(
         ansys_path: Union[str, None] = None,
         ip: str = LOCALHOST,
         port: str = DPF_DEFAULT_PORT,
-        timeout: float = 100.0,
+        timeout: float = 10.0,
         as_global: bool = True,
         load_operators: bool = True,
         launch_server: bool = True,
@@ -836,7 +836,6 @@ def __init__(
                     ansys_path=ansys_path,
                     ip=ip,
                     port=port,
-                    timeout=timeout,
                 )
             else:
                 launch_dpf(ansys_path, ip, port, timeout=timeout, context=context)
@@ -1271,7 +1270,6 @@ def __init__(
                         ansys_path=ansys_path,
                         ip=ip,
                         port=port,
-                        timeout=timeout,
                     )
                 else:
                     launch_dpf(ansys_path, ip, port, timeout=timeout, context=context)