python-fasthtml 0.13.2__tar.gz → 0.13.4__tar.gz

{python_fasthtml-0.13.2/python_fasthtml.egg-info → python_fasthtml-0.13.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.13.2
+Version: 0.13.4
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
 License: Apache-2.0
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.12.16
+Requires-Dist: fastcore>=1.12.41
 Requires-Dist: python-dateutil
 Requires-Dist: starlette~=1.0
 Requires-Dist: oauthlib

python_fasthtml-0.13.4/fasthtml/__init__.py

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

{python_fasthtml-0.13.2 → python_fasthtml-0.13.4}/fasthtml/_modidx.py

@@ -40,6 +40,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.ApiReturn.__init__': ('api/core.html#apireturn.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.Beforeware': ('api/core.html#beforeware', 'fasthtml/core.py'),
                                'fasthtml.core.Beforeware.__init__': ('api/core.html#beforeware.__init__', 'fasthtml/core.py'),
+                               'fasthtml.core.Beforeware.__repr__': ('api/core.html#beforeware.__repr__', 'fasthtml/core.py'),
                                'fasthtml.core.Client': ('api/core.html#client', 'fasthtml/core.py'),
                                'fasthtml.core.Client.__init__': ('api/core.html#client.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.Client._sync': ('api/core.html#client._sync', 'fasthtml/core.py'),
@@ -103,7 +104,6 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._LifespanCtx.__init__': ('api/core.html#_lifespanctx.__init__', 'fasthtml/core.py'),
                                'fasthtml.core._add_ids': ('api/core.html#_add_ids', 'fasthtml/core.py'),
                                'fasthtml.core._annotations': ('api/core.html#_annotations', 'fasthtml/core.py'),
-                               'fasthtml.core._apply_ft': ('api/core.html#_apply_ft', 'fasthtml/core.py'),
                                'fasthtml.core._canonical': ('api/core.html#_canonical', 'fasthtml/core.py'),
                                'fasthtml.core._check_anno': ('api/core.html#_check_anno', 'fasthtml/core.py'),
                                'fasthtml.core._find_p': ('api/core.html#_find_p', 'fasthtml/core.py'),
@@ -133,6 +133,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._wrap_ws': ('api/core.html#_wrap_ws', 'fasthtml/core.py'),
                                'fasthtml.core._ws_endp': ('api/core.html#_ws_endp', 'fasthtml/core.py'),
                                'fasthtml.core._xt_cts': ('api/core.html#_xt_cts', 'fasthtml/core.py'),
+                               'fasthtml.core.add_sig_param': ('api/core.html#add_sig_param', 'fasthtml/core.py'),
                                'fasthtml.core.cookie': ('api/core.html#cookie', 'fasthtml/core.py'),
                                'fasthtml.core.decode_uri': ('api/core.html#decode_uri', 'fasthtml/core.py'),
                                'fasthtml.core.def_hdrs': ('api/core.html#def_hdrs', 'fasthtml/core.py'),
@@ -140,6 +141,9 @@ d = { 'settings': { 'branch': 'main',
                                '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.into': ('api/core.html#into', 'fasthtml/core.py'),
+                               'fasthtml.core.into.__call__': ('api/core.html#into.__call__', 'fasthtml/core.py'),
+                               'fasthtml.core.into.__init__': ('api/core.html#into.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.is_full_page': ('api/core.html#is_full_page', 'fasthtml/core.py'),
                                'fasthtml.core.nested_name': ('api/core.html#nested_name', 'fasthtml/core.py'),
                                'fasthtml.core.noop_body': ('api/core.html#noop_body', 'fasthtml/core.py'),

{python_fasthtml-0.13.2 → python_fasthtml-0.13.4}/fasthtml/core.py

@@ -9,7 +9,7 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            'flat_xt', 'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'noop_body',
            'respond', 'is_full_page', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'Lifespan', 'FastHTML', 'HostRoute',
            'nested_name', 'serve', 'Client', 'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'StaticNoCache',
-           'MiddlewareBase', 'FtResponse', 'unqid']
+           'add_sig_param', 'into', 'MiddlewareBase', 'FtResponse', 'unqid']
 
 # %% ../nbs/api/00_core.ipynb #23503b9e
 import json,uuid,inspect,types,asyncio,inspect,random,contextlib,httpx,itsdangerous,uvicorn
@@ -163,12 +163,15 @@ async def parse_form(req: Request) -> FormData:
     return await req.json() if ctype == 'application/json' else await req.form()
 
 
-# %% ../nbs/api/00_core.ipynb #089fe388
+# %% ../nbs/api/00_core.ipynb #0caedd04
 async def _from_body(conn, p, data):
     "Create an instance of the annotated type from pre-parsed `data`"
     anno = p.annotation
     ctor = getattr(anno, '__from_request__', None)
-    if ctor: return await maybe_await(ctor(data, conn))
+    if ctor:
+        ps = {k:v for k,v in _params(ctor).items() if k != 'cls'}
+        kwargs = await _find_ps(conn, data, conn.headers, ps)
+        return await maybe_await(ctor(**kwargs))
     d = _annotations(anno)
     cargs = {k: _form_arg(k, v, d) for k, v in data.items() if not d or k in d}
     return anno(**cargs)
@@ -184,10 +187,12 @@ class ApiReturn:
 # %% ../nbs/api/00_core.ipynb #7cc39ba9
 class JSONResponse(JSONResponseOrig):
     "Same as starlette's version, but auto-stringifies non serializable types"
-    def render(self, content: Any) -> bytes:
-        res = json.dumps(content, ensure_ascii=False, allow_nan=False, indent=None, separators=(",", ":"), default=str)
+    def render(self, content:Any)->bytes:
+        def _default(o): return list(o) if is_listy(o) else str(o)
+        res = json.dumps(content, ensure_ascii=False, allow_nan=False, indent=None, separators=(",",":"), default=_default)
         return res.encode("utf-8")
 
+
 # %% ../nbs/api/00_core.ipynb #5fa96e3a
 async def _find_p(conn, data, hdrs, arg:str, p:Parameter):
     "In `data` find param named `arg` of type in `p` (`arg` is ignored for body types)"
@@ -207,7 +212,7 @@ async def _find_p(conn, data, hdrs, arg:str, p:Parameter):
     if anno is empty:
         if arg.lower()=='ws' or 'request'.startswith(arg.lower()): return conn
         if 'session'.startswith(arg.lower()): return conn.scope.get('session', {})
-        if arg.lower()=='scope': return dict2obj(conn.scope)
+        if arg.lower()=='scope': return conn.scope
         if arg.lower()=='data': return data
         if arg.lower()=='htmx': return _get_htmx(hdrs)
         if arg.lower()=='app': return conn.scope['app']
@@ -260,6 +265,7 @@ def flat_xt(lst):
 # %% ../nbs/api/00_core.ipynb #aacff5ac
 class Beforeware:
     def __init__(self, f, skip=None): self.f,self.skip = f,skip or []
+    def __repr__(self): return f'Beforeware({self.f}, skip={self.skip})'
 
 # %% ../nbs/api/00_core.ipynb #78c3c357
 async def _handle(f, *args, **kwargs):
@@ -267,7 +273,7 @@ async def _handle(f, *args, **kwargs):
 
 # %% ../nbs/api/00_core.ipynb #ad0f0e87
 async def _wrap_ws(ws, data, params):
-    hdrs = Headers({k.lower():v for k,v in data.pop('HEADERS', {}).items()})
+    hdrs = Headers({k.lower():v for k,v in data.pop('HEADERS', {}).items() if v is not None})
     return await _find_ps(ws, data, hdrs, params)
 
 # %% ../nbs/api/00_core.ipynb #dcc15129
@@ -365,16 +371,8 @@ def _find_targets(req, resp):
             t = resp.attrs.pop(k, None)
             if t: resp.attrs[v] = _url_for(req, t)
 
-def _apply_ft(o):
-    "Apply FastTag transformation recursively to object `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.children = tuple(_apply_ft(c) for c in o.children)
-    return o
-
 def _to_xml(req, resp, indent):
     "Convert response to XML string with target URL resolution"
-    resp = _apply_ft(resp)
     _find_targets(req, resp)
     return to_xml(resp, indent=indent)
 
@@ -904,6 +902,43 @@ class StaticNoCache(StaticFiles):
         resp.headers.setdefault("Cache-Control", "no-cache")
         return resp
 
+# %% ../nbs/api/00_core.ipynb #7189daf8
+from functools import wraps
+from inspect import signature, isawaitable
+
+# %% ../nbs/api/00_core.ipynb #7eed23b7
+def add_sig_param(f, name, typ=NoneType, kind=Parameter.KEYWORD_ONLY, default=Parameter.empty):
+    "Add a parameter to a function's signature"
+    sig = signature(f)
+    if name in sig.parameters: return f
+    kw = {} if default is Parameter.empty else {'default': default}
+    new_params = list(sig.parameters.values()) + [Parameter(name, kind, **kw)]
+    f.__signature__ = sig.replace(parameters=new_params)
+    f.__annotations__[name] = typ
+    return f
+
+# %% ../nbs/api/00_core.ipynb #9e5a9e88
+class into:
+    "Decorator to pass a route's return value into `func`, with keyword params added to the route signature"
+    def __init__(self, func):
+        self.func = func
+        self.params = {k:p for k,p in signature(func).parameters.items()
+            if p.kind not in (Parameter.VAR_POSITIONAL, Parameter.VAR_KEYWORD)}
+
+    def __call__(self, f):
+        @wraps(f)
+        async def _inner(*args, **kw):
+            extra = {k: kw.pop(k, None) for k in self.params}
+            res = f(*args, **kw)
+            if isawaitable(res): res = await res
+            res = self.func(*tuplify(res), **extra)
+            if isawaitable(res): res = await res
+            return res
+        for k,p in self.params.items():
+            anno = p.annotation if p.annotation is not Parameter.empty else NoneType
+            add_sig_param(_inner, k, anno, default=p.default)
+        return _inner
+
 # %% ../nbs/api/00_core.ipynb #1960d7ff
 class MiddlewareBase:
     async def __call__(self, scope, receive, send) -> None:

{python_fasthtml-0.13.2 → python_fasthtml-0.13.4}/pyproject.toml

@@ -12,7 +12,7 @@ license = {text = "Apache-2.0"}
 authors = [{name = "Jeremy Howard and contributors", email = "github@jhoward.fastmail.fm"}]
 keywords = ['nbdev', 'jupyter', 'notebook', 'python']
 classifiers = ["Natural Language :: English", "Intended Audience :: Developers", "Development Status :: 3 - Alpha", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only"]
-dependencies = ['fastcore>=1.12.16', 'python-dateutil', 'starlette~=1.0', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx', 'fastlite>=0.1.1', 'python-multipart', 'beautifulsoup4']
+dependencies = ['fastcore>=1.12.41', 'python-dateutil', 'starlette~=1.0', 'oauthlib', 'itsdangerous', 'uvicorn[standard]>=0.30', 'httpx', 'fastlite>=0.1.1', 'python-multipart', 'beautifulsoup4']
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/fasthtml"
@@ -36,6 +36,8 @@ version = {attr = "fasthtml.__version__"}
 include = ["fasthtml"]
 
 [tool.nbdev]
+allowed_metadata_keys = ['solveit_dialog_mode', 'solveit_ver']
+allowed_cell_metadata_keys = ["solveit_ai"]
 jupyter_hooks = true
 custom_sidebar = false
 lib_path = "fasthtml"

{python_fasthtml-0.13.2 → python_fasthtml-0.13.4/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.13.2
+Version: 0.13.4
 Summary: The fastest way to create an HTML app
 Author-email: Jeremy Howard and contributors <github@jhoward.fastmail.fm>
 License: Apache-2.0
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.12.16
+Requires-Dist: fastcore>=1.12.41
 Requires-Dist: python-dateutil
 Requires-Dist: starlette~=1.0
 Requires-Dist: oauthlib

{python_fasthtml-0.13.2 → python_fasthtml-0.13.4}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.12.16
+fastcore>=1.12.41
 python-dateutil
 starlette~=1.0
 oauthlib

python_fasthtml-0.13.2/fasthtml/__init__.py

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