flwr-nightly 1.18.0.dev20250418__tar.gz → 1.18.0.dev20250422__tar.gz

{flwr_nightly-1.18.0.dev20250418 → flwr_nightly-1.18.0.dev20250422}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.18.0.dev20250418
+Version: 1.18.0.dev20250422
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.18.0.dev20250418 → flwr_nightly-1.18.0.dev20250422}/py/flwr/cli/config_utils.py

@@ -197,21 +197,7 @@ def validate_certificate_in_federation_config(
          - `address` is provided and `insecure = true`. If `root-certificates` is
            set, exit with an error.
     """
-    insecure_value = federation_config.get("insecure")
-    # Determine the insecure flag
-    if insecure_value is None:
-        # Not provided, default to False (TLS enabled)
-        insecure = False
-    elif isinstance(insecure_value, bool):
-        insecure = insecure_value
-    else:
-        typer.secho(
-            "❌ Invalid type for `insecure`: expected a boolean if provided. "
-            "(`insecure = true` or `insecure = false`)",
-            fg=typer.colors.RED,
-            bold=True,
-        )
-        raise typer.Exit(code=1)
+    insecure = get_insecure_flag(federation_config)
 
     # Process root certificates
     if root_certificates := federation_config.get("root-certificates"):
@@ -250,3 +236,21 @@ def exit_if_no_address(federation_config: dict[str, Any], cmd: str) -> None:
             bold=True,
         )
         raise typer.Exit(code=1)
+
+
+def get_insecure_flag(federation_config: dict[str, Any]) -> bool:
+    """Extract and validate the `insecure` flag from the federation configuration."""
+    insecure_value = federation_config.get("insecure")
+
+    if insecure_value is None:
+        # Not provided, default to False (TLS enabled)
+        return False
+    if isinstance(insecure_value, bool):
+        return insecure_value
+    typer.secho(
+        "❌ Invalid type for `insecure`: expected a boolean if provided. "
+        "(`insecure = true` or `insecure = false`)",
+        fg=typer.colors.RED,
+        bold=True,
+    )
+    raise typer.Exit(code=1)

{flwr_nightly-1.18.0.dev20250418 → flwr_nightly-1.18.0.dev20250422}/py/flwr/cli/login/login.py

@@ -22,6 +22,7 @@ import typer
 
 from flwr.cli.config_utils import (
     exit_if_no_address,
+    get_insecure_flag,
     load_and_validate,
     process_loaded_project_config,
     validate_federation_in_project_config,
@@ -80,6 +81,16 @@ def login(  # pylint: disable=R0914
             bold=True,
         )
         raise typer.Exit(code=1)
+    # Check if insecure flag is set to `True`
+    insecure = get_insecure_flag(federation_config)
+    if insecure:
+        typer.secho(
+            "❌ `flwr login` requires TLS to be enabled. `insecure` must NOT be set to "
+            "`true` in the federation configuration.",
+            fg=typer.colors.RED,
+            bold=True,
+        )
+        raise typer.Exit(code=1)
 
     channel = init_channel(app, federation_config, None)
     stub = ExecStub(channel)

{flwr_nightly-1.18.0.dev20250418 → flwr_nightly-1.18.0.dev20250422}/py/flwr/cli/new/templates/app/code/flwr_tune/client_app.py.tpl

@@ -49,7 +49,7 @@ class FlowerClient(NumPyClient):
     ):  # pylint: disable=too-many-arguments
         self.device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
         self.train_cfg = train_cfg
-        self.training_argumnets = TrainingArguments(**train_cfg.training_arguments)
+        self.training_arguments = TrainingArguments(**train_cfg.training_arguments)
         self.tokenizer = tokenizer
         self.formatting_prompts_func = formatting_prompts_func
         self.data_collator = data_collator
@@ -72,14 +72,14 @@ class FlowerClient(NumPyClient):
             self.train_cfg.learning_rate_min,
         )
 
-        self.training_argumnets.learning_rate = new_lr
-        self.training_argumnets.output_dir = config["save_path"]
+        self.training_arguments.learning_rate = new_lr
+        self.training_arguments.output_dir = config["save_path"]
 
         # Construct trainer
         trainer = SFTTrainer(
             model=self.model,
             tokenizer=self.tokenizer,
-            args=self.training_argumnets,
+            args=self.training_arguments,
             max_seq_length=self.train_cfg.seq_length,
             train_dataset=self.trainset,
             formatting_func=self.formatting_prompts_func,

{flwr_nightly-1.18.0.dev20250418 → flwr_nightly-1.18.0.dev20250422}/py/flwr/cli/utils.py

@@ -220,17 +220,6 @@ def try_obtain_cli_auth_plugin(
     if not federation_config.get("enable-user-auth", False):
         return None
 
-    # Check if TLS is enabled. If not, raise an error
-    if federation_config.get("root-certificates") is None:
-        typer.secho(
-            "❌ User authentication requires TLS to be enabled. "
-            "Please provide 'root-certificates' in the federation"
-            " configuration.",
-            fg=typer.colors.RED,
-            bold=True,
-        )
-        raise typer.Exit(code=1)
-
     config_path = get_user_auth_config_path(root_dir, federation)
 
     # Get the auth type from the config if not provided
@@ -273,6 +262,16 @@ def init_channel(
     # Initialize the CLI-side user auth interceptor
     interceptors: list[grpc.UnaryUnaryClientInterceptor] = []
     if auth_plugin is not None:
+        # Check if TLS is enabled. If not, raise an error
+        if insecure:
+            typer.secho(
+                "❌ User authentication requires TLS to be enabled. "
+                "Remove `insecure = true` from the federation configuration.",
+                fg=typer.colors.RED,
+                bold=True,
+            )
+            raise typer.Exit(code=1)
+
         auth_plugin.load_tokens()
         interceptors.append(CliUserAuthInterceptor(auth_plugin))
 

{flwr_nightly-1.18.0.dev20250418 → flwr_nightly-1.18.0.dev20250422}/py/flwr/common/message.py

@@ -36,6 +36,19 @@ MESSAGE_INIT_ERROR_MESSAGE = (
 )
 
 
+class _WarningTracker:
+    """A class to track warnings for deprecated properties."""
+
+    def __init__(self) -> None:
+        # These variables are used to ensure that the deprecation warnings
+        # for the deprecated properties/class are logged only once.
+        self.create_error_reply_logged = False
+        self.create_reply_logged = False
+
+
+_warning_tracker = _WarningTracker()
+
+
 class MessageInitializationError(TypeError):
     """Error raised when initializing a message with invalid arguments."""
 
@@ -456,11 +469,13 @@ class Message:
         message : Message
             A Message containing only the relevant error and metadata.
         """
-        warn_deprecated_feature(
-            "`Message.create_error_reply` is deprecated. "
-            "Instead of calling `some_message.create_error_reply(some_error, ttl=...)`"
-            ", use `Message(some_error, reply_to=some_message, ttl=...)`."
-        )
+        if not _warning_tracker.create_error_reply_logged:
+            _warning_tracker.create_error_reply_logged = True
+            warn_deprecated_feature(
+                "`Message.create_error_reply` is deprecated. "
+                "Instead of calling `some_message.create_error_reply(some_error, "
+                "ttl=...)`, use `Message(some_error, reply_to=some_message, ttl=...)`."
+            )
         if ttl is not None:
             return Message(error, reply_to=self, ttl=ttl)
         return Message(error, reply_to=self)
@@ -488,11 +503,13 @@ class Message:
         Message
             A new `Message` instance representing the reply.
         """
-        warn_deprecated_feature(
-            "`Message.create_reply` is deprecated. "
-            "Instead of calling `some_message.create_reply(some_content, ttl=...)`"
-            ", use `Message(some_content, reply_to=some_message, ttl=...)`."
-        )
+        if not _warning_tracker.create_reply_logged:
+            _warning_tracker.create_reply_logged = True
+            warn_deprecated_feature(
+                "`Message.create_reply` is deprecated. "
+                "Instead of calling `some_message.create_reply(some_content, ttl=...)`"
+                ", use `Message(some_content, reply_to=some_message, ttl=...)`."
+            )
         if ttl is not None:
             return Message(content, reply_to=self, ttl=ttl)
         return Message(content, reply_to=self)

{flwr_nightly-1.18.0.dev20250418 → flwr_nightly-1.18.0.dev20250422}/py/flwr/common/record/recorddict.py

@@ -29,6 +29,22 @@ from .typeddict import TypedDict
 
 RecordType = Union[ArrayRecord, MetricRecord, ConfigRecord]
 
+
+class _WarningTracker:
+    """A class to track warnings for deprecated properties."""
+
+    def __init__(self) -> None:
+        # These variables are used to ensure that the deprecation warnings
+        # for the deprecated properties/class are logged only once.
+        self.recordset_init_logged = False
+        self.recorddict_init_logged = False
+        self.parameters_records_logged = False
+        self.metrics_records_logged = False
+        self.configs_records_logged = False
+
+
+_warning_tracker = _WarningTracker()
+
 T = TypeVar("T")
 
 
@@ -143,8 +159,34 @@ class RecordDict(TypedDict[str, RecordType]):
     :code:`MetricRecord` and :code:`ArrayRecord`.
     """
 
-    def __init__(self, records: dict[str, RecordType] | None = None) -> None:
+    def __init__(
+        self,
+        records: dict[str, RecordType] | None = None,
+        *,
+        parameters_records: dict[str, ArrayRecord] | None = None,
+        metrics_records: dict[str, MetricRecord] | None = None,
+        configs_records: dict[str, ConfigRecord] | None = None,
+    ) -> None:
         super().__init__(_check_key, _check_value)
+
+        # Warning for deprecated usage
+        if (
+            parameters_records is not None
+            or metrics_records is not None
+            or configs_records is not None
+        ):
+            log(
+                WARN,
+                "The arguments `parameters_records`, `metrics_records`, and "
+                "`configs_records` of `RecordDict` are deprecated and will "
+                "be removed in a future release. "
+                "Please pass all records using the `records` argument instead.",
+            )
+            records = records or {}
+            records.update(parameters_records or {})
+            records.update(metrics_records or {})
+            records.update(configs_records or {})
+
         if records is not None:
             for key, record in records.items():
                 self[key] = record
@@ -196,6 +238,54 @@ class RecordDict(TypedDict[str, RecordType]):
                 type(value).__name__,
             )
 
