pyview-web 0.0.25__py3-none-any.whl → 0.1.0__py3-none-any.whl

pyview/__init__.py

@@ -1,5 +1,10 @@
 from pyview.live_view import LiveView
-from pyview.live_socket import LiveViewSocket
+from pyview.live_socket import (
+    LiveViewSocket,
+    is_connected,
+    ConnectedLiveViewSocket,
+    UnconnectedSocket,
+)
 from pyview.pyview import PyView, defaultRootTemplate
 from pyview.js import js
 from pyview.pyview import RootTemplateContext, RootTemplate
@@ -12,4 +17,6 @@ __all__ = [
     "js",
     "RootTemplateContext",
     "RootTemplate",
+    "is_connected",
+    "ConnectedLiveViewSocket",
 ]

pyview/changesets/changesets.py

@@ -1,4 +1,4 @@
-from typing import TypeVar, Any, Generic, Optional, Callable
+from typing import TypeVar, Any, Generic, Optional
 from pydantic import BaseModel, ValidationError
 from dataclasses import dataclass
 from types import SimpleNamespace
@@ -8,7 +8,7 @@ Base = TypeVar("Base", bound=BaseModel)
 
 @dataclass
 class ChangeSet(Generic[Base]):
-    cls: Callable[..., Base]
+    cls: type[Base]
     changes: dict[str, Any]
     errors: dict[str, Any]
     valid: bool
@@ -29,7 +29,7 @@ class ChangeSet(Generic[Base]):
 
     @property
     def fields(self) -> list[str]:
-        return self.cls.__fields__.keys()
+        return list(self.cls.model_fields)
 
     def save(self, payload: dict[str, Any]) -> Optional[Base]:
         self.errors = {}
@@ -58,5 +58,5 @@ class ChangeSet(Generic[Base]):
             self.valid = False
 
 
-def change_set(cls: Callable[..., Base]) -> ChangeSet[Base]:
+def change_set(cls: type[Base]) -> ChangeSet[Base]:
     return ChangeSet(cls, {}, {}, False)

pyview/live_socket.py

@@ -1,7 +1,16 @@
 from __future__ import annotations
 from starlette.websockets import WebSocket
 import json
-from typing import Any, TypeVar, Generic, TYPE_CHECKING, Optional
+from typing import (
+    Any,
+    TypeVar,
+    Generic,
+    TYPE_CHECKING,
+    Optional,
+    Union,
+    TypeAlias,
+    TypeGuard,
+)
 from urllib.parse import urlencode
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from pyview.vendor.flet.pubsub import PubSubHub, PubSub
@@ -21,10 +30,14 @@ pub_sub_hub = PubSubHub()
 T = TypeVar("T")
 
 
+def is_connected(socket: LiveViewSocket[T]) -> TypeGuard["ConnectedLiveViewSocket[T]"]:
+    return socket.connected
+
+
 class UnconnectedSocket(Generic[T]):
     context: T
-    connected: bool = False
     live_title: Optional[str] = None
