portal 3.7.1__tar.gz → 3.7.3__tar.gz

{portal-3.7.1/portal.egg-info → portal-3.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: portal
-Version: 3.7.1
+Version: 3.7.3
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner
@@ -10,6 +10,18 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: cloudpickle
+Requires-Dist: msgpack
+Requires-Dist: numpy
+Requires-Dist: psutil
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
 
 [![PyPI](https://img.shields.io/pypi/v/portal.svg)](https://pypi.python.org/pypi/portal/#history)
 

{portal-3.7.1 → portal-3.7.3}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.7.1'
+__version__ = '3.7.3'
 
 import multiprocessing as mp
 try:

{portal-3.7.1 → portal-3.7.3}/portal/client_socket.py

@@ -207,7 +207,7 @@ class ClientSocket:
         sock.settimeout(10)
         sock.connect(addr)
         self._log('Connection established')
-        self._send_handshake(sock)
+        sock.sendall(self.options.handshake.encode('utf-8'))
         sock.settimeout(0)
         return sock
       except TimeoutError as e:
@@ -252,11 +252,6 @@ class ClientSocket:
 
     return sock
 
-  def _send_handshake(self, sock):
-    buf = buffers.SendBuffer(self.options.handshake.encode('utf-8'))
-    while not buf.done():
-      buf.send(sock)
-
   def _log(self, *args):
     if not self.options.logging:
       return

{portal-3.7.1 → portal-3.7.3}/portal/packlib.py

@@ -1,3 +1,4 @@
+import math
 import struct
 
 import msgpack
@@ -30,7 +31,8 @@ def pack(data):
           "Array is not contiguous in memory. Use " +
           "np.asarray(arr, order='C') before passing the data into pack().")
       specs.append(['array', value.shape, value.dtype.str])
-      buffers.append(value.data.cast('c'))
+      buffer = value.data.cast('c') if value.size else b'\x00'
+      buffers.append(buffer)
     elif isinstance(value, sharray.SharedArray):
       specs.append(['sharray', *value.__getstate__()])
       buffers.append(b'\x00')
@@ -64,6 +66,9 @@ def unpack(buffer):
       leaves.append(buffer)
     elif spec[0] == 'array':
       shape, dtype = spec[1:]
+      if not math.prod(shape):
+        assert buffer == b'\x00'
+        buffer = b''
       leaves.append(np.frombuffer(buffer, dtype).reshape(shape))
     elif spec[0] == 'sharray':
       assert buffer == b'\x00'

{portal-3.7.1 → portal-3.7.3}/portal/server_socket.py

@@ -16,7 +16,7 @@ class Connection:
     self.sock = sock
     self.addr = addr
     self.recvbuf = None
-    self.handshake = False
+    self.handshake = b''
     self.sendbufs = collections.deque()
 
   def fileno(self):
@@ -44,6 +44,7 @@ class ServerSocket:
       port = int(port.rsplit(':', 1)[-1])
     self.name = name
     self.options = Options(**{**contextlib.context.serverkw, **kwargs})
+    self.handshake = self.options.handshake.encode('utf-8')
     if self.options.ipv6:
       self.sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
       self.sock.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
@@ -152,7 +153,11 @@ class ServerSocket:
     if not conn.recvbuf:
       conn.recvbuf = buffers.RecvBuffer(maxsize=self.options.max_msg_size)
     try:
-      conn.recvbuf.recv(conn.sock)
+      if len(conn.handshake) < len(self.handshake):
+        self._handshake(conn)
+        return
+      else:
+        conn.recvbuf.recv(conn.sock)
     except OSError as e:
       # For example:
       # - ConnectionResetError
@@ -163,16 +168,8 @@ class ServerSocket:
       return
     if self.recvq.qsize() > self.options.max_recv_queue:
       raise RuntimeError('Too many incoming messages enqueued')
-    message = conn.recvbuf.result()
+    self.recvq.put((conn.addr, conn.recvbuf.result()))
     conn.recvbuf = None
-    if not conn.handshake:
-      if message != self.options.handshake.encode('utf-8'):
-        e = ValueError(f"Handshake '{self.options.handshake}' expected")
-        self._disconnect(conn, e)
-        return
-      conn.handshake = True
-    else:
-      self.recvq.put((conn.addr, message))
 
   def _disconnect(self, conn, e):
     detail = f'{type(e).__name__}'
@@ -189,6 +186,13 @@ class ServerSocket:
   def _numsending(self):
     return sum(len(x.sendbufs) for x in self.conns.values())
 
+  def _handshake(self, conn):
+    assert len(conn.handshake) < len(self.handshake)
+    conn.handshake += conn.sock.recv(len(self.handshake) - len(conn.handshake))
+    if conn.handshake != self.handshake[:len(conn.handshake)]:
+      msg = f"Expected handshake '{self.handshake}' got '{conn.handshake}'"
+      self._disconnect(conn, ValueError(msg))
+
   def _log(self, *args, **kwargs):
     if not self.options.logging:
       return

{portal-3.7.1 → portal-3.7.3/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: portal
-Version: 3.7.1
+Version: 3.7.3
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner
@@ -10,6 +10,18 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: cloudpickle
+Requires-Dist: msgpack
+Requires-Dist: numpy
+Requires-Dist: psutil
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
 
 [![PyPI](https://img.shields.io/pypi/v/portal.svg)](https://pypi.python.org/pypi/portal/#history)
 

{portal-3.7.1 → portal-3.7.3}/tests/test_pack.py

@@ -10,6 +10,7 @@ class TestPack:
       bytes(7),
       {'foo': np.zeros((2, 4), np.float64), 'bar': np.asarray(1)},
       {'foo': [np.asarray(1), np.asarray(2)]},
+      {'foo': np.ones((128, 0, 5), np.int32)},
       'hello world',
       None,
   ])