Skip to content

Commit

Permalink
handle execute_result overtake execute_reply
Browse files Browse the repository at this point in the history 
avoid the case where result is not shown as msg_id is already from the new executing cell
  • Loading branch information
@idanpa
idanpa committed Jan 16, 2025
1 parent 0fb2dbd commit dae656e
Showing 1 changed file with 37 additions and 30 deletions.
67 changes: 37 additions & 30 deletions pypad/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ def __init__(self, parent, debug=False):
self.highlighter = Highlighter(self)
self.highlighter.set_style('vs')

self.execute_msg_id = ''
self.in_undo_redo = False
# last execution count of each cell
self.execution_count = [None]
Expand All @@ -149,6 +148,9 @@ def __init__(self, parent, debug=False):
# latex code of cell
self.latex = ['']
self.execute_running = False
self.prev_execute_msg_id = ''
self.execute_msg_id = ''
self.prev_execute_cell_idx = -1
self.execute_cell_idx = -1
self.splash_visible = False
self.kernel_info = ''
Expand Down Expand Up @@ -349,7 +351,7 @@ def clear_cell(self, cell_idx):
cursor = cell.firstCursorPosition()
cursor.setPosition(cell.lastCursorPosition().position(), QTextCursor.KeepAnchor)
cursor.removeSelectedText()
self.has_image[self.execute_cell_idx] = False
self.has_image[cell_idx] = False

def append_text(self, cell_idx, txt):
cell = self.out_cell(cell_idx)
Expand Down Expand Up @@ -400,7 +402,6 @@ def _execute(self, cell_idx, code=None):
code = self.get_cell_code(cell_idx)
with self.join_edit_block():
self.clear_cell(cell_idx)
self.executing_animation.start()

self.latex[cell_idx] = ''
# set '_', '__', '___' to hold the previous cells output:
Expand All @@ -410,7 +411,12 @@ def _execute(self, cell_idx, code=None):
prep_code += f'{var_name} = Out.get({self.execution_count[i]}, None)\n'
self.kernel_client.execute(prep_code, silent=True, stop_on_error=False)
# don't stop on error, we interrupt kernel and execute a new cell immediately after, otherwise might get aborted

self.prev_execute_cell_idx = self.execute_cell_idx
self.prev_execute_msg_id = self.execute_msg_id
self.execute_cell_idx = cell_idx
self.execute_msg_id = self.kernel_client.execute(code, stop_on_error=False)
self.executing_animation.start()
self.log.debug(f'execute [{cell_idx}] ({self.execute_msg_id.split("_")[-1]}): {code}')

def execute(self, cell_idx, code=None):
Expand All @@ -421,7 +427,6 @@ def execute(self, cell_idx, code=None):
self.log.debug('interrupt kernel: new code')
self.kernel_manager.interrupt_kernel()
self.execute_running = True
self.execute_cell_idx = cell_idx
self._execute(cell_idx, code)
with self.join_edit_block():
for i in range(cell_idx+1, self.table.rows()):
Expand All @@ -448,38 +453,41 @@ def set_cell_latex_img(self, cell_idx, latex, img):
def _handle_execute_result(self, msg):
msg_id = msg['parent_header']['msg_id']
self.log.debug(f'execute_result ({msg_id.split("_")[-1]}): {msg["content"]}')
if msg_id != self.execute_msg_id:
return
with self.join_edit_block():
self._handle_execute_result_or_display_data(msg['content'], msg_id)
self._handle_execute_result_or_display_data(msg['content'], msg_id)

def _handle_display_data(self, msg):
msg_id = msg['parent_header']['msg_id']
self.log.debug(f'display_data ({msg_id.split("_")[-1]})')
if msg_id != self.execute_msg_id:
return
with self.join_edit_block():
self._handle_execute_result_or_display_data(msg['content'], msg_id)
self._handle_execute_result_or_display_data( msg['content'], msg_id)

def _handle_execute_result_or_display_data(self, content, msg_id):
data = content['data']
if 'image/png' in data:
image_data = b64decode(data['image/png'].encode('ascii'))
self.append_img(self.execute_cell_idx, image_data, 'PNG', msg_id)
elif 'image/jpeg' in data:
image_data = b64decode(data['image/jpeg'].encode('ascii'))
self.append_img(self.execute_cell_idx, image_data, 'JPG', msg_id)
elif 'text/plain' in data:
if not self.has_image[self.execute_cell_idx]:
self.append_text(self.execute_cell_idx, data['text/plain'])
if msg_id == self.execute_msg_id:
cell_idx = self.execute_cell_idx
elif msg_id == self.prev_execute_msg_id:
# execute_reply and execute_results are using different sockets, and their order is not guaranteed
cell_idx = self.prev_execute_cell_idx
else:
self.log.error(f'unsupported type {data}')
return

with self.join_edit_block():
data = content['data']
if 'image/png' in data:
image_data = b64decode(data['image/png'].encode('ascii'))
self.append_img(cell_idx, image_data, 'PNG', msg_id)
elif 'image/jpeg' in data:
image_data = b64decode(data['image/jpeg'].encode('ascii'))
self.append_img(cell_idx, image_data, 'JPG', msg_id)
elif 'text/plain' in data:
if not self.has_image[cell_idx]:
self.append_text(cell_idx, data['text/plain'])
else:
self.log.error(f'unsupported type {data}')

if 'text/latex' in data:
self.latex[self.execute_cell_idx] = data['text/latex']
latex_worker = LatexWorker(self.execute_cell_idx, data['text/latex'])
latex_worker.signals.result.connect(self.set_cell_latex_img)
self.thread_pool.start(latex_worker)
if 'text/latex' in data:
self.latex[cell_idx] = data['text/latex']
latex_worker = LatexWorker(cell_idx, data['text/latex'])
latex_worker.signals.result.connect(self.set_cell_latex_img)
self.thread_pool.start(latex_worker)

def _handle_error(self, msg):
msg_id = msg['parent_header']['msg_id']
Expand Down Expand Up @@ -516,8 +524,7 @@ def _handle_execute_reply(self, msg):
else:
self.set_cell_color(self.execute_cell_idx, theme['error_color'])
if self.execute_cell_idx+1 < self.table.rows():
self.execute_cell_idx = self.execute_cell_idx+1
self._execute(self.execute_cell_idx)
self._execute(self.execute_cell_idx+1)
else:
self.execute_running = False

Expand Down

0 comments on commit dae656e

Please sign in to comment.