python-fasthtml 0.12.36__tar.gz → 0.12.39__tar.gz

{python_fasthtml-0.12.36/python_fasthtml.egg-info → python_fasthtml-0.12.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.36
+Version: 0.12.39
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard and contributors
@@ -18,7 +18,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.8.1
+Requires-Dist: fastcore>=1.10.0
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib
@@ -33,6 +33,7 @@ Requires-Dist: ipython; extra == "dev"
 Requires-Dist: lxml; extra == "dev"
 Requires-Dist: pysymbol_llm; extra == "dev"
 Requires-Dist: monsterui; extra == "dev"
+Requires-Dist: PyJWT; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

python_fasthtml-0.12.39/fasthtml/__init__.py

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

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39}/fasthtml/_modidx.py

@@ -158,7 +158,12 @@ d = { 'settings': { 'branch': 'main',
                                   'fasthtml.jupyter.wait_port_free': ('api/jupyter.html#wait_port_free', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.ws_client': ('api/jupyter.html#ws_client', 'fasthtml/jupyter.py')},
             'fasthtml.live_reload': {},
-            'fasthtml.oauth': { 'fasthtml.oauth.Auth0AppClient': ('api/oauth.html#auth0appclient', 'fasthtml/oauth.py'),
+            'fasthtml.oauth': { 'fasthtml.oauth.AppleAppClient': ('api/oauth.html#appleappclient', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.AppleAppClient.__init__': ('api/oauth.html#appleappclient.__init__', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.AppleAppClient.client_secret': ( 'api/oauth.html#appleappclient.client_secret',
+                                                                                 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.AppleAppClient.get_info': ('api/oauth.html#appleappclient.get_info', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.Auth0AppClient': ('api/oauth.html#auth0appclient', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.Auth0AppClient.__init__': ('api/oauth.html#auth0appclient.__init__', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.Auth0AppClient._fetch_openid_config': ( 'api/oauth.html#auth0appclient._fetch_openid_config',
                                                                                         'fasthtml/oauth.py'),

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39}/fasthtml/core.py

@@ -335,7 +335,7 @@ def url_path_for(self:HTTPConnection, name: str, **path_params):
     return URLPath(f"{self.scope['root_path']}{lp}", lp.protocol, lp.host)
 
 # %% ../nbs/api/00_core.ipynb
-_verbs = dict(get='hx-get', post='hx-post', put='hx-post', delete='hx-delete', patch='hx-patch', link='href')
+_verbs = dict(get='hx-get', post='hx-post', put='hx-put', delete='hx-delete', patch='hx-patch', link='href')
 
 def _url_for(req, t):
     "Generate URL for route `t` using request `req`"

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39}/fasthtml/jupyter.py

@@ -63,9 +63,9 @@ def show(*s, **kwargs):
 
 # %% ../nbs/api/06_jupyter.ipynb
 def render_ft(**kw):
-    "Call once in a notebook or solveit dialog to auto-render components"
+    "Call once in a notebook or solveit dialog to auto-render components with HTMX support"
     @patch
-    def _repr_markdown_(self:FT):
+    def _repr_html_(self:FT):
         scr_proc = Script('if (window.htmx) htmx.process(document.body)')
         return to_xml(Div(self, scr_proc, **kw))
 

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39}/fasthtml/live_reload.py

@@ -1,4 +1,5 @@
 from starlette.routing import WebSocketRoute
+from starlette.websockets import WebSocketDisconnect
 from fasthtml.basics import FastHTML, Script
 
 __all__ = ["FastHTMLWithLiveReload"]
@@ -23,7 +24,11 @@ def LiveReloadJs(reload_attempts:int=20, reload_interval:int=1000, **kwargs):
     """
     return Script(src % (reload_attempts, reload_interval))
 
-async def live_reload_ws(websocket): await websocket.accept()
+async def live_reload_ws(websocket):
+    await websocket.accept()
+    try:
+        while True: await websocket.receive()
+    except WebSocketDisconnect: pass
 
 class FastHTMLWithLiveReload(FastHTML):
     """

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39}/fasthtml/oauth.py

@@ -4,13 +4,13 @@
 
 # %% auto 0
 __all__ = ['http_patterns', 'GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient', 'Auth0AppClient',
-           'get_host', 'redir_url', 'url_match', 'OAuth', 'load_creds']
+           'AppleAppClient', 'get_host', 'redir_url', 'url_match', 'OAuth', 'load_creds']
 
 # %% ../nbs/api/08_oauth.ipynb
 from .common import *
 from oauthlib.oauth2 import WebApplicationClient
 from urllib.parse import urlparse, urlencode, parse_qs, quote, unquote
-import secrets, httpx
+import secrets, httpx, time
 
 # %% ../nbs/api/08_oauth.ipynb
 class _AppClient(WebApplicationClient):
