debug

Author: reinaual

src/python/espressomd/zn.py

@@ -20,7 +20,7 @@
 import subprocess
 import numpy as np
 import zndraw.type_defs
-import zndraw.zndraw
+import zndraw
 import zndraw.utils
 import zndraw.draw
 import znsocket
@@ -421,7 +421,6 @@ class Visualizer():
     """
 
     SERVER_PORT = None
-    SOCKET_PORT = None
 
     def __init__(self,
                  system: espressomd.system.System = None,
@@ -488,12 +487,9 @@ def _start_server(self):
         """
         Start the ZnDraw server through a subprocess
         """
-        self.socket_port = zndraw.utils.get_port(default=6374)
-
         Visualizer.SERVER_PORT = self.port
-        Visualizer.SOCKET_PORT = self.socket_port
 
-        self.server = subprocess.Popen(["zndraw", "--no-browser", f"--port={self.port}", f"--storage-port={self.socket_port}"],
+        self.server = subprocess.Popen(["zndraw", "--no-browser", f"--port={self.port}"],
                                        stdout=subprocess.DEVNULL,
                                        stderr=subprocess.DEVNULL
                                        )
@@ -502,25 +498,8 @@ def _start_zndraw(self):
         """
         Start the ZnDraw client and connect to the server
         """
-        config = zndraw.zndraw.TimeoutConfig(
-            connection=10,
-            modifier=0.25,
-            between_calls=0.1,
-            emit_retries=3,
-            call_retries=1,
-            connect_retries=3,
-        )
-        while True:
-            try:
-                self.r = znsocket.Client(
-                    address=f"{self.url}:{self.SOCKET_PORT}")
-                break
-            except BaseException:
-                time.sleep(0.5)
-
         url = f"{self.url}:{self.SERVER_PORT}"
-        self.zndraw = zndraw.zndraw.ZnDrawLocal(
-            r=self.r, url=url, token=self.token, timeout=config)
+        self.zndraw = zndraw.ZnDraw(url=url, token=self.token)
         parsed_url = urllib.parse.urlparse(
             f"{self.zndraw.url}/token/{self.zndraw.token}")
         self.address = parsed_url._replace(scheme="http").geturl()