python-fasthtml 0.4.4__tar.gz → 0.4.5__tar.gz

{python-fasthtml-0.4.4/python_fasthtml.egg-info → python-fasthtml-0.4.5}/PKG-INFO

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

python-fasthtml-0.4.5/fasthtml/__init__.py

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

{python-fasthtml-0.4.4 → python-fasthtml-0.4.5}/fasthtml/cli.py

@@ -39,9 +39,10 @@ def railway_deploy(
     assert nm=='railwayapp', f'Unexpected railway version string: {nm}'
     if ver2tuple(ver)<(3,8): return print("Please update your railway CLI version to 3.8 or higher")
     cp = run("railway status --json".split(), capture_output=True)
-    if not cp.returncode: print("Checking deployed projects...")
-    project_name = json.loads(cp.stdout.decode()).get('name')
-    if project_name == name: return print("This project is already deployed. Run `railway open`.")
+    if not cp.returncode:
+        print("Checking deployed projects...")
+        project_name = json.loads(cp.stdout.decode()).get('name')
+        if project_name == name: return print("This project is already deployed. Run `railway open`.")
     reqs = Path('requirements.txt')
     if not reqs.exists(): reqs.write_text('python-fasthtml')
     _run(f"railway init -n {name}".split())

{python-fasthtml-0.4.4 → python-fasthtml-0.4.5}/fasthtml/components.py

@@ -146,7 +146,7 @@ def html2ft(html, attr1st=False):
     def _parse(elm, lvl=0, indent=4):
         if isinstance(elm, str): return repr(elm.strip()) if elm.strip() else ''
         if isinstance(elm, list): return '\n'.join(_parse(o, lvl) for o in elm)
-        tag_name = elm.name.capitalize()
+        tag_name = elm.name.capitalize().replace("-", "_")
         if tag_name=='[document]': return _parse(list(elm.children), lvl)
         cts = elm.contents
         cs = [repr(c.strip()) if isinstance(c, str) else _parse(c, lvl+1)

{python-fasthtml-0.4.4 → python-fasthtml-0.4.5}/fasthtml/core.py

@@ -1,10 +1,10 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmxscr', 'htmxwsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths',
-           'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader', 'form2dict', 'flat_xt', 'Beforeware',
-           'WS_RouteX', 'uri', 'decode_uri', 'flat_tuple', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'serve',
-           'cookie', 'reg_re_param', 'MiddlewareBase']
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmxscr', 'htmxwsscr', 'fhjsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset',
+           'all_meths', 'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader', 'form2dict', 'flat_xt',
+           'Beforeware', 'WS_RouteX', 'uri', 'decode_uri', 'flat_tuple', 'RouteX', 'RouterX', 'get_key', 'FastHTML',
+           'serve', 'cookie', 'reg_re_param', 'MiddlewareBase']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types,uvicorn
@@ -401,6 +401,7 @@ class RouterX(Router):
 # %% ../nbs/api/00_core.ipynb
 htmxscr   = Script(src="https://unpkg.com/htmx.org@next/dist/htmx.min.js")
 htmxwsscr = Script(src="https://unpkg.com/htmx-ext-ws/ws.js")
+fhjsscr   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js@main/fasthtml.js")
 surrsrc   = Script(src="https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js")
 scopesrc  = Script(src="https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js")
 viewport  = Meta(name="viewport", content="width=device-width, initial-scale=1, viewport-fit=cover")
@@ -456,7 +457,7 @@ class FastHTML(Starlette):
         if default_hdrs:
             if surreal: hdrs = [surrsrc,scopesrc] + hdrs
             if ws_hdr: hdrs = [htmxwsscr] + hdrs
-            if htmx: hdrs = [htmxscr] + hdrs
+            if htmx: hdrs = [htmxscr,fhjsscr] + 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)
@@ -470,24 +471,27 @@ class FastHTML(Starlette):
             return func
         return f
 
