From 1ee8ea8a35a2c0fccea6e7c955183c4ed03eebb3 Mon Sep 17 00:00:00 2001
From: gmega <giuliano.mega@gmail.com>
Date: Tue, 14 Jan 2025 19:48:58 -0300
Subject: [PATCH] fix: support nested attributes in client retry wrapper

---
 benchmarks/deluge/deluge_node.py            | 23 ++++++++++++++-------
 benchmarks/deluge/tests/test_deluge_node.py | 15 ++++++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/benchmarks/deluge/deluge_node.py b/benchmarks/deluge/deluge_node.py
index 6acaee2..1da4c21 100644
--- a/benchmarks/deluge/deluge_node.py
+++ b/benchmarks/deluge/deluge_node.py
@@ -13,7 +13,7 @@ from tenacity import retry, wait_exponential, stop_after_attempt
 from tenacity.stop import stop_base
 from tenacity.wait import wait_base
 from torrentool.torrent import Torrent
-from typing_extensions import Generic, TypeVar
+from typing_extensions import TypeVar
 from urllib3.util import Url
 
 from benchmarks.core.experiments.experiments import ExperimentComponent
@@ -171,18 +171,25 @@ class DelugeNode(SharedFSNode[Torrent, DelugeMeta], ExperimentComponent):
 T = TypeVar("T")
 
 
-class ResilientCallWrapper(Generic[T]):
-    def __init__(self, client: T, wait_policy: wait_base, stop_policy: stop_base):
-        self.client = client
+class ResilientCallWrapper:
+    def __init__(self, node: Any, wait_policy: wait_base, stop_policy: stop_base):
+        self.node = node
         self.wait_policy = wait_policy
         self.stop_policy = stop_policy
 
-    def __getattr__(self, item):
+    def __call__(self, *args, **kwargs):
         @retry(wait=self.wait_policy, stop=self.stop_policy)
-        def _resilient_wrapper(*args, **kwargs):
-            return getattr(self.client, item)(*args, **kwargs)
+        def _resilient_wrapper():
+            return self.node(*args, **kwargs)
 
-        return _resilient_wrapper
+        return _resilient_wrapper()
+
+    def __getattr__(self, item):
+        return ResilientCallWrapper(
+            getattr(self.node, item),
+            wait_policy=self.wait_policy,
+            stop_policy=self.stop_policy,
+        )
 
 
 class DelugeDownloadHandle(DownloadHandle):
diff --git a/benchmarks/deluge/tests/test_deluge_node.py b/benchmarks/deluge/tests/test_deluge_node.py
index d8058e5..d991804 100644
--- a/benchmarks/deluge/tests/test_deluge_node.py
+++ b/benchmarks/deluge/tests/test_deluge_node.py
@@ -106,3 +106,18 @@ def test_should_give_up_on_operations_when_stop_policy_is_met():
 
     with pytest.raises(RetryError):
         wrapper.flaky()
+
+
+class NestedFlaky:
+    def __init__(self):
+        self.client = FlakyClient()
+
+
+def test_should_resolve_nested_objects():
+    wrapper = ResilientCallWrapper(
+        NestedFlaky(),
+        wait_policy=wait_incrementing(start=0, increment=0),
+        stop_policy=stop_after_attempt(2),
+    )
+
+    assert wrapper.client.flaky() == 1