@@ -112,6 +112,33 @@ class Auth0AppClient(_AppClient):
         d = dict(response_type="code", client_id=self.client_id, scope=self.scope, redirect_uri=redir_url(req, self.redirect_uri))
         return f"{self.base_url}?{urlencode(d)}"
 
+# %% ../nbs/api/08_oauth.ipynb
+class AppleAppClient(_AppClient):
+    "A `WebApplicationClient` for Apple Sign In"
+    base_url = "https://appleid.apple.com/auth/authorize"
+    token_url = "https://appleid.apple.com/auth/token"
+    
+    def __init__(self, client_id, key_id, team_id, private_key, code=None, scope=None, **kwargs):
+        if not scope: scope = ["name", "email"]
+        super().__init__(client_id, client_secret=None, code=code, scope=scope, **kwargs)
+        self.key_id, self.team_id, self.private_key = key_id, team_id, private_key
+    
+    @property
+    def client_secret(self):
+        import jwt
+        now = int(time.time())
+        payload = dict(iss=self.team_id, iat=now, exp=now + 86400 * 180, aud='https://appleid.apple.com', sub=self.client_id)
+        return jwt.encode(payload, self.private_key, algorithm='ES256', headers={'kid': self.key_id})
+    
+    @client_secret.setter
+    def client_secret(self, value): pass
+    
+    def get_info(self, token=None):
+        "Decode user info from the ID token"
+        import jwt
+        if token: self.token = token
+        return jwt.decode(self.token.get('id_token'), options={"verify_signature": False})
+
 # %% ../nbs/api/08_oauth.ipynb
 @patch
 def login_link(self:WebApplicationClient, redirect_uri, scope=None, state=None, **kwargs):
@@ -171,8 +198,9 @@ def url_match(request, patterns=http_patterns):
 
 # %% ../nbs/api/08_oauth.ipynb
 class OAuth:
-    def __init__(self, app, cli, skip=None, redir_path='/redirect', error_path='/error', logout_path='/logout', login_path='/login', https=True, http_patterns=http_patterns):
+    def __init__(self, app, cli, skip=None, redir_path='/redirect', error_path='/error', logout_path='/logout', login_path='/login', https=True, http_patterns=http_patterns, redir_method='get'):
         if not skip: skip = [redir_path,error_path,login_path]
+        redir_handler = app.post if redir_method == 'post' else app.get
         store_attr()
         def before(req, session):
             if 'auth' not in req.scope: req.scope['auth'] = session.get('auth')
@@ -182,7 +210,7 @@ class OAuth:
             if res: return res
         app.before.append(Beforeware(before, skip=skip))
 
-        @app.get(redir_path)
+        @redir_handler(redir_path)
         def redirect(req, session, code:str=None, error:str=None, state:str=None):
             if not code:
                 session['oauth_error']=error

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39}/fasthtml/svg.py

@@ -79,9 +79,9 @@ def transformd(translate=None, scale=None, rotate=None, skewX=None, skewY=None,
 
 # %% ../nbs/api/05_svg.ipynb
 @delegates(ft_svg)
-def Line(x1, y1, x2=0, y2=0, stroke='black', w=None, stroke_width=1, **kwargs):
+def Line(x1, y1, x2=0, y2=0, stroke=None, w=None, stroke_width=None, **kwargs):
     "A standard SVG `line` element"
-    if w: stroke_width=w
+    if w: stroke_width = w
     return ft_svg('line', x1=x1, y1=y1, x2=x2, y2=y2, stroke=stroke, stroke_width=stroke_width, **kwargs)
 
 # %% ../nbs/api/05_svg.ipynb

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.36
+Version: 0.12.39
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard and contributors
@@ -18,7 +18,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.8.1
+Requires-Dist: fastcore>=1.10.0
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib
@@ -33,6 +33,7 @@ Requires-Dist: ipython; extra == "dev"
 Requires-Dist: lxml; extra == "dev"
 Requires-Dist: pysymbol_llm; extra == "dev"
 Requires-Dist: monsterui; extra == "dev"
+Requires-Dist: PyJWT; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.8.1
+fastcore>=1.10.0
 python-dateutil
 starlette>0.33
 oauthlib
@@ -14,3 +14,4 @@ ipython
 lxml
 pysymbol_llm
 monsterui
+PyJWT

{python_fasthtml-0.12.36 → python_fasthtml-0.12.39}/settings.ini

@@ -1,11 +1,11 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = python-fasthtml
-version = 0.12.36
+version = 0.12.39
 min_python = 3.10
 license = apache2
-requirements = fastcore>=1.8.1 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.1.1 python-multipart beautifulsoup4
-dev_requirements = ipython lxml pysymbol_llm monsterui
+requirements = fastcore>=1.10.0 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.1.1 python-multipart beautifulsoup4
+dev_requirements = ipython lxml pysymbol_llm monsterui PyJWT
 black_formatting = False
 conda_user = fastai
 doc_path = _docs

python_fasthtml-0.12.36/fasthtml/__init__.py

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