Aridhia-Open-Source
diff --git a/‎CHANGELOG.md‎
Lines changed: 2 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Dockerfile‎
Lines changed: 8 additions & 10 deletions b/‎Dockerfile‎
Lines changed: 8 additions & 10 deletions
diff --git a/‎Makefile‎
Lines changed: 4 additions & 1 deletion b/‎Makefile‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎Pipfile‎
Lines changed: 0 additions & 23 deletions b/‎Pipfile‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎Pipfile.lock‎
Lines changed: 0 additions & 1002 deletions b/‎Pipfile.lock‎
Lines changed: 0 additions & 1002 deletions
diff --git a/‎build/helper/Dockerfile‎
Lines changed: 7 additions & 10 deletions b/‎build/helper/Dockerfile‎
Lines changed: 7 additions & 10 deletions
diff --git a/‎controller/__main__.py‎
Lines changed: 1 addition & 0 deletions b/‎controller/__main__.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎controller/helpers/pod_watcher.py‎
Lines changed: 0 additions & 1 deletion b/‎controller/helpers/pod_watcher.py‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎controller/models/crd.py‎
Lines changed: 17 additions & 1 deletion b/‎controller/models/crd.py‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎controller/tests/conftest.py‎
Lines changed: 28 additions & 0 deletions b/‎controller/tests/conftest.py‎
Lines changed: 28 additions & 0 deletions
@@ -1,5 +1,7 @@
 # Releases Changelog
 
+# 1.2.0
+- Added a dynamic configuration to `global.taskReview` in the values files. This is only effective when deployed with the federated node. It will hold the result release until approved from the api, which in turns should set the task's CRD annotation `approved` to `"true"` and allowing result delivery. Defaults to `false`.
 # 1.1.0
 - Added support for AWS EFS persistent volume through the csi driver `efs.csi.aws.com`
     To configure it, set in the values file:
 
@@ -1,28 +1,25 @@
-FROM python:3.12.2-slim
+FROM python:3.13.5-slim
 
 COPY controller /app/controller
-COPY Pipfile* /app
+COPY pyproject.toml /app
 
 WORKDIR /app
 
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONIOENCODING=UTF-8
 
-# hadolint detects pipenv as another invocation of pip
-# hadolint ignore=DL3013,DL3008
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# hadolint ignore=DL3008
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
         gcc gh jq curl openssl tar \
-    && pip install --no-cache-dir --upgrade pip \
-    && python3 -m pip install --no-cache-dir pipenv \
-    && pipenv lock \
-    && pipenv install --system --deploy --categories packages \
-    && pip uninstall -y pipenv \
+    && curl -LsSf https://astral.sh/uv/install.sh | sh \
+    && /root/.local/bin/uv sync \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 # hadolint ignore=DL3013,DL3008
-RUN curl -sSL -O https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb \
+RUN curl -sSL -O https://packages.microsoft.com/config/debian/"$(grep VERSION_ID /etc/os-release | cut -d '"' -f 2)"/packages-microsoft-prod.deb \
     && dpkg -i packages-microsoft-prod.deb \
     && apt-get update \
     && apt-get install --no-install-recommends -y azcopy \
