pyweber 1.6.0.dev0__tar.gz → 1.6.0.dev1__tar.gz

{pyweber-1.6.0.dev0/pyweber.egg-info → pyweber-1.6.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyweber
-Version: 1.6.0.dev0
+Version: 1.6.0.dev1
 Summary: A lightweight Python framework for building and managing web applications.
 Author-email: DevPythonMZ <pypi.dev@gmail.com>
 License-Expression: Apache-2.0

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyweber"
-version = "1.6.0.dev0"
+version = "1.6.0.dev1"
 description = "A lightweight Python framework for building and managing web applications."
 readme = "README.md"
 authors = [{ name = "DevPythonMZ", email = "pypi.dev@gmail.com" }]

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1}/pyweber/core/element.py

@@ -264,8 +264,9 @@ class Element(ElementConstrutor):
         from pyweber.core.events import TemplateEvents
 
         element = self
+        cls = type(self)
 
-        cln = Element(
+        init_kwargs = dict(
             tag=element.tag,
             id=element.id,
             content=element.content,
@@ -274,15 +275,55 @@ class Element(ElementConstrutor):
             style=self.__deepy_clone(element.style),
             attrs=self.__deepy_clone(element.attrs),
             events=TemplateEvents(**element.events.__dict__),
-            **element.kwargs
+            sanitize=getattr(element, 'sanitize', True),
+            files=list(getattr(element, 'files', []) or []),
+            include_uuid=getattr(element, 'include_uuid', True),
+            **element.kwargs,
         )
+
+        if cls is Element:
+            cln = Element(**init_kwargs)
+        else:
+            # Avoid subclass __init__ (would rebuild a different tree).
+            cln = object.__new__(cls)
+            Element.__init__(cln, childs=None, data=getattr(element, 'data', None), **init_kwargs)
+
         cln.uuid = element.uuid
-        cln.parent = element.parent
+        cln.parent = None
         cln.template = getattr(element, 'template', None)
+        cln.data = getattr(element, 'data', None)
         cln._Element__element_methods = self.__deepy_clone(self.__element_methods)
 
+        uuid_map: dict[str, Element] = {cln.uuid: cln} if cln.uuid else {}
         for child in element.childs:
-            cln.childs.append(child.clone)
+            child_clone = child.clone
+            cln.childs.append(child_clone)
+            if child_clone.uuid:
+                uuid_map[child_clone.uuid] = child_clone
+            # Index deep descendants for subclass ref remapping
+            stack = list(child_clone.childs)
+            while stack:
+                node = stack.pop()
+                if node.uuid:
+                    uuid_map[node.uuid] = node
+                stack.extend(node.childs)
+
+        if cls is not Element:
+            skip = {
+                'kwargs', 'tag', 'id', 'attrs', 'style', 'content', 'value',
+                'classes', 'parent', 'data', 'files', 'events', 'childs',
+                'include_uuid', 'sanitize', 'uuid', 'template',
+            }
+            for key, val in element.__dict__.items():
+                if key in skip or key.startswith('_Element') or key.startswith('_ElementConstrutor'):
+                    continue
+                if isinstance(val, Element) and val.uuid and val.uuid in uuid_map:
+                    object.__setattr__(cln, key, uuid_map[val.uuid])
+                elif not isinstance(val, Element):
+                    try:
+                        object.__setattr__(cln, key, val)
+                    except AttributeError:
+                        cln.__dict__[key] = val
 
         return cln
 

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1}/pyweber/core/template.py

@@ -275,14 +275,15 @@ class Template:
         return root
 
     def clone(self):
-        tpl = Template(
-            template=self.template,
-            status_code=self.status_code,
-            title=self.title,
-            include_uuid=self.__include_uuid,
-            **self.kwargs
-        )
+        """Deep-copy the template tree, preserving subclass type when possible."""
+        cls = type(self)
+        tpl = object.__new__(cls)
+        tpl._Template__include_uuid = self._Template__include_uuid
+        tpl._Template__template = self._Template__template
+        tpl.kwargs = dict(self.kwargs)
         tpl.data = self.data
-        tpl.root = self.root.clone
-
+        tpl._Template__status_code = self._Template__status_code
+        tpl._Template__icon = self._Template__icon
+        tpl._Template__title = self._Template__title
+        tpl._Template__root = self.root.clone
         return tpl

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1}/pyweber/db/cli.py

@@ -1,4 +1,4 @@
-"""Alembic CLI helpers: ``pyweber db init|revision|upgrade|downgrade``."""
+"""Alembic CLI helpers: ``pyweber db init|revision|migrate|upgrade|downgrade``."""
 
 from __future__ import annotations
 
