pyview-web 0.2.5__py3-none-any.whl → 0.2.6__py3-none-any.whl

pyview/events/BaseEventHandler.py

@@ -55,10 +55,10 @@ class BaseEventHandler:
         else:
             logging.warning(f"Unhandled event: {event} {payload}")
 
-    async def handle_info(self, info: "InfoEvent", socket):
-        handler = self._info_handlers.get(info.name)
+    async def handle_info(self, event: "InfoEvent", socket):
+        handler = self._info_handlers.get(event.name)
 
         if handler:
-            return await handler(self, info, socket)
+            return await handler(self, event, socket)
         else:
-            logging.warning(f"Unhandled info: {info.name} {info}")
+            logging.warning(f"Unhandled info: {event.name} {event}")

pyview/live_socket.py

@@ -25,8 +25,6 @@ from pyview.async_stream_runner import AsyncStreamRunner
 if TYPE_CHECKING:
     from .live_view import LiveView
 
-scheduler = AsyncIOScheduler()
-scheduler.start()
 
 pub_sub_hub = PubSubHub()
 
@@ -55,7 +53,13 @@ class ConnectedLiveViewSocket(Generic[T]):
     upload_manager: UploadManager
     prev_rendered: Optional[dict[str, Any]] = None
 
-    def __init__(self, websocket: WebSocket, topic: str, liveview: LiveView):
+    def __init__(
+        self,
+        websocket: WebSocket,
+        topic: str,
+        liveview: LiveView,
+        scheduler: AsyncIOScheduler,
+    ):
         self.websocket = websocket
         self.topic = topic
         self.liveview = liveview
@@ -65,6 +69,7 @@ class ConnectedLiveViewSocket(Generic[T]):
         self.pending_events = []
         self.upload_manager = UploadManager()
         self.stream_runner = AsyncStreamRunner(self)
+        self.scheduler = scheduler
 
     @property
     def meta(self) -> PyViewMeta:
@@ -81,13 +86,13 @@ class ConnectedLiveViewSocket(Generic[T]):
 
     def schedule_info(self, event, seconds):
         id = f"{self.topic}:{event}"
