flet-easy 0.3.0.dev2__tar.gz → 0.3.0.dev4__tar.gz

{flet_easy-0.3.0.dev2 → flet_easy-0.3.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-easy
-Version: 0.3.0.dev2
+Version: 0.3.0.dev4
 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.dev2 → flet_easy-0.3.0.dev4}/pyproject.toml

@@ -1,72 +1,74 @@
-[project]
-name = "flet-easy"
-version = "0.3.0.dev2"
-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",
-]
-docs = ["mkdocs-material>=9.5.17", "mike>=2.0.0"]
+[project]
+name = "flet-easy"
+version = "0.3.0.dev4"
+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.dev2 → flet_easy-0.3.0.dev4}/src/flet_easy/__init__.py

@@ -11,4 +11,3 @@ from flet_easy.inheritance import (
 )
 from flet_easy.jwt import EasyKey, decode, decode_async
 from flet_easy.pagesy import AddPagesy, Pagesy, MiddlewareRequest
-from flet_easy.extra import cache_control

flet_easy-0.3.0.dev4/src/flet_easy/auto_route.py

@@ -0,0 +1,62 @@
+from importlib.util import module_from_spec, spec_from_file_location
+from inspect import getmembers
+from os import listdir, path
+from sys import modules
+from typing import List, Optional
+
+from flet_easy.pagesy import AddPagesy
+
+
+def automatic_routing(dir: str) -> Optional[List[AddPagesy]]:
+    """
+    A function that automatically routes through a directory to find Python files,
+    extract AddPagesy objects, and return a list of them.
+
+    Parameters:
+    - dir (str): The directory path to search for Python files.
+
+    Returns:
+    - List[AddPagesy]: A list of AddPagesy objects found in the specified directory.
+    """
+    if not dir:
+        return None
+
+    pages = []
+
+    python_files = [
+        file
+        for file in listdir(dir)
+        if (file.endswith(".py") or file.endswith(".pyc")) and file != "__init__.py"
+    ]
+
+    for file in python_files:
+        file_path = path.join(dir, file)
+        module_name = path.splitext(file)[0]
+
+        try:
+            if not isinstance(file_path, str):
+                file_path = str(file_path)
+
+            spec = spec_from_file_location(module_name, file_path)
+            if spec is None or spec.loader is None:
+                continue
+
+            module = module_from_spec(spec)
+
+            if hasattr(module, "__dict__"):
+                modules[module_name] = module
+                spec.loader.exec_module(module)
+
+                for _, obj in getmembers(module):
+                    if isinstance(obj, AddPagesy):
+                        pages.append(obj)
+        except Exception as e:
+            print(f"Error processing file {file}: {e}")
+            continue
+
+    if not pages:
+        raise ValueError(
+            "No instances of AddPagesy found. Check the assigned path of the 'path_views' parameter of the class (FletEasy)."
+        )
+
+    return pages

{flet_easy-0.3.0.dev2 → flet_easy-0.3.0.dev4}/src/flet_easy/datasy.py

@@ -1,8 +1,8 @@
 from collections import deque
 from datetime import datetime, timedelta, timezone
-from typing import Any, Callable, Dict
+from typing import Any, Callable, Dict, Tuple
 
-from flet import Page
+from flet import Control, ControlEvent, Page
 
 from flet_easy.exceptions import LoginError
 from flet_easy.extra import Msg, Redirect
@@ -42,6 +42,7 @@ class Datasy:
     * `login` : method to create sessions of all sections in the browser (client storage), requires as parameters the key and the value, the same used in the `page.client_storage.set` method.
     * `go` : `go`: Method to change the application path, supports url redirections.
     * `go_back` : Method to go back to the previous route.
+    * `go_navigation_bar` : Handles navigation bar changes. Use this method in the on_change event of 'ft.NavigationBar' or 'ft.CupertinoNavigationBar' controls.
     * `history_routes` : Get the history of the routes.
     * `route` : route provided by the route event, it is useful when using middlewares to check if the route is assecible.
     * `redirect` : To redirect to a path before the page loads, it is used in middleware.
@@ -55,7 +56,7 @@ class Datasy:
         secret_key: str,
         auto_logout: bool,
         page_on_keyboard: Keyboardsy,
-        go: Callable[[str], None] = None,
+        go: Callable[[str, int], None] = None,
     ) -> None:
         self.__page: Page = None
         self.__url_params: Dict[str, Any] = None
@@ -68,7 +69,8 @@ class Datasy:
         self.__on_resize: Resizesy = None
         self.__route: str = None
         self.__go = go
-        self.__history_routes: deque[str] = deque()
+        self.__history_routes: deque[Tuple[str, int]] = deque()
+        self._dynamic_control: Dict[str, Tuple[Control, Callable[[Control], None]]] = {}
 
         self.__secret_key: SecretKey = secret_key
         self.__auto_logout: bool = auto_logout
@@ -89,10 +91,6 @@ class Datasy:
     def history_routes(self):
         return self.__history_routes
 
-    @history_routes.setter
-    def history_routes(self, history_routes: deque[str]):
-        self.__history_routes = history_routes
-
     @property
     def url_params(self):
         return self.__url_params
@@ -365,17 +363,37 @@ class Datasy:
         """To change the application path, it is important for better validation to avoid using `page.go()`."""
         return lambda _=None: self.__go(route)
 
+    def go_navigation_bar(self, e: ControlEvent) -> None:
+        """Handles navigation bar changes. Use this method in the on_change event of
+        'ft.NavigationBar' or 'ft.CupertinoNavigationBar' controls."""
+        self.__go(e.control.selected_index)
+
     def redirect(self, route: str):
         """Useful if you do not want to access a route that has already been sent."""
         return Redirect(route)
 
