plash-cli 0.1.2__tar.gz → 0.2.0__tar.gz

{plash_cli-0.1.2/plash_cli.egg-info → plash_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plash_cli
-Version: 0.1.2
+Version: 0.2.0
 Summary: CLI for the Plash hosting service
 Home-page: https://github.com/AnswerDotAI/plash_cli
 Author: Jeremy Howard
@@ -133,6 +133,11 @@ serve()
 This is a basic [FastHTML](https://fastht.ml) app. Plash also supports
 other popular python frameworks.
 
+> [!WARNING]
+>
+> Your app must run on port `5001` which is the default port for
+> FastHTML apps.
+
 And create the `requirements.txt` file:
 
 ``` python

{plash_cli-0.1.2 → plash_cli-0.2.0}/README.md

@@ -92,6 +92,11 @@ serve()
 This is a basic [FastHTML](https://fastht.ml) app. Plash also supports
 other popular python frameworks.
 
+> [!WARNING]
+>
+> Your app must run on port `5001` which is the default port for
+> FastHTML apps.
+
 And create the `requirements.txt` file:
 
 ``` python

plash_cli-0.2.0/plash_cli/__init__.py

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

{plash_cli-0.1.2 → plash_cli-0.2.0}/plash_cli/_bash_magic.py

@@ -6,20 +6,24 @@ from pathlib import Path
 bk = BashKernel()
 ip = get_ipython()
 
-@register_line_cell_magic
-def bash(line, cell=None): 
-    code = f'{line}\n{cell}' if cell else line
-    
-    # Find all $`varname` patterns and interpolate from IPython namespace
-    for match in re.finditer(r'\$`([^`]+)`', code):
+def interpolate_variables(text):
+    """Find all $`varname` patterns and interpolate from IPython namespace"""
+    for match in re.finditer(r'\$`([^`]+)`', text):
         varname = match.group(1)
         if varname not in ip.user_ns:
             raise NameError(f"Variable '{varname}' not found in IPython namespace")
-        code = code.replace(match.group(0), str(ip.user_ns[varname]))
+        text = text.replace(match.group(0), str(ip.user_ns[varname]))
+    return text
+
+@register_line_cell_magic
+def bash(line, cell=None): 
+    code = f'{line}\n{cell}' if cell else line
+    code = interpolate_variables(code)
     print(bk.bashwrapper.run_command(code))
 
 @register_line_cell_magic
 def writefile(line, cell):
+    cell = interpolate_variables(cell)
     pwd = bk.bashwrapper.run_command('pwd').strip()
     fpath = Path(pwd) / line
     fpath.write_text(cell)

{plash_cli-0.1.2 → plash_cli-0.2.0}/plash_cli/_modidx.py

@@ -7,6 +7,7 @@ d = { 'settings': { 'branch': 'main',
                 '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-0.1.2 → plash_cli-0.2.0}/plash_cli/core.py

@@ -4,13 +4,13 @@
 
 # %% auto 0
 __all__ = ['PLASH_CONFIG_HOME', 'PLASH_DOMAIN', 'pat', 'stop', 'start', 'log_modes', 'get_client', 'mk_auth_req', 'get_app_name',
-           'endpoint', 'is_included', 'poll_cookies', 'login', 'PlashError', 'validate_app', 'create_tar_archive',
+           'endpoint', 'is_included', 'PlashError', 'poll_cookies', 'login', 'validate_app', 'create_tar_archive',
            'deploy', 'view', 'delete', 'endpoint_func', 'logs', 'download', 'apps']
 
 # %% ../nbs/00_core.ipynb 2
 from fastcore.all import *
 from fastcore.xdg import *
-import secrets, webbrowser, json, httpx, io, tarfile
+import secrets, webbrowser, json, httpx, io, tarfile, random, string
 from pathlib import Path
 from uuid import uuid4
 from time import time, sleep
@@ -62,7 +62,10 @@ def is_included(path):
                 '.vscode', '.idea', '.sesskey'}
     return not any(p in excludes for p in path.parts)
 
-# %% ../nbs/00_core.ipynb 12
+# %% ../nbs/00_core.ipynb 11
+class PlashError(Exception): pass
+
+# %% ../nbs/00_core.ipynb 13
 def poll_cookies(paircode, interval=1, timeout=180):
     "Poll server for token until received or timeout"
     start = time()
@@ -87,7 +90,7 @@ def login():
         print(f"Authentication successful! Config saved to {PLASH_CONFIG_HOME}")
     else: print("Authentication timed out.")
 
-# %% ../nbs/00_core.ipynb 15
+# %% ../nbs/00_core.ipynb 16
 pat = r'(?m)^# /// (?P<type>[a-zA-Z0-9-]+)$\s(?P<content>(^#(| .*)$\s)+)^# ///$'
 
 def _deps(script: bytes | str) -> dict | None:
@@ -102,9 +105,7 @@ def _deps(script: bytes | str) -> dict | None:
         return '\n'.join(tomllib.loads(content)['dependencies'])
     else: return None
 
-# %% ../nbs/00_core.ipynb 18
-class PlashError(Exception): pass
-
+# %% ../nbs/00_core.ipynb 19
 def validate_app(path):
     "Validates directory `path` is a deployable Plash app"
     if not (path / 'main.py').exists():
@@ -114,10 +115,11 @@ def validate_app(path):
         raise PlashError('A Plash app should not contain both a requirements.txt file and inline dependencies (see PEP723).')
 
 # %% ../nbs/00_core.ipynb 23
-def create_tar_archive(path:Path) -> tuple[io.BytesIO, int]:
+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)
+    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)
         if deps:=_deps((path / 'main.py').read_bytes()):
@@ -127,12 +129,21 @@ def create_tar_archive(path:Path) -> tuple[io.BytesIO, int]:
     tarz.seek(0)
     return tarz, len(files)
 
-# %% ../nbs/00_core.ipynb 24
+# %% ../nbs/00_core.ipynb 25
+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']
+    verbs = ['runs', 'flies', 'jumps', 'builds', 'creates', 'flows', 'shines', 'grows', 'moves', 'works', 'dances', 'sings', 'plays', 'dreams', 'thinks', 'learns', 'teaches', 'helps', 'heals', 'saves', 'protects', 'guards', 'watches', 'sees', 'hears', 'feels', 'knows', 'understands', 'discovers', 'explores', 'searches', 'finds', 'seeks', 'holds', 'carries', 'lifts', 'pushes', 'pulls', 'makes', 'crafts', 'forges', 'shapes', 'forms', 'molds', 'carves', 'joins', 'connects', 'links', 'binds', 'ties', 'opens', 'closes', 'starts', 'stops', 'begins', 'ends', 'finishes', 'completes', 'wins', 'triumphs', 'succeeds', 'achieves', 'accomplishes', 'reaches', 'arrives', 'departs', 'leaves', 'returns', 'comes', 'goes', 'travels', 'journeys', 'walks', 'sprints', 'races', 'speeds', 'rushes', 'hurries', 'waits', 'pauses', 'rests', 'sleeps', 'wakes', 'rises', 'climbs', 'ascends', 'descends', 'swims', 'dives', 'surfs', 'sails', 'paddles', 'hikes', 'treks', 'wanders', 'roams', 'ventures', 'navigates', 'glides', 'soars', 'floats', 'drifts', 'tosses', 'divides', 'shares', 'secures', 'settles', 'places', 'wonders', 'questions']
+    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
 @call_parse
 def deploy(
-    path:Path=Path('.'), # Path to project
-    name:str=None):  # Overrides the .plash file in project root if provided
-    "Deploy app to production (ignores paths starting with '.')"
+    path:Path=Path('.'),    # Path to project
+    name:str=None,          # Overrides the .plash file in project root if provided
+    force_data:bool=False): # Overwrite data/ directory during deployment
+    "Deploy app to production, ignores paths starting with '.', excludes data/ directory by default unless --force_data is used."
     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
