python-fasthtml 0.5.3__tar.gz → 0.6.0__tar.gz

{python-fasthtml-0.5.3/python_fasthtml.egg-info → python-fasthtml-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.5.3
+Version: 0.6.0
 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.7.5
+Requires-Dist: fastcore>=1.7.8
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

python-fasthtml-0.6.0/fasthtml/__init__.py

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

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0}/fasthtml/_modidx.py

@@ -89,16 +89,18 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._xt_cts': ('api/core.html#_xt_cts', 'fasthtml/core.py'),
                                'fasthtml.core._xt_resp': ('api/core.html#_xt_resp', 'fasthtml/core.py'),
                                'fasthtml.core.cookie': ('api/core.html#cookie', 'fasthtml/core.py'),
-                               'fasthtml.core.date': ('api/core.html#date', 'fasthtml/core.py'),
                                'fasthtml.core.decode_uri': ('api/core.html#decode_uri', 'fasthtml/core.py'),
                                'fasthtml.core.flat_tuple': ('api/core.html#flat_tuple', 'fasthtml/core.py'),
                                '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.parse_form': ('api/core.html#parse_form', 'fasthtml/core.py'),
+                               'fasthtml.core.parsed_date': ('api/core.html#parsed_date', 'fasthtml/core.py'),
                                'fasthtml.core.reg_re_param': ('api/core.html#reg_re_param', 'fasthtml/core.py'),
                                'fasthtml.core.serve': ('api/core.html#serve', 'fasthtml/core.py'),
                                'fasthtml.core.signal_shutdown': ('api/core.html#signal_shutdown', 'fasthtml/core.py'),
                                'fasthtml.core.snake2hyphens': ('api/core.html#snake2hyphens', 'fasthtml/core.py'),
+                               'fasthtml.core.str2date': ('api/core.html#str2date', 'fasthtml/core.py'),
                                'fasthtml.core.str2int': ('api/core.html#str2int', 'fasthtml/core.py'),
                                'fasthtml.core.uri': ('api/core.html#uri', 'fasthtml/core.py')},
             'fasthtml.fastapp': { 'fasthtml.fastapp.ContainerX': ('api/fastapp.html#containerx', 'fasthtml/fastapp.py'),

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0}/fasthtml/components.py

@@ -97,9 +97,12 @@ def _fill_item(item, obj):
     val = None if name is None else obj.get(name, None)
     if val is not None and not 'skip' in attr:
         if tag=='input':
-            if attr.get('type', '') in ('checkbox','radio'):
+            if attr.get('type', '') == 'checkbox':
                 if val: attr['checked'] = '1'
                 else: attr.pop('checked', '')
+            elif attr.get('type', '') == 'radio':
+                if val and val == attr['value']: attr['checked'] = '1'
+                else: attr.pop('checked', '')
             else: attr['value'] = val
         if tag=='textarea': cs=(val,)
         if tag == 'select':

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0}/fasthtml/components.pyi

@@ -26,7 +26,7 @@ def attrmap_x(o):
 fh_cfg['attrmap'] = attrmap_x
 fh_cfg['valmap'] = valmap
 
-def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, **kwargs):
+def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=FT, **kwargs):
     ...
 
 @use_kwargs(hx_attrs, keep=True)

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0}/fasthtml/core.py

@@ -4,10 +4,10 @@
 
 # %% auto 0
 __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmxsrc', 'htmxwssrc', 'fhjsscr', 'htmxctsrc', 'surrsrc', 'scopesrc',
-           'viewport', 'charset', 'all_meths', 'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader',
-           'HtmxResponseHeaders', 'form2dict', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'WS_RouteX',
-           'uri', 'decode_uri', 'flat_tuple', 'Redirect', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'serve', 'Client',
-           'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse']
+           'viewport', 'charset', 'all_meths', 'parsed_date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'str2date',
+           'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'flat_xt', 'Beforeware', 'EventStream',
+           'signal_shutdown', 'WS_RouteX', 'uri', 'decode_uri', 'flat_tuple', 'Redirect', 'RouteX', 'RouterX',
+           'get_key', 'FastHTML', 'serve', 'Client', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types,uvicorn,signal,asyncio,threading
@@ -18,7 +18,7 @@ from fastcore.meta import use_kwargs_dict
 
 from types import UnionType, SimpleNamespace as ns, GenericAlias
 from typing import Optional, get_type_hints, get_args, get_origin, Union, Mapping, TypedDict, List, Any