-    def go_back(self):
+    def go_back(self) -> Callable[[ControlEvent], None]:
         """Go back to the previous route."""
-        return lambda _=None: (
-            (self.history_routes.pop(), self.__go(self.history_routes.pop()))
-            if len(self.history_routes) > 1
-            else (print("-> I can't go back! There is no route history."), None)
-        )
+
+        def go_back_func():
+            if len(self.history_routes) > 1:
+                self.history_routes.pop()
+                route, index = self.history_routes.pop()
+                if index is not None:
+                    self.view.navigation_bar.selected_index = index
+
+                if len(self.history_routes) == 0:
+                    self.page.views.clear()
+
+                self.__go(route)
+            else:
+                print("-> I can't go back! there is no history. ")
+
+        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)
 
 
 def evaluate_secret_key(data: Datasy):

flet_easy-0.3.0.dev4/src/flet_easy/extra.py

@@ -0,0 +1,23 @@
+from dataclasses import dataclass
+from re import Pattern, compile
+from typing import Callable, Dict, Optional, Tuple
+
+
+@dataclass
+class Msg:
+    method: str
+    key: str = None
+    value: str | dict = None
+
+
+@dataclass
+class Redirect:
+    route: str = None
+
+
+TYPE_PATTERNS: Dict[str, Tuple[Pattern[str], Callable[[str], Optional[bool]]]] = {
+    "int": (compile(r"-?\d+"), int),
+    "float": (compile(r"-?\d+\.\d+"), float),
+    "str": (compile(r"[^/]+"), str),
+    "bool": (compile(r"(true|True|false|False)"), lambda x: x in ["true", "True"]),
+}

{flet_easy-0.3.0.dev2 → flet_easy-0.3.0.dev4}/src/flet_easy/fletEasy.py

@@ -126,6 +126,20 @@ 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,
@@ -155,13 +169,15 @@ class FletEasy(FletEasyX):
         # add data to middleware request
         MiddlewareRequest._data = self._data
 
+        self.__pagesys = automatic_routing(self.__path_views) if self.__path_views else None
+
     # -------------------------------------------------------------------
     def __pre_config(self, page: Page):
         """config before run"""
         self._add_configuration_start(page)
 
-        if self.__path_views is not None:
-            self.add_pages(automatic_routing(self.__path_views))
+        if self.__pagesys:
+            self.add_pages(self.__pagesys)
 
         self._run()
 
@@ -246,6 +262,7 @@ class FletEasy(FletEasyX):
                         route=route,
                         view=func,
                         title=data.get("title"),
+                        index=data.get("index"),
                         clear=data.get("page_clear"),
                         share_data=data.get("share_data"),
                         protected_route=data.get("protected_route"),
@@ -281,6 +298,7 @@ class FletEasy(FletEasyX):
         cls,
         route: str,
         title: str = None,
+        index: Optional[int] = None,
         page_clear: bool = False,
         share_data: bool = False,
         protected_route: bool = False,
@@ -293,6 +311,7 @@ class FletEasy(FletEasyX):
         """Decorator to add a new page to the app, you need the following parameters:
         * route: text string of the url, for example(`'/FletEasy'`).
         * `title` : Define the title of the page. (optional).
+        * `index` : Define the index of the page, use in controls like `ft.CupertinoNavigationBar` or `ft.NavigationBar`. (optional)
         * clear: Removes the pages from the `page.views` list of flet. (optional)
         * `share_data` : It is a boolean value, which is useful if you want to share data between pages, in a more restricted way. (optional)
         * protected_route: Protects the route of the page, according to the configuration of the `login` decorator of the `FletEasy` class. (optional)
@@ -327,6 +346,7 @@ class FletEasy(FletEasyX):
         data = {
             "route": route,
             "title": title,
+            "index": index,
             "page_clear": page_clear,
             "share_data": share_data,
             "protected_route": protected_route,

{flet_easy-0.3.0.dev2 → flet_easy-0.3.0.dev4}/src/flet_easy/pagesy.py

@@ -15,6 +15,7 @@ class Pagesy:
     * `route`: text string of the url, for example(`'/task'`).
     * `view`: Stores the page function.
     * `title` : Define the title of the page.
+    * `index` : Define the index of the page, use in controls like `ft.NavigationBar` and `ft.CupertinoNavigationBar`.
     * `clear`: Removes the pages from the `page.views` list of flet. (optional)
     * `share_data` : It is a boolean value, which is useful if you want to share data between pages, in a more restricted way. (optional)
     * `protected_route`: Protects the route of the page, according to the configuration of the `login` decorator of the `FletEasy` class. (optional)
@@ -33,6 +34,7 @@ class Pagesy:
         route: str,
         view: ViewHandler,
         title: Optional[str] = None,
+        index: Optional[int] = None,
         clear: bool = False,
         share_data: bool = False,
         protected_route: bool = False,
@@ -45,6 +47,7 @@ class Pagesy:
         self.route = route
         self.view = view
         self.title = title
+        self.index = index
         self.clear = clear
         self.share_data = share_data
         self.protected_route = protected_route
@@ -178,6 +181,7 @@ class AddPagesy:
         self,
         route: str,
         title: Optional[str] = None,
+        index: Optional[int] = None,
         page_clear: bool = False,
         share_data: bool = False,
         protected_route: bool = False,
@@ -199,6 +203,7 @@ class AddPagesy:
                     route=self.__build_route(route),
                     view=func,
                     title=title,
+                    index=index,
                     clear=page_clear,
                     share_data=share_data,
                     protected_route=protected_route,