cherry pick some fixes

DARPA-ASKEM · Feb 6, 2025 · 0a5881d · 0a5881d
1 parent 2aeb459
commit 0a5881d
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 51 deletions.
diff --git a/.github/workflows/publish-client.yml b/.github/workflows/publish-client.yml
@@ -59,8 +59,8 @@ jobs:
           push: true
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
-  arm64-emulation:
-    runs-on: ubuntu-24.04
+  arm64:
+    runs-on: ubuntu-24.04-arm
     needs: image-tag
     permissions:
       contents: read
@@ -73,9 +73,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Setup Node 20.10.0 LTS
         uses: actions/setup-node@v4
         with:
@@ -100,7 +97,7 @@ jobs:
     needs:
       - image-tag
       - amd64
-      - arm64-emulation
+      - arm64
     uses: ./.github/workflows/merge-images.yml
     with:
       name: ${{ needs.image-tag.outputs.tagged-image-name }}
diff --git a/.github/workflows/publish-equation-extraction-taskrunner.yml b/.github/workflows/publish-equation-extraction-taskrunner.yml
@@ -58,8 +58,8 @@ jobs:
           push: true
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
-  arm64-emulation:
-    runs-on: ubuntu-24.04
+  arm64:
+    runs-on: ubuntu-24.04-arm
     needs: image-tag
     permissions:
       contents: read
@@ -72,9 +72,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Checkout the repository
         uses: actions/checkout@v4
 
@@ -102,7 +99,7 @@ jobs:
     needs:
       - image-tag
       - amd64
-      - arm64-emulation
+      - arm64
     uses: ./.github/workflows/merge-images.yml
     with:
       name: ${{ needs.image-tag.outputs.tagged-image-name }}
diff --git a/.github/workflows/publish-funman-taskrunner.yml b/.github/workflows/publish-funman-taskrunner.yml
@@ -58,8 +58,8 @@ jobs:
           push: true
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
-  arm64-emulation:
-    runs-on: ubuntu-24.04
+  arm64:
+    runs-on: ubuntu-24.04-arm
     needs: image-tag
     permissions:
       contents: read
@@ -72,9 +72,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Checkout the repository
         uses: actions/checkout@v4
 
@@ -102,7 +99,7 @@ jobs:
     needs:
       - image-tag
       - amd64
-      - arm64-emulation
+      - arm64
     uses: ./.github/workflows/merge-images.yml
     with:
       name: ${{ needs.image-tag.outputs.tagged-image-name }}
diff --git a/.github/workflows/publish-gollm-taskrunner.yml b/.github/workflows/publish-gollm-taskrunner.yml
@@ -58,8 +58,8 @@ jobs:
           push: true
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
-  arm64-emulation:
-    runs-on: ubuntu-24.04
+  arm64:
+    runs-on: ubuntu-24.04-arm
     needs: image-tag
     permissions:
       contents: read
@@ -72,9 +72,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Checkout the repository
         uses: actions/checkout@v4
 
@@ -102,7 +99,7 @@ jobs:
     needs:
       - image-tag
       - amd64
-      - arm64-emulation
+      - arm64
     uses: ./.github/workflows/merge-images.yml
     with:
       name: ${{ needs.image-tag.outputs.tagged-image-name }}
diff --git a/.github/workflows/publish-mira-taskrunner.yml b/.github/workflows/publish-mira-taskrunner.yml
@@ -59,8 +59,8 @@ jobs:
           push: true
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
-  arm64-emulation:
-    runs-on: ubuntu-24.04
+  arm64:
+    runs-on: ubuntu-24.04-arm
     needs: image-tag
     permissions:
       contents: read
@@ -73,9 +73,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Checkout the repository
         uses: actions/checkout@v4
 
@@ -103,7 +100,7 @@ jobs:
     needs:
       - image-tag
       - amd64
-      - arm64-emulation
+      - arm64
     uses: ./.github/workflows/merge-images.yml
     with:
       name: ${{ needs.image-tag.outputs.tagged-image-name }}
