Merge branch 'main' into add-pdf-2-reg_re_param

Author: jph00

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 <!-- do not remove -->
 
+## 0.11.0
+
+### Breaking changes
+
+-  FT components now stringify as their id if they have one
+
+### New Features
+
+- Create unique route names for nested functions ([#622](https://github.com/AnswerDotAI/fasthtml/issues/622))
+- Pass `id=True` when creating a component to get an auto unique id ([#622](https://github.com/AnswerDotAI/fasthtml/issues/622))
+- Add `+` to FT components ([#622](https://github.com/AnswerDotAI/fasthtml/issues/622))
+
+
 ## 0.10.3
 
 ### Bugs Squashed

fasthtml/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.10.4"
+__version__ = "0.11.1"
 from .core import *

fasthtml/_modidx.py

@@ -11,7 +11,10 @@
                               '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 @@
                                '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'),

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 @@ def attrmap_x(o):
 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

fasthtml/core.py

@@ -7,8 +7,8 @@
            '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 to(self, **kw): return qp(p, **kw)
         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']

nbs/api/00_core.ipynb

@@ -131,7 +131,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2024, 12, 27, 14, 0)"
+       "datetime.datetime(2025, 1, 5, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -1230,7 +1230,7 @@
     {
      "data": {
       "text/plain": [
-       "'a2597a39-e99d-4460-90b9-2ca21e87bc8f'"
+       "'cc87253c-bfc1-4544-bbc0-58dd8d3291bc'"
       ]
      },
      "execution_count": null,
@@ -1485,6 +1485,53 @@
     "    return _lf()"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d2ecc738",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "def nested_name(f):\n",
+    "    \"Get name of function `f` using '_' to join nested function names\"\n",
+    "    return f.__qualname__.replace('.<locals>.', '_')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c0f13ece",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def f():\n",
+    "    def g(): ...\n",
+    "    return g"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "b218f738",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'f_g'"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "func = f()\n",
+    "nested_name(func)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1495,7 +1542,7 @@
     "#| export\n",
     "@patch\n",
     "def _add_route(self:FastHTML, func, path, methods, name, include_in_schema, body_wrap):\n",
-    "    n,fn,p = name,func.__name__,None if callable(path) else path\n",
+    "    n,fn,p = name,nested_name(func),None if callable(path) else path\n",
     "    if methods: m = [methods] if isinstance(methods,str) else methods\n",
     "    elif fn in all_meths and p is not None: m = [fn]\n",
     "    else: m = ['get','post']\n",
@@ -2478,13 +2525,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-12-27 08:45:58.732664\n"
+      "Set to 2025-01-05 15:35:39.508212\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2024-12-27 08:45:58.732664'"
+       "'Session time: 2025-01-05 15:35:39.508212'"
       ]
      },
      "execution_count": null,
@@ -3005,7 +3052,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 08:45:58.893906'"
+       "'Cookie was set at time 15:35:40.128784'"
       ]
      },
      "execution_count": null,