python-fasthtml 0.12.28__tar.gz → 0.12.30__tar.gz

{python_fasthtml-0.12.28/python_fasthtml.egg-info → python_fasthtml-0.12.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.28
+Version: 0.12.30
 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.30/fasthtml/__init__.py

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

{python_fasthtml-0.12.28 → python_fasthtml-0.12.30}/fasthtml/_modidx.py

@@ -73,6 +73,9 @@ d = { 'settings': { 'branch': 'main',
                                'fasthtml.core.RouteFuncs.__getattr__': ('api/core.html#routefuncs.__getattr__', 'fasthtml/core.py'),
                                'fasthtml.core.RouteFuncs.__init__': ('api/core.html#routefuncs.__init__', 'fasthtml/core.py'),
                                'fasthtml.core.RouteFuncs.__setattr__': ('api/core.html#routefuncs.__setattr__', 'fasthtml/core.py'),
+                               'fasthtml.core.StaticNoCache': ('api/core.html#staticnocache', 'fasthtml/core.py'),
+                               'fasthtml.core.StaticNoCache.file_response': ( 'api/core.html#staticnocache.file_response',
+                                                                              'fasthtml/core.py'),
                                'fasthtml.core.StringConvertor.to_string': ('api/core.html#stringconvertor.to_string', 'fasthtml/core.py'),
                                'fasthtml.core._add_ids': ('api/core.html#_add_ids', 'fasthtml/core.py'),
                                'fasthtml.core._annotations': ('api/core.html#_annotations', 'fasthtml/core.py'),
@@ -260,6 +263,12 @@ d = { 'settings': { 'branch': 'main',
                                 'fasthtml.xtend.Fragment.__init__': ('api/xtend.html#fragment.__init__', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Hidden': ('api/xtend.html#hidden', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.HtmxOn': ('api/xtend.html#htmxon', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.LdContactPoint': ('api/xtend.html#ldcontactpoint', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.LdCourse': ('api/xtend.html#ldcourse', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.LdCourseInstance': ('api/xtend.html#ldcourseinstance', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.LdJson': ('api/xtend.html#ldjson', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.LdOrg': ('api/xtend.html#ldorg', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.LdWebsite': ('api/xtend.html#ldwebsite', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Nbsp': ('api/xtend.html#nbsp', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.Now': ('api/xtend.html#now', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.On': ('api/xtend.html#on', 'fasthtml/xtend.py'),
@@ -277,6 +286,9 @@ d = { 'settings': { 'branch': 'main',
                                 'fasthtml.xtend.jsd': ('api/xtend.html#jsd', 'fasthtml/xtend.py'),
                                 '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.robots_txt': ('api/xtend.html#robots_txt', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.run_js': ('api/xtend.html#run_js', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.sitemap_url': ('api/xtend.html#sitemap_url', 'fasthtml/xtend.py'),
+                                'fasthtml.xtend.sitemap_xml': ('api/xtend.html#sitemap_xml', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.undouble_braces': ('api/xtend.html#undouble_braces', 'fasthtml/xtend.py'),
                                 'fasthtml.xtend.with_sid': ('api/xtend.html#with_sid', 'fasthtml/xtend.py')}}}

{python_fasthtml-0.12.28 → python_fasthtml-0.12.30}/fasthtml/core.py

@@ -8,7 +8,8 @@ __all__ = ['empty', 'htmx_hdrs', 'fh_cfg', 'htmx_resps', 'htmx_exts', 'htmxsrc',
            'HtmxHeaders', 'HttpHeader', 'HtmxResponseHeaders', 'form2dict', 'parse_form', 'JSONResponse', 'flat_xt',
            'Beforeware', 'EventStream', 'signal_shutdown', 'uri', 'decode_uri', 'flat_tuple', 'noop_body', 'respond',
            'is_full_page', 'Redirect', 'get_key', 'qp', 'def_hdrs', 'FastHTML', 'nested_name', 'serve', 'Client',
-           'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'MiddlewareBase', 'FtResponse', 'unqid']
+           'RouteFuncs', 'APIRouter', 'cookie', 'reg_re_param', 'StaticNoCache', 'MiddlewareBase', 'FtResponse',
+           'unqid']
 
 # %% ../nbs/api/00_core.ipynb
 import json,uuid,inspect,types,signal,asyncio,threading,inspect,random,contextlib
@@ -820,6 +821,13 @@ def static_route(self:FastHTML, ext='', prefix='/', static_path='.'):
     @self.route(f"{prefix}{{fname:path}}{ext}")
     async def get(fname:str): return FileResponse(f'{static_path}/{fname}{ext}')
 
+# %% ../nbs/api/00_core.ipynb
+class StaticNoCache(StaticFiles):
+    def file_response(self, *args, **kwargs):
+        resp = super().file_response(*args, **kwargs)
+        resp.headers.setdefault("Cache-Control", "no-cache")
+        return resp
+
 # %% ../nbs/api/00_core.ipynb
 class MiddlewareBase:
     async def __call__(self, scope, receive, send) -> None:

{python_fasthtml-0.12.28 → python_fasthtml-0.12.30}/fasthtml/oauth.py

@@ -184,7 +184,9 @@ class OAuth:
 
         @app.get(redir_path)
         def redirect(req, session, code:str=None, error:str=None, state:str=None):
-            if not code: session['oauth_error']=error; return RedirectResponse(self.error_path, status_code=303)
+            if not code:
+                session['oauth_error']=error
+                return RedirectResponse(self.error_path, status_code=303)
             scheme = 'http' if url_match(req,self.http_patterns) or not self.https else 'https'
             base_url = f"{scheme}://{get_host(req)}"
             info = AttrDictDefault(cli.retr_info(code, base_url+redir_path))

{python_fasthtml-0.12.28 → python_fasthtml-0.12.30}/fasthtml/xtend.py

@@ -5,7 +5,9 @@
 # %% auto 0
 __all__ = ['sid_scr', 'A', 'AX', 'Form', 'Hidden', 'CheckboxX', 'Script', 'Style', 'double_braces', 'undouble_braces',
            'loose_format', 'ScriptX', 'replace_css_vars', 'StyleX', 'Nbsp', 'Surreal', 'On', 'Prev', 'Now', 'AnyNow',
-           'run_js', 'HtmxOn', 'jsd', 'Fragment', 'Titled', 'Socials', 'YouTubeEmbed', 'Favicon', 'clear', 'with_sid']
+           'run_js', 'HtmxOn', 'jsd', 'Fragment', 'Titled', 'Socials', 'YouTubeEmbed', 'Favicon', 'clear', 'with_sid',
+           'LdJson', 'LdContactPoint', 'LdOrg', 'LdWebsite', 'LdCourseInstance', 'LdCourse', 'robots_txt',
+           'sitemap_url', 'sitemap_xml']
 
 # %% ../nbs/api/02_xtend.ipynb
 from dataclasses import dataclass, asdict
@@ -224,18 +226,13 @@ def YouTubeEmbed(video_id:str, *, width:int=560, height:int=315, start_time:int=
     print(f"https://www.youtube.com/embed/{video_id}{query_string}")
     return Div(
         Iframe(
-            width=width,
-            height=height,
+            width=width, height=height,
             src=f"https://www.youtube.com/embed/{video_id}{query_string}",
-            title=title,
-            frameborder="0",
+            title=title, frameborder="0",
             allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share",
-            referrerpolicy="strict-origin-when-cross-origin",
-            allowfullscreen='',
+            referrerpolicy="strict-origin-when-cross-origin", allowfullscreen='',
             **kwargs
-        ),
-        cls=cls
-    )
+        ), cls=cls)
 
 # %% ../nbs/api/02_xtend.ipynb
 def Favicon(light_icon, dark_icon):
@@ -268,3 +265,88 @@ htmx.on("htmx:configRequest", (e) => {
 def with_sid(app, dest, path='/'):
     @app.route(path)
     def get(): return Div(hx_get=dest, hx_trigger=f'load delay:0.001s', hx_swap='outerHTML')
+
+# %% ../nbs/api/02_xtend.ipynb
+def LdJson(typ, data:dict, script=False, extra=None, **kwargs)->FT:
+    "A script tag containing JSON-LD structured data"
+    cts = {'@type':typ, "@context": "https://schema.org"} | data | (extra or {})
+    if not script: return cts
+    return Script(dumps(cts, indent=1), type="application/ld+json", **kwargs)
+
+# %% ../nbs/api/02_xtend.ipynb
+def LdContactPoint(contact_type:str, email:str=None, phone:str=None, script=False, **extra)->dict:
+    "Create a ContactPoint for JSON-LD"
+    data = {"contactType": contact_type}
+    if email: data["email"] = email  
+    if phone: data["telephone"] = phone
+    return LdJson("ContactPoint", data, extra=extra, script=script)
+
+# %% ../nbs/api/02_xtend.ipynb
+def LdOrg(name:str, url:str=None, logo:str=None, alt_name:str=None, 
+          same_as:list=None, contact_points:list=None, script=False, **extra)->dict:
+    "JSON-LD Organization structured data"
+    data = {"name": name}
+    if alt_name: data["alternateName"] = alt_name
+    if url: data["url"] = url
+    if logo: data["logo"] = logo
+    if same_as: data["sameAs"] = same_as
+    if contact_points: data["contactPoint"] = contact_points
+    return LdJson("Organization", data, extra=extra, script=script)
+
+# %% ../nbs/api/02_xtend.ipynb
+def LdWebsite(name:str, url:str, script=False, **extra)->dict:
+    "Create JSON-LD WebSite structured data"
+    data = {"name": name, "url": url}
+    return LdJson("WebSite", data, extra=extra, script=script)
+
+# %% ../nbs/api/02_xtend.ipynb
+def LdCourseInstance(course_mode:str="Online", start_date:str=None, end_date:str=None, 
+                     location:dict=None, instructor:dict=None, script=False, **extra)->dict:
+    "Create a CourseInstance for JSON-LD"
+    data = {"courseMode": course_mode}
+    if start_date: data["startDate"] = start_date
+    if end_date: data["endDate"] = end_date  
+    if location: data["location"] = location
+    if instructor: data["instructor"] = instructor
+    return LdJson("CourseInstance", data, extra=extra, script=script)
+
+# %% ../nbs/api/02_xtend.ipynb
+def LdCourse(name:str, description:str, provider:dict, course_instance:dict=None, script=False, **extra)->dict:
+    "Create JSON-LD Course structured data"
+    data = { "name": name, "description": description, "provider": provider }
+    if course_instance: data["hasCourseInstance"] = course_instance
+    return LdJson("Course", data, extra=extra, script=script)
+
+# %% ../nbs/api/02_xtend.ipynb
+def robots_txt(app, allow_all=True, disallow_paths=None, sitemap_url=None, crawl_delay=None):
+    "Add a /robots.txt route to the app"
+    @app.route("/robots.txt")
+    def get():
+        lines = ["User-agent: *"]
+        if allow_all and not disallow_paths: lines.append("Allow: /")
+        elif disallow_paths: lines.extend(f"Disallow: {path}" for path in disallow_paths)
+        else: lines.append("Disallow: /")
+        if crawl_delay: lines.append(f"Crawl-delay: {crawl_delay}")
+        if sitemap_url: lines.append(f"Sitemap: {sitemap_url}")
+        return "\n".join(lines)
+
+# %% ../nbs/api/02_xtend.ipynb
+from fastcore.xml import Url,Loc,Lastmod,Changefreq,Priority,Urlset
+
+# %% ../nbs/api/02_xtend.ipynb
+def sitemap_url(url_info, loc_base=""):
+    "Create a sitemap URL element from url_info (string or dict)"
+    if isinstance(url_info, str): return Url(Loc(loc_base + url_info))
+    loc = loc_base + url_info['loc']
+    url_elem = [Loc(loc)]
+    if 'lastmod' in url_info: url_elem.append(Lastmod(url_info['lastmod']))
+    if 'changefreq' in url_info: url_elem.append(Changefreq(url_info['changefreq']))
+    if 'priority' in url_info: url_elem.append(Priority(str(url_info['priority'])))
+    return Url(*url_elem)
+
+def sitemap_xml(app, urls, loc_base=""):
+    "Add a /sitemap.xml route to the app with list of URLs"
+    @app.route("/sitemap.xml")
+    def get():
+        urlset = [sitemap_url(url_info, loc_base) for url_info in urls]
+        return Urlset(*urlset, xmlns="http://www.sitemaps.org/schemas/sitemap/0.9")

{python_fasthtml-0.12.28 → python_fasthtml-0.12.30/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fasthtml
-Version: 0.12.28
+Version: 0.12.30
 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.28 → python_fasthtml-0.12.30}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = python-fasthtml
-version = 0.12.28
+version = 0.12.30
 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.28/fasthtml/__init__.py

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