pywire 0.1.3__tar.gz → 0.1.5__tar.gz

{pywire-0.1.3 → pywire-0.1.5}/.github/workflows/publish.yml

@@ -31,12 +31,6 @@ jobs:
         with:
           enable-cache: true
 
-      - name: Build client assets
-        run: |
-          cd src/pywire/client
-          pnpm install
-          pnpm build
-
       - name: Build
         run: uv build
 

{pywire-0.1.3 → pywire-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pywire
-Version: 0.1.3
+Version: 0.1.5
 Summary: HTML-over-the-wire Python web framework
 Author-email: Reece Holmdahl <reece@pywire.dev>
 License-File: LICENSE

pywire-0.1.5/hatch_build.py

@@ -0,0 +1,140 @@
+import json
+import logging
+import os
+import sys
+from contextlib import suppress
+from pathlib import Path
+from typing import Any, Dict
+
+from hatchling.builders.hooks.plugin.interface import BuildHookInterface
+
+log = logging.getLogger(__name__)
+
+class CustomBuildHook(BuildHookInterface):
+    def initialize(self, version: str, build_data: Dict[str, Any]) -> None:
+        real_version = self.metadata.version
+        
+        # We only want to do this if we actually have a version
+        if not real_version:
+            return
+
+        # Attempt to find the client package.json
+        # When building sdist, we might be in the source tree.
+        # When building wheel, we might be in a copy.
+        
+        # Try explicit relative path first
+        pkg_path = Path(self.root) / "src" / "pywire" / "client" / "package.json"
+        
+        if not pkg_path.exists():
+            log.warning(f"Client package.json not found at {pkg_path}")
+            return
+
+        try:
+            content = pkg_path.read_text("utf-8")
+            data = json.loads(content)
+            
+            current_version = data.get("version")
+            
+            # Normalize PEP 440 to SemVer
+            # 0.1.5.dev0+... -> 0.1.5-dev0+...
+            semver = real_version.replace(".dev", "-dev")
+            semver = semver.replace(".a", "-alpha")
+            semver = semver.replace(".b", "-beta")
+            semver = semver.replace(".rc", "-rc")
+            
+            version_changed = False
+            if current_version != semver:
+                log.info(f"Syncing client version: {current_version} -> {semver}")
+                data["version"] = semver
+                
+                # formatting with 2 spaces to match typical usage
+                pkg_path.write_text(json.dumps(data, indent=2) + "\n", "utf-8")
+                version_changed = True
+                
+            # Now run the build
+            # We need to run pnpm install and pnpm run build
+            import subprocess
+            import shutil
+            
+            client_dir = pkg_path.parent
+            static_dir = client_dir.parent / "static"
+            
+            if not shutil.which("pnpm"):
+                log.warning("pnpm not found, skipping client build. Assets may be stale.")
+                return
+
+            # Check if we need to install
+            if self._should_install(client_dir):
+                log.info("Installing client dependencies...")
+                subprocess.run(["pnpm", "install"], cwd=client_dir, check=True, shell=False)
+            else:
+                log.debug("Client dependencies up to date.")
+
+            # Check if we need to build
+            if self._should_build(client_dir, static_dir) or version_changed:
+                log.info("Building client assets with pnpm...")
+                subprocess.run(["pnpm", "run", "build"], cwd=client_dir, check=True, shell=False)
+                log.info("Client build complete.")
+            else:
+                log.info("Client assets up to date, skipping build.")
+                
+        except Exception as e:
+            log.error(f"Failed to sync client version: {e}")
+
+    def _should_install(self, client_dir: Path) -> bool:
+        """Check if node_modules is missing or package.json changed."""
+        node_modules = client_dir / "node_modules"
+        package_json = client_dir / "package.json"
+        lock_file = client_dir / "pnpm-lock.yaml"
+        
+        if not node_modules.exists():
+            return True
+        
+        # If no package.json, can't install (shouldn't happen here)
+        if not package_json.exists():
+            return False
+            
+        # Check timestamps
+        # Use node_modules directory mtime as proxy for install time
+        nm_mtime = node_modules.stat().st_mtime
+        pkg_mtime = package_json.stat().st_mtime
+        
+        if pkg_mtime > nm_mtime:
+            return True
+            
+        if lock_file.exists():
+            if lock_file.stat().st_mtime > nm_mtime:
+                return True
+                
+        return False
+
+    def _should_build(self, client_dir: Path, static_dir: Path) -> bool:
+        """Check if source files are newer than built assets."""
+        core_bundle = static_dir / "pywire.core.min.js"
+        
+        if not core_bundle.exists():
+            return True
+            
+        build_mtime = core_bundle.stat().st_mtime
+        
+        # Check source files
+        src_dir = client_dir / "src"
+        if not src_dir.exists():
+            return False
+            
+        # Recursive check for any file in src
+        for root, _, files in os.walk(src_dir):
+            for file in files:
+                file_path = Path(root) / file
+                if file_path.stat().st_mtime > build_mtime:
+                    return True
+                    
+        # Check build script and package.json
+        build_script = client_dir / "build.mjs"
+        if build_script.exists() and build_script.stat().st_mtime > build_mtime:
+            return True
+            
+        if (client_dir / "package.json").stat().st_mtime > build_mtime:
+            return True
+            
+        return False

{pywire-0.1.3 → pywire-0.1.5}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
 
 [project]
@@ -7,7 +7,7 @@ name = "pywire"
 authors = [
     { name="Reece Holmdahl", email="reece@pywire.dev" },
 ]
-version = "0.1.3"
+dynamic = ["version"]
 description = "HTML-over-the-wire Python web framework"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -58,6 +58,14 @@ include = [
 [tool.hatch.build.targets.sdist.force-include]
 "src/pywire/static" = "src/pywire/static"
 
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.build.hooks.vcs]
+version-file = "src/pywire/_version.py"
+
+[tool.hatch.build.hooks.custom]
+
 [tool.mypy]
 python_version = "3.11"
 check_untyped_defs = true

pywire-0.1.5/src/pywire/__init__.py

@@ -0,0 +1,12 @@
+try:
+    from ._version import __version__
+except ImportError:
+    from importlib.metadata import version, PackageNotFoundError
+
+    try:
+        __version__ = version("pywire")
+    except PackageNotFoundError:
+        __version__ = "unknown"
+
+from .runtime.app import PyWire as PyWire
+from .core.wire import wire as wire

pywire-0.1.5/src/pywire/_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.5'
+__version_tuple__ = version_tuple = (0, 1, 5)
+
+__commit_id__ = commit_id = None

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/cli/main.py

@@ -8,6 +8,8 @@ from typing import Any, Optional
 import rich.panel
 import rich_click as click
 
+from pywire import __version__
+
 # Astro-like styling configuration (Cyan Theme)
 click.rich_click.USE_RICH_MARKUP = True
 click.rich_click.STYLE_HELPTEXT_FIRST = True
@@ -141,18 +143,19 @@ def panel_init(self, *args, **kwargs):
 rich.panel.Panel.__init__ = panel_init  # type: ignore[method-assign]
 
 
-@click.group()
-@click.version_option()
-def cli() -> None:
-    """
-    [bold white on cyan] pywire [/] [bold cyan]v0.1.3[/] Build faster python web apps.
+@click.group(
+    help=f"""
+[bold white on cyan] pywire [/] [bold cyan]v{__version__}[/] Build faster python web apps.
 
-    Run [bold cyan]pywire dev APP[/] to start development server.
-    Run [bold cyan]pywire run APP[/] to start production server.
+Run [bold cyan]pywire dev APP[/] to start development server.
+Run [bold cyan]pywire run APP[/] to start production server.
 
-    [dim]APP should be a string in format 'module:instance', e.g. 'src.main:app' or 'main:app'
-    If not provided, pywire tries to discover it in main.py, app.py, etc.[/dim]
-    """
+[dim]APP should be a string in format 'module:instance', e.g. 'src.main:app' or 'main:app'
+If not provided, pywire tries to discover it in main.py, app.py, etc.[/dim]
+"""
+)
+@click.version_option(__version__)
+def cli() -> None:
     pass
 
 

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/client/build.mjs

