flet-easy 0.3.0.dev8__tar.gz → 0.3.0.dev10__tar.gz

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-easy
-Version: 0.3.0.dev8
+Version: 0.3.0.dev10
 Summary: ⚡Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware and more.
 Project-URL: Homepage, https://github.com/Daxexs
 Project-URL: Repository, https://github.com/Daxexs/flet-easy

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/mkdocs.yml

@@ -2,7 +2,7 @@ site_name: Flet-Easy
 site_url: https://daxexs.github.io/flet-easy/
 site_author: Daxexs
 site_description: >-
-  Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware, and more.
+  Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware and more.
 edit_uri: edit/main/docs/
 copyright: Copyright &copy; <span id="dynamic-year"></span> Daxexs
 repo_name: Daxexs/flet-easy
@@ -107,26 +107,6 @@ extra:
         content: "Flet-Easy is a user-friendly add-on package for Flet with customizable features like JWT, routers, and more."
       - name: keywords
         content: "Flet, flet-easy, flet easy, decorators, CLI, middleware, routing, responsive design, jwt"
-      - name: author
-        content: "Daxexs"
-      - property: og:title
-        content: "Flet-Easy - User-friendly add-on package for Flet"
-      - property: og:description
-        content: "Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware, and more."
-      - property: og:type
-        content: "website"
-      - property: og:url
-        content: "https://daxexs.github.io/flet-easy/"
-      - property: og:image
-        content: "https://daxexs.github.io/flet-easy/assets/images/logo.png"
-      - name: twitter:card
-        content: "summary_large_image"
-      - name: twitter:title
-        content: "Flet-Easy - User-friendly add-on package for Flet"
-      - name: twitter:description
-        content: "Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware, and more."
-      - name: twitter:image
-        content: "https://daxexs.github.io/flet-easy/assets/images/logo.png"
 
 markdown_extensions:
   - admonition

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/pyproject.toml

