syft-flwr 0.1.1__tar.gz → 0.1.2__tar.gz

{syft_flwr-0.1.1 → syft_flwr-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syft-flwr
-Version: 0.1.1
+Version: 0.1.2
 Summary: syft_flwr is an open source framework that facilitate federated learning projects using Flower over the SyftBox protocol
 License-File: LICENSE
 Requires-Python: >=3.9.2

{syft_flwr-0.1.1 → syft_flwr-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "syft-flwr"
-version = "0.1.1"
+version = "0.1.2"
 description = "syft_flwr is an open source framework that facilitate federated learning projects using Flower over the SyftBox protocol"
 readme = "README.md"
 requires-python = ">=3.9.2"

{syft_flwr-0.1.1 → syft_flwr-0.1.2}/src/syft_flwr/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.1"
+__version__ = "0.1.2"
 
 from syft_flwr.bootstrap import bootstrap
 from syft_flwr.run import run

{syft_flwr-0.1.1 → syft_flwr-0.1.2}/src/syft_flwr/grid.py

@@ -1,16 +1,17 @@
+import os
 import time
 from typing import Iterable, cast
 
-from loguru import logger
-from syft_core import Client
-from syft_rpc import rpc, rpc_db
-from typing_extensions import Optional
-
 from flwr.common import ConfigRecord
 from flwr.common.constant import MessageType
 from flwr.common.message import Message
 from flwr.common.typing import Run
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
+from loguru import logger
+from syft_core import Client
+from syft_rpc import rpc, rpc_db
+from typing_extensions import Optional
+
 from syft_flwr.flwr_compatibility import (
     Grid,
     RecordDict,
@@ -24,6 +25,10 @@ from syft_flwr.utils import str_to_int
 AGGREGATOR_NODE_ID = 1
 
 
+# env vars
+SYFT_FLWR_MSG_TIMEOUT = "SYFT_FLWR_MSG_TIMEOUT"
+
+
 class SyftGrid(Grid):
     def __init__(
         self,
@@ -155,7 +160,7 @@ class SyftGrid(Grid):
         self,
         messages: Iterable[Message],
         *,
-        timeout: Optional[float] = 60,
+        timeout: Optional[float] = None,
     ) -> Iterable[Message]:
         """Push messages to specified node IDs and pull the reply messages.
 
@@ -163,6 +168,17 @@ class SyftGrid(Grid):
         waits for the replies. It continues to pull replies until either all replies are
         received or the specified timeout duration (in seconds) is exceeded.
         """
+        if os.environ.get(SYFT_FLWR_MSG_TIMEOUT) is not None:
+            timeout = float(os.environ.get(SYFT_FLWR_MSG_TIMEOUT))
+        if timeout is not None:
+            logger.debug(
+                f"syft_flwr messages timeout = {timeout}: Will move on after {timeout} (s) if no reply is received"
+            )
+        else:
+            logger.debug(
+                "syft_flwr messages timeout = None: Will wait indefinitely for replies"
+            )
+
         # Push messages
         msg_ids = set(self.push_messages(messages))