Merge pull request #189 from runpod/fix-stdout-srderr

Fix stdout srderr

Author: justinmerrell

docs/cli/demos/config.gif

@@ -37,3 +37,4 @@
 # --------------------------- Force Logging Levels --------------------------- #
 logging.getLogger("urllib3").setLevel(logging.WARNING)
 logging.getLogger("paramiko").setLevel(logging.WARNING)
+logging.getLogger("uvicorn").setLevel(logging.WARNING)

docs/cli/demos/help.gif

@@ -250,12 +250,13 @@ def start_project_api():
         # Start the API server in the background, and save the PID
         python {handler_path} --rp_serve_api --rp_api_host="0.0.0.0" --rp_api_port=8080 --rp_api_concurrency=1 &
         last_pid=$!
+
         echo -e "- Started API server with PID: $last_pid" && echo ""
         echo "> Connect to the API server at:"
         echo "https://$RUNPOD_POD_ID-8080.proxy.runpod.net/docs" && echo ""
 
         while true; do
-            if changed_file=$(inotifywait -r -e modify,create,delete --exclude "$exclude_pattern" {remote_project_path} --format '%w%f'); then
+            if changed_file=$(inotifywait -q -r -e modify,create,delete --exclude "$exclude_pattern" {remote_project_path} --format '%w%f'); then
                 echo "Detected changes in: $changed_file"
             else
                 echo "Failed to detect changes."
@@ -269,10 +270,9 @@ def start_project_api():
                 python -m pip install --upgrade pip && python -m pip install -r {requirements_path}
             fi
 
-            sleep 1 #Debounce
-
             python {handler_path} --rp_serve_api --rp_api_host="0.0.0.0" --rp_api_port=8080 --rp_api_concurrency=1 &
             last_pid=$!
+
             echo "Restarted API server with PID: $last_pid"
         done
     ''']

docs/cli/demos/ssh.gif

@@ -3,6 +3,7 @@
 
 Connect and run commands over SSH.
 '''
+import threading
 import subprocess
 import colorama
 import paramiko
@@ -47,14 +48,27 @@ def _get_ssh_options(self):
 
     def run_commands(self, commands):
         ''' Runs a list of bash commands over SSH. '''
+        def handle_stream(stream, color, prefix):
+            for line in stream:
+                if line:
+                    print(color + f"[{prefix}]", line.strip())
+
         for command in commands:
             command = f'source /root/.bashrc && {command}'
             command = f'source /etc/rp_environment && {command}'
+            command = f'while IFS= read -r -d \'\' line; do export "$line"; done < /proc/1/environ && {command}' # pylint: disable=line-too-long
             _, stdout, stderr = self.ssh.exec_command(command)
-            for line in stdout:
-                print(colorama.Fore.GREEN + f"[{self.pod_id}]", line.strip())
-            for line in stderr:
-                print(colorama.Fore.RED + f"[{self.pod_id} ERROR]", line.strip())
+
+            stdout_thread = threading.Thread(
+                target=handle_stream, args=(stdout, colorama.Fore.GREEN, self.pod_id))
+            stderr_thread = threading.Thread(
+                target=handle_stream, args=(stderr, colorama.Fore.RED, self.pod_id))
+
+            stdout_thread.start()
+            stderr_thread.start()
+
+            stdout_thread.join()
+            stderr_thread.join()
 
     def put_file(self, local_path, remote_path):
         ''' Copy local file to remote machine over SSH. '''