python-fasthtml 0.11.0__tar.gz → 0.12.1__tar.gz

{python_fasthtml-0.11.0/python_fasthtml.egg-info → python_fasthtml-0.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.11.0
+Version: 0.12.1
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard and contributors
@@ -22,7 +22,7 @@ Requires-Dist: oauthlib
 Requires-Dist: itsdangerous
 Requires-Dist: uvicorn[standard]>=0.30
 Requires-Dist: httpx
-Requires-Dist: fastlite>=0.0.9
+Requires-Dist: fastlite>=0.1.1
 Requires-Dist: python-multipart
 Requires-Dist: beautifulsoup4
 Provides-Extra: dev
@@ -185,3 +185,51 @@ Finally, join the FastHTML community to ask questions, share your work,
 and learn from others:
 
 - [Discord](https://discord.gg/qcXvcxMhdP)
+
+## Other languages and related projects
+
+If you’re not a Python user, or are keen to try out a new language,
+we’ll list here other projects that have a similar approach to FastHTML.
+(Please reach out if you know of any other projects that you’d like to
+see added.)
+
+- [htmgo](https://htmgo.dev/) (Go): “*htmgo is a lightweight pure go way
+  to build interactive websites / web applications using go & htmx. By
+  combining the speed & simplicity of go + hypermedia attributes (htmx)
+  to add interactivity to websites, all conveniently wrapped in pure go,
+  you can build simple, fast, interactive websites without touching
+  javascript. All compiled to a single deployable binary*”
+
+If you’re just interested in functional HTML components, rather than a
+full HTMX server solution, consider:
+
+- [fastcore.xml.FT](https://fastcore.fast.ai/xml.html): This is actually
+  what FastHTML uses behind the scenes
+- [htpy](https://htpy.dev/): Similar to
+  [`fastcore.xml.FT`](https://fastcore.fast.ai/xml.html#ft), but with a
+  somewhat different syntax
+- [elm-html](https://package.elm-lang.org/packages/elm/html/latest/):
+  Elm’s built-in HTML library with a type-safe functional approach
+- [hiccup](https://github.com/weavejester/hiccup): Popular library for
+  representing HTML in Clojure using vectors
+- [hiccl](https://github.com/garlic0x1/hiccl): HTML generation library
+  for Common Lisp inspired by Clojure’s Hiccup
+- [Falco.Markup](https://github.com/pimbrouwers/Falco): F# HTML DSL and
+  web framework with type-safe HTML generation
+- [Lucid](https://github.com/chrisdone/lucid): Type-safe HTML generation
+  for Haskell using monad transformers
+- [dream-html](https://github.com/aantron/dream): Part of the Dream web
+  framework for OCaml, provides type-safe HTML templating
+
+For other hypermedia application platforms, not based on HTMX, take a
+look at:
+
+- [Hotwire/Turbo](https://turbo.hotwired.dev/): Rails-oriented framework
+  that similarly uses HTML-over-the-wire
+- [LiveView](https://hexdocs.pm/phoenix_live_view/Phoenix.LiveView.html):
+  Phoenix framework’s solution for building interactive web apps with
+  minimal JavaScript
+- [Unpoly](https://unpoly.com/): Another HTML-over-the-wire framework
+  with progressive enhancement
+- [Livewire](https://laravel-livewire.com/): Laravel’s take on building
+  dynamic interfaces with minimal JavaScript

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/README.md

@@ -153,3 +153,51 @@ Finally, join the FastHTML community to ask questions, share your work,
 and learn from others:
 
 - [Discord](https://discord.gg/qcXvcxMhdP)
+
+## Other languages and related projects
+
+If you’re not a Python user, or are keen to try out a new language,
+we’ll list here other projects that have a similar approach to FastHTML.
+(Please reach out if you know of any other projects that you’d like to
+see added.)
+
+- [htmgo](https://htmgo.dev/) (Go): “*htmgo is a lightweight pure go way
+  to build interactive websites / web applications using go & htmx. By
+  combining the speed & simplicity of go + hypermedia attributes (htmx)
+  to add interactivity to websites, all conveniently wrapped in pure go,
+  you can build simple, fast, interactive websites without touching
+  javascript. All compiled to a single deployable binary*”
+
+If you’re just interested in functional HTML components, rather than a
+full HTMX server solution, consider:
+
+- [fastcore.xml.FT](https://fastcore.fast.ai/xml.html): This is actually
+  what FastHTML uses behind the scenes
+- [htpy](https://htpy.dev/): Similar to
+  [`fastcore.xml.FT`](https://fastcore.fast.ai/xml.html#ft), but with a
+  somewhat different syntax
+- [elm-html](https://package.elm-lang.org/packages/elm/html/latest/):
+  Elm’s built-in HTML library with a type-safe functional approach
+- [hiccup](https://github.com/weavejester/hiccup): Popular library for
+  representing HTML in Clojure using vectors
+- [hiccl](https://github.com/garlic0x1/hiccl): HTML generation library
+  for Common Lisp inspired by Clojure’s Hiccup
+- [Falco.Markup](https://github.com/pimbrouwers/Falco): F# HTML DSL and
+  web framework with type-safe HTML generation
+- [Lucid](https://github.com/chrisdone/lucid): Type-safe HTML generation
+  for Haskell using monad transformers
+- [dream-html](https://github.com/aantron/dream): Part of the Dream web
+  framework for OCaml, provides type-safe HTML templating
+
+For other hypermedia application platforms, not based on HTMX, take a
+look at:
+
+- [Hotwire/Turbo](https://turbo.hotwired.dev/): Rails-oriented framework
+  that similarly uses HTML-over-the-wire
+- [LiveView](https://hexdocs.pm/phoenix_live_view/Phoenix.LiveView.html):
+  Phoenix framework’s solution for building interactive web apps with
+  minimal JavaScript
+- [Unpoly](https://unpoly.com/): Another HTML-over-the-wire framework
+  with progressive enhancement
+- [Livewire](https://laravel-livewire.com/): Laravel’s take on building
+  dynamic interfaces with minimal JavaScript

python_fasthtml-0.12.1/fasthtml/__init__.py

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

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/fasthtml/_modidx.py

@@ -1,8 +1,8 @@
 # Autogenerated by nbdev
 
 d = { 'settings': { 'branch': 'main',
-                'doc_baseurl': '/fasthtml',
-                'doc_host': 'https://AnswerDotAI.github.io',
+                'doc_baseurl': '/',
+                'doc_host': 'https://docs.fastht.ml',
                 'git_url': 'https://github.com/AnswerDotAI/fasthtml',
                 'lib_path': 'fasthtml'},
   'syms': { 'fasthtml.authmw': {},
@@ -133,6 +133,11 @@ d = { 'settings': { 'branch': 'main',
                                   'fasthtml.jupyter.JupyUvi.__init__': ('api/jupyter.html#jupyuvi.__init__', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.start': ('api/jupyter.html#jupyuvi.start', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.stop': ('api/jupyter.html#jupyuvi.stop', 'fasthtml/jupyter.py'),
+                                  'fasthtml.jupyter.JupyUviAsync': ('api/jupyter.html#jupyuviasync', 'fasthtml/jupyter.py'),
+                                  'fasthtml.jupyter.JupyUviAsync.__init__': ( 'api/jupyter.html#jupyuviasync.__init__',
+                                                                              'fasthtml/jupyter.py'),
+                                  'fasthtml.jupyter.JupyUviAsync.start': ('api/jupyter.html#jupyuviasync.start', 'fasthtml/jupyter.py'),
+                                  'fasthtml.jupyter.JupyUviAsync.stop': ('api/jupyter.html#jupyuviasync.stop', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.htmx_config_port': ('api/jupyter.html#htmx_config_port', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.is_port_free': ('api/jupyter.html#is_port_free', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.nb_serve': ('api/jupyter.html#nb_serve', 'fasthtml/jupyter.py'),

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/fasthtml/components.py

@@ -8,10 +8,10 @@ __all__ = ['named', 'html_attrs', 'hx_attrs', 'hx_attrs_annotations', 'show', 'a
            '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',
-           'H2', 'H3', 'H4', 'H5', 'H6', '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',
+           'H2', 'H3', 'H4', 'H5', 'H6', 'Head', 'Header', 'Hgroup', 'Hr', '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']
 
@@ -110,7 +110,7 @@ _all_ = [
     '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', 'H2', 'H3', 'H4', 'H5', 'H6', 'Head', 'Header',
-    'Hgroup', 'Hr', 'Html', 'I', 'Iframe', 'Img', 'Input', 'Ins', 'Kbd', 'Label', 'Legend', 'Li',
+    'Hgroup', 'Hr', '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',

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/fasthtml/components.pyi

@@ -1,5 +1,5 @@
 """`ft_html` and `ft_hx` functions to add some conveniences to `ft`, along with a full set of basic HTML components, and functions to work with forms and `FT` conversion"""
-__all__ = ['named', 'html_attrs', 'hx_attrs', 'hx_attrs_annotations', 'show', 'attrmap_x', 'ft_html', 'ft_hx', 'File', 'fill_form', 'fill_dataclass', 'find_inputs', 'html2ft', 'sse_message', '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', 'H2', 'H3', 'H4', 'H5', 'H6', '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__ = ['named', 'html_attrs', 'hx_attrs', 'hx_attrs_annotations', 'show', 'attrmap_x', 'ft_html', 'ft_hx', 'File', 'fill_form', 'fill_dataclass', 'find_inputs', 'html2ft', 'sse_message', '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', 'H2', 'H3', 'H4', 'H5', 'H6', 'Head', 'Header', 'Hgroup', 'Hr', '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, Comment
 from typing import Literal, Optional
@@ -17,11 +17,23 @@ except ImportError:
 def show(ft, *rest):
     """Renders FT Components into HTML within a Jupyter notebook."""
     ...
+
+@patch
+def __str__(self: FT):
+    ...
+
+@patch
+def __radd__(self: FT, b):
+    ...
+
+@patch
+def __add__(self: FT, b):
+    ...
 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()
 hx_attrs = 'get post put delete patch trigger target swap swap_oob include select select_oob indicator push_url confirm disable replace_url vals disabled_elt ext headers history history_elt indicator inherit params preserve prompt replace_url request sync validate'
 hx_attrs = [f'hx_{o}' for o in hx_attrs.split()]
-hx_attrs_annotations = {'hx_swap': Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'] | str, 'hx_swap_oob': Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'] | str, 'hx_push_url': Literal['true', 'false'] | str, 'hx_replace_url': Literal['true', 'false'] | str, 'hx_disabled_elt': Literal['this', 'next', 'previous'] | str, 'hx_history': Literal['false'] | str, 'hx_params': Literal['*', 'none'] | str, 'hx_replace_url': Literal['true', 'false'] | str, 'hx_validate': Literal['true', 'false']}
+hx_attrs_annotations = {'hx_swap': Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'] | str, 'hx_swap_oob': Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'] | str, 'hx_push_url': Literal['true', 'false'] | str, 'hx_replace_url': Literal['true', 'false'] | str, 'hx_disabled_elt': Literal['this', 'next', 'previous'] | str, 'hx_history': Literal['false'] | str, 'hx_params': Literal['*', 'none'] | str, 'hx_validate': Literal['true', 'false']}
 hx_attrs_annotations |= {o: str for o in set(hx_attrs) - set(hx_attrs_annotations.keys())}
 hx_attrs_annotations = {k: Optional[v] for k, v in hx_attrs_annotations.items()}
 hx_attrs = html_attrs + hx_attrs
@@ -32,15 +44,16 @@ fh_cfg['attrmap'] = attrmap_x
 fh_cfg['valmap'] = valmap
 fh_cfg['ft_cls'] = FT
 fh_cfg['auto_id'] = False
+fh_cfg['auto_name'] = True
 
-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):
     ...
 
 @use_kwargs(hx_attrs, keep=True)
 def ft_hx(tag: str, *c, target_id=None, hx_vals=None, hx_target=None, **kwargs):
     ...
 _g = globals()
-_all_ = ['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', 'H2', 'H3', 'H4', 'H5', 'H6', '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_ = ['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', 'H2', 'H3', 'H4', 'H5', 'H6', 'Head', 'Header', 'Hgroup', 'Hr', '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']
 for o in _all_:
     _g[o] = partial(ft_hx, o.lower())
 
@@ -125,7 +138,6 @@ def Head(*c, id:Any=None, cls:Any=None, title:Any=None, style:Any=None, accesske
 def Header(*c, id:Any=None, cls:Any=None, title:Any=None, style:Any=None, accesskey:Any=None, contenteditable:Any=None, dir:Any=None, draggable:Any=None, enterkeyhint:Any=None, hidden:Any=None, inert:Any=None, inputmode:Any=None, lang:Any=None, popover:Any=None, spellcheck:Any=None, tabindex:Any=None, translate:Any=None, hx_get:Optional[str]=None, hx_post:Optional[str]=None, hx_put:Optional[str]=None, hx_delete:Optional[str]=None, hx_patch:Optional[str]=None, hx_trigger:Optional[str]=None, hx_target:Optional[str]=None, hx_swap:Union[Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_swap_oob:Union[Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_include:Optional[str]=None, hx_select:Optional[str]=None, hx_select_oob:Optional[str]=None, hx_indicator:Optional[str]=None, hx_push_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_confirm:Optional[str]=None, hx_disable:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_vals:Optional[str]=None, hx_disabled_elt:Union[Literal['this', 'next', 'previous'], str, NoneType]=None, hx_ext:Optional[str]=None, hx_headers:Optional[str]=None, hx_history:Union[Literal['false'], str, NoneType]=None, hx_history_elt:Optional[str]=None, hx_indicator:Optional[str]=None, hx_inherit:Optional[str]=None, hx_params:Union[Literal['*', 'none'], str, NoneType]=None, hx_preserve:Optional[str]=None, hx_prompt:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_request:Optional[str]=None, hx_sync:Optional[str]=None, hx_validate:Optional[Literal['true', 'false']]=None, **kwargs): ...
 def Hgroup(*c, id:Any=None, cls:Any=None, title:Any=None, style:Any=None, accesskey:Any=None, contenteditable:Any=None, dir:Any=None, draggable:Any=None, enterkeyhint:Any=None, hidden:Any=None, inert:Any=None, inputmode:Any=None, lang:Any=None, popover:Any=None, spellcheck:Any=None, tabindex:Any=None, translate:Any=None, hx_get:Optional[str]=None, hx_post:Optional[str]=None, hx_put:Optional[str]=None, hx_delete:Optional[str]=None, hx_patch:Optional[str]=None, hx_trigger:Optional[str]=None, hx_target:Optional[str]=None, hx_swap:Union[Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_swap_oob:Union[Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_include:Optional[str]=None, hx_select:Optional[str]=None, hx_select_oob:Optional[str]=None, hx_indicator:Optional[str]=None, hx_push_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_confirm:Optional[str]=None, hx_disable:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_vals:Optional[str]=None, hx_disabled_elt:Union[Literal['this', 'next', 'previous'], str, NoneType]=None, hx_ext:Optional[str]=None, hx_headers:Optional[str]=None, hx_history:Union[Literal['false'], str, NoneType]=None, hx_history_elt:Optional[str]=None, hx_indicator:Optional[str]=None, hx_inherit:Optional[str]=None, hx_params:Union[Literal['*', 'none'], str, NoneType]=None, hx_preserve:Optional[str]=None, hx_prompt:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_request:Optional[str]=None, hx_sync:Optional[str]=None, hx_validate:Optional[Literal['true', 'false']]=None, **kwargs): ...
 def Hr(*c, id:Any=None, cls:Any=None, title:Any=None, style:Any=None, accesskey:Any=None, contenteditable:Any=None, dir:Any=None, draggable:Any=None, enterkeyhint:Any=None, hidden:Any=None, inert:Any=None, inputmode:Any=None, lang:Any=None, popover:Any=None, spellcheck:Any=None, tabindex:Any=None, translate:Any=None, hx_get:Optional[str]=None, hx_post:Optional[str]=None, hx_put:Optional[str]=None, hx_delete:Optional[str]=None, hx_patch:Optional[str]=None, hx_trigger:Optional[str]=None, hx_target:Optional[str]=None, hx_swap:Union[Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_swap_oob:Union[Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_include:Optional[str]=None, hx_select:Optional[str]=None, hx_select_oob:Optional[str]=None, hx_indicator:Optional[str]=None, hx_push_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_confirm:Optional[str]=None, hx_disable:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_vals:Optional[str]=None, hx_disabled_elt:Union[Literal['this', 'next', 'previous'], str, NoneType]=None, hx_ext:Optional[str]=None, hx_headers:Optional[str]=None, hx_history:Union[Literal['false'], str, NoneType]=None, hx_history_elt:Optional[str]=None, hx_indicator:Optional[str]=None, hx_inherit:Optional[str]=None, hx_params:Union[Literal['*', 'none'], str, NoneType]=None, hx_preserve:Optional[str]=None, hx_prompt:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_request:Optional[str]=None, hx_sync:Optional[str]=None, hx_validate:Optional[Literal['true', 'false']]=None, **kwargs): ...
-def Html(*c, id:Any=None, cls:Any=None, title:Any=None, style:Any=None, accesskey:Any=None, contenteditable:Any=None, dir:Any=None, draggable:Any=None, enterkeyhint:Any=None, hidden:Any=None, inert:Any=None, inputmode:Any=None, lang:Any=None, popover:Any=None, spellcheck:Any=None, tabindex:Any=None, translate:Any=None, hx_get:Optional[str]=None, hx_post:Optional[str]=None, hx_put:Optional[str]=None, hx_delete:Optional[str]=None, hx_patch:Optional[str]=None, hx_trigger:Optional[str]=None, hx_target:Optional[str]=None, hx_swap:Union[Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_swap_oob:Union[Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_include:Optional[str]=None, hx_select:Optional[str]=None, hx_select_oob:Optional[str]=None, hx_indicator:Optional[str]=None, hx_push_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_confirm:Optional[str]=None, hx_disable:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_vals:Optional[str]=None, hx_disabled_elt:Union[Literal['this', 'next', 'previous'], str, NoneType]=None, hx_ext:Optional[str]=None, hx_headers:Optional[str]=None, hx_history:Union[Literal['false'], str, NoneType]=None, hx_history_elt:Optional[str]=None, hx_indicator:Optional[str]=None, hx_inherit:Optional[str]=None, hx_params:Union[Literal['*', 'none'], str, NoneType]=None, hx_preserve:Optional[str]=None, hx_prompt:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_request:Optional[str]=None, hx_sync:Optional[str]=None, hx_validate:Optional[Literal['true', 'false']]=None, **kwargs): ...
 def I(*c, id:Any=None, cls:Any=None, title:Any=None, style:Any=None, accesskey:Any=None, contenteditable:Any=None, dir:Any=None, draggable:Any=None, enterkeyhint:Any=None, hidden:Any=None, inert:Any=None, inputmode:Any=None, lang:Any=None, popover:Any=None, spellcheck:Any=None, tabindex:Any=None, translate:Any=None, hx_get:Optional[str]=None, hx_post:Optional[str]=None, hx_put:Optional[str]=None, hx_delete:Optional[str]=None, hx_patch:Optional[str]=None, hx_trigger:Optional[str]=None, hx_target:Optional[str]=None, hx_swap:Union[Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_swap_oob:Union[Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_include:Optional[str]=None, hx_select:Optional[str]=None, hx_select_oob:Optional[str]=None, hx_indicator:Optional[str]=None, hx_push_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_confirm:Optional[str]=None, hx_disable:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_vals:Optional[str]=None, hx_disabled_elt:Union[Literal['this', 'next', 'previous'], str, NoneType]=None, hx_ext:Optional[str]=None, hx_headers:Optional[str]=None, hx_history:Union[Literal['false'], str, NoneType]=None, hx_history_elt:Optional[str]=None, hx_indicator:Optional[str]=None, hx_inherit:Optional[str]=None, hx_params:Union[Literal['*', 'none'], str, NoneType]=None, hx_preserve:Optional[str]=None, hx_prompt:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_request:Optional[str]=None, hx_sync:Optional[str]=None, hx_validate:Optional[Literal['true', 'false']]=None, **kwargs): ...
 def Iframe(*c, name:Any=None, id:Any=None, cls:Any=None, title:Any=None, style:Any=None, accesskey:Any=None, contenteditable:Any=None, dir:Any=None, draggable:Any=None, enterkeyhint:Any=None, hidden:Any=None, inert:Any=None, inputmode:Any=None, lang:Any=None, popover:Any=None, spellcheck:Any=None, tabindex:Any=None, translate:Any=None, hx_get:Optional[str]=None, hx_post:Optional[str]=None, hx_put:Optional[str]=None, hx_delete:Optional[str]=None, hx_patch:Optional[str]=None, hx_trigger:Optional[str]=None, hx_target:Optional[str]=None, hx_swap:Union[Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_swap_oob:Union[Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_include:Optional[str]=None, hx_select:Optional[str]=None, hx_select_oob:Optional[str]=None, hx_indicator:Optional[str]=None, hx_push_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_confirm:Optional[str]=None, hx_disable:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_vals:Optional[str]=None, hx_disabled_elt:Union[Literal['this', 'next', 'previous'], str, NoneType]=None, hx_ext:Optional[str]=None, hx_headers:Optional[str]=None, hx_history:Union[Literal['false'], str, NoneType]=None, hx_history_elt:Optional[str]=None, hx_indicator:Optional[str]=None, hx_inherit:Optional[str]=None, hx_params:Union[Literal['*', 'none'], str, NoneType]=None, hx_preserve:Optional[str]=None, hx_prompt:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_request:Optional[str]=None, hx_sync:Optional[str]=None, hx_validate:Optional[Literal['true', 'false']]=None, **kwargs): ...
 def Img(*c, name:Any=None, id:Any=None, cls:Any=None, title:Any=None, style:Any=None, accesskey:Any=None, contenteditable:Any=None, dir:Any=None, draggable:Any=None, enterkeyhint:Any=None, hidden:Any=None, inert:Any=None, inputmode:Any=None, lang:Any=None, popover:Any=None, spellcheck:Any=None, tabindex:Any=None, translate:Any=None, hx_get:Optional[str]=None, hx_post:Optional[str]=None, hx_put:Optional[str]=None, hx_delete:Optional[str]=None, hx_patch:Optional[str]=None, hx_trigger:Optional[str]=None, hx_target:Optional[str]=None, hx_swap:Union[Literal['innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_swap_oob:Union[Literal['true', 'innerHTML', 'outerHTML', 'afterbegin', 'beforebegin', 'beforeend', 'afterend', 'delete', 'none'], str, NoneType]=None, hx_include:Optional[str]=None, hx_select:Optional[str]=None, hx_select_oob:Optional[str]=None, hx_indicator:Optional[str]=None, hx_push_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_confirm:Optional[str]=None, hx_disable:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_vals:Optional[str]=None, hx_disabled_elt:Union[Literal['this', 'next', 'previous'], str, NoneType]=None, hx_ext:Optional[str]=None, hx_headers:Optional[str]=None, hx_history:Union[Literal['false'], str, NoneType]=None, hx_history_elt:Optional[str]=None, hx_indicator:Optional[str]=None, hx_inherit:Optional[str]=None, hx_params:Union[Literal['*', 'none'], str, NoneType]=None, hx_preserve:Optional[str]=None, hx_prompt:Optional[str]=None, hx_replace_url:Union[Literal['true', 'false'], str, NoneType]=None, hx_request:Optional[str]=None, hx_sync:Optional[str]=None, hx_validate:Optional[Literal['true', 'false']]=None, **kwargs): ...

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/fasthtml/core.py

@@ -11,7 +11,7 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
 
 # %% ../nbs/api/00_core.ipynb
-import json,uuid,inspect,types,uvicorn,signal,asyncio,threading,inspect
+import json,uuid,inspect,types,signal,asyncio,threading,inspect
 
 from fastcore.utils import *
 from fastcore.xml import *
@@ -260,7 +260,7 @@ async def _send_ws(ws, resp):
 
 def _ws_endp(recv, conn=None, disconn=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 {}, _params(handler))
         resp = await _handle(handler, wd)
@@ -285,13 +285,13 @@ def EventStream(s):
 
 # %% ../nbs/api/00_core.ipynb
 def signal_shutdown():
+    from uvicorn.main import Server
     event = asyncio.Event()
-    def signal_handler(signum, frame):
+    @patch
+    def handle_exit(self:Server, *args, **kwargs):
         event.set()
-        signal.signal(signum, signal.SIG_DFL)
-        os.kill(os.getpid(), signum)
-
-    for sig in (signal.SIGINT, signal.SIGTERM): signal.signal(sig, signal_handler)
+        self.force_exit = True
+        self._orig_handle_exit(*args, **kwargs)
     return event
 
 # %% ../nbs/api/00_core.ipynb
@@ -299,7 +299,7 @@ def uri(_arg, **kwargs):
     return f"{quote(_arg)}/{urlencode(kwargs, doseq=True)}"
 
 # %% ../nbs/api/00_core.ipynb
-def decode_uri(s): 
+def decode_uri(s):
     arg,_,kw = s.partition('/')
     return unquote(arg), {k:v[0] for k,v in parse_qs(kw).items()}
 
@@ -329,7 +329,7 @@ def _url_for(req, t):
     if callable(t): t = t.__routename__
     kw = {}
     if t.find('/')>-1 and (t.find('?')<0 or t.find('/')<t.find('?')): t,kw = decode_uri(t)
-    t,m,q = t.partition('?')    
+    t,m,q = t.partition('?')
     return f"{req.url_path_for(t, **kw)}{m}{q}"
 
 def _find_targets(req, resp):
@@ -397,28 +397,28 @@ def _xt_cts(req, resp):
     return _to_xml(req, resp, indent=fh_cfg.indent), http_hdrs, ts
 
 # %% ../nbs/api/00_core.ipynb
-def _xt_resp(req, resp):
+def _xt_resp(req, resp, status_code):
     cts,http_hdrs,tasks = _xt_cts(req, resp)
-    return HTMLResponse(cts, headers=http_hdrs, background=tasks)
+    return HTMLResponse(cts, status_code=status_code, headers=http_hdrs, background=tasks)
 
 # %% ../nbs/api/00_core.ipynb
 def _is_ft_resp(resp): return isinstance(resp, _iter_typs+(HttpHeader,FT)) or hasattr(resp, '__ft__')
 
 # %% ../nbs/api/00_core.ipynb
-def _resp(req, resp, cls=empty):
+def _resp(req, resp, cls=empty, status_code=200):
     if not resp: resp=()
     if hasattr(resp, '__response__'): resp = resp.__response__(req)
     if cls in (Any,FT): cls=empty
     if isinstance(resp, FileResponse) and not os.path.exists(resp.path): raise HTTPException(404, resp.path)
-    if cls is not empty: return cls(resp)
-    if isinstance(resp, Response): return resp
-    if _is_ft_resp(resp): return _xt_resp(req, resp)
+    if cls is not empty: return cls(resp, status_code=status_code)
+    if isinstance(resp, Response): return resp # respect manually set status_code
+    if _is_ft_resp(resp): return _xt_resp(req, resp, status_code)
     if isinstance(resp, str): cls = HTMLResponse
     elif isinstance(resp, Mapping): cls = JSONResponse
     else:
         resp = str(resp)
         cls = HTMLResponse
-    return cls(resp)
+    return cls(resp, status_code=status_code)
 
 # %% ../nbs/api/00_core.ipynb
 class Redirect:
@@ -467,19 +467,25 @@ def get_key(key=None, fname='.sesskey'):
 def _list(o): return [] if not o else list(o) if isinstance(o, (tuple,list)) else [o]
 
 # %% ../nbs/api/00_core.ipynb
-def _wrap_ex(f, hdrs, ftrs, htmlkw, bodykw, body_wrap):
+def _wrap_ex(f, status_code, hdrs, ftrs, htmlkw, bodykw, body_wrap):
     async def _f(req, exc):
         req.hdrs,req.ftrs,req.htmlkw,req.bodykw = map(deepcopy, (hdrs, ftrs, htmlkw, bodykw))
         req.body_wrap = body_wrap
         res = await _handle(f, (req, exc))
-        return _resp(req, res)
+        return _resp(req, res, status_code=status_code)
     return _f
 
 # %% ../nbs/api/00_core.ipynb
 def qp(p:str, **kw) -> str:
-    "Add query parameters to path p"
-    kw = {k:('' if v in (False,None) else v) for k,v in kw.items()}
-    return p + ('?' + urlencode(kw,doseq=True) if kw else '')
+    "Add parameters kw to path p"
+    def _sub(m):
+        pre,post = m.groups()
+        if pre not in kw: return f'{{{pre}{post or ""}}}'
+        pre = kw.pop(pre)
+        return '' if pre in (False,None) else str(pre)
+    p = re.sub(r'\{([^:}]+)(:.+?)?}', _sub, p)
+    # encode query params
+    return p + ('?' + urlencode({k:'' if v in (False,None) else v for k,v in kw.items()},doseq=True) if kw else '')
 
 # %% ../nbs/api/00_core.ipynb
 def def_hdrs(htmx=True, surreal=True):
@@ -523,7 +529,8 @@ class FastHTML(Starlette):
             from IPython.display import display,HTML
             if nb_hdrs: display(HTML(to_xml(tuple(hdrs))))
             middleware.append(cors_allow)
-        self.on_startup,self.on_shutdown,self.lifespan,self.hdrs,self.ftrs = on_startup,on_shutdown,lifespan,hdrs,ftrs
+        on_startup,on_shutdown = listify(on_startup) or None,listify(on_shutdown) or None
+        self.lifespan,self.hdrs,self.ftrs = lifespan,hdrs,ftrs
         self.body_wrap,self.before,self.after,self.htmlkw,self.bodykw = body_wrap,before,after,htmlkw,bodykw
         secret_key = get_key(secret_key, key_fname)
         if sess_cls:
@@ -532,12 +539,12 @@ class FastHTML(Starlette):
                               https_only=sess_https_only, domain=sess_domain)
             middleware.append(sess)
         exception_handlers = ifnone(exception_handlers, {})
-        if 404 not in exception_handlers: 
-            def _not_found(req, exc): return  Response('404 Not Found', status_code=404)  
+        if 404 not in exception_handlers:
+            def _not_found(req, exc): return  Response('404 Not Found', status_code=404)
             exception_handlers[404] = _not_found
-        excs = {k:_wrap_ex(v, hdrs, ftrs, htmlkw, bodykw, body_wrap=body_wrap) for k,v in exception_handlers.items()}
+        excs = {k:_wrap_ex(v, k, hdrs, ftrs, htmlkw, bodykw, body_wrap=body_wrap) for k,v in exception_handlers.items()}
         super().__init__(debug, routes, middleware=middleware, exception_handlers=excs, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan)
-    
+
     def add_route(self, route):
         route.methods = [m.upper() for m in listify(route.methods)]
         self.router.routes = [r for r in self.router.routes if not
@@ -635,7 +642,7 @@ def serve(
         reload=True, # Default is to reload the app upon code changes
         reload_includes:list[str]|str|None=None, # Additional files to watch for changes
         reload_excludes:list[str]|str|None=None # Files to ignore for changes
-        ): 
+        ):
     "Run the app in an async server, with live reload set as the default."
     bk = inspect.currentframe().f_back
     glb = bk.f_globals
@@ -643,6 +650,7 @@ def serve(
     if not appname:
         if glb.get('__name__')=='__main__': appname = Path(glb.get('__file__', '')).stem
         elif code.co_name=='main' and bk.f_back.f_globals.get('__name__')=='__main__': appname = inspect.getmodule(bk).__name__
+    import uvicorn
     if appname:
         if not port: port=int(os.getenv("PORT", default=5001))
         print(f'Link: http://{"localhost" if host=="0.0.0.0" else host}:{port}')
@@ -664,7 +672,7 @@ for o in ('get', 'post', 'delete', 'put', 'patch', 'options'): setattr(Client, o
 class RouteFuncs:
     def __init__(self): super().__setattr__('_funcs', {})
     def __setattr__(self, name, value): self._funcs[name] = value
-    def __getattr__(self, name): 
+    def __getattr__(self, name):
         if name in all_meths: raise AttributeError("Route functions with HTTP Names are not accessible here")
         try: return self._funcs[name]
         except KeyError: raise AttributeError(f"No route named {name} found in route functions")
@@ -673,7 +681,7 @@ class RouteFuncs:
 # %% ../nbs/api/00_core.ipynb
 class APIRouter:
     "Add routes to an app"
-    def __init__(self, prefix:str|None=None, body_wrap=noop_body): 
+    def __init__(self, prefix:str|None=None, body_wrap=noop_body):
         self.routes,self.wss = [],[]
         self.rt_funcs = RouteFuncs()  # Store wrapped route function for discoverability
         self.prefix = prefix if prefix else ""
@@ -695,7 +703,7 @@ class APIRouter:
             self.routes.append((func, p, methods, name, include_in_schema, body_wrap or self.body_wrap))
             return wrapped
         return f(path) if callable(path) else f
-    
+
     def __getattr__(self, name):
         try: return getattr(self.rt_funcs, name)
         except AttributeError: return super().__getattr__(self, name)
@@ -704,7 +712,7 @@ class APIRouter:
         "Add routes to `app`"
         for args in self.routes: app._add_route(*args)
         for args in self.wss: app._add_ws(*args)
-        
+
     def ws(self, path:str, conn=None, disconn=None, name=None, middleware=None):
         "Add a websocket route at `path`"
         def f(func=noop): return self.wss.append((func, f"{self.prefix}{path}", conn, disconn, name, middleware))
@@ -739,7 +747,7 @@ def reg_re_param(m, s):
 # %% ../nbs/api/00_core.ipynb
 # Starlette doesn't have the '?', so it chomps the whole remaining URL
 reg_re_param("path", ".*?")
-reg_re_param("static", "ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map")
+reg_re_param("static", "ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map|pdf")
 
 @patch
 def static_route_exts(self:FastHTML, prefix='/', static_path='.', exts='static'):
@@ -768,7 +776,7 @@ class FtResponse:
     def __init__(self, content, status_code:int=200, headers=None, cls=HTMLResponse, media_type:str|None=None):
         self.content,self.status_code,self.headers = content,status_code,headers
         self.cls,self.media_type = cls,media_type
-    
+
     def __response__(self, req):
         cts,httphdrs,tasks = _xt_cts(req, self.content)
         headers = {**(self.headers or {}), **httphdrs}

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/fasthtml/core.pyi

@@ -1,6 +1,6 @@
 """The `FastHTML` subclass of `Starlette`, along with the `RouterX` and `RouteX` classes it automatically uses."""
-__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc', 'fhjsscr', 'surrsrc', 'scopesrc', 'viewport', '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', 'def_hdrs', 'FastHTML', 'serve', 'Client', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
-import json, uuid, inspect, types, uvicorn, signal, asyncio, threading
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc', 'fhjsscr', 'surrsrc', 'scopesrc', 'viewport', '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', 'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid', 'setup_ws']
+import json, uuid, inspect, types, uvicorn, signal, asyncio, threading, inspect
 from fastcore.utils import *
 from fastcore.xml import *
 from fastcore.meta import use_kwargs_dict
@@ -167,6 +167,7 @@ def _apply_ft(o):
 
 def _to_xml(req, resp, indent):
     ...
+_iter_typs = (tuple, list, map, filter, range, types.GeneratorType)
 
 def flat_tuple(o):
     """Flatten lists"""
@@ -183,13 +184,13 @@ def respond(req, heads, bdy):
 def _xt_cts(req, resp):
     ...
 
-def _xt_resp(req, resp):
+def _xt_resp(req, resp, status_code):
     ...
 
 def _is_ft_resp(resp):
     ...
 
-def _resp(req, resp, cls=empty):
+def _resp(req, resp, cls=empty, status_code=200):
     ...
 
 class Redirect:
@@ -203,9 +204,9 @@ class Redirect:
 
 async def _wrap_call(f, req, params):
     ...
-htmx_exts = {'head-support': 'https://unpkg.com/htmx-ext-head-support@2.0.1/head-support.js', 'preload': 'https://unpkg.com/htmx-ext-preload@2.0.1/preload.js', 'class-tools': 'https://unpkg.com/htmx-ext-class-tools@2.0.1/class-tools.js', 'loading-states': 'https://unpkg.com/htmx-ext-loading-states@2.0.0/loading-states.js', 'multi-swap': 'https://unpkg.com/htmx-ext-multi-swap@2.0.0/multi-swap.js', 'path-deps': 'https://unpkg.com/htmx-ext-path-deps@2.0.0/path-deps.js', 'remove-me': 'https://unpkg.com/htmx-ext-remove-me@2.0.0/remove-me.js', 'ws': 'https://unpkg.com/htmx-ext-ws/ws.js', 'chunked-transfer': 'https://unpkg.com/htmx-ext-transfer-encoding-chunked/transfer-encoding-chunked.js'}
-htmxsrc = Script(src='https://unpkg.com/htmx.org@next/dist/htmx.min.js')
-fhjsscr = Script(src='https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js@1.0.4/fasthtml.js')
+htmx_exts = {'head-support': 'https://unpkg.com/htmx-ext-head-support@2.0.3/head-support.js', 'preload': 'https://unpkg.com/htmx-ext-preload@2.1.0/preload.js', 'class-tools': 'https://unpkg.com/htmx-ext-class-tools@2.0.1/class-tools.js', 'loading-states': 'https://unpkg.com/htmx-ext-loading-states@2.0.0/loading-states.js', 'multi-swap': 'https://unpkg.com/htmx-ext-multi-swap@2.0.0/multi-swap.js', 'path-deps': 'https://unpkg.com/htmx-ext-path-deps@2.0.0/path-deps.js', 'remove-me': 'https://unpkg.com/htmx-ext-remove-me@2.0.0/remove-me.js', 'ws': 'https://unpkg.com/htmx-ext-ws@2.0.2/ws.js', 'chunked-transfer': 'https://unpkg.com/htmx-ext-transfer-encoding-chunked@0.4.0/transfer-encoding-chunked.js'}
+htmxsrc = Script(src='https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js')
+fhjsscr = Script(src='https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js@1.0.12/fasthtml.js')
 surrsrc = Script(src='https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js')
 scopesrc = Script(src='https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js')
 viewport = Meta(name='viewport', content='width=device-width, initial-scale=1, viewport-fit=cover')
@@ -217,10 +218,11 @@ def get_key(key=None, fname='.sesskey'):
 def _list(o):
     ...
 
-def _wrap_ex(f, hdrs, ftrs, htmlkw, bodykw, body_wrap):
+def _wrap_ex(f, status_code, hdrs, ftrs, htmlkw, bodykw, body_wrap):
     ...
 
-def _mk_locfunc(f, p):
+def qp(p: str, **kw) -> str:
+    """Add query parameters to path p"""
     ...
 
 def def_hdrs(htmx=True, surreal=True):
@@ -231,7 +233,7 @@ iframe_scr = Script(NotStr("\n    function sendmsg() {\n        window.parent.po
 
 class FastHTML(Starlette):
 
-    def __init__(self, debug=False, routes=None, middleware=None, exception_handlers=None, on_startup=None, on_shutdown=None, lifespan=None, hdrs=None, ftrs=None, exts=None, before=None, after=None, surreal=True, htmx=True, default_hdrs=True, sess_cls=SessionMiddleware, 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', body_wrap=noop_body, htmlkw=None, nb_hdrs=True, **bodykw):
+    def __init__(self, debug=False, routes=None, middleware=None, title: str='FastHTML page', exception_handlers=None, on_startup=None, on_shutdown=None, lifespan=None, hdrs=None, ftrs=None, exts=None, before=None, after=None, surreal=True, htmx=True, default_hdrs=True, sess_cls=SessionMiddleware, 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', body_wrap=noop_body, htmlkw=None, nb_hdrs=False, **bodykw):
         ...
 
     def add_route(self, route):
@@ -250,7 +252,7 @@ class FastHTML(Starlette):
     def _add_route(self, func, path, methods, name, include_in_schema, body_wrap):
         ...
 
-    def route(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=noop_body):
+    def route(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):
         """Add a route at `path`"""
         ...
 
@@ -262,6 +264,13 @@ class FastHTML(Starlette):
         """Add a static route at URL path `prefix` with files from `static_path` and single `ext` (including the '.')"""
         ...
 all_meths = 'get post put delete patch head trace options'.split()
+
+def _mk_locfunc(f, p):
+    ...
+
+def nested_name(f):
+    """Get name of function `f` using '_' to join nested function names"""
+    ...
 for o in all_meths:
     setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
 
@@ -280,21 +289,41 @@ class Client:
 for o in ('get', 'post', 'delete', 'put', 'patch', 'options'):
     setattr(Client, o, partialmethod(Client._sync, o))
 
+class RouteFuncs:
+
+    def __init__(self):
+        ...
+
+    def __setattr__(self, name, value):
+        ...
+
+    def __getattr__(self, name):
+        ...
+
+    def __dir__(self):
+        ...
+
 class APIRouter:
     """Add routes to an app"""
 
-    def __init__(self):
+    def __init__(self, prefix: str | None=None, body_wrap=noop_body):
         ...
 
-    def __call__(self: FastHTML, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=noop_body):
+    def _wrap_func(self, func, path=None):
+        ...
+
+    def __call__(self, path: str=None, methods=None, name=None, include_in_schema=True, body_wrap=None):
         """Add a route at `path`"""
         ...
 
+    def __getattr__(self, name):
+        ...
+
     def to_app(self, app):
         """Add routes to `app`"""
         ...
 
-    def ws(self: FastHTML, path: str, conn=None, disconn=None, name=None, middleware=None):
+    def ws(self, path: str, conn=None, disconn=None, name=None, middleware=None):
         """Add a websocket route at `path`"""
         ...
 for o in all_meths:
@@ -307,7 +336,7 @@ def cookie(key: str, value='', max_age=None, expires=None, path='/', domain=None
 def reg_re_param(m, s):
     ...
 reg_re_param('path', '.*?')
-reg_re_param('static', 'ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map')
+reg_re_param('static', 'ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html|map|pdf')
 
 class MiddlewareBase:
 

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/fasthtml/jupyter.py

@@ -4,7 +4,7 @@
 
 # %% auto 0
 __all__ = ['nb_serve', 'nb_serve_async', 'is_port_free', 'wait_port_free', 'show', 'render_ft', 'htmx_config_port', 'JupyUvi',
-           'HTMX', 'ws_client']
+           'JupyUviAsync', 'HTMX', 'ws_client']
 
 # %% ../nbs/api/06_jupyter.ipynb
 import asyncio, socket, time, uvicorn
@@ -92,6 +92,19 @@ class JupyUvi:
         self.server.should_exit = True
         wait_port_free(self.port)
 
+# %% ../nbs/api/06_jupyter.ipynb
+class JupyUviAsync(JupyUvi):
+    "Start and stop an async Jupyter compatible uvicorn server with ASGI `app` on `port` with `log_level`"
+    def __init__(self, app, log_level="error", host='0.0.0.0', port=8000, **kwargs):
+        super().__init__(app, log_level=log_level, host=host, port=port, start=False, **kwargs)
+
+    async def start(self):
+        self.server = await nb_serve_async(self.app, log_level=self.log_level, host=self.host, port=self.port, **self.kwargs)
+
+    def stop(self):
+        self.server.should_exit = True
+        wait_port_free(self.port)
+
 # %% ../nbs/api/06_jupyter.ipynb
 def HTMX(path="", app=None, host='localhost', port=8000, height="auto", link=False, iframe=True):
     "An iframe which displays the HTMX application in a notebook."

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/fasthtml/xtend.pyi

@@ -33,11 +33,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, ft_cls=None, auto_id=None, **kwargs) -> FT:
+def Script(code: str='', *, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, **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, ft_cls=None, auto_id=None, **kwargs) -> FT:
+def Style(*c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, **kwargs) -> FT:
     """A Style tag that doesn't escape its code"""
     ...
 

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.11.0
+Version: 0.12.1
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard and contributors
@@ -22,7 +22,7 @@ Requires-Dist: oauthlib
 Requires-Dist: itsdangerous
 Requires-Dist: uvicorn[standard]>=0.30
 Requires-Dist: httpx
-Requires-Dist: fastlite>=0.0.9
+Requires-Dist: fastlite>=0.1.1
 Requires-Dist: python-multipart
 Requires-Dist: beautifulsoup4
 Provides-Extra: dev
@@ -185,3 +185,51 @@ Finally, join the FastHTML community to ask questions, share your work,
 and learn from others:
 
 - [Discord](https://discord.gg/qcXvcxMhdP)
+
+## Other languages and related projects
+
+If you’re not a Python user, or are keen to try out a new language,
+we’ll list here other projects that have a similar approach to FastHTML.
+(Please reach out if you know of any other projects that you’d like to
+see added.)
+
+- [htmgo](https://htmgo.dev/) (Go): “*htmgo is a lightweight pure go way
+  to build interactive websites / web applications using go & htmx. By
+  combining the speed & simplicity of go + hypermedia attributes (htmx)
+  to add interactivity to websites, all conveniently wrapped in pure go,
+  you can build simple, fast, interactive websites without touching
+  javascript. All compiled to a single deployable binary*”
+
+If you’re just interested in functional HTML components, rather than a
+full HTMX server solution, consider:
+
+- [fastcore.xml.FT](https://fastcore.fast.ai/xml.html): This is actually
+  what FastHTML uses behind the scenes
+- [htpy](https://htpy.dev/): Similar to
+  [`fastcore.xml.FT`](https://fastcore.fast.ai/xml.html#ft), but with a
+  somewhat different syntax
+- [elm-html](https://package.elm-lang.org/packages/elm/html/latest/):
+  Elm’s built-in HTML library with a type-safe functional approach
+- [hiccup](https://github.com/weavejester/hiccup): Popular library for
+  representing HTML in Clojure using vectors
+- [hiccl](https://github.com/garlic0x1/hiccl): HTML generation library
+  for Common Lisp inspired by Clojure’s Hiccup
+- [Falco.Markup](https://github.com/pimbrouwers/Falco): F# HTML DSL and
+  web framework with type-safe HTML generation
+- [Lucid](https://github.com/chrisdone/lucid): Type-safe HTML generation
+  for Haskell using monad transformers
+- [dream-html](https://github.com/aantron/dream): Part of the Dream web
+  framework for OCaml, provides type-safe HTML templating
+
+For other hypermedia application platforms, not based on HTMX, take a
+look at:
+
+- [Hotwire/Turbo](https://turbo.hotwired.dev/): Rails-oriented framework
+  that similarly uses HTML-over-the-wire
+- [LiveView](https://hexdocs.pm/phoenix_live_view/Phoenix.LiveView.html):
+  Phoenix framework’s solution for building interactive web apps with
+  minimal JavaScript
+- [Unpoly](https://unpoly.com/): Another HTML-over-the-wire framework
+  with progressive enhancement
+- [Livewire](https://laravel-livewire.com/): Laravel’s take on building
+  dynamic interfaces with minimal JavaScript

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/python_fasthtml.egg-info/requires.txt

@@ -5,7 +5,7 @@ oauthlib
 itsdangerous
 uvicorn[standard]>=0.30
 httpx
-fastlite>=0.0.9
+fastlite>=0.1.1
 python-multipart
 beautifulsoup4
 

{python_fasthtml-0.11.0 → python_fasthtml-0.12.1}/settings.ini

@@ -1,10 +1,10 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.11.0
+version = 0.12.1
 min_python = 3.10
 license = apache2
-requirements = fastcore>=1.7.18 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.9 python-multipart beautifulsoup4
+requirements = fastcore>=1.7.18 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.1.1 python-multipart beautifulsoup4
 dev_requirements = ipython lxml pysymbol_llm
 black_formatting = False
 conda_user = fastai
@@ -16,8 +16,8 @@ tst_flags = notest
 put_version_in_init = True
 branch = main
 custom_sidebar = False
-doc_host = https://AnswerDotAI.github.io
-doc_baseurl = /fasthtml
+doc_host = https://docs.fastht.ml
+doc_baseurl = /
 git_url = https://github.com/AnswerDotAI/fasthtml
 title = fasthtml
 audience = Developers

python_fasthtml-0.11.0/fasthtml/__init__.py

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