pyweber 1.2.0.dev20260426__tar.gz → 1.2.0.dev20260428__tar.gz

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

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

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

@@ -42,24 +42,24 @@ class Request: # pragma: no cover
             self.__raw_request_asgi = headers
             self.__raw_body = body or b''
             self.__raw_headers: list[tuple[bytes, bytes]] = headers.get('headers', [])
-            
+
         else:
             raise TypeError('Request type does not valid')
-        
+
         self.client_info = client_info
         self.__additions_headers()
-    
+
     @property
     def request_mode(self):
         return self.__request_mode
-    
+
     @request_mode.setter
     def request_mode(self, value):
         if not isinstance(value, RequestMode):
             raise TypeError('Request mode does not valid')
-        
+
         self.__request_mode = value
-    
+
     @property
     def client_info(self): return self.__client_info
 
@@ -67,66 +67,66 @@ class Request: # pragma: no cover
     def client_info(self, value: ClientInfo):
         if value and not isinstance(value, ClientInfo):
             raise TypeError('client_info must be a ClientInfo instances')
-        
+
         self.__client_info = value or ClientInfo(host=None, port=0)
-        
+
     @property
     def raw_headers(self):
         if self.request_mode.value == 'asgi':
             return self.__raw_request_asgi
-        
+
         return self.__raw_request_wsgi
-    
+
     @property
     def raw_body(self):
         return self.__raw_body
-    
+
     @property
     def host(self):
         return self.headers.get('host')
-    
+
     @property
     def port(self):
         try:
             return int(self.headers.get('host', '0').split(':')[-1])
         except:
             return 0
-    
+
     @property
     def content_length(self):
         return int(self.headers.get('content-length'))
-    
+
     @property
     def content_type(self):
         return self.headers.get('content-type', '')
-    
+
     @property
     def user_agent(self):
         return self.headers.get('user-agent')
-    
+
     @property
     def origin(self):
         return self.headers.get('origin')
-    
+
     @property
     def referrer(self):
         return self.headers.get('referrer')
-    
+
     @property
     def accept(self):
         return [val.strip().split(';') for val in self.headers.get('accept', '').split(',') if val]
-    
+
     @property
     def accept_encoding(self):
         return [val.strip().split(';') for val in self.headers.get('accept-encoding', '').split(',') if val]
-    
+
     @property
     def accept_language(self):
         return [val.strip().split(';') for val in self.headers.get('accept-language', '').split(',') if val]
-    
+
     @property
     def cookies(self):
-        return {cookie.split('=')[0]: cookie.split('=')[-1] for cookie in self.headers.get('cookie', '').split(';') if cookie}
+        return {cookie.split('=')[0].strip(): cookie.split('=')[-1].strip() for cookie in self.headers.get('cookie', '').split(';') if cookie}
 
     @property
     def accept_control_request_headers(self):
@@ -136,9 +136,9 @@ class Request: # pragma: no cover
     def headers(self):
         if self.request_mode.value == 'asgi':
             return {header[0].decode(): header[1].decode() for header in self.__raw_headers}
-        
+
         return self.__parse_headers_wsgi()
-    
+
     @property
     def body(self) -> Union[dict[str, Union[list[File], str]]]:
         if self.content_type == ContentTypes.json.value:
@@ -148,15 +148,18 @@ class Request: # pragma: no cover
         elif ContentTypes.form_data.value in self.content_type:
             return self.__parse_form_data()
         return {'body': self.__raw_body}
-    
+
     @property
     def first_line(self):
         if self.request_mode.value == 'wsgi':
             return self.__raw_headers.split(self.__line_splitter, 1)[0].strip()
-        
+
         full_path = f"{self.path}?{'&'.join(['{key}={value}'.format(key=key, value=value) for key, value in self.query_params.items()])}" if self.query_params else self.path
         return f"{self.method} {full_path} {self.scheme}"
 
