reworked

Author: msciabarra

ide/deploy/__main__.py

@@ -6,7 +6,6 @@
 from .deploy import set_dry_run, deploy
 from .client import build
 
-
 def signal_handler(sig, frame):
     print('Termination requested.')
     os.remove(expanduser("~/.nuv/tmp/deploy.pid"))
@@ -22,13 +21,16 @@ def check_port():
             return
 
 def main():
-    # Register the signal handler for SIGTERM
+    
     os.setpgrp()
+    pgrp = os.getpgrp()
+
     signal.signal(signal.SIGTERM, signal_handler)
-        
+    pidfile = expanduser("~/.nuv/tmp/deploy.pgrp")
+    print("PID GROUP", pgrp)
+
     os.makedirs(expanduser("~/.nuv/tmp"), exist_ok=True)
-    with open(expanduser("~/.nuv/tmp/deploy.pid"), "w") as f:
-        f.write(str(os.getpid())+"\n")
+    Path(pidfile).write_text(str(pgrp))
 
     parser = argparse.ArgumentParser(description='Deployer')
     parser.add_argument('directory', help='The mandatory first argument')

ide/deploy/client.py

@@ -16,35 +16,48 @@
 # under the License.
 
 from pathlib import Path
+from subprocess import Popen, PIPE
 import os, os.path, json
-from subprocess import Popen
+import threading
 import asyncio
 
-def get_nuvolaris_config(key):
+def get_nuvolaris_config(key, default):
     try:
         dir = os.environ.get("NUV_PWD", "/do_not_exists")
         file = f"{dir}/package.json"
         info = json.loads(Path(file).read_text())
-        return info.get("nuvolaris", {}).get(key)
+        return info.get("nuvolaris", {}).get(key, default)
     except:
-        return None
- 
+        return default
+
+def readlines(inp):
+    for line in iter(inp.readline, ''):
+        print(line, end='')
+
 # serve web area
-async def serve():
-    devel = get_nuvolaris_config("devel")
-    if devel is None:
-        devel = "nuv ide serve"
-    print(devel)
-    #Popen(devel, shell=True, cwd=os.environ.get("NUV_PWD"), env=os.environ)
-    pwd = os.environ.get("NUV_PWD")
-    cmd = f"cd '{pwd}' ; {devel}"
-    proc = await asyncio.create_subprocess_shell(cmd,
-        stdin=asyncio.subprocess.PIPE,
-        stdout=asyncio.subprocess.PIPE,
-        stderr=asyncio.subprocess.PIPE)
+def launch(key, default):
+    cmd = get_nuvolaris_config(key, default)
+    proc = Popen(
+        cmd, shell=True, 
+        cwd=os.environ.get("NUV_PWD"), env=os.environ, 
+        stdin=PIPE, stdout=PIPE, stderr=PIPE, text=True
+    )
+    threading.Thread(target=readlines, args=(proc.stdout,)).start()
+    threading.Thread(target=readlines, args=(proc.stderr,)).start()
+
+def serve(): 
+    launch("devel", "nuv ide serve")
+
+def logs(): 
+    launch("logs", "nuv activation poll")
 
 # build
 def build():
-    deploy = get_nuvolaris_config("deploy")
-    if deploy is not None:
-        Popen(deploy, shell=True, cwd=os.environ.get("NUV_PWD"), env=os.environ)
+    deploy = get_nuvolaris_config("deploy", "true")
+    proc = Popen(
+        deploy, shell=True, 
+        env=os.environ,
+        cwd=os.environ.get("NUV_PWD"),
+        stdin=PIPE, stdout=PIPE, stderr=PIPE, text=True
+    )
+    proc.communicate()

ide/deploy/deploy.py

