kalong 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

kalong/__init__.py

@@ -1,6 +1,6 @@
 """A new take on debugging"""
 
-__version__ = "0.5.0"
+__version__ = "0.5.2"
 import os
 import sys
 from pathlib import Path

kalong/communication.py

@@ -32,17 +32,15 @@ basicConfig(level=config.log_level)
 
 
 def exception_handler(loop, context):
-    exception = context["exception"]
-    message = context["message"]
-    logging.error(f"Task failed, msg={message}, exception={exception}")
+    logging.error(f"Loop exit: {context}")
 
 
-def communicate(frame, event, arg):
+def communicate(frame, event, arg, pending=None):
     loop = get_loop()
 
     loop.set_exception_handler(exception_handler)
     try:
-        loop.run_until_complete(communication_loop(frame, event, arg))
+        loop.run_until_complete(communication_loop(frame, event, arg, pending))
     except asyncio.CancelledError:
         log.info("Loop got cancelled")
         die()
@@ -62,6 +60,7 @@ async def init(ws, frame, event, arg):
 
 
 async def handle_message(ws, data, frame, event, arg):
+    tb = arg[2] if event == "exception" else None
     if data["type"] == "HELLO":
         await init(ws, frame, event, arg)
         response = {
@@ -83,6 +82,7 @@ async def handle_message(ws, data, frame, event, arg):
 
     elif data["type"] == "SET_PROMPT" or data["type"] == "REFRESH_PROMPT":
         try:
+            step_frame = get_frame(frame, data.get("frame"), tb)
             eval_fun = (
                 serialize_inspect_eval
                 if data.get("command") == "inspect"
@@ -94,16 +94,27 @@ async def handle_message(ws, data, frame, event, arg):
                 if data.get("command") == "recursive_debug"
                 else serialize_answer
             )
-            response = {
-                "type": "SET_ANSWER",
-                "key": data["key"],
-                "command": data.get("command"),
-                "frame": data.get("frame"),
-                **eval_fun(
-                    data["prompt"],
-                    get_frame(frame, data.get("frame")),
-                ),
-            }
+
+            def get_response():
+                return {
+                    "type": "SET_ANSWER",
+                    "key": data["key"],
+                    "command": data.get("command"),
+                    "frame": data.get("frame"),
+                    **eval_fun(data["prompt"], step_frame),
+                }
+
+            if data.get("command") == "condition":
+                add_step("continue", step_frame, condition=get_response)
+                response = {
+                    "type": "DO_COMMAND",
+                    "command": "continue",
+                    "frame": data.get("frame"),
+                    "stop": True,
+                }
+            else:
+                response = get_response()
+
         except SetFrameError as e:
             frame = e.frame
             event = e.event
@@ -137,7 +148,7 @@ async def handle_message(ws, data, frame, event, arg):
                 data["from"],
                 data["to"],
                 data["cursor"],
-                get_frame(frame, data.get("frame")),
+                get_frame(frame, data.get("frame"), tb),
             ),
         }
 
@@ -152,7 +163,7 @@ async def handle_message(ws, data, frame, event, arg):
             stop_trace(frame)
             die()
         else:
-            step_frame = get_frame(frame, data.get("frame"))
+            step_frame = get_frame(frame, data.get("frame"), tb)
             add_step(command, step_frame)
         response["stop"] = True
 
@@ -161,7 +172,7 @@ async def handle_message(ws, data, frame, event, arg):
     return response
 
 
-async def communication_loop(frame_, event_, arg_):
+async def communication_loop(frame_, event_, arg_, pending=None):
     frame = frame_
     event = event_
     arg = arg_
@@ -177,6 +188,9 @@ async def communication_loop(frame_, event_, arg_):
     if existing:
         # If the socket is already opened we need to update client state
         await init(ws, frame, event, arg)
+        if pending:
+            # Start by sending pending message
+            await ws.send_json(pending)
         # Otherwise if it's new, just wait for HELLO to answer current state
 
     stop = False
@@ -189,7 +203,7 @@ async def communication_loop(frame_, event_, arg_):
                 log.error(f"Error handling message {data}", exc_info=e)
                 response = {
                     "type": "SET_ANSWER",
-                    "prompt": data["prompt"].strip(),
+                    "prompt": data.get("prompt", "?").strip(),
                     "key": data["key"],
                     "command": data.get("command"),
                     "frame": data.get("frame"),

kalong/config.py

@@ -90,6 +90,9 @@ class Config:
             if value:
                 setattr(self, name, type(name)(value))
 
+        if os.getenv("KALONG_PORT") and not os.getenv("KALONG_FRONT_PORT"):
+            self.front_port = self.port
+
     def get_args_for_server(self):
         yield "--server"
 

kalong/debugger.py

@@ -24,7 +24,7 @@ from jedi import Interpreter
 from .errors import SetFrameError
 from .utils import cutter_mock, dedent, discompile, universal_travel
 from .utils.io import capture_display, capture_exception, capture_std
-from .utils.iterators import force_iterable, iter_cause, iter_frame, iter_stack
+from .utils.iterators import force_iterable, iter_cause, iter_stack
 from .utils.obj import (
     get_code,
     get_infos,
@@ -59,11 +59,11 @@ def get_title(frame, event, arg):
     return "???"
 
 
-def get_frame(frame, key):
+def get_frame(frame, key, tb=None):
     if not key:
         return frame
 
-    for f in iter_frame(frame):
+    for f, _lno in iter_stack(frame, tb):
         if id(f) == key:
             return f
     log.warning(f"Frame {key} not found")

kalong/server.py

@@ -109,6 +109,10 @@ async def websocket(request):
     return ws
 
 
+def exception_handler(loop, context):
+    logging.error(f"Loop exit: {context}")
+
+
 def serve():
     app = web.Application()
     app["front"] = {}
@@ -116,4 +120,6 @@ def serve():
     app.on_shutdown.append(shutdown)
     app.router.add_get(r"/{side:(front|back)}/{origin}", websocket)
     app.router.add_static("/assets/", Path(__file__).parent / "static" / "assets")
-    web.run_app(app, host=config.host, port=config.port, print=False)
+    loop = asyncio.get_event_loop()
+    loop.set_exception_handler(exception_handler)
+    web.run_app(app, host=config.host, port=config.port, print=False, loop=loop)