-from datetime import datetime
+from datetime import datetime,date
 from dataclasses import dataclass,fields
 from collections import namedtuple
 from inspect import isfunction,ismethod,Parameter,get_annotations
@@ -39,7 +39,7 @@ empty = Parameter.empty
 def _sig(f): return signature_ex(f, True)
 
 # %% ../nbs/api/00_core.ipynb
-def date(s:str):
+def parsed_date(s:str):
     "Convert `s` to a datetime"
     return dtparse.parse(s)
 
@@ -84,13 +84,18 @@ 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 str2date(s:str)->date:
+    "`date.fromisoformat` with empty string handling"
+    return date.fromisoformat(s) if s else None
+
 # %% ../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)"
     origin = get_origin(t)
     if origin is Union or origin is UnionType or origin in (list,List):
         t = first(o for o in get_args(t) if o!=type(None))
-    d = {bool: str2bool, int: str2int}
+    d = {bool: str2bool, int: str2int, date: str2date}
     res = d.get(t, t)
     if origin in (list,List): return partial(_mk_list, res)
     return lambda o: res(o[-1]) if isinstance(o,(list,tuple)) else res(o)
@@ -143,13 +148,25 @@ def form2dict(form: FormData) -> dict:
     "Convert starlette form data to a dict"
     return {k: _formitem(form, k) for k in form}
 
+# %% ../nbs/api/00_core.ipynb
+async def parse_form(req: Request) -> FormData:
+    "Starlette errors on empty multipart forms, so this checks for that situation"
+    ctype = req.headers.get("Content-Type", "")
+    if not ctype.startswith("multipart/form-data"): return await req.form()
+    try: boundary = ctype.split("boundary=")[1].strip()
+    except IndexError: raise HTTPException(400, "Invalid form-data: no boundary")
+    min_len = len(boundary) + 6
+    clen = int(req.headers.get("Content-Length", "0"))
+    if clen <= min_len: return FormData()
+    return await req.form()
+
 # %% ../nbs/api/00_core.ipynb
 async def _from_body(req, p):
     anno = p.annotation
     # Get the fields and types of type `anno`, if available
     d = _annotations(anno)
     if req.headers.get('content-type', None)=='application/json': data = await req.json()
-    else: data = form2dict(await req.form())
+    else: data = form2dict(await parse_form(req))
     cargs = {k: _form_arg(k, v, d) for k, v in data.items() if not d or k in d}
     return anno(**cargs)
 
@@ -179,10 +196,9 @@ async def _find_p(req, arg:str, p:Parameter):
     res = req.path_params.get(arg, 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 = req.query_params.get(arg, None)
-    if res in (empty,None):
-        frm = await req.form()
-        res = _formitem(frm, arg)
+    if res in (empty,None): res = req.query_params.getlist(arg)
+    if res==[]: res = None
+    if res in (empty,None): res = _formitem(await parse_form(req), arg)
     # 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
@@ -417,7 +433,7 @@ class RouteX(Route):
         resp = None
         req.injects = []
         req.hdrs,req.ftrs,req.htmlkw,req.bodykw = map(deepcopy, (self._app.hdrs,self._app.ftrs,self._app.htmlkw,self._app.bodykw))
-        req.hdrs,req.ftrs = list(req.hdrs),list(req.ftrs)
+        req.hdrs,req.ftrs = listify(req.hdrs),listify(req.ftrs)
         for b in self._app.before:
             if not resp:
                 if isinstance(b, Beforeware): bf,skip = b.f,b.skip

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0}/fasthtml/core.pyi