@@ -94,7 +94,7 @@ def deploy_action(artifact):
 file = "packages/deploy/multi/requirements.txt"
 """
 def deploy(file):
-    print(f"*** {file}")
+    #print(f"*** {file}")
     if isdir(file):
         for start in MAINS:
             sub = f"{file}/{start}"

ide/deploy/scan.py

@@ -23,12 +23,12 @@ def scan():
     deployments = set()
     packages = set()
 
-    print(">>> Scan:")
+    print("> Scan:")
     reqs =  glob("packages/*/*/requirements.txt") + glob("packages/*/*/package.json")
     # req = reqs[0]
     # from util.deploy.deploy import *
     for req in reqs:
-        print(">", req)
+        print(">> Requirements:", req)
         sp = req.split("/")
         act = build_zip(sp[1],sp[2])
         deployments.add(act)
@@ -37,7 +37,7 @@ def scan():
     mains = glob("packages/*/*/index.js") + glob("packages/*/*/__main__.py")
     # main = mains[2]
     for main in mains: 
-        print(">", main)
+        print(">> Main:", main)
         sp = main.split("/")
         act = build_action(sp[1],sp[2])
         deployments.add(act)
@@ -46,17 +46,17 @@ def scan():
     singles = glob("packages/*/*.py") +  glob("packages/*/*.js")
     # single = singles[0]
     for single in singles:
-        print(">", single)
+        print(">> Action:", single)
         sp = single.split("/")
         deployments.add(single)
         packages.add(sp[1])
 
-    print(">>> Deploying:")
+    print("> Deploying:")
 
     for package in packages:
-        print("%", package)
+        print(">> Package:", package)
         deploy_package(package)
 
     for action in deployments:
-        print("^", action)
+        print(">>> Action:", action)
         deploy_action(action)

ide/deploy/watch.py

@@ -6,7 +6,7 @@
 import signal
 
 from .deploy import deploy
-from .client import serve
+from .client import serve, logs
 
 def check_and_deploy(change):
     cur_dir_len = len(os.getcwd())+1
@@ -40,19 +40,21 @@ async def redeploy():
         print("Exception")
 
 def watch():
+    # start web server
+    serve()
+    # show logs
+    logs()
+
     loop = asyncio.get_event_loop()
-    task1 = loop.create_task(redeploy())
-    #task = asyncio.ensure_future(redeploy())
-    task2 = loop.create_task(serve())
+    task = loop.create_task(redeploy())
     def end_loop():
         print("Ending task.")
-        task1.cancel()
-        task2.cancel()
+        task.cancel()
     loop.add_signal_handler(signal.SIGTERM, end_loop)
 
     try:
-        loop.run_until_complete(task1)
-    except asyncio.CancelledError:
+        loop.run_until_complete(task)
+    except:
         pass
     finally:
         loop.stop()

ide/http-serve.sh

@@ -74,7 +74,17 @@ tasks:
     desc: local web server
     ignore_error: true
     cmds:
-    - bash http-serve.sh "$NUV_PWD/web"
+     - >
+       http-server 
+       -a 127.0.0.1 "$NUV_PWD/web" 
+       -c-1 --mimetypes mime.types 
+       -P $NUVDEV_HOST
+
+  poll:
+    silent: true
+    desc: poll activation logs
+    cmds:
+    - nuv activation poll
 
   _info:
     silent: true
@@ -83,34 +93,62 @@ tasks:
     - config -d | grep OPENAI_
     - config -d | grep NUVDEV_
 
-  _venv:
-    cmds:
-    - python3 -V || die "I need python3 in the path"
-    - python3 -m venv venv
-    - |
-      source venv/bin/activate
-      pip install watchdog
-    status:
-    - test -d venv
-
-  deploy:
+  prereq:
     silent: true
-    desc: deploy a project or a single action (with _action_=<dir-or-file>)
     cmds:
-      - test -e "/.nuvolaris" || test -n "$NUVDEV_FORCE" || die "nuv ide commands must be run in the ghrc.io/nuvolaris/devcontainer with VSCode"
+      - test "$(python3 -V | awk -F. '{print $2}')" -ge 10 || die "python 3.10 or greater not available"
+      - test "$(node -v | awk -F. '{print substr($1,2) }')" -ge 18 || die "nodejs 18 or greater not available"
       - test -d "$NUV_PWD/packages" || die "no packages in current directory"
       - test -e ~/.wskprops || die "please run 'nuv ide login' first"
       - test -n "$NUVDEV_HOST" || die "please run 'nuv ide login' first"
-      - |
-        if test -e ~/.nuv/tmp/deploy.pid
-        then kill "$(cat ~/.nuv/tmp/deploy.pid)" 2>/dev/null || true
-        fi
       - |
         if test -e "$NUV_PWD/package.json"
         then if ! test -d "$NUV_PWD/node_modules"
              then cd $NUV_PWD ; npm install
              fi
-        fi 
+        fi
+      - |
+        if ! python3 -m pip list | grep watchfiles >/dev/null 2>/dev/null
+        then python3 -m pip install --user watchfiles asyncio
+        fi
+      - |
+        if ! which http-server >/dev/null 2>/dev/null
+        then npm install -g http-server
+        fi
+      - task: kill
+
+  kill:
+    silent: false
+    ignore: true
+    cmds:
+      - |
+        if test -e ~/.nuv/tmp/deploy.pgrp
+        then
+          PGRP="$(cat ~/.nuv/tmp/deploy.pgrp)"
+          #pstree $PID
+          LOOP=true
+          while $LOOP
+          do
+            LOOP=false
+            ps -a -o pgid,pid | while read GRP PID
+            do 
+              echo $GRP $PID
+              if test "$GRP" = "$PGRP"
+              then kill -9 "$PID" 
+                   LOOP=true
+              fi 
+            done
+            sleep 2
+          done
+          rm ~/.nuv/tmp/deploy.pgrp
+        fi
+
+  deploy:
+    silent: true
+    interactive: true
+    desc: deploy a project or a single action (with _action_=<dir-or-file>)
+    cmds:
+      - task: prereq
       - |
         set -a
         if test -e $NUV_PWD/.env
@@ -132,25 +170,12 @@ tasks:
             python3 -m deploy "$NUV_PWD" -s "{{._action_}}" $DRY
         fi
 
- 
   devel:
-    silent: true
+    interactive: true
+    silent: false
     desc: start interactive development mode files
     cmds:
-      - test -e "/.nuvolaris" || test -n "$NUVDEV_FORCE" || die "nuv ide commands must be run in the ghrc.io/nuvolaris/devcontainer with VSCode"
-      - test -d "$NUV_PWD/packages" || die "no packages in current directory"
-      - test -e ~/.wskprops || die "please run 'nuv ide login' first"
-      - test -n "$NUVDEV_HOST" || die "please run 'nuv ide login' first"
-      - |
-        if test -e ~/.nuv/tmp/deploy.pid
-        then kill "$(cat ~/.nuv/tmp/deploy.pid)" 2>/dev/null|| true
-        fi
-      - |
-        if test -e "$NUV_PWD/package.json"
-        then if ! test -d "$NUV_PWD/node_modules"
-             then cd $NUV_PWD ; npm install
-             fi
-        fi 
+      - task: prereq
       - |
         set -a
         if test -e $NUV_PWD/.env
@@ -163,10 +188,8 @@ tasks:
         then DRY="--dry-run" ; ECHO='echo'
         else DRY="" ; ECHO=""
         fi
-        if ! pip list | grep watchfiles >/dev/null
-        then pip install watchfiles asyncio
-        fi
         python3 -m deploy "$NUV_PWD" -w $DRY
+        #npm-run-all --parallel deploy serve
         true
 
   undeploy:

ide/nuvfile.yml

@@ -8,7 +8,9 @@ Usage:
     ide clean
     ide setup 
     ide serve
+    ide logs
     ide shell
+    ide kill
     ide python
     ide nodejs
 
@@ -19,7 +21,9 @@ Commands:
     ide undeploy            undeploy everything or just one action
     ide clean               clean the temporay files
     ide setup               setup the ide 
-    ide serve               web server
-    ide shell                start a shell with current env
+    ide serve               serve web area
+    ide kill                kill current devel or deploy job
+    ide logs                poll for logs
+    ide shell               start a shell with current env
     ide python              python subcommands
     ide nodejs              nodejs subcommands