PyPI - pyweber - Versions diffs - 1.2.0.dev20260423__tar.gz → 1.2.0.dev20260424__tar.gz - Mend

pyweber 1.2.0.dev20260423tar.gz → 1.2.0.dev20260424tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (88) hide show

{pyweber-1.2.0.dev20260423/pyweber.egg-info → pyweber-1.2.0.dev20260424}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyweber
-Version: 1.2.0.dev20260423
+Version: 1.2.0.dev20260424
 Summary: A lightweight Python framework for building and managing web applications.
 Author-email: DevPythonMZ <pypi.dev@gmail.com>
 License-Expression: MIT

{pyweber-1.2.0.dev20260423 → pyweber-1.2.0.dev20260424}/pyproject.toml RENAMED Viewed

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

{pyweber-1.2.0.dev20260423 → pyweber-1.2.0.dev20260424}/pyweber/core/template.py RENAMED Viewed

@@ -1,4 +1,5 @@
 import os
+import re
 from uuid import uuid4
 import lxml.html as HTMLPARSER
 from lxml.etree import Element as LXML_Element
@@ -10,6 +11,7 @@ from pyweber.utils.types import HTTPStatusCode, GetBy
 class Template: # pragma: no cover
     def __init__(self, template: str, status_code: int = 200, title: str = None, include_uuid: bool = True, **kwargs):
+        self.__include_uuid = include_uuid
         self.__template = self.__read_file(file_path=template)
         self.kwargs = kwargs
         self.data = None
@@ -17,39 +19,38 @@ class Template: # pragma: no cover
         self.__icon: str = self.get_icon()
         self.title = title
         self.__root = self.parse_html()
-        self.__include_uuid = include_uuid
     @property
     def template(self):
         return self.__template
     @property
     def root(self):
         return self.__root
     @root.setter
     def root(self, value: Element):
         if value.tag != 'html':
             raise ValueError('This Element is not valid to root. Please add the Html Element')
         self.__root = value
     @property
     def status_code(self):
         return self.__status_code
     @status_code.setter
     def status_code(self, code: int):
         if code not in HTTPStatusCode.code_list():
             raise ValueError(f'The code {code} is not a HttpStatusCode')
         self.__status_code = code
     @property
     def events(self):
         from pyweber.core.events import EventBook
         return EventBook
     @property
     def title(self): return self.__title
@@ -62,10 +63,10 @@ class Template: # pragma: no cover
             if title:
                 title.content = value if value else title.content
     @property
     def head(self): return self.root.querySelector('head')
     @property
     def body(self): return self.root.querySelector('body')
@@ -74,29 +75,29 @@ class Template: # pragma: no cover
     def get_icon(self):
         return str(config['app'].get('icon'))
     def parse_html(self, html: str = None):
         if not html:
             html = self.__template
         return self.__inject_default_elements(root=self.__parse_html(html=html))
     def build_html(self, include_doctype: bool = True):
         html = self.root.to_html(include_uuid=self.__include_uuid)
         if include_doctype:
             html = f'<!DOCTYPE html>\n{html}'
         return html
     def getElement(self, by: GetBy, value: str, element: Element = None):
         if not element: element = self.root
         return element.getElement(by=by, value=value)
     def getElements(self, by: GetBy, value: str, element: Element = None):
         if not element: element = self.root
         return  element.getElements(by=by, value=value)
     def querySelector(self, selector: str, element: Element = None):
         if element is None: element = self.__root
         return element.querySelector(selector=selector)
