python-fasthtml 0.2.2__tar.gz → 0.2.4__tar.gz

{python-fasthtml-0.2.2/python_fasthtml.egg-info → python-fasthtml-0.2.4}/PKG-INFO

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

{python-fasthtml-0.2.2 → python-fasthtml-0.2.4}/fasthtml/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.2"
+__version__ = "0.2.4"
 from .core import *
 from .authmw import *
 from .components import *

{python-fasthtml-0.2.2 → python-fasthtml-0.2.4}/fasthtml/_modidx.py

@@ -53,6 +53,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._mk_list': ('api/core.html#_mk_list', 'fasthtml/core.py'),
                                'fasthtml.core._resp': ('api/core.html#_resp', 'fasthtml/core.py'),
                                'fasthtml.core._send_ws': ('api/core.html#_send_ws', 'fasthtml/core.py'),
+                               'fasthtml.core._sig': ('api/core.html#_sig', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_call': ('api/core.html#_wrap_call', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_ex': ('api/core.html#_wrap_ex', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_req': ('api/core.html#_wrap_req', 'fasthtml/core.py'),

{python-fasthtml-0.2.2 → python-fasthtml-0.2.4}/fasthtml/components.py

@@ -82,7 +82,7 @@ def _fill_item(item, obj):
                 else: attr.pop('checked', '')
             else: attr['value'] = val
         if tag=='textarea': cs=(val,)
-    return FT(tag,cs,attr)
+    return FT(tag,cs,attr,void_=item.void_)
 
 # %% ../nbs/api/01_components.ipynb
 def fill_form(form:FT, obj)->FT:
@@ -120,7 +120,7 @@ def __getattr__(tag):
 
 # %% ../nbs/api/01_components.ipynb
 _re_h2x_attr_key = re.compile(r'^[A-Za-z_-][\w-]*$')
-def html2ft(html):
+def html2ft(html, attr1st=False):
     """Convert HTML to an `ft` expression"""
     rev_map = {'class': 'cls', 'for': 'fr'}
     
@@ -136,13 +136,17 @@ def html2ft(html):
         for key, value in sorted(elm.attrs.items(), key=lambda x: x[0]=='class'):
             if isinstance(value,(tuple,list)): value = " ".join(value)
             key = rev_map.get(key, key)
-            attrs.append(f'{key.replace("-", "_")}={value!r}' if _re_h2x_attr_key.match(key) else f'**{{{key!r}:{value!r}}}')
+            attrs.append(f'{key.replace("-", "_")}={value!r}'
+                         if _re_h2x_attr_key.match(key) else f'**{{{key!r}:{value!r}}}')
         spc = " "*lvl*indent
         onlychild = not cts or (len(cts)==1 and isinstance(cts[0],str))
         j = ', ' if onlychild else f',\n{spc}'
         inner = j.join(filter(None, cs+attrs))
         if onlychild: return f'{tag_name}({inner})'
-        return f'{tag_name}(\n{spc}{inner}\n{" "*(lvl-1)*indent})'
+        if not attr1st or not attrs: return f'{tag_name}(\n{spc}{inner}\n{" "*(lvl-1)*indent})' 
+        inner_cs = j.join(filter(None, cs))
+        inner_attrs = ', '.join(filter(None, attrs))
+        return f'{tag_name}({inner_attrs})(\n{spc}{inner_cs}\n{" "*(lvl-1)*indent})'
 
     soup = BeautifulSoup(html.strip(), 'html.parser')
     for c in soup.find_all(string=risinstance(Comment)): c.extract()

{python-fasthtml-0.2.2 → python-fasthtml-0.2.4}/fasthtml/core.py

@@ -18,7 +18,7 @@ from typing import Optional, get_type_hints, get_args, get_origin, Union, Mappin
 from datetime import datetime
 from dataclasses import dataclass,fields,is_dataclass,MISSING,asdict
 from collections import namedtuple
-from inspect import isfunction,ismethod,signature,Parameter,get_annotations
+from inspect import isfunction,ismethod,Parameter,get_annotations
 from functools import wraps, partialmethod
 from http import cookies
 from copy import copy,deepcopy
@@ -27,6 +27,9 @@ from .starlette import *
 
 empty = Parameter.empty
 
+# %% ../nbs/api/00_core.ipynb
+def _sig(f): return signature_ex(f, True)
+
 # %% ../nbs/api/00_core.ipynb
 def is_typeddict(cls:type)->bool:
     "Check if `cls` is a `TypedDict`"
@@ -226,7 +229,7 @@ def _ws_endp(recv, conn=None, disconn=None, hdrs=None, before=None):
     cls = type('WS_Endp', (WebSocketEndpoint,), {"encoding":"text"})
     
     async def _generic_handler(handler, ws, data=None):
-        wd = _wrap_ws(ws, loads(data) if data else {}, signature(handler).parameters)
+        wd = _wrap_ws(ws, loads(data) if data else {}, _sig(handler).parameters)
         resp = handler(*wd)
         if resp:
             if is_async_callable(handler): resp = await resp
@@ -287,7 +290,7 @@ async def _wrap_call(f, req, params):
 class RouteX(Route):
     def __init__(self, path:str, endpoint, *, methods=None, name=None, include_in_schema=True, middleware=None,
                 hdrs=None, ftrs=None, before=None, after=None, htmlkw=None, **bodykw):
-        self.sig = signature(endpoint)
+        self.sig = _sig(endpoint)
         self.f,self.hdrs,self.ftrs,self.before,self.after,self.htmlkw,self.bodykw = endpoint,hdrs,ftrs,before,after,htmlkw,bodykw
         super().__init__(path, self._endp, methods=methods, name=name, include_in_schema=include_in_schema, middleware=middleware)
 
@@ -301,10 +304,10 @@ class RouteX(Route):
                 if isinstance(b, Beforeware): bf,skip = b.f,b.skip
                 else: bf,skip = b,[]
                 if not any(re.match(r, req.url.path) for r in skip):
-                    resp = await _wrap_call(bf, req, signature(bf).parameters)
+                    resp = await _wrap_call(bf, req, _sig(bf).parameters)
         if not resp: resp = await _wrap_call(self.f, req, self.sig.parameters)
         for a in self.after:
-            _,*wreq = await _wrap_req(req, signature(a).parameters)
+            _,*wreq = await _wrap_req(req, _sig(a).parameters)
             nr = a(resp, *wreq)
             if nr: resp = nr
         return _resp(req, resp, self.sig.return_annotation)

{python-fasthtml-0.2.2 → python-fasthtml-0.2.4}/fasthtml/fastapp.py

@@ -60,12 +60,12 @@ def fast_app(
         **kwargs)->Any:
     h = (picolink,) if pico or (pico is None and default_hdrs) else ()
     if hdrs: h += tuple(hdrs)
-    
+
     app = app_factory(hdrs=h, ftrs=ftrs, before=before, middleware=middleware, live=live, debug=debug, routes=routes, exception_handlers=exception_handlers,
                   on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, default_hdrs=default_hdrs, secret_key=secret_key,
                   session_cookie=session_cookie, max_age=max_age, sess_path=sess_path, same_site=same_site, sess_https_only=sess_https_only,
                   sess_domain=sess_domain, key_fname=key_fname, ws_hdr=ws_hdr, htmlkw=htmlkw, reload_attempts=reload_attempts, reload_interval=reload_interval, **(bodykw or {}))
-    
+
     @app.route("/{fname:path}.{ext:static}")
     async def get(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')
     if not db_file: return app,app.route

{python-fasthtml-0.2.2 → python-fasthtml-0.2.4/python_fasthtml.egg-info}/PKG-INFO

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

{python-fasthtml-0.2.2 → python-fasthtml-0.2.4}/settings.ini

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