flwr-nightly 1.13.0.dev20241112__py3-none-any.whl → 1.13.0.dev20241113__py3-none-any.whl

flwr/common/date.py

@@ -21,3 +21,21 @@ import datetime
 def now() -> datetime.datetime:
     """Construct a datetime from time.time() with time zone set to UTC."""
     return datetime.datetime.now(tz=datetime.timezone.utc)
+
+
+def format_timedelta(td: datetime.timedelta) -> str:
+    """Format a timedelta as a string."""
+    days = td.days
+    hours, remainder = divmod(td.seconds, 3600)
+    minutes, seconds = divmod(remainder, 60)
+
+    if days > 0:
+        return f"{days}d {hours:02}:{minutes:02}:{seconds:02}"
+    return f"{hours:02}:{minutes:02}:{seconds:02}"
+
+
+def isoformat8601_utc(dt: datetime.datetime) -> str:
+    """Return the datetime formatted as an ISO 8601 string with a trailing 'Z'."""
+    if dt.tzinfo != datetime.timezone.utc:
+        raise ValueError("Expected datetime with timezone set to UTC")
+    return dt.isoformat(timespec="seconds").replace("+00:00", "Z")

flwr/superexec/deployment.py

@@ -21,6 +21,7 @@ from typing import Optional
 
 from typing_extensions import override
 
+from flwr.cli.config_utils import get_fab_metadata
 from flwr.common import ConfigsRecord, Context, RecordSet
 from flwr.common.constant import SERVERAPPIO_API_DEFAULT_ADDRESS, Status, SubStatus
 from flwr.common.logger import log
@@ -132,9 +133,10 @@ class DeploymentEngine(Executor):
             raise RuntimeError(
                 f"FAB ({fab.hash_str}) hash from request doesn't match contents"
             )
+        fab_id, fab_version = get_fab_metadata(fab.content)
 
         run_id = self.linkstate.create_run(
-            None, None, fab_hash, override_config, ConfigsRecord()
+            fab_id, fab_version, fab_hash, override_config, ConfigsRecord()
         )
         return run_id
 

flwr/superexec/simulation.py

@@ -21,6 +21,7 @@ from typing import Optional
 
 from typing_extensions import override
 
+from flwr.cli.config_utils import get_fab_metadata
 from flwr.common import ConfigsRecord, Context, RecordSet
 from flwr.common.logger import log
 from flwr.common.typing import Fab, UserConfig
@@ -32,21 +33,11 @@ from .executor import Executor
 
 
 class SimulationEngine(Executor):
-    """Simulation engine executor.
-
-    Parameters
-    ----------
-    num_supernodes: Opitonal[str] (default: None)
-        Total number of nodes to involve in the simulation.
-    """
+    """Simulation engine executor."""
 
     def __init__(
         self,
-        num_supernodes: Optional[int] = None,
-        verbose: Optional[bool] = False,
     ) -> None:
-        self.num_supernodes = num_supernodes
-        self.verbose = verbose
         self.linkstate_factory: Optional[LinkStateFactory] = None
         self.ffs_factory: Optional[FfsFactory] = None
 
@@ -77,40 +68,7 @@ class SimulationEngine(Executor):
         self,
         config: UserConfig,
     ) -> None:
-        """Set executor config arguments.
-
-        Parameters
-        ----------
-        config : UserConfig
-            A dictionary for configuration values.
-            Supported configuration key/value pairs:
-            - "num-supernodes": int
-                Number of nodes to register for the simulation.
-            - "verbose": bool
-                Set verbosity of logs.
-        """
-        if num_supernodes := config.get("num-supernodes"):
-            if not isinstance(num_supernodes, int):
-                raise ValueError("The `num-supernodes` value should be of type `int`.")
-            self.num_supernodes = num_supernodes
-        elif self.num_supernodes is None:
-            log(
-                ERROR,
-                "To start a run with the simulation plugin, please specify "
-                "the number of SuperNodes. This can be done by using the "
-                "`--executor-config` argument when launching the SuperExec.",
-            )
-            raise ValueError(
-                "`num-supernodes` must not be `None`, it must be a valid "
-                "positive integer."
-            )
-
-        if verbose := config.get("verbose"):
-            if not isinstance(verbose, bool):
-                raise ValueError(
-                    "The `verbose` value must be a string `true` or `false`."
-                )
-            self.verbose = verbose
+        """Set executor config arguments."""
 
     # pylint: disable=too-many-locals
     @override
@@ -122,6 +80,12 @@ class SimulationEngine(Executor):
     ) -> Optional[int]:
         """Start run using the Flower Simulation Engine."""
         try:
+            # Check that num-supernodes is set
+            if "num-supernodes" not in federation_options:
+                raise ValueError(
+                    "Federation options doesn't contain key `num-supernodes`."
+                )
+
             # Create run
             fab = Fab(hashlib.sha256(fab_file).hexdigest(), fab_file)
             fab_hash = self.ffs.put(fab.content, {})
