portal 3.0.0__tar.gz → 3.1.1__tar.gz

{portal-3.0.0/portal.egg-info → portal-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.0.0
+Version: 3.1.1
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner
@@ -20,8 +20,8 @@ Fast and reliable distributed systems in Python.
 ## Features
 
 - 📡 **Communication:** Portal lets you bind functions to a `Server` and call
-  them from a `Client`. Wait on results via `Future` objects. Clients can
-  automatically restore broken connections.
+  them from one or more `Client`s. Wait on results via `Future` objects.
+  Clients can automatically restore broken connections.
 - 🚀 **Performance:** Optimized for throughput and latency. Array data is
   zero-copy serialized and deserialized for throughput near the hardware limit.
 - 🤸 **Flexibility:** Function inputs and outputs can be nested dicts and lists

{portal-3.0.0 → portal-3.1.1}/README.md

@@ -7,8 +7,8 @@ Fast and reliable distributed systems in Python.
 ## Features
 
 - 📡 **Communication:** Portal lets you bind functions to a `Server` and call
-  them from a `Client`. Wait on results via `Future` objects. Clients can
-  automatically restore broken connections.
+  them from one or more `Client`s. Wait on results via `Future` objects.
+  Clients can automatically restore broken connections.
 - 🚀 **Performance:** Optimized for throughput and latency. Array data is
   zero-copy serialized and deserialized for throughput near the hardware limit.
 - 🤸 **Flexibility:** Function inputs and outputs can be nested dicts and lists

{portal-3.0.0 → portal-3.1.1}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.0.0'
+__version__ = '3.1.1'
 
 import multiprocessing as mp
 try:

{portal-3.0.0 → portal-3.1.1}/portal/client.py

@@ -12,7 +12,7 @@ from . import packlib
 class Client:
 
   def __init__(
-      self, host, port, name='Client', maxinflight=16, **kwargs):
+      self, host, port=None, name='Client', maxinflight=16, **kwargs):
     assert 1 <= maxinflight, maxinflight
     self.maxinflight = maxinflight
     self.reqnum = iter(itertools.count(0))

{portal-3.0.0 → portal-3.1.1}/portal/client_socket.py

@@ -29,6 +29,7 @@ class Options:
   keepalive_every: float = 10
   keepalive_fails: int = 10
   logging: bool = True
+  logging_color: str = 'yellow'
 
 
 class ClientSocket:
@@ -175,6 +176,7 @@ class ClientSocket:
     once = True
     while self.running:
       sock, addr = self._create()
+      error = None
       try:
         # We need to resolve the address regularly.
         if contextlib.context.resolver:
@@ -184,13 +186,15 @@ class ClientSocket:
         sock.settimeout(0)
         self._log('Connection established')
         return sock
+      except TimeoutError as e:
+        error = e
       except ConnectionError as e:
-        self._log(f'Connection error ({e})')
-        time.sleep(0.1)
-      except TimeoutError:
-        pass
+        error = e
+      except socket.gaierror as e:
+        error = e
+      time.sleep(0.1)
       if once:
-        self._log('Still trying to connect...')
+        self._log(f'Still trying to connect... ({error})')
         once = False
       sock.close()
     return None
@@ -221,7 +225,11 @@ class ClientSocket:
     return sock, addr
 
   def _log(self, *args):
-    if self.options.logging:
-      style = utils.style(color='yellow', bold=True)
+    if not self.options.logging:
+      return
+    if self.options.logging_color:
+      style = utils.style(color=self.options.logging_color)
       reset = utils.style(reset=True)
-      print(style + f'[{self.name}]', *args, reset)
+    else:
+      style, reset = '', ''
+    print(style + f'[{self.name}]' + reset, *args)

{portal-3.0.0 → portal-3.1.1}/portal/contextlib.py

@@ -44,7 +44,7 @@ class Context:
       initfns=None,
       clientkw=None,
       serverkw=None,
-      hostname=None,
+      host=None,
       ipv6=None,
   ):
 
@@ -77,8 +77,8 @@ class Context:
       assert isinstance(serverkw, dict)
       self.serverkw = serverkw
 
-    if hostname is not None:
-      self.serverkw['hostname'] = hostname
+    if host is not None:
+      self.serverkw['host'] = host
 
     if ipv6 is not None:
       self.clientkw['ipv6'] = ipv6
@@ -134,18 +134,18 @@ class Context:
 
   def _watcher(self):
     while True:
-      if self.done.wait(self.interval):
-        break
       if self.errfile and self.errfile.exists():
         print(f'Shutting down due to error file: {self.errfile}')
         self.shutdown(2)
+      if self.done.wait(self.interval):
+        break
 
 
 context = Context()
 
 
-def initfn(fn):
-  context.initfn(fn)
+def initfn(fn, call_now=True):
+  context.initfn(fn, call_now)
 
 
 def setup(**kwargs):

{portal-3.0.0 → portal-3.1.1}/portal/server_socket.py

@@ -26,11 +26,12 @@ class Connection:
 class Options:
 
   ipv6: bool = False
-  hostname: str = ''
+  host: str = ''
   max_msg_size: int = 4 * 1024 ** 3
   max_recv_queue: int = 4096
   max_send_queue: int = 4096
   logging: bool = True
+  logging_color: str = 'blue'
 
 
 class ServerSocket:
@@ -42,10 +43,10 @@ class ServerSocket:
     self.options = Options(**{**contextlib.context.serverkw, **kwargs})
     if self.options.ipv6:
       self.sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-      self.addr = (self.options.hostname, port, 0, 0)
+      self.addr = (self.options.host, port, 0, 0)
     else:
       self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-      self.addr = (self.options.hostname, port)
+      self.addr = (self.options.host, port)
     self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     self.sock.bind(self.addr)
     self.sock.setblocking(False)
@@ -161,7 +162,11 @@ class ServerSocket:
     return sum(len(x.sendbufs) for x in self.conns.values())
 
   def _log(self, *args, **kwargs):
-    if self.options.logging:
-      style = utils.style(color='blue', bold=True)
+    if not self.options.logging:
+      return
+    if self.options.logging_color:
+      style = utils.style(color=self.options.logging_color)
       reset = utils.style(reset=True)
-      print(style + f'[{self.name}]', *args, reset)
+    else:
+      style, reset = '', ''
+    print(style + f'[{self.name}]' + reset, *args)

{portal-3.0.0 → portal-3.1.1/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.0.0
+Version: 3.1.1
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner
@@ -20,8 +20,8 @@ Fast and reliable distributed systems in Python.
 ## Features
 
 - 📡 **Communication:** Portal lets you bind functions to a `Server` and call
-  them from a `Client`. Wait on results via `Future` objects. Clients can
-  automatically restore broken connections.
+  them from one or more `Client`s. Wait on results via `Future` objects.
+  Clients can automatically restore broken connections.
 - 🚀 **Performance:** Optimized for throughput and latency. Array data is
   zero-copy serialized and deserialized for throughput near the hardware limit.
 - 🤸 **Flexibility:** Function inputs and outputs can be nested dicts and lists