[Testing CI/CD] Results view update

.github/workflows/publish-chart.yaml

@@ -41,40 +41,20 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-
-      - name: Decide to publish or not
-        id: publishing
-        shell: python
-        run: |
-          import os
-          repo = "${{ github.repository }}"
-          event = "${{ github.event_name }}"
-          ref = "${{ github.event.ref }}"
-          publishing = ""
-          if (
-              repo == "2i2c-org/frx-challenges"
-              and event == "push"
-              and (
-                  ref.startswith("refs/tags/")
-                  or ref == "refs/heads/main"
-              )
-          ):
-              publishing = "true"
-              print("Publishing chart")
-          with open(os.environ["GITHUB_OUTPUT"], "a") as f:
-              f.write(f"publishing={publishing}\n")
+          python-version: "3.12"
 
       - name: Set up QEMU (for docker buildx)
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx (for chartpress multi-arch builds)
         uses: docker/setup-buildx-action@v3
 
-      - name: Setup push rights to Quay.io
-        if: steps.publishing.outputs.publishing
-        run: |
-          docker login -u "${{ secrets.QUAY_USERNAME }}" -p "${{ secrets.QUAY_PASSWORD }}" quay.io
+      - name: Login to Quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Set up push rights to frx-challenges-helm-chart
         # This was setup by...
@@ -86,7 +66,6 @@ jobs:
         # 3. Registering the public key (gh-pages.pub) as a deploy key
         #    with push rights for the 2i2c-org/frx-challenges-helm-chart repo:
         #    https://github.com/2i2c-org/frx-challenges-helm-chart/settings/keys
-        if: steps.publishing.outputs.publishing
         run: |
           mkdir -p ~/.ssh
           ssh-keyscan github.com >> ~/.ssh/known_hosts
@@ -104,21 +83,13 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "github-actions"
 
-      - name: Build image, push if necessary
-        env:
-          PUBLISHING: ${{ steps.publishing.outputs.publishing }}
+      - name: Build image and push
         run: |
-          CHARTPRESS_ARGS=""
-          if [[ "${PUBLISHING}" == "true" ]]; then
-            CHARTPRESS_ARGS="--push"
-          fi
           chartpress \
             --builder docker-buildx \
-            --platform linux/amd64 --platform linux/arm64 \
-            ${CHARTPRESS_ARGS}
+            --platform linux/amd64 --platform linux/arm64
 
       - name: Publish chart with chartpress
-        if: steps.publishing.outputs.publishing
         run: |
           set -eux
 

.gitignore

@@ -163,3 +163,7 @@ cython_debug/
 
 # MyST
 _build
+
+# VS Code
+.DS_Store
+.vscode/

frx_challenges/web/models.py

@@ -144,6 +144,24 @@ def ordered_results(self) -> list:
                 results_list.append(None)
         return results_list
 
+    @property
+    def percent_complete(self) -> str:
+        """
+        Return the percentage of completion of this evaluation
+        """
+        if self.status == Evaluation.Status.EVALUATED:
+            return "100%"
+        elif self.status == Evaluation.Status.EVALUATING:
+            if self.result:
+                percent_complete = self.result.get(
+                    "num_evals_done", 0
+                ) / self.result.get("total_evals", 1)
+                return f"{int(percent_complete * 100)}%"
+            else:
+                return "0%"
+        else:
+            return "0%"
+
     def __str__(self):
         return f"({self.status}) {self.result} {self.version.data_uri}"
 

frx_challenges/web/templates/version.html

@@ -8,19 +8,30 @@ <h2>
         </h2>
         <div class="row">
             <div class="col-sm-6">
-                Status: <strong>{{ evaluation.status }}</strong>
+                Status:
                 {% if evaluation.status != "EVALUATED" and evaluation.status != "FAILED" %}
+                    {% if evaluation.status == "EVALUATING" %}
+                        <strong>{{ evaluation.percent_complete }} evaluated</strong>
+                    {% else %}
+                        <strong>{{ evaluation.status }}</strong>
+                    {% endif %}
                     <a href="#" onclick="window.location.reload(); return false;">
                         <img alt="Check for updates" src="{% static 'web/arrow-repeat.svg' %}">
                     </a>
+                {% else %}
+                    <strong>{{ evaluation.status }}</strong>
                 {% endif %}
             </div>
             <div class="col-sm-6 text-end">
-                {{ version.user.username }} uploaded <code>{{ version.filename }}</code> {{ version.created_at|timesince }} ago
+                {{ version.user.username }} uploaded <code>{{ version.filename }}</code> {{ version.created_at|timesince }}
+                ago
             </div>
         </div>
         <div class="row py-4">
             <h4>Result</h4>
+            {% if is_collaborator and evaluation.status == 'EVALUATED' %}
+                <a href="{% url 'download-results' version.id %}">Download results</a>
+            {% endif %}
             {% if evaluation.status == 'EVALUATED' %}
                 {% for result_item in results_display %}
                     <div class="col">

frx_challenges/web/urls.py

@@ -4,6 +4,9 @@
 
 urlpatterns = [
     path("upload/<int:id>", versions.upload, name="upload"),
+    path(
+        "download-results/<int:id>", versions.download_results, name="download-results"
+    ),
     path("page/<slug:slug>", pages.view, name="page-view"),
     path("file/<slug:slug>", pages.content_file, name="content-file"),
     path("leaderboard", default.leaderboard, name="leaderboard"),

frx_challenges/web/views/versions.py

@@ -1,3 +1,4 @@
+import json
 import os
 import tempfile
 
@@ -51,9 +52,32 @@ def upload(request: HttpRequest, id: int) -> HttpResponse:
     )
 
 
+@login_required
+def download_results(request: HttpRequest, id: int) -> HttpResponse:
+    version = Version.objects.get(id=id)
+    is_collaborator = _validate_collaborator(request, id)
+    if not is_collaborator:
+        raise Http404(
+            "Full results files are only available to submission collaborators."
+        )
+    evaluation = version.latest_evaluation
+    if not evaluation.result:
+        raise Http404("No results available for this version.")
+
+    # Create a JSON response from the evaluation results
+    response = HttpResponse(
+        content_type="application/json",
+    )
+    response["Content-Disposition"] = f'attachment; filename="results_{id}.json"'
+
+    response.write(json.dumps(evaluation.result, indent=4))
+    return response
+
+
 def view(request: HttpRequest, id: int) -> HttpResponse:
     version = Version.objects.get(id=id)
     evaluation = version.latest_evaluation
+    is_collaborator = _validate_collaborator(request, version.submission.id)
 
     results_display = []
     if evaluation.result:
@@ -72,6 +96,7 @@ def view(request: HttpRequest, id: int) -> HttpResponse:
             "version": version,
             "evaluation": evaluation,
             "results_display": results_display,
+            "is_collaborator": is_collaborator,
         },
     )