flwr-nightly 1.7.0.dev20240117__tar.gz → 1.7.0.dev20240119__tar.gz

Sign up to get free protection for your applications and to get access to all the features.
Files changed (147) hide show
  1. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/PKG-INFO +3 -3
  2. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/pyproject.toml +7 -7
  3. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/app.py +1 -1
  4. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/grpc_client/connection.py +7 -4
  5. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/grpc_rere_client/connection.py +4 -4
  6. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/message_handler/message_handler.py +11 -2
  7. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/message_handler/task_handler.py +7 -4
  8. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/node_state_tests.py +1 -1
  9. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/rest_client/connection.py +3 -3
  10. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/typing.py +1 -1
  11. flwr_nightly-1.7.0.dev20240119/src/py/flwr/common/configsrecord.py +107 -0
  12. flwr_nightly-1.7.0.dev20240119/src/py/flwr/common/flowercontext.py +77 -0
  13. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/logger.py +14 -0
  14. flwr_nightly-1.7.0.dev20240119/src/py/flwr/common/metricsrecord.py +107 -0
  15. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/parametersrecord.py +12 -5
  16. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/recordset.py +3 -10
  17. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/serde.py +2 -2
  18. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/typing.py +9 -0
  19. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/driver/app.py +5 -3
  20. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/driver/driver.py +3 -3
  21. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/driver/driver_client_proxy.py +24 -15
  22. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/driver/grpc_driver.py +2 -2
  23. flwr_nightly-1.7.0.dev20240119/src/py/flwr/proto/driver_pb2.py +44 -0
  24. flwr_nightly-1.7.0.dev20240119/src/py/flwr/proto/fleet_pb2.py +50 -0
  25. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/node_pb2.py +7 -15
  26. flwr_nightly-1.7.0.dev20240119/src/py/flwr/proto/task_pb2.py +54 -0
  27. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/task_pb2.pyi +4 -1
  28. flwr_nightly-1.7.0.dev20240119/src/py/flwr/proto/transport_pb2.py +88 -0
  29. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/app.py +9 -3
  30. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/driver/driver_servicer.py +4 -4
  31. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_bidi/flower_service_servicer.py +5 -2
  32. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_bidi/grpc_bridge.py +4 -1
  33. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_bidi/grpc_client_proxy.py +4 -1
  34. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_bidi/grpc_server.py +3 -1
  35. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_bidi/ins_scheduler.py +6 -3
  36. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_rere/fleet_servicer.py +2 -2
  37. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/message_handler/message_handler.py +3 -3
  38. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/rest_rere/rest_api.py +1 -1
  39. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/state/in_memory_state.py +1 -1
  40. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/state/sqlite_state.py +6 -3
  41. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/state/state.py +1 -1
  42. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedxgb_nn_avg.py +9 -2
  43. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/utils/validator.py +1 -1
  44. flwr_nightly-1.7.0.dev20240117/src/py/flwr/proto/driver_pb2.py +0 -109
  45. flwr_nightly-1.7.0.dev20240117/src/py/flwr/proto/fleet_pb2.py +0 -132
  46. flwr_nightly-1.7.0.dev20240117/src/py/flwr/proto/task_pb2.py +0 -148
  47. flwr_nightly-1.7.0.dev20240117/src/py/flwr/proto/transport_pb2.py +0 -297
  48. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/LICENSE +0 -0
  49. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/README.md +0 -0
  50. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/__init__.py +0 -0
  51. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/__init__.py +0 -0
  52. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/client.py +0 -0
  53. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/dpfedavg_numpy_client.py +0 -0
  54. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/flower.py +0 -0
  55. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/grpc_client/__init__.py +0 -0
  56. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/grpc_rere_client/__init__.py +0 -0
  57. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/message_handler/__init__.py +0 -0
  58. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/middleware/__init__.py +0 -0
  59. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/middleware/utils.py +0 -0
  60. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/node_state.py +0 -0
  61. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/numpy_client.py +0 -0
  62. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/rest_client/__init__.py +0 -0
  63. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/run_state.py +0 -0
  64. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/secure_aggregation/__init__.py +0 -0
  65. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/secure_aggregation/handler.py +0 -0
  66. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/client/secure_aggregation/secaggplus_handler.py +0 -0
  67. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/__init__.py +0 -0
  68. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/address.py +0 -0
  69. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/constant.py +0 -0
  70. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/date.py +0 -0
  71. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/dp.py +0 -0
  72. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/grpc.py +0 -0
  73. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/parameter.py +0 -0
  74. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/recordset_utils.py +0 -0
  75. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/retry_invoker.py +0 -0
  76. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/secure_aggregation/__init__.py +0 -0
  77. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/secure_aggregation/crypto/__init__.py +0 -0
  78. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/secure_aggregation/crypto/shamir.py +0 -0
  79. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/secure_aggregation/crypto/symmetric_encryption.py +0 -0
  80. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/secure_aggregation/ndarrays_arithmetic.py +0 -0
  81. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/secure_aggregation/quantization.py +0 -0
  82. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/secure_aggregation/secaggplus_constants.py +0 -0
  83. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/secure_aggregation/secaggplus_utils.py +0 -0
  84. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/telemetry.py +0 -0
  85. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/common/version.py +0 -0
  86. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/driver/__init__.py +0 -0
  87. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/flower/__init__.py +0 -0
  88. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/__init__.py +0 -0
  89. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/driver_pb2.pyi +0 -0
  90. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/driver_pb2_grpc.py +0 -0
  91. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/driver_pb2_grpc.pyi +0 -0
  92. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/fleet_pb2.pyi +0 -0
  93. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/fleet_pb2_grpc.py +0 -0
  94. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/fleet_pb2_grpc.pyi +0 -0
  95. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/node_pb2.pyi +0 -0
  96. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/node_pb2_grpc.py +0 -0
  97. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/node_pb2_grpc.pyi +0 -0
  98. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/task_pb2_grpc.py +0 -0
  99. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/task_pb2_grpc.pyi +0 -0
  100. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/transport_pb2.pyi +0 -0
  101. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/transport_pb2_grpc.py +0 -0
  102. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/proto/transport_pb2_grpc.pyi +0 -0
  103. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/py.typed +0 -0
  104. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/__init__.py +0 -0
  105. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/client_manager.py +0 -0
  106. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/client_proxy.py +0 -0
  107. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/criterion.py +0 -0
  108. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/driver/__init__.py +0 -0
  109. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/__init__.py +0 -0
  110. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_bidi/__init__.py +0 -0
  111. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_bidi/driver_client_manager.py +0 -0
  112. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/grpc_rere/__init__.py +0 -0
  113. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/message_handler/__init__.py +0 -0
  114. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/fleet/rest_rere/__init__.py +0 -0
  115. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/history.py +0 -0
  116. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/server.py +0 -0
  117. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/state/__init__.py +0 -0
  118. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/state/state_factory.py +0 -0
  119. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/__init__.py +0 -0
  120. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/aggregate.py +0 -0
  121. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/bulyan.py +0 -0
  122. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/dpfedavg_adaptive.py +0 -0
  123. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/dpfedavg_fixed.py +0 -0
  124. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fault_tolerant_fedavg.py +0 -0
  125. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedadagrad.py +0 -0
  126. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedadam.py +0 -0
  127. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedavg.py +0 -0
  128. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedavg_android.py +0 -0
  129. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedavgm.py +0 -0
  130. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedmedian.py +0 -0
  131. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedopt.py +0 -0
  132. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedprox.py +0 -0
  133. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedtrimmedavg.py +0 -0
  134. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedxgb_bagging.py +0 -0
  135. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedxgb_cyclic.py +0 -0
  136. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/fedyogi.py +0 -0
  137. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/krum.py +0 -0
  138. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/qfedavg.py +0 -0
  139. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/strategy/strategy.py +0 -0
  140. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/utils/__init__.py +0 -0
  141. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/server/utils/tensorboard.py +0 -0
  142. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/simulation/__init__.py +0 -0
  143. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/simulation/app.py +0 -0
  144. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/simulation/ray_transport/__init__.py +0 -0
  145. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/simulation/ray_transport/ray_actor.py +0 -0
  146. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/simulation/ray_transport/ray_client_proxy.py +0 -0
  147. {flwr_nightly-1.7.0.dev20240117 → flwr_nightly-1.7.0.dev20240119}/src/py/flwr/simulation/ray_transport/utils.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: flwr-nightly
