flet-easy 0.2.8.dev1__tar.gz → 0.2.8.dev2__tar.gz

{flet_easy-0.2.8.dev1 → flet_easy-0.2.8.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: flet-easy
-Version: 0.2.8.dev1
+Version: 0.2.8.dev2
 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
@@ -8,6 +8,7 @@ Project-URL: Documentation, https://daxexs.github.io/flet-easy
 Project-URL: Changelog, https://github.com/Daxexs/flet-easy/blob/main/CHANGELOG.md
 Author-email: Daxexs <Daxexsdev@gmail.com>
 License: apache-2.0
+License-File: LICENSE
 Keywords: app python,fast flet,flet,flet easy,flet easy fastapi,flet easy mvc,flet easy route,flet jwt,flet middleware,flet mvc,flet route,flutter python,python,python web template,web application
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8

{flet_easy-0.2.8.dev1 → flet_easy-0.2.8.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flet-easy"
-version = "0.2.8.dev1"
+version = "0.2.8.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" }]
 
@@ -61,5 +61,9 @@ build-backend = "hatchling.build"
 fs = "flet_easy.cli.main:run"
 
 [dependency-groups]
-test = ["ruff>=0.3.4", "peewee>=3.17.2", "flet[all]>=0.25.1"]
+test = [
+    "ruff>=0.3.4",
+    "flet[all]>=0.25.1",
+    "tortoise-orm>=0.22.2",
+]
 docs = ["mkdocs-material>=9.5.17", "mike>=2.0.0"]

{flet_easy-0.2.8.dev1 → flet_easy-0.2.8.dev2}/src/flet_easy/fletEasy.py

@@ -7,6 +7,7 @@ from collections import deque
 from functools import wraps
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional
+from warnings import warn
 
 from flet import View
 
@@ -155,6 +156,37 @@ class FletEasy:
 
     # -------------------------------------------------------------------
     # -- initialize / Supports async
