python-fasthtml 0.3.0__tar.gz → 0.3.2__tar.gz

{python-fasthtml-0.3.0/python_fasthtml.egg-info → python-fasthtml-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.3.0
+Version: 0.3.2
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.6.4
+Requires-Dist: fastcore>=1.6.6
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

{python-fasthtml-0.3.0 → python-fasthtml-0.3.2}/fasthtml/__init__.py

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

{python-fasthtml-0.3.0 → python-fasthtml-0.3.2}/fasthtml/_modidx.py

@@ -111,6 +111,7 @@ d = { 'settings': { 'branch': 'main',
                                 'fasthtml.xtend.Hidden': ('api/xtend.html#hidden', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Me': ('api/xtend.html#me', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.On': ('api/xtend.html#on', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.Prev': ('api/xtend.html#prev', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Script': ('api/xtend.html#script', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.ScriptX': ('api/xtend.html#scriptx', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Search': ('api/xtend.html#search', 'fasthtml/xtend.py'),

{python-fasthtml-0.3.0 → python-fasthtml-0.3.2}/fasthtml/components.py

@@ -20,6 +20,7 @@ from bs4 import BeautifulSoup, Comment
 from fastcore.utils import *
 from fastcore.xml import *
 from fastcore.meta import use_kwargs, delegates
+from .core import fh_cfg
 
 import types
 
@@ -28,6 +29,7 @@ except ImportError: display=None
 
 # %% ../nbs/api/01_components.ipynb
 def show(ft,*rest):
+    "Renders FT Components into HTML within a Jupyter notebook."
     if rest: ft = (ft,)+rest
     return display.HTML(to_xml(ft))
 
@@ -38,17 +40,20 @@ hx_attrs = 'get post put delete patch trigger target swap include select indicat
 hx_attrs = html_attrs + [f'hx_{o}' for o in hx_attrs.split()]
 
 # %% ../nbs/api/01_components.ipynb
-_alpine_re = re.compile(r'x_(\w+)_')
-
 def attrmap_x(o):
     if o.startswith('_at_'): o = '@'+o[4:]
-    o = _alpine_re.sub(r'x-\1:', o, 1)
     return attrmap(o)
 
 # %% ../nbs/api/01_components.ipynb
-def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=attrmap, **kwargs):
+fh_cfg['attrmap']=attrmap_x
+fh_cfg['valmap' ]=valmap
+
+# %% ../nbs/api/01_components.ipynb
+def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, **kwargs):
+    if attrmap is None: attrmap=fh_cfg.attrmap
+    if valmap  is None: valmap =fh_cfg.valmap
     kwargs['id'],kwargs['cls'],kwargs['title'],kwargs['style'] = id,cls,title,style
-    tag,c,kw = ft(tag, *c, attrmap=attrmap_x, **kwargs)
+    tag,c,kw = ft(tag, *c, attrmap=attrmap, valmap=valmap, **kwargs)
     if tag in named and 'id' in kw and 'name' not in kw: kw['name'] = kw['id']
     return FT(tag,c,kw, void_=tag in voids)
 
@@ -90,6 +95,9 @@ def _fill_item(item, obj):
                 else: attr.pop('checked', '')
             else: attr['value'] = val
         if tag=='textarea': cs=(val,)
+        if tag == 'select':
+            option = next((o for o in cs if o.tag=='option' and o.get('value')==val), None)
+            if option: option.selected = '1'
     return FT(tag,cs,attr,void_=item.void_)
 
 # %% ../nbs/api/01_components.ipynb
@@ -107,7 +115,7 @@ def fill_dataclass(src, dest):
 
 # %% ../nbs/api/01_components.ipynb
 def find_inputs(e, tags='input', **kw):
-    # Recursively find all elements in `e` with `tags` and attrs matching `kw`
+    "Recursively find all elements in `e` with `tags` and attrs matching `kw`"
     if not isinstance(e, (list,tuple)): return []
     inputs = []
     if isinstance(tags,str): tags = [tags]

{python-fasthtml-0.3.0 → python-fasthtml-0.3.2}/fasthtml/core.py

@@ -1,7 +1,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['empty', 'htmx_hdrs', 'htmxscr', 'htmxwsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths',
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmxscr', 'htmxwsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths',
            'is_typeddict', 'is_namedtuple', 'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader',
            'form2dict', 'flat_xt', 'Beforeware', 'WS_RouteX', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'cookie',
            'reg_re_param', 'MiddlewareBase']
@@ -11,7 +11,6 @@ import json,uuid,inspect,types
 
 from fastcore.utils import *
 from fastcore.xml import *
-from .xtend import *
 
 from types import UnionType, SimpleNamespace as ns, GenericAlias
 from typing import Optional, get_type_hints, get_args, get_origin, Union, Mapping, TypedDict, List, Any
@@ -86,6 +85,9 @@ def str2int(s)->int:
 # %% ../nbs/api/00_core.ipynb
 def _mk_list(t, v): return [t(o) for o in v]
 
+# %% ../nbs/api/00_core.ipynb
+fh_cfg = AttrDict(indent=True)
+
 # %% ../nbs/api/00_core.ipynb
 def _fix_anno(t):
     "Create appropriate callable type for casting a `str` to type `t` (or first type in `t` if union)"
@@ -177,7 +179,7 @@ async def _find_p(req, arg:str, p:Parameter):
     # 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)
-    try: return [anno(o) for o in res] if isinstance(res,list) else anno(res)
+    try: return anno(res)
     except ValueError: raise HTTPException(404, req.url.path) from None
 
 async def _wrap_req(req, params):
@@ -226,7 +228,7 @@ def _wrap_ws(ws, data, params):
 # %% ../nbs/api/00_core.ipynb
 async def _send_ws(ws, resp):
     if not resp: return
-    res = to_xml(resp) if isinstance(resp, (list,tuple)) or hasattr(resp, '__ft__') else resp
+    res = to_xml(resp, indent=fh_cfg.indent) if isinstance(resp, (list,tuple)) or hasattr(resp, '__ft__') else resp
     await ws.send_text(res)
 
 def _ws_endp(recv, conn=None, disconn=None, hdrs=None, before=None):
@@ -267,7 +269,7 @@ def _xt_resp(req, resp):
     if resp and 'hx-request' not in req.headers and not any(getattr(o, 'tag', '')=='html' for o in resp):
         if not titles: titles = [Title('FastHTML page')]
         resp = Html(Head(*titles, *flat_xt(req.hdrs)), Body(bdy, *flat_xt(req.ftrs), **req.bodykw), **req.htmlkw)
-    return HTMLResponse(to_xml(resp), headers=http_hdrs)
+    return HTMLResponse(to_xml(resp, indent=fh_cfg.indent), headers=http_hdrs)
 
 # %% ../nbs/api/00_core.ipynb
 def _resp(req, resp, cls=empty):
@@ -307,7 +309,7 @@ class RouteX(Route):
             if not resp:
                 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):
+                if not any(re.fullmatch(r, req.url.path) for r in skip):
                     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:

{python-fasthtml-0.3.0 → python-fasthtml-0.3.2}/fasthtml/xtend.py

@@ -3,8 +3,8 @@
 # %% auto 0
 __all__ = ['picocss', 'picolink', 'picocondcss', 'picocondlink', 'set_pico_cls', 'A', 'Form', 'AX', 'Checkbox', 'Card', 'Group',
            'Search', 'Grid', 'DialogX', 'Hidden', 'Container', 'Script', 'Style', 'double_braces', 'undouble_braces',
-           'loose_format', 'ScriptX', 'replace_css_vars', 'StyleX', 'On', 'Me', 'Any', 'run_js', 'Titled', 'Socials',
-           'Favicon', 'jsd']
+           'loose_format', 'ScriptX', 'replace_css_vars', 'StyleX', 'On', 'Me', 'Prev', 'Any', 'run_js', 'Titled',
+           'Socials', 'Favicon', 'jsd']
 
 # %% ../nbs/api/02_xtend.ipynb
 from dataclasses import dataclass, asdict
