pyview-web 0.0.20__py3-none-any.whl → 0.0.22__py3-none-any.whl

pyview/live_view.py

@@ -1,7 +1,12 @@
 from typing import TypeVar, Generic, Optional, Union, Any
 from .live_socket import LiveViewSocket, UnconnectedSocket
-from pyview.template import LiveTemplate, template_file, RenderedContent, LiveRender
-import inspect
+from pyview.template import (
+    LiveTemplate,
+    template_file,
+    RenderedContent,
+    LiveRender,
+    find_associated_file,
+)
 from pyview.events import InfoEvent
 from urllib.parse import ParseResult
 
@@ -43,11 +48,6 @@ class LiveView(Generic[T]):
 
 
 def _find_render(m: LiveView) -> Optional[LiveTemplate]:
-    cf = inspect.getfile(m.__class__)
-    return _find_template(cf)
-
-
-def _find_template(cf: str) -> Optional[LiveTemplate]:
-    if cf.endswith(".py"):
-        cf = cf[:-3]
-        return template_file(cf + ".html")
+    html = find_associated_file(m, ".html")
+    if html is not None:
+        return template_file(html)

pyview/pyview.py

@@ -14,7 +14,12 @@ from pyview.auth import AuthProviderFactory
 from .ws_handler import LiveSocketHandler
 from .live_view import LiveView
 from .live_routes import LiveViewLookup
-from .template import RootTemplate, RootTemplateContext, defaultRootTemplate
+from .template import (
+    RootTemplate,
+    RootTemplateContext,
+    defaultRootTemplate,
+    find_associated_css,
+)
 
 
 class PyView(Starlette):
