pyview-web 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of pyview-web might be problematic. Click here for more details.
- pyview/async_stream_runner.py +65 -0
- pyview/events/BaseEventHandler.py +28 -2
- pyview/events/__init__.py +2 -2
- pyview/events/info_event.py +9 -1
- pyview/live_socket.py +2 -0
- {pyview_web-0.2.3.dist-info → pyview_web-0.2.4.dist-info}/METADATA +1 -1
- {pyview_web-0.2.3.dist-info → pyview_web-0.2.4.dist-info}/RECORD +9 -8
- {pyview_web-0.2.3.dist-info → pyview_web-0.2.4.dist-info}/LICENSE +0 -0
- {pyview_web-0.2.3.dist-info → pyview_web-0.2.4.dist-info}/WHEEL +0 -0
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import asyncio
|
|
2
|
+
import uuid
|
|
3
|
+
import logging
|
|
4
|
+
from typing import Any, AsyncGenerator, Callable, Optional
|
|
5
|
+
from pyview.events.info_event import InfoEvent, InfoEventScheduler
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
class AsyncStreamRunner:
|
|
9
|
+
def __init__(self, scheduler: InfoEventScheduler):
|
|
10
|
+
self._stream_tasks: dict[str, asyncio.Task] = {}
|
|
11
|
+
self._scheduler = scheduler
|
|
12
|
+
|
|
13
|
+
def start_stream(
|
|
14
|
+
self,
|
|
15
|
+
gen: AsyncGenerator[Any, None],
|
|
16
|
+
*,
|
|
17
|
+
on_yield: Callable[[Any], InfoEvent],
|
|
18
|
+
on_done: Optional[InfoEvent] = None,
|
|
19
|
+
on_error: Optional[Callable[[Exception], InfoEvent]] = None,
|
|
20
|
+
on_cancel: Optional[InfoEvent] = None,
|
|
21
|
+
) -> str:
|
|
22
|
+
"""
|
|
23
|
+
Run `gen` in the background, returning an op_id you can later use
|
|
24
|
+
to cancel. Hooks:
|
|
25
|
+
|
|
26
|
+
- on_yield(item) → scheduled per chunk
|
|
27
|
+
- on_done → scheduled once at normal completion
|
|
28
|
+
- on_error(exc) → scheduled on unexpected exception
|
|
29
|
+
- on_cancel → scheduled if the task is cancelled
|
|
30
|
+
"""
|
|
31
|
+
task_id = uuid.uuid4().hex
|
|
32
|
+
|
|
33
|
+
async def driver():
|
|
34
|
+
try:
|
|
35
|
+
async for item in gen:
|
|
36
|
+
self._scheduler.schedule_info_once(on_yield(item))
|
|
37
|
+
except asyncio.CancelledError:
|
|
38
|
+
# user-requested cancellation
|
|
39
|
+
if on_cancel:
|
|
40
|
+
self._scheduler.schedule_info_once(on_cancel)
|
|
41
|
+
# swallow so it doesn’t log as an “error”
|
|
42
|
+
except Exception as exc:
|
|
43
|
+
if on_error:
|
|
44
|
+
self._scheduler.schedule_info_once(on_error(exc))
|
|
45
|
+
else:
|
|
46
|
+
logging.exception(f"Error in stream {task_id}", exc_info=True)
|
|
47
|
+
else:
|
|
48
|
+
if on_done:
|
|
49
|
+
self._scheduler.schedule_info_once(on_done)
|
|
50
|
+
finally:
|
|
51
|
+
self._stream_tasks.pop(task_id, None)
|
|
52
|
+
|
|
53
|
+
task = asyncio.create_task(driver())
|
|
54
|
+
self._stream_tasks[task_id] = task
|
|
55
|
+
return task_id
|
|
56
|
+
|
|
57
|
+
def cancel_stream(self, task_id: str) -> bool:
|
|
58
|
+
"""
|
|
59
|
+
Cancel a running stream. Returns True if a task was found & cancelled.
|
|
60
|
+
"""
|
|
61
|
+
task = self._stream_tasks.get(task_id)
|
|
62
|
+
if not task:
|
|
63
|
+
return False
|
|
64
|
+
task.cancel()
|
|
65
|
+
return True
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
from typing import Callable
|
|
1
|
+
from typing import Callable, TYPE_CHECKING
|
|
2
2
|
import logging
|
|
3
3
|
|
|
4
|
+
if TYPE_CHECKING:
|
|
5
|
+
from pyview.live_view import InfoEvent
|
|
6
|
+
|
|
4
7
|
|
|
5
8
|
def event(*event_names):
|
|
6
9
|
"""Decorator that marks methods as event handlers."""
|
|
@@ -12,22 +15,37 @@ def event(*event_names):
|
|
|
12
15
|
return decorator
|
|
13
16
|
|
|
14
17
|
|
|
18
|
+
def info(*info_names):
|
|
19
|
+
"""Decorator that marks methods as info handlers."""
|
|
20
|
+
|
|
21
|
+
def decorator(func):
|
|
22
|
+
func._info_names = info_names
|
|
23
|
+
return func
|
|
24
|
+
|
|
25
|
+
return decorator
|
|
26
|
+
|
|
27
|
+
|
|
15
28
|
class BaseEventHandler:
|
|
16
|
-
"""Base class for event handlers to handle dispatching events."""
|
|
29
|
+
"""Base class for event handlers to handle dispatching events and info."""
|
|
17
30
|
|
|
18
31
|
_event_handlers: dict[str, Callable] = {}
|
|
32
|
+
_info_handlers: dict[str, Callable] = {}
|
|
19
33
|
|
|
20
34
|
def __init_subclass__(cls, **kwargs):
|
|
21
35
|
super().__init_subclass__(**kwargs)
|
|
22
36
|
|
|
23
37
|
# Find all decorated methods and register them
|
|
24
38
|
cls._event_handlers = {}
|
|
39
|
+
cls._info_handlers = {}
|
|
25
40
|
for attr_name in dir(cls):
|
|
26
41
|
if not attr_name.startswith("_"):
|
|
27
42
|
attr = getattr(cls, attr_name)
|
|
28
43
|
if hasattr(attr, "_event_names"):
|
|
29
44
|
for event_name in attr._event_names:
|
|
30
45
|
cls._event_handlers[event_name] = attr
|
|
46
|
+
if hasattr(attr, "_info_names"):
|
|
47
|
+
for info_name in attr._info_names:
|
|
48
|
+
cls._info_handlers[info_name] = attr
|
|
31
49
|
|
|
32
50
|
async def handle_event(self, event: str, payload: dict, socket):
|
|
33
51
|
handler = self._event_handlers.get(event)
|
|
@@ -36,3 +54,11 @@ class BaseEventHandler:
|
|
|
36
54
|
return await handler(self, event, payload, socket)
|
|
37
55
|
else:
|
|
38
56
|
logging.warning(f"Unhandled event: {event} {payload}")
|
|
57
|
+
|
|
58
|
+
async def handle_info(self, info: "InfoEvent", socket):
|
|
59
|
+
handler = self._info_handlers.get(info.name)
|
|
60
|
+
|
|
61
|
+
if handler:
|
|
62
|
+
return await handler(self, info, socket)
|
|
63
|
+
else:
|
|
64
|
+
logging.warning(f"Unhandled info: {info.name} {info}")
|
pyview/events/__init__.py
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
from .BaseEventHandler import BaseEventHandler, event
|
|
1
|
+
from .BaseEventHandler import BaseEventHandler, event, info
|
|
2
2
|
from .info_event import InfoEvent
|
|
3
3
|
|
|
4
|
-
__all__ = ["BaseEventHandler", "event", "InfoEvent"]
|
|
4
|
+
__all__ = ["BaseEventHandler", "event", "info", "InfoEvent"]
|
pyview/events/info_event.py
CHANGED
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
from dataclasses import dataclass
|
|
2
|
-
from typing import Any
|
|
2
|
+
from typing import Any, Optional, Protocol
|
|
3
3
|
|
|
4
4
|
|
|
5
5
|
@dataclass
|
|
6
6
|
class InfoEvent:
|
|
7
7
|
name: str
|
|
8
8
|
payload: Any = None
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
class InfoEventScheduler(Protocol):
|
|
12
|
+
def schedule_info(self, event: InfoEvent, seconds: float):
|
|
13
|
+
pass
|
|
14
|
+
|
|
15
|
+
def schedule_info_once(self, event: InfoEvent, seconds: Optional[float] = None):
|
|
16
|
+
pass
|
pyview/live_socket.py
CHANGED
|
@@ -19,6 +19,7 @@ from pyview.uploads import UploadConstraints, UploadConfig, UploadManager
|
|
|
19
19
|
from pyview.meta import PyViewMeta
|
|
20
20
|
from pyview.template.render_diff import calc_diff
|
|
21
21
|
import datetime
|
|
22
|
+
from pyview.async_stream_runner import AsyncStreamRunner
|
|
22
23
|
|
|
23
24
|
|
|
24
25
|
if TYPE_CHECKING:
|
|
@@ -63,6 +64,7 @@ class ConnectedLiveViewSocket(Generic[T]):
|
|
|
63
64
|
self.pub_sub = PubSub(pub_sub_hub, topic)
|
|
64
65
|
self.pending_events = []
|
|
65
66
|
self.upload_manager = UploadManager()
|
|
67
|
+
self.stream_runner = AsyncStreamRunner(self)
|
|
66
68
|
|
|
67
69
|
@property
|
|
68
70
|
def meta(self) -> PyViewMeta:
|
|
@@ -2,18 +2,19 @@ pyview/__init__.py,sha256=5RJ_KtwJvI_-_Vhb3-py5Qf78YdH1HHvAzZO1ddzzrU,518
|
|
|
2
2
|
pyview/assets/js/app.js,sha256=XuuSgEMY4hx8v0OuEPwaa7trktu_vppL0tc3Bs9Fw7s,2524
|
|
3
3
|
pyview/assets/package-lock.json,sha256=kFCrEUJc3G7VD7EsBQf6__EKQhaKAok-I5rrwiAoX0w,2425
|
|
4
4
|
pyview/assets/package.json,sha256=E6xaX8KMUAektIIedLmI55jGnmlNMSeD2tgKYXWk1vg,151
|
|
5
|
+
pyview/async_stream_runner.py,sha256=_vXeU1LyuQkJrK5AlaaF1gyhRFWXhzn3Y73BFhSsWVc,2289
|
|
5
6
|
pyview/auth/__init__.py,sha256=vMlirETRhD4va61NOzwg8VY8ep9wVOF96GznJGBmzD0,109
|
|
6
7
|
pyview/auth/provider.py,sha256=fwriy2JZcOStutVXD-8VlMPAFXjILCM0l08lhTgmuyE,935
|
|
7
8
|
pyview/auth/required.py,sha256=ZtNmLFth9nK39RxDiJkSzArXwS5Cvr55MUAzfJ1F2e0,1418
|
|
8
9
|
pyview/changesets/__init__.py,sha256=55CLari2JHZtwy4hapHe7CqUyKjcP4dkM_t5d3CY2gU,46
|
|
9
10
|
pyview/changesets/changesets.py,sha256=hImmvB_jS6RyLr5Mas5L7DO_0d805jR3c41LKJlnNL4,1720
|
|
10
11
|
pyview/csrf.py,sha256=VIURva9EJqXXYGC7engweh3SwDQCnHlhV2zWdcdnFqc,789
|
|
11
|
-
pyview/events/BaseEventHandler.py,sha256=
|
|
12
|
-
pyview/events/__init__.py,sha256=
|
|
13
|
-
pyview/events/info_event.py,sha256=
|
|
12
|
+
pyview/events/BaseEventHandler.py,sha256=0xcjFFMLMN8Aj6toI31vzeYhRQqaX9rm-G7XGXMvqsE,1923
|
|
13
|
+
pyview/events/__init__.py,sha256=oP0SG4Af4uf0GEa0Y_zHYhR7TcBOcXQlTAsgOSaIcC4,156
|
|
14
|
+
pyview/events/info_event.py,sha256=JOwf3KDodHkmH1MzqTD8sPxs0zbI4t8Ff0rLjwRSe2Y,358
|
|
14
15
|
pyview/js.py,sha256=E6HMsUfXQjrcLqYq26ieeYuzTjBeZqfJwwOm3uSR4ME,3498
|
|
15
16
|
pyview/live_routes.py,sha256=IN2Jmy8b1umcfx1R7ZgFXHZNbYDJp_kLIbADtDJknPM,1749
|
|
16
|
-
pyview/live_socket.py,sha256=
|
|
17
|
+
pyview/live_socket.py,sha256=p1KtX9Exwhgsf0yOp3Eb32zdUOo5hSnYDJrpJuTu3QI,5084
|
|
17
18
|
pyview/live_view.py,sha256=mwAp7jiABSZCBgYF-GLQCB7zcJ7Wpz9cuC84zjzsp2U,1455
|
|
18
19
|
pyview/meta.py,sha256=01Z-qldB9jrewmIJHQpUqyIhuHodQGgCvpuY9YM5R6c,74
|
|
19
20
|
pyview/phx_message.py,sha256=DUdPfl6tlw9K0FNXJ35ehq03JGgynvwA_JItHQ_dxMQ,2007
|
|
@@ -44,7 +45,7 @@ pyview/vendor/ibis/template.py,sha256=6XJXnztw87CrOaKeW3e18LL0fNM8AI6AaK_QgMdb7e
|
|
|
44
45
|
pyview/vendor/ibis/tree.py,sha256=hg8f-fKHeo6DE8R-QgAhdvEaZ8rKyz7p0nGwPy0CBTs,2509
|
|
45
46
|
pyview/vendor/ibis/utils.py,sha256=nLSaxPR9vMphzV9qinlz_Iurv9c49Ps6Knv8vyNlewU,2768
|
|
46
47
|
pyview/ws_handler.py,sha256=CY1iDx5GETjIkqhgFbo2fkE3FhrqucSdg4AjuJ2P0Qg,9041
|
|
47
|
-
pyview_web-0.2.
|
|
48
|
-
pyview_web-0.2.
|
|
49
|
-
pyview_web-0.2.
|
|
50
|
-
pyview_web-0.2.
|
|
48
|
+
pyview_web-0.2.4.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
|
|
49
|
+
pyview_web-0.2.4.dist-info/METADATA,sha256=v6WKqv3gIV-4BdP9M91sFKcCjpeg5_Beug68wgqlvrU,5256
|
|
50
|
+
pyview_web-0.2.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
|
|
51
|
+
pyview_web-0.2.4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|