python-fasthtml 0.10.2__tar.gz → 0.11.0__tar.gz

{python_fasthtml-0.10.2/python_fasthtml.egg-info → python_fasthtml-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.10.2
+Version: 0.11.0
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard and contributors

python_fasthtml-0.11.0/fasthtml/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "0.11.0"
+from .core import *

{python_fasthtml-0.10.2 → python_fasthtml-0.11.0}/fasthtml/_modidx.py

@@ -11,7 +11,10 @@ d = { 'settings': { 'branch': 'main',
                               'fasthtml.cli.railway_deploy': ('api/cli.html#railway_deploy', 'fasthtml/cli.py'),
                               'fasthtml.cli.railway_link': ('api/cli.html#railway_link', 'fasthtml/cli.py')},
             'fasthtml.common': {},
-            'fasthtml.components': { 'fasthtml.components.File': ('api/components.html#file', 'fasthtml/components.py'),
+            'fasthtml.components': { 'fasthtml.components.FT.__add__': ('api/components.html#ft.__add__', 'fasthtml/components.py'),
+                                     'fasthtml.components.FT.__radd__': ('api/components.html#ft.__radd__', 'fasthtml/components.py'),
+                                     'fasthtml.components.FT.__str__': ('api/components.html#ft.__str__', 'fasthtml/components.py'),
+                                     'fasthtml.components.File': ('api/components.html#file', 'fasthtml/components.py'),
                                      'fasthtml.components.__getattr__': ('api/components.html#__getattr__', 'fasthtml/components.py'),
                                      'fasthtml.components._fill_item': ('api/components.html#_fill_item', 'fasthtml/components.py'),
                                      'fasthtml.components.attrmap_x': ('api/components.html#attrmap_x', 'fasthtml/components.py'),
@@ -103,6 +106,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.flat_xt': ('api/core.html#flat_xt', 'fasthtml/core.py'),
                                'fasthtml.core.form2dict': ('api/core.html#form2dict', 'fasthtml/core.py'),
                                'fasthtml.core.get_key': ('api/core.html#get_key', 'fasthtml/core.py'),
+                               'fasthtml.core.nested_name': ('api/core.html#nested_name', 'fasthtml/core.py'),
                                'fasthtml.core.noop_body': ('api/core.html#noop_body', 'fasthtml/core.py'),
                                'fasthtml.core.parse_form': ('api/core.html#parse_form', 'fasthtml/core.py'),
                                'fasthtml.core.parsed_date': ('api/core.html#parsed_date', 'fasthtml/core.py'),

{python_fasthtml-0.10.2 → python_fasthtml-0.11.0}/fasthtml/common.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from .starlette import *
 from fastcore.utils import *
 from fastcore.xml import *
-from sqlite_minutils import Database
+from apswutils import Database
 from fastlite import *
 from .basics import *
 from .pico import *

{python_fasthtml-0.10.2 → python_fasthtml-0.11.0}/fasthtml/components.py

@@ -37,6 +37,18 @@ def show(ft,*rest):
     if rest: ft = (ft,)+rest
     display.display(display.HTML(to_xml(ft)))
 
+# %% ../nbs/api/01_components.ipynb
+@patch
+def __str__(self:FT): return self.id if self.id else object.__str__(self)
+
+# %% ../nbs/api/01_components.ipynb
+@patch
+def __radd__(self:FT, b): return f'{b}{self}'
+
+# %% ../nbs/api/01_components.ipynb
+@patch
+def __add__(self:FT, b): return f'{self}{b}'
+
 # %% ../nbs/api/01_components.ipynb
 named = set('a button form frame iframe img input map meta object param select textarea'.split())
 html_attrs = 'id cls title style accesskey contenteditable dir draggable enterkeyhint hidden inert inputmode lang popover spellcheck tabindex translate'.split()
@@ -69,14 +81,14 @@ fh_cfg['auto_id']=False
 fh_cfg['auto_name']=True
 
 # %% ../nbs/api/01_components.ipynb
-def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, auto_id=None, **kwargs):
+def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, **kwargs):
     ds,c = partition(c, risinstance(dict))
     for d in ds: kwargs = {**kwargs, **d}
     if ft_cls is None: ft_cls = fh_cfg.ft_cls
     if attrmap is None: attrmap=fh_cfg.attrmap
     if valmap  is None: valmap =fh_cfg.valmap
-    if auto_id is None: auto_id = fh_cfg.auto_id
-    if auto_id and not id: id = unqid()
+    if not id and fh_cfg.auto_id: id = True
+    if id and isinstance(id,bool): id = unqid()
     kwargs['id'] = id.id if isinstance(id,FT) else id
     kwargs['cls'],kwargs['title'],kwargs['style'] = cls,title,style
     tag,c,kw = ft(tag, *c, attrmap=attrmap, valmap=valmap, **kwargs).list

{python_fasthtml-0.10.2 → python_fasthtml-0.11.0}/fasthtml/core.py

@@ -7,8 +7,8 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            'charset', 'cors_allow', 'iframe_scr', 'all_meths', 'parsed_date', 'snake2hyphens', 'HtmxHeaders',
            'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'flat_xt', 'Beforeware', 'EventStream',
            'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'noop_body', 'respond', 'Redirect', 'get_key', 'qp',
-           'def_hdrs', 'FastHTML', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param',
-           'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
+           'def_hdrs', 'FastHTML', 'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie',
+           'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types,uvicorn,signal,asyncio,threading,inspect
@@ -597,10 +597,15 @@ def _mk_locfunc(f,p):
         def __str__(self): return p
     return _lf()
 
+# %% ../nbs/api/00_core.ipynb
+def nested_name(f):
+    "Get name of function `f` using '_' to join nested function names"
+    return f.__qualname__.replace('.<locals>.', '_')
+
 # %% ../nbs/api/00_core.ipynb
 @patch
 def _add_route(self:FastHTML, func, path, methods, name, include_in_schema, body_wrap):
-    n,fn,p = name,func.__name__,None if callable(path) else path
+    n,fn,p = name,nested_name(func),None if callable(path) else path
     if methods: m = [methods] if isinstance(methods,str) else methods
     elif fn in all_meths and p is not None: m = [fn]
     else: m = ['get','post']

{python_fasthtml-0.10.2 → python_fasthtml-0.11.0/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.10.2
+Version: 0.11.0
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard and contributors

{python_fasthtml-0.10.2 → python_fasthtml-0.11.0}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.10.2
+version = 0.11.0
 min_python = 3.10
 license = apache2
 requirements = fastcore>=1.7.18 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.9 python-multipart beautifulsoup4

python_fasthtml-0.10.2/fasthtml/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.10.2"
-from .core import *