python-fasthtml 0.0.11__tar.gz → 0.0.14__tar.gz

{python-fasthtml-0.0.11/python_fasthtml.egg-info → python-fasthtml-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.0.11
+Version: 0.0.14
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -24,6 +24,7 @@ Requires-Dist: uvicorn[standard]
 Requires-Dist: httpx
 Requires-Dist: fastlite>=0.0.6
 Requires-Dist: python-multipart
+Requires-Dist: beautifulsoup4
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: lxml; extra == "dev"

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14}/fasthtml/__init__.py

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

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14}/fasthtml/_modidx.py

@@ -13,6 +13,7 @@ d = { 'settings': { 'branch': 'main',
                                      'fasthtml.components.fill_dataclass': ('components.html#fill_dataclass', 'fasthtml/components.py'),
                                      'fasthtml.components.fill_form': ('components.html#fill_form', 'fasthtml/components.py'),
                                      'fasthtml.components.find_inputs': ('components.html#find_inputs', 'fasthtml/components.py'),
+                                     'fasthtml.components.html2xt': ('components.html#html2xt', 'fasthtml/components.py'),
                                      'fasthtml.components.show': ('components.html#show', 'fasthtml/components.py'),
                                      'fasthtml.components.xt_html': ('components.html#xt_html', 'fasthtml/components.py'),
                                      'fasthtml.components.xt_hx': ('components.html#xt_hx', 'fasthtml/components.py')},
@@ -43,5 +44,8 @@ d = { 'settings': { 'branch': 'main',
                                 'fasthtml.xtend.Group': ('xtend.html#group', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Hidden': ('xtend.html#hidden', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Html': ('xtend.html#html', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.Script': ('xtend.html#script', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Search': ('xtend.html#search', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.Style': ('xtend.html#style', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.jsd': ('xtend.html#jsd', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.set_pico_cls': ('xtend.html#set_pico_cls', 'fasthtml/xtend.py')}}}

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14}/fasthtml/all.py

@@ -1,7 +1,10 @@
+import uvicorn
+
 from .starlette import *
 from fastcore.utils import *
 from fastcore.xml import *
 from sqlite_minutils import Database
 from fastlite import *
 from . import *
+from .js import *
 

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14}/fasthtml/components.py

@@ -1,18 +1,20 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_components.ipynb.
 
 # %% auto 0
-__all__ = ['named', 'html_attrs', 'hx_attrs', 'show', 'xt_html', 'xt_hx', 'fill_form', 'fill_dataclass', 'find_inputs', 'Html',
-           'Head', 'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code', 'Div', 'Span', 'P', 'H1', 'H2', 'H3', 'H4',
-           'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br', 'Img', 'Nav', 'Ul', 'Ol',
-           'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td', 'Caption', 'Col', 'Colgroup',
-           'Form', 'Input', 'Textarea', 'Button', 'Select', 'Option', 'Label', 'Fieldset', 'Legend', 'Details',
-           'Dialog', 'Summary', 'Main', 'Header', 'Footer', 'Section', 'Article', 'Aside', 'Figure', 'Figcaption',
-           'Mark', 'Small', 'Iframe', 'Object', 'Embed', 'Param', 'Video', 'Audio', 'Source', 'Canvas', 'Svg', 'Math',
-           'Script', 'Noscript', 'Template', 'Slot']
+__all__ = ['named', 'html_attrs', 'hx_attrs', 'show', 'xt_html', 'xt_hx', 'fill_form', 'fill_dataclass', 'find_inputs', 'html2xt',
+           'Html', 'Head', 'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code', 'Div', 'Span', 'P', 'H1', 'H2',
+           'H3', 'H4', 'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br', 'Img', 'Nav',
+           'Ul', 'Ol', 'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td', 'Caption', 'Col',
+           'Colgroup', 'Form', 'Input', 'Textarea', 'Button', 'Select', 'Option', 'Label', 'Fieldset', 'Legend',
+           'Details', 'Dialog', 'Summary', 'Main', 'Header', 'Footer', 'Section', 'Article', 'Aside', 'Figure',
+           'Figcaption', 'Mark', 'Small', 'Iframe', 'Object', 'Embed', 'Param', 'Video', 'Audio', 'Source', 'Canvas',
+           'Svg', 'Math', 'Script', 'Noscript', 'Template', 'Slot']
 
 # %% ../nbs/01_components.ipynb 2
 from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING
 
+from bs4 import BeautifulSoup
+
 from fastcore.utils import *
 from fastcore.xml import *
 from fastcore.meta import use_kwargs, delegates
@@ -105,3 +107,28 @@ def __getattr__(tag):
     if tag.startswith('_') or tag[0].islower(): raise AttributeError
     def _f(*c, target_id=None, **kwargs): return xt_hx(tag, *c, target_id=target_id, **kwargs)
     return _f
+
+# %% ../nbs/01_components.ipynb 22
+def html2xt(html):
+    rev_map = {'class': 'cls', 'for': 'fr'}
+    
+    def _parse(elm, lvl=0):
+        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()
+        if tag_name=='[document]': return _parse(list(elm.children), lvl)
+        cts = elm.contents
+        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():
+            if isinstance(value,(tuple,list)): value = " ".join(value)
+            attrs.append(f'{rev_map.get(key, key)}={value!r}')
+        spc = " "*lvl*2
+        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 _parse(BeautifulSoup(html.strip(), 'html.parser'), 1)

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14}/fasthtml/core.py

@@ -2,6 +2,7 @@ import json,dateutil,uuid,inspect
 
 from fastcore.utils import *
 from fastcore.xml import *
+from fasthtml.xtend import *
 
 from types import UnionType, SimpleNamespace as ns
 from typing import Optional, get_type_hints, get_args, get_origin, Union, Mapping, TypedDict, List
@@ -13,6 +14,7 @@ from functools import wraps, partialmethod
 
 from .starlette import *
 
+__all__ = "is_typeddict is_namedtuple date snake2hyphens htmx_hdrs HtmxHeaders str2int HttpHeader form2dict RouteX RouterX FastHTML htmx_hdrs reg_re_param MiddlewareBase Beforeware get_key".split()
 
 empty = Parameter.empty
 
@@ -124,7 +126,6 @@ async def _find_p(req, arg:str, p):
     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:
-        #import pdb; pdb.set_trace()
         frm = await req.form()
         res = frm.getlist(arg)
         if res:
@@ -141,12 +142,20 @@ async def _wrap_req(req, params):
 @dataclass
 class HttpHeader: k:str;v:str
 
+def flat_xt(lst):
+    result = []
+    for item in lst:
+        if isinstance(item, (list,tuple)) and not isinstance(item, XT): result.extend(item)
+        else: result.append(item)
+    return result
+
 def _xt_resp(req, resp, hdrs, **bodykw):
     http_hdrs,resp = partition(resp, risinstance(HttpHeader))
     http_hdrs = {o.k:str(o.v) for o in http_hdrs}
     titles,bdy = partition(resp, lambda o: getattr(o, 'tag', '')=='title')
-    if resp and 'hx-request' not in req.headers and isinstance(resp,tuple) and titles:
-        resp = Html(Head(titles[0], *hdrs), Body(bdy, **bodykw))
+    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[0], *flat_xt(hdrs)), Body(bdy, **bodykw))
     return HTMLResponse(to_xml(resp), headers=http_hdrs)
 
 def _wrap_resp(req, resp, cls, hdrs, **bodykw):
