kp-forks · pull · May 8, 2025 · May 8, 2025 · May 9, 2025 · May 9, 2025
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -31,7 +31,11 @@ RUN apt-get install -y curl wget gnupg python3 python-is-python3 python3-pip git
 RUN python -m pip install \
     pip==24.1.2 \
     setuptools==70.3.0 \
-    poetry==2.1.3
+    poetry==2.1.3 \
+    maturin==1.8.6
+# Install taplo from the main branch on GitHub so that maturin can build the wheel
+RUN python -m pip install \
+    "git+https://github.com/tamasfe/taplo.git@1bb2c1881995a819d2bda7681d145709c783be1b#egg=taplo"
 
 USER $USERNAME
 ENV PATH="/home/$USERNAME/.local/bin:${PATH}"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,14 +1,17 @@
 {
   "dockerFile": "Dockerfile",
-  "postCreateCommand": "sudo poetry install --extras \"simulation\"",
+  "postCreateCommand": ".devcontainer/post-create.sh",
   "customizations": {
     "vscode": {
       "settings": {
-        "files.watcherExclude": { },
-        "search.exclude": { },
+        "files.watcherExclude": {},
+        "search.exclude": {},
         "terminal.integrated.defaultProfile.linux": "bash"
       },
-      "extensions": [ "ms-python.python" ]
+      "extensions": [
+        "ms-python.python",
+        "tamasfe.even-better-toml"
+      ]
     }
   },
      "remoteUser": "flwr-vscode",

diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -euo pipefail
+
+cd framework
+
+files=(
+  "pyproject.toml"
+  "devtool/pyproject.toml"
+)
+
+comment_taplo() {
+  sed -i "s/^\(\s*taplo\s*=.*\)$/#\1/" "$1"
+}
+
+uncomment_taplo() {
+  sed -i "s/^#\(\s*taplo\s*=.*\)/\1/" "$1"
+}
+
+# Comment out taplo from pyproject.toml and devtool/pyproject.toml.
+# This prevents version conflicts with taplo built from maturin and
+# is only required for devcontainer builds.
+for f in "${files[@]}"; do
+  comment_taplo "$f"
+done
+
+sudo poetry install --with dev --extras "simulation"
+
+# Restore taplo lines in "files"
+for f in "${files[@]}"; do
+  uncomment_taplo "$f"
+done
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -19,6 +19,7 @@ README.md @jafermarq @tanertopal @danieljanes
 /examples @chongshenng @jafermarq @tanertopal @danieljanes
 
 # Flower Intelligence
+/intelligence/dev @charlesbvll @tanertopal @danieljanes
 /intelligence/docs @charlesbvll @tanertopal @danieljanes
 /intelligence/ts @charlesbvll @tanertopal @danieljanes
 

diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml
@@ -9,7 +9,7 @@ inputs:
     default: 24.1.2
   setuptools-version:
     description: "Version of setuptools to be installed using pip"
-    default: 70.3.0
+    default: 78.1.1
   poetry-version:
     description: "Version of poetry to be installed using pip"
     default: 2.1.3

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -76,3 +76,8 @@ updates:
     schedule:
       # Check for updates to GitHub Actions every week
       interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/framework/docker/base"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/baselines.yml b/.github/workflows/baselines.yml
@@ -78,7 +78,7 @@ jobs:
 
       - name: Install dependencies
         working-directory: baselines/${{ matrix.baseline }}
-        run: python -m poetry install
+        run: pip install ."[dev]"
 
       - name: Testing ${{ matrix.baseline }}
         working-directory: baselines

diff --git a/.github/workflows/framework-e2e.yml b/.github/workflows/framework-e2e.yml
@@ -162,8 +162,7 @@ jobs:
           - directory: e2e-tensorflow
             e2e: e2e_tensorflow
             dataset: |
-              import tensorflow as tf
-              tf.keras.datasets.cifar10.load_data()
+              from datasets import load_dataset;import numpy as np;dataset = load_dataset(\"uoft-cs/cifar10\");np.stack(dataset[\"train\"][\"img\"])
 
           - directory: e2e-opacus
             e2e: e2e_opacus
@@ -250,9 +249,9 @@ jobs:
       - name: Run driver test with client authentication
         if: ${{ needs.changes.outputs.framework == 'true' && matrix.directory == 'e2e-bare-auth' }}
         run: ./../test_superlink.sh "${{ matrix.directory }}" client-auth
-      - name: Run reconnection test with SQLite database
-        if: ${{ needs.changes.outputs.framework == 'true' && matrix.directory == 'e2e-bare' }}
-        run: ./../test_reconnection.sh sqlite
+      # - name: Run reconnection test with SQLite database (Temporarily disabled due to in-memory ObjectStore)
+      #   if: ${{ needs.changes.outputs.framework == 'true' && matrix.directory == 'e2e-bare' }}
+      #   run: ./../test_reconnection.sh sqlite
       - name: Cache save Python location
         id: cache-save-python
         uses: actions/cache/save@v4
@@ -470,3 +469,39 @@ jobs:
         working-directory: ./framework/e2e
         run: ./test_windows.sh
         shell: bash
+
+  serverapp-heartbeat-test:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 10
+    needs: [changes, wheel]
+    strategy:
+      matrix:
+        engine: [deployment, simulation]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+
+    if: ${{ needs.changes.outputs.framework == 'true' }}
+
+    name: |
+      ServerApp/run heartbeat test with ${{ matrix.engine }} runtime /
+      Python ${{ matrix.python-version }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install build tools
+        run: python -m pip install -U pip==23.3.1
+      - name: Overwrite ping interval and patience
+        run: |
+          sed -i 's/\(HEARTBEAT_DEFAULT_INTERVAL *= *\).*/\16/' framework/py/flwr/common/constant.py
+          sed -i 's/\(HEARTBEAT_PATIENCE *= *\).*/\11/' framework/py/flwr/common/constant.py
+      - name: Install dependencies
+        run: |
+          cd framework
+          python -m pip install --upgrade .[simulation]
+      - name: Run test
+        working-directory: ./framework/e2e/e2e-serverapp-heartbeat
+        run: python ../test_serverapp_heartbeat.py ${{ matrix.engine }}
+        shell: bash
diff --git a/.github/workflows/intelligence-docs.yml b/.github/workflows/intelligence-docs.yml
@@ -99,9 +99,34 @@ jobs:
           name: swift-docs
           path: intelligence/docs/source/swift-api-ref/
 
+  build_kt_docs:
+    runs-on: ubuntu-22.04
+    name: Build Kotlin Docs
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Bootstrap
+        uses: ./.github/actions/bootstrap
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Build Kotlin docs
+        run: |
+          ./intelligence/dev/build-kt-docs.sh
+
+      - name: Upload Kotlin docs artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: kt-docs
+          path: intelligence/docs/source/kt-api-ref/
+
   build_and_deploy:
     runs-on: ubuntu-22.04
-    needs: [build_ts_docs, build_swift_docs]
+    needs: [build_ts_docs, build_swift_docs, build_kt_docs]
     name: Deploy Docs
     steps:
       - uses: actions/checkout@v4
@@ -129,6 +154,12 @@ jobs:
         with:
           name: swift-docs
           path: intelligence/docs/source/swift-api-ref/
+      - name: Download Kotlin docs
+        if: ${{ github.ref == 'refs/heads/main' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
+        uses: actions/download-artifact@v4
+        with:
+          name: kt-docs
+          path: intelligence/docs/source/kt-api-ref/
       - name: Build final docs
         if: ${{ github.ref == 'refs/heads/main' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
         run: |

diff --git a/.github/workflows/intelligence-release.yml b/.github/workflows/intelligence-release.yml
@@ -1,4 +1,4 @@
-name: Publish `@flwr/flwr` release on NPM
+name: Publish `@flwr/flwr` (NPM) and `ai.flower:flwr` (Maven)
 
 on:
   push:
@@ -10,9 +10,26 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  publish:
+  check-version:
+    name: Check version consistency
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '22.14.0'
+          registry-url: https://registry.npmjs.org
+
+      - name: Run version consistency check
+        run: ./intelligence/dev/check-version-consistency.sh
+
+  publish-typescript:
+    needs: check-version
     if: ${{ github.repository == 'adap/flower' }}
-    name: Publish release
+    name: Publish Flower Intelligence TypeScript SDK to NPM
     runs-on: ubuntu-22.04
     timeout-minutes: 10
     steps:
@@ -41,3 +58,30 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: pnpm publish . --access public --no-git-checks
+
+  publish-kotlin:
+    needs: check-version
+    if: ${{ github.repository == 'adap/flower' }}
+    name: Publish Flower Intelligence Kotlin SDK to Maven Central
+    runs-on: ubuntu-22.04
+    timeout-minutes: 10
+
+    env:
+      MVN_CENTRAL_USER: ${{ secrets.MVN_CENTRAL_USER }}
+      MVN_CENTRAL_PASSWORD: ${{ secrets.MVN_CENTRAL_PASSWORD }}
+      ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GRADLE_SIGNING_KEY }}
+      ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GRADLE_SIGNING_PASSWORD }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Publish Kotlin package
+        working-directory: intelligence/kt
+        run: ./dev/publish.sh
diff --git a/.github/workflows/label-pr-author.yaml b/.github/workflows/label-pr-author.yaml
@@ -0,0 +1,71 @@
+name: Label PR Authors (Scheduled)
+
+on:
+  schedule:
+    - cron: '0 * * * *'  # every hour
+  workflow_dispatch:     # allow manual run too
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  label-prs:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const org = "adap";
+
+            const prs = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: "open",
+              per_page: 100,
+            });
+
+            for (const pr of prs.data) {
+              const labels = pr.labels.map(l => l.name);
+              const hasLabel = labels.includes("Maintainer") || labels.includes("Contributor") || labels.includes("Bot");
+              if (hasLabel) continue;
+
+              const author = pr.user.login;
+              const isBot = pr.user.type === "Bot";
+
+              if (isBot) {
+                console.log(`Labeling PR #${pr.number} by ${author} as Bot`);
+                await github.rest.issues.addLabels({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: pr.number,
+                  labels: ["Bot"],
+                });
+                continue;
+              }
+
+              let isMaintainer = false;
+              try {
+                const result = await github.rest.orgs.checkMembershipForUser({
+                  org,
+                  username: author
+                });
+                isMaintainer = result.status === 204;
+              } catch (e) {
+                if (e.status !== 404) throw e;
+              }
+
+              const label = isMaintainer ? "Maintainer" : "Contributor";
+              console.log(`Labeling PR #${pr.number} by ${author} as ${label}`);
+
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: pr.number,
+                labels: [label],
              });
+            }
+
+              console.log("All PRs processed");
+              return `Labeled ${prs.data.length} PRs successfully.`;