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

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

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

python-fasthtml-0.4.1/fasthtml/__init__.py

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

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

@@ -62,6 +62,7 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core._is_body': ('api/core.html#_is_body', 'fasthtml/core.py'),
                                'fasthtml.core._list': ('api/core.html#_list', 'fasthtml/core.py'),
                                'fasthtml.core._mk_list': ('api/core.html#_mk_list', 'fasthtml/core.py'),
+                               'fasthtml.core._mk_locfunc': ('api/core.html#_mk_locfunc', 'fasthtml/core.py'),
                                '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'),

{python-fasthtml-0.4.0 → python-fasthtml-0.4.1}/fasthtml/components.py

@@ -85,7 +85,7 @@ def File(fname):
 
 # %% ../nbs/api/01_components.ipynb
 def _fill_item(item, obj):
-    if not isinstance(item,list): return item
+    if not isinstance(item,FT): return 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)

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

@@ -18,7 +18,7 @@ from datetime import datetime
 from dataclasses import dataclass,fields,is_dataclass,MISSING,asdict
 from collections import namedtuple
 from inspect import isfunction,ismethod,Parameter,get_annotations
-from functools import wraps, partialmethod
+from functools import wraps, partialmethod, update_wrapper
 from http import cookies
 from urllib.parse import urlencode, parse_qs, quote, unquote
 from copy import copy,deepcopy
@@ -469,27 +469,38 @@ 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=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,fn,p = name,func.__name__,pathstr
-            assert path or (fn not in _verbs), "Must provide a path when using http verb-based function name"
-            if methods: m = [methods] if isinstance(methods,str) else methods
-            else: m = [fn] if fn in _verbs else ['get'] if fn=='index' else ['post']
-            if not n: n = fn
-            if not p: p = '/'+('' if fn=='index' else fn)
-            self.router.add_route(p, func, methods=m, name=n, include_in_schema=include_in_schema)
-            func.__routename__ = n
-            return func
-        return f(path) if callable(path) else f
-
     def ws(self, path:str, conn=None, disconn=None, name=None):
         def f(func):
             self.router.add_ws(path, func, conn=conn, disconn=disconn, name=name)
             return func
         return f
 
+# %% ../nbs/api/00_core.ipynb
+def _mk_locfunc(f,p):
+    class _lf:
+        def __init__(self): update_wrapper(self, f)
+        def __call__(self, **kw): return p + (f'?{urlencode(kw)}' if kw else '')
+        def __str__(self): return p
+    return _lf()
+
+# %% ../nbs/api/00_core.ipynb
+@patch
+def route(self:FastHTML, 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,fn,p = name,func.__name__,pathstr
+        assert path or (fn not in _verbs), "Must provide a path when using http verb-based function name"
+        if methods: m = [methods] if isinstance(methods,str) else methods
+        else: m = [fn] if fn in _verbs else ['get'] if fn=='index' else ['post']
+        if not n: n = fn
+        if not p: p = '/'+('' if fn=='index' else fn)
+        self.router.add_route(p, func, methods=m, name=n, include_in_schema=include_in_schema)
+        lf = _mk_locfunc(func, p)
+        lf.__routename__ = n
+        return lf
+    return f(path) if callable(path) else f
+
 all_meths = 'get post put delete patch head trace options'.split()
 for o in all_meths: setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
 

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

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

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

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

python-fasthtml-0.4.0/fasthtml/__init__.py

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