update python wait for debug client

Author: MEPalma

lambda-debug-mode/python/base-concurrent-lambda-debug-mode/.vscode/launch.json

@@ -7,7 +7,7 @@
             "request": "attach",
             "connect": {
                 "host": "localhost",
-                "port": 19891
+                "port": 19891 
             },
             "pathMappings": [
                 {

lambda-debug-mode/python/base-concurrent-lambda-debug-mode/handler.py

@@ -1,35 +1,40 @@
 def handler(event, context):
     """Lambda handler that will get invoked by the LocalStack runtime"""
-
-    # Wait for the debugger to get attached.
-    wait_for_debug_client()
-
     # Print the incoming invocation event.
     print(event)
 
     # Return the incoming invocation event.
     return event
 
 
-def wait_for_debug_client(timeout=3600):
-    """Utility function to enable debugging with Visual Studio Code"""
+def wait_for_debug_client(port: int=19891, timeout: int=3600):
     import time, threading
     import sys, glob
     sys.path.append(glob.glob(".venv/lib/python*/site-packages")[0])
     import debugpy
 
-    debugpy.listen(("0.0.0.0", 19891))
-    class T(threading.Thread):
-        daemon = True
-        def run(self):
+    if not hasattr(wait_for_debug_client, "_debugpy_listening"):
+        wait_for_debug_client._debugpy_listening = False
+
+    if not wait_for_debug_client._debugpy_listening:
+        try:
+            debugpy.listen(("0.0.0.0", port))
+            wait_for_debug_client._debugpy_listening = True
+            print(f"debugpy is now listening on port {port}")
+        except RuntimeError as e:
+            print(f"debugpy.listen() failed or already active: {e}")
+
+    if not debugpy.is_client_connected():
+        print("Waiting for client to attach debugger...")
+
+        def cancel_wait():
             time.sleep(timeout)
-            print("Canceling debug wait task ...")
+            print("Canceling debug wait task after timeout...")
             debugpy.wait_for_client.cancel()
-    T().start()
-    print("Waiting for client to attach debugger ...")
-    debugpy.wait_for_client()
-
 
-if __name__ == "__main__":
-    handler({}, {})
+        threading.Thread(target=cancel_wait, daemon=True).start()
+        debugpy.wait_for_client()
+    else:
+        print("Debugger already attached.")
 
+wait_for_debug_client()

lambda-debug-mode/python/base-concurrent-lambda-debug-mode/run.sh

@@ -22,6 +22,7 @@ for i in {1..3}; do
     echo "Invoking the Lambda function, attempt $i."
     AWS_MAX_ATTEMPTS=1 \
     awslocal lambda invoke \
+        --cli-binary-format raw-in-base64-out \
         --cli-connect-timeout 3600 \
         --cli-read-timeout 3600 \
         --function-name "$FUNCTION_NAME" \

lambda-debug-mode/python/base-enable-lambda-debug-mode/handler.py

@@ -1,35 +1,41 @@
 def handler(event, context):
     """Lambda handler that will get invoked by the LocalStack runtime"""
 
-    # Wait for the debugger to get attached.
-    wait_for_debug_client()
-
     # Print the incoming invocation event.
     print(event)
 
     # Return the incoming invocation event.
     return event
 
 
-def wait_for_debug_client(timeout=3600):
-    """Utility function to enable debugging with Visual Studio Code"""
+def wait_for_debug_client(port: int=19891, timeout: int=3600):
     import time, threading
     import sys, glob
     sys.path.append(glob.glob(".venv/lib/python*/site-packages")[0])
     import debugpy
 
-    debugpy.listen(("0.0.0.0", 19891))
-    class T(threading.Thread):
-        daemon = True
-        def run(self):
+    if not hasattr(wait_for_debug_client, "_debugpy_listening"):
+        wait_for_debug_client._debugpy_listening = False
+
+    if not wait_for_debug_client._debugpy_listening:
+        try:
+            debugpy.listen(("0.0.0.0", port))
+            wait_for_debug_client._debugpy_listening = True
+            print(f"debugpy is now listening on port {port}")
+        except RuntimeError as e:
+            print(f"debugpy.listen() failed or already active: {e}")
+
+    if not debugpy.is_client_connected():
+        print("Waiting for client to attach debugger...")
+
+        def cancel_wait():
             time.sleep(timeout)
-            print("Canceling debug wait task ...")
+            print("Canceling debug wait task after timeout...")
             debugpy.wait_for_client.cancel()
-    T().start()
-    print("Waiting for client to attach debugger ...")
-    debugpy.wait_for_client()
-
 
-if __name__ == "__main__":
-    handler({}, {})
+        threading.Thread(target=cancel_wait, daemon=True).start()
+        debugpy.wait_for_client()
+    else:
+        print("Debugger already attached.")
 
+wait_for_debug_client()

lambda-debug-mode/python/base-enable-lambda-debug-mode/run.sh

@@ -21,6 +21,7 @@ echo "Set a breakpoint and attach the Python remote debugger from your IDE"
 echo "Invoking the Lambda function."
 AWS_MAX_ATTEMPTS=1 \
 awslocal lambda invoke \
+    --cli-binary-format raw-in-base64-out \
     --cli-connect-timeout 3600 \
     --cli-read-timeout 3600 \
     --function-name "$FUNCTION_NAME" \

lambda-debug-mode/python/base-multiple-lambda-debug-mode/handler_function_one.py

@@ -1,9 +1,6 @@
 def handler(event, context):
     """Lambda handler that will get invoked by the LocalStack runtime"""
 
-    # Wait for the debugger to get attached.
-    wait_for_debug_client()
-
     # Print a message to log that this the handler of handler_function_one.py file.
     print("The handler of handler_function_one.py is evaluating.")
 
@@ -14,25 +11,35 @@ def handler(event, context):
     return event
 
 
-def wait_for_debug_client(timeout=3600):
-    """Utility function to enable debugging with Visual Studio Code"""
+def wait_for_debug_client(port: int=19891, timeout: int=3600):
     import time, threading
     import sys, glob
     sys.path.append(glob.glob(".venv/lib/python*/site-packages")[0])
     import debugpy
 
-    debugpy.listen(("0.0.0.0", 19891))
-    class T(threading.Thread):
-        daemon = True
-        def run(self):
+    if not hasattr(wait_for_debug_client, "_debugpy_listening"):
+        wait_for_debug_client._debugpy_listening = False
+
+    if not wait_for_debug_client._debugpy_listening:
+        try:
+            debugpy.listen(("0.0.0.0", port))
+            wait_for_debug_client._debugpy_listening = True
+            print(f"debugpy is now listening on port {port}")
+        except RuntimeError as e:
+            print(f"debugpy.listen() failed or already active: {e}")
+
+    if not debugpy.is_client_connected():
+        print("Waiting for client to attach debugger...")
+
+        def cancel_wait():
             time.sleep(timeout)
-            print("Canceling debug wait task ...")
+            print("Canceling debug wait task after timeout...")
             debugpy.wait_for_client.cancel()
-    T().start()
-    print("Waiting for client to attach debugger ...")
-    debugpy.wait_for_client()
 
+        threading.Thread(target=cancel_wait, daemon=True).start()
+        debugpy.wait_for_client()
+    else:
+        print("Debugger already attached.")
 
-if __name__ == "__main__":
-    handler({}, {})
 
+wait_for_debug_client()

lambda-debug-mode/python/base-multiple-lambda-debug-mode/handler_function_two.py

@@ -1,9 +1,6 @@
 def handler(event, context):
     """Lambda handler that will get invoked by the LocalStack runtime"""
 
-    # Wait for the debugger to get attached.
-    wait_for_debug_client()
-
     # Print a message to log that this the handler of handler_function_two.py file.
     print("The handler of handler_function_two.py is evaluating.")
 
@@ -14,24 +11,35 @@ def handler(event, context):
     return event
 
 
-def wait_for_debug_client(timeout=3600):
-    """Utility function to enable debugging with Visual Studio Code"""
+def wait_for_debug_client(port: int=19892, timeout: int=3600):
     import time, threading
     import sys, glob
     sys.path.append(glob.glob(".venv/lib/python*/site-packages")[0])
     import debugpy
 
-    debugpy.listen(("0.0.0.0", 19892))
-    class T(threading.Thread):
-        daemon = True
-        def run(self):
+    if not hasattr(wait_for_debug_client, "_debugpy_listening"):
+        wait_for_debug_client._debugpy_listening = False
+
+    if not wait_for_debug_client._debugpy_listening:
+        try:
+            debugpy.listen(("0.0.0.0", port))
+            wait_for_debug_client._debugpy_listening = True
+            print(f"debugpy is now listening on port {port}")
+        except RuntimeError as e:
+            print(f"debugpy.listen() failed or already active: {e}")
+
+    if not debugpy.is_client_connected():
+        print("Waiting for client to attach debugger...")
+
+        def cancel_wait():
             time.sleep(timeout)
-            print("Canceling debug wait task ...")
+            print("Canceling debug wait task after timeout...")
             debugpy.wait_for_client.cancel()
-    T().start()
-    print("Waiting for client to attach debugger ...")
-    debugpy.wait_for_client()
+
+        threading.Thread(target=cancel_wait, daemon=True).start()
+        debugpy.wait_for_client()
+    else:
+        print("Debugger already attached.")
 
 
-if __name__ == "__main__":
-    handler({}, {})
+wait_for_debug_client()

lambda-debug-mode/python/base-multiple-lambda-debug-mode/run.sh

@@ -38,6 +38,7 @@ for function_name in "${FUNCTION_NAMES[@]}"; do
     AWS_MAX_ATTEMPTS=1 \
     awslocal lambda invoke \
         --cli-connect-timeout 3600 \
+        --cli-binary-format raw-in-base64-out \
         --cli-read-timeout 3600 \
         --function-name "$function_name" \
         --payload '{"message": "Testing Lambda Debug Mode lifting the 1-second timeout for '"$function_name"'. "}' \