@@ -1,6 +1,9 @@
 import * as esbuild from 'esbuild'
 import { resolve, dirname } from 'path'
 import { fileURLToPath } from 'url'
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
+const { version } = require('./package.json')
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
@@ -38,7 +41,7 @@ function getBuildOptions(bundle) {
       'process.env.NODE_ENV': isDev ? '"development"' : '"production"',
     },
     banner: {
-      js: `/* PyWire Client ${bundle.name} v0.1.3 - https://github.com/pywire/pywire */`,
+      js: `/* PyWire Client ${bundle.name} v${version} - https://github.com/pywire/pywire */`,
     },
   }
 }

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pywire-client",
-  "version": "0.1.0",
+  "version": "0.1.5",
   "description": "PyWire client-side library with transport fallbacks",
   "type": "module",
   "private": true,

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/client/src/core/app.ts

@@ -1,4 +1,5 @@
 import { TransportManager, TransportConfig } from './transport-manager'
+import { version as clientVersion } from '../../package.json'
 import { DOMUpdater } from './dom-updater'
 import { ServerMessage, ClientMessage, EventData, RelocateMessage } from './transports'
 import { UnifiedEventHandler } from '../events/handler'
@@ -242,6 +243,10 @@ export class PyWireApp {
         }
         break
 
