python-fasthtml 0.0.5__tar.gz → 0.0.7__tar.gz

{python-fasthtml-0.0.5/python_fasthtml.egg-info → python-fasthtml-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.0.5
+Version: 0.0.7
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -23,6 +23,7 @@ Requires-Dist: itsdangerous
 Requires-Dist: uvicorn
 Requires-Dist: httpx
 Requires-Dist: fastlite
+Requires-Dist: python-multipart
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: lxml; extra == "dev"

{python-fasthtml-0.0.5 → python-fasthtml-0.0.7}/fasthtml/__init__.py

@@ -1,5 +1,5 @@
-__version__ = "0.0.5"
+__version__ = "0.0.7"
 from .core import *
-from .auth import *
+from .authmw import *
 from .components import *
 from .xtend import *

{python-fasthtml-0.0.5 → python-fasthtml-0.0.7}/fasthtml/_modidx.py

@@ -6,7 +6,7 @@ d = { 'settings': { 'branch': 'main',
                 'git_url': 'https://github.com/AnswerDotAI/fasthtml',
                 'lib_path': 'fasthtml'},
   'syms': { 'fasthtml.all': {},
-            'fasthtml.auth': {},
+            'fasthtml.authmw': {},
             'fasthtml.components': { 'fasthtml.components._FindElems': ('components.html#_findelems', 'fasthtml/components.py'),
                                      'fasthtml.components._FindElems.__init__': ( 'components.html#_findelems.__init__',
                                                                                   'fasthtml/components.py'),

{python-fasthtml-0.0.5 → python-fasthtml-0.0.7}/fasthtml/core.py

@@ -144,35 +144,42 @@ def _wrap_resp(req, resp, cls, hdrs, **bodykw):
         cls = HTMLResponse
     return cls(resp)
 
-def _wrap_ep(f, hdrs, **bodykw):
+def _wrap_ep(f, hdrs, before, **bodykw):
     if not (isfunction(f) or ismethod(f)): return f
     sig = signature(f)
     params = sig.parameters
     cls = sig.return_annotation
 
     async def _f(req):
-        wreq = await _wrap_req(req, params)
-        resp = f(*wreq)
-        if is_async_callable(f): resp = await resp
+        resp = None
+        for b in before:
+            if not resp:
+                wreq = await _wrap_req(req, signature(b).parameters)
+                resp = b(*wreq)
+                if is_async_callable(b): resp = await resp
+        if not resp:
+            wreq = await _wrap_req(req, params)
+            resp = f(*wreq)
+            if is_async_callable(f): resp = await resp
         return _wrap_resp(req, resp, cls, hdrs, **bodykw)
     return _f
 
 class RouteX(Route):
     def __init__(self, path:str, endpoint, *, methods=None, name=None, include_in_schema=True, middleware=None,
-                hdrs=None, **bodykw):
-        super().__init__(path, _wrap_ep(endpoint, hdrs, **bodykw), methods=methods, name=name,
+                hdrs=None, before=None, **bodykw):
+        super().__init__(path, _wrap_ep(endpoint, hdrs, before, **bodykw), methods=methods, name=name,
                          include_in_schema=include_in_schema, middleware=middleware)
 
 class RouterX(Router):
     def __init__(self, routes=None, redirect_slashes=True, default=None, on_startup=None, on_shutdown=None,
-                 lifespan=None, *, middleware=None, hdrs=None, **bodykw):
+                 lifespan=None, *, middleware=None, hdrs=None, before=None, **bodykw):
         super().__init__(routes, redirect_slashes, default, on_startup, on_shutdown,
                  lifespan=lifespan, middleware=middleware)
-        self.hdrs,self.bodykw = hdrs or (),bodykw
+        self.hdrs,self.bodykw,self.before = hdrs or (),bodykw,before or ()
 
     def add_route( self, path: str, endpoint: callable, methods=None, name=None, include_in_schema=True):
         route = RouteX(path, endpoint=endpoint, methods=methods, name=name, include_in_schema=include_in_schema,
-                      hdrs=self.hdrs, **self.bodykw)
+                      hdrs=self.hdrs, before=self.before, **self.bodykw)
         self.routes = [o for o in self.routes if o.methods!=methods or o.path!=path]
         self.routes.append(route)
 
@@ -188,12 +195,14 @@ def get_key(key=None, fname='.sesskey'):
     fname.write_text(key)
     return key
 
+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,
+                 on_startup=None, on_shutdown=None, lifespan=None, hdrs=None, before=None,
                  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):
-        if not middleware: middleware = []
+        middleware,before = _list(middleware),_list(before)
         secret_key = get_key(secret_key, key_fname)
         sess = Middleware(SessionMiddleware, secret_key=secret_key, session_cookie=session_cookie,
                           max_age=max_age, path=sess_path, same_site=same_site,
@@ -201,7 +210,8 @@ class FastHTML(Starlette):
         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]
-        self.router = RouterX(routes, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, hdrs=hdrs, **bodykw)
+        self.router = RouterX(routes, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, hdrs=hdrs,
+                              before=before, **bodykw)
 
     def route(self, path:str, methods=None, name=None, include_in_schema=True):
         def f(func):

{python-fasthtml-0.0.5 → python-fasthtml-0.0.7/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.0.5
+Version: 0.0.7
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -23,6 +23,7 @@ Requires-Dist: itsdangerous
 Requires-Dist: uvicorn
 Requires-Dist: httpx
 Requires-Dist: fastlite
+Requires-Dist: python-multipart
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: lxml; extra == "dev"

{python-fasthtml-0.0.5 → python-fasthtml-0.0.7}/python_fasthtml.egg-info/SOURCES.txt

@@ -6,7 +6,7 @@ setup.py
 fasthtml/__init__.py
 fasthtml/_modidx.py
 fasthtml/all.py
-fasthtml/auth.py
+fasthtml/authmw.py
 fasthtml/components.py
 fasthtml/core.py
 fasthtml/fastapp.py

{python-fasthtml-0.0.5 → python-fasthtml-0.0.7}/python_fasthtml.egg-info/requires.txt

@@ -6,6 +6,7 @@ itsdangerous
 uvicorn
 httpx
 fastlite
+python-multipart
 
 [dev]
 ipython

{python-fasthtml-0.0.5 → python-fasthtml-0.0.7}/settings.ini

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