@@ -208,6 +217,8 @@ class RouterX(Router):
 htmxscr = Script(
     src="https://unpkg.com/htmx.org@1.9.12", crossorigin="anonymous",
     integrity="sha384-ujb1lZYygJmzgSwoxRggbCHcjc0rB2XoQrxeTUQyRjrOnlCoYta87iKBWq3EsdM2")
+surrsrc  = Script(src="https://cdn.jsdelivr.net/gh/gnat/surreal/surreal.js")
+scopesrc = Script(src="https://cdn.jsdelivr.net/gh/gnat/css-scope-inline/script.js")
 
 def get_key(key=None, fname='.sesskey'):
     if key: return key
@@ -221,7 +232,7 @@ def _list(o): return [] if not o else o if isinstance(o, (tuple,list)) else [o]
 
 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, before=None,
+                 on_startup=None, on_shutdown=None, lifespan=None, hdrs=None, before=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', **bodykw):
         middleware,before = _list(middleware),_list(before)
@@ -231,7 +242,8 @@ class FastHTML(Starlette):
                           https_only=sess_https_only, domain=sess_domain)
         middleware.append(sess)
         super().__init__(debug, routes, middleware, exception_handlers, on_startup, on_shutdown, lifespan=lifespan)
-        hdrs = list([] if hdrs is None else hdrs) + [htmxscr]
+        hdrs = list([] if hdrs is None else hdrs)
+        if default_hdrs: hdrs = [htmxscr,surrsrc,scopesrc] + hdrs
         self.router = RouterX(routes, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, hdrs=hdrs,
                               before=before, **bodykw)
 