@@ -57,6 +62,8 @@ async def liveview_container(
     await lv.handle_params(urlparse(url._url), parse_qs(url.query), s)
     r = await lv.render(s.context)
 
+    liveview_css = find_associated_css(lv)
+
     id = str(uuid.uuid4())
 
     context: RootTemplateContext = {
@@ -65,6 +72,7 @@ async def liveview_container(
         "title": s.live_title,
         "csrf_token": generate_csrf_token("lv:phx-" + id),
         "session": serialize_session(session),
+        "additional_head_elements": liveview_css,
     }
 
     return HTMLResponse(template(context))

pyview/template/__init__.py

@@ -1,3 +1,17 @@
 from pyview.vendor.ibis import Template
 from .live_template import LiveTemplate, template_file, RenderedContent, LiveRender
 from .root_template import RootTemplate, RootTemplateContext, defaultRootTemplate
+from .utils import find_associated_css, find_associated_file
+
+__all__ = [
+    "Template",
+    "LiveTemplate",
+    "template_file",
+    "RenderedContent",
+    "LiveRender",
+    "RootTemplate",
+    "RootTemplateContext",
+    "defaultRootTemplate",
+    "find_associated_css",
+    "find_associated_file",
+]

pyview/template/render_diff.py

@@ -0,0 +1,34 @@
+from typing import Any
+
+
+def calc_diff(old_tree: dict[str, Any], new_tree: dict[str, Any]) -> dict[str, Any]:
+    diff = {}
+    for key in new_tree:
+        if key not in old_tree:
+            diff[key] = new_tree[key]
+        elif (
+            isinstance(new_tree[key], dict)
+            and "s" in new_tree[key]
+            and "d" in new_tree[key]
+        ):
+            # Handle special case of for loop
+            old_dynamic = old_tree[key]["d"]
+            new_dynamic = new_tree[key]["d"]
+
+            old_static = old_tree[key]["s"]
+            new_static = new_tree[key]["s"]
+
+            if old_static != new_static:
+                diff[key] = {"s": new_static, "d": new_dynamic}
+                continue
+
+            if old_dynamic != new_dynamic:
+                diff[key] = {"d": new_dynamic}
+        elif isinstance(new_tree[key], dict):
+            nested_diff = calc_diff(old_tree[key], new_tree[key])
+            if nested_diff:
+                diff[key] = nested_diff
+        elif old_tree[key] != new_tree[key]:
+            diff[key] = new_tree[key]
+
+    return diff

pyview/template/root_template.py

@@ -8,6 +8,7 @@ class RootTemplateContext(TypedDict):
     title: Optional[str]
     csrf_token: str
     session: Optional[str]
+    additional_head_elements: list[Markup]
 
 
 RootTemplate = Callable[[RootTemplateContext], str]
@@ -45,6 +46,8 @@ def _defaultRootTemplate(
         ),
     )
 
+    additional_head_elements = "\n".join(context["additional_head_elements"])
+
     return (
         Markup(
             f"""
@@ -56,8 +59,9 @@ def _defaultRootTemplate(
       <meta charset="utf-8">
       <meta http-equiv="X-UA-Compatible" content="IE=edge">
       <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-      {css}      
+      {css}
       <script defer type="text/javascript" src="/static/assets/app.js"></script>
+      {additional_head_elements}
     </head>
     <body>"""
         )

pyview/template/utils.py

@@ -0,0 +1,24 @@
+from typing import Optional
+import inspect
+import os
+from markupsafe import Markup
+
+
+def find_associated_file(o: object, extension: str) -> Optional[str]:
+    object_file = inspect.getfile(o.__class__)
+
+    if object_file.endswith(".py"):
+        object_file = object_file[:-3]
+
+        associated_file = object_file + extension
+        if os.path.isfile(associated_file):
+            return associated_file
+
+
+def find_associated_css(o: object) -> list[Markup]:
+    css_file = find_associated_file(o, ".css")
+    if css_file:
+        with open(css_file, "r") as css:
+            return [Markup(f"<style>{css.read()}</style>")]
+
+    return []

pyview/vendor/ibis/nodes.py

@@ -203,6 +203,8 @@ class Node:
                 resp.add_static(child.token.text if child.token else "")
             elif isinstance(child, PrintNode):
                 resp.add_dynamic(child.wrender(context))
+            elif isinstance(child, IncludeNode):
+                resp.add_dynamic(child.tree_parts(context))
             else:
                 resp.add_dynamic(child.tree_parts(context))
 
@@ -624,7 +626,7 @@ class IncludeNode(Node):
         else:
             raise errors.TemplateSyntaxError("Malformed 'include' tag.", token)
 
-    def wrender(self, context):
+    def visit_node(self, context, visitor: NodeVisitor):
         template_name = self.template_expr.eval(context)
         if isinstance(template_name, str):
             if ibis.loader:
@@ -632,9 +634,8 @@ class IncludeNode(Node):
                 context.push()
                 for name, expr in self.variables.items():
                     context[name] = expr.eval(context)
-                rendered = template.root_node.render(context)
+                visitor(context, template.root_node)
                 context.pop()
-                return rendered
             else:
                 msg = f"No template loader has been specified. "
                 msg += f"A template loader is required by the 'include' tag in "
@@ -645,6 +646,18 @@ class IncludeNode(Node):
             msg += f"The variable '{self.template_arg}' should evaluate to a string. "
             msg += f"This variable has the value: {repr(template_name)}."
             raise errors.TemplateRenderingError(msg, self.token)
+        
+    def wrender(self, context):
+        output = []
+        self.visit_node(context, lambda ctx, node: output.append(node.render(ctx)))
+        return "".join(output)
+    
+    def tree_parts(self, context) -> PartsTree:
+        output = []
+        def visitor(ctx, node):
+            output.append(node.tree_parts(ctx))
+        self.visit_node(context, visitor)
+        return output[0]
 
 
 # ExtendsNodes implement template inheritance. They indicate that the current template inherits

pyview/ws_handler.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Any
 import json
 from starlette.websockets import WebSocket, WebSocketDisconnect
 from urllib.parse import urlparse, parse_qs
@@ -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 pyview.template.render_diff import calc_diff
 
 
 class AuthException(Exception):
@@ -63,7 +64,7 @@ class LiveSocketHandler:
                 ]
 
                 await self.manager.send_personal_message(json.dumps(resp), websocket)
-                await self.handle_connected(topic, socket)
+                await self.handle_connected(topic, socket, rendered)
 
         except WebSocketDisconnect:
             if socket:
@@ -73,7 +74,9 @@ class LiveSocketHandler:
             await websocket.close()
             self.sessions -= 1
 
-    async def handle_connected(self, myJoinId, socket: LiveViewSocket):
+    async def handle_connected(
+        self, myJoinId, socket: LiveViewSocket, prev_rendered: dict[str, Any]
+    ):
         while True:
             message = await socket.websocket.receive()
             [joinRef, mesageRef, topic, event, payload] = parse_message(message)
@@ -105,6 +108,9 @@ class LiveSocketHandler:
                     {} if not socket.pending_events else {"e": socket.pending_events}
                 )
 