+    @property
+    def full_path(self): return self.first_line.split(' ', 2)[1].strip()
+
     def __parse_form_data(self):
         fs = FieldStorage(self.content_type, callbacks=self.__raw_body)
         body: dict[str, list[File] | str] = {}
@@ -174,10 +177,10 @@ class Request: # pragma: no cover
 
                     body[field.name].append(field.value)
                 else:
-                    body[field.name] = field.value 
-                
+                    body[field.name] = field.value
+
         return body
-    
+
     def __additions_headers(self):
         if self.request_mode.value == 'asgi':
             self.method: str = self.raw_headers.get('method')
@@ -193,17 +196,17 @@ class Request: # pragma: no cover
             self.query_params = {
                 key: ';'.join(val) for key, val in parse_qs(line_info[1].split('?', 1)[-1]).items() if val
             } if len(line_info) >= 2 else {}
-        
+
     def __parse_headers_wsgi(self) -> dict[str, str]:
         return {header.split(':', 1)[0].strip().lower(): header.split(':', 1)[-1].strip() for header in self.__raw_headers.split(self.__line_splitter)[1::]}
-    
+
     @property
     def __line_splitter(self):
         return '\r\n'
-    
+
     @property
     def request_parts_splitter(self):
         return '\r\n\r\n'
 
     def __repr__(self):
-        return f"Request(method={self.method}, mode={self.request_mode})"
+        return f"Request(method={self.method}, mode={self.request_mode})"

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

@@ -30,7 +30,7 @@ class Response:
             "Server": 'Pyweber/1.0',
             "Date": datetime.now(timezone.utc).strftime("%a, %d %b %Y %H:%M:%S GMT"),
             "Set-Cookie": cookies,
-            "Request-Path": request.path,
+            "Request-Path": request.full_path,
             "Response-Path": route,
             "Access-Control-Allow-Origin": request.origin,
             "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",

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

@@ -544,7 +544,6 @@ 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)
@@ -597,14 +596,25 @@ class RouteManager: # pragma: no cover
     def __resolve_path__(route: str, list_routes: dict[str, Route | RedirectRoute]):
         kwargs: dict[str, str] = {}
 
+        # Separa path dos query params antes de qualquer processamento
+        clean_route, _, query_string = route.partition('?')
+
+        # Parse dos query params
+        query_params: dict[str, str] = {}
+        if query_string:
+            for pair in query_string.split('&'):
+                key, _, val = pair.partition('=')
+                if key:
+                    query_params[key] = val
+
         for path in list_routes:
             l_route = path.strip('/').split('/')
-            r_route = route.strip('/').split('/')
+            r_route = clean_route.strip('/').split('/')  # usa o path limpo
 
             if len(l_route) != len(r_route):
                 continue
 
-            if '{' in path and len(route) == 1:
+            if '{' in path and len(clean_route) == 1:
                 continue
 
             match = True
@@ -619,9 +629,9 @@ class RouteManager: # pragma: no cover
                     break
 
             if match:
-                return path, kwargs
+                return path, {**kwargs, **query_params}  # merge kwargs + query_params
 
-        return route, kwargs
+        return clean_route, query_params
 
     @staticmethod
     def inspect_function(callback: Callable):

{pyweber-1.2.0.dev20260426 → pyweber-1.2.0.dev20260428}/pyweber/models/run.py

