pyweber 1.2.0.dev20260425__tar.gz → 1.2.0.dev20260426__tar.gz

{pyweber-1.2.0.dev20260425/pyweber.egg-info → pyweber-1.2.0.dev20260426}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyweber
-Version: 1.2.0.dev20260425
+Version: 1.2.0.dev20260426
 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.dev20260425 → pyweber-1.2.0.dev20260426}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyweber"
-version = "1.2.0.dev20260425"
+version = "1.2.0.dev20260426"
 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.dev20260425 → pyweber-1.2.0.dev20260426}/pyweber/core/element.py

@@ -1,3 +1,4 @@
+import re
 from uuid import uuid4
 import lxml.html as HTMLPARSER
 from lxml.html import fromstring
@@ -10,6 +11,8 @@ from pyweber.models.element import (
     ChildElements
 )
 
+SEARCH_MODE = Literal['exact', 'regex', 'contains', 'startswith', 'endswith']
+
 class Element(ElementConstrutor): # pragma: no cover
     def __init__(
         self,
@@ -143,12 +146,79 @@ class Element(ElementConstrutor): # pragma: no cover
     def set_selection_range(self, start: int, end: str):
         self.__set_element_methods(method='setSelectionRange', start=start, end=end)
 
-    def getElement(self, by: GetBy, value: str, element: 'Element' = None) -> 'Element':
-        results = self.getElements(by=by, value=value, element=element)
+    def getElement(self, by: GetBy, value: str, element: 'Element' = None, search_mode: SEARCH_MODE = 'exact') -> 'Element':
+        results = self.getElements(by=by, value=value, element=element, search_mode=search_mode)
 
         return results[0] if results else None
 
-    def getElements(self, by: GetBy, value: str, element: 'Element' = None) -> list['Element']:
+    def getElements(
+        self,
+        by: GetBy,
+        value: str,
+        element: 'Element' = None,
+        search_mode: SEARCH_MODE = 'exact'
+    ) -> list['Element']:
+
+        def matches(target, val) -> bool:
+            if target is None: return False
+
+            # Lista (classes)
+            if isinstance(target, list):
+                search_classes = val.split()  # classes que o utilizador passou
+                match search_mode:
+                    case 'exact':      return set(search_classes) <= set(target)
+                    case 'regex':      return all(any(re.search(cls, t) for t in target) for cls in search_classes)
+                    case 'contains':   return all(any(cls in t for t in target) for cls in search_classes)
+                    case 'startswith': return all(any(t.startswith(cls) for t in target) for cls in search_classes)
+                    case 'endswith':   return all(any(t.endswith(cls) for t in target) for cls in search_classes)
+
+            # Dict (attrs, style)
+            if isinstance(target, dict):
+                conditions = [pair.strip() for pair in val.split(';') if pair.strip()]
+
+                match search_mode:
+                    case 'exact':
+                        for condition in conditions:
+                            key, _, v = condition.partition(':')
+                            if not v: key, _, v = condition.partition('=')
+                            if not v:
+                                if key.strip() not in target: return False
+                            elif target.get(key.strip()) != v.strip():
+                                return False
+                        return True
+
+                    case 'regex':
+                        return all(
+                            any(re.search(cond, k) or re.search(cond, str(v)) for k, v in target.items())
+                            for cond in conditions
+                        )
+                    case 'contains':
+                        return all(
+                            any(cond in k or cond in str(v) for k, v in target.items())
+                            for cond in conditions
+                        )
+                    case 'startswith':
+                        return all(
+                            any(k.startswith(cond) or str(v).startswith(cond) for k, v in target.items())
+                            for cond in conditions
+                        )
+                    case 'endswith':
+                        return all(
+                            any(k.endswith(cond) or str(v).endswith(cond) for k, v in target.items())
+                            for cond in conditions
+                        )
+
+            # String (id, tag, content, etc)
+            target = str(target)
+            match search_mode:
+                case 'exact':      return target == val
+                case 'regex':      return bool(re.search(val, target))
+                case 'contains':   return val in target
+                case 'startswith': return target.startswith(val)
+                case 'endswith':   return target.endswith(val)
+
+            return False
+
         element = element or self
         results: list['Element'] = []
 
@@ -156,50 +226,34 @@ class Element(ElementConstrutor): # pragma: no cover
             by: str = by.value
 
         if by == 'classes':
-            if set(value.split()) <= set(element.classes):
+            if matches(element.classes, value):
                 results.append(element)
 
         elif by in ['attrs', 'style']:
-            conditions: list[str] = [pair.strip() for pair in value.split(';') if pair.strip()]
-            has = False
-
-            el: dict[str, str] = getattr(element, by, {})
-            for condition in conditions:
-                key, _, val = condition.partition(':')
-
-                if not val: key, _, val = condition.partition('=')
-
-                if not val:
-                    if key.strip() in el:
-                        has = True
-
-                elif key.strip() in el and el.get(key.strip(), None) == val.strip():
-                    has = True
-
-            if has:
+            if matches(getattr(element, by, {}), value):
                 results.append(element)
 
-        elif getattr(element, by, None) == value:
+        elif matches(getattr(element, by, None), value):
             results.append(element)
 
         if element.childs:
             for child in element.childs:
-                results.extend(self.getElements(by=by, value=value, element=child))
+                results.extend(self.getElements(by=by, value=value, element=child, search_mode=search_mode))
 
         return results
 
-    def querySelector(self, selector: str, element: 'Element' = None) -> 'Element':
-        results = self.querySelectorAll(selector=selector, element=element)
+    def querySelector(self, selector: str, element: 'Element' = None, search_mode: SEARCH_MODE = 'exact') -> 'Element':
+        results = self.querySelectorAll(selector=selector, element=element, search_mode=search_mode)
 
         return results[0] if results else None
 
-    def querySelectorAll(self, selector: str, element: 'Element' = None) -> list['Element']:
+    def querySelectorAll(self, selector: str, element: 'Element' = None, search_mode: SEARCH_MODE = 'exact') -> list['Element']:
         element = element or self
         results: list['Element'] = []
 
         if selector.startswith('.'):
             classes = ' '.join(selector.split('.')).strip()
-            return self.getElements(by=GetBy.classes, value=classes)
+            return self.getElements(by=GetBy.classes, value=classes, search_mode=search_mode)
 
         elif selector.startswith('#'):
             if selector[1:].strip() == element.id:
@@ -207,14 +261,14 @@ class Element(ElementConstrutor): # pragma: no cover
 
         elif selector.startswith('['):
             sel = selector.removeprefix('[').removesuffix(']')
-            return self.getElements(by=GetBy.attrs, value=sel)
+            return self.getElements(by=GetBy.attrs, value=sel, search_mode=search_mode)
 
         else:
             if selector.strip() == element.tag:
                 results.append(element)
 
         for child in element.childs:
-            results.extend(self.querySelectorAll(selector=selector, element=child))
+            results.extend(self.querySelectorAll(selector=selector, element=child, search_mode=search_mode))
 
         return results
 
@@ -320,6 +374,11 @@ class Element(ElementConstrutor): # pragma: no cover
         for key, event in events_dict.items():
             if hasattr(event_obj, key): setattr(event_obj, key, event)
 
+        attrs = {
+            cls.render_dynamic_values(c, **kwargs): cls.render_dynamic_values(v, **kwargs)
+            for c, v in attrib.items()
+        }
+
         element = cls(
             tag=name,
             id=id_,
@@ -328,7 +387,7 @@ class Element(ElementConstrutor): # pragma: no cover
             content=content,
             events=event_obj,
             style=style_dict,
-            attrs=dict(attrib),
+            attrs=attrs,
             childs=None,
             sanitize=False,
             files=[],
@@ -353,7 +412,10 @@ class Element(ElementConstrutor): # pragma: no cover
 
             if get_tail:
                 uuid_child = "{{" + child_el.uuid + "}}"
-                element.content = (element.content or '') + f"{uuid_child} {get_tail}"
+                element.content = cls.render_dynamic_values(
+                    content=(element.content or '') + f"{uuid_child} {get_tail}",
+                    **kwargs
+                )
 
         if element.tag == 'select' and element.childs:
             try: element.value = __xyza

{pyweber-1.2.0.dev20260425 → pyweber-1.2.0.dev20260426}/pyweber/core/template.py

@@ -1,6 +1,6 @@
 import os
 from uuid import uuid4
-from pyweber.core.element import Element
+from pyweber.core.element import Element, SEARCH_MODE
 from pyweber.utils.loads import LoadStaticFiles
 from pyweber.config.config import config
 from pyweber.utils.types import HTTPStatusCode, GetBy
@@ -84,21 +84,43 @@ class Template: # pragma: no cover
 
         return html
 
-    def getElement(self, by: GetBy, value: str, element: Element = None):
+    def getElement(
+        self,
+        by: GetBy,
+        value: str,
+        element: Element = None,
+        search_mode: SEARCH_MODE='exact'
+    ):
         if not element: element = self.root
-        return element.getElement(by=by, value=value)
-
-    def getElements(self, by: GetBy, value: str, element: Element = None):
+        return element.getElement(by=by, value=value, search_mode=search_mode)
+
+    def getElements(
+        self,
+        by: GetBy,
+        value: str,
+        element: Element = None,
+        search_mode: SEARCH_MODE='exact'
+    ):
         if not element: element = self.root
-        return  element.getElements(by=by, value=value)
-
-    def querySelector(self, selector: str, element: Element = None):
+        return  element.getElements(by=by, value=value, search_mode=search_mode)
+
+    def querySelector(
+        self,
+        selector: str,
+        element: Element = None,
+        search_mode: SEARCH_MODE='exact'
+    ):
         if element is None: element = self.__root
-        return element.querySelector(selector=selector)
-
-    def querySelectorAll(self, selector: str, element: Element = None) -> list[Element]:
+        return element.querySelector(selector=selector, search_mode=search_mode)
+
+    def querySelectorAll(
+        self,
+        selector: str,
+        element: Element = None,
+        search_mode: SEARCH_MODE='exact'
+    ) -> list[Element]:
         if element is None: element = self.__root
-        return element.querySelectorAll(selector=selector)
+        return element.querySelectorAll(selector=selector, search_mode=search_mode)
 
     def __parse_html(self, html: str) -> Element:
         if not html.replace('<!DOCTYPE html>', '').strip().startswith('<html'):

{pyweber-1.2.0.dev20260425 → pyweber-1.2.0.dev20260426}/pyweber/models/cookies.py

@@ -2,12 +2,12 @@ from datetime import datetime, timezone, timedelta
 
 class CookieManager:
     def __init__(self):
-        self.__cookies: list[str] = []
-    
+        self.__cookies: dict[str, str] = {}
+
     @property
     def cookies(self):
         return self.__cookies
-    
+
     def set_cookie(
         self,
         cookie_name: str,
@@ -25,10 +25,10 @@ class CookieManager:
 
         if httponly:
             cookie += ' HttpOnly;'
-        
+
         if secure:
             cookie += ' Secure;'
-        
+
         if samesite:
             if samesite not in ['Strict', 'Lax']:
                 raise ValueError("SameSite is not valid. Please use one of: ['Strict', 'Lax']")
@@ -54,9 +54,9 @@ class CookieManager:
 
             expires_str = expires.strftime("%a, %d %b %Y %H:%M:%S GMT")
             cookie += f' Expires={expires_str};'
-        
+
         if isinstance(max_age, (int, float)) and max_age > 0:
             cookie += f' Max-Age={max_age};'
-        
+
         if cookie not in self.__cookies:
-            self.__cookies.append(cookie)
+            self.__cookies[cookie_name] = cookie

{pyweber-1.2.0.dev20260425 → pyweber-1.2.0.dev20260426}/pyweber/models/element.py

@@ -307,6 +307,17 @@ class ElementConstrutor: # pragma: no cover
     def content(self):
         return self.__content
 
+    @property
+    def text_content(self):
+        uuids = re.findall(pattern=r'\{\{(.*?)\}\}', string=self.content or '')
+        child_uuids = {child.uuid for child in self.childs if child.uuid in uuids}
+        result = self.content or ''
+
+        for uuid in child_uuids:
+            u_ = "{{" + uuid + "}}"
+            result = result.replace(u_, '')
+        return result.strip()
+
     @content.setter
     def content(self, value: str):
         if value is None:
@@ -471,7 +482,6 @@ class ElementConstrutor: # pragma: no cover
                             value = self.to_html(element=value)
 
                         content = content.replace("{{" + r + "}}", str(value))
-
         return content
 
     def create_event_id(self, event: Union[Callable, str], type: str, element_id: str = None):

{pyweber-1.2.0.dev20260425 → pyweber-1.2.0.dev20260426}/pyweber/models/response.py

@@ -10,7 +10,7 @@ class Response:
         request: Request,
         response_content: bytes,
         code: int,
-        cookies: list[str],
+        cookies: dict[str, str],
         response_type: ContentTypes,
         route: str
     ):
@@ -153,7 +153,7 @@ class Response:
         for key, value in self.headers.items():
             if key == 'Set-Cookie':
                 for cookie in value:
-                    response += f'{key}: {cookie}\r\n'
+                    response += f'{key}: {value[cookie]}\r\n'
 
             elif key == 'Response':
                 pass

{pyweber-1.2.0.dev20260425 → pyweber-1.2.0.dev20260426}/pyweber/models/routes.py

@@ -109,7 +109,12 @@ class Route: # pragma: no cover
         self.__callback = callback or self.template if callable(self.template) else lambda **kwargs: self.template
 
     @property
-    def full_route(self): return f"/{self.group.removeprefix('__')}{self.route}" if self.group != self.default_group() else self.route
+    def full_route(self):
+        return f"/{self.group.removeprefix('__')}{self.route}" if self.group != self.default_group() else self.route
+
+    @property
+    def full_route_with_params(self):
+        return f"{self.full_route}{('?' + self.route_with_params.split('?',1)[-1] if self.query_params else '')}"
 
     @property
     def middlewares(self): return self.__middlewares
@@ -330,6 +335,7 @@ class Route: # pragma: no cover
             f'group={self.group}, '
             f'route={self.route}, '
             f'full_route={self.full_route}, '
+            f'route_with_params={self.route_with_params}, '
             f'name={self.name}, '
             f'methods={self.methods}, '
             f'status_code={self.status_code})'
@@ -538,10 +544,12 @@ class RouteManager: # pragma: no cover
 
     def get_route_by_path(self, route: str, follow_redirect: bool = True):
         path, _ = self.resolve_path(route=route)
+        path = path.split('?', 1)[0]
 
         if follow_redirect in [True, 1] and self.is_redirected(route=path):
             redirect_route = self.get_redirected_route(route=path)
             return redirect_route.route
+
         return self.__routes.get(path)
 
     def get_route_by_name(self, name: str):

{pyweber-1.2.0.dev20260425 → pyweber-1.2.0.dev20260426}/pyweber/pyweber/pyweber.py

@@ -477,8 +477,9 @@ class Pyweber(
             template = state_result.template
 
             while callable(template) or isinstance(template, RedirectRoute):
+                request_params = {**self.request.body, **self.request.query_params, 'request': self.request} if self.request else {}
+
                 if callable(template):
-                    request_params = {**self.request.body, **self.request.query_params, 'request': self.request} if self.request else {}
                     kwargs = OpenApiProcessor.prepare_callback_kwargs(
                         callback=state_result.callback,
                         **{**state_result.kwargs, **request_params}
@@ -487,14 +488,15 @@ class Pyweber(
                     template = await template(**kwargs) if inspect.iscoroutinefunction(template) else template(**kwargs)
 
                 if isinstance(template, RedirectRoute):
-                    redirect_path = self.build_route(route=template.route.full_route, **{**state_result.kwargs, **template.kwargs})
+                    kwargs = {**state_result.kwargs, **request_params, **template.kwargs}
+                    redirect_path = self.build_route(route=template.route.full_route_with_params, **kwargs)
 
                     self._check_recursion(route=redirect_path)
                     state_result = await self._process_redirect_route(
                         state=state_result,
                         redirect_route=template,
                         redirect_path=redirect_path,
-                        **state_result.kwargs
+                        **kwargs
                     )
 
                     template = state_result.template

{pyweber-1.2.0.dev20260425 → pyweber-1.2.0.dev20260426/pyweber.egg-info}/PKG-INFO

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