Merge branch 'main' into jort/Geti-1222-remove_configurable_ff

Author: JortBergfeld

deploy/charts/control-plane/chart/values.yaml

@@ -45,7 +45,7 @@ global:
     allow_credentials: true
 
 enabled:
-  account-service: false
+  account-service: true
   onboarding-service: false
   notifier: false
   credit-system: false

dev_tools/builder_images/python-builder/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.7
 
-FROM python:3.10-slim-bookworm@sha256:66a6e8a211a02794515d4e1aa1970fc037ec4dde1429395e1321bdd63af01256
+FROM python:3.10-slim-bookworm@sha256:f72a1f1edc9431c288fe27af1e68c433f64ff9e595cd726be72502cdb3f93927
 
 ENV UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy UV_PYTHON_DOWNLOADS=0
 

interactive_ai/migration_job/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim-bookworm@sha256:66a6e8a211a02794515d4e1aa1970fc037ec4dde1429395e1321bdd63af01256 AS base
+FROM python:3.10-slim-bookworm@sha256:f72a1f1edc9431c288fe27af1e68c433f64ff9e595cd726be72502cdb3f93927 AS base
 
 FROM base AS build
 
@@ -27,7 +27,7 @@ FROM base AS runtime
 
 # Install ffmpeg and curl
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends ffmpeg=7:5.1.6-0+deb12u1 curl && \
+    apt-get install -y --no-install-recommends ffmpeg=7:5.1.*-0+deb12u1 curl && \
     rm -rf /var/lib/apt/lists/* && \
     useradd -l -u 10001 non-root && \
 	pip3 uninstall -y setuptools pip wheel && \

interactive_ai/services/auto_train/Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.10-slim-bookworm@sha256:66a6e8a211a02794515d4e1aa1970fc037ec4dde1429395e1321bdd63af01256 AS base
+FROM python:3.10-slim-bookworm@sha256:f72a1f1edc9431c288fe27af1e68c433f64ff9e595cd726be72502cdb3f93927 AS base
 
 FROM base AS build
 
 # Install Git and clone the OTX at the specified tag
-ARG OTX_RELEASE_TAG=develop
+ARG OTX_RELEASE_TAG=release/2.6
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

interactive_ai/services/dataset_ie/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim-bookworm@sha256:66a6e8a211a02794515d4e1aa1970fc037ec4dde1429395e1321bdd63af01256 AS base
+FROM python:3.10-slim-bookworm@sha256:f72a1f1edc9431c288fe27af1e68c433f64ff9e595cd726be72502cdb3f93927 AS base
 
 FROM base AS build
 

interactive_ai/services/director/Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.10-slim-bookworm@sha256:66a6e8a211a02794515d4e1aa1970fc037ec4dde1429395e1321bdd63af01256 AS base
+FROM python:3.10-slim-bookworm@sha256:f72a1f1edc9431c288fe27af1e68c433f64ff9e595cd726be72502cdb3f93927 AS base
 
 FROM base AS build
 
 # Install Git and clone the OTX at the specified tag
-ARG OTX_RELEASE_TAG=develop
+ARG OTX_RELEASE_TAG=release/2.6
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

interactive_ai/services/director/app/usecases/auto_train/auto_train_use_case.py

@@ -179,7 +179,6 @@ def _check_conditions_and_set_auto_train_readiness(
             project = ProjectRepo().get_by_id(project_identifier.project_id)
             trainable_tasks_ids = [tn.id_ for tn in project.get_trainable_task_nodes()]
             auto_train_activation_repo = ProjectBasedAutoTrainActivationRepo(project_identifier=project_identifier)
-
             auto_train_ready_tasks_ids = [
                 tn.id_ for tn in AutoTrainUseCase.__get_auto_train_ready_tasks(project=project)
             ]
@@ -216,10 +215,12 @@ def __is_auto_train_enabled_for_task(project_identifier: ProjectIdentifier, task
         :param task_node: The task node to check
         :returns: True if auto-training is enabled for the task node, False otherwise.
         """
-        # use revamped project configuration
         repo = ProjectConfigurationRepo(project_identifier)
         project_config = repo.get_project_configuration()
-        return project_config.get_task_config(task_id=str(task_node.id_)).auto_training.enable
+        return (
+            not task_node.task_properties.is_anomaly
+            and project_config.get_task_config(task_id=str(task_node.id_)).auto_training.enable
+        )
 
     @classmethod
     def __get_auto_train_ready_tasks(
@@ -247,7 +248,6 @@ def __get_auto_train_ready_tasks(
                 task_node=task_node,
             )
             required_annotations_met = missing_annotations.total_missing_annotations_auto_training <= 0
-
             auto_train_enabled = cls.__is_auto_train_enabled_for_task(
                 project_identifier=project.identifier, task_node=task_node
             )

interactive_ai/services/director/tests/unit/usecases/auto_train/test_auto_train_use_case.py

@@ -51,29 +51,39 @@ def test_check_conditions_and_set_auto_train_readiness_debounce(self, fxt_projec
         [True, False],
         ids=["enough annotations", "not enough annotations"],
     )
+    @pytest.mark.parametrize(
+        "project_fixture,auto_train_enabled",
+        [
+            ("fxt_project", True),
+            ("fxt_project_with_anomaly_task", False),
+        ],
+        ids=["Standard Project", "Anomaly Project"],
+    )
     def test_check_conditions_and_set_auto_train_readiness(
         self,
         request,
         enough_annotations,
         fxt_organization_id,
-        fxt_project,
         fxt_missing_annotations,
         fxt_missing_annotations_zero_missing,
+        project_fixture,
+        auto_train_enabled,
     ) -> None:
         """Checks that an auto-training request is submitted if and only if the conditions are met"""
-        dataset_storage = fxt_project.get_training_dataset_storage()
-        task_node = fxt_project.get_trainable_task_nodes()[0]
+        project = request.getfixturevalue(project_fixture)
+        dataset_storage = project.get_training_dataset_storage()
+        task_node = project.get_trainable_task_nodes()[0]
 
         request.addfinalizer(lambda: ProjectBasedAutoTrainActivationRepo(fxt_project.identifier).delete_all())
         ProjectConfigurationRepo(fxt_project.identifier).create_default_configuration([task_node.id_])
 
         session = make_session(
             organization_id=fxt_organization_id,
-            workspace_id=fxt_project.identifier.workspace_id,
+            workspace_id=project.identifier.workspace_id,
         )
         with (
             session_context(session),
-            patch.object(ProjectRepo, "get_by_id", return_value=fxt_project) as mock_get_project,
+            patch.object(ProjectRepo, "get_by_id", return_value=project) as mock_get_project,
             patch.object(
                 ProjectBasedAutoTrainActivationRepo,
                 "set_auto_train_readiness_by_task_id",
@@ -86,15 +96,22 @@ def test_check_conditions_and_set_auto_train_readiness(
             ) as mock_get_missing_annotations,
         ):
             AutoTrainUseCase._check_conditions_and_set_auto_train_readiness(
-                session=session, project_identifier=fxt_project.identifier
+                session=session, project_identifier=project.identifier
             )
 
-            mock_get_project.assert_called_once_with(fxt_project.id_)
+            mock_get_project.assert_called_once_with(project.id_)
             mock_get_missing_annotations.assert_called_once_with(
                 dataset_storage_identifier=dataset_storage.identifier,
                 task_node=task_node,
             )
-            if enough_annotations:
+            if not auto_train_enabled:
+                mock_set_readiness.assert_called_once_with(
+                    task_node_id=task_node.id_,
+                    readiness=False,
+                    bypass_debouncer=True,
+                    raise_exc_on_missing=False,
+                )
+            elif enough_annotations:
                 mock_set_readiness.assert_called_once_with(
                     task_node_id=task_node.id_,
                     readiness=True,

interactive_ai/services/inference_gateway/Dockerfile

@@ -32,11 +32,11 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
     go-licenses save . --save_path /THIRD_PARTY_NOTICES || true
 
 # Production image
-FROM debian:bookworm-slim@sha256:b1a741487078b369e78119849663d7f1a5341ef2768798f7b7406c4240f86aef AS runtime
+FROM debian:bookworm-slim@sha256:df52e55e3361a81ac1bead266f3373ee55d29aa50cf0975d440c2be3483d8ed3 AS runtime
 
 # Install ffmpeg
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends ffmpeg=7:5.1.6-0+deb12u1 && \
+    apt-get install -y --no-install-recommends ffmpeg=7:5.1.*-0+deb12u1 && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --link --from=build /build/interactive_ai/service/inference_gateway .

interactive_ai/services/jobs/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim-bookworm@sha256:66a6e8a211a02794515d4e1aa1970fc037ec4dde1429395e1321bdd63af01256 AS base
+FROM python:3.10-slim-bookworm@sha256:f72a1f1edc9431c288fe27af1e68c433f64ff9e595cd726be72502cdb3f93927 AS base
 
 FROM base AS build