plash-cli 0.2.2__tar.gz → 0.3.1__tar.gz

{plash_cli-0.2.2 → plash_cli-0.3.1}/MANIFEST.in

@@ -3,3 +3,4 @@ include LICENSE
 include CONTRIBUTING.md
 include README.md
 recursive-exclude * __pycache__
+include plash_cli/assets/es256_public_key.pem

{plash_cli-0.2.2/plash_cli.egg-info → plash_cli-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plash_cli
-Version: 0.2.2
+Version: 0.3.1
 Summary: CLI for the Plash hosting service
 Home-page: https://github.com/AnswerDotAI/plash_cli
 Author: Jeremy Howard
@@ -18,6 +18,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastcore
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: python-dotenv
+Requires-Dist: pyjwt
+Requires-Dist: cryptography
 Provides-Extra: dev
 Requires-Dist: bash_kernel; extra == "dev"
 Requires-Dist: nbdev; extra == "dev"
@@ -185,13 +188,18 @@ When you visit that page you should see “Hello, World!”
 Learn more about what Plash has to offer in the rest of the docs at:
 <https://docs.pla.sh>
 
-For learning more about creating web apps with FastHTML, we recommend
-looking at the official docs at: <https://fastht.ml/docs/>.
-
-Particularly, we recommend the following:
+To learn more about creating web apps with FastHTML, we recommend
+looking at the official docs at: <https://fastht.ml/docs/>. In
+particular, we recommend the following:
 
 1.  [OAuth](https://fastht.ml/docs/explains/oauth.html) - Setup
     authentication for your Plash App with Google Sign-In or other OAuth
     Providers.
 2.  [Stripe](https://fastht.ml/docs/explains/stripe.html) - Accept
     payments for your products hosted on Plash with Stripe.
+
+Would you like to use a different python web framework? Then check out
+the [examples
+section](https://github.com/AnswerDotAI/plash_cli/tree/main/examples) of
+the repo, it has examples for many popular python web frameworks like
+FastAPI, Gradio, and Streamlit.

{plash_cli-0.2.2 → plash_cli-0.3.1}/README.md

@@ -148,13 +148,18 @@ When you visit that page you should see “Hello, World!”
 Learn more about what Plash has to offer in the rest of the docs at:
 <https://docs.pla.sh>
 
-For learning more about creating web apps with FastHTML, we recommend
-looking at the official docs at: <https://fastht.ml/docs/>.
-
-Particularly, we recommend the following:
+To learn more about creating web apps with FastHTML, we recommend
+looking at the official docs at: <https://fastht.ml/docs/>. In
+particular, we recommend the following:
 
 1.  [OAuth](https://fastht.ml/docs/explains/oauth.html) - Setup
     authentication for your Plash App with Google Sign-In or other OAuth
     Providers.
 2.  [Stripe](https://fastht.ml/docs/explains/stripe.html) - Accept
     payments for your products hosted on Plash with Stripe.
+
+Would you like to use a different python web framework? Then check out
+the [examples
+section](https://github.com/AnswerDotAI/plash_cli/tree/main/examples) of
+the repo, it has examples for many popular python web frameworks like
+FastAPI, Gradio, and Streamlit.

plash_cli-0.3.1/plash_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.1"

plash_cli-0.3.1/plash_cli/_modidx.py

@@ -0,0 +1,32 @@
+# Autogenerated by nbdev
+
+d = { 'settings': { 'branch': 'main',
+                'doc_baseurl': '/plash_cli',
+                'doc_host': 'https://AnswerDotAI.github.io',
+                'git_url': 'https://github.com/AnswerDotAI/plash_cli',
+                'lib_path': 'plash_cli'},
+  'syms': { 'plash_cli.auth': { 'plash_cli.auth.PlashAuthError': ('auth.html#plashautherror', 'plash_cli/auth.py'),
+                                'plash_cli.auth._parse_jwt': ('auth.html#_parse_jwt', 'plash_cli/auth.py'),
+                                'plash_cli.auth._signin_url': ('auth.html#_signin_url', 'plash_cli/auth.py'),
+                                'plash_cli.auth.goog_id_from_signin_reply': ('auth.html#goog_id_from_signin_reply', 'plash_cli/auth.py'),
+                                'plash_cli.auth.mk_signin_url': ('auth.html#mk_signin_url', 'plash_cli/auth.py')},
+            'plash_cli.cli': { 'plash_cli.cli.PlashError': ('cli.html#plasherror', 'plash_cli/cli.py'),
+                               'plash_cli.cli._deps': ('cli.html#_deps', 'plash_cli/cli.py'),
+                               'plash_cli.cli._endpoint': ('cli.html#_endpoint', 'plash_cli/cli.py'),
+                               'plash_cli.cli._gen_app_name': ('cli.html#_gen_app_name', 'plash_cli/cli.py'),
+                               'plash_cli.cli._get_app_name': ('cli.html#_get_app_name', 'plash_cli/cli.py'),
+                               'plash_cli.cli._get_client': ('cli.html#_get_client', 'plash_cli/cli.py'),
+                               'plash_cli.cli._is_included': ('cli.html#_is_included', 'plash_cli/cli.py'),
+                               'plash_cli.cli._mk_auth_req': ('cli.html#_mk_auth_req', 'plash_cli/cli.py'),
+                               'plash_cli.cli._poll_cookies': ('cli.html#_poll_cookies', 'plash_cli/cli.py'),
+                               'plash_cli.cli._validate_app': ('cli.html#_validate_app', 'plash_cli/cli.py'),
+                               'plash_cli.cli.apps': ('cli.html#apps', 'plash_cli/cli.py'),
+                               'plash_cli.cli.create_tar_archive': ('cli.html#create_tar_archive', 'plash_cli/cli.py'),
+                               'plash_cli.cli.delete': ('cli.html#delete', 'plash_cli/cli.py'),
+                               'plash_cli.cli.deploy': ('cli.html#deploy', 'plash_cli/cli.py'),
+                               'plash_cli.cli.download': ('cli.html#download', 'plash_cli/cli.py'),
+                               'plash_cli.cli.login': ('cli.html#login', 'plash_cli/cli.py'),
+                               'plash_cli.cli.logs': ('cli.html#logs', 'plash_cli/cli.py'),
+                               'plash_cli.cli.start': ('cli.html#start', 'plash_cli/cli.py'),
+                               'plash_cli.cli.stop': ('cli.html#stop', 'plash_cli/cli.py'),
+                               'plash_cli.cli.view': ('cli.html#view', 'plash_cli/cli.py')}}}

plash_cli-0.3.1/plash_cli/assets/es256_public_key.pem

@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEmAlaJd3pPsLNDxMf+gG1e+0DfSnS
+mfrJiP5rgj8GL/xwhALJl9DOrw0gBh1H3Q2/XQvs+Df0rWXJ5bryn2ZPmg==
+-----END PUBLIC KEY-----

plash_cli-0.3.1/plash_cli/auth.py

@@ -0,0 +1,60 @@
+"""Client side logic to add Plash Auth to your app"""
+
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_auth.ipynb.
+
+# %% auto 0
+__all__ = ['signin_completed_rt', 'mk_signin_url', 'PlashAuthError', 'goog_id_from_signin_reply']
+
+# %% ../nbs/01_auth.ipynb 4
+import httpx,os,jwt
+from pathlib import Path
+from warnings import warn
+
+from . import __version__
+
+# %% ../nbs/01_auth.ipynb 5
+_in_prod = os.getenv('PLASH_PRODUCTION', '') == '1'
+
+# %% ../nbs/01_auth.ipynb 6
+def _signin_url(email_re: str=None, hd_re: str=None):
+    res = httpx.post(os.environ['PLASH_AUTH_URL'], json=dict(email_re=email_re, hd_re=hd_re), 
+                     auth=(os.environ['PLASH_APP_ID'], os.environ['PLASH_APP_SECRET']), 
+                     headers={'X-PLASH-AUTH-VERSION': __version__}).raise_for_status().json()
+    if "warning" in res: warn(res.pop('warning'))
+    return res
+
+# %% ../nbs/01_auth.ipynb 8
+signin_completed_rt = "/signin_completed"
+
+# %% ../nbs/01_auth.ipynb 10
+def mk_signin_url(session: dict,       # Session dictionary
+                        email_re: str=None,  # Regex filter for allowed email addresses
+                        hd_re: str=None):    # Regex filter for allowed Google hosted domains
+    "Generate a Google Sign-In URL for Plash authentication."
+    if not _in_prod: return f"{signin_completed_rt}?signin_reply=mock-sign-in-reply"
+    res = _signin_url(email_re, hd_re)
+    session['req_id'] = res['req_id']
+    return res['plash_signin_url']
+
+# %% ../nbs/01_auth.ipynb 12
+def _parse_jwt(reply: str) -> dict:
+    "Parse JWT reply and return decoded claims or error info"
+    try: decoded = jwt.decode(reply, key=open(Path(__file__).parent / "assets" / "es256_public_key.pem","rb").read(), algorithms=["ES256"], 
+                              options=dict(verify_aud=False, verify_iss=False))
+    except Exception as e: return dict(req_id=None, sub=None, err=f'JWT validation failed: {e}')
+    return dict(req_id=decoded.get('req_id'), sub=decoded.get('sub'), err=decoded.get('err'))
+
+# %% ../nbs/01_auth.ipynb 14
+class PlashAuthError(Exception):
+    """Raised when Plash authentication fails"""
+    pass
+
+# %% ../nbs/01_auth.ipynb 16
+def goog_id_from_signin_reply(session: dict, # Session dictionary containing 'req_id'
+                              reply: str):   # The JWT reply string from Plash after Google authentication
+    "Validate Google sign-in reply and returns Google user ID if valid."
+    if not _in_prod: return '424242424242424242424'
+    parsed = _parse_jwt(reply)
+    if session.get('req_id') != parsed['req_id']: raise PlashAuthError("Request originated from a different browser than the one receiving the reply")
+    if parsed['err']: raise PlashAuthError(f"Authentication failed: {parsed['err']}")
+    return parsed['sub']

plash_cli-0.2.2/plash_cli/core.py → plash_cli-0.3.1/plash_cli/cli.py

@@ -1,13 +1,12 @@
 """The Plash CLI tool"""
 
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_cli.ipynb.
 
 # %% auto 0
-__all__ = ['PLASH_CONFIG_HOME', 'PLASH_DOMAIN', 'pat', 'stop', 'start', 'log_modes', 'get_client', 'mk_auth_req', 'get_app_name',
-           'endpoint', 'is_included', 'PlashError', 'poll_cookies', 'login', 'validate_app', 'create_tar_archive',
-           'deploy', 'view', 'delete', 'endpoint_func', 'logs', 'download', 'apps']
+__all__ = ['PLASH_CONFIG_HOME', 'PLASH_DOMAIN', 'pat', 'log_modes', 'PlashError', 'login', 'create_tar_archive', 'deploy', 'view',
+           'delete', 'start', 'stop', 'logs', 'download', 'apps']
 
-# %% ../nbs/00_core.ipynb 2
+# %% ../nbs/00_cli.ipynb 3
 from fastcore.all import *
 from fastcore.xdg import *
 import secrets, webbrowser, json, httpx, io, tarfile, random, string
@@ -18,12 +17,12 @@ import io, os, re, tarfile, tomllib
 
 from . import __version__
 
-# %% ../nbs/00_core.ipynb 5
+# %% ../nbs/00_cli.ipynb 6
 PLASH_CONFIG_HOME = xdg_config_home() / 'plash_config.json'
 PLASH_DOMAIN = os.getenv("PLASH_DOMAIN","pla.sh")  # pla.sh plash-dev.answer.ai localhost:5002
 
-# %% ../nbs/00_core.ipynb 6
-def get_client(cookie_file):
+# %% ../nbs/00_cli.ipynb 7
+def _get_client(cookie_file):
     client = httpx.Client()
     if not cookie_file.exists():
         raise FileNotFoundError("Plash config not found. Please run plash_login and try again.")
@@ -32,11 +31,11 @@ def get_client(cookie_file):
     client.headers.update({'X-PLASH': 'true', 'User-Agent': f'plash_cli/{__version__}'})
     return client
 
-# %% ../nbs/00_core.ipynb 7
-def mk_auth_req(url:str, method:str='get', **kwargs): return getattr(get_client(PLASH_CONFIG_HOME), method)(url, **kwargs)
+# %% ../nbs/00_cli.ipynb 8
+def _mk_auth_req(url:str, method:str='get', **kwargs): return getattr(_get_client(PLASH_CONFIG_HOME), method)(url, **kwargs)
 
-# %% ../nbs/00_core.ipynb 8
-def get_app_name(path:Path):
+# %% ../nbs/00_cli.ipynb 9
+def _get_app_name(path:Path):
     plash_app = Path(path) / '.plash'
     if not plash_app.exists(): raise FileNotFoundError(f"File not found: {plash_app=}")
     env = parse_env(fn=plash_app)
@@ -47,13 +46,13 @@ def get_app_name(path:Path):
     raise RuntimeError(f"{plash_app=} did not have a PLASH_APP_NAME")
 
 
-# %% ../nbs/00_core.ipynb 9
-def endpoint(sub='', rt=''):
+# %% ../nbs/00_cli.ipynb 10
+def _endpoint(sub='', rt=''):
     p = "http" if "localhost" in PLASH_DOMAIN else "https"
     return f"{p}://{sub}{'.' if sub else ''}{PLASH_DOMAIN}{rt}"
 
-# %% ../nbs/00_core.ipynb 10
-def is_included(path):
+# %% ../nbs/00_cli.ipynb 11
+def _is_included(path):
     "Returns True if path should be included in deployment"
     if path.name.startswith('.'): return False
     if path.suffix == '.pyc': return False
@@ -62,35 +61,37 @@ def is_included(path):
                 '.vscode', '.idea', '.sesskey'}
     return not any(p in excludes for p in path.parts)
 
-# %% ../nbs/00_core.ipynb 11
+# %% ../nbs/00_cli.ipynb 12
 class PlashError(Exception): pass
 
-# %% ../nbs/00_core.ipynb 13
-def poll_cookies(paircode, interval=1, timeout=180):
+# %% ../nbs/00_cli.ipynb 13
+def _poll_cookies(paircode, interval=1, timeout=180):
     "Poll server for token until received or timeout"
     start = time()
     client = httpx.Client()
-    url = endpoint(rt=f"/cli_token?paircode={paircode}")
+    url = _endpoint(rt=f"/cli_token?paircode={paircode}")
     while time()-start < timeout:
         resp = client.get(url).raise_for_status()
         if resp.text.strip(): return dict(client.cookies)
         sleep(interval)
-        
+     
+
+# %% ../nbs/00_cli.ipynb 14
 @call_parse
 def login():
     "Authenticate CLI with server and save config"
     paircode = secrets.token_urlsafe(16)
-    login_url = httpx.get(endpoint(rt=f"/cli_login?paircode={paircode}")).text
+    login_url = httpx.get(_endpoint(rt=f"/cli_login?paircode={paircode}")).text
     print(f"Opening browser for authentication:\n{login_url}\n")
     webbrowser.open(login_url)
     
-    cookies = poll_cookies(paircode)
+    cookies = _poll_cookies(paircode)
     if cookies:
         Path(PLASH_CONFIG_HOME).write_text(json.dumps(cookies))
         print(f"Authentication successful! Config saved to {PLASH_CONFIG_HOME}")
     else: print("Authentication timed out.")
 
-# %% ../nbs/00_core.ipynb 16
+# %% ../nbs/00_cli.ipynb 17
 pat = r'(?m)^# /// (?P<type>[a-zA-Z0-9-]+)$\s(?P<content>(^#(| .*)$\s)+)^# ///$'
 
 def _deps(script: bytes | str) -> dict | None:
@@ -105,8 +106,8 @@ def _deps(script: bytes | str) -> dict | None:
         return '\n'.join(tomllib.loads(content)['dependencies'])
     else: return None
 
-# %% ../nbs/00_core.ipynb 19
-def validate_app(path):
+# %% ../nbs/00_cli.ipynb 19
+def _validate_app(path):
     "Validates directory `path` is a deployable Plash app"
     if not (path / 'main.py').exists():
         raise PlashError('A Plash app requires a main.py file.')
@@ -114,11 +115,11 @@ def validate_app(path):
     if  deps and (path/"requirements.txt").exists(): 
         raise PlashError('A Plash app should not contain both a requirements.txt file and inline dependencies (see PEP723).')
 
-# %% ../nbs/00_core.ipynb 24
+# %% ../nbs/00_cli.ipynb 22
 def create_tar_archive(path:Path, force_data:bool=False) -> tuple[io.BytesIO, int]:
     "Creates a tar archive of a directory, excluding files based on is_included"
     tarz = io.BytesIO()
-    files = L(path if path.is_file() else Path(path).iterdir()).filter(is_included)
+    files = L(path if path.is_file() else Path(path).iterdir()).filter(_is_included)
     if not force_data: files = files.filter(lambda f: f.name != 'data')
     with tarfile.open(fileobj=tarz, mode='w:gz') as tar:
         for f in files: tar.add(f, arcname=f.name)
@@ -129,7 +130,7 @@ def create_tar_archive(path:Path, force_data:bool=False) -> tuple[io.BytesIO, in
     tarz.seek(0)
     return tarz, len(files)
 
-# %% ../nbs/00_core.ipynb 25
+# %% ../nbs/00_cli.ipynb 23
 def _gen_app_name():
     adjectives = ['admiring', 'adoring', 'amazing', 'awesome', 'beautiful', 'blissful', 'bold', 'brave', 'busy', 'charming', 'clever', 'compassionate', 'confident', 'cool', 'dazzling', 'determined', 'dreamy', 'eager', 'ecstatic', 'elastic', 'elated', 'elegant', 'epic', 'exciting', 'fervent', 'festive', 'flamboyant', 'focused', 'friendly', 'frosty', 'funny', 'gallant', 'gifted', 'goofy', 'gracious', 'great', 'happy', 'hopeful', 'hungry', 'inspiring', 'intelligent', 'interesting', 'jolly', 'jovial', 'keen', 'kind', 'laughing', 'loving', 'lucid', 'magical', 'modest', 'nice', 'nifty', 'nostalgic', 'objective', 'optimistic', 'peaceful', 'pensive', 'practical', 'priceless', 'quirky', 'quizzical', 'relaxed', 'reverent', 'romantic', 'serene', 'sharp', 'silly', 'sleepy', 'stoic', 'sweet', 'tender', 'trusting', 'upbeat', 'vibrant', 'vigilant', 'vigorous', 'wizardly', 'wonderful', 'youthful', 'zealous', 'zen', 'golden', 'silver', 'crimson', 'azure', 'emerald', 'violet', 'amber', 'coral', 'turquoise', 'lavender', 'minty', 'citrus', 'vanilla', 'woody', 'floral', 'fresh', 'gentle', 'sparkling', 'precise', 'curious']
     nouns = ['tiger', 'eagle', 'river', 'mountain', 'forest', 'ocean', 'star', 'moon', 'wind', 'dragon', 'phoenix', 'wolf', 'bear', 'lion', 'shark', 'falcon', 'raven', 'crystal', 'diamond', 'ruby', 'sapphire', 'pearl', 'wave', 'tide', 'cloud', 'rainbow', 'sunset', 'sunrise', 'galaxy', 'comet', 'meteor', 'planet', 'nebula', 'cosmos', 'universe', 'atom', 'photon', 'quantum', 'matrix', 'cipher', 'code', 'signal', 'pulse', 'beam', 'ray', 'spark', 'frost', 'ice', 'snow', 'mist', 'fog', 'dew', 'rain', 'hail', 'helix', 'prism', 'lens', 'mirror', 'echo', 'heart', 'mind', 'dream', 'vision', 'hope', 'wish', 'magic', 'spell', 'charm', 'rune', 'symbol', 'token', 'key', 'door', 'gate', 'bridge', 'tower', 'castle', 'fortress', 'shield', 'dolphin', 'whale', 'penguin', 'butterfly', 'hummingbird', 'deer', 'rabbit', 'fox', 'otter', 'panda', 'koala', 'zebra', 'giraffe', 'elephant', 'valley', 'canyon', 'meadow', 'prairie', 'island', 'lake', 'pond', 'stream', 'waterfall', 'cliff', 'peak', 'hill', 'grove', 'garden', 'sunlight', 'breeze', 'melody', 'sparkle', 'whirlpool', 'windmill', 'carousel', 'spiral', 'glow']
@@ -137,7 +138,7 @@ def _gen_app_name():
     suffix = ''.join(random.choices(string.ascii_lowercase + string.digits, k=3))
     return f"{random.choice(adjectives)}-{random.choice(nouns)}-{random.choice(verbs)}-{suffix}"
 
-# %% ../nbs/00_core.ipynb 26
+# %% ../nbs/00_cli.ipynb 24
 @call_parse
 def deploy(
     path:Path=Path('.'),    # Path to project
@@ -145,51 +146,51 @@ def deploy(
     force_data:bool=False): # Overwrite data/ directory during deployment
     """
     Deploys app to production. By default, this command erases all files in your app which are not in data/.
-    Then uploads all files and folders, except paths starting with '.' and except the local data/ directory.
-    If `--force data` is used, then it erases all files in production. Then it uploads all files and folders,
-    including `data/`, except paths starting with '.'.
+    Then uploads all files and folders, except paths starting with `.` and except the local data/ directory.
+    If `--force_data` is used, then it erases all files in production. Then it uploads all files and folders,
+    including `data/`, except paths starting with `.`.
     """
     print('Initializing deployment...')
     if name == '': print('Error: App name cannot be an empty string'); return
     if not path.is_dir(): print("Error: Path should point to the project directory"); return
-    try: validate_app(path)
+    try: _validate_app(path)
     except PlashError as e: print(f"Error: {str(e)}\nInvalid path: {path}"); return
     
     try: 
-        if not name: name = get_app_name(path)
+        if not name: name = _get_app_name(path)
     except FileNotFoundError:
         plash_app = path / '.plash'
         name = _gen_app_name()
         plash_app.write_text(f'export PLASH_APP_NAME={name}')
     
     tarz, _ = create_tar_archive(path, force_data)
-    resp = mk_auth_req(endpoint(rt="/upload"), "post", files={'file': tarz}, timeout=300.0, 
+    resp = _mk_auth_req(_endpoint(rt="/upload"), "post", files={'file': tarz}, timeout=300.0, 
                        data={'name': name, 'force_data': force_data})
     if resp.status_code == 200:
         print('✅ Upload complete! Your app is currently being built.')
-        print(f'It will be live at {name if "." in name else endpoint(sub=name)}')
+        print(f'It will be live at {name if "." in name else _endpoint(sub=name)}')
     else: print(f'Failure: {resp.status_code}\n{resp.text}')
 
-# %% ../nbs/00_core.ipynb 28
+# %% ../nbs/00_cli.ipynb 27
 @call_parse
 def view(
     path:Path=Path('.'), # Path to project directory
     name:str=None,     # Overrides the .plash file in project root if provided
 ):
     "Open your app in the browser"
-    if not name: name = get_app_name(path)
-    url = name if '.' in name else endpoint(sub=name)
+    if not name: name = _get_app_name(path)
+    url = name if '.' in name else _endpoint(sub=name)
     print(f"Opening browser to view app :\n{url}\n")
     webbrowser.open(url)
 
-# %% ../nbs/00_core.ipynb 30
+# %% ../nbs/00_cli.ipynb 30
 @call_parse
 def delete(
     path:Path=Path('.'), # Path to project
     name:str=None,     # Overrides the .plash file in project root if provided
     force:bool=False):   # Skip confirmation prompt
     'Delete your deployed app'
-    if not name: name = get_app_name(path)
+    if not name: name = _get_app_name(path)
     if not force:
         confirm = input(f"Are you sure you want to delete app '{name}'? This action cannot be undone. [y/N]: ")
         if confirm.lower() not in ['y', 'yes']:
@@ -197,34 +198,29 @@ def delete(
             return
     
     print(f"Deleting app '{name}'...")
-    r = mk_auth_req(endpoint(rt=f"/delete?name={name}"), "delete")
+    r = _mk_auth_req(_endpoint(rt=f"/delete?name={name}"), "delete")
     return r.text
 
-# %% ../nbs/00_core.ipynb 32
-def endpoint_func(endpoint_name):
-    'Creates a function for a specific API endpoint'
-    def func(
-        path:Path=Path('.'), # Path to project
-        name:str=None,     # Overrides the .plash file in project root if provided
-    ):
-        if not name: name = get_app_name(path)
-        r = mk_auth_req(endpoint(rt=f"{endpoint_name}?name={name}"))
-        return r.text
-    
-    # Set the function name and docstring
-    func.__name__ = endpoint_name
-    func.__doc__ = f"Access the '{endpoint_name}' endpoint for your app"
-    
-    return call_parse(func)
+# %% ../nbs/00_cli.ipynb 33
+@call_parse
+def start(path:Path=Path('.'), name:str=None):
+    "Start your deployed app"
+    if not name: name = _get_app_name(path)
+    r = _mk_auth_req(_endpoint(rt=f"/start?name={name}"))
+    return r.text
 
-# Create endpoint-specific functions
-stop = endpoint_func('/stop')
-start = endpoint_func('/start')
+# %% ../nbs/00_cli.ipynb 36
+@call_parse  
+def stop(path:Path=Path('.'), name:str=None):
+    "Stop your deployed app" 
+    if not name: name = _get_app_name(path)
+    r = _mk_auth_req(_endpoint(rt=f"/stop?name={name}"))
+    return r.text
 
-# %% ../nbs/00_core.ipynb 34
+# %% ../nbs/00_cli.ipynb 39
 log_modes = str_enum('log_modes', 'build', 'app')
 
-# %% ../nbs/00_core.ipynb 35
+# %% ../nbs/00_cli.ipynb 40
 @call_parse
 def logs(
     path:Path=Path('.'),    # Path to project
@@ -232,12 +228,12 @@ def logs(
     mode:log_modes='build', # Choose between build or app logs
     tail:bool=False):       # Tail the logs
     'Prints the logs for your deployed app'
-    if not name: name = get_app_name(path)
+    if not name: name = _get_app_name(path)
     if tail:
         text = ''
         while True:
             try:
-                r = mk_auth_req(endpoint(rt=f"/logs?name={name}&mode={mode}"))
+                r = _mk_auth_req(_endpoint(rt=f"/logs?name={name}&mode={mode}"))
                 if r.status_code == 200:
                     print(r.text[len(text):], end='') # Only print updates
                     text = r.text
@@ -247,30 +243,30 @@ def logs(
                     print(f"Error: {r.status_code}")
             except KeyboardInterrupt:
                 return "\nExiting"
-    r = mk_auth_req(endpoint(rt=f"/logs?name={name}&mode={mode}"))
+    r = _mk_auth_req(endpoint(rt=f"/logs?name={name}&mode={mode}"))
     return r.text
 
-# %% ../nbs/00_core.ipynb 37
+# %% ../nbs/00_cli.ipynb 43
 @call_parse
 def download(
     path:Path=Path('.'),                 # Path to project
     name:str=None,                       # Overrides the .plash file in project root if provided
     save_path:Path=Path("./download/")): # Save path (optional)
     'Download your deployed app'
-    if not name: name = get_app_name(path)
+    if not name: name = _get_app_name(path)
     try: save_path.mkdir(exist_ok=False)
     except: print(f"ERROR: Save path ({save_path}) already exists. Please rename or delete this folder to avoid accidental overwrites.")
     else:
-        response = mk_auth_req(endpoint(rt=f'/download?name={name}')).raise_for_status()
+        response = mk_auth_req(_endpoint(rt=f'/download?name={name}')).raise_for_status()
         file_bytes = io.BytesIO(response.content)
         with tarfile.open(fileobj=file_bytes, mode="r:gz") as tar: tar.extractall(path=save_path)
         print(f"Downloaded your app to: {save_path}")
 
-# %% ../nbs/00_core.ipynb 39
+# %% ../nbs/00_cli.ipynb 46
 @call_parse
 def apps(verbose:bool=False):
     "List your deployed apps (verbose shows status table: 1=running, 0=stopped)"
-    r = mk_auth_req(endpoint(rt="/user_apps")).raise_for_status()
+    r = _mk_auth_req(_endpoint(rt="/user_apps")).raise_for_status()
     apps = r.json()
     if not apps: return "You don't have any deployed Plash apps."
     if verbose: [print(f"{a['running']} {a['name']}") for a in apps]

{plash_cli-0.2.2 → plash_cli-0.3.1/plash_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plash_cli
-Version: 0.2.2
+Version: 0.3.1
 Summary: CLI for the Plash hosting service
 Home-page: https://github.com/AnswerDotAI/plash_cli
 Author: Jeremy Howard
@@ -18,6 +18,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastcore
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: python-dotenv
+Requires-Dist: pyjwt
+Requires-Dist: cryptography
 Provides-Extra: dev
 Requires-Dist: bash_kernel; extra == "dev"
 Requires-Dist: nbdev; extra == "dev"
@@ -185,13 +188,18 @@ When you visit that page you should see “Hello, World!”
 Learn more about what Plash has to offer in the rest of the docs at:
 <https://docs.pla.sh>
 
-For learning more about creating web apps with FastHTML, we recommend
-looking at the official docs at: <https://fastht.ml/docs/>.
-
-Particularly, we recommend the following:
+To learn more about creating web apps with FastHTML, we recommend
+looking at the official docs at: <https://fastht.ml/docs/>. In
+particular, we recommend the following:
 
 1.  [OAuth](https://fastht.ml/docs/explains/oauth.html) - Setup
     authentication for your Plash App with Google Sign-In or other OAuth
     Providers.
 2.  [Stripe](https://fastht.ml/docs/explains/stripe.html) - Accept
     payments for your products hosted on Plash with Stripe.
+
+Would you like to use a different python web framework? Then check out
+the [examples
+section](https://github.com/AnswerDotAI/plash_cli/tree/main/examples) of
+the repo, it has examples for many popular python web frameworks like
+FastAPI, Gradio, and Streamlit.

{plash_cli-0.2.2 → plash_cli-0.3.1}/plash_cli.egg-info/SOURCES.txt

@@ -7,11 +7,13 @@ setup.py
 plash_cli/__init__.py
 plash_cli/_bash_magic.py
 plash_cli/_modidx.py
-plash_cli/core.py
+plash_cli/auth.py
+plash_cli/cli.py
 plash_cli.egg-info/PKG-INFO
 plash_cli.egg-info/SOURCES.txt
 plash_cli.egg-info/dependency_links.txt
 plash_cli.egg-info/entry_points.txt
 plash_cli.egg-info/not-zip-safe
 plash_cli.egg-info/requires.txt
-plash_cli.egg-info/top_level.txt
+plash_cli.egg-info/top_level.txt
+plash_cli/assets/es256_public_key.pem

plash_cli-0.3.1/plash_cli.egg-info/entry_points.txt

@@ -0,0 +1,13 @@
+[console_scripts]
+plash_apps = plash_cli.cli:apps
+plash_delete = plash_cli.cli:delete
+plash_deploy = plash_cli.cli:deploy
+plash_download = plash_cli.cli:download
+plash_login = plash_cli.cli:login
+plash_logs = plash_cli.cli:logs
+plash_start = plash_cli.cli:start
+plash_stop = plash_cli.cli:stop
+plash_view = plash_cli.cli:view
+
+[nbdev]
+plash_cli = plash_cli._modidx:d

{plash_cli-0.2.2 → plash_cli-0.3.1}/plash_cli.egg-info/requires.txt

@@ -1,5 +1,8 @@
 fastcore
 httpx>=0.28.1
+python-dotenv
+pyjwt
+cryptography
 
 [dev]
 bash_kernel

{plash_cli-0.2.2 → plash_cli-0.3.1}/settings.ini

@@ -2,7 +2,7 @@
 jupyter_hooks = False
 repo = plash_cli
 lib_name = plash_cli
-version = 0.2.2
+version = 0.3.1
 min_python = 3.11
 license = apache2
 black_formatting = False
@@ -27,17 +27,17 @@ keywords = nbdev jupyter notebook python
 language = English
 status = 3
 user = AnswerDotAI
-requirements = fastcore httpx>=0.28.1
+requirements = fastcore httpx>=0.28.1 python-dotenv pyjwt cryptography
 dev_requirements = bash_kernel nbdev
-console_scripts = plash_deploy=plash_cli.core:deploy
-	plash_login=plash_cli.core:login
-	plash_view=plash_cli.core:view
-	plash_logs=plash_cli.core:logs
-	plash_delete=plash_cli.core:delete
-	plash_stop=plash_cli.core:stop
-	plash_start=plash_cli.core:start
-	plash_download=plash_cli.core:download
-	plash_apps=plash_cli.core:apps
+console_scripts = plash_deploy=plash_cli.cli:deploy
+	plash_login=plash_cli.cli:login
+	plash_view=plash_cli.cli:view
+	plash_logs=plash_cli.cli:logs
+	plash_delete=plash_cli.cli:delete
+	plash_stop=plash_cli.cli:stop
+	plash_start=plash_cli.cli:start
+	plash_download=plash_cli.cli:download
+	plash_apps=plash_cli.cli:apps
 readme_nb = index.ipynb
 allowed_metadata_keys = 
 allowed_cell_metadata_keys = 

plash_cli-0.2.2/plash_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.2"

plash_cli-0.2.2/plash_cli/_modidx.py

@@ -1,26 +0,0 @@
-# Autogenerated by nbdev
-
-d = { 'settings': { 'branch': 'main',
-                'doc_baseurl': '/plash_cli',
-                'doc_host': 'https://AnswerDotAI.github.io',
-                'git_url': 'https://github.com/AnswerDotAI/plash_cli',
-                'lib_path': 'plash_cli'},
-  'syms': { 'plash_cli.core': { 'plash_cli.core.PlashError': ('core.html#plasherror', 'plash_cli/core.py'),
-                                'plash_cli.core._deps': ('core.html#_deps', 'plash_cli/core.py'),
-                                'plash_cli.core._gen_app_name': ('core.html#_gen_app_name', 'plash_cli/core.py'),
-                                'plash_cli.core.apps': ('core.html#apps', 'plash_cli/core.py'),
-                                'plash_cli.core.create_tar_archive': ('core.html#create_tar_archive', 'plash_cli/core.py'),
-                                'plash_cli.core.delete': ('core.html#delete', 'plash_cli/core.py'),
-                                'plash_cli.core.deploy': ('core.html#deploy', 'plash_cli/core.py'),
-                                'plash_cli.core.download': ('core.html#download', 'plash_cli/core.py'),
-                                'plash_cli.core.endpoint': ('core.html#endpoint', 'plash_cli/core.py'),
-                                'plash_cli.core.endpoint_func': ('core.html#endpoint_func', 'plash_cli/core.py'),
-                                'plash_cli.core.get_app_name': ('core.html#get_app_name', 'plash_cli/core.py'),
-                                'plash_cli.core.get_client': ('core.html#get_client', 'plash_cli/core.py'),
-                                'plash_cli.core.is_included': ('core.html#is_included', 'plash_cli/core.py'),
-                                'plash_cli.core.login': ('core.html#login', 'plash_cli/core.py'),
-                                'plash_cli.core.logs': ('core.html#logs', 'plash_cli/core.py'),
-                                'plash_cli.core.mk_auth_req': ('core.html#mk_auth_req', 'plash_cli/core.py'),
-                                'plash_cli.core.poll_cookies': ('core.html#poll_cookies', 'plash_cli/core.py'),
-                                'plash_cli.core.validate_app': ('core.html#validate_app', 'plash_cli/core.py'),
-                                'plash_cli.core.view': ('core.html#view', 'plash_cli/core.py')}}}

plash_cli-0.2.2/plash_cli.egg-info/entry_points.txt

@@ -1,13 +0,0 @@
-[console_scripts]
-plash_apps = plash_cli.core:apps
-plash_delete = plash_cli.core:delete
-plash_deploy = plash_cli.core:deploy
-plash_download = plash_cli.core:download
-plash_login = plash_cli.core:login
-plash_logs = plash_cli.core:logs
-plash_start = plash_cli.core:start
-plash_stop = plash_cli.core:stop
-plash_view = plash_cli.core:view
-
-[nbdev]
-plash_cli = plash_cli._modidx:d