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

{python_fasthtml-0.4.3/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.3
+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.3 → python-fasthtml-0.4.5}/fasthtml/_modidx.py

@@ -74,6 +74,7 @@ d = { 'settings': { 'branch': 'main',
                                '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_tuple': ('api/core.html#flat_tuple', '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'),
@@ -95,22 +96,38 @@ d = { 'settings': { 'branch': 'main',
                              'fasthtml.js.dark_media': ('api/js.html#dark_media', 'fasthtml/js.py'),
                              'fasthtml.js.light_media': ('api/js.html#light_media', 'fasthtml/js.py')},
             'fasthtml.live_reload': {},
-            'fasthtml.oauth': { 'fasthtml.oauth.GitHubAppClient': ('incomplete/oauth.html#githubappclient', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth.GitHubAppClient.__init__': ( 'incomplete/oauth.html#githubappclient.__init__',
-                                                                             'fasthtml/oauth.py'),
-                                'fasthtml.oauth.GoogleAppClient': ('incomplete/oauth.html#googleappclient', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth.GoogleAppClient.__init__': ( 'incomplete/oauth.html#googleappclient.__init__',
-                                                                             'fasthtml/oauth.py'),
-                                'fasthtml.oauth.WebApplicationClient.login_link': ( 'incomplete/oauth.html#webapplicationclient.login_link',
+            'fasthtml.oauth': { 'fasthtml.oauth.DiscordAppClient': ('api/oauth.html#discordappclient', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.DiscordAppClient.__init__': ( 'api/oauth.html#discordappclient.__init__',
+                                                                              'fasthtml/oauth.py'),
+                                'fasthtml.oauth.DiscordAppClient.login_link': ( 'api/oauth.html#discordappclient.login_link',
+                                                                                'fasthtml/oauth.py'),
+                                'fasthtml.oauth.DiscordAppClient.parse_response': ( 'api/oauth.html#discordappclient.parse_response',
+                                                                                    'fasthtml/oauth.py'),
+                                'fasthtml.oauth.GitHubAppClient': ('api/oauth.html#githubappclient', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.GitHubAppClient.__init__': ('api/oauth.html#githubappclient.__init__', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.GoogleAppClient': ('api/oauth.html#googleappclient', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.GoogleAppClient.__init__': ('api/oauth.html#googleappclient.__init__', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.HuggingFaceClient': ('api/oauth.html#huggingfaceclient', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.HuggingFaceClient.__init__': ( 'api/oauth.html#huggingfaceclient.__init__',
+                                                                               'fasthtml/oauth.py'),
+                                'fasthtml.oauth.WebApplicationClient.login_link': ( 'api/oauth.html#webapplicationclient.login_link',
                                                                                     'fasthtml/oauth.py'),
-                                'fasthtml.oauth._AppClient': ('incomplete/oauth.html#_appclient', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth._AppClient.__init__': ('incomplete/oauth.html#_appclient.__init__', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth._AppClient.get_info': ('incomplete/oauth.html#_appclient.get_info', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth._AppClient.parse_response': ( 'incomplete/oauth.html#_appclient.parse_response',
+                                'fasthtml.oauth.WebApplicationClient.login_link_with_state': ( 'api/oauth.html#webapplicationclient.login_link_with_state',
+                                                                                               'fasthtml/oauth.py'),
+                                'fasthtml.oauth._AppClient': ('api/oauth.html#_appclient', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth._AppClient.__init__': ('api/oauth.html#_appclient.__init__', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth._AppClient.get_info': ('api/oauth.html#_appclient.get_info', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth._AppClient.parse_response': ( 'api/oauth.html#_appclient.parse_response',
                                                                               'fasthtml/oauth.py'),
-                                'fasthtml.oauth._AppClient.retr_id': ('incomplete/oauth.html#_appclient.retr_id', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth._AppClient.retr_info': ('incomplete/oauth.html#_appclient.retr_info', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth.retr_code': ('incomplete/oauth.html#retr_code', 'fasthtml/oauth.py')},
+                                'fasthtml.oauth._AppClient.retr_id': ('api/oauth.html#_appclient.retr_id', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth._AppClient.retr_info': ('api/oauth.html#_appclient.retr_info', 'fasthtml/oauth.py')},
+            'fasthtml.pico': { 'fasthtml.pico.Card': ('api/pico.html#card', 'fasthtml/pico.py'),
+                               'fasthtml.pico.Container': ('api/pico.html#container', 'fasthtml/pico.py'),
+                               'fasthtml.pico.DialogX': ('api/pico.html#dialogx', 'fasthtml/pico.py'),
+                               'fasthtml.pico.Grid': ('api/pico.html#grid', 'fasthtml/pico.py'),
+                               'fasthtml.pico.Group': ('api/pico.html#group', 'fasthtml/pico.py'),
+                               'fasthtml.pico.Search': ('api/pico.html#search', 'fasthtml/pico.py'),
+                               'fasthtml.pico.set_pico_cls': ('api/pico.html#set_pico_cls', 'fasthtml/pico.py')},
             'fasthtml.starlette': {},
             'fasthtml.svg': {},
             'fasthtml.toaster': {},
@@ -118,21 +135,15 @@ d = { 'settings': { 'branch': 'main',
                                 'fasthtml.xtend.AX': ('api/xtend.html#ax', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Any': ('api/xtend.html#any', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.AnyNow': ('api/xtend.html#anynow', 'fasthtml/xtend.py'),
-                                'fasthtml.xtend.Card': ('api/xtend.html#card', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.CheckboxX': ('api/xtend.html#checkboxx', 'fasthtml/xtend.py'),
-                                'fasthtml.xtend.Container': ('api/xtend.html#container', 'fasthtml/xtend.py'),
-                                'fasthtml.xtend.DialogX': ('api/xtend.html#dialogx', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Favicon': ('api/xtend.html#favicon', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Form': ('api/xtend.html#form', 'fasthtml/xtend.py'),
-                                'fasthtml.xtend.Grid': ('api/xtend.html#grid', 'fasthtml/xtend.py'),
-                                'fasthtml.xtend.Group': ('api/xtend.html#group', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Hidden': ('api/xtend.html#hidden', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Now': ('api/xtend.html#now', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.On': ('api/xtend.html#on', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Prev': ('api/xtend.html#prev', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Script': ('api/xtend.html#script', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.ScriptX': ('api/xtend.html#scriptx', 'fasthtml/xtend.py'),
-                                'fasthtml.xtend.Search': ('api/xtend.html#search', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Socials': ('api/xtend.html#socials', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Style': ('api/xtend.html#style', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.StyleX': ('api/xtend.html#stylex', 'fasthtml/xtend.py'),
@@ -143,5 +154,4 @@ d = { 'settings': { 'branch': 'main',
                                 'fasthtml.xtend.loose_format': ('api/xtend.html#loose_format', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.replace_css_vars': ('api/xtend.html#replace_css_vars', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.run_js': ('api/xtend.html#run_js', 'fasthtml/xtend.py'),
-                                'fasthtml.xtend.set_pico_cls': ('api/xtend.html#set_pico_cls', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.undouble_braces': ('api/xtend.html#undouble_braces', 'fasthtml/xtend.py')}}}

{python_fasthtml-0.4.3 → 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.3 → python-fasthtml-0.4.5}/fasthtml/common.py

@@ -7,6 +7,7 @@ from fastcore.xml import *
 from sqlite_minutils import Database
 from fastlite import *
 from .basics import *
+from .pico import *
 from .authmw import *
 from .live_reload import *
 from .toaster import *

{python_fasthtml-0.4.3 → 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.3 → 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', '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
@@ -152,6 +152,7 @@ async def _find_p(req, arg:str, p:Parameter):
         if arg.lower()=='auth': return req.scope.get('auth', None)
         if arg.lower()=='htmx': return _get_htmx(req.headers)
         if arg.lower()=='app': return req.scope['app']
+        if arg.lower()=='body': return (await req.body()).decode()
         if arg.lower() in ('hdrs','ftrs','bodykw','htmlkw'): return getattr(req, arg.lower())
         warn(f"`{arg} has no type annotation and is not a recognised special name, so is ignored.")
         return None
@@ -310,9 +311,20 @@ def _to_xml(req, resp, indent):
     _find_targets(req, resp)
     return to_xml(resp, indent)
 
+# %% ../nbs/api/00_core.ipynb
+def flat_tuple(o):
+    "Flatten lists"
+    result = []
+    if not isinstance(o,(tuple,list)): o=[o]
+    o = list(o)
+    for item in o:
+        if isinstance(item, (list,tuple)): result.extend(item)
+        else: result.append(item)
+    return tuple(result)
+
 # %% ../nbs/api/00_core.ipynb
 def _xt_resp(req, resp):
-    if not isinstance(resp, tuple): resp = (resp,)
+    resp = flat_tuple(resp)
     resp = resp + tuple(getattr(req, 'injects', ()))
     http_hdrs,resp = partition(resp, risinstance(HttpHeader))
     http_hdrs = {o.k:str(o.v) for o in http_hdrs}
@@ -389,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")
@@ -414,6 +427,15 @@ def _wrap_ex(f, hdrs, ftrs, htmlkw, bodykw):
         return _resp(req, res)
     return _f
 
+# %% ../nbs/api/00_core.ipynb
+def _mk_locfunc(f,p):
+    class _lf:
+        def __init__(self): update_wrapper(self, f)
+        def __call__(self, *args, **kw): return f(*args, **kw)
+        def rt(self, **kw): return p + (f'?{urlencode(kw)}' if kw else '')
+        def __str__(self): return p
+    return _lf()
+
 # %% ../nbs/api/00_core.ipynb
 class FastHTML(Starlette):
     def __init__(self, debug=False, routes=None, middleware=None, exception_handlers=None,
@@ -435,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)
@@ -443,29 +465,24 @@ class FastHTML(Starlette):
                               hdrs=hdrs, ftrs=ftrs, before=before, after=after, htmlkw=htmlkw, **bodykw)
 
     def ws(self, path:str, conn=None, disconn=None, name=None):
+        "Add a websocket route at `path`"
         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()
+all_meths = 'get post put delete patch head trace options'.split()
 
-# %% ../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"
+    "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"
+        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 _verbs else ['get'] if fn=='index' else ['post']
+        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)
@@ -474,7 +491,7 @@ def route(self:FastHTML, path:str=None, methods=None, name=None, include_in_sche
         return lf
     return f(path) if callable(path) else f
 
-all_meths = 'get post put delete patch head trace options'.split()
+# %% ../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.5/fasthtml/core.pyi

@@ -0,0 +1,238 @@
+__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 *
+from types import UnionType, SimpleNamespace as ns, GenericAlias
+from typing import Optional, get_type_hints, get_args, get_origin, Union, Mapping, TypedDict, List, Any
+from datetime import datetime
+from dataclasses import dataclass, fields
+from collections import namedtuple
+from inspect import isfunction, ismethod, Parameter, get_annotations
+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
+from warnings import warn
+from dateutil import parser as dtparse
+from starlette.requests import HTTPConnection
+from .starlette import *
+empty = Parameter.empty
+
+def _sig(f):
+    ...
+
+def date(s: str):
+    """Convert `s` to a datetime"""
+    ...
+
+def snake2hyphens(s: str):
+    """Convert `s` from snake case to hyphenated and capitalised"""
+    ...
+htmx_hdrs = dict(boosted='HX-Boosted', current_url='HX-Current-URL', history_restore_request='HX-History-Restore-Request', prompt='HX-Prompt', request='HX-Request', target='HX-Target', trigger_name='HX-Trigger-Name', trigger='HX-Trigger')
+
+@dataclass
+class HtmxHeaders:
+    boosted: str | None = None
+    current_url: str | None = None
+    history_restore_request: str | None = None
+    prompt: str | None = None
+    request: str | None = None
+    target: str | None = None
+    trigger_name: str | None = None
+    trigger: str | None = None
+
+    def __bool__(self):
+        ...
+
+def _get_htmx(h):
+    ...
+
+def str2int(s) -> int:
+    """Convert `s` to an `int`"""
+    ...
+
+def _mk_list(t, v):
+    ...
+fh_cfg = AttrDict(indent=True)
+
+def _fix_anno(t):
+    """Create appropriate callable type for casting a `str` to type `t` (or first type in `t` if union)"""
+    ...
+
+def _form_arg(k, v, d):
+    """Get type by accessing key `k` from `d`, and use to cast `v`"""
+    ...
+
+@dataclass
+class HttpHeader:
+    k: str
+    v: str
+
+def _annotations(anno):
+    """Same as `get_annotations`, but also works on namedtuples"""
+    ...
+
+def _is_body(anno):
+    ...
+
+def _formitem(form, k):
+    """Return single item `k` from `form` if len 1, otherwise return list"""
+    ...
+
+def form2dict(form: FormData) -> dict:
+    """Convert starlette form data to a dict"""
+    ...
+
+async def _from_body(req, p):
+    ...
+
+async def _find_p(req, arg: str, p: Parameter):
+    """In `req` find param named `arg` of type in `p` (`arg` is ignored for body types)"""
+    ...
+
+async def _wrap_req(req, params):
+    ...
+
+def flat_xt(lst):
+    """Flatten lists"""
+    ...
+
+class Beforeware:
+
+    def __init__(self, f, skip=None):
+        ...
+
+async def _handle(f, args, **kwargs):
+    ...
+
+def _find_wsp(ws, data, hdrs, arg: str, p: Parameter):
+    """In `data` find param named `arg` of type in `p` (`arg` is ignored for body types)"""
+    ...
+
+def _wrap_ws(ws, data, params):
+    ...
+
+async def _send_ws(ws, resp):
+    ...
+
+def _ws_endp(recv, conn=None, disconn=None, hdrs=None, before=None):
+    ...
+
+class WS_RouteX(WebSocketRoute):
+
+    def __init__(self, path: str, recv, conn: callable=None, disconn: callable=None, *, name=None, middleware=None, hdrs=None, before=None):
+        ...
+
+def uri(_arg, **kwargs):
+    ...
+
+def decode_uri(s):
+    ...
+from starlette.convertors import StringConvertor
+StringConvertor.regex = '[^/]*'
+
+@patch
+def to_string(self: StringConvertor, value: str) -> str:
+    ...
+
+@patch
+def url_path_for(self: HTTPConnection, name: str, **path_params):
+    ...
+_verbs = dict(get='hx-get', post='hx-post', put='hx-post', delete='hx-delete', patch='hx-patch', link='href')
+
+def _url_for(req, t):
+    ...
+
+def _find_targets(req, resp):
+    ...
+
+def _apply_ft(o):
+    ...
+
+def _to_xml(req, resp, indent):
+    ...
+
+def flat_tuple(o):
+    """Flatten lists"""
+    ...
+
+def _xt_resp(req, resp):
+    ...
+
+def _resp(req, resp, cls=empty):
+    ...
+
+async def _wrap_call(f, req, params):
+    ...
+
+class RouteX(Route):
+
+    def __init__(self, path: str, endpoint, *, methods=None, name=None, include_in_schema=True, middleware=None, hdrs=None, ftrs=None, before=None, after=None, htmlkw=None, **bodykw):
+        ...
+
+    async def _endp(self, req):
+        ...
+
+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, ftrs=None, before=None, after=None, htmlkw=None, **bodykw):
+        ...
+
+    def add_route(self, path: str, endpoint: callable, methods=None, name=None, include_in_schema=True):
+        ...
+
+    def add_ws(self, path: str, recv: callable, conn: callable=None, disconn: callable=None, name=None):
+        ...
+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')
+charset = Meta(charset='utf-8')
+
+def get_key(key=None, fname='.sesskey'):
+    ...
+
+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 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))
+
+def serve(appname=None, app='app', host='0.0.0.0', port=None, reload=True, reload_includes: list[str] | str | None=None, reload_excludes: list[str] | str | None=None):
+    """Run the app in an async server, with live reload set as the default."""
+    ...
+
+def cookie(key: str, value='', max_age=None, expires=None, path='/', domain=None, secure=False, httponly=False, samesite='lax'):
+    """Create a 'set-cookie' `HttpHeader`"""
+    ...
+
+def reg_re_param(m, s):
+    ...
+reg_re_param('path', '.*?')
+reg_re_param('static', 'ico|gif|jpg|jpeg|webm|css|js|woff|png|svg|mp4|webp|ttf|otf|eot|woff2|txt|html')
+
+class MiddlewareBase:
+
+    async def __call__(self, scope, receive, send) -> None:
+        ...

{python_fasthtml-0.4.3 → python-fasthtml-0.4.5}/fasthtml/fastapp.py

@@ -7,6 +7,7 @@ import inspect,uvicorn
 from fastcore.utils import *
 from fastlite import *
 from .basics import *
+from .pico import *
 from .starlette import *
 from .live_reload import FastHTMLWithLiveReload
 

python-fasthtml-0.4.5/fasthtml/oauth.py

@@ -0,0 +1,130 @@
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/08_oauth.ipynb.
+
+# %% auto 0
+__all__ = ['GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient']
+
+# %% ../nbs/api/08_oauth.ipynb
+from .common import *
+from oauthlib.oauth2 import WebApplicationClient
+from urllib.parse import urlencode, parse_qs, quote, unquote
+from httpx import get, post
+import secrets
+
+# %% ../nbs/api/08_oauth.ipynb
+class _AppClient(WebApplicationClient):
+    def __init__(self, client_id, client_secret, redirect_uri, code=None, scope=None, **kwargs):
+        super().__init__(client_id, code=code, scope=scope, **kwargs)
+        self.client_secret,self.redirect_uri = client_secret,redirect_uri
+
+# %% ../nbs/api/08_oauth.ipynb
+class GoogleAppClient(_AppClient):
+    "A `WebApplicationClient` for Google oauth2"
+    base_url = "https://accounts.google.com/o/oauth2/v2/auth"
+    token_url = "https://www.googleapis.com/oauth2/v4/token"
+    info_url = "https://www.googleapis.com/oauth2/v3/userinfo"
+    id_key = 'sub'
+    
+    def __init__(self, client_id, client_secret, redirect_uri=None, redirect_uris=None, code=None, scope=None, **kwargs):
+        if redirect_uris and not redirect_uri: redirect_uri = redirect_uris[0]
+        scope_pre = "https://www.googleapis.com/auth/userinfo"
+        if not scope: scope=["openid", f"{scope_pre}.email", f"{scope_pre}.profile"]
+        super().__init__(client_id, client_secret, redirect_uri, code=code, scope=scope, **kwargs)
+
+# %% ../nbs/api/08_oauth.ipynb
+class GitHubAppClient(_AppClient):
+    "A `WebApplicationClient` for GitHub oauth2"
+    base_url = "https://github.com/login/oauth/authorize"
+    token_url = "https://github.com/login/oauth/access_token"
+    info_url = "https://api.github.com/user"
+    id_key = 'id'
+
+    def __init__(self, client_id, client_secret, redirect_uri, code=None, scope=None, **kwargs):
+        if not scope: scope="user"
+        super().__init__(client_id, client_secret, redirect_uri, code=code, scope=scope, **kwargs)
+
+# %% ../nbs/api/08_oauth.ipynb
+class HuggingFaceClient(_AppClient):
+    "A `WebApplicationClient` for HuggingFace oauth2"
+
+    base_url = "https://huggingface.co/oauth/authorize"
+    token_url = "https://huggingface.co/oauth/token"
+    info_url = "https://huggingface.co/oauth/userinfo"
+    id_key = 'sub'
+    
+    def __init__(self, client_id, client_secret, redirect_uri=None, redirect_uris=None, code=None, scope=None, state=None, **kwargs):
+        if redirect_uris and not redirect_uri: redirect_uri = redirect_uris[0]
+        if not scope: scope=["openid","profile"]
+        if not state: state=secrets.token_urlsafe(16)
+        super().__init__(client_id, client_secret, redirect_uri, code=code, scope=scope, state=state, **kwargs)
+
+# %% ../nbs/api/08_oauth.ipynb
+class DiscordAppClient(_AppClient):
+    "A `WebApplicationClient` for Discord oauth2"
+    base_url = "https://discord.com/oauth2/authorize"
+    token_url = "https://discord.com/api/oauth2/token"
+    revoke_url = "https://discord.com/api/oauth2/token/revoke"
+    id_key = 'id'
+
+    def __init__(self, client_id, client_secret, redirect_uri, is_user=False, perms=0, scope=None, **kwargs):
+        if not scope: scope="applications.commands applications.commands.permissions.update identify"
+        self.integration_type = 1 if is_user else 0
+        self.perms = perms
+        super().__init__(client_id, client_secret, redirect_uri, scope=scope, **kwargs)
+
+    def login_link(self):
+        d = dict(response_type='code', client_id=self.client_id,
+                 integration_type=self.integration_type, scope=self.scope,
+                 redirect_uri=self.redirect_uri) #, permissions=self.perms, prompt='consent')
+        return f'{self.base_url}?' + urlencode(d)
+
+    def parse_response(self, code):
+        headers = {'Content-Type': 'application/x-www-form-urlencoded'}
+        data = dict(grant_type='authorization_code', code=code, redirect_uri=self.redirect_uri)
+        r = post(self.token_url, data=data, headers=headers, auth=(self.client_id, self.client_secret))
+        r.raise_for_status()
+        self.parse_request_body_response(r.text)
+
+# %% ../nbs/api/08_oauth.ipynb
+@patch
+def login_link(self:WebApplicationClient, scope=None):
+    "Get a login link for this client"
+    if not scope: scope=self.scope
+    return self.prepare_request_uri(self.base_url, self.redirect_uri, scope)
+
+# %% ../nbs/api/08_oauth.ipynb
+@patch
+def login_link_with_state(self:WebApplicationClient, scope=None, state=None):
+    "Get a login link for this client"
+    if not scope: scope=self.scope
+    if not state: state=self.state
+    return self.prepare_request_uri(self.base_url, self.redirect_uri, scope, state)
+
+# %% ../nbs/api/08_oauth.ipynb
+@patch
+def parse_response(self:_AppClient, code):
+    "Get the token from the oauth2 server response"
+    payload = dict(code=code, redirect_uri=self.redirect_uri, client_id=self.client_id,
+                   client_secret=self.client_secret, grant_type='authorization_code')
+    r = post(self.token_url, json=payload)
+    r.raise_for_status()
+    self.parse_request_body_response(r.text)
+
+# %% ../nbs/api/08_oauth.ipynb
+@patch
+def get_info(self:_AppClient):
+    "Get the info for authenticated user"
+    headers = {'Authorization': f'Bearer {self.token["access_token"]}'}
+    return get(self.info_url, headers=headers).json()
+
+# %% ../nbs/api/08_oauth.ipynb
+@patch
+def retr_info(self:_AppClient, code):
+    "Combines `parse_response` and `get_info`"
+    self.parse_response(code)
+    return self.get_info()
+
+# %% ../nbs/api/08_oauth.ipynb
+@patch
+def retr_id(self:_AppClient, code):
+    "Call `retr_info` and then return id/subscriber value"
+    return self.retr_info(code)[self.id_key]