create-pywire-app 0.1.3__tar.gz → 0.1.4__tar.gz

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: create-pywire-app
-Version: 0.1.3
+Version: 0.1.4
 Summary: Init wizard for new pywire projects
 License-File: LICENSE
 Requires-Python: >=3.11

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "create-pywire-app"
-version = "0.1.3"
+dynamic = ["version"]
 description = "Init wizard for new pywire projects"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -14,7 +14,7 @@ dependencies = [
 create-pywire-app = "create_pywire_app.main:main"
 
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
 
 
@@ -44,3 +44,9 @@ include = [
 exclude = [
     "src/create_pywire_app/templates",
 ]
+
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.build.hooks.vcs]
+version-file = "src/create_pywire_app/_version.py"

create_pywire_app-0.1.4/src/create_pywire_app/__init__.py

@@ -0,0 +1,8 @@
+try:
+    from ._version import __version__
+except ImportError:
+    from importlib.metadata import version, PackageNotFoundError
+    try:
+        __version__ = version("create-pywire-app")
+    except PackageNotFoundError:
+        __version__ = "unknown"

create_pywire_app-0.1.4/src/create_pywire_app/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.1.4'
+__version_tuple__ = version_tuple = (0, 1, 4)
+
+__commit_id__ = commit_id = None

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/main.py

@@ -8,11 +8,14 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 import questionary
+import tomllib
 from jinja2 import Environment, PackageLoader, select_autoescape
 from rich.console import Console
 from rich.markdown import Markdown
 from rich.panel import Panel
 
+from create_pywire_app import __version__
+
 console = Console()
 
 LOGO = r"""
@@ -27,11 +30,56 @@ LOGO = r"""
 """
 
 
+def get_local_version(path: Path) -> Optional[str]:
+    """Try to read version from a local pyproject.toml file."""
+    try:
+        if path.exists():
+            with open(path, "rb") as f:
+                data = tomllib.load(f)
+                return data.get("project", {}).get("version")
+    except Exception:
+        pass
+    return None
+
+
 def get_version() -> str:
+    return __version__
+
+
+def resolve_pywire_version(pywire_dep: str) -> Optional[str]:
+    """Resolve the actual pywire version that will be installed.
+    
+    Args:
+        pywire_dep: Dependency spec (e.g., 'pywire', 'pywire==0.1.4', 'pywire @ /path')
+    
+    Returns:
+        Resolved version string or None if resolution fails
+    """
+    # For local paths, we can't resolve via uv pip compile
+    if "@" in pywire_dep:
+        return None
+    
     try:
-        return importlib.metadata.version("create-pywire-app")
-    except importlib.metadata.PackageNotFoundError:
-        return "0.0.0"
+        # Use uv pip compile to resolve the version without installing
+        process = subprocess.run(
+            ["uv", "pip", "compile", "-", "--quiet"],
+            input=pywire_dep,
+            text=True,
+            capture_output=True,
+            check=True,
+            timeout=10,
+        )
+        
+        # Parse the output for pywire==<version>
+        import re
+        match = re.search(r'pywire==([^\s]+)', process.stdout)
+        if match:
+            return match.group(1)
+            
+    except (subprocess.CalledProcessError, subprocess.TimeoutExpired, FileNotFoundError):
+        pass
+        
+    return None
 
 
 class TemplateRenderer:
@@ -277,6 +325,19 @@ class ProjectGenerator:
 
 
 def main():
+    # Fix for macOS when running with redirected stdin (e.g. via pipe)
+    # KqueueSelector fails with /dev/tty on macOS, so we force SelectSelector.
+    if sys.platform == "darwin":
+        import asyncio
+        import selectors
+
+        class MacOSEventLoopPolicy(asyncio.DefaultEventLoopPolicy):
+            def new_event_loop(self):
+                selector = selectors.SelectSelector()
+                return asyncio.SelectorEventLoop(selector)
+
+        asyncio.set_event_loop_policy(MacOSEventLoopPolicy())
+
     console.clear()
 
     # Parse arguments
@@ -291,16 +352,51 @@ def main():
 
     if use_local:
         pywire_dep = "pywire @ /Users/rholmdahl/projects/pywire-workspace/pywire"
-        # We don't warn yet, wait until after LOGO
+        # Try to resolve actual local version for display
+        # In a workspace structure, we might be in src/create_pywire_app, so up 3 levels is create-pywire-app, then up 1 is workspace
+        # actually let's try a safer relative resolution based on known structure
+        # /Users/rholmdahl/projects/pywire-workspace/create-pywire-app/src/create_pywire_app/main.py
+        # -> create-pywire-app (repo root) = parents[2]
+        # -> pywire-workspace = parents[3]
+        workspace_root = Path(__file__).resolve().parents[3]
+        local_pywire_path = workspace_root / "pywire"
+        
+        # Try reading _version.py first (generated by hatch-vcs)
+        local_pywire_version_file = local_pywire_path / "src" / "pywire" / "_version.py"
+        pywire_version_display = "Local (Source)"
+        
+        if local_pywire_version_file.exists():
+             # Basic regex search for version string to avoid importing it
+            import re
+            content = local_pywire_version_file.read_text()
+            match = re.search(r'version = ["\']([^"\']+)["\']', content)
+            if match:
+                 pywire_version_display = f"{match.group(1)} (Local)"
+        
+        if pywire_version_display == "Local (Source)":
+             # Fallback to toml if needed, though with hatch-vcs pyproject.toml won't have it.
+             # but check anyway? hatch-vcs usually cleans it.
+             # If completely failing, just stick with "Local (Source)"
+             pass
+
     elif args.pywire_version:
         pywire_dep = f"pywire=={args.pywire_version}"
+        pywire_version_display = args.pywire_version
     else:
         pywire_dep = "pywire"  # Latest
+        pywire_version_display = "Latest"
+
+    # Resolve the actual version if not local
+    if not use_local and pywire_version_display == "Latest":
+        with console.status("[dim]Resolving version...", spinner="dots"):
+            resolved_version = resolve_pywire_version(pywire_dep)
+            if resolved_version:
+                pywire_version_display = resolved_version
 
     tool_version = get_version()
 
     console.print(LOGO)
-    console.print(f"[dim]v{tool_version} • The Python Web Framework[/dim]\n")
+    console.print(f"[dim]v{tool_version} • PyWire {pywire_version_display}[/dim]\n")
 
     if use_local:
         console.print("[yellow]WARNING: Using local pywire dependency[/yellow]")

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/blog/explicit/about.wire

@@ -1,7 +1,8 @@
 !path "/about"
 !layout "layout.wire"
 
----html---
+--- html ---
+
 <section>
     <h1>About</h1>
     <p>This page shows explicit routing with semantic filenames.</p>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/blog/explicit/blog-posts.wire

@@ -31,15 +31,9 @@ if path.detail:
         "select title, body from posts where slug = ?",
         (slug,),
     ).fetchone()
-    
-    if post:
-        post_title = post["title"]
-        post_body_html = markdown.markdown(post["body"])
-    else:
-        post_title = "Post not found"
-        post_body_html = "<p>We couldn't find that post.</p>"
-
----html---
+
+--- html ---
+
 <main>
     <!-- List view: /posts -->
     <section $if={path.list}>
@@ -54,8 +48,8 @@ if path.detail:
     
     <!-- Detail view: /posts/{slug} -->
     <article $if={path.detail}>
-        <h1>{post_title}</h1>
-        <div>{post_body_html}</div>
+        <h1>{post_title if post else "Post not found"}</h1>
+        <div>{!html markdown.markdown(post["body"]) if post else "<p>We couldn't find that post.</p>"}</div>
         <p><a href="/posts">← Back to all posts</a></p>
     </article>
 </main>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/blog/explicit/home.wire

@@ -48,11 +48,14 @@ posts = cursor.execute(
     "select slug, title from posts order by id desc"
 ).fetchall()
 
----html---
+--- html ---
+
 <section>
     <h1>Blog + Portfolio (Explicit)</h1>
     <p>Routes are declared with <code>!path</code> and files are named semantically.</p>
     <ul>
-        {"".join([f'<li><a href="/posts/{row["slug"]}">{row["title"]}</a></li>' for row in posts])}
+        <li $for={post in posts} $key={post["slug"]}>
+            <a href="/posts/{row["slug"]}">{row["title"]}</a>
+        </li>
     </ul>
 </section>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/blog/path-based/index.wire

@@ -45,11 +45,14 @@ posts = cursor.execute(
     "select slug, title from posts order by id desc"
 ).fetchall()
 
----html---
+--- html ---
+
 <section>
     <h1>Blog + Portfolio</h1>
     <p>Markdown posts backed by SQLite.</p>
     <ul>
-        {"".join([f'<li><a href="/posts/{row["slug"]}">{row["title"]}</a></li>' for row in posts])}
+        <li $for={post in posts} $key={post["slug"]}>
+            <a href="/posts/{row["slug"]}">{row["title"]}</a>
+        </li>
     </ul>
 </section>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/blog/path-based/posts_index.wire

@@ -12,10 +12,13 @@ posts = cursor.execute(
     "select slug, title from posts order by id desc"
 ).fetchall()
 
----html---
+--- html ---
+
 <section>
     <h1>All posts</h1>
     <ul>
-        {"".join([f'<li><a href="/posts/{row["slug"]}">{row["title"]}</a></li>' for row in posts])}
+        <li $for={post in posts} $key={post["slug"]}>
+            <a href="/posts/{row["slug"]}">{row["title"]}</a>
+        </li>
     </ul>
 </section>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/blog/path-based/posts_slug.wire

@@ -14,15 +14,9 @@ post = cursor.execute(
     (slug,),
 ).fetchone()
 
-if post:
-    title = post["title"]
-    body_html = markdown.markdown(post["body"])
-else:
-    title = "Post not found"
-    body_html = "<p>We couldn't find that post.</p>"
+--- html ---
 
----html---
 <article>
-    <h1>{title}</h1>
-    <div>{body_html}</div>
+    <h1>{post["title"] if post else "Post not found"}</h1>
+    <div>{!html markdown.markdown(post["body"]) if post else "<p>We couldn't find that post.</p>"}</div>
 </article>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/common/__error__.wire

@@ -1,5 +1,4 @@
----html---
 <section class="container">
-    <h1>Something went wrong</h1>
+    <h1>Something went wrong ({error_code})</h1>
     <p>Try refreshing the page. If the issue persists, check the server logs.</p>
 </section>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/counter/explicit/home.wire

@@ -1,11 +1,13 @@
 !path "/"
 !layout "layout.wire"
 
-count = 0
----html---
+count = wire(0)
+
+--- html ---
+
 <div class="container">
     <h1>Counter (Explicit Routing)</h1>
     <p>This page uses explicit routing via <code>!path</code>.</p>
-    <p>Count is: {count}</p>
-    <button @click={count += 1}>Increment</button>
+    <p>Count is: {count.value}</p>
+    <button @click={count.value += 1}>Increment</button>
 </div>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/counter/path-based/index.wire

@@ -1,8 +1,10 @@
-count = 0
----html---
+count = wire(0)
+
+--- html ---
+
 <div class="container">
     <h1>Counter</h1>
     <p>Edit <code>pages/index.wire</code> to watch hot reload in action.</p>
-    <p>Count is: {count}</p>
-    <button @click={count += 1}>Increment</button>
+    <p>Count is: {count.value}</p>
+    <button @click={count.value += 1}>Increment</button>
 </div>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/explicit/auth-layout.wire.j2

@@ -3,7 +3,8 @@ from datetime import datetime
 # TODO: Replace with real auth middleware
 user = {"id": "demo-user", "email": "demo@pywire.dev", "signed_in_at": datetime.utcnow()}
 
----html---
+--- html ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/explicit/dashboard-pages.wire

@@ -11,7 +11,8 @@ settings_sections = [
     {"id": "team", "title": "Team", "description": "Invite and manage team members."},
 ]
 
----html---
+--- html ---
+
 <main>
     <!-- Dashboard home: /dashboard -->
     <section $if={path.home}>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/explicit/landing.wire

@@ -1,7 +1,8 @@
 !path "/"
 !layout "public-layout.wire"
 
----html---
+--- html ---
+
 <section>
     <h1>Ship a SaaS with pywire</h1>
     <p>This starter includes Stripe + SQLAlchemy + stubbed auth.</p>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/explicit/login.wire

@@ -1,7 +1,8 @@
 !path "/login"
 !layout "public-layout.wire"
 
----html---
+--- html ---
+
 <section>
     <h1>Login</h1>
     <p>TODO: Replace with pywire auth once available.</p>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/explicit/pricing.wire

@@ -5,7 +5,7 @@ import os
 
 stripe_public_key = os.environ.get("STRIPE_PUBLIC_KEY", "")
 
----html---
+--- html ---
 <section>
     <h1>Pricing</h1>
     <p>Set <code>STRIPE_PUBLIC_KEY</code> to connect Stripe.</p>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/path-based/dashboard__layout__.wire.j2

@@ -3,7 +3,8 @@ from datetime import datetime
 # TODO: Replace with real auth middleware
 user = {"id": "demo-user", "email": "demo@pywire.dev", "signed_in_at": datetime.utcnow()}
 
----html---
+--- html ---
+
 <!DOCTYPE html>
 <html lang="en">
 <head>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/path-based/dashboard_index.wire

@@ -1,4 +1,3 @@
----html---
 <section>
     <h1>Dashboard</h1>
     <p>Welcome to your SaaS dashboard.</p>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/path-based/dashboard_settings.wire

@@ -1,4 +1,3 @@
----html---
 <section>
     <h1>Settings</h1>
     <p>Manage billing, team, and usage.</p>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/path-based/index.wire

@@ -1,4 +1,3 @@
----html---
 <section>
     <h1>Ship a SaaS with pywire</h1>
     <p>This starter includes Stripe + SQLAlchemy + stubbed auth.</p>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/path-based/login.wire

@@ -1,4 +1,3 @@
----html---
 <section>
     <h1>Login</h1>
     <p>TODO: Replace with pywire auth once available.</p>

{create_pywire_app-0.1.3 → create_pywire_app-0.1.4}/src/create_pywire_app/templates/saas/path-based/pricing.wire

@@ -2,7 +2,8 @@ import os
 
 stripe_public_key = os.environ.get("STRIPE_PUBLIC_KEY", "")
 
----html---
+--- html ---
+
 <section>
     <h1>Pricing</h1>
     <p>Set <code>STRIPE_PUBLIC_KEY</code> to connect Stripe.</p>