resolved conflicts

scaleoutsystems · Jan 29, 2024 · fa9f0a0 · fa9f0a0
2 parents 2ae055d + 2b95237
commit fa9f0a0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -34,7 +34,7 @@ services:
       - 9001:9001
 
   mongo:
-    image: mongo
+    image: mongo:7.0
     restart: always
     environment:
       - MONGO_INITDB_ROOT_USERNAME=fedn_admin

diff --git a/fedn/fedn/network/api/client.py b/fedn/fedn/network/api/client.py
@@ -120,7 +120,7 @@ def get_round(self, round_id):
         return response.json()
 
     def start_session(self, session_id=None, aggregator='fedavg', model_id=None, round_timeout=180, rounds=5, round_buffer_size=-1, delete_models=True,
-                      validate=True, helper='numpyhelper', min_clients=1, requested_clients=1):
+                      validate=True, helper='numpyhelper', min_clients=1, requested_clients=8):
         """ Start a new session.
 
         :param session_id: The session id to start.

diff --git a/fedn/fedn/network/api/interface.py b/fedn/fedn/network/api/interface.py
@@ -1011,7 +1011,7 @@ def start_session(
         round_buffer_size=-1,
         delete_models=False,
         validate=True,
-        helper="keras",
+        helper="numpyhelper",
         min_clients=1,
         requested_clients=8,
     ):

diff --git a/fedn/fedn/network/combiner/roundhandler.py b/fedn/fedn/network/combiner/roundhandler.py
@@ -336,10 +336,7 @@ def execute_training_round(self, config):
         if model is not None:
             helper = get_helper(config['helper_type'])
             a = serialize_model_to_BytesIO(model, helper)
-            # a.seek(0)
-            #model_id = str(uuid.uuid4())
             model_id = self.storage.set_model(a.read(), is_file=False)
-            #self.modelservice.set_model(a, model_id)
             a.close()
             data['model_id'] = model_id