@@ -33,4 +30,5 @@ RUN curl -sSL -O https://packages.microsoft.com/config/debian/12/packages-micros
     && rm -rf /var/lib/apt/lists/*
 
 ENV PYTHONPATH=/app/controller
+ENV PATH="/app/.venv/bin:$PATH"
 CMD ["python3", "-m", "controller"]
@@ -1,5 +1,5 @@
 SHELL=/bin/bash
-IMAGE ?= ghcr.io/aridhia-open-source/fn_task_controller:0.7.0
+IMAGE ?= ghcr.io/aridhia-open-source/fn_task_controller:1.2.0
 TESTS_IMAGE ?= ghcr.io/aridhia-open-source/fn_task_controller_tests
 TEST_CONTAINER ?= fn-controller-tests
 
@@ -9,6 +9,9 @@ build_docker:
 build_test_container:
 	docker build . -f test.Dockerfile -t ${TESTS_IMAGE}
 
+build_helper:
+	docker build build/helper -t ghcr.io/aridhia-open-source/fn_task_controller_helper:1.0.0
+
 run_test_container: cleanup_test_container
 	docker run --name ${TEST_CONTAINER} ${TESTS_IMAGE}
 	docker cp ${TEST_CONTAINER}:/app/artifacts/coverage.xml artifacts/coverage.xml
 
@@ -1,4 +1,4 @@
-FROM alpine/k8s:1.29.4
+FROM alpine/k8s:1.33.2
 
 ARG USERNAME=fednode
 ARG USER_UID=1001
@@ -9,18 +9,15 @@ RUN addgroup -S "${USERNAME}" --gid "${USER_GID}" \
 
 WORKDIR /apps
 # Can't find venv-related files
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 # hadolint ignore=SC1091
-RUN apk add --no-cache \
-        'jq=~1.7' \
-        'curl=~8.5' \
-        'openssl=~3.1' \
-        'github-cli=~2.39' \
-    && python3 -m venv venv \
-    && . venv/bin/activate \
-    && pip install --no-cache-dir "requests==2.32.3" \
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
+    && /root/.local/bin/uv init \
+    && /root/.local/bin/uv add requests \
     && chown "${USER_UID}:${USER_GID}" /apps
 
 COPY . /apps/
 USER ${USER_UID}
 
-ENTRYPOINT [ "/apps/venv/bin/python3", "idp-init.py" ]
+ENV PATH="/apps/.venv/bin:$PATH"
+ENTRYPOINT [ "python3", "idp-init.py" ]
@@ -1,6 +1,7 @@
 """
 Entrypoint for the FNTC
 """
+
 from .controller import start
 
 print("Starting the controller")
 
@@ -6,7 +6,6 @@
 
 import base64
 import logging
-import json
 import re
 import subprocess
 from kubernetes.watch import Watch
 
@@ -1,5 +1,6 @@
 import json
 from math import exp
+import os
 import re
 
 from exceptions import CRDException
@@ -45,7 +46,22 @@ def can_trigger_task(self) -> bool:
         return self.annotations.get(f"{self.domain}/user") and not self.annotations.get(f"{self.domain}/done")
 
     def can_deliver_results(self) -> bool:
-        return self.annotations.get(f"{self.domain}/done") and not self.annotations.get(f"{self.domain}/results")
+        """
+        Overcomplicated flow control, but there are few requirements to
+        fetch results:
+        - done HAS to be there, which means task pod is done
+        - results HAS NOT to be there, meaning results have not been fetched and delivered yet
+
+        TASK_REVIEW and approved annotation should make the whole check fail when:
+            TASK_REVIEW is set and approved is not "true". So we check for this
+            case, and negate it.
+        """
+        return self.annotations.get(f"{self.domain}/done") and \
+            not self.annotations.get(f"{self.domain}/results") and \
+            not (
+                os.getenv("TASK_REVIEW") is not None and \
+                self.annotations.get(f"{self.domain}/approved", "false").lower() != "true"
+            )
 
     def should_skip(self) -> bool:
         return bool(self.is_delete or self.annotations.get(f"{self.domain}/results"))
 
@@ -142,6 +142,30 @@ def mock_crd_api_basic_done(mock_crd_task_done):
     }}
     return deepcopy(mock_crd_task_done)
 
+@pytest.fixture
+def mock_crd_azcopy_done(mock_crd_task_done):
+    mock_crd_task_done["object"]["spec"]["results"] = {"other": {
+        "url": "https://fancyresultsplace.com/api/storage",
+        "auth_type": "AzCopy"
+    }}
+    return deepcopy(mock_crd_task_done)
+
+@pytest.fixture
+def mock_crd_api_done(mock_crd_task_done):
+    mock_crd_task_done["object"]["spec"]["results"] = {"other": {
+        "url": "https://fancyresultsplace.com/api/storage",
+        "auth_type": "Bearer"
+    }}
+    return deepcopy(mock_crd_task_done)
+
+@pytest.fixture
+def mock_crd_api_basic_done(mock_crd_task_done):
+    mock_crd_task_done["object"]["spec"]["results"] = {"other": {
+        "url": "https://fancyresultsplace.com/api/storage",
+        "auth_type": "Basic"
+    }}
+    return deepcopy(mock_crd_task_done)
+
 @pytest.fixture(autouse=True)
 def k8s_config(mocker):
     mocker.patch('kubernetes.config.load_kube_config', return_value=Mock())
@@ -286,3 +310,7 @@ def delivery_open(request, mocker):
     if getattr(request, "param", None):
         file_contents = request.param
     return mocker.patch("models.crd.open", mock_open(read_data=json.dumps(file_contents)))
+
+@pytest.fixture
+def review_env(monkeypatch):
+    monkeypatch.setenv("TASK_REVIEW", "enabled")