Implement WrapperHandler for managing multiple news API wrappers; add tests for wrapper functionality

tests/agents/test_predictor.py

@@ -16,8 +16,8 @@ def unified_checks(model: AppModels, input):
     for item in content.portfolio:
         assert item.asset not in (None, "", "null")
         assert isinstance(item.asset, str)
-        assert item.percentage > 0
-        assert item.percentage <= 100
+        assert item.percentage >= 0.0
+        assert item.percentage <= 100.0
         assert isinstance(item.percentage, (int, float))
         assert item.motivation not in (None, "", "null")
         assert isinstance(item.motivation, str)
@@ -41,6 +41,7 @@ class TestPredictor:
     def test_gemini_model_output(self, inputs):
         unified_checks(AppModels.GEMINI, inputs)
 
+    @pytest.mark.slow
     def test_ollama_qwen_model_output(self, inputs):
         unified_checks(AppModels.OLLAMA_QWEN, inputs)
 

tests/conftest.py

@@ -22,6 +22,7 @@ def pytest_configure(config:pytest.Config):
         ("ollama_qwen", "marks tests that use Ollama Qwen model"),
         ("news", "marks tests that use news"),
         ("limited", "marks tests that have limited execution due to API constraints"),
+        ("wrapper", "marks tests for wrapper handler"),
     ]
     for marker in markers:
         line = f"{marker[0]}: {marker[1]}"

tests/utils/test_wrapper_handler.py

@@ -0,0 +1,60 @@
+import pytest
+from app.utils.wrapper_handler import WrapperHandler
+
+class MockWrapper:
+    def do_something(self) -> str:
+        return "Success"
+
+class FailingWrapper(MockWrapper):
+    def do_something(self):
+        raise Exception("Intentional Failure")
+
+
+@pytest.mark.wrapper
+class TestWrapperHandler:
+    def test_all_wrappers_fail(self):
+        wrappers = [FailingWrapper, FailingWrapper]
+        handler: WrapperHandler[MockWrapper] = WrapperHandler.build_wrappers(wrappers, try_per_wrapper=2, retry_delay=0)
+
+        with pytest.raises(Exception) as exc_info:
+            handler.try_call(lambda w: w.do_something())
+        assert "All wrappers failed after retries" in str(exc_info.value)
+
+    def test_success_on_first_try(self):
+        wrappers = [MockWrapper, FailingWrapper]
+        handler: WrapperHandler[MockWrapper] = WrapperHandler.build_wrappers(wrappers, try_per_wrapper=2, retry_delay=0)
+
+        result = handler.try_call(lambda w: w.do_something())
+        assert result == "Success"
+        assert handler.index == 0  # Should still be on the first wrapper
+        assert handler.retry_count == 0
+
+    def test_eventual_success(self):
+        wrappers = [FailingWrapper, MockWrapper]
+        handler: WrapperHandler[MockWrapper] = WrapperHandler.build_wrappers(wrappers, try_per_wrapper=2, retry_delay=0)
+
+        result = handler.try_call(lambda w: w.do_something())
+        assert result == "Success"
+        assert handler.index == 1  # Should have switched to the second wrapper
+        assert handler.retry_count == 0
+
+    def test_partial_failures(self):
+        wrappers = [FailingWrapper, MockWrapper, FailingWrapper]
+        handler: WrapperHandler[MockWrapper] = WrapperHandler.build_wrappers(wrappers, try_per_wrapper=1, retry_delay=0)
+
+        result = handler.try_call(lambda w: w.do_something())
+        assert result == "Success"
+        assert handler.index == 1  # Should have switched to the second wrapper
+        assert handler.retry_count == 0
+
+        # Next call should still succeed on the second wrapper
+        result = handler.try_call(lambda w: w.do_something())
+        assert result == "Success"
+        assert handler.index == 1  # Should still be on the second wrapper
+        assert handler.retry_count == 0
+
+        handler.index = 2  # Manually switch to the third wrapper
+        result = handler.try_call(lambda w: w.do_something())
+        assert result == "Success"
+        assert handler.index == 1  # Should return to the second wrapper after failure
+        assert handler.retry_count == 0