flwr-nightly 1.12.0.dev20240918__tar.gz → 1.12.0.dev20240920__tar.gz

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/PKG-INFO

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

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/pyproject.toml

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

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/cli/new/new.py

@@ -275,7 +275,7 @@ def new(
         )
     )
 
-    _add = "	huggingface-cli login\n" if framework_str == "flowertune" else ""
+    _add = "	huggingface-cli login\n" if llm_challenge_str else ""
     print(
         typer.style(
             f"	cd {package_name}\n" + "	pip install -e .\n" + _add + "	flwr run\n",

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -17,6 +17,7 @@ dependencies = [
     "transformers==4.39.3",
     "sentencepiece==0.2.0",
     "omegaconf==2.3.0",
+    "hf_transfer==0.1.8",
 ]
 
 [tool.hatch.build.targets.wheel]

flwr_nightly-1.12.0.dev20240920/src/py/flwr/proto/control_pb2.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/control.proto
+# Protobuf Python Version: 4.25.0
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/control.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/run.proto2U\n\x07\x43ontrol\x12J\n\tCreateRun\x12\x1c.flwr.proto.CreateRunRequest\x1a\x1d.flwr.proto.CreateRunResponse\"\x00\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.control_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_CONTROL']._serialized_start=62
+  _globals['_CONTROL']._serialized_end=147
+# @@protoc_insertion_point(module_scope)

flwr_nightly-1.12.0.dev20240920/src/py/flwr/proto/control_pb2.pyi

@@ -0,0 +1,7 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""
+import google.protobuf.descriptor
+
+DESCRIPTOR: google.protobuf.descriptor.FileDescriptor

flwr_nightly-1.12.0.dev20240920/src/py/flwr/proto/control_pb2_grpc.py

@@ -0,0 +1,67 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+
+from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+
+
+class ControlStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.CreateRun = channel.unary_unary(
+                '/flwr.proto.Control/CreateRun',
+                request_serializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
+                )
+
+
+class ControlServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def CreateRun(self, request, context):
+        """Request to create a new run
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_ControlServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'CreateRun': grpc.unary_unary_rpc_method_handler(
+                    servicer.CreateRun,
+                    request_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'flwr.proto.Control', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class Control(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def CreateRun(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/CreateRun',
+            flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
+            flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr_nightly-1.12.0.dev20240920/src/py/flwr/proto/control_pb2_grpc.pyi

@@ -0,0 +1,27 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""
+import abc
+import flwr.proto.run_pb2
+import grpc
+
+class ControlStub:
+    def __init__(self, channel: grpc.Channel) -> None: ...
+    CreateRun: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.run_pb2.CreateRunRequest,
+        flwr.proto.run_pb2.CreateRunResponse]
+    """Request to create a new run"""
+
+
+class ControlServicer(metaclass=abc.ABCMeta):
+    @abc.abstractmethod
+    def CreateRun(self,
+        request: flwr.proto.run_pb2.CreateRunRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.run_pb2.CreateRunResponse:
+        """Request to create a new run"""
+        pass
+
+
+def add_ControlServicer_to_server(servicer: ControlServicer, server: grpc.Server) -> None: ...

flwr_nightly-1.12.0.dev20240920/src/py/flwr/proto/driver_pb2.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/driver.proto
+# Protobuf Python Version: 4.25.0
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
+from flwr.proto import task_pb2 as flwr_dot_proto_dot_task__pb2
+from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x66lwr/proto/driver.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x15\x66lwr/proto/task.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\"!\n\x0fGetNodesRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"3\n\x10GetNodesResponse\x12\x1f\n\x05nodes\x18\x01 \x03(\x0b\x32\x10.flwr.proto.Node\"@\n\x12PushTaskInsRequest\x12*\n\rtask_ins_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"\'\n\x13PushTaskInsResponse\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"F\n\x12PullTaskResRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"A\n\x13PullTaskResResponse\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes2\xc7\x03\n\x06\x44river\x12J\n\tCreateRun\x12\x1c.flwr.proto.CreateRunRequest\x1a\x1d.flwr.proto.CreateRunResponse\"\x00\x12G\n\x08GetNodes\x12\x1b.flwr.proto.GetNodesRequest\x1a\x1c.flwr.proto.GetNodesResponse\"\x00\x12P\n\x0bPushTaskIns\x12\x1e.flwr.proto.PushTaskInsRequest\x1a\x1f.flwr.proto.PushTaskInsResponse\"\x00\x12P\n\x0bPullTaskRes\x12\x1e.flwr.proto.PullTaskResRequest\x1a\x1f.flwr.proto.PullTaskResResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\x00\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.driver_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_GETNODESREQUEST']._serialized_start=129
+  _globals['_GETNODESREQUEST']._serialized_end=162
+  _globals['_GETNODESRESPONSE']._serialized_start=164
+  _globals['_GETNODESRESPONSE']._serialized_end=215
+  _globals['_PUSHTASKINSREQUEST']._serialized_start=217
+  _globals['_PUSHTASKINSREQUEST']._serialized_end=281
+  _globals['_PUSHTASKINSRESPONSE']._serialized_start=283
+  _globals['_PUSHTASKINSRESPONSE']._serialized_end=322
+  _globals['_PULLTASKRESREQUEST']._serialized_start=324
+  _globals['_PULLTASKRESREQUEST']._serialized_end=394
+  _globals['_PULLTASKRESRESPONSE']._serialized_start=396
+  _globals['_PULLTASKRESRESPONSE']._serialized_end=461
+  _globals['_DRIVER']._serialized_start=464
+  _globals['_DRIVER']._serialized_end=919
+# @@protoc_insertion_point(module_scope)

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/proto/driver_pb2.pyi

@@ -3,10 +3,8 @@
 isort:skip_file
 """
 import builtins
-import flwr.proto.fab_pb2
 import flwr.proto.node_pb2
 import flwr.proto.task_pb2
-import flwr.proto.transport_pb2
 import google.protobuf.descriptor
 import google.protobuf.internal.containers
 import google.protobuf.message
@@ -15,56 +13,6 @@ import typing_extensions
 
 DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 
-class CreateRunRequest(google.protobuf.message.Message):
-    """CreateRun"""
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    class OverrideConfigEntry(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-        KEY_FIELD_NUMBER: builtins.int
-        VALUE_FIELD_NUMBER: builtins.int
-        key: typing.Text
-        @property
-        def value(self) -> flwr.proto.transport_pb2.Scalar: ...
-        def __init__(self,
-            *,
-            key: typing.Text = ...,
-            value: typing.Optional[flwr.proto.transport_pb2.Scalar] = ...,
-            ) -> None: ...
-        def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ...
-        def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
-
-    FAB_ID_FIELD_NUMBER: builtins.int
-    FAB_VERSION_FIELD_NUMBER: builtins.int
-    OVERRIDE_CONFIG_FIELD_NUMBER: builtins.int
-    FAB_FIELD_NUMBER: builtins.int
-    fab_id: typing.Text
-    fab_version: typing.Text
-    @property
-    def override_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
-    @property
-    def fab(self) -> flwr.proto.fab_pb2.Fab: ...
-    def __init__(self,
-        *,
-        fab_id: typing.Text = ...,
-        fab_version: typing.Text = ...,
-        override_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
-        fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
-        ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["fab",b"fab"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["fab",b"fab","fab_id",b"fab_id","fab_version",b"fab_version","override_config",b"override_config"]) -> None: ...
-global___CreateRunRequest = CreateRunRequest
-
-class CreateRunResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    RUN_ID_FIELD_NUMBER: builtins.int
-    run_id: builtins.int
-    def __init__(self,
-        *,
-        run_id: builtins.int = ...,
-        ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id"]) -> None: ...
-global___CreateRunResponse = CreateRunResponse
-
 class GetNodesRequest(google.protobuf.message.Message):
     """GetNodes messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/proto/driver_pb2_grpc.py

@@ -18,8 +18,8 @@ class DriverStub(object):
         """
         self.CreateRun = channel.unary_unary(
                 '/flwr.proto.Driver/CreateRun',
-                request_serializer=flwr_dot_proto_dot_driver__pb2.CreateRunRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_driver__pb2.CreateRunResponse.FromString,
+                request_serializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
                 )
         self.GetNodes = channel.unary_unary(
                 '/flwr.proto.Driver/GetNodes',
@@ -98,8 +98,8 @@ def add_DriverServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'CreateRun': grpc.unary_unary_rpc_method_handler(
                     servicer.CreateRun,
-                    request_deserializer=flwr_dot_proto_dot_driver__pb2.CreateRunRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_driver__pb2.CreateRunResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.SerializeToString,
             ),
             'GetNodes': grpc.unary_unary_rpc_method_handler(
                     servicer.GetNodes,
@@ -148,8 +148,8 @@ class Driver(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/CreateRun',
-            flwr_dot_proto_dot_driver__pb2.CreateRunRequest.SerializeToString,
-            flwr_dot_proto_dot_driver__pb2.CreateRunResponse.FromString,
+            flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
+            flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/proto/driver_pb2_grpc.pyi

@@ -11,8 +11,8 @@ import grpc
 class DriverStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
     CreateRun: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.driver_pb2.CreateRunRequest,
-        flwr.proto.driver_pb2.CreateRunResponse]
+        flwr.proto.run_pb2.CreateRunRequest,
+        flwr.proto.run_pb2.CreateRunResponse]
     """Request run_id"""
 
     GetNodes: grpc.UnaryUnaryMultiCallable[
@@ -44,9 +44,9 @@ class DriverStub:
 class DriverServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def CreateRun(self,
-        request: flwr.proto.driver_pb2.CreateRunRequest,
+        request: flwr.proto.run_pb2.CreateRunRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.driver_pb2.CreateRunResponse:
+    ) -> flwr.proto.run_pb2.CreateRunResponse:
         """Request run_id"""
         pass
 

flwr_nightly-1.12.0.dev20240920/src/py/flwr/proto/run_pb2.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/run.proto
+# Protobuf Python Version: 4.25.0
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
+from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66lwr/proto/run.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x1a\x66lwr/proto/transport.proto\"\xd5\x01\n\x03Run\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x0e\n\x06\x66\x61\x62_id\x18\x02 \x01(\t\x12\x13\n\x0b\x66\x61\x62_version\x18\x03 \x01(\t\x12<\n\x0foverride_config\x18\x04 \x03(\x0b\x32#.flwr.proto.Run.OverrideConfigEntry\x12\x10\n\x08\x66\x61\x62_hash\x18\x05 \x01(\t\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"\xeb\x01\n\x10\x43reateRunRequest\x12\x0e\n\x06\x66\x61\x62_id\x18\x01 \x01(\t\x12\x13\n\x0b\x66\x61\x62_version\x18\x02 \x01(\t\x12I\n\x0foverride_config\x18\x03 \x03(\x0b\x32\x30.flwr.proto.CreateRunRequest.OverrideConfigEntry\x12\x1c\n\x03\x66\x61\x62\x18\x04 \x01(\x0b\x32\x0f.flwr.proto.Fab\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"#\n\x11\x43reateRunResponse\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"\x1f\n\rGetRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\".\n\x0eGetRunResponse\x12\x1c\n\x03run\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Runb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.run_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_RUN_OVERRIDECONFIGENTRY']._options = None
+  _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
+  _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._options = None
+  _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
+  _globals['_RUN']._serialized_start=87
+  _globals['_RUN']._serialized_end=300
+  _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_start=227
+  _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_end=300
+  _globals['_CREATERUNREQUEST']._serialized_start=303
+  _globals['_CREATERUNREQUEST']._serialized_end=538
+  _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=227
+  _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=300
+  _globals['_CREATERUNRESPONSE']._serialized_start=540
+  _globals['_CREATERUNRESPONSE']._serialized_end=575
+  _globals['_GETRUNREQUEST']._serialized_start=577
+  _globals['_GETRUNREQUEST']._serialized_end=608
+  _globals['_GETRUNRESPONSE']._serialized_start=610
+  _globals['_GETRUNRESPONSE']._serialized_end=656
+# @@protoc_insertion_point(module_scope)

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/proto/run_pb2.pyi

@@ -3,6 +3,7 @@
 isort:skip_file
 """
 import builtins
+import flwr.proto.fab_pb2
 import flwr.proto.transport_pb2
 import google.protobuf.descriptor
 import google.protobuf.internal.containers
@@ -51,7 +52,58 @@ class Run(google.protobuf.message.Message):
     def ClearField(self, field_name: typing_extensions.Literal["fab_hash",b"fab_hash","fab_id",b"fab_id","fab_version",b"fab_version","override_config",b"override_config","run_id",b"run_id"]) -> None: ...
 global___Run = Run
 
+class CreateRunRequest(google.protobuf.message.Message):
+    """CreateRun"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    class OverrideConfigEntry(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        KEY_FIELD_NUMBER: builtins.int
+        VALUE_FIELD_NUMBER: builtins.int
+        key: typing.Text
+        @property
+        def value(self) -> flwr.proto.transport_pb2.Scalar: ...
+        def __init__(self,
+            *,
+            key: typing.Text = ...,
+            value: typing.Optional[flwr.proto.transport_pb2.Scalar] = ...,
+            ) -> None: ...
+        def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
+
+    FAB_ID_FIELD_NUMBER: builtins.int
+    FAB_VERSION_FIELD_NUMBER: builtins.int
+    OVERRIDE_CONFIG_FIELD_NUMBER: builtins.int
+    FAB_FIELD_NUMBER: builtins.int
+    fab_id: typing.Text
+    fab_version: typing.Text
+    @property
+    def override_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
+    @property
+    def fab(self) -> flwr.proto.fab_pb2.Fab: ...
+    def __init__(self,
+        *,
+        fab_id: typing.Text = ...,
+        fab_version: typing.Text = ...,
+        override_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
+        fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["fab",b"fab"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["fab",b"fab","fab_id",b"fab_id","fab_version",b"fab_version","override_config",b"override_config"]) -> None: ...
+global___CreateRunRequest = CreateRunRequest
+
+class CreateRunResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    RUN_ID_FIELD_NUMBER: builtins.int
+    run_id: builtins.int
+    def __init__(self,
+        *,
+        run_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id"]) -> None: ...
+global___CreateRunResponse = CreateRunResponse
+
 class GetRunRequest(google.protobuf.message.Message):
+    """GetRun"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     RUN_ID_FIELD_NUMBER: builtins.int
     run_id: builtins.int

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/server/run_serverapp.py

@@ -35,11 +35,11 @@ from flwr.common.constant import DRIVER_API_DEFAULT_ADDRESS
 from flwr.common.logger import log, update_console_handler, warn_deprecated_feature
 from flwr.common.object_ref import load_app
 from flwr.common.typing import UserConfig
-from flwr.proto.driver_pb2 import (  # pylint: disable=E0611
+from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
+from flwr.proto.run_pb2 import (  # pylint: disable=E0611
     CreateRunRequest,
     CreateRunResponse,
 )
-from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
 
 from .driver import Driver
 from .driver.grpc_driver import GrpcDriver

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/server/superlink/state/sqlite_state.py

@@ -782,8 +782,9 @@ class SqliteState(State):  # pylint: disable=R0904
         # Convert the uint64 value to sint64 for SQLite
         sint64_run_id = convert_uint64_to_sint64(run_id)
         query = "SELECT * FROM run WHERE run_id = ?;"
-        try:
-            row = self.query(query, (sint64_run_id,))[0]
+        rows = self.query(query, (sint64_run_id,))
+        if rows:
+            row = rows[0]
             return Run(
                 run_id=convert_sint64_to_uint64(row["run_id"]),
                 fab_id=row["fab_id"],
@@ -791,9 +792,8 @@ class SqliteState(State):  # pylint: disable=R0904
                 fab_hash=row["fab_hash"],
                 override_config=json.loads(row["override_config"]),
             )
-        except sqlite3.IntegrityError:
-            log(ERROR, "`run_id` does not exist.")
-            return None
+        log(ERROR, "`run_id` does not exist.")
+        return None
 
     def acknowledge_ping(self, node_id: int, ping_interval: float) -> bool:
         """Acknowledge a ping received from a node, serving as a heartbeat."""

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20240920}/src/py/flwr/superexec/deployment.py

@@ -28,8 +28,8 @@ from flwr.common.grpc import create_channel
 from flwr.common.logger import log
 from flwr.common.serde import fab_to_proto, user_config_to_proto
 from flwr.common.typing import Fab, UserConfig
-from flwr.proto.driver_pb2 import CreateRunRequest  # pylint: disable=E0611
 from flwr.proto.driver_pb2_grpc import DriverStub
+from flwr.proto.run_pb2 import CreateRunRequest  # pylint: disable=E0611
 
 from .executor import Executor, RunTracker
 
@@ -167,6 +167,8 @@ class DeploymentEngine(Executor):
             # Execute the command
             proc = subprocess.Popen(  # pylint: disable=consider-using-with
                 command,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
                 text=True,
             )
             log(INFO, "Started run %s", str(run_id))

flwr_nightly-1.12.0.dev20240920/src/py/flwr/superexec/exec_servicer.py

@@ -0,0 +1,136 @@
+# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""SuperExec API servicer."""
+
+
+import select
+import sys
+import threading
+import time
+from collections.abc import Generator
+from logging import ERROR, INFO
+from typing import Any
+
+import grpc
+
+from flwr.common.logger import log
+from flwr.common.serde import user_config_from_proto
+from flwr.proto import exec_pb2_grpc  # pylint: disable=E0611
+from flwr.proto.exec_pb2 import (  # pylint: disable=E0611
+    StartRunRequest,
+    StartRunResponse,
+    StreamLogsRequest,
+    StreamLogsResponse,
+)
+
+from .executor import Executor, RunTracker
+
+SELECT_TIMEOUT = 1  # Timeout for selecting ready-to-read file descriptors (in seconds)
+
+
+class ExecServicer(exec_pb2_grpc.ExecServicer):
+    """SuperExec API servicer."""
+
+    def __init__(self, executor: Executor) -> None:
+        self.executor = executor
+        self.runs: dict[int, RunTracker] = {}
+
+    def StartRun(
+        self, request: StartRunRequest, context: grpc.ServicerContext
+    ) -> StartRunResponse:
+        """Create run ID."""
+        log(INFO, "ExecServicer.StartRun")
+
+        run = self.executor.start_run(
+            request.fab.content,
+            user_config_from_proto(request.override_config),
+            user_config_from_proto(request.federation_config),
+        )
+
+        if run is None:
+            log(ERROR, "Executor failed to start run")
+            return StartRunResponse()
+
+        self.runs[run.run_id] = run
+
+        # Start a background thread to capture the log output
+        capture_thread = threading.Thread(
+            target=_capture_logs, args=(run,), daemon=True
+        )
+        capture_thread.start()
+
+        return StartRunResponse(run_id=run.run_id)
+
+    def StreamLogs(  # pylint: disable=C0103
+        self, request: StreamLogsRequest, context: grpc.ServicerContext
+    ) -> Generator[StreamLogsResponse, Any, None]:
+        """Get logs."""
+        log(INFO, "ExecServicer.StreamLogs")
+
+        # Exit if `run_id` not found
+        if request.run_id not in self.runs:
+            context.abort(grpc.StatusCode.NOT_FOUND, "Run ID not found")
+
+        last_sent_index = 0
+        while context.is_active():
+            # Yield n'th row of logs, if n'th row < len(logs)
+            logs = self.runs[request.run_id].logs
+            for i in range(last_sent_index, len(logs)):
+                yield StreamLogsResponse(log_output=logs[i])
+            last_sent_index = len(logs)
+
+            # Wait for and continue to yield more log responses only if the
+            # run isn't completed yet. If the run is finished, the entire log
+            # is returned at this point and the server ends the stream.
+            if self.runs[request.run_id].proc.poll() is not None:
+                log(INFO, "All logs for run ID `%s` returned", request.run_id)
+                context.set_code(grpc.StatusCode.OK)
+                context.cancel()
+
+            time.sleep(1.0)  # Sleep briefly to avoid busy waiting
+
+
+def _capture_logs(
+    run: RunTracker,
+) -> None:
+    while True:
+        # Explicitly check if Popen.poll() is None. Required for `pytest`.
+        if run.proc.poll() is None:
+            # Select streams only when ready to read
+            ready_to_read, _, _ = select.select(
+                [run.proc.stdout, run.proc.stderr],
+                [],
+                [],
+                SELECT_TIMEOUT,
+            )
+            # Read from std* and append to RunTracker.logs
+            for stream in ready_to_read:
+                # Flush stdout to view output in real time
+                readline = stream.readline()
+                sys.stdout.write(readline)
+                sys.stdout.flush()
+                # Append to logs
+                line = readline.rstrip()
+                if line:
+                    run.logs.append(f"{line}")
+
+        # Close std* to prevent blocking
+        elif run.proc.poll() is not None:
+            log(INFO, "Subprocess finished, exiting log capture")
+            if run.proc.stdout:
+                run.proc.stdout.close()
+            if run.proc.stderr:
+                run.proc.stderr.close()
+            break