refactor: remove WithState as it wasn't doing anything beyond functools.wraps

Author: sassanh

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Upcoming
+
+- refactor: remove `WithState` as it wasn't doing anything beyond `functools.wraps`
+
 ## Version 0.22.2
 
 - fix: add `__qualname__`, `__annotations__`, `__module__`, `__defaults__` and `__kwdefaults__` to `Autorun` and `WithStore` instances so that they play nice when passed as a function to something assuming they are normal function having these properties.

pyproject.toml

@@ -7,13 +7,13 @@ authors = [{ name = "Sassan Haradji", email = "me@sassanh.com" }]
 maintainers = [{ name = "Sassan Haradji", email = "me@sassanh.com" }]
 readme = "README.md"
 requires-python = ">=3.11"
-keywords = ['store', 'redux', 'reactive', 'autorun']
+keywords = ['python', 'store', 'redux', 'reactive', 'autorun', 'view']
 dependencies = ["python-immutable >= 1.1.1", "python-strtobool >= 1.0.0"]
 
 [tool.uv]
 dev-dependencies = [
   "poethepoet >= 0.24.4",
-  "pyright >= 1.1.397",
+  "pyright >= 1.1.399",
   "ruff >= 0.11.0",
   "pytest >= 8.1.1",
   "pytest-cov >= 4.1.0",
@@ -85,7 +85,7 @@ exclude = ['typings', '.venv']
 filterwarnings = 'error'
 
 [tool.pytest.ini_options]
-log_cli = 1
+log_cli = true
 log_cli_level = 'ERROR'
 timeout = 1
 

redux/main.py

@@ -7,6 +7,7 @@
 import queue
 import weakref
 from collections import defaultdict
+from functools import wraps
 from threading import Lock, Thread
 from typing import (
     TYPE_CHECKING,
@@ -59,7 +60,6 @@
 )
 from redux.serialization_mixin import SerializationMixin
 from redux.side_effect_runner import SideEffectRunnerThread
-from redux.with_state import WithState
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Callable
@@ -442,7 +442,26 @@ def with_state_decorator(
                 ReturnType,
             ],
         ) -> Callable[Args, ReturnType]:
-            return WithState(store=self, selector=selector, func=cast('Callable', func))
+            def wrapper(*args: Args.args, **kwargs: Args.kwargs) -> ReturnType:
+                if self._state is None:
+                    msg = 'Store has not been initialized yet.'
+                    raise RuntimeError(msg)
+                return func(selector(self._state), *args, **kwargs)
+
+            signature = inspect.signature(func)
+            parameters = list(signature.parameters.values())
+            if parameters and parameters[0].kind in [
+                inspect.Parameter.POSITIONAL_ONLY,
+                inspect.Parameter.POSITIONAL_OR_KEYWORD,
+            ]:
+                parameters = parameters[1:]
+
+            wrapped = wraps(func)(wrapper)
+            wrapped.__signature__ = signature.replace(  # pyright: ignore [reportAttributeAccessIssue]
+                parameters=parameters,
+            )
+
+            return wrapped
 
         return with_state_decorator
 

redux/with_state.py

@@ -17,7 +17,7 @@
 if TYPE_CHECKING:
     from collections.abc import Callable
 
-    from _pytest.fixtures import SubRequest
+    from _pytest.fixtures import SubRequest  # pyright: ignore[reportPrivateImportUsage]
 
     from redux.main import Store
 

redux_pytest/fixtures/snapshot.py

@@ -1,6 +1,5 @@
 # ruff: noqa: D100, D101, D102, D103, D104, D107
 import pytest
-from _pytest.outcomes import Failed
 from tenacity import RetryError, stop_after_delay
 from tenacity.wait import wait_fixed
 
@@ -15,9 +14,9 @@ def test_asyncheonous(
     async def runner() -> None:
         @wait_for(run_async=True, timeout=1)
         def check() -> None:
-            pytest.fail('Never')
+            raise RuntimeError
 
-        with pytest.raises(Failed, match=r'^Never$'):
+        with pytest.raises(RetryError):
             await check()
 
         event_loop.stop()
@@ -50,16 +49,16 @@ def check(min_value: int) -> None:
 def test_with_stop(wait_for: WaitFor) -> None:
     @wait_for(stop=stop_after_delay(0.1))
     def check() -> None:
-        pytest.fail('Never')
+        raise RuntimeError
 
-    with pytest.raises(Failed, match=r'^Never$'):
+    with pytest.raises(RetryError):
         check()
 
 
 def test_with_timeout(wait_for: WaitFor) -> None:
     @wait_for(timeout=0.1)
     def check() -> None:
-        pytest.fail('Never')
+        raise RuntimeError
 
-    with pytest.raises(Failed, match=r'^Never$'):
+    with pytest.raises(RetryError):
         check()

tests/test_wait_for_fixture.py

@@ -63,25 +63,14 @@ def test_name_attr(store: StoreType) -> None:
     def decorated(value: int) -> int:
         return value
 
-    assert decorated.__name__ == 'WithState:decorated'
-    assert decorated.__qualname__ == 'WithState:test_name_attr.<locals>.decorated'
+    assert decorated.__name__ == 'decorated'
+    assert decorated.__qualname__ == 'test_name_attr.<locals>.decorated'
 
     inline_decorated = store.with_state(lambda state: state.value)(
         lambda value: value,
     )
 
-    assert inline_decorated.__name__ == 'WithState:<lambda>'
-
-    class Decorated:
-        def __call__(self, value: int) -> int:
-            return value
-
-        def __repr__(self) -> str:
-            return 'Decorated'
-
-    decorated_instance = store.with_state(lambda state: state.value)(Decorated())
-
-    assert decorated_instance.__name__ == 'WithState:Decorated'
+    assert inline_decorated.__name__ == '<lambda>'
 
     store.dispatch(InitAction())
     store.dispatch(FinishAction())
@@ -95,7 +84,7 @@ def func(value: int) -> int:
         return value
 
     assert re.match(
-        r'.*\(func: <function test_repr\.<locals>\.func at .*>\)$',
+        r'.*<function test_repr\.<locals>\.func at .*>$',
         repr(func),
     )