Feature/SK-1164 | grpc allow version up to <v1.67 (#732)

.ci/tests/examples/print_logs.sh

@@ -1,19 +1,38 @@
 #!/bin/bash
-echo "Minio logs"
-docker logs "$(basename $PWD)-minio-1"
+service = $1
+example = $2
+helper = $3
 
-echo "Mongo logs"
-docker logs "$(basename $PWD)-mongo-1"
+if [ "$service" == "minio" ]; then
+    echo "Minio logs"
+    docker logs "$(basename $PWD)-minio-1"
+    exit 0
+fi
+
+if [ "$service" == "mongo" ]; then
+    echo "Mongo logs"
+    docker logs "$(basename $PWD)-mongo-1"
+    exit 0
+fi
 
-echo "API-Server logs"
-docker logs "$(basename $PWD)-api-server-1"
+if [ "$service" == "api-server" ]; then
+    echo "API-Server logs"
+    docker logs "$(basename $PWD)-api-server-1"
+    exit 0
+fi
+
+if [ "$service" == "combiner" ]; then
+    echo "Reducer logs"
+    docker logs "$(basename $PWD)-combiner-1"
+    exit 0
+fi
 
-echo "Combiner logs"
-docker logs "$(basename $PWD)-combiner-1"
-          
-echo "Client 1 logs"
-if [ "$example" == "mnist-keras" ]; then
-    docker logs "$(basename $PWD)-client-1"
-else
-    docker logs "$(basename $PWD)-client1-1"
+if [ "$service" == "client" ]; then
+    echo "Client 0 logs"
+    if [ "$example" == "mnist-keras" ]; then
+        docker logs "$(basename $PWD)-client-0"
+    else
+        docker logs "$(basename $PWD)-client0-1"
+    fi
+    exit 0
 fi

.github/workflows/code-checks.yaml

@@ -26,6 +26,7 @@ jobs:
           --exclude-dir='flower-client'
           --exclude='tests.py'
           --exclude='controller_cmd.py'
+          --exclude='fedn_pb2_grpc.py'
           --exclude='combiner_cmd.py'
           --exclude='run_cmd.py'
           --exclude='README.rst'

.github/workflows/integration-tests.yaml

@@ -42,6 +42,22 @@ jobs:
       #   run: .ci/tests/examples/run_prediction.sh ${{ matrix.to_test }}
       #   if: ${{ matrix.os != 'macos-11' && matrix.to_test == 'mnist-keras keras' }} # example available for Keras
 
-      - name: print logs
+      - name: print logs api-server
         if: failure()
-        run: .ci/tests/examples/print_logs.sh
+        run: .ci/tests/examples/print_logs.sh api-server ${{ matrix.to_test }}
+
+      - name: print logs combiner
+        if: failure()
+        run: .ci/tests/examples/print_logs.sh combiner ${{ matrix.to_test }}
+
+      - name: print logs client
+        if: failure()
+        run: .ci/tests/examples/print_logs.sh client ${{ matrix.to_test }}
+
+      - name: print logs mongo
+        if: failure()
+        run: .ci/tests/examples/print_logs.sh mongo ${{ matrix.to_test }}
+
+      - name: print logs minio
+        if: failure()
+        run: .ci/tests/examples/print_logs.sh minio ${{ matrix.to_test }}

docs/conf.py

@@ -11,7 +11,7 @@
 author = "Scaleout Systems AB"
 
 # The full version, including alpha/beta/rc tags
-release = "0.18.0"
+release = "0.19.0"
 
 # Add any Sphinx extension module names here, as strings
 extensions = [

fedn/network/combiner/combiner.py

@@ -425,7 +425,7 @@ def _send_status(self, status):
         :param status: the status message to report
         :type status: :class:`fedn.network.grpc.fedn_pb2.Status`
         """
-        data = MessageToDict(status, including_default_value_fields=True)
+        data = MessageToDict(status)
         _ = status_store.add(data)
 
     def _flush_model_update_queue(self):
@@ -750,7 +750,7 @@ def register_model_validation(self, validation):
         :param validation: the model validation
         :type validation: :class:`fedn.network.grpc.fedn_pb2.ModelValidation`
         """
-        data = MessageToDict(validation, including_default_value_fields=True)
+        data = MessageToDict(validation)
         success, result = validation_store.add(data)
         if not success:
             logger.error(result)
@@ -769,7 +769,7 @@ def SendModelValidation(self, request, context):
         """
         logger.info("Recieved ModelValidation from {}".format(request.sender.name))
 
-        validation = MessageToDict(request, including_default_value_fields=True)
+        validation = MessageToDict(request)
         validation_store.add(validation)
 
         response = fedn.Response()
@@ -788,7 +788,7 @@ def SendModelPrediction(self, request, context):
         """
         logger.info("Recieved ModelPrediction from {}".format(request.sender.name))
 
-        result = MessageToDict(request, including_default_value_fields=True)
+        result = MessageToDict(request)
         prediction_store.add(result)
 
         response = fedn.Response()