python-fasthtml-0.0.14/fasthtml/js.py

@@ -0,0 +1,48 @@
+from fastcore.utils import *
+from fasthtml.xtend import Script,jsd,Style
+
+def light_media(css): return Style('@media (prefers-color-scheme: light) {%s}' %css)
+def  dark_media(css): return Style('@media (prefers-color-scheme:  dark) {%s}' %css)
+
+def MarkdownJS(sel='.marked'):
+    src = """
+import { marked } from "https://cdn.jsdelivr.net/npm/marked/lib/marked.esm.js";
+import { proc_htmx} from "https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js/fasthtml.js";
+proc_htmx('%s', e => e.innerHTML = marked.parse(e.textContent));
+""" % sel
+    return Script(src, type='module')
+
+
+def HighlightJS(sel='pre code', langs='python', light='atom-one-light', dark='atom-one-dark'):
+    src = """
+hljs.addPlugin(new CopyButtonPlugin());
+hljs.configure({'cssSelector': '%s'});
+htmx.onLoad(hljs.highlightAll);""" % sel
+    hjs = 'highlightjs','cdn-release', 'build'
+    hjc = 'arronhunt'  ,'highlightjs-copy', 'dist'
+    if isinstance(langs, str): langs = [langs]
+    langjs = [jsd(*hjs, f'languages/{lang}.min.js') for lang in langs]
+    return [jsd(*hjs, f'styles/{dark}.css', typ='css', media="(prefers-color-scheme: dark)"),
+            jsd(*hjs, f'styles/{light}.css', typ='css', media="(prefers-color-scheme: light)"),
+            jsd(*hjs, f'highlight.min.js'),
+            jsd(*hjc, 'highlightjs-copy.min.js'),
+            jsd(*hjc, 'highlightjs-copy.min.css', typ='css'),
+            light_media('.hljs-copy-button {background-color: #2d2b57;}'),
+            *langjs, Script(src, type='module')]
+
+
+def SortableJS(sel='.sortable', ghost_class='blue-background-class'):
+    src = """
+import {Sortable} from 'https://cdn.jsdelivr.net/npm/sortablejs/+esm';
+import {proc_htmx} from "https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js/fasthtml.js";
+proc_htmx('%s', elm => {
+    const s = new Sortable(elm, {
+        animation: 150, ghostClass: '%s', filter: ".htmx-indicator",
+        onMove: e => !e.related.classList.contains('htmx-indicator'),
+        onEnd: () => s.option("disabled", true),
+    });
+    htmx.on("htmx:afterSwap", () => s.option("disabled", false), elm);
+});
+""" % (sel, ghost_class)
+    return Script(src, type='module')
+

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14}/fasthtml/xtend.py

