python-fasthtml 0.1.5__tar.gz → 0.1.7__tar.gz

{python_fasthtml-0.1.5/python_fasthtml.egg-info → python-fasthtml-0.1.7}/PKG-INFO

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

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/fasthtml/__init__.py

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

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/fasthtml/_modidx.py

@@ -10,7 +10,8 @@ d = { 'settings': { 'branch': 'main',
                               'fasthtml.cli.railway_deploy': ('cli.html#railway_deploy', 'fasthtml/cli.py'),
                               'fasthtml.cli.railway_link': ('cli.html#railway_link', 'fasthtml/cli.py')},
             'fasthtml.common': {},
-            'fasthtml.components': { 'fasthtml.components.__getattr__': ('components.html#__getattr__', 'fasthtml/components.py'),
+            'fasthtml.components': { 'fasthtml.components.File': ('components.html#file', 'fasthtml/components.py'),
+                                     'fasthtml.components.__getattr__': ('components.html#__getattr__', 'fasthtml/components.py'),
                                      'fasthtml.components._fill_item': ('components.html#_fill_item', 'fasthtml/components.py'),
                                      'fasthtml.components.fill_dataclass': ('components.html#fill_dataclass', 'fasthtml/components.py'),
                                      'fasthtml.components.fill_form': ('components.html#fill_form', 'fasthtml/components.py'),
@@ -84,6 +85,7 @@ d = { 'settings': { 'branch': 'main',
             'fasthtml.starlette': {},
             'fasthtml.svg': {},
             'fasthtml.toaster': {},
+            'fasthtml.xt': {},
             'fasthtml.xtend': { 'fasthtml.xtend.A': ('xtend.html#a', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.AX': ('xtend.html#ax', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Card': ('xtend.html#card', 'fasthtml/xtend.py'),

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/fasthtml/components.py

@@ -1,9 +1,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_components.ipynb.
 
 # %% auto 0
-__all__ = ['voids', 'named', 'html_attrs', 'hx_attrs', 'show', 'xt_html', 'xt_hx', 'fill_form', 'fill_dataclass', 'find_inputs',
-           'html2xt', 'A', 'Abbr', 'Address', 'Area', 'Article', 'Aside', 'Audio', 'B', 'Base', 'Bdi', 'Bdo',
-           'Blockquote', 'Body', 'Br', 'Button', 'Canvas', 'Caption', 'Cite', 'Code', 'Col', 'Colgroup', 'Data',
+__all__ = ['voids', 'named', 'html_attrs', 'hx_attrs', 'show', 'xt_html', 'xt_hx', 'File', 'fill_form', 'fill_dataclass',
+           'find_inputs', 'html2xt', 'A', 'Abbr', 'Address', 'Area', 'Article', 'Aside', 'Audio', 'B', 'Base', 'Bdi',
+           'Bdo', 'Blockquote', 'Body', 'Br', 'Button', 'Canvas', 'Caption', 'Cite', 'Code', 'Col', 'Colgroup', 'Data',
            'Datalist', 'Dd', 'Del', 'Details', 'Dfn', 'Dialog', 'Div', 'Dl', 'Dt', 'Em', 'Embed', 'Fencedframe',
            'Fieldset', 'Figcaption', 'Figure', 'Footer', 'Form', 'H1', 'Head', 'Header', 'Hgroup', 'Hr', 'Html', 'I',
            'Iframe', 'Img', 'Input', 'Ins', 'Kbd', 'Label', 'Legend', 'Li', 'Link', 'Main', 'Map', 'Mark', 'Menu',
@@ -65,7 +65,12 @@ _all_ = [
     'Td', 'Template', 'Textarea', 'Tfoot', 'Th', 'Thead', 'Time', 'Title', 'Tr', 'Track', 'U', 'Ul', 'Var', 'Video', 'Wbr']
 for o in _all_: _g[o] = partial(xt_hx, o.lower())
 
-# %% ../nbs/01_components.ipynb 13
+# %% ../nbs/01_components.ipynb 9
+def File(fname):
+    "Use the unescaped text in file `fname` directly"
+    return NotStr(Path(fname).read_text())
+
+# %% ../nbs/01_components.ipynb 14
 def _fill_item(item, obj):
     if not isinstance(item,list): return item
     tag,cs,attr = item
@@ -81,19 +86,19 @@ def _fill_item(item, obj):
         if tag=='textarea': cs=(val,)
     return XT(tag,cs,attr)
 
-# %% ../nbs/01_components.ipynb 14
+# %% ../nbs/01_components.ipynb 15
 def fill_form(form:XT, obj)->XT:
     "Fills named items in `form` using attributes in `obj`"
     if not isinstance(obj,dict): obj = asdict(obj)
     return _fill_item(form, obj)
 
-# %% ../nbs/01_components.ipynb 16
+# %% ../nbs/01_components.ipynb 17
 def fill_dataclass(src, dest):
     "Modifies dataclass in-place and returns it"
     for nm,val in asdict(src).items(): setattr(dest, nm, val)
     return dest
 
-# %% ../nbs/01_components.ipynb 18
+# %% ../nbs/01_components.ipynb 19
 def find_inputs(e, tags='input', **kw):
     # Recursively find all elements in `e` with `tags` and attrs matching `kw`
     if not isinstance(e, (list,tuple)): return []
@@ -107,18 +112,18 @@ def find_inputs(e, tags='input', **kw):
     for o in cs: inputs += find_inputs(o, tags, **kw)
     return inputs
 
-# %% ../nbs/01_components.ipynb 22
+# %% ../nbs/01_components.ipynb 23
 def __getattr__(tag):
     if tag.startswith('_') or tag[0].islower(): raise AttributeError
     tag = tag.replace("_", "-")
     def _f(*c, target_id=None, **kwargs): return xt_hx(tag, *c, target_id=target_id, **kwargs)
     return _f
 
-# %% ../nbs/01_components.ipynb 23
+# %% ../nbs/01_components.ipynb 24
 def html2xt(html):
     rev_map = {'class': 'cls', 'for': 'fr'}
     
-    def _parse(elm, lvl=0):
+    def _parse(elm, lvl=0, indent=4):
         if isinstance(elm, str): return repr(elm.strip()) if elm.strip() else ''
         if isinstance(elm, list): return '\n'.join(_parse(o, lvl) for o in elm)
         tag_name = elm.name.capitalize()
@@ -127,14 +132,14 @@ def html2xt(html):
         cs = [repr(c.strip()) if isinstance(c, str) else _parse(c, lvl+1)
               for c in cts if str(c).strip()]
         attrs = []
-        for key, value in elm.attrs.items():
+        for key, value in sorted(elm.attrs.items(), key=lambda x: x[0]=='class'):
             if isinstance(value,(tuple,list)): value = " ".join(value)
             attrs.append(f'{rev_map.get(key, key).replace("-", "_")}={value!r}')
-        spc = " "*lvl*2
+        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)*2})'
+        return f'{tag_name}(\n{spc}{inner}\n{" "*(lvl-1)*indent})'
 
     return _parse(BeautifulSoup(html.strip(), 'html.parser'), 1)

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/fasthtml/components.pyi

@@ -1,4 +1,4 @@
-__all__ = ['voids', 'named', 'html_attrs', 'hx_attrs', 'show', 'xt_html', 'xt_hx', 'fill_form', 'fill_dataclass', 'find_inputs', 'html2xt', 'A', 'Abbr', 'Address', 'Area', 'Article', 'Aside', 'Audio', 'B', 'Base', 'Bdi', 'Bdo', 'Blockquote', 'Body', 'Br', 'Button', 'Canvas', 'Caption', 'Cite', 'Code', 'Col', 'Colgroup', 'Data', 'Datalist', 'Dd', 'Del', 'Details', 'Dfn', 'Dialog', 'Div', 'Dl', 'Dt', 'Em', 'Embed', 'Fencedframe', 'Fieldset', 'Figcaption', 'Figure', 'Footer', 'Form', 'H1', 'Head', 'Header', 'Hgroup', 'Hr', 'Html', 'I', 'Iframe', 'Img', 'Input', 'Ins', 'Kbd', 'Label', 'Legend', 'Li', 'Link', 'Main', 'Map', 'Mark', 'Menu', 'Meta', 'Meter', 'Nav', 'Noscript', 'Object', 'Ol', 'Optgroup', 'Option', 'Output', 'P', 'Picture', 'PortalExperimental', 'Pre', 'Progress', 'Q', 'Rp', 'Rt', 'Ruby', 'S', 'Samp', 'Script', 'Search', 'Section', 'Select', 'Slot', 'Small', 'Source', 'Span', 'Strong', 'Style', 'Sub', 'Summary', 'Sup', 'Table', 'Tbody', 'Td', 'Template', 'Textarea', 'Tfoot', 'Th', 'Thead', 'Time', 'Title', 'Tr', 'Track', 'U', 'Ul', 'Var', 'Video', 'Wbr']
+__all__ = ['voids', 'named', 'html_attrs', 'hx_attrs', 'show', 'xt_html', 'xt_hx', 'File', 'fill_form', 'fill_dataclass', 'find_inputs', 'html2xt', 'A', 'Abbr', 'Address', 'Area', 'Article', 'Aside', 'Audio', 'B', 'Base', 'Bdi', 'Bdo', 'Blockquote', 'Body', 'Br', 'Button', 'Canvas', 'Caption', 'Cite', 'Code', 'Col', 'Colgroup', 'Data', 'Datalist', 'Dd', 'Del', 'Details', 'Dfn', 'Dialog', 'Div', 'Dl', 'Dt', 'Em', 'Embed', 'Fencedframe', 'Fieldset', 'Figcaption', 'Figure', 'Footer', 'Form', 'H1', 'Head', 'Header', 'Hgroup', 'Hr', 'Html', 'I', 'Iframe', 'Img', 'Input', 'Ins', 'Kbd', 'Label', 'Legend', 'Li', 'Link', 'Main', 'Map', 'Mark', 'Menu', 'Meta', 'Meter', 'Nav', 'Noscript', 'Object', 'Ol', 'Optgroup', 'Option', 'Output', 'P', 'Picture', 'PortalExperimental', 'Pre', 'Progress', 'Q', 'Rp', 'Rt', 'Ruby', 'S', 'Samp', 'Script', 'Search', 'Section', 'Select', 'Slot', 'Small', 'Source', 'Span', 'Strong', 'Style', 'Sub', 'Summary', 'Sup', 'Table', 'Tbody', 'Td', 'Template', 'Textarea', 'Tfoot', 'Th', 'Thead', 'Time', 'Title', 'Tr', 'Track', 'U', 'Ul', 'Var', 'Video', 'Wbr']
 from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING
 from bs4 import BeautifulSoup
 from fastcore.utils import *
@@ -29,6 +29,10 @@ _all_ = ['A', 'Abbr', 'Address', 'Area', 'Article', 'Aside', 'Audio', 'B', 'Base
 for o in _all_:
     _g[o] = partial(xt_hx, o.lower())
 
+def File(fname):
+    """Use the unescaped text in file `fname` directly"""
+    ...
+
 def _fill_item(item, obj):
     ...
 

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/fasthtml/core.py

@@ -127,7 +127,7 @@ async def _from_body(req, p):
     anno = p.annotation
     # Get the fields and types of type `anno`, if available
     d = _annotations(anno)
-    cargs = {k:_form_arg(k, v, d) for k,v in form2dict(form).items()}
+    cargs = {k:_form_arg(k, v, d) for k,v in form2dict(form).items() if not d or k in d}
     return anno(**cargs)
 
 # %% ../nbs/00_core.ipynb 37
@@ -150,15 +150,17 @@ async def _find_p(req, arg:str, p:Parameter):
         return None
     # Look through path, cookies, headers, session, query, and body in that order
     res = req.path_params.get(arg, None)
-    if res is empty or res is None: res = req.cookies.get(arg, None)
-    if res is empty or res is None: res = req.headers.get(snake2hyphens(arg), None)
-    if res is empty or res is None: res = nested_idx(req.scope, 'session', arg) or None
-    if res is empty or res is None: res = req.query_params.get(arg, None)
-    if res is empty or res is None:
+    if res in (empty,None): res = req.cookies.get(arg, None)
+    if res in (empty,None): res = req.headers.get(snake2hyphens(arg), None)
+    if res in (empty,None): res = nested_idx(req.scope, 'session', arg) or None
+    if res in (empty,None): res = req.query_params.get(arg, None)
+    if res in (empty,None):
         frm = await req.form()
         res = _formitem(frm, arg)
-    # Use default param if needed
-    if res is empty or res is None: res = p.default
+    # Raise 400 error if the param does not include a default
+    if (res in (empty,None)) and p.default is empty: raise HTTPException(400, f"Missing required field: {arg}")
+    # If we have a default, return that if we have no value
+    if res in (empty,None): res = p.default
     # We can cast str and list[str] to types; otherwise just return what we have
     if not isinstance(res, (list,str)) or anno is empty: return res
     anno = _fix_anno(anno)

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/fasthtml/fastapp.py

@@ -14,14 +14,15 @@ def get_tbl(dt, nm, schema):
 
 def fast_app(db=None, render=None, hdrs=None, tbls=None, before=None, middleware=None, live=False, debug=False, routes=None, exception_handlers=None,
              on_startup=None, on_shutdown=None, lifespan=None, default_hdrs=True, secret_key=None, session_cookie='session_', max_age=365*24*3600,
-             sess_path='/', same_site='lax', sess_https_only=False, sess_domain=None, key_fname='.sesskey', **kwargs):
-    h = (picolink,)
+             pico=None, sess_path='/', same_site='lax', sess_https_only=False, sess_domain=None, key_fname='.sesskey', bodykw=None, **kwargs):
+
+    h = (picolink,) if pico or (pico is None and default_hdrs) else ()
     if hdrs: h += tuple(hdrs)
     app_cls = FastHTMLWithLiveReload if live else FastHTML
     app = app_cls(hdrs=h, before=before, middleware=middleware, 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)
+                  sess_domain=sess_domain, key_fname=key_fname, **(bodykw or {}))
     @app.route("/{fname:path}.{ext:static}")
     async def get(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')
     if not db: return app,app.route

python-fasthtml-0.1.7/fasthtml/xt.py

@@ -0,0 +1,4 @@
+from fastcore.xml import *
+from .components import *
+from .xtend import *
+

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/fasthtml/xtend.py

@@ -148,7 +148,7 @@ def loose_format(s, **kw):
 
 # %% ../nbs/02_xtend.ipynb 34
 def ScriptX(fname, type=None, _async=None, defer=None, charset=None, crossorigin=None, integrity=None, **kw):
-    "Create a Script from the text of a file"
+    "A `script` element with contents read from `fname`"
     attrs = ['src', 'type', 'async', 'defer', 'charset', 'crossorigin', 'integrity', 'nomodule']
     scr_kw = {k:kw.pop(k) for k in attrs if k in kw}
     s = loose_format(Path(fname).read_text(), **kw)
@@ -156,6 +156,7 @@ def ScriptX(fname, type=None, _async=None, defer=None, charset=None, crossorigin
 
 # %% ../nbs/02_xtend.ipynb 35
 def replace_css_vars(css, pre='tpl', **kwargs):
+    "Replace `var(--)` CSS variables with `kwargs` if name prefix matches `pre`"
     def replace_var(m):
         var_name = m.group(1).replace('-', '_')
         return kwargs.get(var_name, m.group(0))
@@ -163,6 +164,7 @@ def replace_css_vars(css, pre='tpl', **kwargs):
 
 # %% ../nbs/02_xtend.ipynb 36
 def StyleX(fname, **kw):
+    "A `style` element with contents read from `fname` and variables replaced from `kw`"
     s = Path(fname).read_text()
     attrs = ['type', 'media', 'scoped', 'title', 'nonce', 'integrity', 'crossorigin']
     sty_kw = {k:kw.pop(k) for k in attrs if k in kw}

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/fasthtml/xtend.pyi

@@ -82,13 +82,15 @@ def loose_format(s, **kw):
     ...
 
 def ScriptX(fname, type=None, _async=None, defer=None, charset=None, crossorigin=None, integrity=None, **kw):
-    """Create a Script from the text of a file"""
+    """A `script` element with contents read from `fname`"""
     ...
 
 def replace_css_vars(css, pre='tpl', **kwargs):
+    """Replace `var(--)` CSS variables with `kwargs` if name prefix matches `pre`"""
     ...
 
 def StyleX(fname, **kw):
+    """A `style` element with contents read from `fname` and variables replaced from `kw`"""
     ...
 
 def run_js(js, id=None, **kw):

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7/python_fasthtml.egg-info}/PKG-INFO

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

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/python_fasthtml.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ fasthtml/oauth.py
 fasthtml/starlette.py
 fasthtml/svg.py
 fasthtml/toaster.py
+fasthtml/xt.py
 fasthtml/xtend.py
 fasthtml/xtend.pyi
 python_fasthtml.egg-info/PKG-INFO

{python_fasthtml-0.1.5 → python-fasthtml-0.1.7}/settings.ini

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