@@ -143,18 +154,18 @@ def deploy(
         if not name: name = get_app_name(path)
     except FileNotFoundError:
         plash_app = path / '.plash'
-        name = f'fasthtml-app-{str(uuid4())[:8]}'
+        name = _gen_app_name()
         plash_app.write_text(f'export PLASH_APP_NAME={name}')
-        
     
-    tarz, _ = create_tar_archive(path)
-    resp = mk_auth_req(endpoint(rt="/upload"), "post", files={'file': tarz}, timeout=300.0, data={'name': name})
+    tarz, _ = create_tar_archive(path, force_data)
+    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)}')
     else: print(f'Failure: {resp.status_code}\n{resp.text}')
 
-# %% ../nbs/00_core.ipynb 26
+# %% ../nbs/00_core.ipynb 28
 @call_parse
 def view(
     path:Path=Path('.'), # Path to project directory
@@ -166,7 +177,7 @@ def view(
     print(f"Opening browser to view app :\n{url}\n")
     webbrowser.open(url)
 
-# %% ../nbs/00_core.ipynb 28
+# %% ../nbs/00_core.ipynb 30
 @call_parse
 def delete(
     path:Path=Path('.'), # Path to project
@@ -184,7 +195,7 @@ def delete(
     r = mk_auth_req(endpoint(rt=f"/delete?name={name}"), "delete")
     return r.text
 
-# %% ../nbs/00_core.ipynb 30
+# %% ../nbs/00_core.ipynb 32
 def endpoint_func(endpoint_name):
     'Creates a function for a specific API endpoint'
     def func(
@@ -205,10 +216,10 @@ def endpoint_func(endpoint_name):
 stop = endpoint_func('/stop')
 start = endpoint_func('/start')
 
-# %% ../nbs/00_core.ipynb 32
+# %% ../nbs/00_core.ipynb 34
 log_modes = str_enum('log_modes', 'build', 'app')
 
-# %% ../nbs/00_core.ipynb 33
+# %% ../nbs/00_core.ipynb 35
 @call_parse
 def logs(
     path:Path=Path('.'),    # Path to project
@@ -234,7 +245,7 @@ def logs(
     r = mk_auth_req(endpoint(rt=f"/logs?name={name}&mode={mode}"))
     return r.text
 
-# %% ../nbs/00_core.ipynb 35
+# %% ../nbs/00_core.ipynb 37
 @call_parse
 def download(
     path:Path=Path('.'),                 # Path to project
@@ -250,7 +261,7 @@ def download(
         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 37
+# %% ../nbs/00_core.ipynb 39
 @call_parse
 def apps(verbose:bool=False):
     "List your deployed apps (verbose shows status table: 1=running, 0=stopped)"

{plash_cli-0.1.2 → plash_cli-0.2.0/plash_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plash_cli
-Version: 0.1.2
+Version: 0.2.0
 Summary: CLI for the Plash hosting service
 Home-page: https://github.com/AnswerDotAI/plash_cli
 Author: Jeremy Howard
@@ -133,6 +133,11 @@ serve()
 This is a basic [FastHTML](https://fastht.ml) app. Plash also supports
 other popular python frameworks.
 
+> [!WARNING]
+>
+> Your app must run on port `5001` which is the default port for
+> FastHTML apps.
+
 And create the `requirements.txt` file:
 
 ``` python

{plash_cli-0.1.2 → plash_cli-0.2.0}/settings.ini

@@ -1,7 +1,8 @@
 [DEFAULT]
+jupyter_hooks = False
 repo = plash_cli
 lib_name = plash_cli
-version = 0.1.2
+version = 0.2.0
 min_python = 3.7
 license = apache2
 black_formatting = False
@@ -40,7 +41,6 @@ console_scripts = plash_deploy=plash_cli.core:deploy
 readme_nb = index.ipynb
 allowed_metadata_keys = 
 allowed_cell_metadata_keys = 
-jupyter_hooks = False
 clean_ids = True
 clear_all = False
 cell_number = True

plash_cli-0.1.2/plash_cli/__init__.py

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