diff --git a/.github/workflows/publish-server.yml b/.github/workflows/publish-server.yml
@@ -65,8 +65,8 @@ jobs:
           push: true
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
-  arm64-emulation:
-    runs-on: ubuntu-24.04
+  arm64:
+    runs-on: ubuntu-24.04-arm
     needs: image-tag
     permissions:
       contents: read
@@ -79,9 +79,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Checkout the repository
         uses: actions/checkout@v4
 
@@ -112,7 +109,7 @@ jobs:
     needs:
       - image-tag
       - amd64
-      - arm64-emulation
+      - arm64
     uses: ./.github/workflows/merge-images.yml
     with:
       name: ${{ needs.image-tag.outputs.tagged-image-name }}
diff --git a/.github/workflows/publish-table-extraction-taskrunner.yml b/.github/workflows/publish-table-extraction-taskrunner.yml
@@ -58,8 +58,8 @@ jobs:
           push: true
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
-  arm64-emulation:
-    runs-on: ubuntu-24.04
+  arm64:
+    runs-on: ubuntu-24.04-arm
     needs: image-tag
     permissions:
       contents: read
@@ -72,9 +72,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Checkout the repository
         uses: actions/checkout@v4
 
@@ -102,7 +99,7 @@ jobs:
     needs:
       - image-tag
       - amd64
-      - arm64-emulation
+      - arm64
     uses: ./.github/workflows/merge-images.yml
     with:
       name: ${{ needs.image-tag.outputs.tagged-image-name }}
diff --git a/.github/workflows/publish-text-extraction-taskrunner.yml b/.github/workflows/publish-text-extraction-taskrunner.yml
@@ -58,8 +58,8 @@ jobs:
           push: true
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
-  arm64-emulation:
-    runs-on: ubuntu-24.04
+  arm64:
+    runs-on: ubuntu-24.04-arm
     needs: image-tag
     permissions:
       contents: read
@@ -72,9 +72,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Checkout the repository
         uses: actions/checkout@v4
 
@@ -102,7 +99,7 @@ jobs:
     needs:
       - image-tag
       - amd64
-      - arm64-emulation
+      - arm64
     uses: ./.github/workflows/merge-images.yml
     with:
       name: ${{ needs.image-tag.outputs.tagged-image-name }}
diff --git a/.../client/hmi-client/src/components/workflow/ops/compare-datasets/compare-datasets-utils.ts b/.../client/hmi-client/src/components/workflow/ops/compare-datasets/compare-datasets-utils.ts
@@ -89,11 +89,17 @@ export const transformRowValuesRelativeToBaseline = (
 			transformed[key] = value;
 			return;
 		}
+		const eps = 1e-6;
 		const baselineValue = row[`${dataKey}:${baselineDataIndex}`];
 		if (plotType === PlotValue.DIFFERENCE) {
 			transformed[key] = value - baselineValue;
 		} else if (plotType === PlotValue.PERCENTAGE) {
-			transformed[key] = ((value - baselineValue) / baselineValue) * 100;
+			// set to 0 if value - baselineValue is 0
+			if (Math.abs(value - baselineValue) <= eps) {
+				transformed[key] = 0;
+			} else {
+				transformed[key] = ((value - baselineValue + eps) / (baselineValue + eps)) * 100;
+			}
 		} else if (plotType === PlotValue.VALUE) {
 			transformed[key] = value;
 		}

diff --git a/packages/text_extraction/Dockerfile b/packages/text_extraction/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
 	rm -rf /var/lib/apt/lists/*
 
 # Install PyMuPDF
-RUN pip install --no-cache-dir PyMuPDF
+RUN pip install --no-cache-dir PyMuPDF==1.25.2
 
 #^^^^^^^^^^^^^^^^^^^^
 ######################
@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
 	rm -rf /var/lib/apt/lists/*
 
 # Install PyMuPDF
-RUN pip install --no-cache-dir PyMuPDF
+RUN pip install --no-cache-dir PyMuPDF==1.25.2
 
 # Copy the Spring Boot fat JAR from the builder image
 COPY --from=text_extraction_taskrunner_builder /taskrunner/build/libs/*.jar /taskrunner.jar