@@ -2,7 +2,7 @@
 
 # %% auto 0
 __all__ = ['picocss', 'picolink', 'picocondcss', 'picocondlink', 'set_pico_cls', 'Html', 'A', 'AX', 'Checkbox', 'Card', 'Group',
-           'Search', 'Grid', 'DialogX', 'Hidden']
+           'Search', 'Grid', 'DialogX', 'Hidden', 'Script', 'Style', 'jsd']
 
 # %% ../nbs/02_xtend.ipynb 2
 from dataclasses import dataclass, asdict
@@ -96,3 +96,23 @@ def DialogX(*c, open=None, header=None, footer=None, id=None, **kwargs):
 @delegates(xt_hx, keep=True)
 def Hidden(value:str="", **kwargs):
     return Input(type="hidden", value=value, **kwargs)
+
+# %% ../nbs/02_xtend.ipynb 28
+@delegates(xt_html, keep=True)
+def Script(code:str="", **kwargs):
+    "A Script tag that doesn't escape its code"
+    return xt_html('script', NotStr(code), **kwargs)
+
+# %% ../nbs/02_xtend.ipynb 29
+@delegates(xt_html, keep=True)
+def Style(css:str="", **kwargs):
+    "A Style tag that doesn't escape its code"
+    return xt_html('style', NotStr(css), **kwargs)
+
+# %% ../nbs/02_xtend.ipynb 30
+def jsd(org, repo, root, path, typ='script', ver=None, esm=False, **kwargs):
+    "jsdelivr `Script` or CSS `Link` tag, or URL"
+    ver = '@'+ver if ver else ''
+    s = f'https://cdn.jsdelivr.net/gh/{org}/{repo}{ver}/{root}/{path}'
+    if esm: s += '/+esm'
+    return Script(src=s, **kwargs) if typ=='script' else Link(rel='stylesheet', href=s, **kwargs) if typ=='css' else s

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.0.11
+Version: 0.0.14
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -24,6 +24,7 @@ Requires-Dist: uvicorn[standard]
 Requires-Dist: httpx
 Requires-Dist: fastlite>=0.0.6
 Requires-Dist: python-multipart
+Requires-Dist: beautifulsoup4
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: lxml; extra == "dev"

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14}/python_fasthtml.egg-info/requires.txt

@@ -7,6 +7,7 @@ uvicorn[standard]
 httpx
 fastlite>=0.0.6
 python-multipart
+beautifulsoup4
 
 [dev]
 ipython

{python-fasthtml-0.0.11 → python-fasthtml-0.0.14}/settings.ini

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

python-fasthtml-0.0.11/fasthtml/js.py

@@ -1,29 +0,0 @@
-from fastcore.utils import *
-from fasthtml.components import Script
-
-def MarkdownJS(sel):
-    src = """
-import { marked } from "https://cdn.jsdelivr.net/npm/marked/lib/marked.esm.js";
-htmx.onLoad(elt => htmx.findAll(elt, "%s").forEach(e => e.innerHTML = marked.parse(e.textContent)));
-""" % sel
-    return Script(NotStr(src), type='module')
-
-def SortableJS(sel='.sortable', ghost_class='blue-background-class'):
-    src = """
-import {Sortable} from 'https://cdn.jsdelivr.net/npm/sortablejs/+esm';
-
-htmx.onLoad(content => {
-    content.querySelectorAll("%s").forEach(elm => {
-        const s = new Sortable(elm, {
-            animation: 150,
-            ghostClass: '%s',
-            filter: ".htmx-indicator",
-            onMove: e => !e.related.classList.contains('htmx-indicator'),
-            onEnd: () => s.option("disabled", true),
-        });
-        htmx.on("htmx:afterSwap", () => s.option("disabled", false), elm);
-    });
-})
-""" % (sel, ghost_class)
-    return Script(NotStr(src), type='module')
-