python-fasthtml 0.9.1__tar.gz → 0.9.2__tar.gz

{python-fasthtml-0.9.1/python_fasthtml.egg-info → python-fasthtml-0.9.2}/PKG-INFO

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

python-fasthtml-0.9.2/fasthtml/__init__.py

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

{python-fasthtml-0.9.1 → python-fasthtml-0.9.2}/fasthtml/_modidx.py

@@ -149,11 +149,11 @@ d = { 'settings': { 'branch': 'main',
                                                                                'fasthtml/oauth.py'),
                                 'fasthtml.oauth.OAuth': ('api/oauth.html#oauth', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.OAuth.__init__': ('api/oauth.html#oauth.__init__', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth.OAuth._chk_auth': ('api/oauth.html#oauth._chk_auth', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth.OAuth.chk_auth': ('api/oauth.html#oauth.chk_auth', 'fasthtml/oauth.py'),
-                                'fasthtml.oauth.OAuth.login': ('api/oauth.html#oauth.login', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.OAuth.check_invalid': ('api/oauth.html#oauth.check_invalid', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.OAuth.get_auth': ('api/oauth.html#oauth.get_auth', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.OAuth.login_link': ('api/oauth.html#oauth.login_link', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.OAuth.logout': ('api/oauth.html#oauth.logout', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.OAuth.redir_login': ('api/oauth.html#oauth.redir_login', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.OAuth.redir_url': ('api/oauth.html#oauth.redir_url', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.WebApplicationClient.login_link': ( 'api/oauth.html#webapplicationclient.login_link',
                                                                                     'fasthtml/oauth.py'),

{python-fasthtml-0.9.1 → python-fasthtml-0.9.2}/fasthtml/core.py

@@ -239,6 +239,7 @@ def _find_wsp(ws, data, hdrs, arg:str, p:Parameter):
         if arg.lower()=='htmx': return _get_htmx(hdrs)
         if arg.lower()=='app': return ws.scope['app']
         if arg.lower()=='send': return partial(_send_ws, ws)
+        if 'session'.startswith(arg.lower()): return ws.scope.get('session', {})
         return None
     res = data.get(arg, None)
     if res is empty or res is None: res = hdrs.get(arg, None)

{python-fasthtml-0.9.1 → python-fasthtml-0.9.2}/fasthtml/oauth.py

@@ -143,10 +143,9 @@ class OAuth:
         store_attr()
         def before(req, session):
             auth = req.scope['auth'] = session.get('auth')
-            if not auth: return RedirectResponse(self.login_path, status_code=303)
-            info = AttrDictDefault(cli.get_info(auth))
-            if not self._chk_auth(info, session): return RedirectResponse(self.login_path, status_code=303)
-
+            if not auth: return self.redir_login(session)
+            res = self.check_invalid(req, session, auth)
+            if res: return res
         app.before.append(Beforeware(before, skip=skip))
 
         @app.get(redir_path)
@@ -155,23 +154,24 @@ class OAuth:
             scheme = 'http' if url_match(req.url,self.http_patterns) or not self.https else 'https'
             base_url = f"{scheme}://{req.url.netloc}"
             info = AttrDictDefault(cli.retr_info(code, base_url+redir_path))
-            if not self._chk_auth(info, session): return RedirectResponse(self.login_path, status_code=303)
-            session['auth'] = cli.token['access_token']
-            return self.login(info, state)
+            ident = info.get(self.cli.id_key)
+            if not ident: return self.redir_login(session)
+            res = self.get_auth(info, ident, session, state)
+            if not res:   return self.redir_login(session)
+            req.scope['auth'] = session['auth'] = ident
+            return res
 
         @app.get(logout_path)
         def logout(session):
             session.pop('auth', None)
             return self.logout(session)
 
-    def redir_url(self, req): 
+    def redir_login(self, session): return RedirectResponse(self.login_path, status_code=303)
+    def redir_url(self, req):
         scheme = 'http' if url_match(req.url,self.http_patterns) or not self.https else 'https'
         return redir_url(req, self.redir_path, scheme)
-    def login_link(self, req, scope=None, state=None): return self.cli.login_link(self.redir_url(req), scope=scope, state=state)
 
-    def login(self, info, state): raise NotImplementedError()
-    def logout(self, session): return RedirectResponse(self.login_path, status_code=303)
-    def chk_auth(self, info, ident, session): raise NotImplementedError()
-    def _chk_auth(self, info, session):
-        ident = info.get(self.cli.id_key)
-        return ident and self.chk_auth(info, ident, session)
+    def login_link(self, req, scope=None, state=None): return self.cli.login_link(self.redir_url(req), scope=scope, state=state)
+    def check_invalid(self, req, session, auth): return False
+    def logout(self, session): return self.redir_login(session)
+    def get_auth(self, info, ident, session, state): raise NotImplementedError()

{python-fasthtml-0.9.1 → python-fasthtml-0.9.2/python_fasthtml.egg-info}/PKG-INFO

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

{python-fasthtml-0.9.1 → python-fasthtml-0.9.2}/settings.ini

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

python-fasthtml-0.9.1/fasthtml/__init__.py

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