+      case 'init':
+        console.log(`PyWire Client v${clientVersion} • Server v${msg.version}`)
+        break
+
       default:
         console.warn('PyWire: Unknown message type', msg)
     }

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/client/src/core/transports/base.ts

@@ -36,13 +36,19 @@ export interface StackFrame {
 }
 
 export interface ServerMessage {
-  type: 'update' | 'reload' | 'error' | 'console' | 'error_trace'
+  type: 'update' | 'reload' | 'error' | 'console' | 'error_trace' | 'init'
   html?: string
   regions?: Array<{ region: string; html: string }>
   error?: string
   level?: 'info' | 'warn' | 'error'
   lines?: string[]
   trace?: StackFrame[]
+  version?: string
+}
+
+export interface InitMessage {
+  type: 'init'
+  version: string
 }
 
 export interface ConsoleMessage {

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/client/src/core/transports/http.ts

@@ -35,9 +35,13 @@ export class HTTPTransport extends BaseTransport {
       }
 
       const buffer = await response.arrayBuffer()
-      const data = decode(buffer) as { sessionId: string }
+      const data = decode(buffer) as { sessionId: string; version?: string }
       this.sessionId = data.sessionId
 
+      if (data.version) {
+        this.notifyHandlers({ type: 'init', version: data.version })
+      }
+
       console.log('PyWire: HTTP transport connected')
       this.notifyStatus(true)
 

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/client/tsconfig.json

@@ -10,7 +10,8 @@
     "declaration": false,
     "outDir": "./dist",
     "rootDir": "./src",
-    "lib": ["ES2020", "DOM", "DOM.Iterable"]
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "resolveJsonModule": true
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/compiler/codegen/generator.py

@@ -1485,45 +1485,8 @@ class CodeGenerator:
 
         for node in python_ast.body:
             if isinstance(node, (ast.Import, ast.ImportFrom)):
-                # Skip imports - already handled
+                # Skip imports - already handled at module level
                 continue
-            elif isinstance(node, ast.Assign):
-                # Module-level assignments become class attributes
-                # UNLESS they target 'self' (e.g. self.x = 1), which makes no sense at class level
-                # and implies instance initialization.
-
-                is_instance_assign = False
-                for target in node.targets:
-                    # Check if target is Attribute(value=Name(id='self'))
-                    if (
-                        isinstance(target, ast.Attribute)
-                        and isinstance(target.value, ast.Name)
-                        and target.value.id == "self"
-                    ):
-                        is_instance_assign = True
-                        break
-
-                # Also check if value is a Call (like wire()) or mutable structure.
-                # These should be instance-level to avoid shared state.
-                is_mutable_init = isinstance(
-                    node.value,
-                    (
-                        ast.Call,
-                        ast.List,
-                        ast.Dict,
-                        ast.Set,
-                        ast.ListComp,
-                        ast.DictComp,
-                        ast.SetComp,
-                    ),
-                )
-
-                if is_instance_assign or is_mutable_init:
-                    top_level_statements.append(node)
-                else:
-                    # Simple literals (int, str) stay class attributes
-                    transformed.append(node)
-
             elif isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
                 # Check for decorators
                 new_decorators = []
@@ -1544,8 +1507,10 @@ class CodeGenerator:
                 # Classes are moved to module level, skip here
                 continue
             else:
-                # Other statements (Expr, If, For, While, Try)
-                # Move to top-level init
+                # ALL other statements (Assign, AnnAssign, AugAssign, Expr, If, For, While, Try, etc.)
+                # are moved to __top_level_init__ for consistent instance-scope execution.
+                # This ensures that dependent code (e.g., conn = ...; conn.row_factory = ...)
+                # all runs in the same scope at instance creation time.
                 top_level_statements.append(node)
 
         if top_level_statements:

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/runtime/app.py

@@ -12,6 +12,7 @@ from starlette.responses import JSONResponse, PlainTextResponse, Response
 from starlette.routing import Mount, Route, WebSocketRoute
 from starlette.staticfiles import StaticFiles
 
+from pywire import __version__
 from pywire.runtime.error_page import ErrorPage
 from pywire.runtime.http_transport import HTTPTransportHandler
 from pywire.runtime.router import Router
@@ -208,7 +209,7 @@ class PyWire:
                 "transports": ["websocket", "http"],
                 # WebTransport requires HTTP/3 - only available when running with Hypercorn
                 "webtransport": False,
-                "version": "0.1.0",
+                "version": __version__,
             }
         )
 

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/runtime/http_transport.py