@@ -104,38 +105,38 @@ class Template: # pragma: no cover
     def querySelectorAll(self, selector: str, element: Element = None) -> list[Element]:
         if element is None: element = self.__root
         return element.querySelectorAll(selector=selector)
     def __parse_html(self, html: str) -> Element:
         if not html.replace('<!DOCTYPE html>', '').strip().startswith('<html'):
             if not html.startswith('<body'):
                 html = f'<body>{html}</body>'
             html = f'<html>{html}</html>'
         root: HTMLPARSER.HtmlElement = HTMLPARSER.fromstring(html=html)
         if root.find(path='head') is None:
             root.insert(0, LXML_Element('head'))
         return self.__create_element(HTMLElement=root)
     def __create_element(self, HTMLElement: HTMLPARSER.HtmlElement, parent: Element = None):
         def gettail(html_element: str | None):
             try:
                 return html_element.strip()
             except:
                 return html_element
         if isinstance(HTMLElement, HTMLPARSER.HtmlComment):
             name = 'comment'
         else:
             name = HTMLElement.tag
-        id = self.__render_dynamic_values(content=HTMLElement.attrib.pop('id', None))
+        id = self.__render_dynamic_values(content=HTMLElement.attrib.pop('id', None), include_uuid=self.__include_uuid)
-        class_str = self.__render_dynamic_values(content=HTMLElement.attrib.pop('class', None))
+        class_str = self.__render_dynamic_values(content=HTMLElement.attrib.pop('class', None), include_uuid=self.__include_uuid)
         classes = class_str.split() if class_str else []
-        style_str: str = self.__render_dynamic_values(content=HTMLElement.attrib.pop('style', None))
+        style_str: str = self.__render_dynamic_values(content=HTMLElement.attrib.pop('style', None), include_uuid=self.__include_uuid)
         style_dict = {}
         if style_str:
@@ -148,11 +149,11 @@ class Template: # pragma: no cover
         parent = parent
         uuid = HTMLElement.attrib.pop('uuid', None)
-        value = self.__render_dynamic_values(content=HTMLElement.attrib.pop('value', None))
-        content: str = self.__render_dynamic_values(content=HTMLElement.text if HTMLElement.text else None)
+        value = self.__render_dynamic_values(content=HTMLElement.attrib.pop('value', None), include_uuid=self.__include_uuid)
+        content: str = self.__render_dynamic_values(content=HTMLElement.text if HTMLElement.text else None, include_uuid=self.__include_uuid)
         events_dict = {key[1:]: HTMLElement.attrib.pop(key) for key in HTMLElement.attrib if key.startswith('_on')}
         childrens: list[HTMLPARSER.HtmlElement] = HTMLElement.getchildren()
         event_obj = TemplateEvents()
         for key, event in events_dict.items():
             if hasattr(event_obj, key):
@@ -180,69 +181,70 @@ class Template: # pragma: no cover
         for child in childrens:
             element.childs.append(self.__create_element(child, element))
         return element
-    def __render_dynamic_values(self, content: str):
+    def __render_dynamic_values(self, content: str, include_uuid: bool = True):
         if content:
-            begin = content.find('{{')
-            if begin != -1:
-                end = content.find('}}')
-                key = content[begin:end+2].removeprefix('{{').removesuffix('}}').strip()
-                new_content = self.kwargs.get(key, None)
-                if new_content:
-                    if isinstance(new_content, Element):
-                        new_content = self.build_html(element=new_content)
-                    content = content.replace(content[begin:end+2], str(new_content))
+            pattern = r'\{\{(.*?)\}\}'
+            result = re.findall(pattern, content)
+            if result:
+                for r in result:
+                    value = self.kwargs.get(r.strip(), None)
+                    if value is not None:
+                        if isinstance(value, Element):
+                            value = self.to_html(element=value, include_uuid=include_uuid)
+                        content = content.replace("{{" + r + "}}", str(value))
         return content
     def __read_file(self, file_path: str) -> str:
         from pyweber.models.error_pages import ErrorPages
         if file_path.endswith('.html'):
             path = os.path.join('templates', file_path) if not os.path.isfile(file_path) else file_path
             try:
                 return LoadStaticFiles(path=path).load
             except FileNotFoundError:
                 return ErrorPages().page_server_error.build_html().replace(
                     "{{error}}",
                     f'{path} not found, please include on templates file'
                 )
         return file_path
     def __create_default_element(self, *args, **kwargs):
         return Element(*args, **kwargs)
     def __inject_default_elements(self, root: Element):
         has_websocket_script, has_icon, has_description, has_css, has_keywords, has_title = False, False, False, False, False, False
         for child in root.childs[0].childs:
             if child.tag == 'script' and child.get_attr('src', '').startswith('/_pyweber/static/') and child.get_attr('src', '').endswith('/.js'):
                 has_websocket_script = True
             elif child.tag == 'link':
                 if 'icon' in list(child.attrs.values()):
                     has_icon = True
                 elif child.get_attr('rel') == 'stylesheet' and child.get_attr('href', '').startswith('/_pyweber/static/') and child.get_attr('href', '').endswith('/.css'):
                     has_css = True
             elif child.tag == 'meta':
                 if 'description' in list(child.attrs.values()):
                     has_description = True
                 elif 'keywords' in list(child.attrs.values()):
                     has_keywords = True
             elif child.tag == 'title':
                 has_title = child
             if has_websocket_script and has_icon and has_css and has_description and has_keywords and has_title:
                 break
         if not has_websocket_script:
             # insert websockets port if exists
             disable_ws = os.environ.get('PYWEBER_DISABLE_WS', False)
