Streaming logs in deploy

Author: pydanny

nbs/00_core.ipynb

@@ -34,6 +34,7 @@
     "from pathlib import Path\n",
     "from uuid import uuid4\n",
     "from time import time, sleep\n",
+    "import threading\n",
     "\n",
     "import io, os, re, tarfile, tomllib"
    ]
@@ -326,6 +327,36 @@
     "    return tarz, len(files)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "19fd70cb",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "log_modes = str_enum('log_modes', 'build', 'app')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c1c1db20",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "def _logs_during_deploy(\n",
+    "    path:Path, # Path to project\n",
+    "    mode:str='build', # 'build' or 'run'\n",
+    "    tail:bool=True): # We always want to tail the logs\n",
+    "    # Give the server time to start\n",
+    "    sleep(1) \n",
+    "    # Unwrap the logs function to avoid the call_parse decorator so it can be wrapped in a thread\n",
+    "    log_thread = threading.Thread(target=logs.__wrapped__, kwargs=dict(path=path, mode='build', tail=True))\n",
+    "    log_thread.start()"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -355,7 +386,8 @@
     "    if resp.status_code == 200:\n",
     "        print('✅ Upload complete! Your app is currently being built.')\n",
     "        print(f'It will be live at {endpoint(sub=aid)}')\n",
-    "    else: print(f'Failure: {resp.status_code}\\n{resp.text}')"
+    "    else: print(f'Failure: {resp.status_code}\\n{resp.text}')\n",
+    "    _logs_during_deploy(path=path, mode='build', tail=True)"
    ]
   },
   {
@@ -461,17 +493,6 @@
     "## App - logs"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "24e62f1f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#| export\n",
-    "log_modes = str_enum('log_modes', 'build', 'app')"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

plash_cli/_modidx.py

@@ -7,6 +7,7 @@
                 '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._logs_during_deploy': ('core.html#_logs_during_deploy', '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.py

@@ -3,7 +3,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['PLASH_CONFIG_HOME', 'PLASH_DOMAIN', 'pat', 'stop', 'start', 'log_modes', 'get_client', 'mk_auth_req', 'get_app_id',
+__all__ = ['PLASH_CONFIG_HOME', 'PLASH_DOMAIN', 'pat', 'log_modes', 'stop', 'start', 'get_client', 'mk_auth_req', 'get_app_id',
            'endpoint', 'is_included', 'poll_cookies', 'login', 'PlashError', 'validate_app', 'create_tar_archive',
            'deploy', 'view', 'delete', 'endpoint_func', 'logs', 'download']
 
@@ -14,6 +14,7 @@
 from pathlib import Path
 from uuid import uuid4
 from time import time, sleep
+import threading
 
 import io, os, re, tarfile, tomllib
 
@@ -121,6 +122,20 @@ def create_tar_archive(path:Path) -> tuple[io.BytesIO, int]:
     return tarz, len(files)
 
 # %% ../nbs/00_core.ipynb 24
+log_modes = str_enum('log_modes', 'build', 'app')
+
+# %% ../nbs/00_core.ipynb 25
+def _logs_during_deploy(
+    path:Path, # Path to project
+    mode:str='build', # 'build' or 'run'
+    tail:bool=True): # We always want to tail the logs
+    # Give the server time to start
+    sleep(1) 
+    # Unwrap the logs function to avoid the call_parse decorator so it can be wrapped in a thread
+    log_thread = threading.Thread(target=logs.__wrapped__, kwargs=dict(path=path, mode='build', tail=True))
+    log_thread.start()
+
+# %% ../nbs/00_core.ipynb 26
 @call_parse
 def deploy(
     path:Path=Path('.'), # Path to project
@@ -143,8 +158,9 @@ def deploy(
         print('✅ Upload complete! Your app is currently being built.')
         print(f'It will be live at {endpoint(sub=aid)}')
     else: print(f'Failure: {resp.status_code}\n{resp.text}')
+    _logs_during_deploy(path=path, mode='build', tail=True)
 
-# %% ../nbs/00_core.ipynb 26
+# %% ../nbs/00_core.ipynb 28
 @call_parse
 def view(
     path:Path=Path('.'), # Path to project
@@ -153,7 +169,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
@@ -170,7 +186,7 @@ def delete(
     r = mk_auth_req(endpoint(rt=f"/delete?aid={aid}"), "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'
     @call_parse
@@ -191,10 +207,7 @@ def func(
 stop = endpoint_func('/stop')
 start = endpoint_func('/start')
 
-# %% ../nbs/00_core.ipynb 32
-log_modes = str_enum('log_modes', 'build', 'app')
-
-# %% ../nbs/00_core.ipynb 33
+# %% ../nbs/00_core.ipynb 34
 @call_parse
 def logs(
     path:Path=Path('.'),    # Path to project
@@ -218,7 +231,7 @@ def logs(
     r = mk_auth_req(endpoint(rt=f"/logs?aid={aid}&mode={mode}"))
     return r.text
 
-# %% ../nbs/00_core.ipynb 35
+# %% ../nbs/00_core.ipynb 36
 @call_parse
 def download(
     path:Path=Path('.'),                 # Path to project