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

pyview/cli/commands/create_view.py

@@ -0,0 +1,199 @@
+import click
+from pathlib import Path
+import tomllib
+from typing import Optional
+
+
+def snake_case(name: str) -> str:
+    """Convert PascalCase or camelCase to snake_case."""
+    import re
+
+    s1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
+    return re.sub("([a-z0-9])([A-Z])", r"\1_\2", s1).lower()
+
+
+def pascal_case(name: str) -> str:
+    """Convert snake_case or other formats to PascalCase."""
+    # If already in PascalCase or camelCase, convert to snake_case first
+    snake_name = snake_case(name)
+    return "".join(word.capitalize() for word in snake_name.split("_"))
+
+
+def kebab_case(name: str) -> str:
+    """Convert any case to kebab-case."""
+    return snake_case(name).replace("_", "-")
+
+
+def generate_python_file(name: str) -> str:
+    """Generate the Python LiveView file content."""
+    class_name = f"{pascal_case(name)}LiveView"
+    context_name = f"{pascal_case(name)}Context"
+
+    return f"""from pyview import LiveView, LiveViewSocket
+from dataclasses import dataclass
+from pyview.events import event, BaseEventHandler
+
+
+@dataclass
+class {context_name}:
+    pass
+
+
+class {class_name}(BaseEventHandler, LiveView[{context_name}]):
+    async def mount(self, socket: LiveViewSocket[{context_name}], session):
+        socket.context = {context_name}()
+"""
+
+
+def generate_html_file(name: str) -> str:
+    """Generate the HTML template file content."""
+    css_class = kebab_case(name)
+    return f'''<div class="{css_class}-container">
+    <h1>{pascal_case(name)}</h1>
+    
+    <div class="content">
+        <!-- Add your content here -->
+    </div>
+</div>
+'''
+
+
+def generate_css_file(name: str) -> str:
+    """Generate the CSS file content."""
+    css_class = kebab_case(name)
+    return f""".{css_class}-container {{
+    padding: 1rem;
+}}
+
+.{css_class}-container h1 {{
+    margin-bottom: 1rem;
+}}
+
+.{css_class}-container .content {{
+    /* Add your styles here */
+}}
+"""
+
+
+def generate_init_file(name: str) -> str:
+    """Generate the __init__.py file content."""
+    module_name = snake_case(name)
+    class_name = f"{pascal_case(name)}LiveView"
+
+    return f'''from .{module_name} import {class_name}
+
+__all__ = ["{class_name}"]
+'''
+
+
+def detect_package_structure(directory: Optional[Path] = None):
+    """Detect the package structure from pyproject.toml.
+
+    Args:
+        directory: Directory to look for pyproject.toml in. Defaults to current directory.
+
+    Returns:
+        tuple: (package_name, views_path)
+    """
+    if directory is None:
+        directory = Path.cwd()
+
+    pyproject_path = directory / "pyproject.toml"
+
+    if not pyproject_path.exists():
+        return None, "views"
+
+    try:
+        with open(pyproject_path, "rb") as f:
+            config = tomllib.load(f)
+    except Exception:
+        return None, "views"
+
+    # Check for packages configuration
+    packages = config.get("tool", {}).get("poetry", {}).get("packages", [])
+    if not packages:
+        # Check for modern pyproject.toml structure
+        packages = config.get("project", {}).get("packages", [])
+
+    if not packages:
+        return None, "views"
+
+    # Find the first package entry
+    for package in packages:
+        if isinstance(package, dict) and "include" in package:
+            package_name = package["include"]
+            from_dir = package.get("from", ".")
+
+            # Construct the path where views should go
+            if from_dir == ".":
+                package_path = Path(package_name)
+            else:
+                package_path = Path(from_dir) / package_name
+
+            views_path = package_path / "views"
+            return package_name, str(views_path)
+
+    return None, "views"
+
+
+@click.command()
+@click.argument("name")
+@click.option(
+    "--path",
+    "-p",
+    default=None,
+    help="Directory to create the view in (default: auto-detect from pyproject.toml)",
+)
+@click.option("--no-css", is_flag=True, help="Skip creating CSS file")
+def create_view(name: str, path: Optional[str], no_css: bool):
+    """Create a new LiveView with boilerplate files.
+
+    Example: pv create-view Counter
+    """
+    module_name = snake_case(name)
+
+    # Always try to detect package structure for import advice
+    package_name, detected_path = detect_package_structure()
+
+    # Use detected path if no path specified, otherwise use provided path
+    if path is None:
+        path = detected_path
+
+    view_dir = Path(path) / module_name
+
+    # Check if directory already exists
+    if view_dir.exists():
+        click.secho(f"Error: Directory '{view_dir}' already exists", fg="red")
+        raise click.Abort()
+
+    view_dir.mkdir(parents=True, exist_ok=True)
+    click.secho(f"Created directory: {view_dir}", fg="green")
+
+    # Generate files
+    files_to_create = [
+        ("__init__.py", generate_init_file(name)),
+        (f"{module_name}.py", generate_python_file(name)),
+        (f"{module_name}.html", generate_html_file(name)),
+    ]
+
+    if not no_css:
+        files_to_create.append((f"{module_name}.css", generate_css_file(name)))
+
+    # Create files
+    for filename, content in files_to_create:
+        file_path = view_dir / filename
+        file_path.write_text(content)
+        click.secho(f"Created: {file_path}", fg="green")
+
+    class_name = f"{pascal_case(name)}LiveView"
+    click.echo("\nLiveView created successfully! 🎉")
+    click.echo("\nTo use this view, add it to your app:")
+
+    # import statement based on detected package structure
+    if package_name:
+        import_path = f"{package_name}.views.{module_name}"
+    else:
+        import_path = f"{path.replace('/', '.')}.{module_name}"
+
+    click.echo(f"  from {import_path} import {class_name}")
+    click.echo(f"  app.add_live_view('/{module_name}', {class_name})")

pyview/cli/main.py

@@ -0,0 +1,17 @@
+import click
+
+from pyview.cli.commands.create_view import create_view
+
+
+@click.group()
+@click.version_option(package_name="pyview-web")
+def cli():
+    """PyView CLI - Generate boilerplate for LiveView applications."""
+    pass
+
+
+cli.add_command(create_view)
+
+
+if __name__ == "__main__":
+    cli()

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.4.dist-info → pyview_web-0.2.6.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: pyview-web
-Version: 0.2.4
+Version: 0.2.6
 Summary: LiveView in Python
 License: MIT
 Keywords: web,api,LiveView
 Author: Larry Ogrodnek
 Author-email: ogrodnek@gmail.com
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.11,<3.13
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Framework :: AsyncIO
@@ -18,7 +18,6 @@ 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.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -30,13 +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: 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: APScheduler (==3.11.0)
+Requires-Dist: click (>=8.1.7,<9.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.4.dist-info → pyview_web-0.2.6.dist-info}/RECORD

@@ -8,13 +8,17 @@ 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=hImmvB_jS6RyLr5Mas5L7DO_0d805jR3c41LKJlnNL4,1720
+pyview/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyview/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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
@@ -44,8 +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.4.dist-info/LICENSE,sha256=M_bADaBm9_MV9llX3lCicksLhwk3eZUjA2srE0uUWr0,1071
-pyview_web-0.2.4.dist-info/METADATA,sha256=v6WKqv3gIV-4BdP9M91sFKcCjpeg5_Beug68wgqlvrU,5256
-pyview_web-0.2.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyview_web-0.2.4.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,,

pyview_web-0.2.6.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+pv=pyview.cli.main:cli
+