flwr-nightly 1.12.0.dev20241010__tar.gz → 1.13.0.dev20241016__tar.gz

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.12.0.dev20241010
+Version: 1.13.0.dev20241016
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.12.0.dev20241010"
+version = "1.13.0.dev20241016"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -95,7 +95,7 @@ black = { version = "==24.2.0", extras = ["jupyter"] }
 taplo = "==0.9.3"
 docformatter = "==1.7.5"
 mypy = "==1.8.0"
-pylint = "==3.0.3"
+pylint = "==3.3.1"
 flake8 = "==5.0.4"
 parameterized = "==0.9.0"
 pytest = "==7.4.4"

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.11.0",
+    "flwr[simulation]>=1.12.0",
     "flwr-datasets[vision]>=0.3.0",
     "torch==2.2.1",
     "torchvision==0.17.1",

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.11.1",
+    "flwr[simulation]>=1.12.0",
     "flwr-datasets>=0.3.0",
     "trl==0.8.1",
     "bitsandbytes==0.43.0",

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.11.0",
+    "flwr[simulation]>=1.12.0",
     "flwr-datasets>=0.3.0",
     "torch==2.2.1",
     "transformers>=4.30.0,<5.0",

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.10.0",
+    "flwr[simulation]>=1.12.0",
     "jax==0.4.30",
     "jaxlib==0.4.30",
     "scikit-learn==1.3.2",

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.10.0",
+    "flwr[simulation]>=1.12.0",
     "flwr-datasets[vision]>=0.3.0",
     "mlx==0.16.1",
     "numpy==1.24.4",

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.10.0",
+    "flwr[simulation]>=1.12.0",
     "numpy>=1.21.0",
 ]
 

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.10.0",
+    "flwr[simulation]>=1.12.0",
     "flwr-datasets[vision]>=0.3.0",
     "torch==2.2.1",
     "torchvision==0.17.1",

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.10.0",
+    "flwr[simulation]>=1.12.0",
     "flwr-datasets[vision]>=0.3.0",
     "scikit-learn>=1.1.1",
 ]

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.10.0",
+    "flwr[simulation]>=1.12.0",
     "flwr-datasets[vision]>=0.3.0",
     "tensorflow>=2.11.1",
 ]

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/client/clientapp/app.py

@@ -132,11 +132,10 @@ def run_clientapp(  # pylint: disable=R0914
             )
 
             try:
-                if fab:
-                    # Load ClientApp
-                    client_app: ClientApp = load_client_app_fn(
-                        run.fab_id, run.fab_version, fab.hash_str
-                    )
+                # Load ClientApp
+                client_app: ClientApp = load_client_app_fn(
+                    run.fab_id, run.fab_version, fab.hash_str if fab else ""
+                )
 
                 # Execute ClientApp
                 reply_message = client_app(message=message, context=context)

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/client/grpc_adapter_client/connection.py

@@ -32,7 +32,7 @@ from flwr.common.typing import Fab, Run
 
 
 @contextmanager
