pyview-web 0.2.2__tar.gz → 0.2.3__tar.gz

{pyview_web-0.2.2 → pyview_web-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyview-web
-Version: 0.2.2
+Version: 0.2.3
 Summary: LiveView in Python
 License: MIT
 Keywords: web,api,LiveView

{pyview_web-0.2.2 → pyview_web-0.2.3}/pyproject.toml

@@ -5,7 +5,7 @@ packages = [
   { include = "pyview" },
 ]
 
-version = "0.2.2"
+version = "0.2.3"
 description = "LiveView in Python"
 authors = ["Larry Ogrodnek <ogrodnek@gmail.com>"]
 license = "MIT"

{pyview_web-0.2.2 → pyview_web-0.2.3}/pyview/live_socket.py

@@ -17,6 +17,7 @@ from pyview.vendor.flet.pubsub import PubSubHub, PubSub
 from pyview.events import InfoEvent
 from pyview.uploads import UploadConstraints, UploadConfig, UploadManager
 from pyview.meta import PyViewMeta
+from pyview.template.render_diff import calc_diff
 import datetime
 
 
@@ -50,8 +51,8 @@ class ConnectedLiveViewSocket(Generic[T]):
     context: T
     live_title: Optional[str] = None
     pending_events: list[tuple[str, Any]]
-
     upload_manager: UploadManager
+    prev_rendered: Optional[dict[str, Any]] = None
 
     def __init__(self, websocket: WebSocket, topic: str, liveview: LiveView):
         self.websocket = websocket
@@ -93,9 +94,13 @@ class ConnectedLiveViewSocket(Generic[T]):
         )
 
     def diff(self, render: dict[str, Any]) -> dict[str, Any]:
-        # TODO: not a real diff
-        del render["s"]
-        return render
+        if self.prev_rendered:
+            diff = calc_diff(self.prev_rendered, render)
+        else:
+            diff = render
+
+        self.prev_rendered = render
+        return diff
 
     async def send_info(self, event: InfoEvent):
         await self.liveview.handle_info(event, self)

{pyview_web-0.2.2 → pyview_web-0.2.3}/pyview/ws_handler.py

@@ -1,4 +1,4 @@
-from typing import Optional, Any
+from typing import Optional
 import json
 from starlette.websockets import WebSocket, WebSocketDisconnect
 from urllib.parse import urlparse, parse_qs
@@ -8,7 +8,6 @@ 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 pyview.template.render_diff import calc_diff
 
 
 class AuthException(Exception):
@@ -60,6 +59,7 @@ class LiveSocketHandler:
                 await lv.handle_params(url, merged_params, socket)
 
                 rendered = await _render(socket)
+                socket.prev_rendered = rendered
 
                 resp = [
                     joinRef,
@@ -70,7 +70,7 @@ class LiveSocketHandler:
                 ]
 
                 await self.manager.send_personal_message(json.dumps(resp), websocket)
-                await self.handle_connected(topic, socket, rendered)
+                await self.handle_connected(topic, socket)
 
         except WebSocketDisconnect:
             if socket:
@@ -80,9 +80,7 @@ class LiveSocketHandler:
             await websocket.close()
             self.sessions -= 1
 
-    async def handle_connected(
-        self, myJoinId, socket: ConnectedLiveViewSocket, prev_rendered: dict[str, Any]
-    ):
+    async def handle_connected(self, myJoinId, socket: ConnectedLiveViewSocket):
         while True:
             message = await socket.websocket.receive()
             [joinRef, mesageRef, topic, event, payload] = parse_message(message)
@@ -114,8 +112,7 @@ class LiveSocketHandler:
                     {} if not socket.pending_events else {"e": socket.pending_events}
                 )
 
-                diff = calc_diff(prev_rendered, rendered)
-                prev_rendered = rendered
+                diff = socket.diff(rendered)
 
                 socket.pending_events = []
 
@@ -150,8 +147,7 @@ class LiveSocketHandler:
 
                 await lv.handle_params(url, merged_params, socket)
                 rendered = await _render(socket)
-                diff = calc_diff(prev_rendered, rendered)
-                prev_rendered = rendered
+                diff = socket.diff(rendered)
 
                 resp = [
                     joinRef,
@@ -171,8 +167,7 @@ class LiveSocketHandler:
                 )
 
                 rendered = await _render(socket)
-                diff = calc_diff(prev_rendered, rendered)
-                prev_rendered = rendered
+                diff = socket.diff(rendered)
 
                 resp = [
                     joinRef,
@@ -238,8 +233,7 @@ class LiveSocketHandler:
             if event == "progress":
                 socket.upload_manager.update_progress(joinRef, payload)
                 rendered = await _render(socket)
-                diff = calc_diff(prev_rendered, rendered)
-                prev_rendered = rendered
+                diff = socket.diff(rendered)
 
                 resp = [
                     joinRef,