Merge branch 'develop' into tensorflow

securefederatedai · Feb 6, 2025 · c72efff · c72efff
2 parents d81e8f3 + 1fc8229
commit c72efff
Show file tree

Hide file tree

Showing 48 changed files with 511 additions and 2,140 deletions.
diff --git a/.github/workflows/task_runner_fedeval_e2e.yml b/.github/workflows/task_runner_fedeval_e2e.yml
@@ -39,7 +39,7 @@ jobs:
       matrix:
         # Models like XGBoost (xgb_higgs) and torch/histology require runners with higher memory and CPU to run.
         # Thus these models are excluded from the matrix for now.
-        model_name: ["torch.mnist", "keras/mnist"]
+        model_name: ["torch/mnist", "keras/mnist"]
         python_version: ["3.10"]
       fail-fast: false # do not immediately fail if one of the combinations fail
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -32,5 +32,5 @@ repos:
     rev: 1.7.4
     hooks:
       - id: bandit
-        args: ["-c", "pre_commit.toml"]
+        args: ["-c", "pyproject.toml"]
         additional_dependencies: ["bandit[toml]"]
diff --git a/README.md b/README.md
@@ -71,9 +71,6 @@ OpenFL supports popular aggregation algorithms out-of-the-box, with more algorit
 | FedProx | [Li et al., 2020](https://arxiv.org/pdf/1812.06127.pdf) | yes | yes | - |
 | FedCurv | [Shoham et al., 2019](https://arxiv.org/pdf/1910.07796.pdf) | yes | - | - |
 
-### Enabling Bandit Precommit
-To ensure that precommit is setup in your local for Bandit Scan. For more details, kindly follow this doc: [Setup Guide - Precommit](precommit-doc.md)
-
 ## Contributing
 We welcome contributions! Please refer to the [contributing guidelines](https://openfl.readthedocs.io/en/latest/contributing.html).
 

diff --git a/docs/_templates/custom-exception-template.rst b/docs/_templates/custom-exception-template.rst
@@ -2,7 +2,7 @@
 {% if truncated_fullname | length < 4 %}
    {% set truncated_fullname = truncated_fullname.ljust(4) %}
 {% endif %}
-Exceptions - {{ truncated_fullname | escape | underline}}
+Exception - {{ truncated_fullname | escape | underline}}
 
 
 .. currentmodule:: {{ module }}

diff --git a/...kspace/experimental/workflow/AggregatorBasedWorkflow/workspace/plan/defaults/network.yaml b/...kspace/experimental/workflow/AggregatorBasedWorkflow/workspace/plan/defaults/network.yaml
@@ -2,8 +2,6 @@ template: openfl.federation.Network
 settings:
     agg_addr                   : auto
     agg_port                   : auto
-    hash_salt                  : auto
     tls                        : True
     client_reconnect_interval  : 5
     disable_client_auth        : False
-    cert_folder                : cert
diff --git a/openfl-workspace/keras/nlp/.workspace b/openfl-workspace/keras/nlp/.workspace
diff --git a/openfl-workspace/keras/nlp/plan/cols.yaml b/openfl-workspace/keras/nlp/plan/cols.yaml
diff --git a/openfl-workspace/keras/nlp/plan/data.yaml b/openfl-workspace/keras/nlp/plan/data.yaml
diff --git a/openfl-workspace/keras/nlp/plan/plan.yaml b/openfl-workspace/keras/nlp/plan/plan.yaml
diff --git a/openfl-workspace/keras/nlp/requirements.txt b/openfl-workspace/keras/nlp/requirements.txt
diff --git a/openfl-workspace/keras/nlp/src/__init__.py b/openfl-workspace/keras/nlp/src/__init__.py
diff --git a/openfl-workspace/keras/nlp/src/dataloader.py b/openfl-workspace/keras/nlp/src/dataloader.py