@@ -1,12 +1,12 @@
 """The `FastHTML` subclass of `Starlette`, along with the `RouterX` and `RouteX` classes it automatically uses."""
-__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmxsrc', 'htmxwssrc', 'fhjsscr', 'htmxctsrc', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths', 'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'WS_RouteX', 'uri', 'decode_uri', 'flat_tuple', 'Redirect', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'serve', 'cookie', 'reg_re_param', 'MiddlewareBase']
-import json, uuid, inspect, types, uvicorn, signal, asyncio
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmxsrc', 'htmxwssrc', 'fhjsscr', 'htmxctsrc', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths', 'parsed_date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'str2date', 'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'WS_RouteX', 'uri', 'decode_uri', 'flat_tuple', 'Redirect', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'serve', 'Client', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse']
+import json, uuid, inspect, types, uvicorn, signal, asyncio, threading
 from fastcore.utils import *
 from fastcore.xml import *
 from fastcore.meta import use_kwargs_dict
 from types import UnionType, SimpleNamespace as ns, GenericAlias
 from typing import Optional, get_type_hints, get_args, get_origin, Union, Mapping, TypedDict, List, Any
-from datetime import datetime
+from datetime import datetime, date
 from dataclasses import dataclass, fields
 from collections import namedtuple
 from inspect import isfunction, ismethod, Parameter, get_annotations
@@ -16,13 +16,15 @@ from urllib.parse import urlencode, parse_qs, quote, unquote
 from copy import copy, deepcopy
 from warnings import warn
 from dateutil import parser as dtparse
+from httpx import ASGITransport, AsyncClient
+from anyio import from_thread
 from .starlette import *
 empty = Parameter.empty
 
 def _sig(f):
     ...
 
-def date(s: str):
+def parsed_date(s: str):
     """Convert `s` to a datetime"""
     ...
 
@@ -56,6 +58,10 @@ def _mk_list(t, v):
     ...
 fh_cfg = AttrDict(indent=True)
 
+def str2date(s: str) -> date:
+    """`date.fromisoformat` with empty string handling"""
+    ...
+
 def _fix_anno(t):
     """Create appropriate callable type for casting a `str` to type `t` (or first type in `t` if union)"""
     ...
@@ -93,6 +99,10 @@ def form2dict(form: FormData) -> dict:
     """Convert starlette form data to a dict"""
     ...
 
+async def parse_form(req: Request) -> FormData:
+    """Starlette errors on empty multipart forms, so this checks for that situation"""
+    ...
+
 async def _from_body(req, p):
     ...
 
@@ -173,9 +183,15 @@ def flat_tuple(o):
     """Flatten lists"""
     ...
 
+def _xt_cts(req, resp):
+    ...
+
 def _xt_resp(req, resp):
     ...
 
+def _is_ft_resp(resp):
+    ...
+
 def _resp(req, resp, cls=empty):
     ...
 