@@ -256,7 +258,7 @@ class Template: # pragma: no cover
                         )
                     ]
                 )
         if not has_icon:
             root.childs[0].childs.append(
                 self.__create_default_element(
@@ -264,7 +266,7 @@ class Template: # pragma: no cover
                     attrs={'rel': 'icon', 'href': f'{self.__icon.strip()}'.replace('\\', '/')}
                 )
             )
         if not has_css:
             root.childs[0].childs.insert(
                 1,
@@ -273,7 +275,7 @@ class Template: # pragma: no cover
                     attrs={'rel': 'stylesheet', 'href': f'/_pyweber/static/{str(uuid4())}/.css'}
                 )
             )
         if not has_description:
             root.childs[0].childs.insert(
                 0,
@@ -282,7 +284,7 @@ class Template: # pragma: no cover
                     attrs={'name': 'description', 'content': config['app'].get('description')}
                 )
             )
         if not has_keywords:
             root.childs[0].childs.insert(
                 0,
@@ -291,10 +293,10 @@ class Template: # pragma: no cover
                     attrs={'name': 'keywords', 'content': ', '.join(config['app'].get('keywords', []))}
                 )
             )
         if isinstance(has_title, Element):
             has_title.content = self.title if self.title else has_title.content
         else:
             root.childs[0].childs.append(
                 self.__create_default_element(
@@ -304,7 +306,7 @@ class Template: # pragma: no cover
             )
         return root
     def clone(self):
         tpl = Template(
             template=self.template,
@@ -315,4 +317,4 @@ class Template: # pragma: no cover
         tpl.data = self.data
         tpl.root = self.root.clone
-        return tpl
+        return tpl

{pyweber-1.2.0.dev20260423 → pyweber-1.2.0.dev20260424}/pyweber/models/element.py RENAMED Viewed

@@ -452,6 +452,7 @@ class ElementConstrutor: # pragma: no cover
     def __render_dynamic_values(self, content: str, include_uuid: bool = True):
         if content:
             pattern = r'\{\{(.*?)\}\}'
             result = re.findall(pattern, content)
@@ -459,8 +460,7 @@ class ElementConstrutor: # pragma: no cover
             if result:
                 for r in result:
                     value = self.kwargs.get(r.strip(), None)
-                    if value:
+                    if value is not None:
                         if isinstance(value, ElementConstrutor):
                             value = self.to_html(element=value, include_uuid=include_uuid)

{pyweber-1.2.0.dev20260423 → pyweber-1.2.0.dev20260424/pyweber.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyweber
-Version: 1.2.0.dev20260423
+Version: 1.2.0.dev20260424
 Summary: A lightweight Python framework for building and managing web applications.
 Author-email: DevPythonMZ <pypi.dev@gmail.com>
 License-Expression: MIT