python-fasthtml 0.3.7__tar.gz → 0.4.0__tar.gz

{python-fasthtml-0.3.7/python_fasthtml.egg-info → python-fasthtml-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.3.7
+Version: 0.4.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.6.9
+Requires-Dist: fastcore>=1.7.0
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

python-fasthtml-0.4.0/fasthtml/__init__.py

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

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/fasthtml/_modidx.py

@@ -6,6 +6,7 @@ d = { 'settings': { 'branch': 'main',
                 'git_url': 'https://github.com/AnswerDotAI/fasthtml',
                 'lib_path': 'fasthtml'},
   'syms': { 'fasthtml.authmw': {},
+            'fasthtml.basics': {},
             'fasthtml.cli': { 'fasthtml.cli._run': ('api/cli.html#_run', 'fasthtml/cli.py'),
                               'fasthtml.cli.railway_deploy': ('api/cli.html#railway_deploy', 'fasthtml/cli.py'),
                               'fasthtml.cli.railway_link': ('api/cli.html#railway_link', 'fasthtml/cli.py')},

python-fasthtml-0.4.0/fasthtml/basics.py

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

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/fasthtml/common.py

@@ -6,6 +6,9 @@ from fastcore.utils import *
 from fastcore.xml import *
 from sqlite_minutils import Database
 from fastlite import *
-from . import *
+from .basics import *
+from .authmw import *
+from .live_reload import *
+from .toaster import *
 from .js import *
 from .fastapp import *

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/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 fastcore.test import *
 from .core import fh_cfg
 
 import types, json
@@ -53,7 +54,7 @@ def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=Non
     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, valmap=valmap, **kwargs)
+    tag,c,kw = ft(tag, *c, attrmap=attrmap, valmap=valmap, **kwargs).list
     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)
 
@@ -85,7 +86,7 @@ def File(fname):
 # %% ../nbs/api/01_components.ipynb
 def _fill_item(item, obj):
     if not isinstance(item,list): return item
-    tag,cs,attr = item
+    tag,cs,attr = item.list
     if isinstance(cs,tuple): cs = tuple(_fill_item(o, obj) for o in cs)
     name = attr.get('name', None)
     val = None if name is None else obj.get(name, None)
@@ -117,14 +118,14 @@ 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`"
-    if not isinstance(e, (list,tuple)): return []
+    if not isinstance(e, (list,tuple,FT)): return []
     inputs = []
     if isinstance(tags,str): tags = [tags]
     elif tags is None: tags = []
     cs = e
-    if isinstance(e, list):
-        tag,cs,attr = e
-        if e[0] in tags and kw.items()<=e[2].items(): inputs.append(e)
+    if isinstance(e, FT):
+        tag,cs,attr = e.list
+        if tag in tags and kw.items()<=attr.items(): inputs.append(e)
     for o in cs: inputs += find_inputs(o, tags, **kw)
     return inputs
 

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/fasthtml/core.py

@@ -189,11 +189,11 @@ async def _wrap_req(req, params):
 
 # %% ../nbs/api/00_core.ipynb
 def flat_xt(lst):
-    "Flatten lists, except for `FT`s"
+    "Flatten lists"
     result = []
     if isinstance(lst,(FT,str)): lst=[lst]
     for item in lst:
-        if isinstance(item, (list,tuple)) and not isinstance(item, FT): result.extend(item)
+        if isinstance(item, (list,tuple)): result.extend(item)
         else: result.append(item)
     return result
 
@@ -234,7 +234,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, indent=fh_cfg.indent) if isinstance(resp, (list,tuple)) or hasattr(resp, '__ft__') else resp
+    res = to_xml(resp, indent=fh_cfg.indent) if isinstance(resp, (list,tuple,FT)) or hasattr(resp, '__ft__') else resp
     await ws.send_text(res)
 
 def _ws_endp(recv, conn=None, disconn=None, hdrs=None, before=None):
@@ -313,7 +313,7 @@ def _find_targets(req, resp):
 def _apply_ft(o):
     if isinstance(o, tuple): o = tuple(_apply_ft(c) for c in o)
     if hasattr(o, '__ft__'): o = o.__ft__()
-    if isinstance(o, FT): o[1] = [_apply_ft(c) for c in o[1]]
+    if isinstance(o, FT): o.children = [_apply_ft(c) for c in o.children]
     return o
 
 def _to_xml(req, resp, indent):
@@ -341,7 +341,7 @@ def _resp(req, resp, cls=empty):
     if isinstance(resp, FileResponse) and not os.path.exists(resp.path): raise HTTPException(404, resp.path)
     if isinstance(resp, Response): return resp
     if cls is not empty: return cls(resp)
-    if isinstance(resp, (list,tuple,HttpHeader)) or hasattr(resp, '__ft__'): return _xt_resp(req, resp)
+    if isinstance(resp, (list,tuple,HttpHeader,FT)) or hasattr(resp, '__ft__'): return _xt_resp(req, resp)
     if isinstance(resp, str): cls = HTMLResponse
     elif isinstance(resp, Mapping): cls = JSONResponse
     else:

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/fasthtml/fastapp.py

@@ -6,7 +6,8 @@ from __future__ import annotations
 import inspect,uvicorn
 from fastcore.utils import *
 from fastlite import *
-from . import *
+from .basics import *
+from .starlette import *
 from .live_reload import FastHTMLWithLiveReload
 
 # %% auto 0

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/fasthtml/js.py

@@ -79,7 +79,7 @@ htmx.onLoad(hljs.highlightAll);""" % sel
 # %% ../nbs/api/03_js.ipynb
 def SortableJS(
         sel='.sortable',  # CSS selector for sortable elements
-        ghost_class='blue-background-class'  # When an element is being dragged, this is the class used to distingish it from the rest
+        ghost_class='blue-background-class'  # When an element is being dragged, this is the class used to distinguish it from the rest
     ):
     src = """
 import {Sortable} from 'https://cdn.jsdelivr.net/npm/sortablejs/+esm';

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/fasthtml/live_reload.py

@@ -1,5 +1,5 @@
 from starlette.routing import WebSocketRoute
-from fasthtml import FastHTML, Script
+from fasthtml.basics import FastHTML, Script
 
 __all__ = ["FastHTMLWithLiveReload"]
 

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.3.7
+Version: 0.4.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.6.9
+Requires-Dist: fastcore>=1.7.0
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/python_fasthtml.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ setup.py
 fasthtml/__init__.py
 fasthtml/_modidx.py
 fasthtml/authmw.py
+fasthtml/basics.py
 fasthtml/cli.py
 fasthtml/common.py
 fasthtml/components.py

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.6.9
+fastcore>=1.7.0
 python-dateutil
 starlette>0.33
 oauthlib

{python-fasthtml-0.3.7 → python-fasthtml-0.4.0}/settings.ini

@@ -1,10 +1,10 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.3.7
+version = 0.4.0
 min_python = 3.10
 license = apache2
-requirements = fastcore>=1.6.9 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.6 python-multipart beautifulsoup4
+requirements = fastcore>=1.7.0 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

python-fasthtml-0.3.7/fasthtml/__init__.py

@@ -1,7 +0,0 @@
-__version__ = "0.3.7"
-from .core import *
-from .authmw import *
-from .components import *
-from .xtend import *
-from .live_reload import *
-from .toaster import *