python-fasthtml 0.12.12__tar.gz → 0.12.14__tar.gz

{python_fasthtml-0.12.12/python_fasthtml.egg-info → python_fasthtml-0.12.14}/PKG-INFO

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

python_fasthtml-0.12.14/fasthtml/__init__.py

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

{python_fasthtml-0.12.12 → python_fasthtml-0.12.14}/fasthtml/_modidx.py

@@ -132,6 +132,7 @@ d = { 'settings': { 'branch': 'main',
                                   'fasthtml.jupyter.JupyUvi': ('api/jupyter.html#jupyuvi', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.__init__': ('api/jupyter.html#jupyuvi.__init__', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.start': ('api/jupyter.html#jupyuvi.start', 'fasthtml/jupyter.py'),
+                                  'fasthtml.jupyter.JupyUvi.start_async': ('api/jupyter.html#jupyuvi.start_async', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUvi.stop': ('api/jupyter.html#jupyuvi.stop', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUviAsync': ('api/jupyter.html#jupyuviasync', 'fasthtml/jupyter.py'),
                                   'fasthtml.jupyter.JupyUviAsync.__init__': ( 'api/jupyter.html#jupyuviasync.__init__',
@@ -166,6 +167,8 @@ d = { 'settings': { 'branch': 'main',
                                 '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.GoogleAppClient.consent_url': ( 'api/oauth.html#googleappclient.consent_url',
+                                                                                'fasthtml/oauth.py'),
                                 'fasthtml.oauth.GoogleAppClient.creds': ('api/oauth.html#googleappclient.creds', 'fasthtml/oauth.py'),
                                 'fasthtml.oauth.GoogleAppClient.from_file': ( 'api/oauth.html#googleappclient.from_file',
                                                                               'fasthtml/oauth.py'),

{python_fasthtml-0.12.12 → python_fasthtml-0.12.14}/fasthtml/components.py

@@ -3,7 +3,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/01_components.ipynb.
 
 # %% auto 0
-__all__ = ['named', 'html_attrs', 'hx_attrs', 'hx_attrs_annotations', 'show', 'attrmap_x', 'ft_html', 'ft_hx', 'File',
+__all__ = ['named', 'html_attrs', 'hx_attrs', 'hx_attrs_annotations', 'attrmap_x', 'ft_html', 'ft_hx', 'File', 'show',
            'fill_form', 'fill_dataclass', 'find_inputs', 'html2ft', 'sse_message', 'A', 'Abbr', 'Address', 'Area',
            'Article', 'Aside', 'Audio', 'B', 'Base', 'Bdi', 'Bdo', 'Blockquote', 'Body', 'Br', 'Button', 'Canvas',
            'Caption', 'Cite', 'Code', 'Col', 'Colgroup', 'Data', 'Datalist', 'Dd', 'Del', 'Details', 'Dfn', 'Dialog',
@@ -31,12 +31,6 @@ import types, json
 try: from IPython import display
 except ImportError: display=None
 
-# %% ../nbs/api/01_components.ipynb
-def show(ft,*rest):
-    "Renders FT Components into HTML within a Jupyter notebook."
-    if rest: ft = (ft,)+rest
-    display.display(display.HTML(to_xml(ft)))
-
 # %% ../nbs/api/01_components.ipynb
 @patch
 def __str__(self:FT): return self.id if self.id else object.__str__(self)
@@ -122,6 +116,19 @@ def File(fname):
     "Use the unescaped text in file `fname` directly"
     return NotStr(Path(fname).read_text())
 
+# %% ../nbs/api/01_components.ipynb
+def show(ft, *rest, iframe=False, height='auto', style=None):
+    "Renders FT Components into HTML within a Jupyter notebook."
+    if rest: ft = (ft,)+rest
+    res = to_xml(ft)
+    if iframe:
+        style = "border: none; " + (style or "")
+        cfg = dict(frameborder=0, width='100%', height=height, style=style)
+        res = to_xml(Iframe(srcdoc=res, **cfg))
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", UserWarning)
+        display.display(display.HTML(res))
+
 # %% ../nbs/api/01_components.ipynb
 def _fill_item(item, obj):
     if not isinstance(item,FT): return item

{python_fasthtml-0.12.12 → python_fasthtml-0.12.14}/fasthtml/jupyter.py

@@ -88,6 +88,9 @@ class JupyUvi:
     def start(self):
         self.server = nb_serve(self.app, log_level=self.log_level, host=self.host, port=self.port, **self.kwargs)
 
+    async def start_async(self):
+        self.server = await nb_serve_async(self.app, log_level=self.log_level, host=self.host, port=self.port, **self.kwargs)
+
     def stop(self):
         self.server.should_exit = True
         wait_port_free(self.port)

{python_fasthtml-0.12.12 → python_fasthtml-0.12.14}/fasthtml/oauth.py

@@ -26,15 +26,17 @@ class GoogleAppClient(_AppClient):
     token_url = "https://oauth2.googleapis.com/token"
     info_url = "https://openidconnect.googleapis.com/v1/userinfo"
     
-    def __init__(self, client_id, client_secret, code=None, scope=None, **kwargs):
+    def __init__(self, client_id, client_secret, code=None, scope=None, project_id=None, **kwargs):
         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, code=code, scope=scope, **kwargs)
+        self.project_id = project_id
     
     @classmethod
     def from_file(cls, fname, code=None, scope=None, **kwargs):
         cred = Path(fname).read_json()['web']
-        return cls(cred['client_id'], client_secret=cred['client_secret'], code=code, scope=scope, **kwargs)
+        return cls(cred['client_id'], client_secret=cred['client_secret'], project_id=cred['project_id'],
+                  code=code, scope=scope, **kwargs)
 
 # %% ../nbs/api/08_oauth.ipynb
 class GitHubAppClient(_AppClient):
@@ -67,6 +69,7 @@ class DiscordAppClient(_AppClient):
     base_url = "https://discord.com/oauth2/authorize"
     token_url = "https://discord.com/api/oauth2/token"
     revoke_url = "https://discord.com/api/oauth2/token/revoke"
+    info_url = "https://discord.com/api/users/@me"
     id_key = 'id'
 
     def __init__(self, client_id, client_secret, is_user=False, perms=0, scope=None, **kwargs):
@@ -75,14 +78,18 @@ class DiscordAppClient(_AppClient):
         self.perms = perms
         super().__init__(client_id, client_secret, scope=scope, **kwargs)
 
-    def login_link(self):
+    def login_link(self, redirect_uri=None, scope=None, state=None):
+        use_scope = scope or self.scope
         d = dict(response_type='code', client_id=self.client_id,
-                 integration_type=self.integration_type, scope=self.scope) #, permissions=self.perms, prompt='consent')
+                 integration_type=self.integration_type, scope=use_scope)
+        if state: d['state'] = state
+        if redirect_uri: d['redirect_uri'] = redirect_uri
         return f'{self.base_url}?' + urlencode(d)
 
-    def parse_response(self, code):
+    def parse_response(self, code, redirect_uri=None):
         headers = {'Content-Type': 'application/x-www-form-urlencoded'}
-        data = dict(grant_type='authorization_code', code=code)#, redirect_uri=self.redirect_uri)
+        data = dict(grant_type='authorization_code', code=code)
+        if redirect_uri: data['redirect_uri'] = redirect_uri
         r = httpx.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)
@@ -161,7 +168,8 @@ class OAuth:
         if not skip: skip = [redir_path,error_path,login_path]
         store_attr()
         def before(req, session):
-            auth = req.scope['auth'] = session.get('auth')
+            if 'auth' not in req.scope: req.scope['auth'] = session.get('auth')
+            auth = req.scope['auth']
             if not auth: return self.redir_login(session)
             res = self.check_invalid(req, session, auth)
             if res: return res
@@ -203,6 +211,14 @@ except ImportError:
     Request=None
     class Credentials: pass
 
+# %% ../nbs/api/08_oauth.ipynb
+@patch()
+def consent_url(self:GoogleAppClient, proj=None):
+    "Get Google OAuth consent screen URL"
+    loc = "https://console.cloud.google.com/auth/clients"
+    if proj is None: proj=self.project_id
+    return f"{loc}/{self.client_id}?project={proj}"
+
 # %% ../nbs/api/08_oauth.ipynb
 @patch
 def update(self:Credentials):

{python_fasthtml-0.12.12 → python_fasthtml-0.12.14/python_fasthtml.egg-info}/PKG-INFO

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

{python_fasthtml-0.12.12 → python_fasthtml-0.12.14}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = python-fasthtml
-version = 0.12.12
+version = 0.12.14
 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

python_fasthtml-0.12.12/fasthtml/__init__.py

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