@@ -129,9 +93,10 @@ class SimulationEngine(Executor):
                 raise RuntimeError(
                     f"FAB ({fab.hash_str}) hash from request doesn't match contents"
                 )
+            fab_id, fab_version = get_fab_metadata(fab.content)
 
             run_id = self.linkstate.create_run(
-                None, None, fab_hash, override_config, federation_options
+                fab_id, fab_version, fab_hash, override_config, federation_options
             )
 
             # Create an empty context for the Run

{flwr_nightly-1.13.0.dev20241112.dist-info → flwr_nightly-1.13.0.dev20241113.dist-info}/METADATA

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

{flwr_nightly-1.13.0.dev20241112.dist-info → flwr_nightly-1.13.0.dev20241113.dist-info}/RECORD

@@ -109,7 +109,7 @@ flwr/common/args.py,sha256=y9qtPIwyijegNi0GbQT5ddRtMUITM-DlgilC1Co-nvw,6133
 flwr/common/config.py,sha256=qC1QvGAGr4faBtg3Y5dWhfyK5FggyWUMjPqg-Rx_FW4,8083
 flwr/common/constant.py,sha256=D7MNLl1u-P7tJAMdT67xIujSeCibc2QzqtFoqCagoco,4731
 flwr/common/context.py,sha256=uJ-mnoC_8y_udEb3kAX-r8CPphNTWM72z1AlsvQEu54,2403
-flwr/common/date.py,sha256=uTvLmCkd3uVQuD4MviPHnIXMGyheL16mEI_UlOsv_R8,894
+flwr/common/date.py,sha256=NHHpESce5wYqEwoDXf09gp9U9l_5Bmlh2BsOcwS-kDM,1554
 flwr/common/differential_privacy.py,sha256=XwcJ3rWr8S8BZUocc76vLSJAXIf6OHnWkBV6-xlIRuw,6106
 flwr/common/differential_privacy_constants.py,sha256=c7b7tqgvT7yMK0XN9ndiTBs4mQf6d3qk6K7KBZGlV4Q,1074
 flwr/common/dp.py,sha256=vddkvyjV2FhRoN4VuU2LeAM1UBn7dQB8_W-Qdiveal8,1978
@@ -315,13 +315,13 @@ flwr/simulation/run_simulation.py,sha256=BoG0lwaixe3g-xL4RZPl_6P47PKj2TiPHsDUtcN
 flwr/simulation/simulationio_connection.py,sha256=Uqtm2pRuZqEM8SxKS2TdBgsMUABSabhVIx9zzCPb_qc,3195
 flwr/superexec/__init__.py,sha256=fcj366jh4RFby_vDwLroU4kepzqbnJgseZD_jUr_Mko,715
 flwr/superexec/app.py,sha256=Tt3GonnTwHrMmicwx9XaP-crP78-bf4DUWl-N5cG6zY,1841
-flwr/superexec/deployment.py,sha256=C-NNclLE9OVJST6VRemtXv5N_vOoZeb77AQcMptCP6M,6511
+flwr/superexec/deployment.py,sha256=e4yU0HSOEn0MqLnOwg8X1ViRJEJWUpD4u8pLAV_DU14,6631
 flwr/superexec/exec_grpc.py,sha256=OuhBAk7hiky9rjGceinLGIXqchtzGPQThZnwyYv6Ei0,2241
 flwr/superexec/exec_servicer.py,sha256=zNcdPkqLXgJIANKvE9uGIzgxocIs31WAj1YDnwqI6jo,3958
 flwr/superexec/executor.py,sha256=zH3_53il6Jh0ZscIVEB9f4GNnXMeBbCGyCoBCxLgiG0,3114
-flwr/superexec/simulation.py,sha256=NDFMDRidvp3Gz2MlgcWzkTrFHNAFfS94fTAdX_g7WzY,5370
-flwr_nightly-1.13.0.dev20241112.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.13.0.dev20241112.dist-info/METADATA,sha256=yeDED4-E_qBqp8i2KaDoCQHr-gv2M3LAmo5oOT-MCR4,15701
-flwr_nightly-1.13.0.dev20241112.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.13.0.dev20241112.dist-info/entry_points.txt,sha256=JlNxX3qhaV18_2yj5a3kJW1ESxm31cal9iS_N_pf1Rk,538
-flwr_nightly-1.13.0.dev20241112.dist-info/RECORD,,
+flwr/superexec/simulation.py,sha256=WQDon15oqpMopAZnwRZoTICYCfHqtkvFSqiTQ2hLD_g,4088
+flwr_nightly-1.13.0.dev20241113.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.13.0.dev20241113.dist-info/METADATA,sha256=nGtH2E9gPhSSJlsVtTmf2iXu26szJ5s-iMXhkeDPIwg,15701
+flwr_nightly-1.13.0.dev20241113.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.13.0.dev20241113.dist-info/entry_points.txt,sha256=JlNxX3qhaV18_2yj5a3kJW1ESxm31cal9iS_N_pf1Rk,538
+flwr_nightly-1.13.0.dev20241113.dist-info/RECORD,,