laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests and address comments

Browse Source
This commit is contained in:
Elijah 2024-12-12 06:27:54 +00:00
parent 8836117b42
commit 1f2eafb4e7
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
reflex/state.py
View File

@ -3240,7 +3240,7 @@ class StateManagerRedis(StateManager):
# The maximum time to hold a lock (ms). # The maximum time to hold a lock (ms).
lock_expiration: int = pydantic.Field(default_factory=_default_lock_expiration) lock_expiration: int = pydantic.Field(default_factory=_default_lock_expiration)
# The minimum time to hold a lock (ms). # The maximum time to hold a lock (ms) before warning.
lock_warning_threshold: int = pydantic.Field( lock_warning_threshold: int = pydantic.Field(
default_factory=_default_lock_warning_threshold default_factory=_default_lock_warning_threshold
) )
@ -3436,12 +3436,10 @@ class StateManagerRedis(StateManager):
time_taken = self.lock_expiration / 1000 - ( time_taken = self.lock_expiration / 1000 - (
await self.redis.ttl(self._lock_key(token)) await self.redis.ttl(self._lock_key(token))
) )
_validate_lock_warning_threshold(
self.lock_warning_threshold, self.lock_expiration
)
if time_taken > self.lock_warning_threshold / 1000: if time_taken > self.lock_warning_threshold / 1000:
console.warn( console.warn(
f"Lock for token {token} was held too long {time_taken=}s, avoid blocking operations.", f"Lock for token {token} was held too long {time_taken=}s, "
f"use `@rx.event(background=True)` decorator for long-running tasks.",
dedupe=True, dedupe=True,
) )

37
tests/units/test_state.py
View File

@ -3289,15 +3289,41 @@ async def test_setvar_async_setter():
@pytest.mark.parametrize( @pytest.mark.parametrize(
"expiration_kwargs, expected_values", "expiration_kwargs, expected_values",
[ [
({"redis_lock_expiration": 20000}, (20000, constants.Expiration.TOKEN)), (
{"redis_lock_expiration": 20000},
(
20000,
constants.Expiration.TOKEN,
constants.Expiration.LOCK_WARNING_THRESHOLD,
),
),
( (
{"redis_lock_expiration": 50000, "redis_token_expiration": 5600}, {"redis_lock_expiration": 50000, "redis_token_expiration": 5600},
(50000, 5600), (50000, 5600, constants.Expiration.LOCK_WARNING_THRESHOLD),
), ),
({"redis_token_expiration": 7600}, (constants.Expiration.LOCK, 7600)),
( (
{"redis_lock_expiration": 50000, "redis_lock_warning_threshold": 2000}, {"redis_token_expiration": 7600},
(50000, 2000), (
constants.Expiration.LOCK,
7600,
constants.Expiration.LOCK_WARNING_THRESHOLD,
),
),
(
{"redis_lock_expiration": 50000, "redis_lock_warning_threshold": 1500},
(50000, constants.Expiration.TOKEN, 1500),
),
(
{"redis_token_expiration": 5600, "redis_lock_warning_threshold": 3000},
(constants.Expiration.LOCK, 5600, 3000),
),
(
{
"redis_lock_expiration": 50000,
"redis_token_expiration": 5600,
"redis_lock_warning_threshold": 2000,
},
(50000, 5600, 2000),
), ),
], ],
) )
@ -3328,6 +3354,7 @@ config = rx.Config(
state_manager = StateManager.create(state=State) state_manager = StateManager.create(state=State)
assert state_manager.lock_expiration == expected_values[0] # type: ignore assert state_manager.lock_expiration == expected_values[0] # type: ignore
assert state_manager.token_expiration == expected_values[1] # type: ignore assert state_manager.token_expiration == expected_values[1] # type: ignore
assert state_manager.lock_warning_threshold == expected_values[2] # type: ignore
@pytest.mark.skipif("REDIS_URL" not in os.environ, reason="Test requires redis") @pytest.mark.skipif("REDIS_URL" not in os.environ, reason="Test requires redis")