+    @property
+    def parameters_records(self) -> TypedDict[str, ArrayRecord]:
+        """Deprecated property.
+
+        Use ``array_records`` instead.
+        """
+        if _warning_tracker.parameters_records_logged:
+            _warning_tracker.parameters_records_logged = True
+            log(
+                WARN,
+                "The `parameters_records` property of `RecordDict` "
+                "(formerly `RecordSet`) is deprecated and will be removed in a "
+                "future release. Please use the `array_records` property instead.",
+            )
+        return self.array_records
+
+    @property
+    def metrics_records(self) -> TypedDict[str, MetricRecord]:
+        """Deprecated property.
+
+        Use ``metric_records`` instead.
+        """
+        if not _warning_tracker.metrics_records_logged:
+            _warning_tracker.metrics_records_logged = True
+            log(
+                WARN,
+                "The `metrics_records` property of `RecordDict` "
+                "(formerly `RecordSet`) is deprecated and will be removed in a "
+                "future release. Please use the `metric_records` property instead.",
+            )
+        return self.metric_records
+
+    @property
+    def configs_records(self) -> TypedDict[str, ConfigRecord]:
+        """Deprecated property.
+
+        Use ``config_records`` instead.
+        """
+        if not _warning_tracker.configs_records_logged:
+            _warning_tracker.configs_records_logged = True
+            log(
+                WARN,
+                "The `configs_records` property of `RecordDict` "
+                "(formerly `RecordSet`) is deprecated and will be removed in a "
+                "future release. Please use the `config_records` property instead.",
+            )
+        return self.config_records
+
 
 class RecordSet(RecordDict):
     """Deprecated class ``RecordSet``, use ``RecordDict`` instead.
@@ -223,66 +313,25 @@ class RecordSet(RecordDict):
         my_content = RecordDict()
     """
 
