Skip to content

Put _send_reply back inside run_handler. #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2025
Merged

Put _send_reply back inside run_handler. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d035617
Put _send_reply back inside run_handler.
fleming79 Sep 17, 2025
6f5dc74
Fix debugger disconnect
fleming79 Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/async_kernel/debugger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,10 @@ async def disconnect(self):
"type": "request",
"command": "disconnect",
"seq": self.next_seq(),
"restart": False,
"terminateDebuggee": False,
"suspendDebuggee": False,
"arguments": {
"restart": False,
"terminateDebuggee": False,
"suspendDebuggee": False,
},
}
)
34 changes: 17 additions & 17 deletions src/async_kernel/kernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,8 @@ async def _wait_stopped(self, task_status: TaskStatus[None]) -> None:
task_status.started()
try:
await self.event_stopped.wait()
await self.debugger.disconnect()
if self.debugger.debugpy_client.connected:
await self.control_thread_caller.call_soon(self.debugger.disconnect)
except BaseException:
pass
Caller.stop_all(_stop_protected=True)
Expand Down Expand Up @@ -848,34 +849,33 @@ async def run_handler(self, handler: HandlerType, job: Job[dict]) -> None:
This method gets called for every valid request with the relevant handler.
"""

def send_reply(job: Job[dict], content: dict, /) -> None:
if "status" not in content:
content["status"] = "ok"
msg = self.session.send(
stream=job["socket"],
msg_or_type=job["msg"]["header"]["msg_type"].replace("request", "reply"),
content=content,
parent=job["msg"]["header"], # pyright: ignore[reportArgumentType]
ident=job["ident"],
)
if msg:
self.log.debug("*** _send_reply %s*** %s", job["socket_id"], msg)

token = utils._job_var.set(job) # pyright: ignore[reportPrivateUsage]
try:
self.iopub_send(msg_or_type="status", content={"execution_state": "busy"}, ident=self.topic("status"))
if (content := await handler(job)) is not None:
self._send_reply(job, content)
send_reply(job, content)
except Exception as e:
self._send_reply(job, error_to_content(e))
send_reply(job, error_to_content(e))
self.log.exception("Exception in message handler:", exc_info=e)
finally:
utils._job_var.reset(token) # pyright: ignore[reportPrivateUsage]
self.iopub_send(
msg_or_type="status", parent=job["msg"], content={"execution_state": "idle"}, ident=self.topic("status")
)

def _send_reply(self, job: Job[dict], content: dict, /) -> None:
"""Send a reply to the job with the specified content."""
if "status" not in content:
content["status"] = "ok"
msg = self.session.send(
stream=job["socket"],
msg_or_type=job["msg"]["header"]["msg_type"].replace("request", "reply"),
content=content,
parent=job["msg"]["header"], # pyright: ignore[reportArgumentType]
ident=job["ident"],
)
if msg:
self.log.debug("*** _send_reply %s*** %s", job["socket_id"], msg)

def iopub_send(
self,
msg_or_type: dict[str, Any] | str,
Expand Down
Loading