flet-easy 0.3.0.dev1__tar.gz → 0.3.0.dev3__tar.gz

flet_easy-0.3.0.dev3/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/PKG-INFO

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

@@ -1,72 +1,74 @@
-[project]
-name = "flet-easy"
-version = "0.3.0.dev1"
-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.dev3"
+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.dev3/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.dev1 → flet_easy-0.3.0.dev3}/src/flet_easy/fletEasy.py

@@ -155,13 +155,15 @@ class FletEasy(FletEasyX):
         # add data to middleware request
         MiddlewareRequest._data = self._data
 
+        self.__pagesys = automatic_routing(self.__path_views)
+
     # -------------------------------------------------------------------
     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()
 

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/src/flet_easy/route.py

@@ -131,6 +131,7 @@ class FletEasyX:
     def _add_configuration_start(self, page: Page):
         """Add general settings to the pages."""
         self.__page = page
+        self.__page.views.clear()
         self.__config_datasy()
 
         """ Add view configuration """
@@ -166,7 +167,8 @@ class FletEasyX:
         """Add a new page and update it."""
 
         # To make the page change faster.
-        self.__page.views.clear()
+        if len(self.__page.views) == 2:
+            self.__page.views.remove(self.__page.views[1])
 
         view = self.__history_pages.get(route)
 

flet_easy-0.3.0.dev3/tests/cache-pages/pyproject.toml

@@ -0,0 +1,53 @@
+[project]
+name = "flet-app"
+version = "0.1.0"
+license = "MIT"
+dependencies = ["flet", "flet-easy==0.3.0.dev2", "sqlmodel"]
+
+[[project.authors]]
+name = "Daxexs"
+email = "Daxexs@test.com"
+
+[tool.flet]
+org = "com.mycompany"                         # --org
+product = "flet-easy"                         # --product
+company = "My Company"                        # --company
+copyright = "Copyright (C) 2024 by MyCompany" # --copyright
+build_number = 1                              # --build-number
+BUILD_VERSION = "0.1.0"
+
+
+[tool.flet.app]
+module = "witch-main"
+path = "."
+#exclude = ["assets"]
+
+[tool.flet.compile]
+app = true
+packages = true
+cleanup = true
+
+[tool.flet.splash]
+color = ""      # --splash-color
+dark_color = "" # --splash-dark-color
+web = false     # --no-web-splash
+ios = false     # --no-ios-splash
+android = false # --no-android-splash
+
+
+[tool.flet.android]
+#"adaptive_icon_background = ""
+#split_per_abi = true
+target_sdk_version = 34
+
+
+[tool.flet.android.permission] # --android-permissions
+"android.permission.CAMERA" = true
+"android.permission.INTERNET" = true
+"android.permission.READ_EXTERNAL_STORAGE" = true
+"android.permission.WRITE_EXTERNAL_STORAGE" = true
+"android.hardware.location.network" = true
+
+
+[tool.flet.android.feature] # --android-features
+"android.hardware.camera" = true

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/tests/cache-pages/witch-main.py

@@ -112,7 +112,12 @@ def index_page(data: fs.Datasy):
     )
 
 
-@app.page("/test2", title="Test 2")
+def m(data: fs.Datasy):
+    page = data.page
+    page.run_task(x)
+
+
+@app.page("/test2", title="Test 2", middleware=[m])
 def test_page(data: fs.Datasy):
     page = data.page
     data.view.appbar.title = ft.Text("Test 2")
@@ -129,6 +134,13 @@ def test_page(data: fs.Datasy):
     )
 
 
+async def x():
+    for i in range(10):
+        print(i)
+        await asyncio.sleep(1)
+    return "Done"
+
+
 # add cache to the page
 @app.page("/test3", title="Test 3", cache=True)
 async def test2_page(data: fs.Datasy):
@@ -136,6 +148,8 @@ async def test2_page(data: fs.Datasy):
     new_appbar = fs.cache_control(data.view.appbar)
     new_appbar.title = ft.Text("Test 3")
 