-def grpc_adapter(  # pylint: disable=R0913
+def grpc_adapter(  # pylint: disable=R0913,too-many-positional-arguments
     server_address: str,
     insecure: bool,
     retry_invoker: RetryInvoker,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/client/grpc_client/connection.py

@@ -60,7 +60,7 @@ def on_channel_state_change(channel_connectivity: str) -> None:
 
 
 @contextmanager
-def grpc_connection(  # pylint: disable=R0913, R0915
+def grpc_connection(  # pylint: disable=R0913,R0915,too-many-positional-arguments
     server_address: str,
     insecure: bool,
     retry_invoker: RetryInvoker,  # pylint: disable=unused-argument

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/client/grpc_rere_client/connection.py

@@ -71,7 +71,7 @@ def on_channel_state_change(channel_connectivity: str) -> None:
 
 
 @contextmanager
-def grpc_request_response(  # pylint: disable=R0913, R0914, R0915
+def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     server_address: str,
     insecure: bool,
     retry_invoker: RetryInvoker,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/client/node_state.py

@@ -48,7 +48,7 @@ class NodeState:
         self.node_config = node_config
         self.run_infos: dict[int, RunInfo] = {}
 
-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
     def register_context(
         self,
         run_id: int,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/client/rest_client/connection.py

@@ -82,7 +82,7 @@ T = TypeVar("T", bound=GrpcMessage)
 
 
 @contextmanager
-def http_request_response(  # pylint: disable=,R0913, R0914, R0915
+def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     server_address: str,
     insecure: bool,  # pylint: disable=unused-argument
     retry_invoker: RetryInvoker,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/client/supernode/app.py

@@ -48,13 +48,20 @@ from ..clientapp.utils import get_load_client_app_fn
 
 def run_supernode() -> None:
     """Run Flower SuperNode."""
+    args = _parse_args_run_supernode().parse_args()
+    _warn_deprecated_server_arg(args)
+
     log(INFO, "Starting Flower SuperNode")
 
     event(EventType.RUN_SUPERNODE_ENTER)
 
-    args = _parse_args_run_supernode().parse_args()
-
-    _warn_deprecated_server_arg(args)
+    # Check if both `--flwr-dir` and `--isolation` were set
+    if args.flwr_dir is not None and args.isolation is not None:
+        log(
+            WARN,
+            "Both `--flwr-dir` and `--isolation` were specified. "
+            "Ignoring `--flwr-dir`.",
+        )
 
     root_certificates = _get_certificates(args)
     load_fn = get_load_client_app_fn(
@@ -178,12 +185,12 @@ def _parse_args_run_supernode() -> argparse.ArgumentParser:
         "--flwr-dir",
         default=None,
         help="""The path containing installed Flower Apps.
-    By default, this value is equal to:
+        The default directory is:
 
         - `$FLWR_HOME/` if `$FLWR_HOME` is defined
         - `$XDG_DATA_HOME/.flwr/` if `$XDG_DATA_HOME` is defined
         - `$HOME/.flwr/` in all other cases
-    """,
+        """,
     )
     parser.add_argument(
         "--isolation",

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/common/config.py

@@ -206,6 +206,7 @@ def parse_config_args(
     # Regular expression to capture key-value pairs with possible quoted values
     pattern = re.compile(r"(\S+?)=(\'[^\']*\'|\"[^\"]*\"|\S+)")
 
+    flat_overrides = {}
     for config_line in config:
         if config_line:
             # .toml files aren't allowed alongside other configs

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/common/logger.py

@@ -111,7 +111,7 @@ FLOWER_LOGGER.addHandler(console_handler)
 class CustomHTTPHandler(HTTPHandler):
     """Custom HTTPHandler which overrides the mapLogRecords method."""
 
-    # pylint: disable=too-many-arguments,bad-option-value,R1725
+    # pylint: disable=too-many-arguments,bad-option-value,R1725,R0917
     def __init__(
         self,
         identifier: str,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/common/message.py

@@ -52,7 +52,7 @@ class Metadata:  # pylint: disable=too-many-instance-attributes
         the receiving end.
     """
 
-    def __init__(  # pylint: disable=too-many-arguments
+    def __init__(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self,
         run_id: int,
         message_id: str,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/common/record/configsrecord.py

@@ -128,6 +128,7 @@ class ConfigsRecord(TypedDict[str, ConfigsRecordValues]):
 
         def get_var_bytes(value: ConfigsScalar) -> int:
             """Return Bytes of value passed."""
+            var_bytes = 0
             if isinstance(value, bool):
                 var_bytes = 1
             elif isinstance(value, (int, float)):
@@ -136,6 +137,11 @@ class ConfigsRecord(TypedDict[str, ConfigsRecordValues]):
                 )
             if isinstance(value, (str, bytes)):
                 var_bytes = len(value)
+            if var_bytes == 0:
+                raise ValueError(
+                    "Config values must be either `bool`, `int`, `float`, "
+                    "`str`, or `bytes`"
+                )
             return var_bytes
 
         num_bytes = 0

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/app.py

@@ -199,12 +199,12 @@ def start_server(  # pylint: disable=too-many-arguments,too-many-locals
 # pylint: disable=too-many-branches, too-many-locals, too-many-statements
 def run_superlink() -> None:
     """Run Flower SuperLink (Driver API and Fleet API)."""
+    args = _parse_args_run_superlink().parse_args()
+
     log(INFO, "Starting Flower SuperLink")
 
     event(EventType.RUN_SUPERLINK_ENTER)
 
-    args = _parse_args_run_superlink().parse_args()
-
     # Parse IP address
     driver_address, _, _ = _format_address(args.driver_api_address)
 
@@ -542,6 +542,7 @@ def _run_fleet_api_grpc_adapter(
 
 
 # pylint: disable=import-outside-toplevel,too-many-arguments
+# pylint: disable=too-many-positional-arguments
 def _run_fleet_api_rest(
     host: str,
     port: int,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/driver/driver.py

@@ -32,7 +32,7 @@ class Driver(ABC):
         """Run information."""
 
     @abstractmethod
-    def create_message(  # pylint: disable=too-many-arguments
+    def create_message(  # pylint: disable=too-many-arguments,R0917
         self,
         content: RecordSet,
         message_type: str,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/driver/grpc_driver.py

@@ -158,7 +158,7 @@ class GrpcDriver(Driver):
         ):
             raise ValueError(f"Invalid message: {message}")
 
-    def create_message(  # pylint: disable=too-many-arguments
+    def create_message(  # pylint: disable=too-many-arguments,R0917
         self,
         content: RecordSet,
         message_type: str,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/driver/inmemory_driver.py

@@ -82,7 +82,7 @@ class InMemoryDriver(Driver):
         self._init_run()
         return Run(**vars(cast(Run, self._run)))
 
-    def create_message(  # pylint: disable=too-many-arguments
+    def create_message(  # pylint: disable=too-many-arguments,R0917
         self,
         content: RecordSet,
         message_type: str,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/server_app.py

@@ -71,7 +71,7 @@ class ServerApp:
     >>>    print("ServerApp running")
     """
 
-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
     def __init__(
         self,
         server: Optional[Server] = None,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/strategy/dp_adaptive_clipping.py

@@ -88,7 +88,7 @@ class DifferentialPrivacyServerSideAdaptiveClipping(Strategy):
     >>> )
     """
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes
+    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-positional-arguments
     def __init__(
         self,
         strategy: Strategy,
@@ -307,7 +307,7 @@ class DifferentialPrivacyClientSideAdaptiveClipping(Strategy):
     >>> )
     """
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes
+    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-positional-arguments
     def __init__(
         self,
         strategy: Strategy,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/strategy/dpfedavg_adaptive.py

@@ -39,7 +39,7 @@ class DPFedAvgAdaptive(DPFedAvgFixed):
     This class is deprecated and will be removed in a future release.
     """
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes
+    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-positional-arguments
     def __init__(
         self,
         strategy: Strategy,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/strategy/dpfedavg_fixed.py

@@ -36,7 +36,7 @@ class DPFedAvgFixed(Strategy):
     This class is deprecated and will be removed in a future release.
     """
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes
+    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-positional-arguments
     def __init__(
         self,
         strategy: Strategy,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/superlink/fleet/grpc_bidi/grpc_server.py

@@ -60,7 +60,7 @@ def valid_certificates(certificates: tuple[bytes, bytes, bytes]) -> bool:
     return is_valid
 
 
-def start_grpc_server(  # pylint: disable=too-many-arguments
+def start_grpc_server(  # pylint: disable=too-many-arguments,R0917
     client_manager: ClientManager,
     server_address: str,
     max_concurrent_workers: int = 1000,
@@ -156,7 +156,7 @@ def start_grpc_server(  # pylint: disable=too-many-arguments
     return server
 
 
-def generic_create_grpc_server(  # pylint: disable=too-many-arguments
+def generic_create_grpc_server(  # pylint: disable=too-many-arguments,R0917
     servicer_and_add_fn: Union[
         tuple[FleetServicer, AddServicerToServerFn],
         tuple[GrpcAdapterServicer, AddServicerToServerFn],

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/server/superlink/fleet/vce/vce_api.py

@@ -172,6 +172,7 @@ def put_taskres_into_state(
             pass
 
 
+# pylint: disable=too-many-positional-arguments
 def run_api(
     app_fn: Callable[[], ClientApp],
     backend_fn: Callable[[], Backend],
@@ -251,7 +252,7 @@ def run_api(
 
 
 # pylint: disable=too-many-arguments,unused-argument,too-many-locals,too-many-branches
-# pylint: disable=too-many-statements
+# pylint: disable=too-many-statements,too-many-positional-arguments
 def start_vce(
     backend_name: str,
     backend_config_json_stream: str,
@@ -267,6 +268,8 @@ def start_vce(
     existing_nodes_mapping: Optional[NodeToPartitionMapping] = None,
 ) -> None:
     """Start Fleet API with the Simulation Engine."""
+    nodes_mapping = {}
+
     if client_app_attr is not None and client_app is not None:
         raise ValueError(
             "Both `client_app_attr` and `client_app` are provided, "
@@ -340,17 +343,17 @@ def start_vce(
     # Load ClientApp if needed
     def _load() -> ClientApp:
 
+        if client_app:
+            return client_app
         if client_app_attr:
-            app = get_load_client_app_fn(
+            return get_load_client_app_fn(
                 default_app_ref=client_app_attr,
                 app_path=app_dir,
                 flwr_dir=flwr_dir,
                 multi_app=False,
             )(run.fab_id, run.fab_version, run.fab_hash)
 
-        if client_app:
-            app = client_app
-        return app
+        raise ValueError("Either `client_app_attr` or `client_app` must be provided")
 
     app_fn = _load
 

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/simulation/ray_transport/ray_client_proxy.py

@@ -48,7 +48,7 @@ from flwr.simulation.ray_transport.ray_actor import VirtualClientEngineActorPool
 class RayActorClientProxy(ClientProxy):
     """Flower client proxy which delegates work using Ray."""
 
-    def __init__(  # pylint: disable=too-many-arguments
+    def __init__(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self,
         client_fn: ClientFnExt,
         node_id: int,

{flwr_nightly-1.12.0.dev20241010 → flwr_nightly-1.13.0.dev20241016}/src/py/flwr/simulation/run_simulation.py

@@ -225,7 +225,7 @@ def run_simulation_from_cli() -> None:
 
 
 # Entry point from Python session (script or notebook)
-# pylint: disable=too-many-arguments
+# pylint: disable=too-many-arguments,too-many-positional-arguments
 def run_simulation(
     server_app: ServerApp,
     client_app: ClientApp,
@@ -300,7 +300,7 @@ def run_simulation(
     )
 
 
-# pylint: disable=too-many-arguments
+# pylint: disable=too-many-arguments,too-many-positional-arguments
 def run_serverapp_th(
     server_app_attr: Optional[str],
     server_app: Optional[ServerApp],
@@ -369,7 +369,7 @@ def run_serverapp_th(
     return serverapp_th
 
 
-# pylint: disable=too-many-locals
+# pylint: disable=too-many-locals,too-many-positional-arguments
 def _main_loop(
     num_supernodes: int,
     backend_name: str,
@@ -455,7 +455,7 @@ def _main_loop(
     log(DEBUG, "Stopping Simulation Engine now.")
 
 
-# pylint: disable=too-many-arguments,too-many-locals
+# pylint: disable=too-many-arguments,too-many-locals,too-many-positional-arguments
 def _run_simulation(
     num_supernodes: int,
     exit_event: EventType,