@@ -48,7 +48,7 @@ def run(
     @route('/')
     def home():
         return pw.Template(template='Hello, world')
-    
+
     if __name__ == '__main__':
         app.run()
     ```
@@ -94,7 +94,7 @@ def encode_header(headers: dict[str, Any], /,*ignore_headers: str):
 
         if header not in set(map(lambda el: el.strip().lower(), ignore_headers)):
             byte_headers.append((header.encode(), str(value).encode()))
-    
+
     return byte_headers
 
 async def run_as_asgi(scope, receive, send, app: 'Pyweber', target: Callable = None): # pragma: no cover
@@ -108,7 +108,7 @@ async def run_as_asgi(scope, receive, send, app: 'Pyweber', target: Callable = N
             message = await receive()
             body += message.get("body", b"")
             more_body = message.get("more_body", False)
-    
+
     client_info = scope.get('client', (None, 0))
     request = Request(
         headers=scope,
@@ -118,7 +118,7 @@ async def run_as_asgi(scope, receive, send, app: 'Pyweber', target: Callable = N
             port=client_info[-1]
         )
     )
-    
+
     ws_server.protocol = 'uvicorn'
 
     if not WS_RUNNING:
@@ -126,7 +126,7 @@ async def run_as_asgi(scope, receive, send, app: 'Pyweber', target: Callable = N
 
         ws_server.app = app
         app.ws_server = ws_server
-        
+
         if target and callable(target):
             target(app)
 
@@ -143,7 +143,7 @@ async def run_as_asgi(scope, receive, send, app: 'Pyweber', target: Callable = N
         headers = encode_header(response['headers'], 'set-cookie', 'code')
 
         if app.cookies:
-            for cookie in app.cookies:
+            for cookie in app.cookies.values():
                 headers.append((b'set-cookie', cookie.encode()))
 
         await send({
@@ -155,4 +155,4 @@ async def run_as_asgi(scope, receive, send, app: 'Pyweber', target: Callable = N
         await send({
             'type': 'http.response.body',
             'body': response.response_content
-        })
+        })

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

@@ -476,19 +476,20 @@ class Pyweber(
         try:
             template = state_result.template
 
+            kwargs = {**self.request.body, **self.request.query_params, 'request': self.request} if self.request else {}
             while callable(template) or isinstance(template, RedirectRoute):
-                request_params = {**self.request.body, **self.request.query_params, 'request': self.request} if self.request else {}
+                kwargs = {**kwargs, **state_result.kwargs}
 
                 if callable(template):
-                    kwargs = OpenApiProcessor.prepare_callback_kwargs(
-                        callback=state_result.callback,
-                        **{**state_result.kwargs, **request_params}
-                    )
+                    kwargs = {
+                        **kwargs,
+                        **OpenApiProcessor.prepare_callback_kwargs(callback=state_result.callback, **kwargs)
+                    }
 
                     template = await template(**kwargs) if inspect.iscoroutinefunction(template) else template(**kwargs)
 
                 if isinstance(template, RedirectRoute):
-                    kwargs = {**state_result.kwargs, **request_params, **template.kwargs}
+                    kwargs = {**kwargs, **template.kwargs}
                     redirect_path = self.build_route(route=template.route.full_route_with_params, **kwargs)
 
                     self._check_recursion(route=redirect_path)
@@ -570,6 +571,14 @@ class Pyweber(
                     methods=['post'],
                     content_type=ContentTypes.json
                 ),
+                Route(
+                    route='/_pyweber/check-cookies',
+                    template={'message': 'OK'},
+                    methods=['get'],
+                    title='Get Cookies',
+                    process_response=False,
+                    content_type=ContentTypes.json
+                ),
                 Route(
                     route='/docs',
                     template=StaticFilePath.pyweber_docs.value,

{pyweber-1.2.0.dev20260426 → pyweber-1.2.0.dev20260428}/pyweber/static/js.js

@@ -117,6 +117,7 @@ function connectWebSocket() {
         }
 
         if (data.open) {
+            await update_cookies();
             data.open.new_page
                 ? window.open(data.open.path, '_blank')
                 : (window.location.href = data.open.path);
@@ -232,6 +233,13 @@ function connectWebSocket() {
     return socket;
 }
 
+async function update_cookies() {
+    await fetch(`/_pyweber/check-cookies`, {
+        method: 'GET',
+        headers: { 'Content-Type': 'application/json' }
+    });
+}
+
 // ─── Envio de ficheiro via HTTP (mantém binário puro, sem compressão JSON) ────
 async function send_file_chunk(file_id, status, data) {
     await fetch(`/_pyweber/file_chunk?file_id=${file_id}&status=${status}`, {

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

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