fh-matui 0.9.8__tar.gz → 0.9.10__tar.gz

{fh_matui-0.9.8/fh_matui.egg-info → fh_matui-0.9.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fh-matui
-Version: 0.9.8
+Version: 0.9.10
 Summary: material-ui for fasthtml
 Home-page: https://github.com/abhisheksreesaila/fh-matui
 Author: abhishek sreesaila

fh_matui-0.9.10/fh_matui/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.9.9"

{fh_matui-0.9.8 → fh_matui-0.9.10}/fh_matui/components.py

@@ -331,9 +331,14 @@ def NavBar(*children, brand=None, sticky=False, cls='', **kwargs):
     return Nav(*children, cls=f"padding {nav_cls}", **kwargs)
 
 # %% ../nbs/02_components.ipynb 35
-def Modal(*c, id=None, footer=None, active=False, overlay=True, cls=(), **kwargs):
-    """BeerCSS modal dialog with optional overlay and footer."""
+def Modal(*c, id=None, footer=None, active=False, overlay='default', position=None, cls=(), **kwargs):
+    """BeerCSS modal dialog with position and overlay options."""
     modal_cls = normalize_tokens(cls)
+    
+    # Add position class if specified
+    if position in ['left', 'right', 'top', 'bottom']:
+        modal_cls.append(position)
+    
     if active: 
         modal_cls.append('active')
     
@@ -349,9 +354,22 @@ def Modal(*c, id=None, footer=None, active=False, overlay=True, cls=(), **kwargs
     # Create the dialog
     dialog = Dialog(*children, id=id, cls=cls_str, **kwargs)
     
-    if overlay:
-        # Return overlay + dialog as separate elements that BeerCSS can manage
-        overlay_cls = "overlay blur"
+    # Handle overlay
+    if overlay and overlay not in [False, None]:
+        overlay_classes = ['overlay']
+        
+        # Map overlay parameter to BeerCSS classes
+        if overlay == 'blur':
+            overlay_classes.append('blur')
+        elif overlay == 'small-blur':
+            overlay_classes.append('small-blur')
+        elif overlay == 'medium-blur':
+            overlay_classes.append('medium-blur')
+        elif overlay == 'large-blur':
+            overlay_classes.append('large-blur')
+        # 'default' means plain overlay with no blur class
+        
+        overlay_cls = ' '.join(overlay_classes)
         if active:
             overlay_cls += " active"
             
@@ -717,15 +735,14 @@ def Toolbar(*items, cls='', elevate='large', fill=True, **kwargs):
     if cls: classes.append(cls)
     return Nav(*items, cls=' '.join(classes), **kwargs)
 
-# %% ../nbs/02_components.ipynb 92
+# %% ../nbs/02_components.ipynb 93
 #| code-fold: true
-def Toast(*c, cls='', position='top', variant='', action=None, dur=5.0, active=False, **kwargs):
-    """BeerCSS snackbar/toast notification with position and variant options."""
+def Toast(*c, cls='', position='top', variant='', action=None, active=False, dur=None, **kwargs):
+    """BeerCSS snackbar/toast notification with position ('top' or 'bottom') and variant options."""
     classes = ['snackbar']
     if variant: classes.append(variant)
-    if position:
-        position_map = {'top': 'bottom', 'bottom': 'top', 'left': 'right', 'right': 'left'}
-        classes.append(position_map.get(position, position))
+    if position in ['top', 'bottom']:
+        classes.append(position)
     if active: classes.append('active')
     if cls: classes.append(cls)
     
@@ -735,13 +752,34 @@ def Toast(*c, cls='', position='top', variant='', action=None, dur=5.0, active=F
         if isinstance(action, str): content.append(A(action, cls='inverse-link'))
         else: content.append(action)
     else: content.extend(c)
-    return Div(*content, cls=' '.join(classes), **kwargs)
+    
+    snackbar = Div(*content, cls=' '.join(classes), **kwargs)
+    
+    # If duration is specified and there's an id, generate auto-hide script
+    if dur and 'id' in kwargs:
+        timeout_ms = int(dur * 1000)
+        toast_id = kwargs['id']
+        # Wait for Beer CSS module to load before calling ui()
+        script = Script(f"""
+window.addEventListener('load', function() {{
+    function showToast() {{
+        if (typeof ui !== 'undefined') {{
+            try {{ ui('#{toast_id}', {timeout_ms}); }}
+            catch (e) {{ console.error('Toast error:', e.message); }}
+        }}
+    }}
+    setTimeout(showToast, 50);
+}});
+""")
+        return (snackbar, script)
+    
+    return snackbar
 
 def Snackbar(*c, **kwargs):
     """Alias for Toast component."""
     return Toast(*c, **kwargs)
 
-# %% ../nbs/02_components.ipynb 94
+# %% ../nbs/02_components.ipynb 96
 #| code-fold: true
 class ContainerT(VEnum):
     """Container size options (BeerCSS). Most alias to 'responsive'; use 'expand' for full-width."""
@@ -752,7 +790,7 @@ class ContainerT(VEnum):
     xl = 'responsive'
     expand = 'responsive max'
 
-# %% ../nbs/02_components.ipynb 96
+# %% ../nbs/02_components.ipynb 98
 #| code-fold: true
 def _get_form_config(col: dict) -> dict:
     """Extract form config from column, with sensible defaults."""
@@ -828,7 +866,7 @@ def FormField(
             **attrs
         )
 
-# %% ../nbs/02_components.ipynb 98
+# %% ../nbs/02_components.ipynb 100
 #| code-fold: true
 from typing import Callable, Any
 
@@ -947,7 +985,7 @@ def FormModal(
         cls="large-width"
     )
 
-# %% ../nbs/02_components.ipynb 100
+# %% ../nbs/02_components.ipynb 102
 #| code-fold: true
 def NavContainer(*li, title=None, brand=None, position='left', close_button=True, cls='active', id=None, **kwargs):
     """Slide-out navigation drawer with header and close button."""
@@ -1004,7 +1042,7 @@ def BottomNav(*c, cls='bottom', size='s', **kwargs):
     final_cls = f"{cls} {size_cls}".strip()
     return Nav(*c, cls=final_cls, **kwargs)
 
-# %% ../nbs/02_components.ipynb 103
+# %% ../nbs/02_components.ipynb 105
 #| code-fold: true
 def NavSideBarHeader(*c, cls='', **kwargs):
     """Sidebar header section for menu buttons and branding."""
@@ -1024,7 +1062,7 @@ def NavSideBarContainer(*children, position='left', size='m', cls='', active=Fal
     nav_cls = f"{base_cls} {cls}".strip()
     return Nav(*children, cls=nav_cls, **kwargs)
 
-# %% ../nbs/02_components.ipynb 105
+# %% ../nbs/02_components.ipynb 107
 #| code-fold: true
 def Layout(*content, sidebar=None, sidebar_links=None, nav_bar=None, container_size=ContainerT.expand,
            main_bg='surface', sidebar_id='app-sidebar', cls='', **kwargs):
@@ -1069,7 +1107,7 @@ def Layout(*content, sidebar=None, sidebar_links=None, nav_bar=None, container_s
     final_cls = f"surface-container {cls}".strip() if cls else "surface-container"
     return Div(*layout_children, cls=final_cls, **kwargs)
 
-# %% ../nbs/02_components.ipynb 109
+# %% ../nbs/02_components.ipynb 111
 #| code-fold: true
 class TextT(VEnum):
     """Text styles using BeerCSS typography classes."""
@@ -1101,7 +1139,7 @@ class TextPresets(VEnum):
     primary_link = 'link primary-text'
     muted_link = 'link secondary-text'
 
-# %% ../nbs/02_components.ipynb 110
+# %% ../nbs/02_components.ipynb 112
 #| code-fold: true
 def CodeSpan(*c, cls=(), **kwargs):
     """Inline code snippet."""
@@ -1157,7 +1195,7 @@ def Sup(*c, cls=(), **kwargs):
     cls_str = stringify(cls) if cls else None
     return fc.Sup(*c, cls=cls_str, **kwargs) if cls_str else fc.Sup(*c, **kwargs)
 
-# %% ../nbs/02_components.ipynb 112
+# %% ../nbs/02_components.ipynb 114
 #| code-fold: true
 def FAQItem(question: str, answer: str, question_cls: str = '', answer_cls: str = ''):
     """Collapsible FAQ item using details/summary.
@@ -1175,7 +1213,7 @@ def FAQItem(question: str, answer: str, question_cls: str = '', answer_cls: str
         Summary(Article(Nav(Div(question, cls=f"max bold {question_cls}".strip()), I("expand_more")), cls="round surface-variant border no-elevate")),
         Article(P(answer, cls=f"secondary-text {answer_cls}".strip()), cls="round border padding"))
 
-# %% ../nbs/02_components.ipynb 116
+# %% ../nbs/02_components.ipynb 118
 #| code-fold: true
 def CookiesBanner(message='We use cookies to enhance your experience. By continuing to visit this site you agree to our use of cookies.',
                   accept_text='Accept', decline_text='Decline', settings_text=None, policy_link='/cookies', policy_text='Learn more',

{fh_matui-0.9.8 → fh_matui-0.9.10}/fh_matui/datatable.py

@@ -22,10 +22,50 @@ from .components import *
 from math import ceil
 from urllib.parse import urlencode
 from typing import Callable, Optional, Any
+from dataclasses import asdict, is_dataclass
 
 # Default page size options
 PAGE_SIZES = [5, 10, 20, 50]
 
+
+def _to_dict(obj: Any) -> dict:
+    """
+    Convert any record type to dict.
+    
+    Handles:
+    - dict -> pass through
+    - dataclass -> asdict()
+    - namedtuple -> _asdict()
+    - Pydantic model -> model_dump() or dict()
+    - ORM/object with __dict__ -> vars() filtered
+    - dict-like with keys -> dict()
+    - None -> {}
+    """
+    if obj is None:
+        return {}
+    if isinstance(obj, dict):
+        return obj
+    # Dataclass
+    if is_dataclass(obj) and not isinstance(obj, type):
+        return asdict(obj)
+    # Namedtuple
+    if hasattr(obj, '_asdict'):
+        return obj._asdict()
+    # Pydantic v2
+    if hasattr(obj, 'model_dump'):
+        return obj.model_dump()
+    # Pydantic v1
+    if hasattr(obj, 'dict') and callable(getattr(obj, 'dict')):
+        return obj.dict()
+    # ORM-style objects with __dict__
+    if hasattr(obj, "__dict__"):
+        return {k: v for k, v in obj.__dict__.items() if not k.startswith("_")}
+    # Dict-like
+    if hasattr(obj, 'keys'):
+        return dict(obj)
+    return {}
+
+
 def _safe_int(value, default):
     """Safely convert to positive int or return default."""
     try:
@@ -83,6 +123,7 @@ def _action_menu(
     row: dict,
     row_id: Any,
     crud_ops: dict,
+    crud_enabled: dict,
     base_route: str,
     search: str,
     page: int,
@@ -113,14 +154,14 @@ def _action_menu(
         )
     
     items = []
-    # View is conditional (read operation)
-    if crud_ops.get("view", True):
+    # View is conditional (read operation) - use crud_enabled for callable support
+    if crud_enabled.get("view", True):
         items.append(action_item("View", "visibility", "view"))
     
-    if crud_ops.get("update", False):
+    if crud_enabled.get("update", False):
         items.append(action_item("Edit", "edit", "edit"))
     
-    if crud_ops.get("delete", False):
+    if crud_enabled.get("delete", False):
         items.append(action_item("Delete", "delete", "delete", confirm="Delete this record?"))
     
     # Custom actions
@@ -157,6 +198,7 @@ def DataTable(
     search: str = '',
     columns: list[dict] = None,
     crud_ops: dict = None,
+    crud_enabled: dict = None,
     base_route: str = '',
     row_id_field: str = 'id',
     title: str = 'Records',
@@ -169,10 +211,14 @@ def DataTable(
     "Generic data table with server-side pagination, search, and row actions."
     # Defaults
     crud_ops = crud_ops or {"create": False, "update": False, "delete": False}
+    crud_enabled = crud_enabled or {k: bool(v) for k, v in crud_ops.items() if k != 'custom_actions'}
     page_sizes = page_sizes or PAGE_SIZES
     container_id = container_id or f"crud-table-{base_route.replace('/', '-').strip('-')}"
     feedback_id = f"{container_id}-feedback"
     
+    # Auto-convert data records to dicts (supports dataclass, namedtuple, Pydantic, ORM)
+    data = [_to_dict(r) for r in data]
+    
     # Auto-generate columns from first data row if not provided
     if columns is None and data:
         columns = [{"key": k, "label": k.replace("_", " ").title()} for k in data[0].keys()]
@@ -184,7 +230,6 @@ def DataTable(
     start_index = (page - 1) * page_size + 1 if total else 0
     end_index = min(start_index + page_size - 1, total) if total else 0
     summary = f"{start_index}-{end_index} of {total} records" if total else "No matching records"
-    
     base_query = urlencode({"search": search, "page_size": page_size})
     
     # Build table header keys and labels
@@ -212,6 +257,7 @@ def DataTable(
             row=row,
             row_id=row_id,
             crud_ops=crud_ops,
+            crud_enabled=crud_enabled,
             base_route=base_route,
             search=search,
             page=page,
@@ -221,9 +267,9 @@ def DataTable(
         )
         table_rows.append(row_dict)
     
-    # Create button
+    # Create button - use crud_enabled for callable support
     create_button = None
-    if crud_ops.get("create", False):
+    if crud_enabled.get("create", False):
         query = urlencode({"action": "create", "search": search, "page": page, "page_size": page_size})
         create_button = Button(
             Icon("add"),
@@ -279,31 +325,46 @@ def DataTable(
             cls="field prefix"
         ),
         Input(type="hidden", name="page_size", value=page_size),
-        cls="row"
+        cls="max"
     )
     
+    # Build table with proper Thead/Tbody structure
+    data_table = Table(
+        Thead(Tr(*[Th(label) for label in header_labels])),
+        Tbody(*[
+            Tr(*[Td(row_dict.get(key, '')) for key in header_keys])
+            for row_dict in table_rows
+        ]),
+        cls="border"
+    ) if data else Div(empty_message, cls="center-align padding")
+    
+    # Footer section with page size selector and pagination
+    footer = None
+    if total > 0:
+        page_info_row = Div(
+            _page_size_select(page_size, search, base_route, container_id, page_sizes),
+            Span(summary, cls="small-text grey-text"),
+            cls="row"
+        )
+        if pagination:
+            # Two-row layout: info on top, centered pagination below
+            footer = Div(
+                page_info_row,
+                Div(pagination, cls="row center-align"),
+            )
+        else:
+            # Single row when no pagination needed
+            footer = page_info_row
+    
     return Article(
         Div(id=feedback_id),  # Feedback container for modals/toasts
         Div(
             search_form,
             create_button,
-            cls="grid"
+            cls="row"
         ),
-        Table(
-            *table_rows,
-            headers=header_labels,
-            keys=header_keys,
-            cls="border"
-        ) if data else Div(empty_message, cls="center-align padding"),
-        Div(
-            Div(
-                _page_size_select(page_size, search, base_route, container_id, page_sizes),
-                Span(summary, cls="small-text grey-text"),
-                cls="row"
-            ),
-            pagination,
-            cls="grid"
-        ) if total > 0 else None,
+        data_table,
+        footer,
         id=container_id,
         hx_trigger=f"{container_id}-refresh from:body",
         hx_get=f"{base_route}?{base_query}",
@@ -405,6 +466,7 @@ class CrudContext:
     tbl: Optional[Any] = None        # request.state.tables[table_name] (if available)
     record: dict = None              # Form data dict
     record_id: Optional[Any] = None  # ID for update/delete (None for create)
+    feedback_id: Optional[str] = None  # Target div ID for HTMX swap (for override handlers)
 
 # %% ../nbs/05_datatable.ipynb 13
 from typing import Callable, Optional, Any, Union
@@ -526,6 +588,20 @@ class DataTableResource:
                     if not callable(action["handler"]):
                         raise ValueError(f"Custom action '{action['name']}' handler must be callable")
         
+        # Parse crud_ops for callable overrides vs boolean enable/disable
+        # Callable = override handler (action is enabled)
+        # True = use default handler (action is enabled)
+        # False = action is disabled
+        self.crud_overrides = {}
+        self.crud_enabled = {}
+        for action_name in ['create', 'update', 'delete', 'view']:
+            value = self.crud_ops.get(action_name, action_name == 'view')  # view defaults to True
+            if callable(value):
+                self.crud_overrides[action_name] = value
+                self.crud_enabled[action_name] = True  # Callable means action is enabled
+            else:
+                self.crud_enabled[action_name] = bool(value)
+        
         # CRUD hooks
         self.on_create_hook = on_create
         self.on_update_hook = on_update
@@ -555,7 +631,7 @@ class DataTableResource:
             return await hook(ctx)
         return hook(ctx)
     
-    def _build_context(self, req, record: dict = None, record_id: Any = None) -> CrudContext:
+    def _build_context(self, req, record: dict = None, record_id: Any = None, include_feedback_id: bool = False) -> CrudContext:
         """🏗️ Build CrudContext from request."""
         user = None
         db = None
@@ -581,7 +657,8 @@ class DataTableResource:
             db=db,
             tbl=tbl,
             record=record or {},
-            record_id=record_id
+            record_id=record_id,
+            feedback_id=self.feedback_id if include_feedback_id else None
         )
     
     def _wrap_response(self, content, req):
@@ -599,8 +676,8 @@ class DataTableResource:
             return self._handle_table(req)
         
         @rt(f"{self.base_route}/action")
-        def _action_handler(req):
-            return self._handle_action(req)
+        async def _action_handler(req):
+            return await self._handle_action(req)
         
         @rt(f"{self.base_route}/save")
         async def _save_handler(req):
@@ -656,6 +733,7 @@ class DataTableResource:
             search=search,
             columns=self.columns,
             crud_ops=self.crud_ops,
+            crud_enabled=self.crud_enabled,
             base_route=self.base_route,
             row_id_field=self.row_id_field,
             title=self.title,
@@ -683,8 +761,8 @@ class DataTableResource:
         # Wrap with layout if full-page request
         return self._wrap_response(content, req)
     
-    def _handle_action(self, req):
-        """Handle action route (view/edit/create/delete)."""
+    async def _handle_action(self, req):
+        """Handle action route (view/edit/create/delete) with override support."""
         params = getattr(req, "query_params", {})
         getter = params.get if hasattr(params, "get") else (lambda k, d=None: params[k] if k in params else d)
         
@@ -707,9 +785,47 @@ class DataTableResource:
         cancel_url = f"{self.base_route}/action?dismiss=1"
         save_url = f"{self.base_route}/save?{return_params}"
         
-        # Handle CREATE
+        # Get record for actions that need it (not create)
+        record = None
+        if record_id:
+            raw_record = self.get_by_id(req, record_id)
+            record = _to_dict(raw_record) if raw_record else None
+        
+        # Map action names to internal action names for overrides
+        action_map = {'edit': 'update'}  # 'edit' action uses 'update' override
+        override_key = action_map.get(action, action)
+        
+        # Check for CRUD override FIRST (callable in crud_ops)
+        if override_key in self.crud_overrides:
+            try:
+                ctx = self._build_context(req, record=record, record_id=record_id, include_feedback_id=True)
+                handler = self.crud_overrides[override_key]
+                
+                # Execute handler (sync or async)
+                if asyncio.iscoroutinefunction(handler):
+                    result = await handler(ctx)
+                else:
+                    result = handler(ctx)
+                
+                # Handle return value:
+                # - FT component: Return directly (full control to user)
+                # - str: Wrap in success toast
+                # - None: Default success message
+                if result is None:
+                    return self._success_toast(f"{action.title()} completed successfully.")
+                elif isinstance(result, str):
+                    return self._success_toast(result)
+                else:
+                    # FT component - wrap in feedback div
+                    return Div(result, id=self.feedback_id)
+                    
+            except Exception as e:
+                logger.error(f"CRUD override '{action}' failed: {e}", exc_info=True)
+                return self._error_toast(f"{action.title()} failed: {str(e)}")
+        
+        # Handle CREATE (default behavior)
         if action == "create":
-            if not self.crud_ops.get("create"):
+            if not self.crud_enabled.get("create"):
                 return self._error_toast("Create operation not enabled.")
             
             modal = FormModal(
@@ -725,16 +841,11 @@ class DataTableResource:
             )
             return self._wrap_modal(modal)
         
-        # Get record for view/edit/delete
-        record = None
-        if record_id:
-            raw_record = self.get_by_id(req, record_id)
-            record = _to_dict(raw_record) if raw_record else None
-        
+        # Record required for remaining actions
         if not record:
             return self._error_toast("Record not found.")
         
-        # Handle VIEW
+        # Handle VIEW (default behavior)
         if action == "view":
             modal = FormModal(
                 columns=self.columns,
@@ -747,9 +858,9 @@ class DataTableResource:
             )
             return self._wrap_modal(modal)
         
-        # Handle EDIT
+        # Handle EDIT (default behavior)
         if action == "edit":
-            if not self.crud_ops.get("update"):
+            if not self.crud_enabled.get("update"):
                 return self._error_toast("Update operation not enabled.")
             
             modal = FormModal(
@@ -765,9 +876,9 @@ class DataTableResource:
             )
             return self._wrap_modal(modal)
         
-        # Handle DELETE
+        # Handle DELETE (default behavior)
         if action == "delete":
-            if not self.crud_ops.get("delete"):
+            if not self.crud_enabled.get("delete"):
                 return self._error_toast("Delete operation not enabled.")
             
             try:
@@ -775,11 +886,7 @@ class DataTableResource:
                 
                 # Use on_delete hook if provided
                 if self.on_delete_hook:
-                    if asyncio.iscoroutinefunction(self.on_delete_hook):
-                        loop = asyncio.get_event_loop()
-                        loop.run_until_complete(self.on_delete_hook(ctx))
-                    else:
-                        self.on_delete_hook(ctx)
+                    await self._call_hook(self.on_delete_hook, ctx)
                 else:
                     # Default: use delete_fn
                     self.delete_fn(req, record_id)
@@ -794,19 +901,22 @@ class DataTableResource:
         for custom_action in custom_actions:
             if action == custom_action["name"]:
                 try:
-                    ctx = self._build_context(req, record=record, record_id=record_id)
+                    ctx = self._build_context(req, record=record, record_id=record_id, include_feedback_id=True)
                     handler = custom_action["handler"]
                     
                     # Execute handler (sync or async)
                     if asyncio.iscoroutinefunction(handler):
-                        loop = asyncio.get_event_loop()
-                        result = loop.run_until_complete(handler(ctx))
+                        result = await handler(ctx)
                     else:
                         result = handler(ctx)
                     
-                    # Return success toast with refresh trigger
-                    message = result if isinstance(result, str) else f"{custom_action['label']} completed successfully."
-                    return self._success_toast(message)
+                    # Handle return value same as overrides
+                    if result is None:
+                        return self._success_toast(f"{custom_action['label']} completed successfully.")
+                    elif isinstance(result, str):
+                        return self._success_toast(result)
+                    else:
+                        return Div(result, id=self.feedback_id)
                     
                 except Exception as e:
                     logger.error(f"Custom action '{action}' failed: {e}", exc_info=True)

{fh_matui-0.9.8 → fh_matui-0.9.10/fh_matui.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fh-matui
-Version: 0.9.8
+Version: 0.9.10
 Summary: material-ui for fasthtml
 Home-page: https://github.com/abhisheksreesaila/fh-matui
 Author: abhishek sreesaila

{fh_matui-0.9.8 → fh_matui-0.9.10}/settings.ini

@@ -5,7 +5,7 @@
 ### Python library ###
 repo =  fh-matui
 lib_name = %(repo)s
-version = 0.9.8
+version = 0.9.10
 min_python = 3.9
 license = apache2
 black_formatting = False

fh_matui-0.9.8/fh_matui/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.9.7"