+                diff = calc_diff(prev_rendered, rendered)
+                prev_rendered = rendered
+
                 socket.pending_events = []
 
                 resp = [
@@ -112,7 +118,7 @@ class LiveSocketHandler:
                     mesageRef,
                     topic,
                     "phx_reply",
-                    {"response": {"diff": rendered | hook_events}, "status": "ok"},
+                    {"response": {"diff": diff | hook_events}, "status": "ok"},
                 ]
                 await self.manager.send_personal_message(
                     json.dumps(resp), socket.websocket
@@ -125,13 +131,15 @@ class LiveSocketHandler:
 
                 await lv.handle_params(url, parse_qs(url.query), socket)
                 rendered = await _render(socket)
+                diff = calc_diff(prev_rendered, rendered)
+                prev_rendered = rendered
 
                 resp = [
                     joinRef,
                     mesageRef,
                     topic,
                     "phx_reply",
-                    {"response": {"diff": rendered}, "status": "ok"},
+                    {"response": {"diff": diff}, "status": "ok"},
                 ]
                 await self.manager.send_personal_message(
                     json.dumps(resp), socket.websocket
@@ -142,7 +150,10 @@ class LiveSocketHandler:
                 allow_upload_response = socket.upload_manager.process_allow_upload(
                     payload
                 )
+
                 rendered = await _render(socket)
+                diff = calc_diff(prev_rendered, rendered)
+                prev_rendered = rendered
 
                 resp = [
                     joinRef,
@@ -208,13 +219,15 @@ 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
 
                 resp = [
                     joinRef,
                     mesageRef,
                     topic,
                     "phx_reply",
-                    {"response": {"diff": rendered}, "status": "ok"},
+                    {"response": {"diff": diff}, "status": "ok"},
                 ]
 
                 await self.manager.send_personal_message(

{pyview_web-0.0.20.dist-info → pyview_web-0.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyview-web
-Version: 0.0.20
+Version: 0.0.22
 Summary: LiveView in Python
 Home-page: https://pyview.rocks
 License: MIT

{pyview_web-0.0.20.dist-info → pyview_web-0.0.22.dist-info}/RECORD

@@ -12,16 +12,18 @@ pyview/events.py,sha256=Zv8G2F1XeXUk1wrnfomeFfxB0OPYmHdjSvxRjQew3No,125
 pyview/js.py,sha256=4OnPEfBfuvmekeQlm9444As4PLR22zLMIyyzQIIkmls,751
 pyview/live_routes.py,sha256=tsKFh2gmH2BWsjsZQZErzRp_-KiAZcn4lFKNLRIN5Nc,498
 pyview/live_socket.py,sha256=6SLEkEBzK-zIUNh_5j_OG5t6IHGTDNCpGXk7D7SMNJ4,4370
-pyview/live_view.py,sha256=SeZ78aA_leqfubPUybRaaCUhqLJJirjPSkf9omvJyTs,1486
+pyview/live_view.py,sha256=A0vCCvHUy39_eEhRzDbYMEDzgpRqseZPjCnBAMjogxw,1406
 pyview/phx_message.py,sha256=DUdPfl6tlw9K0FNXJ35ehq03JGgynvwA_JItHQ_dxMQ,2007
-pyview/pyview.py,sha256=UfVaYBAzPU_RalijjmXup6oDpIG_w9acjUG1AXm11r4,2342
+pyview/pyview.py,sha256=xy8on2f-chU4JWVy6zGTDqjP8BW-kOoi16voNIgWRg4,2478
 pyview/secret.py,sha256=HbaNpGAkFs4uxMVAmk9HwE3FIehg7dmwEOlED7C9moM,363
 pyview/session.py,sha256=nC8ExyVwfCgQfx9T-aJGyFhr2C7jsrEY_QFkaXtP28U,432
 pyview/static/assets/app.js,sha256=QoXfdcOCYwVYJftvjsIIVwFye7onaOJMxRpalyYqoMU,200029
-pyview/template/__init__.py,sha256=bDaxDV7QhUwBXfy672Ft0NBDNvhT4kEKDV5VUWhADe8,206
+pyview/template/__init__.py,sha256=c5hLRfsF2fDOz8aOsoOgoCeBV6VBzdqN_Ktg3mYPw8A,509
 pyview/template/live_template.py,sha256=wSKyBw7ejpUY5qXUZdE36Jeeix8Of0CUq8eZdQwxXyg,1864
-pyview/template/root_template.py,sha256=OBTYtaw03yDJIsXDV9ZFqy__U579FGttRjlAXnLaNEo,1882
+pyview/template/render_diff.py,sha256=UpmxQZ-ImDqEUIehcoLfpdClRVYV5StTOP9iKsU8AZ0,1090
+pyview/template/root_template.py,sha256=zCUs1bt8R7qynhBE0tTSEYfdkGtbeKNmPhwzRiFNdsI,2031
 pyview/template/serializer.py,sha256=WDZfqJr2LMlf36fUW2CmWc2aREc63553_y_GRP2-qYc,826
+pyview/template/utils.py,sha256=S8593UjUJztUrtC3h1EL9MxQp5uH7rFDTNkv9C6A_xU,642
 pyview/test_csrf.py,sha256=QWTOtfagDMkoYDK_ehYxua34F7-ltPsSeTwQGEOlqHU,684
 pyview/uploads.py,sha256=cFNOlJD5dkA2VccZT_W1bJn_5vYAaphhRJX-RCfEXm8,9598
 pyview/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,12 +35,12 @@ pyview/vendor/ibis/context.py,sha256=tTZSKJDPI2r__nsC3hl9OTOZjEIlXUEpnih0NKbCc3k
 pyview/vendor/ibis/errors.py,sha256=gtRX3LjkdWEP4NaX8HXL_6OU2fCX16IBBSiGMG5wiY4,1531
 pyview/vendor/ibis/filters.py,sha256=M36KS6dlzfsb2NmHkbVuo8gJbiQ6aQjcHzXxHwZ3Afw,7042
 pyview/vendor/ibis/loaders.py,sha256=NYW7_hlC7TRPDau37bgiOCsvsBgIPpUEpb1NbroUVUA,3457
-pyview/vendor/ibis/nodes.py,sha256=jNRmlTCHXC4xCF8nfDRlLWINlaYiFa8NGrzebJFJgEM,25128
+pyview/vendor/ibis/nodes.py,sha256=TgFt4q5MrVW3gC3PVitrs2LyXKllRveooM7XKydNATk,25617
 pyview/vendor/ibis/template.py,sha256=IX9z-Ig13yJyRnMqtB52eiRLe002qdIxnfa7fYEXLqM,2314
 pyview/vendor/ibis/tree.py,sha256=5LAjl3q9iPMZBb6QbKurWj9-QGKLVf11K2_bQotWlUc,2293
 pyview/vendor/ibis/utils.py,sha256=nLSaxPR9vMphzV9qinlz_Iurv9c49Ps6Knv8vyNlewU,2768
-pyview/ws_handler.py,sha256=Mkbw6UKEy4HYURSZUdmpF95oWiuEymzS_VGG8WV8mGw,7977
-pyview_web-0.0.20.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
-pyview_web-0.0.20.dist-info/METADATA,sha256=6EY-yiCteR7fFY029hG2T5jCp8wCMRKpr2FaGhV8tJY,5276
-pyview_web-0.0.20.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyview_web-0.0.20.dist-info/RECORD,,
+pyview/ws_handler.py,sha256=Vi5aIoxz_Z9qOEcA5fgxsSoJtLz7n_ytbJ8vZiWDvGc,8473
+pyview_web-0.0.22.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
+pyview_web-0.0.22.dist-info/METADATA,sha256=Du3wF_Qe8pG3FAk8F7tRD80eahCG3pTuqpzzVlP0Kqo,5276
+pyview_web-0.0.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyview_web-0.0.22.dist-info/RECORD,,