python-fasthtml 0.3.3__tar.gz → 0.3.4__tar.gz

{python-fasthtml-0.3.3/python_fasthtml.egg-info → python-fasthtml-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.3.3
+Version: 0.3.4
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard

{python-fasthtml-0.3.3 → python-fasthtml-0.3.4}/fasthtml/__init__.py

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

{python-fasthtml-0.3.3 → python-fasthtml-0.3.4}/fasthtml/_modidx.py

@@ -27,6 +27,8 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.FastHTML.__init__': ('api/core.html#fasthtml.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.route': ('api/core.html#fasthtml.route', 'fasthtml/core.py'),
                                'fasthtml.core.FastHTML.ws': ('api/core.html#fasthtml.ws', 'fasthtml/core.py'),
+                               'fasthtml.core.HTTPConnection.url_path_for': ( 'api/core.html#httpconnection.url_path_for',
+                                                                              'fasthtml/core.py'),
                                'fasthtml.core.HtmxHeaders': ('api/core.html#htmxheaders', 'fasthtml/core.py'),
                                'fasthtml.core.HtmxHeaders.__bool__': ('api/core.html#htmxheaders.__bool__', 'fasthtml/core.py'),
                                'fasthtml.core.HttpHeader': ('api/core.html#httpheader', 'fasthtml/core.py'),
@@ -39,6 +41,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.RouterX.__init__': ('api/core.html#routerx.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.RouterX.add_route': ('api/core.html#routerx.add_route', 'fasthtml/core.py'),
                                'fasthtml.core.RouterX.add_ws': ('api/core.html#routerx.add_ws', 'fasthtml/core.py'),
+                               'fasthtml.core.StringConvertor.to_string': ('api/core.html#stringconvertor.to_string', 'fasthtml/core.py'),
                                'fasthtml.core.WS_RouteX': ('api/core.html#ws_routex', 'fasthtml/core.py'),
                                'fasthtml.core.WS_RouteX.__init__': ('api/core.html#ws_routex.__init__', 'fasthtml/core.py'),
                                'fasthtml.core._SessionMiddleware': ('api/core.html#_sessionmiddleware', 'fasthtml/core.py'),
@@ -46,6 +49,7 @@ d = { 'settings': { 'branch': 'main',
                                                                               'fasthtml/core.py'),
                                'fasthtml.core._annotations': ('api/core.html#_annotations', 'fasthtml/core.py'),
                                'fasthtml.core._find_p': ('api/core.html#_find_p', 'fasthtml/core.py'),
+                               'fasthtml.core._find_targets': ('api/core.html#_find_targets', 'fasthtml/core.py'),
                                'fasthtml.core._find_wsp': ('api/core.html#_find_wsp', 'fasthtml/core.py'),
                                'fasthtml.core._fix_anno': ('api/core.html#_fix_anno', 'fasthtml/core.py'),
                                'fasthtml.core._form_arg': ('api/core.html#_form_arg', 'fasthtml/core.py'),
@@ -58,6 +62,8 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._resp': ('api/core.html#_resp', 'fasthtml/core.py'),
                                'fasthtml.core._send_ws': ('api/core.html#_send_ws', 'fasthtml/core.py'),
                                'fasthtml.core._sig': ('api/core.html#_sig', 'fasthtml/core.py'),
+                               'fasthtml.core._to_xml': ('api/core.html#_to_xml', 'fasthtml/core.py'),
+                               'fasthtml.core._url_for': ('api/core.html#_url_for', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_call': ('api/core.html#_wrap_call', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_ex': ('api/core.html#_wrap_ex', 'fasthtml/core.py'),
                                'fasthtml.core._wrap_req': ('api/core.html#_wrap_req', 'fasthtml/core.py'),
@@ -66,6 +72,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._xt_resp': ('api/core.html#_xt_resp', 'fasthtml/core.py'),
                                'fasthtml.core.cookie': ('api/core.html#cookie', 'fasthtml/core.py'),
                                'fasthtml.core.date': ('api/core.html#date', 'fasthtml/core.py'),
+                               'fasthtml.core.decode_uri': ('api/core.html#decode_uri', 'fasthtml/core.py'),
                                'fasthtml.core.flat_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'),
@@ -73,7 +80,8 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.is_typeddict': ('api/core.html#is_typeddict', 'fasthtml/core.py'),
                                'fasthtml.core.reg_re_param': ('api/core.html#reg_re_param', 'fasthtml/core.py'),
                                'fasthtml.core.snake2hyphens': ('api/core.html#snake2hyphens', 'fasthtml/core.py'),
-                               'fasthtml.core.str2int': ('api/core.html#str2int', 'fasthtml/core.py')},
+                               'fasthtml.core.str2int': ('api/core.html#str2int', 'fasthtml/core.py'),
+                               'fasthtml.core.uri': ('api/core.html#uri', 'fasthtml/core.py')},
             'fasthtml.fastapp': {},
             'fasthtml.ft': {},
             'fasthtml.js': {},

{python-fasthtml-0.3.3 → python-fasthtml-0.3.4}/fasthtml/core.py

@@ -3,8 +3,8 @@
 # %% auto 0
 __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmxscr', 'htmxwsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths',
            'is_typeddict', 'is_namedtuple', 'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader',