@@ -1,74 +1,74 @@
-[project]
-name = "flet-easy"
-version = "0.3.0.dev8"
-description = "⚡Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware and more."
-authors = [{ name = "Daxexs", email = "Daxexsdev@gmail.com" }]
-
-dependencies = []
-requires-python = ">=3.8"
-readme = "README.md"
-license = { text = "apache-2.0" }
-keywords = [
-    "flet easy",
-    "flet",
-    "python",
-    "flet route",
-    "flet easy route",
-    "python web template",
-    "app python",
-    "flet mvc",
-    "flet easy mvc",
-    "flet easy fastapi",
-    "flutter python",
-    "web application",
-    "flet middleware",
-    "flet jwt",
-    "fast flet",
-]
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-]
-
-[project.optional-dependencies]
-all = [
-    "pyJWT>=2.0.0",
-    "rsa>=4.9",
-    "cookiecutter>=2.6.0",
-    "rich-argparse>=1.4.0",
-    "flet[all]>=0.25.1",
-]
-JWT = ["pyJWT>=2.0.0", "rsa>=4.9"]
-cli = ["cookiecutter>=2.6.0", "rich-argparse>=1.4.0", "flet[all]>=0.25.1"]
-
-[project.urls]
-Homepage = "https://github.com/Daxexs"
-Repository = "https://github.com/Daxexs/flet-easy"
-Documentation = "https://daxexs.github.io/flet-easy"
-Changelog = "https://github.com/Daxexs/flet-easy/blob/main/CHANGELOG.md"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-
-[project.scripts]
-fs = "flet_easy.cli.main:run"
-
-[dependency-groups]
-test = [
-    "ruff>=0.3.4",
-    "flet[all]>=0.25.1",
-    "tortoise-orm>=0.22.2",
-    "pytest>=8.3.4",
-    "pyjwt>=2.0.0",
-    "rsa>=4.9",
-    "sqlmodel>=0.0.24",
-    "pyinstrument>=5.0.1",
-]
-docs = ["mkdocs-material>=9.5.17", "mike>=2.0.0"]
+[project]
+name = "flet-easy"
+version = "0.3.0.dev10"
+description = "⚡Flet-Easy is a user-friendly add-on package for Flet, offering a cleaner code structure with numerous customizable features like JWT, routers, decorators, middleware and more."
+authors = [{ name = "Daxexs", email = "Daxexsdev@gmail.com" }]
+
+dependencies = []
+requires-python = ">=3.8"
+readme = "README.md"
+license = { text = "apache-2.0" }
+keywords = [
+    "flet easy",
+    "flet",
+    "python",
+    "flet route",
+    "flet easy route",
+    "python web template",
+    "app python",
+    "flet mvc",
+    "flet easy mvc",
+    "flet easy fastapi",
+    "flutter python",
+    "web application",
+    "flet middleware",
+    "flet jwt",
+    "fast flet",
+]
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+
+[project.optional-dependencies]
+all = [
+    "pyJWT>=2.0.0",
+    "rsa>=4.9",
+    "cookiecutter>=2.6.0",
+    "rich-argparse>=1.4.0",
+    "flet[all]>=0.25.1",
+]
+JWT = ["pyJWT>=2.0.0", "rsa>=4.9"]
+cli = ["cookiecutter>=2.6.0", "rich-argparse>=1.4.0", "flet[all]>=0.25.1"]
+
+[project.urls]
+Homepage = "https://github.com/Daxexs"
+Repository = "https://github.com/Daxexs/flet-easy"
+Documentation = "https://daxexs.github.io/flet-easy"
+Changelog = "https://github.com/Daxexs/flet-easy/blob/main/CHANGELOG.md"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+
+[project.scripts]
+fs = "flet_easy.cli.main:run"
+
+[dependency-groups]
+test = [
+    "ruff>=0.3.4",
+    "flet[all]>=0.25.1",
+    "tortoise-orm>=0.22.2",
+    "pytest>=8.3.4",
+    "pyjwt>=2.0.0",
+    "rsa>=4.9",
+    "sqlmodel>=0.0.24",
+    "pyinstrument>=5.0.1",
+]
+docs = ["mkdocs-material>=9.5.17", "mike>=2.0.0"]

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/__init__.py

@@ -1,7 +1,7 @@
 from flet_easy.datasy import Datasy
 from flet_easy.extra import Redirect
 from flet_easy.extrasJwt import Algorithm, PemKey, SecretKey, encode_HS256, encode_RS256