+    connected: bool = False
 
     def allow_upload(
         self, upload_name: str, constraints: UploadConstraints
@@ -32,7 +45,7 @@ class UnconnectedSocket(Generic[T]):
         return UploadConfig(name=upload_name, constraints=constraints)
 
 
-class LiveViewSocket(Generic[T]):
+class ConnectedLiveViewSocket(Generic[T]):
     context: T
     live_title: Optional[str] = None
     pending_events: list[tuple[str, Any]]
@@ -86,7 +99,7 @@ class LiveViewSocket(Generic[T]):
 
         try:
             await self.websocket.send_text(json.dumps(resp))
-        except Exception as e:
+        except Exception:
             for id in self.scheduled_jobs:
                 print("Removing job", id)
                 scheduler.remove_job(id)
@@ -143,3 +156,6 @@ class LiveViewSocket(Generic[T]):
             await self.liveview.disconnect(self)
         except Exception:
             pass
+
+
+LiveViewSocket: TypeAlias = Union[ConnectedLiveViewSocket[T], UnconnectedSocket[T]]

pyview/live_view.py

@@ -1,5 +1,5 @@
 from typing import TypeVar, Generic, Optional, Union, Any
-from .live_socket import LiveViewSocket, UnconnectedSocket
+from .live_socket import LiveViewSocket, ConnectedLiveViewSocket
 from pyview.template import (
     LiveTemplate,
     template_file,
@@ -12,7 +12,6 @@ from urllib.parse import ParseResult
 
 T = TypeVar("T")
 
-AnySocket = Union[LiveViewSocket[T], UnconnectedSocket[T]]
 Session = dict[str, Any]
 
 # TODO: ideally this would always be a ParseResult, but we need to update push_patch
@@ -23,19 +22,19 @@ class LiveView(Generic[T]):
     def __init__(self):
         pass
 
-    async def mount(self, socket: AnySocket, session: Session):
+    async def mount(self, socket: LiveViewSocket[T], session: Session):
         pass
 
-    async def handle_event(self, event, payload, socket: LiveViewSocket[T]):
+    async def handle_event(self, event, payload, socket: ConnectedLiveViewSocket[T]):
         pass
 
-    async def handle_info(self, event: InfoEvent, socket: LiveViewSocket[T]):
+    async def handle_info(self, event: InfoEvent, socket: ConnectedLiveViewSocket[T]):
         pass
 
-    async def handle_params(self, url: URL, params, socket: AnySocket):
+    async def handle_params(self, url: URL, params, socket: LiveViewSocket[T]):
         pass
 
-    async def disconnect(self, socket: LiveViewSocket[T]):
+    async def disconnect(self, socket: ConnectedLiveViewSocket[T]):
         pass
 
     async def render(self, assigns: T) -> RenderedContent:

pyview/template/live_template.py

@@ -1,16 +1,20 @@
 from pyview.vendor.ibis import Template
-from typing import Any, Union, Protocol, Optional
-from dataclasses import asdict
+from typing import Any, Union, Protocol, Optional, ClassVar
+from dataclasses import asdict, Field
 from .serializer import serialize
 import os.path
 
 
-class DictConvertable(Protocol):
-    def asdict(self) -> dict[str, Any]:
-        ...
+class DataclassInstance(Protocol):
+    __dataclass_fields__: ClassVar[dict[str, Field[Any]]]
+
 
+Assigns = Union[dict[str, Any], DataclassInstance]
 
-Assigns = Union[dict[str, Any], DictConvertable]
+
+# TODO: should we still support this?
+class DictConvertable(Protocol):
+    def asdict(self) -> dict[str, Any]: ...
 
 
 class LiveTemplate:
@@ -37,11 +41,9 @@ class LiveTemplate:
 
 
 class RenderedContent(Protocol):
-    def tree(self) -> dict[str, Any]:
-        ...
+    def tree(self) -> dict[str, Any]: ...
 
-    def text(self) -> str:
-        ...
+    def text(self) -> str: ...
 
 
 class LiveRender:
@@ -58,6 +60,7 @@ class LiveRender:
 
 _cache = {}
 
+
 def template_file(filename: str) -> Optional[LiveTemplate]:
     """Renders a template file with the given assigns."""
     if not os.path.isfile(filename):

pyview/ws_handler.py

@@ -2,7 +2,7 @@ from typing import Optional, Any
 import json
 from starlette.websockets import WebSocket, WebSocketDisconnect
 from urllib.parse import urlparse, parse_qs
-from pyview.live_socket import LiveViewSocket
+from pyview.live_socket import ConnectedLiveViewSocket, LiveViewSocket
 from pyview.live_routes import LiveViewLookup
 from pyview.csrf import validate_csrf_token
 from pyview.session import deserialize_session
@@ -44,7 +44,7 @@ class LiveSocketHandler:
                 url = urlparse(payload["url"])
                 lv = self.routes.get(url.path)
                 await self.check_auth(websocket, lv)
-                socket = LiveViewSocket(websocket, topic, lv)
+                socket = ConnectedLiveViewSocket(websocket, topic, lv)
 
                 session = {}
                 if "session" in payload:
@@ -75,7 +75,7 @@ class LiveSocketHandler:
             self.sessions -= 1
 
     async def handle_connected(
-        self, myJoinId, socket: LiveViewSocket, prev_rendered: dict[str, Any]
+        self, myJoinId, socket: ConnectedLiveViewSocket, prev_rendered: dict[str, Any]
     ):
         while True:
             message = await socket.websocket.receive()
@@ -235,7 +235,7 @@ class LiveSocketHandler:
                 )
 
 
-async def _render(socket: LiveViewSocket):
+async def _render(socket: ConnectedLiveViewSocket):
     rendered = (await socket.liveview.render(socket.context)).tree()
 
     if socket.live_title:

{pyview_web-0.0.25.dist-info → pyview_web-0.1.0.dist-info}/METADATA

@@ -1,17 +1,16 @@
 Metadata-Version: 2.1
 Name: pyview-web
-Version: 0.0.25
+Version: 0.1.0
 Summary: LiveView in Python
 Home-page: https://pyview.rocks
 License: MIT
 Keywords: web,api,LiveView
 Author: Larry Ogrodnek
 Author-email: ogrodnek@gmail.com
-Requires-Python: >=3.9,<3.12
+Requires-Python: >=3.10,<3.13
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Framework :: AsyncIO
-Classifier: Framework :: FastAPI
 Classifier: Framework :: Pydantic
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
@@ -20,9 +19,9 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
@@ -36,9 +35,9 @@ Requires-Dist: APScheduler (==3.9.1.post1)
 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: pydantic (>=2.7.1,<3.0.0)
-Requires-Dist: starlette (==0.37.2)
-Requires-Dist: uvicorn (==0.20.0)
+Requires-Dist: pydantic (>=2.9.2,<3.0.0)
+Requires-Dist: starlette (==0.38.5)
+Requires-Dist: uvicorn (==0.30.6)
 Requires-Dist: wsproto (==1.2.0)
 Project-URL: Repository, https://github.com/ogrodnek/pyview
 Description-Content-Type: text/markdown

{pyview_web-0.0.25.dist-info → pyview_web-0.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyview/__init__.py,sha256=Pk-RgSkIG6fkLH3CwrF5tptoq7n72w0O73k2vAW4CAQ,374
+pyview/__init__.py,sha256=PG8coDKOMFTBuG9e3XxHJX1LipT0VDeki8CjDO-ZTG4,504
 pyview/assets/js/app.js,sha256=XuuSgEMY4hx8v0OuEPwaa7trktu_vppL0tc3Bs9Fw7s,2524
 pyview/assets/package-lock.json,sha256=kFCrEUJc3G7VD7EsBQf6__EKQhaKAok-I5rrwiAoX0w,2425
 pyview/assets/package.json,sha256=E6xaX8KMUAektIIedLmI55jGnmlNMSeD2tgKYXWk1vg,151
@@ -6,20 +6,20 @@ pyview/auth/__init__.py,sha256=vMlirETRhD4va61NOzwg8VY8ep9wVOF96GznJGBmzD0,109
 pyview/auth/provider.py,sha256=fwriy2JZcOStutVXD-8VlMPAFXjILCM0l08lhTgmuyE,935
 pyview/auth/required.py,sha256=ZtNmLFth9nK39RxDiJkSzArXwS5Cvr55MUAzfJ1F2e0,1418
 pyview/changesets/__init__.py,sha256=55CLari2JHZtwy4hapHe7CqUyKjcP4dkM_t5d3CY2gU,46
-pyview/changesets/changesets.py,sha256=B1q1nXwI2iuZZQpE3P2T0PpwI21PHjqcsuIQmkKPCvI,1747
+pyview/changesets/changesets.py,sha256=hImmvB_jS6RyLr5Mas5L7DO_0d805jR3c41LKJlnNL4,1720
 pyview/csrf.py,sha256=VIURva9EJqXXYGC7engweh3SwDQCnHlhV2zWdcdnFqc,789
 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=A0vCCvHUy39_eEhRzDbYMEDzgpRqseZPjCnBAMjogxw,1406
+pyview/live_socket.py,sha256=BylR8AiMLP0ZF8Lm2NxE1DZq9AX2g1YkcrNuK2a_tLY,4644
+pyview/live_view.py,sha256=3q-n1QoZR-JwPac4Sece_Q3nG3Kj6nEyVQwzxGqVt44,1396
 pyview/phx_message.py,sha256=DUdPfl6tlw9K0FNXJ35ehq03JGgynvwA_JItHQ_dxMQ,2007
 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=c5hLRfsF2fDOz8aOsoOgoCeBV6VBzdqN_Ktg3mYPw8A,509
-pyview/template/live_template.py,sha256=wSKyBw7ejpUY5qXUZdE36Jeeix8Of0CUq8eZdQwxXyg,1864
+pyview/template/live_template.py,sha256=JmHHuH6mu4OF-M6pZGTP3vgQWZizp0YS9q1QgtggD9g,1993
 pyview/template/render_diff.py,sha256=v7EVmn8oJdh809N0vnSLK8OiDs1BOpErF36y4VUo9ew,1214
 pyview/template/root_template.py,sha256=zCUs1bt8R7qynhBE0tTSEYfdkGtbeKNmPhwzRiFNdsI,2031
 pyview/template/serializer.py,sha256=WDZfqJr2LMlf36fUW2CmWc2aREc63553_y_GRP2-qYc,826
@@ -39,8 +39,8 @@ pyview/vendor/ibis/nodes.py,sha256=TgFt4q5MrVW3gC3PVitrs2LyXKllRveooM7XKydNATk,2
 pyview/vendor/ibis/template.py,sha256=IX9z-Ig13yJyRnMqtB52eiRLe002qdIxnfa7fYEXLqM,2314
 pyview/vendor/ibis/tree.py,sha256=hg8f-fKHeo6DE8R-QgAhdvEaZ8rKyz7p0nGwPy0CBTs,2509
 pyview/vendor/ibis/utils.py,sha256=nLSaxPR9vMphzV9qinlz_Iurv9c49Ps6Knv8vyNlewU,2768
-pyview/ws_handler.py,sha256=Vi5aIoxz_Z9qOEcA5fgxsSoJtLz7n_ytbJ8vZiWDvGc,8473
-pyview_web-0.0.25.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
-pyview_web-0.0.25.dist-info/METADATA,sha256=-UhlfnbHQaDx-Elu2KFZRxrV2brUwuJ2GAwFfrRWRGU,5276
-pyview_web-0.0.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyview_web-0.0.25.dist-info/RECORD,,
+pyview/ws_handler.py,sha256=y0LTo9ug33KN3iyBxeaLrv7Vx0kVw1IedVvxO8wm7Tg,8525
+pyview_web-0.1.0.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
+pyview_web-0.1.0.dist-info/METADATA,sha256=ssECrZ4vS-1qy_XG3oVmRKbYnMlD75bG1vOJXt3C0nA,5244
+pyview_web-0.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyview_web-0.1.0.dist-info/RECORD,,