-    _warning_logged = False
-    _warning_logged_params = False
-    _warning_logged_metrics = False
-    _warning_logged_configs = False
-
-    def __init__(self, records: dict[str, RecordType] | None = None) -> None:
-        if not RecordSet._warning_logged:
-            RecordSet._warning_logged = True
+    def __init__(
+        self,
+        records: dict[str, RecordType] | None = None,
+        *,
+        parameters_records: dict[str, ArrayRecord] | None = None,
+        metrics_records: dict[str, MetricRecord] | None = None,
+        configs_records: dict[str, ConfigRecord] | None = None,
+    ) -> None:
+        if not _warning_tracker.recordset_init_logged:
+            _warning_tracker.recordset_init_logged = True
             log(
                 WARN,
                 "The `RecordSet` class has been renamed to `RecordDict`. "
                 "Support for `RecordSet` will be removed in a future release. "
                 "Please update your code accordingly.",
             )
-        super().__init__(records)
-
-    @property
-    def parameters_records(self) -> TypedDict[str, ArrayRecord]:
-        """Deprecated property.
-
-        Use ``array_records`` instead.
-        """
-        if not RecordSet._warning_logged_params:
-            RecordSet._warning_logged_params = True
-            log(
-                WARN,
-                "`RecordSet.parameters_records` has been deprecated "
-                "and will be removed in a future release. Please use "
-                "`RecordDict.array_records` instead.",
-            )
-        return self.array_records
-
-    @property
-    def metrics_records(self) -> TypedDict[str, MetricRecord]:
-        """Deprecated property.
-
-        Use ``metric_records`` instead.
-        """
-        if not RecordSet._warning_logged_metrics:
-            RecordSet._warning_logged_metrics = True
-            log(
-                WARN,
-                "`RecordSet.metrics_records` has been deprecated "
-                "and will be removed in a future release. Please use "
-                "`RecordDict.metric_records` instead.",
-            )
-        return self.metric_records
-
-    @property
-    def configs_records(self) -> TypedDict[str, ConfigRecord]:
-        """Deprecated property.
-
-        Use ``config_records`` instead.
-        """
-        if not RecordSet._warning_logged_configs:
-            RecordSet._warning_logged_configs = True
-            log(
-                WARN,
-                "`RecordSet.configs_records` has been deprecated "
-                "and will be removed in a future release. Please use "
-                "`RecordDict.config_records` instead.",
-            )
-        return self.config_records
+        super().__init__(
+            records,
+            parameters_records=parameters_records,
+            metrics_records=metrics_records,
+            configs_records=configs_records,
+        )

{flwr_nightly-1.18.0.dev20250418 → flwr_nightly-1.18.0.dev20250422}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.18.0.dev20250418"
+version = "1.18.0.dev20250422"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]