-        scheduler.add_job(
+        self.scheduler.add_job(
             self.send_info, args=[event], id=id, trigger="interval", seconds=seconds
         )
         self.scheduled_jobs.append(id)
 
     def schedule_info_once(self, event, seconds=None):
-        scheduler.add_job(
+        self.scheduler.add_job(
             self.send_info,
             args=[event],
             trigger="date",
@@ -114,7 +119,7 @@ class ConnectedLiveViewSocket(Generic[T]):
         except Exception:
             for id in self.scheduled_jobs:
                 print("Removing job", id)
-                scheduler.remove_job(id)
+                self.scheduler.remove_job(id)
 
     async def push_patch(self, path: str, params: dict[str, Any] = {}):
         # or "replace"
@@ -156,7 +161,7 @@ class ConnectedLiveViewSocket(Generic[T]):
     async def close(self):
         self.connected = False
         for id in self.scheduled_jobs:
-            scheduler.remove_job(id)
+            self.scheduler.remove_job(id)
         await self.pub_sub.unsubscribe_all_async()
 
         try:

pyview/ws_handler.py

@@ -8,6 +8,7 @@ from pyview.csrf import validate_csrf_token
 from pyview.session import deserialize_session
 from pyview.auth import AuthProviderFactory
 from pyview.phx_message import parse_message
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
 
 class AuthException(Exception):
@@ -19,6 +20,8 @@ class LiveSocketHandler:
         self.routes = routes
         self.manager = ConnectionManager()
         self.sessions = 0
+        self.scheduler = AsyncIOScheduler()
+        self.scheduler.start()
 
     async def check_auth(self, websocket: WebSocket, lv):
         if not await AuthProviderFactory.get(lv).has_required_auth(websocket):
@@ -43,7 +46,7 @@ class LiveSocketHandler:
                 url = urlparse(payload["url"])
                 lv, path_params = self.routes.get(url.path)
                 await self.check_auth(websocket, lv)
-                socket = ConnectedLiveViewSocket(websocket, topic, lv)
+                socket = ConnectedLiveViewSocket(websocket, topic, lv, self.scheduler)
 
                 session = {}
                 if "session" in payload:

{pyview_web-0.2.5.dist-info → pyview_web-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyview-web
-Version: 0.2.5
+Version: 0.2.6
 Summary: LiveView in Python
 License: MIT
 Keywords: web,api,LiveView
@@ -29,14 +29,13 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Dist: APScheduler (==3.9.1.post1)
+Requires-Dist: APScheduler (==3.11.0)
 Requires-Dist: click (>=8.1.7,<9.0.0)
-Requires-Dist: itsdangerous (>=2.1.2,<3.0.0)
-Requires-Dist: markupsafe (>=2.1.2,<3.0.0)
-Requires-Dist: psutil (>=5.9.4,<6.0.0)
+Requires-Dist: itsdangerous (>=2.2.0,<3.0.0)
+Requires-Dist: markupsafe (>=3.0.2,<4.0.0)
 Requires-Dist: pydantic (>=2.9.2,<3.0.0)
-Requires-Dist: starlette (==0.40.0)
-Requires-Dist: uvicorn (==0.30.6)
+Requires-Dist: starlette (==0.47.1)
+Requires-Dist: uvicorn (==0.34.3)
 Requires-Dist: wsproto (==1.2.0)
 Project-URL: Homepage, https://pyview.rocks
 Project-URL: Repository, https://github.com/ogrodnek/pyview

{pyview_web-0.2.5.dist-info → pyview_web-0.2.6.dist-info}/RECORD

@@ -13,12 +13,12 @@ pyview/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pyview/cli/commands/create_view.py,sha256=9hrjc1J1sJHyp3Ihi5ls4Mj19OMNeaj6fpIwDFWrdZ8,5694
 pyview/cli/main.py,sha256=OEHqNwl9fqIPTI6qy5sLYndPHMEJ3fA9qsjSUuKzYSE,296
 pyview/csrf.py,sha256=VIURva9EJqXXYGC7engweh3SwDQCnHlhV2zWdcdnFqc,789
-pyview/events/BaseEventHandler.py,sha256=0xcjFFMLMN8Aj6toI31vzeYhRQqaX9rm-G7XGXMvqsE,1923
+pyview/events/BaseEventHandler.py,sha256=rBE0z_nN6vIZ8TQ9eRfnCnTEcMOaMX7Na7YgtQmSW3s,1928
 pyview/events/__init__.py,sha256=oP0SG4Af4uf0GEa0Y_zHYhR7TcBOcXQlTAsgOSaIcC4,156
 pyview/events/info_event.py,sha256=JOwf3KDodHkmH1MzqTD8sPxs0zbI4t8Ff0rLjwRSe2Y,358
 pyview/js.py,sha256=E6HMsUfXQjrcLqYq26ieeYuzTjBeZqfJwwOm3uSR4ME,3498
 pyview/live_routes.py,sha256=IN2Jmy8b1umcfx1R7ZgFXHZNbYDJp_kLIbADtDJknPM,1749
-pyview/live_socket.py,sha256=p1KtX9Exwhgsf0yOp3Eb32zdUOo5hSnYDJrpJuTu3QI,5084
+pyview/live_socket.py,sha256=rAa11A7hfbx7DoGC1PQnahxxgGpwOFXwQjYkR9-QtXY,5166
 pyview/live_view.py,sha256=mwAp7jiABSZCBgYF-GLQCB7zcJ7Wpz9cuC84zjzsp2U,1455
 pyview/meta.py,sha256=01Z-qldB9jrewmIJHQpUqyIhuHodQGgCvpuY9YM5R6c,74
 pyview/phx_message.py,sha256=DUdPfl6tlw9K0FNXJ35ehq03JGgynvwA_JItHQ_dxMQ,2007
@@ -48,9 +48,9 @@ pyview/vendor/ibis/nodes.py,sha256=TgFt4q5MrVW3gC3PVitrs2LyXKllRveooM7XKydNATk,2
 pyview/vendor/ibis/template.py,sha256=6XJXnztw87CrOaKeW3e18LL0fNM8AI6AaK_QgMdb7ew,2353
 pyview/vendor/ibis/tree.py,sha256=hg8f-fKHeo6DE8R-QgAhdvEaZ8rKyz7p0nGwPy0CBTs,2509
 pyview/vendor/ibis/utils.py,sha256=nLSaxPR9vMphzV9qinlz_Iurv9c49Ps6Knv8vyNlewU,2768
-pyview/ws_handler.py,sha256=CY1iDx5GETjIkqhgFbo2fkE3FhrqucSdg4AjuJ2P0Qg,9041
-pyview_web-0.2.5.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
-pyview_web-0.2.5.dist-info/METADATA,sha256=3g39-VhWx0gWkq1B46NAkTTTDSqnOr692TkFZtgOrNo,5243
-pyview_web-0.2.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyview_web-0.2.5.dist-info/entry_points.txt,sha256=GAT-ic-VYmmSMUSUVKdV1bp4w-vgEeVP-XzElvarQ9U,42
-pyview_web-0.2.5.dist-info/RECORD,,
+pyview/ws_handler.py,sha256=qe_rQV5z4GTZOgMDSTC29zv8VrUJ0B5AApGdQ9GzrV0,9192
+pyview_web-0.2.6.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
+pyview_web-0.2.6.dist-info/METADATA,sha256=Iwe5cP1CvsCCvf-2qi077zYcxFj5HhTJwtD10yZqhcM,5199
+pyview_web-0.2.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyview_web-0.2.6.dist-info/entry_points.txt,sha256=GAT-ic-VYmmSMUSUVKdV1bp4w-vgEeVP-XzElvarQ9U,42
+pyview_web-0.2.6.dist-info/RECORD,,