-           'form2dict', 'flat_xt', 'Beforeware', 'WS_RouteX', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'cookie',
-           'reg_re_param', 'MiddlewareBase']
+           'form2dict', 'flat_xt', 'Beforeware', 'WS_RouteX', 'uri', 'decode_uri', 'RouteX', 'RouterX', 'get_key',
+           'FastHTML', 'cookie', 'reg_re_param', 'MiddlewareBase']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types
@@ -20,9 +20,11 @@ from collections import namedtuple
 from inspect import isfunction,ismethod,Parameter,get_annotations
 from functools import wraps, partialmethod
 from http import cookies
+from urllib.parse import urlencode, parse_qs, quote, unquote
 from copy import copy,deepcopy
 from warnings import warn
 from dateutil import parser as dtparse
+from starlette.requests import HTTPConnection
 
 from .starlette import *
 
@@ -103,7 +105,7 @@ def _fix_anno(t):
 def _form_arg(k, v, d):
     "Get type by accessing key `k` from `d`, and use to cast `v`"
     if v is None: return
-    if not isinstance(v, str): return v
+    if not isinstance(v, (str,list,tuple)): return v
     # This is the type we want to cast `v` to
     anno = d.get(k, None)
     if not anno: return v
@@ -258,6 +260,57 @@ class WS_RouteX(WebSocketRoute):
                  name=None, middleware=None, hdrs=None, before=None):
         super().__init__(path, _ws_endp(recv, conn, disconn, hdrs, before), name=name, middleware=middleware)
 
+# %% ../nbs/api/00_core.ipynb
+def uri(_arg, **kwargs):
+    return f"{quote(_arg)}/{urlencode(kwargs, doseq=True)}"
+
+# %% ../nbs/api/00_core.ipynb
+def decode_uri(s): 
+    arg,_,kw = s.partition('/')
+    return unquote(arg), {k:v[0] for k,v in parse_qs(kw).items()}
+
+# %% ../nbs/api/00_core.ipynb
+from starlette.convertors import StringConvertor
+
+# %% ../nbs/api/00_core.ipynb
+StringConvertor.regex = "[^/]*"  # `+` replaced with `*`
+
+@patch
+def to_string(self:StringConvertor, value: str) -> str:
+    value = str(value)
+    assert "/" not in value, "May not contain path separators"
+    # assert value, "Must not be empty"  # line removed due to errors
+    return value
+
+# %% ../nbs/api/00_core.ipynb
+@patch
+def url_path_for(self:HTTPConnection, name: str, **path_params):
+    router: Router = self.scope["router"]
+    return router.url_path_for(name, **path_params)
+
+# %% ../nbs/api/00_core.ipynb
+_verbs = dict(get='hx-get', post='hx-post', put='hx-post', delete='hx-delete', patch='hx-patch', link='href')
+
+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('?')    
+    return f"{req.url_path_for(t, **kw)}{m}{q}"
+
+def _find_targets(req, resp):
+    if isinstance(resp, tuple):
+        for o in resp: _find_targets(req, o)
+    if isinstance(resp, FT):
+        for o in resp.children: _find_targets(req, o)
+        for k,v in _verbs.items():
+            t = resp.attrs.pop(k, None)
+            if t: resp.attrs[v] = _url_for(req, t)
+
+def _to_xml(req, resp, indent):
+    _find_targets(req, resp)
+    return to_xml(resp, indent)
+
 # %% ../nbs/api/00_core.ipynb
 def _xt_resp(req, resp):
     if not isinstance(resp, tuple): resp = (resp,)
@@ -269,7 +322,7 @@ def _xt_resp(req, resp):
     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, *flat_xt(req.hdrs)), Body(bdy, *flat_xt(req.ftrs), **req.bodykw), **req.htmlkw)
-    return HTMLResponse(to_xml(resp, indent=fh_cfg.indent), headers=http_hdrs)
+    return HTMLResponse(_to_xml(req, resp, indent=fh_cfg.indent), headers=http_hdrs)
 
 # %% ../nbs/api/00_core.ipynb
 def _resp(req, resp, cls=empty):
@@ -406,17 +459,19 @@ class FastHTML(Starlette):
         self.router = RouterX(routes, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan,
                               hdrs=hdrs, ftrs=ftrs, before=before, after=after, htmlkw=htmlkw, **bodykw)
 
-    def route(self, path:str, methods=None, name=None, include_in_schema=True):
+    def route(self, path:str=None, methods=None, name=None, include_in_schema=True):
         "Add a route at `path`; the function name is the default method"
+        pathstr = None if callable(path) else path
         def f(func):
-            n = name
-            if methods:
-                m = [methods] if isinstance(methods,str) else methods
-                if not n: n = func.__name__
-            else: m = [func.__name__]
-            self.router.add_route(path, func, methods=m, name=n, include_in_schema=include_in_schema)
+            n,fn,p = name,func.__name__,pathstr
+            if methods: m = [methods] if isinstance(methods,str) else methods
+            else: m = [fn] if fn in _verbs else ['post']
+            if not n: n = fn
+            if not p: p = '/'+fn
+            self.router.add_route(p, func, methods=m, name=n, include_in_schema=include_in_schema)
+            func.__routename__ = n
             return func
-        return f
+        return f(path) if callable(path) else f
 
     def ws(self, path:str, conn=None, disconn=None, name=None):
         def f(func):

{python-fasthtml-0.3.3 → python-fasthtml-0.3.4/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.3.3
+Version: 0.3.4
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard

{python-fasthtml-0.3.3 → python-fasthtml-0.3.4}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.3.3
+version = 0.3.4
 min_python = 3.10
 license = apache2
 requirements = fastcore>=1.6.7 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.6 python-multipart beautifulsoup4