-from flet_easy.fletEasy import FletEasy, page
+from flet_easy.fletEasy import FletEasy
 from flet_easy.inheritance import (
     Keyboardsy,
     Ref,
@@ -11,3 +11,5 @@ from flet_easy.inheritance import (
 )
 from flet_easy.jwt import EasyKey, decode, decode_async
 from flet_easy.pagesy import AddPagesy, Pagesy, MiddlewareRequest
+
+page = FletEasy.page

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/auto_route.py

@@ -4,6 +4,7 @@ from os import listdir, path
 from sys import modules
 from typing import List, Optional
 
+from flet_easy.logger import get_logger
 from flet_easy.pagesy import AddPagesy
 
 
@@ -22,6 +23,7 @@ def automatic_routing(dir: str) -> Optional[List[AddPagesy]]:
         return None
 
     pages = []
+    logger = get_logger("Automatic routing")
 
     python_files = [
         file
@@ -50,8 +52,9 @@ def automatic_routing(dir: str) -> Optional[List[AddPagesy]]:
                 for _, obj in getmembers(module):
                     if isinstance(obj, AddPagesy):
                         pages.append(obj)
+                        logger.debug(f"Adding AddPagesy automatic routing: {obj}")
         except Exception as e:
-            print(f"Error processing file {file}: {e}")
+            logger.error(f"Error processing file {file}: {e}")
             continue
 
     if not pages:
@@ -59,4 +62,5 @@ def automatic_routing(dir: str) -> Optional[List[AddPagesy]]:
             "No instances of AddPagesy found. Check the assigned path of the 'path_views' parameter of the class (FletEasy)."
         )
 
+    logger.info(f"Automatic routing completed successfully: {len(pages)} Pagesy objects")
     return pages

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/datasy.py

@@ -1,6 +1,6 @@
 from collections import deque
 from datetime import datetime, timedelta, timezone
-from typing import Any, Callable, Dict, Tuple
+from typing import Any, Callable, Dict, List, Tuple, Union
 
 from flet import Control, ControlEvent, Page
 
@@ -70,7 +70,7 @@ class Datasy:
         self.__route: str = None
         self.__go = go
         self.__history_routes: deque[Tuple[str, int]] = deque()
-        self._dynamic_control: Dict[str, Tuple[Control, Callable[[Control], None]]] = {}
+        self._dynamic_control: Dict[str, List[Tuple[Control, Callable[[Control]], None]]] = {}
 
         self.__secret_key: SecretKey = secret_key
         self.__auto_logout: bool = auto_logout
@@ -273,11 +273,11 @@ class Datasy:
     def __login(
         self,
         key: str,
-        value: Dict[str, Any] | Any,
+        value: Union[Dict[str, Any], Any],
         next_route: str,
         time_expiry: timedelta = None,
         sleep: int = 1,
-    ) -> str | None:
+    ) -> Union[str, None]:
         if time_expiry:
             assert isinstance(value, Dict), (
                 "Use a dict in login method values or don't use time_expiry."
@@ -307,7 +307,7 @@ class Datasy:
     def login(
         self,
         key: str,
-        value: Dict[str, Any] | Any,
+        value: Union[Dict[str, Any], Any],
         next_route: str,
         time_expiry: timedelta = None,
         sleep: int = 1,
@@ -336,7 +336,7 @@ class Datasy:
     async def login_async(
         self,
         key: str,
-        value: Dict[str, Any] | Any,
+        value: Union[Dict[str, Any], Any],
         next_route: str,
         time_expiry: timedelta = None,
         sleep: int = 1,
@@ -389,8 +389,11 @@ class Datasy:
         return lambda _=None: go_back_func()
 
     def dynamic_control(self, control: Control, func_update: Callable[[Control], None]) -> None:
-        """Adds dynamic control to the page."""
-        self._dynamic_control[self.page.route] = (control, func_update)
+        """Adds dynamic control to the page, allowing real-time updates when caching is enabled on the page."""
+        if self.page.route not in self._dynamic_control:
+            self._dynamic_control[self.page.route] = [(control, func_update)]
+        else:
+            self._dynamic_control[self.page.route].append((control, func_update))
 
 
 def evaluate_secret_key(data: Datasy):

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/extra.py

@@ -1,13 +1,13 @@
 from dataclasses import dataclass
 from re import Pattern, compile
-from typing import Callable, Dict, Optional, Tuple
+from typing import Callable, Dict, Optional, Tuple, Union
 
 
 @dataclass
 class Msg:
     method: str
     key: str = None
-    value: str | dict = None
+    value: Union[str, Dict] = None
 
 
 @dataclass

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/extrasJwt.py

@@ -1,7 +1,7 @@
 import contextlib
 from dataclasses import dataclass
 from datetime import datetime, timezone
-from typing import Any, Dict
+from typing import Any, Dict, Union
 
 from flet_easy.exceptions import AlgorithmJwtError
 
@@ -55,7 +55,7 @@ def encode_HS256(payload: Dict[str, Any], secret_key: str, time_expiry: timezone
     )
 
 
-def encode_verified(secret_key: SecretKey, value: str, time_expiration) -> str | None:
+def encode_verified(secret_key: SecretKey, value: str, time_expiration) -> Union[str, None]:
     """Verify the possible encryption of the value sent."""
     assert secret_key.algorithm is not None, (
         "The secret_key algorithm is not supported, only (RS256, HS256) is accepted."

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/fletEasy.py

@@ -1,3 +1,6 @@
+import logging
+from typing import Union
+
 from flet_easy.exceptions import AddPagesError, FletEasyError, MidlewareError
 
 try:
@@ -16,28 +19,12 @@ from flet_easy.auto_route import automatic_routing
 from flet_easy.datasy import Datasy
 from flet_easy.extrasJwt import SecretKey
 from flet_easy.inheritance import Viewsy
+from flet_easy.logger import LoggingFletEasy, get_logger
 from flet_easy.middleware import MiddlewareHandler, MiddlewareRequest
 from flet_easy.pagesy import AddPagesy, Pagesy
 from flet_easy.route import FletEasyX
 
 
-def page(
-    route: str,
-    title: str = None,
-    page_clear: bool = False,
-    share_data: bool = False,
-    protected_route: bool = False,
-    custom_params: Dict[str, Any] = None,
-    middleware: Optional[
-        List[MiddlewareHandler | MiddlewareRequest] | MiddlewareHandler | MiddlewareRequest
-    ] = None,
-    cache: bool = False,
-):
-    return FletEasy.page(
-        route, title, page_clear, share_data, protected_route, custom_params, middleware, cache
-    )
-
-
 class FletEasy(FletEasyX):
     """
     we create the app object, in it you can configure:
@@ -50,6 +37,7 @@ class FletEasy(FletEasyX):
     * `secret_key` : Used with `SecretKey` class of Flet easy, to configure JWT or client storage.
     * `auto_logout` : If you use JWT, you can configure it.
     * `path_views` : Configuration of the folder where are the .py files of the pages, you use the `Path` class to configure it.
+    * `logger` : Activates the logger, by default it is disabled (False).
 
     Example:
     ```python
@@ -126,20 +114,6 @@ class FletEasy(FletEasyX):
     """
 
     __self = None
-    __slots__ = (
-        "__route_prefix",
-        "__path_views",
-        "__pagesys",
-        "_data",
-        "_pages",
-        "_page_404",
-        "_view_data",
-        "_view_config",
-        "_config_login",
-        "_config_event",
-        "_middlewares",
-        "_middlewares_after",
-    )
 
     def __init__(
         self,
@@ -151,7 +125,12 @@ class FletEasy(FletEasyX):
         secret_key: SecretKey = None,
         auto_logout: bool = False,
         path_views: Path = None,
+        logger: bool = False,
     ):
+        if logger:
+            LoggingFletEasy.enable(logging.DEBUG)
+        self.logger = get_logger("FletEasy")
+
         self.__route_prefix = route_prefix
         self.__path_views = path_views
         FletEasy.__self = self
@@ -183,6 +162,7 @@ class FletEasy(FletEasyX):
 
     def start(self, page: Page):
         """Start the app in the main function"""
+        self.logger.debug("enabling connection with flet app")
         self.__pre_config(page)
 
     def get_app(self):
@@ -191,6 +171,7 @@ class FletEasy(FletEasyX):
         def main(page: Page):
             self.__pre_config(page)
 
+        self.logger.debug("getting app from fletEasy to export")
         return main
 
     def run(
@@ -220,6 +201,7 @@ class FletEasy(FletEasyX):
             )
             return main
         try:
+            self.logger.debug("running app from fletEasy with flet")
             return app(
                 target=main,
                 name=name,
@@ -256,6 +238,8 @@ class FletEasy(FletEasyX):
 
             if value == "page_404":
                 self._page_404 = Pagesy(route, func, data.get("title"), data.get("page_clear"))
+                self.logger.debug(f"Adding page 404: {self._page_404}")
+
             elif value == "page":
                 self._pages.append(
                     Pagesy(
@@ -271,6 +255,8 @@ class FletEasy(FletEasyX):
                         cache=data.get("cache"),
                     )
                 )
+                self.logger.debug(f"Adding page: {self._pages[-1]}")
+
             return wrapper
 
         return decorator
@@ -290,6 +276,8 @@ class FletEasy(FletEasyX):
                     self._pages.extend(page._add_pages(self.__route_prefix))
                 else:
                     self._pages.extend(page._add_pages())
+
+                self.logger.debug(f"Adding group of pages: {len(group_pages)}: {page}\n")
         except Exception as e:
             raise AddPagesError("Add pages error in route: ", e)
 
@@ -304,7 +292,7 @@ class FletEasy(FletEasyX):
         protected_route: bool = False,
         custom_params: Dict[str, Any] = None,
         middleware: Optional[
-            List[MiddlewareHandler | MiddlewareRequest] | MiddlewareHandler | MiddlewareRequest
+            Union[List[Union[MiddlewareHandler, MiddlewareRequest]], MiddlewareHandler, MiddlewareRequest]
         ] = None,
         cache: bool = False,
     ) -> Callable:
@@ -457,6 +445,7 @@ class FletEasy(FletEasyX):
         ```
         """
         self._view_data = func
+        self.logger.debug(f"Adding view: {self._view_data}")
 
     def config(self, func: Callable[[Datasy], None]):
         """Decorator to add a custom configuration to the app:
@@ -484,6 +473,7 @@ class FletEasy(FletEasyX):
         ```
         """
         self._view_config = func
+        self.logger.debug(f"Adding config: {self._view_config}")
 
     def login(self, func: Callable[[Datasy], bool]):
         """Decorator to add a login configuration to the app (protected_route):
@@ -508,6 +498,7 @@ class FletEasy(FletEasyX):
         ```
         """
         self._config_login = func
+        self.logger.debug(f"Adding login: {self._config_login}")
 
     def config_event_handler(self, func: Callable[[Datasy], None]):
         """Decorator to add charter event settings -> https://flet.dev/docs/controls/page#events
@@ -524,6 +515,7 @@ class FletEasy(FletEasyX):
         """
 
         self._config_event = func
+        self.logger.debug(f"Adding config event: {self._config_event}")
 
     def add_routes(self, add_views: List[Pagesy]):
         """-> Add routes without the use of decorators.
@@ -550,11 +542,12 @@ class FletEasy(FletEasyX):
                 page.route = self.__route_prefix + page.route
 
             self._pages.append(page)
+            self.logger.debug(f"Add routes: {page}")
 
     def add_middleware(
         self,
         *middleware: Optional[
-            Tuple[MiddlewareHandler | MiddlewareRequest] | MiddlewareHandler | MiddlewareRequest
+            Union[Tuple[Union[MiddlewareHandler, MiddlewareRequest]], MiddlewareHandler, MiddlewareRequest]
         ],
     ):
         """
@@ -579,6 +572,8 @@ class FletEasy(FletEasyX):
                         )
                 else:
                     self._middlewares.append(m)
+
+            self.logger.debug(f"Add middlewares in method 'add_middleware': {middleware}")
         except Exception as e:
             raise MidlewareError(
                 "You are not adding any midleware but you are using the 'add_middleware' method:",

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/inheritance.py

@@ -1,5 +1,5 @@
 from inspect import iscoroutinefunction
-from typing import Any, Callable, Dict, List, TypeVar
+from typing import Any, Callable, Dict, List, TypeVar, Union
 
 from flet import (
     ControlEvent,
@@ -115,8 +115,8 @@ class Resizesy:
         self.__page = page
         self.__height: float = page.height
         self.__width: float = page.width
-        self.__margin_y: float | int = 0
-        self.__margin_x: float | int = 0
+        self.__margin_y: Union[float, int] = 0
+        self.__margin_x: Union[float, int] = 0
         self.__e: ControlEvent = None
 
     @property

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/jwt.py

@@ -94,7 +94,7 @@ def _handle_decode_errors(jwt: str, data: Datasy, key_login: str) -> Union[Dict[
         raise LogoutError("Login error:", e)
 
 
-def decode(key_login: str, data: Datasy) -> Dict[str, Any] | bool:
+def decode(key_login: str, data: Datasy) -> Union[Dict[str, Any], bool]:
     """decodes the jwt and updates the browser sessions.
 
     ### Parameters to use:
@@ -110,7 +110,7 @@ def decode(key_login: str, data: Datasy) -> Dict[str, Any] | bool:
         raise LoginError("Use the 'decode_async' method instead of 'decode'. | More details:", e)
 
 
-async def decode_async(key_login: str, data: Datasy) -> Dict[str, Any] | bool:
+async def decode_async(key_login: str, data: Datasy) -> Union[Dict[str, Any], bool]:
     """decodes the jwt and updates the browser sessions.
 
     ### Parameters to use:

flet_easy-0.3.0.dev10/src/flet_easy/logger.py

@@ -0,0 +1,74 @@
+import logging
+
+try:
+    from rich.logging import RichHandler
+
+    _RICH_AVAILABLE = True
+except ImportError:
+    _RICH_AVAILABLE = False
+
+
+class ColorFormatter(logging.Formatter):
+    def format(self, record):
+        record.name = f"[bold]{record.name}[/]:"
+        return super().format(record)
+
+
+class OnlyMyLogsFilter(logging.Filter):
+    def filter(self, record):
+        return record.name.startswith("flet_easy")
+
+
+class LoggingFletEasy:
+    """Logger for Flet Easy"""
+
+    _logger_activado = False
+
+    @classmethod
+    def enable(cls, level: int = logging.INFO) -> None:
+        """
+        Enables the logging system only ONCE.
+        - With rich: uses its own format.
+        - Without rich: forces the exact format of the image.
+        """
+        if cls._logger_activado:
+            return
+
+        root = logging.getLogger()
+        root.setLevel(level)
+
+        if _RICH_AVAILABLE:
+            fmt = ColorFormatter(fmt="%(name)s %(message)s")
+            console = RichHandler(
+                level=level,
+                show_level=True,
+                rich_tracebacks=True,
+                show_time=True,
+                omit_repeated_times=False,
+                show_path=True,
+                markup=True,
+                log_time_format="%Y-%m-%d %H:%M:%S",
+            )
+            console.setFormatter(fmt)
+
+        else:
+            fmt = logging.Formatter(
+                "[%(asctime)s] [%(levelname)s] [%(name)s] %(message)s | %(pathname)s : %(lineno)d",
+                datefmt="%Y-%m-%d %H:%M:%S",
+            )
+            console = logging.StreamHandler()
+
+            console.setFormatter(fmt)
+
+        console.addFilter(OnlyMyLogsFilter())
+        root.addHandler(console)
+        cls._logger_activado = True
+
+
+def get_logger(name: str) -> logging.Logger:
+    """
+    Returns a logger with the given name.
+    Example: logger = get_logger("Init")
+    """
+    full_name = name if name.startswith("flet_easy") else f"flet_easy.{name}"
+    return logging.getLogger(full_name)

{flet_easy-0.3.0.dev8 → flet_easy-0.3.0.dev10}/src/flet_easy/middleware.py

@@ -1,4 +1,4 @@
-from typing import Callable, List, Optional
+from typing import Callable, List, Optional, Union
 
 from flet import View
 
@@ -21,6 +21,6 @@ class MiddlewareRequest:
 
 MiddlewareHandler = Callable[[Datasy], Optional[Redirect]]
 Middleware = Optional[
-    List[MiddlewareHandler | MiddlewareRequest] | MiddlewareHandler | MiddlewareRequest
+    Union[List[Union[MiddlewareHandler, MiddlewareRequest]], MiddlewareHandler, MiddlewareRequest]
 ]
 ViewHandler = Callable[[Datasy], View]