@@ -258,6 +274,17 @@ def serve(appname=None, app='app', host='0.0.0.0', port=None, reload=True, reloa
     """Run the app in an async server, with live reload set as the default."""
     ...
 
+class Client:
+    """A simple httpx ASGI client that doesn't require `async`"""
+
+    def __init__(self, app, url='http://testserver'):
+        ...
+
+    def _sync(self, method, url, **kwargs):
+        ...
+for o in ('get', 'post', 'delete', 'put', 'patch', 'options'):
+    setattr(Client, o, partialmethod(Client._sync, o))
+
 def cookie(key: str, value='', max_age=None, expires=None, path='/', domain=None, secure=False, httponly=False, samesite='lax'):
     """Create a 'set-cookie' `HttpHeader`"""
     ...
@@ -270,4 +297,13 @@ reg_re_param('static', 'ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|o
 class MiddlewareBase:
 
     async def __call__(self, scope, receive, send) -> None:
+        ...
+
+class FtResponse:
+    """Wrap an FT response with any Starlette `Response`"""
+
+    def __init__(self, content, status_code: int=200, headers=None, cls=HTMLResponse, media_type: str | None=None, background=None):
+        ...
+
+    def __response__(self, req):
         ...

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0}/fasthtml/xtend.pyi

@@ -1,5 +1,5 @@
 """Simple extensions to standard HTML components, such as adding sensible defaults"""
-__all__ = ['A', 'Form', 'AX', 'Hidden', 'CheckboxX', 'Script', 'Style', 'double_braces', 'undouble_braces', 'loose_format', 'ScriptX', 'replace_css_vars', 'StyleX', 'On', 'Prev', 'Now', 'AnyNow', 'run_js', 'HtmxOn', 'Titled', 'Socials', 'Favicon', 'jsd', 'clear']
+__all__ = ['sid_scr', 'A', 'Form', 'AX', 'Hidden', 'CheckboxX', 'Script', 'Style', 'double_braces', 'undouble_braces', 'loose_format', 'ScriptX', 'replace_css_vars', 'StyleX', 'On', 'Prev', 'Now', 'AnyNow', 'run_js', 'HtmxOn', 'Titled', 'Socials', 'Favicon', 'jsd', 'clear']
 from dataclasses import dataclass, asdict
 from typing import Any
 from fastcore.utils import *
@@ -32,11 +32,11 @@ def CheckboxX(checked: bool=False, label=None, value='1', id=None, name=None, *,
     """A Checkbox optionally inside a Label, preceded by a `Hidden` with matching name"""
     ...
 
-def Script(code: str='', *, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, **kwargs) -> FT:
+def Script(code: str='', *, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=fastcore.xml.FT, **kwargs) -> FT:
     """A Script tag that doesn't escape its code"""
     ...
 
-def Style(*c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, **kwargs) -> FT:
+def Style(*c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=fastcore.xml.FT, **kwargs) -> FT:
     """A Style tag that doesn't escape its code"""
     ...
 
@@ -65,11 +65,11 @@ def StyleX(fname, **kw):
     ...
 
 def On(code: str, event: str='click', sel: str='', me=True):
-    """An async surreal.js script block event handler for `event` on selector `sel`"""
+    """An async surreal.js script block event handler for `event` on selector `sel`, making available parent `p`, event `ev`, and target `e`"""
     ...
 
 def Prev(code: str, event: str='click'):
-    """An async surreal.js script block event handler for `event` on previous sibling"""
+    """An async surreal.js script block event handler for `event` on previous sibling, with same vars as `On`"""
     ...
 
 def Now(code: str, sel: str=''):
@@ -104,4 +104,5 @@ def jsd(org, repo, root, path, prov='gh', typ='script', ver=None, esm=False, **k
     ...
 
 def clear(id):
-    ...
+    ...
+sid_scr = Script('\nfunction uuid() {\n    return [...crypto.getRandomValues(new Uint8Array(10))].map(b=>b.toString(36)).join(\'\');\n}\n\nsessionStorage.setItem("sid", sessionStorage.getItem("sid") || uuid());\n\nhtmx.on("htmx:configRequest", (e) => {\n    const sid = sessionStorage.getItem("sid");\n    if (sid) {\n        const url = new URL(e.detail.path, window.location.origin);\n        url.searchParams.set(\'sid\', sid);\n        e.detail.path = url.pathname + url.search;\n    }\n});\n')

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.5.3
+Version: 0.6.0
 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.7.5
+Requires-Dist: fastcore>=1.7.8
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.7.5
+fastcore>=1.7.8
 python-dateutil
 starlette>0.33
 oauthlib

{python-fasthtml-0.5.3 → python-fasthtml-0.6.0}/settings.ini

@@ -1,10 +1,10 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.5.3
+version = 0.6.0
 min_python = 3.10
 license = apache2
-requirements = fastcore>=1.7.5 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.9 python-multipart beautifulsoup4
+requirements = fastcore>=1.7.8 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.9 python-multipart beautifulsoup4
 dev_requirements = ipython lxml pysymbol_llm
 black_formatting = False
 conda_user = fastai

python-fasthtml-0.5.3/fasthtml/__init__.py

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