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

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

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

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

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

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

@@ -383,7 +383,8 @@ class _SessionMiddleware(SessionMiddleware):
 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, ftrs=None,
-                 before=None, after=None, default_hdrs=True, ws_hdr=False,
+                 before=None, after=None, ws_hdr=False,
+                 surreal=True, htmx=True, default_hdrs=True,
                  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',
                  htmlkw=None, **bodykw):
@@ -395,8 +396,11 @@ class FastHTML(Starlette):
         middleware.append(sess)
         hdrs,ftrs = listify(hdrs),listify(ftrs)
         htmlkw = htmlkw or {}
-        if default_hdrs: hdrs = [charset, viewport, htmxscr,surrsrc,scopesrc] + hdrs
-        if ws_hdr: hdrs.append(htmxwsscr)
+        if default_hdrs:
+            if surreal: hdrs = [surrsrc,scopesrc] + hdrs
+            if htmx: hdrs = [htmxscr] + hdrs
+            if ws_hdr: hdrs = [htmxwsscr] + hdrs
+            hdrs = [charset, viewport] + hdrs
         excs = {k:_wrap_ex(v, hdrs, ftrs, htmlkw, bodykw) for k,v in (exception_handlers or {}).items()}
         super().__init__(debug, routes, middleware, excs, on_startup, on_shutdown, lifespan=lifespan)
         self.router = RouterX(routes, on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan,
@@ -405,8 +409,12 @@ class FastHTML(Starlette):
     def route(self, path:str, methods=None, name=None, include_in_schema=True):
         "Add a route at `path`; the function name is the default method"
         def f(func):
-            m = [methods] if isinstance(methods,str) else [func.__name__] if not methods else methods
-            self.router.add_route(path, func, methods=m, name=name, include_in_schema=include_in_schema)
+            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)
             return func
         return f
 

{python-fasthtml-0.3.2 → python-fasthtml-0.3.3}/fasthtml/fastapp.py

@@ -15,7 +15,7 @@ def get_tbl(dt, nm, schema):
     if render: dc.__ft__ = render
     return tbl,dc
 
-def app_factory(*args, **kwargs) -> FastHTML | FastHTMLWithLiveReload: 
+def app_factory(*args, **kwargs) -> FastHTML | FastHTMLWithLiveReload:
     """Creates a FastHTML or FastHTMLWithLiveReload app instance.
     The type of app created is determined by the "live" key in kwargs.
 
@@ -45,6 +45,8 @@ def fast_app(
         lifespan:Optional[callable]=None, # Passed to Starlette
         default_hdrs=True, # Include default FastHTML headers such as HTMX script?
         pico:Optional[bool]=None, # Include PicoCSS header?
+        surreal:Optional[bool]=True, # Include surreal.js/scope headers?
+        htmx:Optional[bool]=True, # Include HTMX header?
         ws_hdr:bool=False, # Include HTMX websocket extension header?
         secret_key:Optional[str]=None, # Signing key for sessions
         key_fname:str='.sesskey', # Session cookie signing key file name
@@ -54,8 +56,8 @@ def fast_app(
         same_site:str='lax', # Session cookie same site policy
         sess_https_only:bool=False, # Session cookie HTTPS only?
         sess_domain:Optional[str]=None, # Session cookie domain
-        htmlkw:Optional[dict]=None, 
-        bodykw:Optional[dict]=None,
+        htmlkw:Optional[dict]=None, # Attrs to add to the HTML tag
+        bodykw:Optional[dict]=None, # Attrs to add to the Body tag
         reload_attempts:Optional[int]=1, # Number of reload attempts when live reloading
         reload_interval:Optional[int]=1000, # Time between reload attempts in ms
         **kwargs)->Any:
@@ -65,7 +67,8 @@ def fast_app(
     app = app_factory(hdrs=h, ftrs=ftrs, before=before, middleware=middleware, live=live, debug=debug, routes=routes, exception_handlers=exception_handlers,
                   on_startup=on_startup, on_shutdown=on_shutdown, lifespan=lifespan, default_hdrs=default_hdrs, secret_key=secret_key,
                   session_cookie=session_cookie, max_age=max_age, sess_path=sess_path, same_site=same_site, sess_https_only=sess_https_only,
-                  sess_domain=sess_domain, key_fname=key_fname, ws_hdr=ws_hdr, htmlkw=htmlkw, reload_attempts=reload_attempts, reload_interval=reload_interval, **(bodykw or {}))
+                  sess_domain=sess_domain, key_fname=key_fname, ws_hdr=ws_hdr, surreal=surreal, htmx=htmx, htmlkw=htmlkw,
+                  reload_attempts=reload_attempts, reload_interval=reload_interval, **(bodykw or {}))
 
     @app.route("/{fname:path}.{ext:static}")
     async def get(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')

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

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

{python-fasthtml-0.3.2 → python-fasthtml-0.3.3}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.6.6
+fastcore>=1.6.7
 python-dateutil
 starlette>0.33
 oauthlib

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

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