3
- Version: 1.7.0.dev20240117
3
+ Version: 1.7.0.dev20240119
4
4
  Summary: Flower: A Friendly Federated Learning Framework
5
5
  Home-page: https://flower.dev
6
6
  License: Apache-2.0
@@ -33,10 +33,10 @@ Classifier: Typing :: Typed
33
33
  Provides-Extra: rest
34
34
  Provides-Extra: simulation
35
35
  Requires-Dist: cryptography (>=41.0.2,<42.0.0)
36
- Requires-Dist: grpcio (>=1.48.2,<2.0.0,!=1.52.0)
36
+ Requires-Dist: grpcio (>=1.60.0,<2.0.0)
37
37
  Requires-Dist: iterators (>=0.0.2,<0.0.3)
38
38
  Requires-Dist: numpy (>=1.21.0,<2.0.0)
39
- Requires-Dist: protobuf (>=3.19.0,<4.0.0)
39
+ Requires-Dist: protobuf (>=4.25.2,<5.0.0)
40
40
  Requires-Dist: pycryptodome (>=3.18.0,<4.0.0)
41
41
  Requires-Dist: pydantic (<2.0.0) ; extra == "simulation"
42
42
  Requires-Dist: ray (==2.6.3) ; extra == "simulation"
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
4
4
 