@@ -149,7 +149,7 @@ Generic single-database Alembic configuration for PyWeber (async).
 
 1. Import your models in ``env.py`` so ``Model.metadata`` includes them.
 2. ``pyweber db revision -m "message"``
-3. ``pyweber db upgrade head``
+3. ``pyweber db migrate``  (applies all pending revisions; same as ``upgrade head``)
 '''
 
 
@@ -195,6 +195,11 @@ def upgrade(target: str = 'head') -> int:
     return _alembic_cmd('upgrade', target)
 
 
+def migrate(target: str = 'head') -> int:
+    """Apply pending migrations (default: all the way to ``head``)."""
+    return upgrade(target)
+
+
 def downgrade(target: str = '-1') -> int:
     return _alembic_cmd('downgrade', target)
 
@@ -213,6 +218,17 @@ def build_parser(subparsers) -> None:
         help='Do not pass --autogenerate to Alembic',
     )
 
+    mig = db_sub.add_parser(
+        'migrate',
+        help='Apply all pending migrations (alias for upgrade head)',
+    )
+    mig.add_argument(
+        'target',
+        nargs='?',
+        default='head',
+        help='Revision target (default: head — run everything pending)',
+    )
+
     up = db_sub.add_parser('upgrade', help='Upgrade to a revision (default: head)')
     up.add_argument('target', nargs='?', default='head')
 
@@ -228,9 +244,11 @@ def handle_db_command(args: argparse.Namespace) -> int:
         return 0
     if cmd == 'revision':
         return revision(args.message, autogenerate=not args.no_autogenerate)
+    if cmd == 'migrate':
+        return migrate(args.target)
     if cmd == 'upgrade':
         return upgrade(args.target)
     if cmd == 'downgrade':
         return downgrade(args.target)
-    print('Usage: pyweber db {init,revision,upgrade,downgrade}')
+    print('Usage: pyweber db {init,revision,migrate,upgrade,downgrade}')
     return 1

pyweber-1.6.0.dev1/pyweber/models/dom_merge.py

@@ -0,0 +1,92 @@
+"""Merge client DOM HTML into an existing server Element tree by uuid.
+
+Preserves Python object identity so bound handlers and ``self`` refs stay valid.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from pyweber.core.element import Element
+
+
+def index_elements_by_uuid(root: 'Element') -> dict[str, 'Element']:
+    """Walk ``root`` and map uuid → Element (skips missing/empty uuids)."""
+    out: dict[str, Element] = {}
+
+    def walk(el: 'Element') -> None:
+        uid = getattr(el, 'uuid', None)
+        if uid:
+            out[str(uid)] = el
+        for child in el.childs or []:
+            walk(child)
+
+    walk(root)
+    return out
+
+
+def _sync_client_fields(server_el: 'Element', client_el: 'Element') -> None:
+    """Copy browser-authoritative fields onto the existing server element."""
+    if client_el.value is not None:
+        server_el.value = client_el.value
+
+    for attr in ('checked', 'selected', 'disabled'):
+        if attr in (client_el.attrs or {}):
+            server_el.attrs[attr] = client_el.attrs[attr]
+        elif attr in (server_el.attrs or {}) and attr not in (client_el.attrs or {}):
+            # Client omitted boolean attr → unchecked / not selected
+            if server_el.tag in ('input', 'option'):
+                server_el.attrs.pop(attr, None)
+
+
+def _is_top_level_client_only(client_el: 'Element', server_map: dict[str, 'Element']) -> bool:
+    """True when this node is new and its parent already exists on the server (or is root)."""
+    parent = client_el.parent
+    if parent is None:
+        return False
+    parent_uid = getattr(parent, 'uuid', None)
+    if not parent_uid:
+        return False
+    return str(parent_uid) in server_map
+
+
+def merge_client_dom(
+    server_root: 'Element',
+    client_html: str,
+    *,
+    include_uuid: bool = True,
+) -> None:
+    """Merge parsed client HTML into ``server_root`` without replacing known nodes.
+
+    - Matching uuids: update value / form-ish attrs in place.
+    - Client-only uuids (e.g. JS inject): graft the new subtree under the matching
+      server parent.
+    - Server-only uuids: left untouched (next diff can reconcile the browser).
+    """
+    from pyweber.core.element import Element
+
+    if not client_html or not client_html.strip():
+        return
+
+    client_root = Element.from_html(client_html, include_uuid=include_uuid)
+    server_map = index_elements_by_uuid(server_root)
+    client_map = index_elements_by_uuid(client_root)
+
+    for uid, server_el in list(server_map.items()):
+        client_el = client_map.get(uid)
+        if client_el is not None:
+            _sync_client_fields(server_el, client_el)
+
+    for uid, client_el in client_map.items():
+        if uid in server_map:
+            continue
+        if not _is_top_level_client_only(client_el, server_map):
+            continue
+
+        parent_uid = str(client_el.parent.uuid)
+        server_parent = server_map[parent_uid]
+        grafted = client_el.clone
+        grafted.parent = None
+        server_parent.add_child(grafted)
+        server_map.update(index_elements_by_uuid(grafted))

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1}/pyweber/models/handoff.py

@@ -18,6 +18,13 @@ class HandoffEntry:
 
 
 class TemplateHandoffRegistry:
+    """One-shot HTTP → WS handoff of the **same** Template instance (move on consume).
+
+    Storing a clone would type-erase subclasses and orphan ``self`` refs used by
+    bound event handlers. The HTTP response and the future session share one object
+    until ``consume`` moves it into the WebSocket session.
+    """
+
     def __init__(self, ttl: int = HANDOFF_TTL_SECONDS):
         self._ttl = ttl
         self._entries: dict[str, HandoffEntry] = {}
@@ -28,7 +35,7 @@ class TemplateHandoffRegistry:
         with self._lock:
             self._purge_expired()
             self._entries[token] = HandoffEntry(
-                template=template.clone(),
+                template=template,
                 route=route,
                 created_at=time(),
             )
@@ -50,7 +57,7 @@ class TemplateHandoffRegistry:
         if time() - entry.created_at > self._ttl:
             return None
 
-        return entry.template.clone()
+        return entry.template
 
     def clear(self):
         with self._lock:

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1}/pyweber/models/ws_message.py

@@ -63,8 +63,17 @@ class wsMessage:
                 not getattr(session_template, 'include_uuid', True)
                 or (used_handoff and 'uuid=' not in client_html.lower())
             )
-            if not keep_server:
-                session_template.root = session_template.parse_html(html=client_html)
+            if keep_server:
+                self.insert_values(element=session_template.root)
+            else:
+                # Preserve Python object identity (self / bound handlers).
+                from pyweber.models.dom_merge import merge_client_dom
+
+                merge_client_dom(
+                    session_template.root,
+                    client_html,
+                    include_uuid=getattr(session_template, 'include_uuid', True),
+                )
                 self.insert_values(element=session_template.root)
 
         return session_template

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1}/pyweber/services/template_service.py

@@ -44,9 +44,41 @@ class TemplateService:
         if isinstance(template, Template):
             return template
         if isinstance(template, Element):
-            return Template(template=template.to_html(), title=title)
+            return self._adopt_element_as_template(template, title=title)
         return Template(template=str(template), title=title)
 
+    def _adopt_element_as_template(self, element: Element, title: str = None) -> Template:
+        """Wrap an Element tree in a Template without HTML round-trip (keeps identity)."""
+        from pyweber.config.config import config
+
+        include_uuid = getattr(element, 'include_uuid', True)
+        if element.tag == 'html':
+            tpl = object.__new__(Template)
+            tpl._Template__include_uuid = include_uuid
+            tpl._Template__template = ''
+            tpl.kwargs = {}
+            tpl.data = getattr(element, 'data', None)
+            tpl._Template__status_code = 200
+            tpl._Template__icon = str(config['app'].get('icon'))
+            tpl._Template__title = title
+            tpl._Template__root = element
+            if title:
+                # Use property to sync <title> when present
+                tpl.title = title
+            return tpl
+
+        shell = Template(
+            template='<html><head></head><body></body></html>',
+            title=title,
+            include_uuid=include_uuid,
+        )
+        body = shell.body
+        while body.childs:
+            body.childs.pop()
+        body.content = None
+        body.add_child(element)
+        return shell
+
     def template_to_bytes(
         self,
         template: Union[Template, Element, dict, list, set, str, bytes],

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1/pyweber.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyweber
-Version: 1.6.0.dev0
+Version: 1.6.0.dev1
 Summary: A lightweight Python framework for building and managing web applications.
 Author-email: DevPythonMZ <pypi.dev@gmail.com>
 License-Expression: Apache-2.0

{pyweber-1.6.0.dev0 → pyweber-1.6.0.dev1}/pyweber.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ pyweber/models/__init__.py
 pyweber/models/context.py
 pyweber/models/cookies.py
 pyweber/models/create_app.py
+pyweber/models/dom_merge.py
 pyweber/models/element.py
 pyweber/models/error_pages.py
 pyweber/models/field.py