Added DbObjects

.gitignore

@@ -3,6 +3,7 @@ app.egg-info
 *.pyc
 .mypy_cache
 .coverage
+.myFastHtmlDb
 htmlcov
 .cache
 .venv

requirements.txt

@@ -36,6 +36,7 @@ markdown-it-py==4.0.0
 mdurl==0.1.2
 more-itertools==10.8.0
 myauth==0.2.0
+mydbengine==0.1.0
 myutils==0.4.0
 nh3==0.3.1
 oauthlib==3.3.1
@@ -64,11 +65,13 @@ rfc3986==2.0.0
 rich==14.2.0
 rsa==4.9.1
 SecretStorage==3.4.0
+shellingham==1.5.4
 six==1.17.0
 sniffio==1.3.1
 soupsieve==2.8
 starlette==0.48.0
 twine==6.2.0
+typer==0.20.0
 typing-inspection==0.4.2
 typing_extensions==4.15.0
 urllib3==2.5.0

src/app.py

@@ -1,8 +1,11 @@
 import logging
 
 from fasthtml import serve
+from fasthtml.components import *
 
 from myfasthtml.controls.Layout import Layout
+from myfasthtml.controls.helpers import Ids
+from myfasthtml.core.instances import InstancesManager
 from myfasthtml.myfastapp import create_app
 
 logging.basicConfig(
@@ -11,13 +14,26 @@ logging.basicConfig(
   datefmt='%Y-%m-%d %H:%M:%S',  # Timestamp format
 )
 
-app, rt = create_app(protect_routes=False, mount_auth_app=True, pico=False, title="MyFastHtml" )
+app, rt = create_app(protect_routes=True,
+                     mount_auth_app=True,
+                     pico=False,
+                     title="MyFastHtml",
+                     live=True,
+                     base_url="http://localhost:5003")
+
 
 @rt("/")
 def index(session):
-  layout = Layout(session, "Testing Layout", right_drawer=False)
+  layout = InstancesManager.get(session, Ids.Layout, Layout, "Testing Layout")
   layout.set_footer("Goodbye World")
+  for i in range(1000):
+    layout.left_drawer.append(Div(f"Left Drawer Item {i}"))
+  
+  content = tuple([Div(f"Content {i}") for i in range(1000)])
+  layout.set_main(content)
   return layout
 
+
 if __name__ == "__main__":
+  # debug_routes(app)
   serve(port=5003)

src/myfasthtml/assets/myfasthtml.css

@@ -39,6 +39,7 @@
     grid-area: header;
     display: flex;
     align-items: center;
+    justify-content: space-between; /* put one item on each side */
     gap: 1rem;
     padding: 0 1rem;
     background-color: var(--color-base-300);

src/myfasthtml/auth/routes.py

@@ -18,7 +18,7 @@ from ..auth.utils import (
 )
 
 
-def setup_auth_routes(app, rt, mount_auth_app=True, sqlite_db_path="Users.db"):
+def setup_auth_routes(app, rt, mount_auth_app=True, sqlite_db_path="Users.db", base_url=None):
   """
   Setup all authentication and protected routes.
 
@@ -27,6 +27,7 @@ def setup_auth_routes(app, rt, mount_auth_app=True, sqlite_db_path="Users.db"):
       rt: Route decorator from FastHTML
       mount_auth_app: Whether to mount the auth FastApi API routes
       sqlite_db_path: by default, create a new SQLite database at this path
+      base_url: Base URL for the application (default to localhost:5001 if not provided)
   """
   
   # ============================================================================
@@ -61,7 +62,7 @@ def setup_auth_routes(app, rt, mount_auth_app=True, sqlite_db_path="Users.db"):
         RedirectResponse on success, or LoginPage with error on failure
     """
     # Attempt login
-    auth_data = login_user(email, password)
+    auth_data = login_user(email, password, base_url=base_url)
     
     if auth_data:
       # Login successful - store tokens in session
@@ -69,7 +70,7 @@ def setup_auth_routes(app, rt, mount_auth_app=True, sqlite_db_path="Users.db"):
       session['refresh_token'] = auth_data['refresh_token']
       
       # Get user info and store in session
-      user_info = get_user_info(auth_data['access_token'])
+      user_info = get_user_info(auth_data['access_token'], base_url=base_url)
       if user_info:
         session['user_info'] = user_info
       
@@ -116,7 +117,7 @@ def setup_auth_routes(app, rt, mount_auth_app=True, sqlite_db_path="Users.db"):
       return RegisterPage(error_message="Password must be at least 8 characters long.")
     
     # Attempt registration
-    result = register_user(email, username, password)
+    result = register_user(email, username, password, base_url=base_url)
     
     if result:
       # Registration successful - show success message and auto-login

src/myfasthtml/auth/utils.py

@@ -163,13 +163,14 @@ def check_token_expiry(token: str) -> Optional[float]:
     return None
 
 
-def login_user(email: str, password: str) -> Optional[Dict[str, Any]]:
+def login_user(email: str, password: str, base_url: str = None) -> Optional[Dict[str, Any]]:
   """
   Authenticate user with email and password.
 
   Args:
       email: User email address
       password: User password
+      base_url:
 
   Returns:
       Dictionary containing access_token, refresh_token, and user_info if successful,
@@ -177,7 +178,7 @@ def login_user(email: str, password: str) -> Optional[Dict[str, Any]]:
   """
   try:
     response = http_client.post(
-      f"{API_BASE_URL}/auth/login",
+      f"{base_url or API_BASE_URL}/auth/login",
       data={"username": email, "password": password},
       headers={"Content-Type": "application/x-www-form-urlencoded"},
       timeout=10.0
@@ -196,7 +197,7 @@ def login_user(email: str, password: str) -> Optional[Dict[str, Any]]:
     return None
 
 
-def register_user(email: str, username: str, password: str) -> Optional[Dict[str, Any]]:
+def register_user(email: str, username: str, password: str, base_url: str = None) -> Optional[Dict[str, Any]]:
   """
   Register a new user.
 
@@ -204,14 +205,14 @@ def register_user(email: str, username: str, password: str) -> Optional[Dict[str
       email: User email address
       username: User name
       password: User password
-
+      base_url:
   Returns:
       Dictionary containing success message if registration succeeds,
       None if registration fails
   """
   try:
     response = http_client.post(
-      f"{API_BASE_URL}/auth/register",
+      f"{base_url or API_BASE_URL}/auth/register",
       json={"email": email, "username": username, "password": password},
       timeout=10.0
     )
@@ -224,20 +225,20 @@ def register_user(email: str, username: str, password: str) -> Optional[Dict[str
     return None
 
 
-def refresh_access_token(refresh_token: str) -> Optional[Dict[str, Any]]:
+def refresh_access_token(refresh_token: str, base_url: str = None) -> Optional[Dict[str, Any]]:
   """
   Refresh the access token using a refresh token.
 
   Args:
       refresh_token: Valid refresh token
-
+      base_url:
   Returns:
       Dictionary containing new access_token and refresh_token if successful,
       None if refresh fails
   """
   try:
     response = http_client.post(
-      f"{API_BASE_URL}/auth/refresh",
+      f"{base_url or API_BASE_URL}/auth/refresh",
       json={"refresh_token": refresh_token},
       timeout=10.0
     )
@@ -254,20 +255,20 @@ def refresh_access_token(refresh_token: str) -> Optional[Dict[str, Any]]:
     return None
 
 
-def get_user_info(access_token: str) -> Optional[Dict[str, Any]]:
+def get_user_info(access_token: str, base_url: str = None) -> Optional[Dict[str, Any]]:
   """
   Get current user information using access token.
 
   Args:
       access_token: Valid access token
-
+      base_url:
   Returns:
       Dictionary containing user information if successful,
       None if request fails
   """
   try:
     response = http_client.get(
-      f"{API_BASE_URL}/auth/me",
+      f"{base_url or API_BASE_URL}/auth/me",
       headers={"Authorization": f"Bearer {access_token}"},
       timeout=10.0
     )
@@ -280,19 +281,19 @@ def get_user_info(access_token: str) -> Optional[Dict[str, Any]]:
     return None
 
 
-def logout_user(refresh_token: str) -> bool:
+def logout_user(refresh_token: str, base_url: str = None) -> bool:
   """
   Logout user by revoking the refresh token.
 
   Args:
       refresh_token: Refresh token to revoke
-
+      base_url:
   Returns:
       True if logout successful, False otherwise
   """
   try:
     response = http_client.post(
-      f"{API_BASE_URL}/auth/logout",
+      f"{base_url or API_BASE_URL}/auth/logout",
       json={"refresh_token": refresh_token},
       timeout=10.0
     )

src/myfasthtml/controls/BaseControl.py

@@ -1,7 +0,0 @@
-class BaseControl:
-  def __init__(self, session, _id):
-    self.session = session
-    self._id = _id
-  
-  def get_id(self):
-    return self._id

src/myfasthtml/controls/Layout.py

@@ -5,23 +5,29 @@ This component provides a responsive layout with fixed header/footer,
 optional collapsible left/right drawers, and a scrollable main content area.
 """
 import logging
-import uuid
 from typing import Literal
 
 from fasthtml.common import *
 
 from myfasthtml.controls.BaseCommands import BaseCommands
-from myfasthtml.controls.BaseControl import BaseControl
-from myfasthtml.controls.helpers import mk
+from myfasthtml.controls.UserProfile import UserProfile
+from myfasthtml.controls.helpers import mk, Ids
 from myfasthtml.core.commands import Command
-from myfasthtml.icons.fluent import icon_panel_left_expand20_regular as left_drawer_icon
-from myfasthtml.icons.fluent import icon_panel_right_expand20_regular as right_drawer_icon
+from myfasthtml.core.dbmanager import DbObject
+from myfasthtml.core.instances import InstancesManager, SingleInstance
+from myfasthtml.icons.fluent import panel_left_expand20_regular as left_drawer_icon
+from myfasthtml.icons.fluent_p2 import panel_right_expand20_regular as right_drawer_icon
 
 logger = logging.getLogger("LayoutControl")
 
+
 @dataclass
-class LayoutState:
+class LayoutState(DbObject):
+  def __init__(self, session, owner):
+    super().__init__(session, owner.get_id())
+  
   left_drawer_open: bool = True
+  right_drawer_open: bool = False
 
 
 class Commands(BaseCommands):
@@ -29,7 +35,7 @@ class Commands(BaseCommands):
     return Command("ToggleDrawer", "Toggle main layout drawer", self._owner.toggle_drawer, "left")
 
 
-class Layout(BaseControl):
+class Layout(SingleInstance):
   """
   A responsive layout component with header, footer, main content area,
   and optional collapsible side drawers.
@@ -40,7 +46,19 @@ class Layout(BaseControl):
       right_drawer (bool): Whether to include a right drawer
   """
   
-  def __init__(self, session, app_name, left_drawer=True, right_drawer=True):
+  class DrawerContent:
+    def __init__(self, owner, side: Literal["left", "right"]):
+      self._owner = owner
+      self.side = side
+      self._content = []
+    
+    def append(self, content):
+      self._content.append(content)
+    
+    def get_content(self):
+      return self._content
+  
+  def __init__(self, session, app_name):
     """
     Initialize the Layout component.
 
@@ -49,28 +67,17 @@ class Layout(BaseControl):
         left_drawer (bool): Enable left drawer. Default is True.
         right_drawer (bool): Enable right drawer. Default is True.
     """
-    super().__init__(session, f"mf-layout-{str(uuid.uuid4())}")
+    super().__init__(session, Ids.Layout)
     self.app_name = app_name
-    self.left_drawer = left_drawer
-    self.right_drawer = right_drawer
     
     # Content storage
     self._header_content = None
     self._footer_content = None
     self._main_content = None
-    self._left_drawer_content = None
-    self._right_drawer_content = None
-    self._state = LayoutState()
+    self._state = LayoutState(session, self)
     self.commands = Commands(self)
-  
-  # def set_header(self, content):
-  #   """
-  #   Set the header content.
-  #
-  #   Args:
-  #       content: FastHTML component(s) or content for the header
-  #   """
-  #   self._header_content = content
+    self.left_drawer = self.DrawerContent(self, "left")
+    self.right_drawer = self.DrawerContent(self, "right")
   
   def set_footer(self, content):
     """
@@ -90,26 +97,6 @@ class Layout(BaseControl):
     """
     self._main_content = content
   
-  def set_left_drawer(self, content):
-    """
-    Set the left drawer content.
-
-    Args:
-        content: FastHTML component(s) or content for the left drawer
-    """
-    if self.left_drawer:
-      self._left_drawer_content = content
-  
-  def set_right_drawer(self, content):
-    """
-    Set the right drawer content.
-
-    Args:
-        content: FastHTML component(s) or content for the right drawer
-    """
-    if self.right_drawer:
-      self._right_drawer_content = content
-  
   def toggle_drawer(self, side: Literal["left", "right"]):
     logger.debug(f"Toggle drawer: {side=}, {self._state.left_drawer_open=}")
     if side == "left":
@@ -117,7 +104,7 @@ class Layout(BaseControl):
       return self._mk_left_drawer_icon(), self._mk_left_drawer()
     elif side == "right":
       self._state.right_drawer_open = not self._state.right_drawer_open
-      return Div(), self._mk_right_drawer()
+      return self._mk_left_drawer_icon(), self._mk_right_drawer()
     else:
       raise ValueError("Invalid drawer side")
   
@@ -130,6 +117,7 @@ class Layout(BaseControl):
     """
     return Header(
       self._mk_left_drawer_icon(),
+      InstancesManager.get(self._session, Ids.UserProfile, UserProfile),
       cls="mf-layout-header"
     )
   
@@ -166,17 +154,10 @@ class Layout(BaseControl):
     Returns:
         Div or None: FastHTML Div component for left drawer, or None if disabled
     """
-    if not self.left_drawer:
-      return None
-    
-    print(f"{self._state.left_drawer_open=}")
-    
-    drawer_content = self._left_drawer_content if self._left_drawer_content else ""
     return Div(
-      drawer_content,
+      *self.left_drawer.get_content(),
       id=f"{self._id}_ld",
       cls=f"mf-layout-drawer mf-layout-left-drawer {'collapsed' if not self._state.left_drawer_open else ''}",
-      **{"data-side": "left"}
     )
   
   def _mk_right_drawer(self):
@@ -186,15 +167,10 @@ class Layout(BaseControl):
     Returns:
         Div or None: FastHTML Div component for right drawer, or None if disabled
     """
-    if not self.right_drawer:
-      return None
-    
-    drawer_content = self._right_drawer_content if self._right_drawer_content else ""
     return Div(
-      drawer_content,
-      cls="mf-layout-drawer mf-layout-right-drawer",
+      *self.right_drawer.get_content(),
+      cls=f"mf-layout-drawer mf-layout-right-drawer {'collapsed' if not self._state.right_drawer_open else ''}",
       id=f"{self._id}_rd",
-      **{"data-side": "right"}
     )
   
   def _mk_left_drawer_icon(self):
@@ -217,13 +193,8 @@ class Layout(BaseControl):
       self._mk_main(),
       self._mk_right_drawer(),
       self._mk_footer(),
-      Script(f"initLayout('{self._id}');"),
       id=self._id,
       cls="mf-layout",
-      **{
-          "data-left-drawer": str(self.left_drawer).lower(),
-          "data-right-drawer": str(self.right_drawer).lower()
-      }
     )
   
   def __ft__(self):

src/myfasthtml/controls/UserProfile.py

@@ -0,0 +1,46 @@
+from fasthtml.components import *
+
+from myfasthtml.controls.helpers import Ids, mk
+from myfasthtml.core.instances import SingleInstance
+from myfasthtml.core.utils import retrieve_user_info
+from myfasthtml.icons.material import dark_mode_filled, person_outline_sharp
+from myfasthtml.icons.material_p1 import light_mode_filled, alternate_email_filled
+
+
+class UserProfile(SingleInstance):
+  def __init__(self, session):
+    super().__init__(session, Ids.UserProfile)
+  
+  def render(self):
+    user_info = retrieve_user_info(self._session)
+    return Div(
+      Div(user_info['username'],
+          tabindex="0",
+          role="button",
+          cls="btn btn-xs"),
+      Div(
+        Div(mk.icon(person_outline_sharp, cls="mr-1"), user_info['username'], cls="flex m-1"),
+        Div(mk.icon(alternate_email_filled, cls="mr-1"), user_info['email'], cls="flex m-1"),
+        Div(mk.icon(dark_mode_filled, cls="mr-1"), self.mk_dark_mode(), cls="flex m-1"),
+        Div(A("Logout", cls="btn btn-xs mr-1", href="/logout"), cls="flex justify-center items-center"),
+        tabindex="-1",
+        cls="dropdown-content menu w-52 rounded-box bg-base-300 shadow-xl"
+      ),
+      cls="dropdown dropdown-end"
+    )
+  
+  @staticmethod
+  def mk_dark_mode():
+    return Label(
+      Input(type="checkbox",
+            name='theme',
+            aria_label='Dark',
+            value='dark',
+            cls='theme-controller'),
+      light_mode_filled,
+      dark_mode_filled,
+      cls="toggle text-base-content"
+    )
+  
+  def __ft__(self):
+    return self.render()

src/myfasthtml/controls/helpers.py

@@ -5,6 +5,12 @@ from myfasthtml.core.commands import Command
 from myfasthtml.core.utils import merge_classes
 
 
+class Ids:
+  DbManager = "mf-dbmanager"
+  Layout = "mf-layout"
+  UserProfile = "mf-user-profile"
+
+
 class mk:
   
   @staticmethod

src/myfasthtml/core/bindings.py

@@ -270,10 +270,10 @@ class Binding:
     return self
   
   def get_htmx_params(self):
-    return self.htmx_extra | {
+    return {
         "hx-post": f"{ROUTE_ROOT}{Routes.Bindings}",
         "hx-vals": f'{{"b_id": "{self.id}"}}',
-    }
+    } | self.htmx_extra
   
   def init(self):
     """

src/myfasthtml/core/commands.py

@@ -34,11 +34,11 @@ class BaseCommand:
     CommandsManager.register(self)
   
   def get_htmx_params(self):
-    return self._htmx_extra | {
+    return {
         "hx-post": f"{ROUTE_ROOT}{Routes.Commands}",
         "hx-swap": "outerHTML",
         "hx-vals": f'{{"c_id": "{self.id}"}}',
-    }
+    } | self._htmx_extra
   
   def execute(self):
     raise NotImplementedError

src/myfasthtml/core/dbmanager.py

@@ -0,0 +1,62 @@
+from dbengine.dbengine import DbEngine
+
+from myfasthtml.controls.helpers import Ids
+from myfasthtml.core.instances import SingleInstance, InstancesManager
+from myfasthtml.core.utils import retrieve_user_info
+
+
+class DbManager(SingleInstance):
+  def __init__(self, session, root=".myFastHtmlDb", auto_register: bool = True):
+    super().__init__(session, Ids.DbManager, auto_register=auto_register)
+    self.db = DbEngine(root=root)
+  
+  def save(self, entry, obj):
+    self.db.save(self.get_tenant(), self.get_user(), entry, obj)
+  
+  def load(self, entry):
+    return self.db.load(self.get_tenant(), entry)
+  
+  def exists_entry(self, entry):
+    return self.db.exists(self.get_tenant(), entry)
+  
+  def get_tenant(self):
+    return retrieve_user_info(self._session)["id"]
+  
+  def get_user(self):
+    return retrieve_user_info(self._session)["email"]
+
+
+class DbObject:
+  """
+  When you set the attribute, it persists in DB
+  It loads from DB at startup
+  """
+  
+  def __init__(self, session, name=None, db_manager=None):
+    self._session = session
+    self._name = name or self.__class__.__name__
+    self._db_manager = db_manager or InstancesManager.get(self._session, Ids.DbManager, DbManager)
+    
+    # init is possible
+    if self._db_manager.exists_entry(self._name):
+      props = self._db_manager.load(self._name)
+      for k, v in props.items():
+        setattr(self, k, v)
+    else:
+      self._save_self()
+  
+  def __setattr__(self, name: str, value: str):
+    if name.startswith("_"):
+      super().__setattr__(name, value)
+      return
+    
+    old_value = getattr(self, name, None)
+    if old_value == value:
+      return
+    
+    super().__setattr__(name, value)
+    self._save_self()
+  
+  def _save_self(self):
+    props = {k: getattr(self, k) for k, v in self.__class__.__dict__.items() if not k.startswith("_")}
+    self._db_manager.save(self._name, props)

src/myfasthtml/core/instances.py

@@ -0,0 +1,90 @@
+import uuid
+
+
+class DuplicateInstanceError(Exception):
+  def __init__(self, instance):
+    self.instance = instance
+
+
+class BaseInstance:
+  """
+  Base class for all instances (manageable by InstancesManager)
+  """
+  
+  def __init__(self, session: dict, _id: str, auto_register: bool = True):
+    self._session = session
+    self._id = _id
+    if auto_register:
+      InstancesManager.register(session, self)
+  
+  def get_id(self):
+    return self._id
+  
+  def get_session(self):
+    return self._session
+
+
+class SingleInstance(BaseInstance):
+  """
+  Base class for instances that can only have one instance at a time.
+  """
+  
+  def __init__(self, session: dict, prefix: str, auto_register: bool = True):
+    super().__init__(session, prefix, auto_register)
+    self._instance = None
+
+
+class MultipleInstance(BaseInstance):
+  """
+  Base class for instances that can have multiple instances at a time.
+  """
+  
+  def __init__(self, session: dict, prefix: str, auto_register: bool = True):
+    super().__init__(session, f"{prefix}-{str(uuid.uuid4())}", auto_register)
+    self._instance = None
+
+
+class InstancesManager:
+  instances = {}
+  
+  @staticmethod
+  def register(session: dict, instance: BaseInstance):
+    """
+    Register an instance in the manager, so that it can be retrieved later.
+    :param session:
+    :param instance:
+    :return:
+    """
+    key = (InstancesManager._get_session_id(session), instance.get_id())
+    
+    if isinstance(instance, SingleInstance) and key in InstancesManager.instances:
+      raise DuplicateInstanceError(instance)
+    
+    InstancesManager.instances[key] = instance
+    return instance
+  
+  @staticmethod
+  def get(session: dict, instance_id: str, instance_type: type = None, *args, **kwargs):
+    """
+    Get or create an instance of the given type (from its id)
+    :param session:
+    :param instance_id:
+    :param instance_type:
+    :param args:
+    :param kwargs:
+    :return:
+    """
+    try:
+      key = (InstancesManager._get_session_id(session), instance_id)
+      
+      return InstancesManager.instances[key]
+    except KeyError:
+      return instance_type(session, *args, **kwargs)  # it will be automatically registered
+  
+  @staticmethod
+  def _get_session_id(session):
+    if not session:
+      return "** NOT LOGGED IN **"
+    if "user_info" not in session:
+      return "** UNKNOWN USER **"
+    return session["user_info"].get("id", "** INVALID SESSION **")

src/myfasthtml/core/utils.py

@@ -3,6 +3,8 @@ import logging
 from bs4 import Tag
 from fastcore.xml import FT
 from fasthtml.fastapp import fast_app
+from rich.console import Console
+from rich.table import Table
 from starlette.routing import Mount
 
 from myfasthtml.core.constants import Routes, ROUTE_ROOT
@@ -60,15 +62,46 @@ def merge_classes(*args):
 
 
 def debug_routes(app):
+  routes = []
+  
+  def _clean_endpoint(endpoint):
+    res = str(endpoint).replace("<function ", "").replace(".<locals>", "")
+    return res.split(" at ")[0]
+  
   def _debug_routes(_app, _route, prefix=""):
     if isinstance(_route, Mount):
       for sub_route in _route.app.router.routes:
         _debug_routes(_app, sub_route, prefix=_route.path)
     else:
-      print(f"path={prefix}{_route.path}, methods={_route.methods}, endpoint={_route.endpoint}")
+      routes.append({
+          "number": len(routes),
+          "app": str(_app),
+          "name": _route.name,
+          "path": _route.path,
+          "full_path": prefix + _route.path,
+          "endpoint": _clean_endpoint(_route.endpoint),
+          "methods": _route.methods if hasattr(_route, "methods") else [],
+          "path_format": _route.path_format,
+          "path_regex": str(_route.path_regex),
+      })
   
   for route in app.router.routes:
     _debug_routes(app, route)
+  
+  if not routes:
+    print("No routes found.")
+    return
+  
+  table = Table(show_header=True, expand=True, header_style="bold")
+  columns = ["number", "name", "full_path", "endpoint", "methods"]  # routes[0].keys()
+  for column in columns:
+    table.add_column(column)
+  
+  for route in routes:
+    table.add_row(*[str(route[column]) for column in columns])
+  
+  console = Console()
+  console.print(table)
 
 
 def mount_utils(app):
@@ -158,6 +191,26 @@ def quoted_str(s):
   return str(s)
 
 
+def retrieve_user_info(session: dict):
+  if not session:
+    return {
+        "id": "** NOT LOGGED IN **",
+        "email": "** NOT LOGGED IN **",
+        "username": "** NOT LOGGED IN **",
+        "role": [],
+    }
+  
+  if "user_info" not in session:
+    return {
+        "id": "** UNKNOWN USER **",
+        "email": "** UNKNOWN USER **",
+        "username": "** UNKNOWN USER **",
+        "role": [],
+    }
+  
+  return session["user_info"]
+
+
 @utils_rt(Routes.Commands)
 def post(session, c_id: str):
   """

src/myfasthtml/icons/Readme.md

@@ -17,5 +17,15 @@ Update the root folder in `update_icons.py` to point to the root folder of the i
 
 ## 
 ```sh
-python update_icons.py
-```
+python manage_icons.py --help
+```
+
+To list
+```sh
+python manage_icons.py list
+```
+
+To generate icons
+```sh
+python manage_icons.py generate --no-dry-run --suppress-suffix
+```

src/myfasthtml/icons/manage_icons.py

@@ -0,0 +1,150 @@
+import os
+from pathlib import Path
+
+import typer
+
+ROOT_FOLDER = "/home/kodjo/Dev/MyDocManager/src/frontend/node_modules/@sicons"
+MAX_SIZE = 2000000
+
+import re
+
+
+def pascal_to_snake(name: str) -> str:
+  """Convert a PascalCase or CamelCase string to snake_case."""
+  # Insert underscore before capital letters (except the first one)
+  s1 = re.sub(r'(.)([A-Z][a-z]+)', r'\1_\2', name)
+  # Handle consecutive capital letters (like 'HTTPServer' -> 'http_server')
+  s2 = re.sub(r'([a-z0-9])([A-Z])', r'\1_\2', s1)
+  return s2.lower()
+
+
+app = typer.Typer()
+
+
+def list_sources(source_folder: str):
+  return os.listdir(source_folder)
+
+
+def list_icons_from_source(source_folder: str, source: str):
+  res = []
+  for f in os.listdir(f"{source_folder}/{source}"):
+    if f.endswith(".svg"):
+      res.append(f)
+  return res
+
+
+def read_content(source_folder: str, source: str, file_name: str):
+  with open(f"{source_folder}/{source}/{file_name}", "r") as f:
+    return f.read().strip()
+
+
+def get_dir_size(path: str | Path) -> int:
+  p = Path(path)
+  if p.is_file():
+    return p.stat().st_size
+  elif p.is_dir():
+    return sum(f.stat().st_size for f in p.rglob('*') if f.is_file())
+  else:
+    raise FileNotFoundError(f"Path not found: {path}")
+
+
+def sizeof_fmt(num, suffix="B"):
+  for unit in ["", "K", "M", "G", "T"]:
+    if abs(num) < 1024.0:
+      return f"{num:3.1f}{unit}{suffix}"
+    num /= 1024.0
+  return f"{num:.1f}P{suffix}"
+
+
+def init_buffer(source_folder: str, source: str):
+  buffer = ""
+  readme_file_path = f"{source_folder}/{source}/README.md"
+  if os.path.exists(readme_file_path):
+    with open(readme_file_path, "r") as f_readme:
+      for line in f_readme:
+        if line.startswith("#"):
+          buffer += line
+        else:
+          buffer += f"# {line}"
+      buffer += "\n\n"
+  
+  buffer += "from fastcore.basics import NotStr\n\n"
+  return buffer
+
+
+def flush(dry_run, suppress_suffix, source_folder: str, target_folder: str, buffer: str, size: int, part: int, source: str):
+  suffix = '' if suppress_suffix else f"_test"
+  outfile = f"{source}{suffix}.py" if part == 0 else f"{source}_p{part}{suffix}.py"
+  if not dry_run:
+    output_path = f"{target_folder}/{outfile}" if part == 0 else f"{target_folder}/{outfile}"
+    with open(output_path, "w") as f:
+      f.write(buffer)
+  
+  typer.echo(f"  Generated {source} as {outfile} ({sizeof_fmt(size)}, max={sizeof_fmt(MAX_SIZE)})")
+  return init_buffer(source_folder, source), 0, part + 1
+
+
+@app.command("list")
+def list_icons(
+    source: str = typer.Argument(None, help="The source file to list icons from"),
+    source_folder: str = typer.Option(ROOT_FOLDER, help="The source folder containing icons"),
+    count: bool = typer.Option(False, help="Counts the number of items"),
+    size: bool = typer.Option(False, help="Gets the size of the items"),
+):
+  res = []
+  if source:
+    res.extend(list_icons_from_source(source_folder, source))
+  else:
+    res.extend(list_sources(source_folder))
+  
+  if count:
+    typer.echo(len(res))
+    return
+  
+  if size:
+    path = f"{source_folder}/{source}" if source else f"{source_folder}"
+    size = get_dir_size(path)
+    typer.echo(sizeof_fmt(size))
+    return
+  
+  for r in res:
+    typer.echo(r)
+
+
+@app.command("generate")
+def generate_icons(
+    source: str = typer.Argument(None, help="The source file to list icons from"),
+    source_folder: str = typer.Option(ROOT_FOLDER, help="The source folder containing icons"),
+    target_folder: str = typer.Option(".", help="The folder where to create the python files."),
+    top: int = typer.Option(0, help="The number of top items to generate"),
+    dry_run: bool = typer.Option(True, help="Does not generate the icons"),
+    suppress_suffix: bool = typer.Option(False, help="Does not add the suffix to the icon names"),
+):
+  sources = [source] if source else list_sources(source_folder)
+  for current_source in sources:
+    typer.echo(f"Generating icons for {current_source}")
+    buffer = init_buffer(source_folder, current_source)
+    size = 0
+    part = 0
+    for index, svg_file in enumerate(list_icons_from_source(source_folder, current_source)):
+      
+      if 0 < top <= index:
+        break
+      
+      icon_name = os.path.splitext(os.path.basename(svg_file))[0]
+      svg_content = read_content(source_folder, current_source, svg_file)
+      svg_content = svg_content.replace("<svg ", f'<svg name="{current_source}-{icon_name}" ').replace("\n", "")
+      
+      content = f"{pascal_to_snake(icon_name)} = NotStr('''{svg_content}''')"
+      buffer += f"{content}\n"
+      size += len(content)
+      
+      if size > MAX_SIZE:
+        buffer, size, part = flush(dry_run, suppress_suffix, source_folder, target_folder, buffer, size, part,
+                                   current_source)
+    
+    flush(dry_run, suppress_suffix, source_folder, target_folder, buffer, size, part, current_source)
+
+
+if __name__ == "__main__":
+  app()

src/myfasthtml/myfastapp.py

@@ -32,6 +32,7 @@ def get_asset_content(filename):
 def create_app(daisyui: Optional[bool] = True,
                protect_routes: Optional[bool] = True,
                mount_auth_app: Optional[bool] = False,
+               base_url: Optional[str] = None,
                **kwargs) -> Any:
   """
   Creates and configures a FastHtml application with optional support for daisyUI themes and
@@ -39,16 +40,11 @@ def create_app(daisyui: Optional[bool] = True,
   
   :param daisyui: Flag to enable or disable inclusion of daisyUI-related assets for styling.
                   Defaults to False.
-  :type daisyui: Optional[bool]
-  
   :param protect_routes: Flag to enable or disable routes protection based on authentication.
                   Defaults to True.
-  :type protect_routes: Optional[bool]
-
   :param mount_auth_app: Flag to enable or disable mounting of authentication routes.
                          Defaults to False.
-  :type mount_auth_app: Optional[bool]
-
+  :param base_url: Url to use for the application (used by the auth APIs)
   :param kwargs: Arbitrary keyword arguments forwarded to the application initialization logic.
 
   :return: A tuple containing the FastHtml application instance and the associated router.
@@ -70,11 +66,12 @@ def create_app(daisyui: Optional[bool] = True,
   app, rt = fasthtml.fastapp.fast_app(before=beforeware, hdrs=tuple(hdrs), **kwargs)
   
   # remove the global static files routes
-  static_route_exts_get = app.routes.pop(0)
+  original_routes = app.routes[:]
+  app.routes.clear()
   
   # Serve assets
   @app.get("/myfasthtml/{filename:path}.{ext:static}")
-  def serve_asset(filename: str, ext: str):
+  def serve_assets(filename: str, ext: str):
     path = filename + "." + ext
     try:
       content = get_asset_content(path)
@@ -89,13 +86,14 @@ def create_app(daisyui: Optional[bool] = True,
       return Response(f"Asset not found: {path}", status_code=404)
   
   # and put it back after the myfasthtml static files routes
-  app.routes.append(static_route_exts_get)
+  for r in original_routes:
+    app.routes.append(r)
   
   # route the commands and the bindings
   app.mount("/myfasthtml", utils_app)
   
   if mount_auth_app:
     # Setup authentication routes
-    setup_auth_routes(app, rt)
+    setup_auth_routes(app, rt, base_url=base_url)
   
   return app, rt

tests/core/test_db_object.py

@@ -0,0 +1,98 @@
+import shutil
+from dataclasses import dataclass
+
+import pytest
+
+from myfasthtml.core.dbmanager import DbManager, DbObject
+
+
+@pytest.fixture(scope="session")
+def session():
+  return {
+      "user_info": {
+          "id": "test_tenant_id",
+          "email": "test@email.com",
+          "username": "test user",
+          "role": [],
+      }
+  }
+
+
+@pytest.fixture
+def db_manager(session):
+  shutil.rmtree("TestDb", ignore_errors=True)
+  db_manager_instance = DbManager(session, root="TestDb", auto_register=False)
+  
+  yield db_manager_instance
+  
+  shutil.rmtree("TestDb", ignore_errors=True)
+
+
+def simplify(res: dict) -> dict:
+  return {k: v for k, v in res.items() if not k.startswith("_")}
+
+
+def test_i_can_init(session, db_manager):
+  @dataclass
+  class DummyObject(DbObject):
+    def __init__(self, sess: dict):
+      super().__init__(sess, "DummyObject", db_manager)
+    
+    value: str = "hello"
+    number: int = 42
+  
+  DummyObject(session)
+  
+  assert simplify(db_manager.load("DummyObject")) == {"value": "hello", "number": 42}
+
+
+def test_i_can_init_from_db(session, db_manager):
+  @dataclass
+  class DummyObject(DbObject):
+    def __init__(self, sess: dict):
+      super().__init__(sess, "DummyObject", db_manager)
+    
+    value: str = "hello"
+    number: int = 42
+  
+  # insert other values in db
+  db_manager.save("DummyObject", {"value": "other_value", "number": 34})
+  
+  dummy = DummyObject(session)
+  
+  assert dummy.value == "other_value"
+  assert dummy.number == 34
+
+
+def test_db_is_updated_when_attribute_is_modified(session, db_manager):
+  @dataclass
+  class DummyObject(DbObject):
+    def __init__(self, sess: dict):
+      super().__init__(sess, "DummyObject", db_manager)
+    
+    value: str = "hello"
+    number: int = 42
+  
+  dummy = DummyObject(session)
+  dummy.value = "other_value"
+  
+  assert simplify(db_manager.load("DummyObject")) == {"value": "other_value", "number": 42}
+
+
+def test_i_do_not_save_in_db_when_value_is_the_same(session, db_manager):
+  @dataclass
+  class DummyObject(DbObject):
+    def __init__(self, sess: dict):
+      super().__init__(sess, "DummyObject", db_manager)
+    
+    value: str = "hello"
+    number: int = 42
+  
+  dummy = DummyObject(session)
+  dummy.value = "other_value"
+  in_db_1 = db_manager.load("DummyObject")
+  
+  dummy.value = "other_value"
+  in_db_2 = db_manager.load("DummyObject")
+  
+  assert in_db_1["__parent__"] == in_db_2["__parent__"]