5
5
  [tool.poetry]
6
6
  name = "flwr-nightly"
7
- version = "1.7.0-dev20240117"
7
+ version = "1.7.0-dev20240119"
8
8
  description = "Flower: A Friendly Federated Learning Framework"
9
9
  license = "Apache-2.0"
10
10
  authors = ["The Flower Authors <hello@flower.dev>"]
@@ -61,8 +61,8 @@ flower-client = "flwr.client:run_client"
61
61
  python = "^3.8"
62
62
  # Mandatory dependencies
63
63
  numpy = "^1.21.0"
64
- grpcio = "^1.48.2,!=1.52.0"
65
- protobuf = "^3.19.0"
64
+ grpcio = "^1.60.0"
65
+ protobuf = "^4.25.2"
66
66
  cryptography = "^41.0.2"
67
67
  pycryptodome = "^3.18.0"
68
68
  iterators = "^0.0.2"
@@ -87,13 +87,13 @@ clang-format = "==17.0.4"
87
87
  isort = "==5.13.2"
88
88
  black = { version = "==23.10.1", extras = ["jupyter"] }
89
89
  docformatter = "==1.7.5"
90
- mypy = "==1.6.1"
90
+ mypy = "==1.8.0"
91
91
  pylint = "==3.0.3"
92
92
  flake8 = "==5.0.4"
93
- pytest = "==7.4.3"
93
+ pytest = "==7.4.4"
94
94
  pytest-cov = "==4.1.0"
95
95
  pytest-watch = "==4.2.0"
96
- grpcio-tools = "==1.48.2"
96
+ grpcio-tools = "==1.60.0"
97
97
  mypy-protobuf = "==3.2.0"
98
98
  jupyterlab = "==4.0.9"
99
99
  rope = "==1.11.0"
@@ -121,7 +121,7 @@ pyroma = "==4.2"
121
121
  check-wheel-contents = "==0.4.0"
122
122
  GitPython = "==3.1.32"
123
123
  PyGithub = "==2.1.1"
124
- licensecheck = "==2023.5.1"
124
+ licensecheck = "==2024"
125
125
 
126
126
  [tool.isort]
127
127
  line_length = 88
@@ -35,7 +35,7 @@ from flwr.common.constant import (
35
35
  TRANSPORT_TYPES,
36
36
  )
37
37
  from flwr.common.logger import log, warn_experimental_feature
38
- from flwr.proto.task_pb2 import TaskIns, TaskRes
38
+ from flwr.proto.task_pb2 import TaskIns, TaskRes # pylint: disable=E0611
39
39
 
40
40
  from .flower import load_flower_callable
41
41
  from .grpc_client.connection import grpc_connection
@@ -25,10 +25,13 @@ from typing import Callable, Iterator, Optional, Tuple, Union
25
25
  from flwr.common import GRPC_MAX_MESSAGE_LENGTH
26
26
  from flwr.common.grpc import create_channel
27
27
  from flwr.common.logger import log
28
- from flwr.proto.node_pb2 import Node
29
- from flwr.proto.task_pb2 import Task, TaskIns, TaskRes
30
- from flwr.proto.transport_pb2 import ClientMessage, ServerMessage
31
- from flwr.proto.transport_pb2_grpc import FlowerServiceStub
28
+ from flwr.proto.node_pb2 import Node # pylint: disable=E0611
29
+ from flwr.proto.task_pb2 import Task, TaskIns, TaskRes # pylint: disable=E0611
30
+ from flwr.proto.transport_pb2 import ( # pylint: disable=E0611
31
+ ClientMessage,
32
+ ServerMessage,
33
+ )
34
+ from flwr.proto.transport_pb2_grpc import FlowerServiceStub # pylint: disable=E0611
32
35
 
33
36
  # The following flags can be uncommented for debugging. Other possible values:
