pulse-framework 0.1.70__py3-none-any.whl → 0.1.72__py3-none-any.whl

pulse/queries/query.py

@@ -26,11 +26,13 @@ from pulse.queries.common import (
 	ActionError,
 	ActionResult,
 	ActionSuccess,
+	Key,
 	OnErrorFn,
 	OnSuccessFn,
 	QueryKey,
 	QueryStatus,
 	bind_state,
+	normalize_key,
 )
 from pulse.queries.effect import AsyncQueryEffect
 from pulse.reactive import Computed, Effect, Signal, Untrack
@@ -239,7 +241,8 @@ async def run_fetch_with_retries(
 				result = await fetch_fn()
 			state.set_success(result)
 			if on_success:
-				await maybe_await(call_flexible(on_success, result))
+				with Untrack():
+					await maybe_await(call_flexible(on_success, result))
 			return
 		except asyncio.CancelledError:
 			raise
@@ -252,7 +255,8 @@ async def run_fetch_with_retries(
 				state.retry_reason.write(e)
 				state.apply_error(e)
 				if on_error:
-					await maybe_await(call_flexible(on_error, e))
+					with Untrack():
+						await maybe_await(call_flexible(on_error, e))
 				return
 
 
@@ -263,7 +267,7 @@ class KeyedQuery(Generic[T], Disposable):
 	Multiple observers can share the same query.
 	"""
 
-	key: QueryKey
+	key: Key
 	state: QueryState[T]
 	observers: "list[KeyedQueryResult[T]]"
 	_task: asyncio.Task[None] | None
@@ -283,7 +287,7 @@ class KeyedQuery(Generic[T], Disposable):
 		gc_time: float = 300.0,
 		on_dispose: Callable[[Any], None] | None = None,
 	):
-		self.key = key
+		self.key = normalize_key(key)
 		self.state = QueryState(
 			name=str(key),
 			retries=retries,
@@ -559,7 +563,8 @@ class KeyedQuery(Generic[T], Disposable):
 				)
 
 		if len(self.observers) == 0:
-			self.schedule_gc()
+			if not self.__disposed__:
+				self.schedule_gc()
 
 	def schedule_gc(self):
 		self.cancel_gc()
@@ -1055,7 +1060,7 @@ class QueryProperty(Generic[T, TState], InitializableProperty):
 	_initial_data_updated_at: float | dt.datetime | None
 	_enabled: bool
 	_initial_data: T | Callable[[TState], T] | Missing | None
-	_key: QueryKey | Callable[[TState], QueryKey] | None
+	_key: Key | Callable[[TState], Key] | None
 	# Not using OnSuccessFn and OnErrorFn since unions of callables are not well
 	# supported in the type system. We just need to be careful to use
 	# call_flexible to invoke these functions.
@@ -1081,7 +1086,17 @@ class QueryProperty(Generic[T, TState], InitializableProperty):
 	):
 		self.name = name
 		self._fetch_fn = fetch_fn
-		self._key = key
+		if key is None:
+			self._key = None
+		elif callable(key):
+			key_fn = key
+
+			def normalized_key(state: TState) -> Key:
+				return normalize_key(key_fn(state))
+
+			self._key = normalized_key
+		else:
+			self._key = normalize_key(key)
 		self._on_success_fn = None
 		self._on_error_fn = None
 		self._keep_previous_data = keep_previous_data
@@ -1102,7 +1117,11 @@ class QueryProperty(Generic[T, TState], InitializableProperty):
 			raise RuntimeError(
 				f"Cannot use @{self.name}.key decorator when a key is already provided to @query(key=...)."
 			)
-		self._key = fn
+
+		def normalized_key(state: TState) -> Key:
+			return normalize_key(fn(state))
+
+		self._key = normalized_key
 		return fn
 
 	# Decorator to attach a function providing initial data
@@ -1270,6 +1289,7 @@ class QueryProperty(Generic[T, TState], InitializableProperty):
 def query(
 	fn: Callable[[TState], Awaitable[T]],
 	*,
+	key: QueryKey | Callable[[TState], QueryKey] | None = None,
 	stale_time: float = 0.0,
 	gc_time: float | None = 300.0,
 	refetch_interval: float | None = None,
@@ -1279,7 +1299,6 @@ def query(
 	initial_data_updated_at: float | dt.datetime | None = None,
 	enabled: bool = True,
 	fetch_on_mount: bool = True,
-	key: QueryKey | None = None,
 ) -> QueryProperty[T, TState]: ...
 
 
@@ -1287,6 +1306,7 @@ def query(
 def query(
 	fn: None = None,
 	*,
+	key: QueryKey | Callable[[TState], QueryKey] | None = None,
 	stale_time: float = 0.0,
 	gc_time: float | None = 300.0,
 	refetch_interval: float | None = None,
@@ -1296,13 +1316,13 @@ def query(
 	initial_data_updated_at: float | dt.datetime | None = None,
 	enabled: bool = True,
 	fetch_on_mount: bool = True,
-	key: QueryKey | None = None,
 ) -> Callable[[Callable[[TState], Awaitable[T]]], QueryProperty[T, TState]]: ...
 
 
 def query(
 	fn: Callable[[TState], Awaitable[T]] | None = None,
 	*,
+	key: QueryKey | Callable[[TState], QueryKey] | None = None,
 	stale_time: float = 0.0,
 	gc_time: float | None = 300.0,
 	refetch_interval: float | None = None,
@@ -1312,7 +1332,6 @@ def query(
 	initial_data_updated_at: float | dt.datetime | None = None,
 	enabled: bool = True,
 	fetch_on_mount: bool = True,
-	key: QueryKey | None = None,
 ) -> (
 	QueryProperty[T, TState]
 	| Callable[[Callable[[TState], Awaitable[T]]], QueryProperty[T, TState]]

pulse/queries/store.py

@@ -3,7 +3,7 @@ from collections.abc import Callable
 from typing import Any, TypeVar, cast
 
 from pulse.helpers import MISSING, Missing
-from pulse.queries.common import QueryKey
+from pulse.queries.common import Key, QueryKey, normalize_key
 from pulse.queries.infinite_query import InfiniteQuery, Page
 from pulse.queries.query import RETRY_DELAY_DEFAULT, KeyedQuery
 
@@ -16,7 +16,7 @@ class QueryStore:
 	"""
 
 	def __init__(self):
-		self._entries: dict[QueryKey, KeyedQuery[Any] | InfiniteQuery[Any, Any]] = {}
+		self._entries: dict[Key, KeyedQuery[Any] | InfiniteQuery[Any, Any]] = {}
 
 	def items(self):
 		"""Iterate over all (key, query) pairs in the store."""
@@ -24,7 +24,7 @@ class QueryStore:
 
 	def get_any(self, key: QueryKey):
 		"""Get any query (regular or infinite) by key, or None if not found."""
-		return self._entries.get(key)
+		return self._entries.get(normalize_key(key))
 
 	def ensure(
 		self,
@@ -35,8 +35,9 @@ class QueryStore:
 		retries: int = 3,
 		retry_delay: float = RETRY_DELAY_DEFAULT,
 	) -> KeyedQuery[T]:
+		nkey = normalize_key(key)
 		# Return existing entry if present
-		existing = self._entries.get(key)
+		existing = self._entries.get(nkey)
 		if existing:
 			if isinstance(existing, InfiniteQuery):
 				raise TypeError(
@@ -49,7 +50,7 @@ class QueryStore:
 				del self._entries[e.key]
 
 		entry = KeyedQuery(
-			key,
+			nkey,
 			initial_data=initial_data,
 			initial_data_updated_at=initial_data_updated_at,
 			gc_time=gc_time,
@@ -57,14 +58,14 @@ class QueryStore:
 			retry_delay=retry_delay,
 			on_dispose=_on_dispose,
 		)
-		self._entries[key] = entry
+		self._entries[nkey] = entry
 		return entry
 
 	def get(self, key: QueryKey) -> KeyedQuery[Any] | None:
 		"""
 		Get an existing regular query by key, or None if not found.
 		"""
-		existing = self._entries.get(key)
+		existing = self._entries.get(normalize_key(key))
 		if existing and isinstance(existing, InfiniteQuery):
 			return None
 		return existing
@@ -73,7 +74,7 @@ class QueryStore:
 		"""
 		Get an existing infinite query by key, or None if not found.
 		"""
-		existing = self._entries.get(key)
+		existing = self._entries.get(normalize_key(key))
 		if existing and isinstance(existing, InfiniteQuery):
 			return existing
 		return None
@@ -93,7 +94,8 @@ class QueryStore:
 		retries: int = 3,
 		retry_delay: float = RETRY_DELAY_DEFAULT,
 	) -> InfiniteQuery[Any, Any]:
-		existing = self._entries.get(key)
+		nkey = normalize_key(key)
+		existing = self._entries.get(nkey)
 		if existing:
 			if not isinstance(existing, InfiniteQuery):
 				raise TypeError(
@@ -106,7 +108,7 @@ class QueryStore:
 				del self._entries[e.key]
 
 		entry = InfiniteQuery(
-			key,
+			nkey,
 			initial_page_param=initial_page_param,
 			get_next_page_param=get_next_page_param,
 			get_previous_page_param=get_previous_page_param,
@@ -118,7 +120,7 @@ class QueryStore:
 			retry_delay=retry_delay,
 			on_dispose=_on_dispose,
 		)
-		self._entries[key] = entry
+		self._entries[nkey] = entry
 		return entry
 
 	def dispose_all(self) -> None:

pulse/render_session.py

@@ -285,7 +285,6 @@ class RenderSession:
 		self._send_message = None
 		self._global_states = {}
 		self._global_queue = []
-		self.query_store = QueryStore()
 		self.connected = False
 		self.channels = ChannelsManager(self)
 		self.forms = FormRegistry(self)
@@ -293,6 +292,7 @@ class RenderSession:
 		self._pending_js_results = {}
 		self._tasks = TaskRegistry(name=f"render:{id}")
 		self._timers = TimerRegistry(tasks=self._tasks, name=f"render:{id}")
+		self.query_store = QueryStore()
 		self.prerender_queue_timeout = prerender_queue_timeout
 		self.detach_queue_timeout = detach_queue_timeout
 		self.disconnect_queue_timeout = disconnect_queue_timeout
@@ -574,9 +574,10 @@ class RenderSession:
 	# ---- Helpers ----
 
 	def close(self):
+		# Close all pending timers at the start, to avoid anything firing while we clean up
+		self._timers.cancel_all()
 		self.forms.dispose()
 		self._tasks.cancel_all()
-		self._timers.cancel_all()
 		for path in list(self.route_mounts.keys()):
 			self.detach(path, timeout=0)
 		self.route_mounts.clear()
@@ -597,6 +598,8 @@ class RenderSession:
 			if not fut.done():
 				fut.cancel()
 		self._pending_js_results.clear()
+		# Close any timer that may have been scheduled during cleanup (ex: query GC)
+		self._timers.cancel_all()
 		self._global_queue = []
 		self._send_message = None
 		self.connected = False

{pulse_framework-0.1.70.dist-info → pulse_framework-0.1.72.dist-info}/METADATA

@@ -1,20 +1,20 @@
 Metadata-Version: 2.3
 Name: pulse-framework
-Version: 0.1.70
+Version: 0.1.72
 Summary: Pulse - Full-stack framework for building real-time React applications in Python
-Requires-Dist: websockets>=12.0
 Requires-Dist: fastapi>=0.128.0
 Requires-Dist: uvicorn>=0.24.0
 Requires-Dist: mako>=1.3.10
 Requires-Dist: typer>=0.16.0
 Requires-Dist: python-socketio>=5.16.0
 Requires-Dist: rich>=13.7.1
-Requires-Dist: python-multipart>=0.0.20
+Requires-Dist: python-multipart>=0.0.22
 Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: starlette>=0.50.0,<0.51.0
 Requires-Dist: urllib3>=2.6.3
 Requires-Dist: watchfiles>=1.1.0
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: aiohttp>=3.12.0
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 

{pulse_framework-0.1.70.dist-info → pulse_framework-0.1.72.dist-info}/RECORD

@@ -1,11 +1,11 @@
-pulse/__init__.py,sha256=cXNVXz0aizbkOG1aj2zytgzodyVNv7nNylsXcWmH-Lc,32183
+pulse/__init__.py,sha256=VV1oD_y0xnhQ_yBj1XqGWjIaw4Hi-xGHYQfEMv-Z1Bo,32453
 pulse/_examples.py,sha256=dFuhD2EVXsbvAeexoG57s4VuN4gWLaTMOEMNYvlPm9A,561
-pulse/app.py,sha256=TjMP21lpwYpRnkMkeKL8EA22V9xSKTA6_5GQI9Btw_o,36059
+pulse/app.py,sha256=Bi94rYG-MoldkGa-_CscLMstjTEV8BHVAgDbvapRGzI,36167
 pulse/channel.py,sha256=ePpvD2mDbddt_LMxxxDjNRgOLbVi8Ed6TmJFgkrALB0,15790
 pulse/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulse/cli/cmd.py,sha256=zh3Ah6c16cNg3o_v_If_S58Qe8rvxNe5M2VrTkwvDU8,15957
+pulse/cli/cmd.py,sha256=LQK_B6iANOAqcQCM0KMTfRbpqGYRaPDkEBvvaAS3qNI,15985
 pulse/cli/dependencies.py,sha256=qU-rF7QyP0Rl1Fl0YKQubrGNBzj84BAbH1uUT3ehxik,4283
-pulse/cli/folder_lock.py,sha256=-AKld2iM91G0uHB3F5ARD0QAjOw0TmsYYGaFgy_V350,3477
+pulse/cli/folder_lock.py,sha256=CGJCovbSxZ59dllwNUqtPDx6YCED8k3ct5ZsEL0gzfw,4035
 pulse/cli/helpers.py,sha256=XXRRXeGFgeq-jbp0QGFFVq_aGg_Kp7_AkYsTK8LfSdg,7810
 pulse/cli/logging.py,sha256=3uuB1dqI-lHJkodNUURN6UMWdKF5UQ9spNG-hBG7bA4,2516
 pulse/cli/models.py,sha256=NBV5byBDNoAQSk0vKwibLjoxuA85XBYIyOVJn64L8oU,858
@@ -17,7 +17,7 @@ pulse/code_analysis.py,sha256=NBba_7VtOxZYMyfku_p-bWkG0O_1pi1AxcaNyVM1nmY,1024
 pulse/codegen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulse/codegen/codegen.py,sha256=Zw55vzevg_17hFtSi6KLl-EWSiABKRfZe6fB-cWpLAk,10330
 pulse/codegen/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulse/codegen/templates/layout.py,sha256=xz2ImZrbpu-tUkHZ38U6npIDzeYhrR_s41BuNPJUnOU,4470
+pulse/codegen/templates/layout.py,sha256=nJ9k0MDUHOGjtwbt8QAo9XdCPR06rqJSU9E8Qi4Uot4,4597
 pulse/codegen/templates/route.py,sha256=UjBrb3e_8tMkd1OjBjEsnYmK6PCQqOYZBWDuU59FcrI,9234
 pulse/codegen/templates/routes_ts.py,sha256=nPgKCvU0gzue2k6KlOL1TJgrBqqRLmyy7K_qKAI8zAE,1129
 pulse/codegen/utils.py,sha256=QoXcV-h-DLLmq_t03hDNUePS0fNnofUQLoR-TXzDFCY,539
@@ -41,7 +41,7 @@ pulse/forms.py,sha256=0irpErCMJk8-YO1BrxjMkFb8dnvSz3rfzTywmMeib7g,14042
 pulse/helpers.py,sha256=imVA9XzkYrYmdeqEdD7ot0g99adL1SVKv5bQGkKb-aQ,9504
 pulse/hooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulse/hooks/core.py,sha256=tDEcB_CTD4yI5bNKn7CtB40sRKIanGNqPD5_qLgSzf4,10982
-pulse/hooks/effects.py,sha256=cEPurXwRQoFmxasI0tZE1cQsZYnZr6VB5mWMUK0Db8c,2604
+pulse/hooks/effects.py,sha256=IRb37K9p0egBqlPvAnlW5dPohPvQGzmcyLSgbuNk5FU,3005
 pulse/hooks/init.py,sha256=PhjVBLlHpodPzVrRcx_QfEUrsx_6gEX_NuVhe6ojiYI,17834
 pulse/hooks/runtime.py,sha256=nxqwl8ByclIh5i3ZcCN6L3f0X3ZpwOBWajLb_FSbcDw,11839
 pulse/hooks/setup.py,sha256=ILbn2v6UFJPFBOWnJef1X2A9JLpIagEHN9Mx0d9947I,6925
@@ -74,21 +74,21 @@ pulse/js/window.py,sha256=yC1BjyH2jqp1x-CXJCUFta-ASyZ5668ozQ0AmAjZcxA,4097
 pulse/messages.py,sha256=hz5EUFVHbzXHkcByZcV_Y199vb-M9cGjMMBL1HXPctE,4024
 pulse/middleware.py,sha256=2syzmJ0r9fEa0k1pD7zC_1DHUMs9qLSWRzo5XXtKqsA,10896
 pulse/plugin.py,sha256=bu90qaUVFtZsIsW41dpshVK1vvIGHUsg6mFoiF0Wfso,2370
-pulse/proxy.py,sha256=tj30GIJJVNKMxMwPNJ39-gn3PAXbx5wua4PiQ7XupvQ,7857
+pulse/proxy.py,sha256=c13b0fE3sq82sFo46vv0emWLQ_ePwRkI7hiPZrnQDCE,22780
 pulse/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulse/queries/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulse/queries/client.py,sha256=52T4MvorDr-T5UsJlndcEgnrPDs3QxIYP-MZtBSEuvc,18583
-pulse/queries/common.py,sha256=TYhn6LyldfmOKYYurxINgCEr3C3WSEwB0cIki1a5iBM,2488
+pulse/queries/client.py,sha256=KMGT92dESMrzpLlhd701fyh7Wrs3VKmM5cZoRQ0AEzg,18994
+pulse/queries/common.py,sha256=tjW5pqpWvRYUy3gsj-KxhUB9c5KBOgBqRKIuKJkob9A,4278
 pulse/queries/effect.py,sha256=1ePUi2TwP49L9LhlkKI2qV_HhIO4jKj1r5jyPaWiUn8,1508
-pulse/queries/infinite_query.py,sha256=oyEheqi2z79_DaG0loZd5eIwfBSmqEURuTEyQeJRVBc,49110
+pulse/queries/infinite_query.py,sha256=QZmXN2G8r0FA7cCez5bjPxEEvWZTB2Sl5_Pob3d5E6E,50489
 pulse/queries/mutation.py,sha256=fhEpOZ7CuHImH4Y02QapYdTJrwe6K52-keb0d67wmms,8274
 pulse/queries/protocol.py,sha256=TOrUiI4QK55xuh0i4ch1u96apNl12QeYafkf6RVDd08,3544
-pulse/queries/query.py,sha256=PhPUx975f1rO8ACiCiOCndrtuOmy4VA48ii3rIHUWRM,41351
-pulse/queries/store.py,sha256=4pWTDSl71LUM7YqhWanKjZkFh3t8F_04o48js_H4ttQ,3728
+pulse/queries/query.py,sha256=Ap1PRKoc1U1ddhnnHgBOuNX9oUcYD9nInpq87uTLnb8,41849
+pulse/queries/store.py,sha256=iw05_EFpyfiXv5_FV_x4aHtCo00mk0dDPFD461cajcg,3850
 pulse/react_component.py,sha256=8RLg4Bi7IcjqbnbEnp4hJpy8t1UsE7mG0UR1Q655LDk,2332
 pulse/reactive.py,sha256=GSh9wSH3THCBjDTafwWttyx7djeKBWV_KqjaKRYUNsA,31393
 pulse/reactive_extensions.py,sha256=yQ1PpdAh4kMvll7R15T72FOg8NFdG_HGBsGc63dawYk,33754
-pulse/render_session.py,sha256=RJgxJp_yRpDBr3l9ZFW0Eb6-dSp_urTzzPhPcHd0_Vo,23224
+pulse/render_session.py,sha256=65mhbKZ9o1vIDSRrM2p3VNPmo6Z5vn1Aoz7we5mw7P8,23417
 pulse/renderer.py,sha256=fjSsUvCqV12jyN7Y5XspKUfjQJJzKX-Chha5oF5PrAk,16001
 pulse/request.py,sha256=N0oFOLiGxpbgSgxznjvu64lG3YyOcZPKC8JFyKx6X7w,6023
 pulse/requirements.py,sha256=nMnE25Uu-TUuQd88jW7m2xwus6fD-HvXxQ9UNb7OOGc,1254
@@ -122,7 +122,7 @@ pulse/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulse/types/event_handler.py,sha256=psQCydj-WEtBcFU5JU4mDwvyzkW8V2O0g_VFRU2EOHI,1618
 pulse/user_session.py,sha256=nsnsMgqq2xGJZLpbHRMHUHcLrElMP8WcA4gjGMrcoBk,10208
 pulse/version.py,sha256=711vaM1jVIQPgkisGgKZqwmw019qZIsc_QTae75K2pg,1895
-pulse_framework-0.1.70.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-pulse_framework-0.1.70.dist-info/entry_points.txt,sha256=i7aohd3QaPu5IcuGKKvsQQEiMYMe5HcF56QEsaLVO64,46
-pulse_framework-0.1.70.dist-info/METADATA,sha256=zUio7-V0_fgct5WwsWMwjrTqqJLQpbIkcFoAVE8Syoc,8300
-pulse_framework-0.1.70.dist-info/RECORD,,
+pulse_framework-0.1.72.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+pulse_framework-0.1.72.dist-info/entry_points.txt,sha256=i7aohd3QaPu5IcuGKKvsQQEiMYMe5HcF56QEsaLVO64,46
+pulse_framework-0.1.72.dist-info/METADATA,sha256=Vn_d62C23dTizl4uuQ05BAkhQUDrBmnELQI3OrHkkE8,8299
+pulse_framework-0.1.72.dist-info/RECORD,,