-    def route(self, path:str=None, methods=None, name=None, include_in_schema=True):
-        "Add a route at `path`"
-        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','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
-
 # %% ../nbs/api/00_core.ipynb
 all_meths = 'get post put delete patch head trace options'.split()
+
+@patch
+def route(self:FastHTML, path:str=None, methods=None, name=None, include_in_schema=True):
+    "Add a route at `path`"
+    pathstr = None if callable(path) else path
+    def f(func):
+        n,fn,p = name,func.__name__,pathstr
+        assert path or (fn not in all_meths), "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 all_meths else ['get','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
+
+# %% ../nbs/api/00_core.ipynb
 for o in all_meths: setattr(FastHTML, o, partialmethod(FastHTML.route, methods=o))
 
 # %% ../nbs/api/00_core.ipynb

{python-fasthtml-0.4.4 → python-fasthtml-0.4.5}/fasthtml/core.pyi

@@ -1,4 +1,4 @@
-__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmxscr', 'htmxwsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths', 'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader', 'form2dict', 'flat_xt', 'Beforeware', 'WS_RouteX', 'uri', 'decode_uri', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'serve', 'cookie', 'reg_re_param', 'MiddlewareBase']
+__all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmxscr', 'htmxwsscr', 'fhjsscr', 'surrsrc', 'scopesrc', 'viewport', 'charset', 'all_meths', 'date', 'snake2hyphens', 'HtmxHeaders', 'str2int', 'HttpHeader', 'form2dict', 'flat_xt', 'Beforeware', 'WS_RouteX', 'uri', 'decode_uri', 'flat_tuple', 'RouteX', 'RouterX', 'get_key', 'FastHTML', 'serve', 'cookie', 'reg_re_param', 'MiddlewareBase']
 import json, uuid, inspect, types, uvicorn
 from fastcore.utils import *
 from fastcore.xml import *
@@ -152,6 +152,10 @@ def _apply_ft(o):
 def _to_xml(req, resp, indent):
     ...
 
+def flat_tuple(o):
+    """Flatten lists"""
+    ...
+
 def _xt_resp(req, resp):
     ...
 
@@ -181,6 +185,7 @@ class RouterX(Router):
         ...
 htmxscr = Script(src='https://unpkg.com/htmx.org@next/dist/htmx.min.js')
 htmxwsscr = Script(src='https://unpkg.com/htmx-ext-ws/ws.js')
+fhjsscr = Script(src='https://cdn.jsdelivr.net/gh/answerdotai/fasthtml-js@main/fasthtml.js')
 surrsrc = Script(src='https://cdn.jsdelivr.net/gh/answerdotai/surreal@main/surreal.js')
 scopesrc = Script(src='https://cdn.jsdelivr.net/gh/gnat/css-scope-inline@main/script.js')
 viewport = Meta(name='viewport', content='width=device-width, initial-scale=1, viewport-fit=cover')
@@ -195,21 +200,21 @@ def _list(o):
 def _wrap_ex(f, hdrs, ftrs, htmlkw, bodykw):
     ...
 
+def _mk_locfunc(f, p):
+    ...
+
 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, ws_hdr=False, surreal=True, htmx=True, default_hdrs=True, sess_cls=SessionMiddleware, 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):
         ...
 
     def ws(self, path: str, conn=None, disconn=None, name=None):
+        """Add a websocket route at `path`"""
         ...
 
-def _mk_locfunc(f, p):
-    ...
-
-@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"""
-    ...
+    def route(self, path: str=None, methods=None, name=None, include_in_schema=True):
+        """Add a route at `path`"""
+        ...
 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.4 → python-fasthtml-0.4.5/python_fasthtml.egg-info}/PKG-INFO

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

{python-fasthtml-0.4.4 → python-fasthtml-0.4.5}/settings.ini

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

python-fasthtml-0.4.4/fasthtml/__init__.py

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