34
37
  # https://github.com/grpc/grpc/blob/master/doc/environment_variables.md
@@ -29,15 +29,15 @@ from flwr.client.message_handler.task_handler import (
29
29
  from flwr.common import GRPC_MAX_MESSAGE_LENGTH
30
30
  from flwr.common.grpc import create_channel
31
31
  from flwr.common.logger import log, warn_experimental_feature
32
- from flwr.proto.fleet_pb2 import (
32
+ from flwr.proto.fleet_pb2 import ( # pylint: disable=E0611
33
33
  CreateNodeRequest,
34
34
  DeleteNodeRequest,
35
35
  PullTaskInsRequest,
36
36
  PushTaskResRequest,
37
37
  )
38
- from flwr.proto.fleet_pb2_grpc import FleetStub
39
- from flwr.proto.node_pb2 import Node
40
- from flwr.proto.task_pb2 import TaskIns, TaskRes
38
+ from flwr.proto.fleet_pb2_grpc import FleetStub # pylint: disable=E0611
39
+ from flwr.proto.node_pb2 import Node # pylint: disable=E0611
40
+ from flwr.proto.task_pb2 import TaskIns, TaskRes # pylint: disable=E0611
41
41
 
42
42
  KEY_NODE = "node"
43
43
  KEY_TASK_INS = "current_task_ins"
@@ -32,8 +32,17 @@ from flwr.client.run_state import RunState
32
32
  from flwr.client.secure_aggregation import SecureAggregationHandler
33
33
  from flwr.client.typing import ClientFn
34
34
  from flwr.common import serde
35
- from flwr.proto.task_pb2 import SecureAggregation, Task, TaskIns, TaskRes
36
- from flwr.proto.transport_pb2 import ClientMessage, Reason, ServerMessage
35
+ from flwr.proto.task_pb2 import ( # pylint: disable=E0611
36
+ SecureAggregation,
37
+ Task,
38
+ TaskIns,
39
+ TaskRes,
40
+ )
41
+ from flwr.proto.transport_pb2 import ( # pylint: disable=E0611
42
+ ClientMessage,
43
+ Reason,
44
+ ServerMessage,
45
+ )
37
46
 
38
47
 
39
48
  class UnexpectedServerMessage(Exception):
@@ -17,10 +17,13 @@
17
17
 
18
18
  from typing import Optional
19
19
 
20
- from flwr.proto.fleet_pb2 import PullTaskInsResponse
21
- from flwr.proto.node_pb2 import Node
22
- from flwr.proto.task_pb2 import Task, TaskIns, TaskRes
23
- from flwr.proto.transport_pb2 import ClientMessage, ServerMessage
20
+ from flwr.proto.fleet_pb2 import PullTaskInsResponse # pylint: disable=E0611
21
+ from flwr.proto.node_pb2 import Node # pylint: disable=E0611
22
+ from flwr.proto.task_pb2 import Task, TaskIns, TaskRes # pylint: disable=E0611
23
+ from flwr.proto.transport_pb2 import ( # pylint: disable=E0611
24
+ ClientMessage,
25
+ ServerMessage,
26
+ )
24
27
 
25
28
 
26
29
  def validate_task_ins(task_ins: TaskIns, discard_reconnect_ins: bool) -> bool:
@@ -17,7 +17,7 @@
17
17
 
18
18
  from flwr.client.node_state import NodeState
19
19
  from flwr.client.run_state import RunState
20
- from flwr.proto.task_pb2 import TaskIns
20
+ from flwr.proto.task_pb2 import TaskIns # pylint: disable=E0611
21
21
 
22
22
 
23
23
  def _run_dummy_task(state: RunState) -> RunState:
@@ -29,7 +29,7 @@ from flwr.client.message_handler.task_handler import (
29
29
  from flwr.common import GRPC_MAX_MESSAGE_LENGTH
30
30
  from flwr.common.constant import MISSING_EXTRA_REST
31
31
  from flwr.common.logger import log
32
- from flwr.proto.fleet_pb2 import (
32
+ from flwr.proto.fleet_pb2 import ( # pylint: disable=E0611
33
33
  CreateNodeRequest,
34
34
  CreateNodeResponse,
35
35
  DeleteNodeRequest,
@@ -38,8 +38,8 @@ from flwr.proto.fleet_pb2 import (
38
38
  PushTaskResRequest,
39
39
  PushTaskResResponse,
40
40
  )
41
- from flwr.proto.node_pb2 import Node
42
- from flwr.proto.task_pb2 import TaskIns, TaskRes
41
+ from flwr.proto.node_pb2 import Node # pylint: disable=E0611
42
+ from flwr.proto.task_pb2 import TaskIns, TaskRes # pylint: disable=E0611
43
43
 
44
44
  try:
45
45
  import requests
@@ -18,7 +18,7 @@ from dataclasses import dataclass
18
18
  from typing import Callable
19
19
 
20
20
  from flwr.client.run_state import RunState
21
- from flwr.proto.task_pb2 import TaskIns, TaskRes
21
+ from flwr.proto.task_pb2 import TaskIns, TaskRes # pylint: disable=E0611
22
22
 
23
23
  from .client import Client as Client
24
24
 
@@ -0,0 +1,107 @@
1
+ # Copyright 2024 Flower Labs GmbH. All Rights Reserved.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+ # ==============================================================================
15
+ """ConfigsRecord."""
16
+
17
+
18
+ from dataclasses import dataclass, field
19
+ from typing import Dict, Optional, get_args
20
+
21
+ from .typing import ConfigsRecordValues, ConfigsScalar
22
+
23
+
24
+ @dataclass
25
+ class ConfigsRecord:
26
+ """Configs record."""
27
+
28
+ data: Dict[str, ConfigsRecordValues] = field(default_factory=dict)
29
+
30
+ def __init__(
31
+ self,
32
+ configs_dict: Optional[Dict[str, ConfigsRecordValues]] = None,
33
+ keep_input: bool = True,
34
+ ):
35
+ """Construct a ConfigsRecord object.
36
+
37
+ Parameters
38
+ ----------
39
+ configs_dict : Optional[Dict[str, ConfigsRecordValues]]
40
+ A dictionary that stores basic types (i.e. `str`, `int`, `float`, `bytes` as
41
+ defined in `ConfigsScalar`) and lists of such types (see
42
+ `ConfigsScalarList`).
43
+ keep_input : bool (default: True)
44
+ A boolean indicating whether config passed should be deleted from the input
45
+ dictionary immediately after adding them to the record. When set
46
+ to True, the data is duplicated in memory. If memory is a concern, set
47
+ it to False.
48
+ """
49
+ self.data = {}
50
+ if configs_dict:
51
+ self.set_configs(configs_dict, keep_input=keep_input)
52
+
53
+ def set_configs(
54
+ self, configs_dict: Dict[str, ConfigsRecordValues], keep_input: bool = True
55
+ ) -> None:
56
+ """Add configs to the record.
57
+
58
+ Parameters
59
+ ----------
60
+ configs_dict : Dict[str, ConfigsRecordValues]
61
+ A dictionary that stores basic types (i.e. `str`,`int`, `float`, `bytes` as
62
+ defined in `ConfigsRecordValues`) and list of such types (see
63
+ `ConfigsScalarList`).
64
+ keep_input : bool (default: True)
65
+ A boolean indicating whether config passed should be deleted from the input
66
+ dictionary immediately after adding them to the record. When set
67
+ to True, the data is duplicated in memory. If memory is a concern, set
68
+ it to False.
69
+ """
70
+ if any(not isinstance(k, str) for k in configs_dict.keys()):
71
+ raise TypeError(f"Not all keys are of valid type. Expected {str}")
72
+
73
+ def is_valid(value: ConfigsScalar) -> None:
74
+ """Check if value is of expected type."""
75
+ if not isinstance(value, get_args(ConfigsScalar)):
76
+ raise TypeError(
77
+ "Not all values are of valid type."
78
+ f" Expected {ConfigsRecordValues} but you passed {type(value)}."
79
+ )
80
+
81
+ # Check types of values
82
+ # Split between those values that are list and those that aren't
83
+ # then process in the same way
84
+ for value in configs_dict.values():
85
+ if isinstance(value, list):
86
+ # If your lists are large (e.g. 1M+ elements) this will be slow
87
+ # 1s to check 10M element list on a M2 Pro
88
+ # In such settings, you'd be better of treating such config as
89
+ # an array and pass it to a ParametersRecord.
90
+ for list_value in value:
91
+ is_valid(list_value)
92
+ else:
93
+ is_valid(value)
94
+
95
+ # Add configs to record
96
+ if keep_input:
97
+ # Copy
98
+ self.data = configs_dict.copy()
99
+ else:
100
+ # Add entries to dataclass without duplicating memory
101
+ for key in list(configs_dict.keys()):
102
+ self.data[key] = configs_dict[key]
103
+ del configs_dict[key]
104
+
105
+ def __getitem__(self, key: str) -> ConfigsRecordValues:
106
+ """Retrieve an element stored in record."""
107
+ return self.data[key]
@@ -0,0 +1,77 @@
1
+ # Copyright 2024 Flower Labs GmbH. All Rights Reserved.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+ # ==============================================================================
15
+ """FlowerContext and Metadata."""
16
+
17
+
18
+ from dataclasses import dataclass
19
+
20
+ from .recordset import RecordSet
21
+
22
+
23
+ @dataclass
24
+ class Metadata:
25
+ """A dataclass holding metadata associated with the current task.
26
+
27
+ Parameters
28
+ ----------
29
+ run_id : int
30
+ An identifier for the current run.
31
+ task_id : str
32
+ An identifier for the current task.
33
+ group_id : str
34
+ An identifier for grouping tasks. In some settings
35
+ this is used as the FL round.
36
+ ttl : str
37
+ Time-to-live for this task.
38
+ task_type : str
39
+ A string that encodes the action to be executed on
40
+ the receiving end.
41
+ """
42
+
43
+ run_id: int
44
+ task_id: str
45
+ group_id: str
46
+ ttl: str
47
+ task_type: str
48
+
49
+
50
+ @dataclass
51
+ class FlowerContext:
52
+ """State of your application from the viewpoint of the entity using it.
53
+
54
+ Parameters
55
+ ----------
56
+ in_message : RecordSet
57
+ Holds records sent by another entity (e.g. sent by the server-side
58
+ logic to a client, or vice-versa)
59
+ out_message : RecordSet
60
+ Holds records added by the current entity. This `RecordSet` will
61
+ be sent out (e.g. back to the server-side for aggregation of
62
+ parameter, or to the client to perform a certain task)
63
+ local : RecordSet
64
+ Holds record added by the current entity and that will stay local.
65
+ This means that the data it holds will never leave the system it's running from.
66
+ This can be used as an intermediate storage or scratchpad when
67
+ executing middleware layers. It can also be used as a memory to access
68
+ at different points during the lifecycle of this entity (e.g. across
69
+ multiple rounds)
70
+ metadata : Metadata
71
+ A dataclass including information about the task to be executed.
72
+ """
73
+
74
+ in_message: RecordSet
75
+ out_message: RecordSet
76
+ local: RecordSet
77
+ metadata: Metadata
@@ -111,3 +111,17 @@ def warn_experimental_feature(name: str) -> None:
111
111
  """,
112
112
  name,
113
113
  )
114
+
115
+
116
+ def warn_deprecated_feature(name: str) -> None:
117
+ """Warn the user when they use a deprecated feature."""
118
+ log(
119
+ WARN,
120
+ """
121
+ DEPRECATED FEATURE: %s
122
+
123
+ This is a deprecated feature. It will be removed
124
+ entirely in future versions of Flower.
125
+ """,
126
+ name,
127
+ )
@@ -0,0 +1,107 @@
1
+ # Copyright 2024 Flower Labs GmbH. All Rights Reserved.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+ # ==============================================================================
15
+ """MetricsRecord."""
16
+
17
+
18
+ from dataclasses import dataclass, field
19
+ from typing import Dict, Optional, get_args
20
+
21
+ from .typing import MetricsRecordValues, MetricsScalar
22
+
23
+
24
+ @dataclass
25
+ class MetricsRecord:
26
+ """Metrics record."""
27
+
28
+ data: Dict[str, MetricsRecordValues] = field(default_factory=dict)
29
+
30
+ def __init__(
31
+ self,
32
+ metrics_dict: Optional[Dict[str, MetricsRecordValues]] = None,
33
+ keep_input: bool = True,
34
+ ):
35
+ """Construct a MetricsRecord object.
36
+
37
+ Parameters
38
+ ----------
39
+ metrics_dict : Optional[Dict[str, MetricsRecordValues]]
40
+ A dictionary that stores basic types (i.e. `int`, `float` as defined
41
+ in `MetricsScalar`) and list of such types (see `MetricsScalarList`).
42
+ keep_input : bool (default: True)
43
+ A boolean indicating whether metrics should be deleted from the input
44
+ dictionary immediately after adding them to the record. When set
45
+ to True, the data is duplicated in memory. If memory is a concern, set
46
+ it to False.
47
+ """
48
+ self.data = {}
49
+ if metrics_dict:
50
+ self.set_metrics(metrics_dict, keep_input=keep_input)
51
+
52
+ def set_metrics(
53
+ self, metrics_dict: Dict[str, MetricsRecordValues], keep_input: bool = True
54
+ ) -> None:
55
+ """Add metrics to the record.
56
+
57
+ Parameters
58
+ ----------
59
+ metrics_dict : Dict[str, MetricsRecordValues]
60
+ A dictionary that stores basic types (i.e. `int`, `float` as defined
61
+ in `MetricsScalar`) and list of such types (see `MetricsScalarList`).
62
+ keep_input : bool (default: True)
63
+ A boolean indicating whether metrics should be deleted from the input
64
+ dictionary immediately after adding them to the record. When set
65
+ to True, the data is duplicated in memory. If memory is a concern, set
66
+ it to False.
67
+ """
68
+ if any(not isinstance(k, str) for k in metrics_dict.keys()):
69
+ raise TypeError(f"Not all keys are of valid type. Expected {str}.")
70
+
71
+ def is_valid(value: MetricsScalar) -> None:
72
+ """Check if value is of expected type."""
73
+ if not isinstance(value, get_args(MetricsScalar)) or isinstance(
74
+ value, bool
75
+ ):
76
+ raise TypeError(
77
+ "Not all values are of valid type."
78
+ f" Expected {MetricsRecordValues} but you passed {type(value)}."
79
+ )
80
+
81
+ # Check types of values
82
+ # Split between those values that are list and those that aren't
83
+ # then process in the same way
84
+ for value in metrics_dict.values():
85
+ if isinstance(value, list):
86
+ # If your lists are large (e.g. 1M+ elements) this will be slow
87
+ # 1s to check 10M element list on a M2 Pro
88
+ # In such settings, you'd be better of treating such metric as
89
+ # an array and pass it to a ParametersRecord.
90
+ for list_value in value:
91
+ is_valid(list_value)
92
+ else:
93
+ is_valid(value)
94
+
95
+ # Add metrics to record
96
+ if keep_input:
97
+ # Copy
98
+ self.data = metrics_dict.copy()
99
+ else:
100
+ # Add entries to dataclass without duplicating memory
101
+ for key in list(metrics_dict.keys()):
102
+ self.data[key] = metrics_dict[key]
103
+ del metrics_dict[key]
104
+
105
+ def __getitem__(self, key: str) -> MetricsRecordValues:
106
+ """Retrieve an element stored in record."""
107
+ return self.data[key]
@@ -59,7 +59,6 @@ class ParametersRecord:
59
59
  PyTorch's state_dict, but holding serialised tensors instead.
60
60
  """
61
61
 
62
- keep_input: bool
63
62
  data: OrderedDict[str, Array] = field(default_factory=OrderedDict[str, Array])
64
63
 
65
64
  def __init__(
@@ -82,25 +81,29 @@ class ParametersRecord:
82
81
  parameters after adding it to the record, set this flag to True. When set
83
82
  to True, the data is duplicated in memory.
84
83
  """
85
- self.keep_input = keep_input
86
84
  self.data = OrderedDict()
87
85
  if array_dict:
88
- self.set_parameters(array_dict)
86
+ self.set_parameters(array_dict, keep_input=keep_input)
89
87
 
90
- def set_parameters(self, array_dict: OrderedDict[str, Array]) -> None:
88
+ def set_parameters(
89
+ self, array_dict: OrderedDict[str, Array], keep_input: bool = False
90
+ ) -> None:
91
91
  """Add parameters to record.
92
92
 
93
93
  Parameters
94
94
  ----------
95
95
  array_dict : OrderedDict[str, Array]
96
96
  A dictionary that stores serialized array-like or tensor-like objects.
97
+ keep_input : bool (default: False)
98
+ A boolean indicating whether parameters should be deleted from the input
99
+ dictionary immediately after adding them to the record.
97
100
  """
98
101
  if any(not isinstance(k, str) for k in array_dict.keys()):
99
102
  raise TypeError(f"Not all keys are of valid type. Expected {str}")
100
103
  if any(not isinstance(v, Array) for v in array_dict.values()):
101
104
  raise TypeError(f"Not all values are of valid type. Expected {Array}")
102
105
 
103
- if self.keep_input:
106
+ if keep_input:
104
107
  # Copy
105
108
  self.data = OrderedDict(array_dict)
106
109
  else:
@@ -108,3 +111,7 @@ class ParametersRecord:
108
111
  for key in list(array_dict.keys()):
109
112
  self.data[key] = array_dict[key]
110
113
  del array_dict[key]
114
+
115
+ def __getitem__(self, key: str) -> Array:
116
+ """Retrieve an element stored in record."""
117
+ return self.data[key]
@@ -14,22 +14,15 @@
14
14
  # ==============================================================================
15
15
  """RecordSet."""
16
16
 
17
+
17
18
  from dataclasses import dataclass, field
18
19
  from typing import Dict
19
20
 
21
+ from .configsrecord import ConfigsRecord
22
+ from .metricsrecord import MetricsRecord
20
23
  from .parametersrecord import ParametersRecord
21
24
 
22
25
 
23
- @dataclass
24
- class MetricsRecord:
25
- """Metrics record."""
26
-
27
-
28
- @dataclass
29
- class ConfigsRecord:
30
- """Configs record."""
31
-
32
-
33
26
  @dataclass
34
27
  class RecordSet:
35
28
  """Definition of RecordSet."""
@@ -17,8 +17,8 @@
17
17
 
18
18
  from typing import Any, Dict, List, MutableMapping, cast
19
19
 
20
- from flwr.proto.task_pb2 import Value
21
- from flwr.proto.transport_pb2 import (
20
+ from flwr.proto.task_pb2 import Value # pylint: disable=E0611
21
+ from flwr.proto.transport_pb2 import ( # pylint: disable=E0611
22
22
  ClientMessage,
23
23
  Code,
24
24
  Parameters,
@@ -45,6 +45,15 @@ Value = Union[
45
45
  List[str],
46
46
  ]
47
47
 
48
+ # Value types for common.MetricsRecord
49
+ MetricsScalar = Union[int, float]
50
+ MetricsScalarList = Union[List[int], List[float]]
51
+ MetricsRecordValues = Union[MetricsScalar, MetricsScalarList]
52
+ # Value types for common.ConfigsRecord
53
+ ConfigsScalar = Union[MetricsScalar, str, bytes, bool]
54
+ ConfigsScalarList = Union[MetricsScalarList, List[str], List[bytes], List[bool]]
55
+ ConfigsRecordValues = Union[ConfigsScalar, ConfigsScalarList]
56
+
48
57
  Metrics = Dict[str, Scalar]
49
58
  MetricsAggregationFn = Callable[[List[Tuple[int, Metrics]]], Metrics]
50
59
 
@@ -25,7 +25,7 @@ from typing import Dict, Optional, Union
25
25
  from flwr.common import EventType, event
26
26
  from flwr.common.address import parse_address
27
27
  from flwr.common.logger import log
28
- from flwr.proto import driver_pb2
28
+ from flwr.proto import driver_pb2 # pylint: disable=E0611
29
29
  from flwr.server.app import ServerConfig, init_defaults, run_fl
30
30
  from flwr.server.client_manager import ClientManager
31
31
  from flwr.server.history import History
@@ -171,7 +171,9 @@ def update_client_manager(
171
171
  `client_manager.unregister()`.
172
172
  """
173
173
  # Request for run_id
174
- run_id = driver.create_run(driver_pb2.CreateRunRequest()).run_id
174
+ run_id = driver.create_run(
175
+ driver_pb2.CreateRunRequest() # pylint: disable=E1101
176
+ ).run_id
175
177
 
176
178
  # Loop until the driver is disconnected
177
179
  registered_nodes: Dict[int, DriverClientProxy] = {}
@@ -181,7 +183,7 @@ def update_client_manager(
181
183
  if driver.stub is None:
182
184
  break
183
185
  get_nodes_res = driver.get_nodes(
184
- req=driver_pb2.GetNodesRequest(run_id=run_id)
186
+ req=driver_pb2.GetNodesRequest(run_id=run_id) # pylint: disable=E1101
185
187
  )
186
188
  all_node_ids = {node.node_id for node in get_nodes_res.nodes}
187
189
  dead_nodes = set(registered_nodes).difference(all_node_ids)
@@ -18,14 +18,14 @@
18
18
  from typing import Iterable, List, Optional, Tuple
19
19
 
20
20
  from flwr.driver.grpc_driver import DEFAULT_SERVER_ADDRESS_DRIVER, GrpcDriver
21
- from flwr.proto.driver_pb2 import (
21
+ from flwr.proto.driver_pb2 import ( # pylint: disable=E0611
22
22
  CreateRunRequest,
23
23
  GetNodesRequest,
24
24
  PullTaskResRequest,
25
25
  PushTaskInsRequest,
26
26
  )
27
- from flwr.proto.node_pb2 import Node
28
- from flwr.proto.task_pb2 import TaskIns, TaskRes
27
+ from flwr.proto.node_pb2 import Node # pylint: disable=E0611
28
+ from flwr.proto.task_pb2 import TaskIns, TaskRes # pylint: disable=E0611
29
29
 
30
30
 
31
31
  class Driver: