Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix(common/misc_utils): allow once decorator retries after failure (#16174)

Harsh Kashyapd67d14e4c631
diff --git a/common/misc_utils.py b/common/misc_utils.py
index e9486f51fb..673efb210e 100644
--- a/common/misc_utils.py
+++ b/common/misc_utils.py
@@ -224,8 +224,8 @@ def once(func):
nonlocal executed, result
with lock:
if not executed:
- executed = True
result = func(*args, **kwargs)
+ executed = True
return result
return wrapper
diff --git a/test/unit_test/common/test_misc_utils.py b/test/unit_test/common/test_misc_utils.py
index e1b3490d42..9cd3f0fbf0 100644
--- a/test/unit_test/common/test_misc_utils.py
+++ b/test/unit_test/common/test_misc_utils.py
@@ -17,6 +17,7 @@ import asyncio
import contextvars
import hashlib
import sys
+import threading
import types
import uuid
from contextlib import contextmanager
@@ -25,7 +26,7 @@ from unittest.mock import patch
import pytest
from common import ssrf_guard
-from common.misc_utils import convert_bytes, download_img, get_uuid, hash_str2int, thread_pool_exec
+from common.misc_utils import convert_bytes, download_img, get_uuid, hash_str2int, once, thread_pool_exec
class _Hdr:
@@ -539,3 +540,74 @@ class TestConvertBytes:
# Ensure we don't exceed available units
huge_value = 100 * 1125899906842624 # 100 PB (still within PB range)
assert "PB" in convert_bytes(huge_value)
+
+
+class TestOnce:
+ """Test cases for the once() run-exactly-once decorator."""
+
+ def test_runs_only_once_on_success(self):
+ """A successful function body runs once; later calls return the cached result."""
+ calls = {"n": 0}
+
+ @once
+ def init():
+ calls["n"] += 1
+ return calls["n"]
+
+ assert init() == 1
+ assert init() == 1 # cached, not re-executed
+ assert calls["n"] == 1
+
+ def test_exception_allows_retry(self):
+ """A first-call exception must not permanently disable the function.
+
+ Previously ``executed`` was set to True before the wrapped function ran,
+ so a raising first call left the decorator stuck returning None forever.
+ After a failure the body should run again on the next call.
+ """
+ calls = {"n": 0}
+
+ @once
+ def flaky():
+ calls["n"] += 1
+ if calls["n"] == 1:
+ raise RuntimeError("boom")
+ return "ok"
+
+ with pytest.raises(RuntimeError):
+ flaky()
+
+ # The first call failed, so the second call must retry and succeed.
+ assert flaky() == "ok"
+ assert calls["n"] == 2
+
+ def test_thread_safe_single_execution(self):
+ """Concurrent callers must trigger exactly one successful execution."""
+ calls = {"n": 0}
+ counter_lock = threading.Lock()
+ barrier = threading.Barrier(8)
+
+ @once
+ def init():
+ with counter_lock:
+ calls["n"] += 1
+ return 42
+
+ results = []
+ results_lock = threading.Lock()
+
+ def worker():
+ barrier.wait()
+ value = init()
+ with results_lock:
+ results.append(value)
+
+ threads = [threading.Thread(target=worker) for _ in range(8)]
+ for t in threads:
+ t.start()
+ for t in threads:
+ t.join()
+
+ assert calls["n"] == 1
+ assert results == [42] * 8