@@ -12,6 +12,7 @@ from starlette.requests import Request
 from starlette.responses import Response
 
 from pywire.runtime.page import BasePage
+from pywire import __version__
 
 
 @dataclass
@@ -118,7 +119,8 @@ class HTTPTransportHandler:
         self.start_cleanup_task()
 
         return Response(
-            msgpack.packb({"sessionId": session_id}), media_type="application/x-msgpack"
+            msgpack.packb({"sessionId": session_id, "version": __version__}),
+            media_type="application/x-msgpack",
         )
 
     async def poll(self, request: Request) -> Response:

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/runtime/loader.py

@@ -80,6 +80,9 @@ class PageLoader:
         module_any.load_layout = self.load_layout
         module_any.load_component = self.load_component
 
+        # Inject __file__ for relative path resolution
+        module.__file__ = str(pywire_file)
+
         exec(code, module.__dict__)
 
         page_class = self._find_page_class(module, pywire_file)

{pywire-0.1.3 → pywire-0.1.5}/src/pywire/runtime/websocket.py

@@ -12,6 +12,7 @@ from starlette.websockets import WebSocket, WebSocketDisconnect
 
 from pywire.runtime.logging import log_callback_ctx
 from pywire.runtime.page import BasePage
+from pywire import __version__
 
 
 class WebSocketHandler:
@@ -34,6 +35,11 @@ class WebSocketHandler:
         await websocket.accept()
         self.active_connections.add(websocket)
 
+        # Send init message
+        await websocket.send_bytes(
+            msgpack.packb({"type": "init", "version": __version__})
+        )
+
         try:
             # Create isolated page instance for this connection
             # We need to reconstruct the page based on current URL