@@ -42,19 +42,19 @@ def __init__(self, port, domain='*', protocol='tcp', wait_for_handshake=True):
4242 self ._context = zmq .Context ()
4343 self ._server_socket = self ._context .socket (zmq .PAIR )
4444 self ._server_socket .bind (f"{ protocol } ://{ domain } :{ port } " )
45- self ._logger .info ("launched on" , self ._server_socket .getsockopt (zmq .LAST_ENDPOINT ))
45+ self ._logger .info (f "launched on { self ._server_socket .getsockopt (zmq .LAST_ENDPOINT )} " )
4646
4747 if wait_for_handshake :
4848 self .wait_for_handshake ()
4949
5050 def wait_for_handshake (self ):
51- self ._logger .debug ("waiting for handshake from cllient " )
51+ self ._logger .debug ("waiting for handshake from client " )
5252 client_hello = self ._server_socket .recv_string ()
5353 if client_hello == HELLO :
5454 self ._logger .debug ("received correct handshake" )
5555 _send_ack (self ._server_socket , self ._logger , subject = "handshake" )
5656 else :
57- self ._logger .debug ("received incorrect handshake" , client_hello )
57+ self ._logger .debug (f "received incorrect handshake { client_hello } " )
5858 self ._logger .debug ("sending deny" )
5959 self ._server_socket .send_string (DENY )
6060 raise ForeignToolError ("server received incorrect handshake" )
@@ -65,12 +65,12 @@ def _serve_image(self, image_data):
6565 """
6666 header = np .lib .format .header_data_from_array_1_0 (image_data )
6767
68- self ._logger .debug ("sending header" , header , " waiting for acknowledgement" )
68+ self ._logger .debug (f "sending header { header } waiting for acknowledgement" )
6969 self ._server_socket .send_json (header )
7070
7171 ack = _receive_ack (self ._server_socket , self ._logger , subject = "header" )
7272
73- self ._logger .debug ("sending image data" , image_data .shape , " waiting for acknowledgement" )
73+ self ._logger .debug (f "sending image data { image_data .shape } waiting for acknowledgement" )
7474
7575 self ._server_socket .send (image_data , copy = False )
7676
@@ -87,7 +87,7 @@ def _serve_image(self, image_data):
8787 self ._logger .debug ("parsing label data" )
8888 labels = np .frombuffer (label_bytes , dtype = labels_header ['descr' ])
8989 labels .shape = labels_header ['shape' ]
90- self ._logger .debug ("parse label data" , labels .shape )
90+ self ._logger .debug (f "parse label data of shape { labels .shape } " )
9191
9292 _send_ack (self ._server_socket , self ._logger , subject = "return data" )
9393
@@ -100,7 +100,7 @@ def serve_one_image(self, image_data):
100100 return self ._serve_image (image_data )
101101
102102class ForeignToolClient (object ):
103- def __init__ (self , port , domain = '* ' , protocol = 'tcp' , do_handshake = True , cb = None ):
103+ def __init__ (self , port , domain = 'localhost ' , protocol = 'tcp' , do_handshake = True , cb = None ):
104104 """
105105 Connect to a server on the given port.
106106 """
@@ -109,20 +109,20 @@ def __init__(self, port, domain='*', protocol='tcp', do_handshake=True, cb=None)
109109 self ._context = zmq .Context ()
110110 self ._client_socket = self ._context .socket (zmq .PAIR )
111111 self ._client_socket .connect (f"{ protocol } ://{ domain } :{ port } " )
112- self ._logger .info ("connected to" , self ._client_socket .getsockopt (zmq .LAST_ENDPOINT ))
112+ self ._logger .info (f "connected to { self ._client_socket .getsockopt (zmq .LAST_ENDPOINT )} " )
113113
114114 if cb :
115115 self .register_cb (cb )
116116
117117 if do_handshake :
118118 self .do_handshake ()
119119
120- def do_handshake (self ):
121- """
122- Handshake with the server.
123- """
124- self .client_socket .send_string (HELLO )
125- response = _receive_ack (self .client_socket , self .logger , subject = "handshake" )
120+ def do_handshake (self ):
121+ """
122+ Handshake with the server.
123+ """
124+ self ._client_socket .send_string (HELLO )
125+ response = _receive_ack (self ._client_socket , self ._logger , subject = "handshake" )
126126
127127 def register_cb (self , cb ):
128128 """
@@ -142,7 +142,7 @@ def _receive_image(self):
142142 Receive an image from the server.
143143 """
144144 header = self ._client_socket .recv_json ()
145- self ._logger .debug ("received header" , header )
145+ self ._logger .debug (f "received header { header } " )
146146
147147 _send_ack (self ._client_socket , self ._logger , subject = "header" )
148148
@@ -152,9 +152,8 @@ def _receive_image(self):
152152 self ._logger .debug ("parsing image data" )
153153 buf = memoryview (im_bytes )
154154 im = np .frombuffer (buf , dtype = header ['descr' ])
155- im = (im * 255 ).astype (np .uint8 )
156155 im .shape = header ['shape' ]
157- self ._logger .debug ("parsed image data" , im .shape )
156+ self ._logger .debug (f "parsed image data { im .shape } " )
158157
159158 _send_ack (self ._client_socket , self ._logger , subject = "image data" )
160159
@@ -163,7 +162,7 @@ def _receive_image(self):
163162 self ._logger .debug ("executed callback" )
164163
165164 return_header = np .lib .format .header_data_from_array_1_0 (return_data )
166- self ._logger .debug ("returning header" , return_header )
165+ self ._logger .debug (f "returning header { return_header } " )
167166 self ._client_socket .send_json (return_header )
168167
169168 ack = _receive_ack (self ._client_socket , self ._logger , subject = "return header" )
0 commit comments