+    def __run(self, page: Page):
+        """Initialize FletEasy configuration"""
+        return FletEasyX(
+            page=page,
+            route_prefix=self.__route_prefix,
+            route_init=self.__route_init,
+            route_login=self.__route_login,
+            config_login=self.__config_login,
+            pages=self.__pages,
+            page_404=self.__page_404,
+            view_data=self.__view_data,
+            view_config=self.__view_config,
+            config_event_handler=self.__config_event,
+            on_resize=self.__on_resize,
+            on_Keyboard=self.__on_Keyboard,
+            secret_key=self.__secret_key,
+            auto_logout=self.__auto_logout,
+            middleware=self.__middlewares,
+        ).run()
+
+    def start(self, page: Page):
+        """Start the app in the main function"""
+        return self.__run(page)
+
+    def get_app(self):
+        """Return the app function main"""
+
+        def main(page: Page):
+            self.__run(page)
+
+        return main
 
     def run(
         self,
@@ -173,27 +205,14 @@ class FletEasy:
         """* Execute the app. | Soporta async, fastapi y export_asgi_app."""
 
         def main(page: Page):
-            app = FletEasyX(
-                page=page,
-                route_prefix=self.__route_prefix,
-                route_init=self.__route_init,
-                route_login=self.__route_login,
-                config_login=self.__config_login,
-                pages=self.__pages,
-                page_404=self.__page_404,
-                view_data=self.__view_data,
-                view_config=self.__view_config,
-                config_event_handler=self.__config_event,
-                on_resize=self.__on_resize,
-                on_Keyboard=self.__on_Keyboard,
-                secret_key=self.__secret_key,
-                auto_logout=self.__auto_logout,
-                middleware=self.__middlewares,
-            )
-
-            app.run()
+            self.__run(page)
 
         if fastapi:
+            warn(
+                "Avoid using the 'fastapi' parameter in the 'run()' method, instead it is better to use the 'get_app()' method.",
+                category=DeprecationWarning,
+                stacklevel=2,
+            )
             return main
         try:
             return app(

{flet_easy-0.2.8.dev1 → flet_easy-0.2.8.dev2}/tests/flet-app/controllers/login.py

@@ -28,7 +28,7 @@ class LoginC:
         )
 
         if username and password:
-            if not check_user(User(username=username, password=password)):
+            if not e.page.run_task(check_user, User(username=username, password=password)).result():
                 self.data.page.snack_bar = ft.SnackBar(
                     content=ft.Text("User does not exist"), action="Alright!", open=True
                 )

{flet_easy-0.2.8.dev1 → flet_easy-0.2.8.dev2}/tests/flet-app/controllers/register.py

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

{flet_easy-0.2.8.dev1 → flet_easy-0.2.8.dev2}/tests/flet-app/main.py

@@ -1,14 +1,16 @@
 from pathlib import Path
 
+import flet as ft
 from core.config import ConfigApp
 
 # from core.sensitive import PRIVATE_KEY, PUBLIC_KEY
 from core.sensitive import SECRET_KEY
-from models import create_tables
+from models.connection import db_init
+from tortoise import run_async
 
 import flet_easy as fs
 
-create_tables()
+run_async(db_init())
 
 app = fs.FletEasy(
     route_init="/home",
@@ -57,4 +59,4 @@ ConfigApp(app)
 
 """ [If you have any problem - build web]
 Use ft.app(target=app.run(fastapi=true)) when compiling web statica. """
-app.run()
+ft.app(app.run(fastapi=True))

flet_easy-0.2.8.dev2/tests/flet-app/models/__init__.py

@@ -0,0 +1 @@
+

flet_easy-0.2.8.dev2/tests/flet-app/models/connection.py

@@ -0,0 +1,17 @@
+from pathlib import Path
+
+from tortoise import Tortoise
+
+path = Path(__file__).parents[1] / "assets"
+
+
+async def db_init():
+    await Tortoise.init(
+        db_url=f"sqlite://{path}/database.db",
+        modules={"models": ["models.models"]},
+    )
+    await Tortoise.generate_schemas()
+
+
+async def db_close():
+    await Tortoise.close_connections()

flet_easy-0.2.8.dev2/tests/flet-app/models/methods.py

@@ -0,0 +1,39 @@
+# from tortoise import run_async
+from tortoise.exceptions import DoesNotExist, IntegrityError
+
+from models.connection import db_close, db_init
+from models.models import User
+
+
+async def add_user(user: User):
+    try:
+        await db_init()
+        await User.create(username=user.username, password=user.password)
+
+        # run_async(x())
+        return True
+    except IntegrityError:
+        return False
+    finally:
+        await db_close()
+
+
+async def check_user(user: User):
+    try:
+        await db_init()
+        user_check = await User.get(username=user.username)
+        return user_check.password == user.password
+    except DoesNotExist:
+        return False
+    finally:
+        await db_close()
+
+
+async def delete_user(user: User):
+    try:
+        await db_init()
+        await User.filter(User.username == user.username).delete()
+    except IntegrityError:
+        return False
+    finally:
+        await db_close()

flet_easy-0.2.8.dev2/tests/flet-app/models/models.py

@@ -0,0 +1,11 @@
+from tortoise import fields
+from tortoise.models import Model
+
+
+class User(Model):
+    id = fields.IntField(pk=True)
+    username = fields.CharField(max_length=255, unique=True)
+    password = fields.CharField(max_length=255)
+
+    def __str__(self):
+        return f"User(id={self.id}, username={self.username})"

flet_easy-0.2.8.dev2/tests/flet-app/pyproject.toml

@@ -0,0 +1,9 @@
+[project]
+name = "flet-app"
+version = "0.1.0"
+license = "MIT"
+dependencies = ["flet==0.25.*", "flet-easy[jwt]==0.2.8.dev1", "tortoise-orm==0.22.2"]
+
+[[project.authors]]
+name = "Daxexs"
+email = "Daxexs@test.com"