Changes in PQ Pipeline & Publish Package workflows for PYPI_API_TOKEN (securefederatedai#1520)

* Added dev environment

Signed-off-by: noopur <noopur@intel.com>

* Added dev environment

Signed-off-by: noopur <noopur@intel.com>

* Do not continue on error

Signed-off-by: noopur <noopur@intel.com>

* Added permission for token read write

Signed-off-by: noopur <noopur@intel.com>

* Use shell commands

Signed-off-by: noopur <noopur@intel.com>

* Testing

Signed-off-by: noopur <noopur@intel.com>

* Testing

Signed-off-by: noopur <noopur@intel.com>

* Final changes

Signed-off-by: noopur <noopur@intel.com>

* Changes in PQ pipeline as well

Signed-off-by: noopur <noopur@intel.com>

* Comment out jobs fopr quick testing

Signed-off-by: noopur <noopur@intel.com>

* Modified

Signed-off-by: noopur <noopur@intel.com>

* Modified

Signed-off-by: noopur <noopur@intel.com>

* Modified

Signed-off-by: noopur <noopur@intel.com>

* Pass on token

Signed-off-by: noopur <noopur@intel.com>

* Inherit secret

Signed-off-by: noopur <noopur@intel.com>

* Do not pass env from called wf

Signed-off-by: noopur <noopur@intel.com>

* Do not pass env from called wf

Signed-off-by: noopur <noopur@intel.com>

* Revert the testing changes

Signed-off-by: noopur <noopur@intel.com>

* Renmote printing job

Signed-off-by: noopur <noopur@intel.com>

* Run publish step for manual trigger as well

Signed-off-by: noopur <noopur@intel.com>

* Ignore case for Aggregated model validation score

Signed-off-by: noopur <noopur@intel.com>

* Read 10 lines

Signed-off-by: noopur <noopur@intel.com>

* For trusted publishing

Signed-off-by: noopur <noopur@intel.com>

* Revert previous change

Signed-off-by: noopur <noopur@intel.com>

* Search string in lowercase

Signed-off-by: noopur <noopur@intel.com>

* Review comments incorp

Signed-off-by: noopur <noopur@intel.com>

---------

Signed-off-by: noopur <noopur@intel.com>

Author: noopurintel

.github/workflows/pq_pipeline.yml

@@ -178,8 +178,11 @@ jobs:
   # publish nightly package to PyPI (only run on schedule)
   publish_package:
     if: |
-      (github.event_name == 'schedule' && github.repository_owner == 'securefederatedai')
+      (github.event_name == 'schedule' && github.repository_owner == 'securefederatedai') ||
+      (github.event_name == 'workflow_dispatch')
     name: Publish Nightly Package to PyPI
+    permissions:
+      id-token: write
     needs: [
       wf_mnist_local_runtime,
       wf_watermark_e2e,
@@ -198,3 +201,4 @@ jobs:
     uses: ./.github/workflows/publish_nightly_package.yml
     with:
       commit_id: ${{ needs.set_commit_id_for_all_jobs.outputs.commit_id }}
+    secrets: inherit

.github/workflows/publish_nightly_package.yml

@@ -9,6 +9,9 @@ on:
       commit_id:
         required: false
         type: string
+    secrets:
+      PYPI_API_TOKEN:
+        required: true
   workflow_dispatch:
     inputs:
       commit_id:
@@ -19,14 +22,17 @@ on:
 env:
   COMMIT_ID: ${{ inputs.commit_id || github.sha }} # use commit_id from the calling workflow
 
+permissions:
+  id-token: write
+
 jobs:
   publish_package:
     name: Publish Nightly Package
     runs-on: ubuntu-22.04
+    environment: dev
     if: |
       (github.event_name == 'schedule' && github.repository_owner == 'securefederatedai') ||
-      (github.event_name == 'workflow_dispatch') ||
-      (github.event.pull_request.draft == false)
+      (github.event_name == 'workflow_dispatch')
     steps:
     - name: Checkout OpenFL repository
       uses: actions/checkout@v4
@@ -45,14 +51,11 @@ jobs:
 
     - name: Build package
       run: |
-        python3 -m pip install --upgrade build
+        python3 -m pip install setuptools wheel twine --upgrade build
         python3 -m build
+        echo "Package built successfully!"
 
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@release/v1
-      continue-on-error: true
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        repository-url: https://pypi.org/legacy/
-        verbose: true
+    - name: Upload package to PyPI
+      run: |
+        python3 -m twine upload dist/openfl_nightly* --verbose -u __token__ -p ${{ secrets.PYPI_API_TOKEN }}
+        echo "Package published successfully!"

tests/end_to_end/utils/federation_helper.py

@@ -338,7 +338,7 @@ def _verify_completion_for_participant(
             lines = [line.strip() for line in file.readlines()]
 
         # Below change is done to handle warnings coming in end of runs
-        content = list(filter(str.rstrip, lines))[-7:] if len(lines) >= 7 else lines
+        content = list(filter(str.rstrip, lines))[-10:] if len(lines) >= 10 else lines
 
         # Print last line of the log file on screen to track the progress
         log.info(f"Last line in {participant.name} log: {lines[-1:]}")
@@ -355,8 +355,6 @@ def _verify_completion_for_participant(
             log.info(f"Process completed for {participant.name}")
             break
 
-        time.sleep(45)
-
         # If process.poll() has a value, it means the process has completed
         # If None, it means the process is still running
         # This is applicable for native process only
@@ -370,6 +368,8 @@ def _verify_completion_for_participant(
             # Dockerized workspace scenario
             log.info(f"No process found for participant {participant.name}")
 
+        time.sleep(45)
+
     # Read tensor.db file for aggregator to check if the process is completed
     if participant.name == "aggregator" and num_rounds > 1:
         current_round = get_current_round(participant.tensor_db_file)

tests/end_to_end/utils/summary_helper.py

@@ -190,13 +190,13 @@ def print_federated_runtime_score(nb_name):
     # Open and read the log file
     with open(dir_res_file, "r") as file:
         for line in file:
-            if search_string in line:
+            if search_string.lower() in line.lower():
                 last_occurrence = line
 
     # Extract the value from the last occurrence
     if last_occurrence:
         match = re.search(
-            r"Aggregated model validation score = (\d+\.\d+)", last_occurrence
+            r"Aggregated model validation score = (\d+\.\d+)", last_occurrence, re.IGNORECASE
         )
         if match:
             aggregated_model_score = match.group(1)