[DO NOT MERGE] fix(controller): prevent Re-ID fallback from firing while features are still being gathered

controller/src/controller/uuid_manager.py

@@ -285,13 +285,14 @@ def assignID(self, sscape_object):
         self.active_ids.setdefault(sscape_object.rv_id, [None, None])
       self.gatherQualityVisualFeatures(sscape_object)
       self.pickBestID(sscape_object)
-      if self.haveSufficientVisualFeatures(sscape_object) and self.reid_enabled:
-        # Only do the query for similarity if it hasn't been run before
-        if sscape_object.rv_id not in self.active_query:
-          self.active_query[sscape_object.rv_id] = True
-          self.pool.submit(self.querySimilarity, sscape_object)
+      if self.reid_enabled:
+        if self.haveSufficientVisualFeatures(sscape_object):
+          # Only do the query for similarity if it hasn't been run before
+          if sscape_object.rv_id not in self.active_query:
+            self.active_query[sscape_object.rv_id] = True
+            self.pool.submit(self.querySimilarity, sscape_object)
       else:
-        # Re-ID is disabled or we don't have enough features; fall back to using the generated GID
+        # Re-ID is disabled; fall back to using the generated GID
         with self.active_ids_lock:
           if self.active_ids.get(sscape_object.rv_id, [None])[0] is None:
             self.active_ids[sscape_object.rv_id] = [sscape_object.gid, None]

tests/Makefile

@@ -233,6 +233,7 @@ _unit-tests: \
   singleton-sensor-unit \
   timestamp-unit \
   transform-unit \
+  uuid-manager-unit \
   views-unit \
 
 include Makefile.sscape Makefile.functional Makefile.perf \

tests/Makefile.sscape

@@ -79,5 +79,8 @@ timestamp-unit: # NEX-T10480
 transform-unit: # NEX-T10512
 	$(call unit-recipe, transform, $(IMAGE)-manager-test)
 
+uuid-manager-unit: # NEX-T19884
+	$(call unit-recipe, uuid_manager, $(IMAGE)-controller-test)
+
 views-unit: # NEX-T10479
 	$(call unit-recipe, views, $(IMAGE)-manager-test)

tests/sscape_tests/uuid_manager/conftest.py

@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: (C) 2026 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+import sys
+from unittest.mock import MagicMock
+
+import tests.common_test_utils as common
+
+TEST_NAME = "NEX-T19884"
+
+# Mock the vdms module before importing controller modules that depend on it.
+sys.modules.setdefault('vdms', MagicMock())
+
+
+def pytest_sessionstart():
+  """! Executes at the beginning of the session. """
+
+  print(f"Executing: {TEST_NAME}")
+  return
+
+
+def pytest_sessionfinish(exitstatus):
+  """! Executes at the end of the session. """
+
+  common.record_test_result(TEST_NAME, exitstatus)
+  return