@@ -185,6 +185,11 @@ def Me(code:str, sel:str=''):
     if sel: sel=f'"{sel}"'
     return Script(f'(async (ee = me({sel})) => {{\nlet e = me(ee);\n{code}\n}})()\n')
 
+# %% ../nbs/api/02_xtend.ipynb
+def Prev(code:str):
+    "An async surreal.js script block on selector `me('-')`"
+    return Me(code, '-')
+
 # %% ../nbs/api/02_xtend.ipynb
 def Any(code:str, sel:str):
     "An async surreal.js script block on selector `any(sel)`"

{python-fasthtml-0.3.0 → python-fasthtml-0.3.2/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.3.0
+Version: 0.3.2
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.6.4
+Requires-Dist: fastcore>=1.6.6
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

{python-fasthtml-0.3.0 → python-fasthtml-0.3.2}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.6.4
+fastcore>=1.6.6
 python-dateutil
 starlette>0.33
 oauthlib

{python-fasthtml-0.3.0 → python-fasthtml-0.3.2}/settings.ini

@@ -1,10 +1,10 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.3.0
+version = 0.3.2
 min_python = 3.10
 license = apache2
-requirements = fastcore>=1.6.4 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.6 python-multipart beautifulsoup4
+requirements = fastcore>=1.6.6 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.6 python-multipart beautifulsoup4
 dev_requirements = ipython lxml
 black_formatting = False
 conda_user = fastai