+    page.run_task(x)
+
     return ft.View(
         controls=[
             ft.Text("Counter 3", size=50),
@@ -148,4 +162,11 @@ async def test2_page(data: fs.Datasy):
     )
 
 
-app.run()
+async def main(page: ft.Page):
+    app.start(page)
+
+
+# app.run()
+if __name__ == "__main__":
+    #ft.app(target=main)
+    app.run()

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/tests/cache-pages/without-main.py

@@ -147,3 +147,5 @@ async def test2_page(data: fs.Datasy):
 
 
 app.run()
+
+# ft.app(target=app.get_app())

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/tests/d2.py

@@ -1,4 +1,8 @@
+import asyncio
 import flet as ft
+from pyinstrument import Profiler, profile
+
+#x = Profiler()
 
 
 def navigation_change(e: ft.ControlEvent):
@@ -22,7 +26,22 @@ t = ft.View(
 )
 
 
+async def test(page: ft.Page):
+    page.title = "Test"
+    return 123
+
+
+def xd(page: ft.Page):
+    l = asyncio.get_event_loop()
+    # l = page.loop
+    # l.run_in_executor(None, test, page)
+    l.run_until_complete(test(page))
+    return 1
+
+
+# @profile
 def main(page: ft.Page):
+    
     page.title = "Test"
     page.theme = ft.Theme(
         page_transitions=ft.PageTransitionsTheme(
@@ -34,8 +53,10 @@ def main(page: ft.Page):
         )
     )
 
+    # x = page.run_task(xd).result()
+    # xd(page)
+
     def route_change(e: ft.RouteChangeEvent):
-        page.views.clear()
         if e.route == "/":
             page.views.append(
                 ft.View(
@@ -46,6 +67,7 @@ def main(page: ft.Page):
                     navigation_bar=t.navigation_bar,
                 )
             )
+
         elif e.route == "/2":
             page.views.append(
                 ft.View(
@@ -61,7 +83,11 @@ def main(page: ft.Page):
 
     page.on_route_change = route_change
     page.go("/")
+    """ page.window.close() """
 
 
 if __name__ == "__main__":
-    ft.app(target=main)
+    a = ft.app(target=main)
+""" 
+x.stop()
+x.open_in_browser(timeline=True) """

flet_easy-0.3.0.dev3/tests/flet-app/pyproject.toml

@@ -0,0 +1,58 @@
+[project]
+name = "flet-app"
+version = "0.1.0"
+license = "MIT"
+dependencies = [
+    "flet==0.27.5",
+    "flet-easy[jwt]==0.3.0.dev2",
+    "sqlmodel==0.0.24",
+]
+
+[[project.authors]]
+name = "Daxexs"
+email = "Daxexs@test.com"
+
+[tool.flet]
+org = "com.mycompany1"                        # --org
+product = "flet-app"                          # --product
+company = "My Company"                        # --company
+copyright = "Copyright (C) 2024 by MyCompany" # --copyright
+build_number = 2                              # --build-number
+build_version = "0.2.1"
+
+
+[tool.flet.app]
+module = "main"
+path = "src"
+exclude = ["assets/icon.png"]
+
+[tool.flet.compile]
+app = true
+packages = true
+cleanup = true
+
+[tool.flet.splash]
+color = ""      # --splash-color
+dark_color = "" # --splash-dark-color
+web = false     # --no-web-splash
+ios = false     # --no-ios-splash
+android = true  # --no-android-splash
+
+
+[tool.flet.android]
+#"adaptive_icon_background = ""
+#split_per_abi = true
+target_sdk_version = 34
+ADAPTIVE_ICON_BACKGROUND = true
+
+
+[tool.flet.android.permission] # --android-permissions
+"android.permission.CAMERA" = true
+"android.permission.INTERNET" = true
+"android.permission.READ_EXTERNAL_STORAGE" = true
+"android.permission.WRITE_EXTERNAL_STORAGE" = true
+"android.hardware.location.network" = true
+
+
+[tool.flet.android.feature] # --android-features
+"android.hardware.camera" = true

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/tests/flet-app/src/controllers/login.py

@@ -14,7 +14,7 @@ class LoginC:
         self.password = fs.Ref[ft.TextField]()
         self.time_logout = fs.Ref[ft.TextField]()
 
-    async def check(self, e):
+    def check(self, e):
         username = (
             self.username.c.value
             if self.username.c.value != "" and self.username.c.value
@@ -28,12 +28,12 @@ class LoginC:
         )
 
         if username and password:
-            if not await check_user(User(username=username, password=password)):
+            if not check_user(User(username=username, password=password)):
                 self.data.page.snack_bar = ft.SnackBar(
                     content=ft.Text("User does not exist"), action="Alright!", open=True
                 )
             else:
-                await self.data.login_async(
+                self.data.login(
                     key="login",
                     value={"user": username},
                     time_expiry=timedelta(seconds=int(self.time_logout.c.value)),

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/tests/flet-app/src/controllers/register.py

@@ -27,7 +27,7 @@ class RegisterC:
         )
 
         if username and password:
-            if not e.page.run_task(add_user, User(username=username, password=password)).result():
+            if not add_user(User(username=username, password=password)):
                 self.data.page.snack_bar = ft.SnackBar(
                     content=ft.Text("The user already exists"), action="Alright!", open=True
                 )

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/tests/flet-app/src/core/config.py

@@ -17,10 +17,7 @@ class ConfigApp:
         @self.app.view
         async def view_config(data: fs.Datasy):
             return fs.Viewsy(
-                appbar=ft.AppBar(
-                    title=ft.Text("Flet-Easy"),
-                    leading=ft.IconButton(icon=ft.Icons.ARROW_BACK_IOS, on_click=data.go_back()),
-                ),
+                appbar=ft.AppBar(title=ft.Text("Flet-Easy")),
                 drawer=ft.NavigationDrawer(
                     controls=[
                         ft.Container(height=12),

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/tests/flet-app/src/main.py

@@ -4,8 +4,12 @@ from core.config import ConfigApp
 
 # from core.sensitive import PRIVATE_KEY, PUBLIC_KEY
 from core.sensitive import SECRET_KEY
+from models.connection import create_tables
 
 import flet_easy as fs
+import flet as ft
+
+create_tables()
 
 app = fs.FletEasy(
     route_init="/home",
@@ -17,10 +21,10 @@ app = fs.FletEasy(
 )
 
 
-def starting_page(data: fs.Datasy):
+async def starting_page(data: fs.Datasy) -> None:
     """Remove [print()] from Python if build Windows"""
-    pass
-    # print(f"\n⚡[MIDDLEWARES RUNNING]\n-> Route:{data.route}\n1. Loading the page")
+    # pass
+    print(f"\n⚡[MIDDLEWARES RUNNING]\n-> Route:{data.route}\n1. Loading the page")
 
 
 async def starting_page_two(data: fs.Datasy):
@@ -47,10 +51,11 @@ async def starting_page_two(data: fs.Datasy):
 # add class to middleware custom
 class CustomMiddlewareInit(fs.MiddlewareRequest):
     def before_request(self):
-        print("-/// (app-root) Before request", self.data.history_routes)
+        pass
+        # print("-/// (app-root) Before request", self.data.history_routes)
 
     def after_request(self):
-        print("-/// (app-root) After request")
+        # print("-/// (app-root) After request")
         if self.data.route == "/login":
             self.data.page.title = "login-Middleware"
             self.data.page.update()
@@ -58,7 +63,7 @@ class CustomMiddlewareInit(fs.MiddlewareRequest):
 
 """ [If you have any problem - build Windows]
 Remove [print()] from Python if used in 'add_middleware' functions. """
-app.add_middleware(starting_page, starting_page_two, CustomMiddlewareInit)
+# app.add_middleware(starting_page, starting_page_two, CustomMiddlewareInit)
 
 ConfigApp(app)
 

flet_easy-0.3.0.dev3/tests/flet-app/src/models/connection.py

@@ -0,0 +1,11 @@
+from pathlib import Path
+
+from sqlmodel import SQLModel, create_engine
+
+path = Path(__file__).parents[1] / "assets"
+
+engine = create_engine(f"sqlite:///{path}/database.db")
+
+
+def create_tables():
+    SQLModel.metadata.create_all(engine)

flet_easy-0.3.0.dev3/tests/flet-app/src/models/methods.py

@@ -0,0 +1,41 @@
+from sqlalchemy.exc import IntegrityError, NoResultFound
+from sqlmodel import Session, select
+
+from models.connection import engine
+from models.models import User
+
+
+def add_user(user: User):
+    try:
+        with Session(engine) as session:
+            session.add(user)
+            session.commit()
+            return True
+    except IntegrityError:
+        return False
+
+
+def check_user(user: User):
+    try:
+        with Session(engine) as session:
+            statement = select(User).where(User.username == user.username)
+            user_check = session.exec(statement).first()
+            # print(user_check)
+            if user_check:
+                return user_check.password == user.password
+            else:
+                return False
+    except NoResultFound or IntegrityError:
+        return False
+
+
+async def delete_user(user: User):
+    try:
+        with Session(engine) as session:
+            statement = select(User).where(User.username == user.username)
+            user_check = session.exec(statement).first()
+            session.delete(user_check)
+            session.commit()
+            return True
+    except NoResultFound or IntegrityError:
+        return False

flet_easy-0.3.0.dev3/tests/flet-app/src/models/models.py

@@ -0,0 +1,7 @@
+from sqlmodel import Field, SQLModel
+
+
+class User(SQLModel, table=True):
+    id: int = Field(default=None, primary_key=True)
+    username: str = Field(default=None, unique=True)
+    password: str = Field(default=None)

{flet_easy-0.3.0.dev1 → flet_easy-0.3.0.dev3}/tests/flet-app/src/views/counter.py

@@ -4,7 +4,7 @@ from components import Counter, Custom, Drawer
 import flet_easy as fs
 
 
-def message_counter(data: fs.Datasy):
+async def message_counter(data: fs.Datasy):
     print("+ Message counter")
 
 
@@ -29,7 +29,7 @@ async def counter_page(data: fs.Datasy, id: str):
         ],
         vertical_alignment=ft.MainAxisAlignment.CENTER,
         horizontal_alignment=ft.CrossAxisAlignment.CENTER,
-        drawer=view.drawer,
+        #drawer=view.drawer,
         appbar=view.appbar,
     )