python-fasthtml 0.6.8__tar.gz → 0.6.10__tar.gz

{python-fasthtml-0.6.8 → python-fasthtml-0.6.10}/CONTRIBUTING.md

@@ -1,6 +1,9 @@
 # How to contribute
 
-This project uses [nbdev](https://nbdev.fast.ai/getting_started.html) for development. Before beginning, make sure that nbdev and a jupyter-compatible client such as jupyterlab or nbclassic are installed. To make changes, update the notebooks in the `nbs` folder, not the .py files directly. Then, run `nbdev_export`. For more details, have a look at the [nbdev tutorial](https://nbdev.fast.ai/tutorials/tutorial.html).
+Make sure you have read the [doc on code style](
+https://docs.fast.ai/dev/style.html) first. (Note that we don't follow PEP8, but instead follow a coding style designed specifically for numerical and interactive programming.)
+
+This project uses [nbdev](https://nbdev.fast.ai/getting_started.html) for development. Before beginning, make sure that nbdev and a jupyter-compatible client such as jupyterlab or nbclassic are installed. To make changes, update the notebooks in the `nbs` folder, not the .py files directly. Then, run `nbdev_export`. For more details, have a look at the [nbdev tutorial](https://nbdev.fast.ai/tutorials/tutorial.html). Depending on the code changes, you might also need to run `tools/update.sh` to update python interface modules and [LLM reference material](https://github.com/AnswerDotAI/llms-txt).
 
 You may want to set up a `prep` alias in `~/.zshrc` or other shell startup file:
 

{python-fasthtml-0.6.8/python_fasthtml.egg-info → python-fasthtml-0.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.6.8
+Version: 0.6.10
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.7.8
+Requires-Dist: fastcore>=1.7.10
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

python-fasthtml-0.6.10/fasthtml/__init__.py

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

{python-fasthtml-0.6.8 → python-fasthtml-0.6.10}/fasthtml/_modidx.py

@@ -160,7 +160,8 @@ d = { 'settings': { 'branch': 'main',
                                                                               '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.oauth.decode': ('api/oauth.html#decode', 'fasthtml/oauth.py')},
+                                'fasthtml.oauth.redir_url': ('api/oauth.html#redir_url', 'fasthtml/oauth.py'),
+                                'fasthtml.oauth.url_match': ('api/oauth.html#url_match', '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'),

{python-fasthtml-0.6.8 → python-fasthtml-0.6.10}/fasthtml/oauth.py

@@ -3,14 +3,14 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/api/08_oauth.ipynb.
 
 # %% auto 0
-__all__ = ['GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient', 'decode', 'OAuth']
+__all__ = ['http_patterns', 'GoogleAppClient', 'GitHubAppClient', 'HuggingFaceClient', 'DiscordAppClient', 'redir_url',
+           'url_match', 'OAuth']
 
 # %% ../nbs/api/08_oauth.ipynb
 from .common import *
 from oauthlib.oauth2 import WebApplicationClient
 from urllib.parse import urlparse, urlencode, parse_qs, quote, unquote
-from httpx import get, post
-import secrets
+import secrets, httpx
 
 # %% ../nbs/api/08_oauth.ipynb
 class _AppClient(WebApplicationClient):
@@ -45,7 +45,6 @@ class GitHubAppClient(_AppClient):
     id_key = 'id'
 
     def __init__(self, client_id, client_secret, code=None, scope=None, **kwargs):
-        if not scope: scope="user"
         super().__init__(client_id, client_secret, code=code, scope=scope, **kwargs)
 
 # %% ../nbs/api/08_oauth.ipynb
@@ -84,7 +83,7 @@ class DiscordAppClient(_AppClient):
     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 = 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)
 
@@ -96,29 +95,28 @@ def login_link(self:WebApplicationClient, redirect_uri, scope=None, state=None):
     if not state: state=getattr(self, 'state', None)
     return self.prepare_request_uri(self.base_url, redirect_uri, scope, state=state)
 
+# %% ../nbs/api/08_oauth.ipynb
+def redir_url(request, redir_path, scheme='https'):
+    "Get the redir url for the host in `request`"
+    return f"{scheme}://{request.url.netloc}{redir_path}"
+
 # %% ../nbs/api/08_oauth.ipynb
 @patch
 def parse_response(self:_AppClient, code, redirect_uri):
     "Get the token from the oauth2 server response"
     payload = dict(code=code, redirect_uri=redirect_uri, client_id=self.client_id,
                    client_secret=self.client_secret, grant_type='authorization_code')
-    r = post(self.token_url, json=payload)
+    r = httpx.post(self.token_url, json=payload)
     r.raise_for_status()
     self.parse_request_body_response(r.text)
 
-# %% ../nbs/api/08_oauth.ipynb
-def decode(code_url):
-    parsed_url = urlparse(code_url)
-    query_params = parse_qs(parsed_url.query)
-    return query_params.get('code', [''])[0], query_params.get('state', [''])[0], code_url.split('?')[0]
-
 # %% ../nbs/api/08_oauth.ipynb
 @patch
 def get_info(self:_AppClient, token=None):
     "Get the info for authenticated user"
     if not token: token = self.token["access_token"]
     headers = {'Authorization': f'Bearer {token}'}
-    return get(self.info_url, headers=headers).json()
+    return httpx.get(self.info_url, headers=headers).json()
 
 # %% ../nbs/api/08_oauth.ipynb
 @patch
@@ -133,24 +131,29 @@ def retr_id(self:_AppClient, code, redirect_uri):
     "Call `retr_info` and then return id/subscriber value"
     return self.retr_info(code, redirect_uri)[self.id_key]
 
+# %% ../nbs/api/08_oauth.ipynb
+http_patterns = (r'^(localhost|127\.0\.0\.1)(:\d+)?$',)
+def url_match(url, patterns=http_patterns):
+    return any(re.match(pattern, url.netloc.split(':')[0]) for pattern in patterns)
+
 # %% ../nbs/api/08_oauth.ipynb
 class OAuth:
-    def __init__(self, app, cli, skip=None, redir_path='/redirect', logout_path='/logout', login_path='/login'):
+    def __init__(self, app, cli, skip=None, redir_path='/redirect', logout_path='/logout', login_path='/login', https=True, http_patterns=http_patterns):
         if not skip: skip = [redir_path,login_path]
-        self.app,self.cli,self.skip,self.redir_path,self.logout_path,self.login_path = app,cli,skip,redir_path,logout_path,login_path
-
+        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)
+
         app.before.append(Beforeware(before, skip=skip))
 
         @app.get(redir_path)
         def redirect(code:str, req, session, state:str=None):
             if not code: return "No code provided!"
-            base_url = f"{req.url.scheme}://{req.url.netloc}"
-            print(base_url)
+            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']
@@ -161,7 +164,9 @@ class OAuth:
             session.pop('auth', None)
             return self.logout(session)
 
-    def redir_url(self, req): return f"{req.url.scheme}://{req.url.netloc}{self.redir_path}"
+    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()

{python-fasthtml-0.6.8 → python-fasthtml-0.6.10/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.6.8
+Version: 0.6.10
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.7.8
+Requires-Dist: fastcore>=1.7.10
 Requires-Dist: python-dateutil
 Requires-Dist: starlette>0.33
 Requires-Dist: oauthlib

{python-fasthtml-0.6.8 → python-fasthtml-0.6.10}/python_fasthtml.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastcore>=1.7.8
+fastcore>=1.7.10
 python-dateutil
 starlette>0.33
 oauthlib

{python-fasthtml-0.6.8 → python-fasthtml-0.6.10}/settings.ini

@@ -1,10 +1,10 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.6.8
+version = 0.6.10
 min_python = 3.10
 license = apache2
-requirements = fastcore>=1.7.8 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.9 python-multipart beautifulsoup4
+requirements = fastcore>=1.7.10 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.9 python-multipart beautifulsoup4
 dev_requirements = ipython lxml pysymbol_llm
 black_formatting = False
 conda_user = fastai

python-fasthtml-0.6.8/fasthtml/__init__.py

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