fix integer engine id in exception metadata

was using old int_id which is just -1

Author: minrk

ipyparallel/engine/kernel.py

@@ -1,4 +1,5 @@
 """IPython kernel for parallel computing"""
+import inspect
 import sys
 
 from ipykernel.ipkernel import IPythonKernel
@@ -15,6 +16,11 @@ class IPythonParallelKernel(IPythonKernel):
     """Extend IPython kernel for parallel computing"""
 
     engine_id = Integer(-1)
+
+    @property
+    def int_id(self):
+        return self.engine_id
+
     msg_types = getattr(IPythonKernel, 'msg_types', []) + ['apply_request']
     control_msg_types = getattr(IPythonKernel, 'control_msg_types', []) + [
         'abort_request',
@@ -78,13 +84,20 @@ def finish_metadata(self, parent, metadata, reply_content):
         if reply_content['status'] == 'error':
             if reply_content['ename'] == 'UnmetDependency':
                 metadata['dependencies_met'] = False
-            metadata['engine_info'] = dict(
-                engine_uuid=self.ident,
-                engine_id=self.engine_id,
-            )
+            metadata['engine_info'] = self.get_engine_info()
 
         return metadata
 
+    def get_engine_info(self, method=None):
+        """Return engine_info dict"""
+        engine_info = dict(
+            engine_uuid=self.ident,
+            engine_id=self.engine_id,
+        )
+        if method:
+            engine_info["method"] = method
+        return engine_info
+
     def apply_request(self, stream, ident, parent):
         try:
             content = parent['content']
@@ -168,8 +181,7 @@ def do_apply(self, content, bufs, msg_id, reply_metadata):
             else:
                 self.log.warning("Didn't find a traceback where I expected to")
             shell._last_traceback = None
-            e_info = dict(engine_uuid=self.ident, engine_id=self.int_id, method='apply')
-            reply_content['engine_info'] = e_info
+            reply_content["engine_info"] = self.get_engine_info(method="apply")
 
             self.log.info(
                 "Exception in apply request:\n%s", '\n'.join(reply_content['traceback'])
@@ -181,6 +193,14 @@ def do_apply(self, content, bufs, msg_id, reply_metadata):
 
         return reply_content, result_buf
 
+    async def do_execute(self, *args, **kwargs):
+        reply_content = super().do_execute(*args, **kwargs)
+        if inspect.isawaitable(reply_content):
+            reply_content = await reply_content
+        if reply_content['status'] == 'error':
+            reply_content["engine_info"] = self.get_engine_info(method="execute")
+        return reply_content
+
     # Control messages for msgspec extensions:
 
     def abort_request(self, stream, ident, parent):

ipyparallel/tests/test_asyncresult.py

@@ -5,6 +5,7 @@
 import time
 from datetime import datetime
 
+import pytest
 from IPython.utils.io import capture_output
 
 import ipyparallel as ipp
@@ -488,3 +489,47 @@ def test_progress(self):
         assert amr.progress == 0
         amr.wait_interactive()
         assert amr.progress == len(amr)
+
+    def test_error_engine_info_apply(self):
+        dv = self.client[:]
+        targets = self.client.ids
+        ar = dv.apply_async(lambda: 1 / 0)
+        try:
+            ar.get()
+        except Exception as e:
+            exc = e
+        else:
+            pytest.fail("Should have raised remote ZeroDivisionError")
+        assert isinstance(exc, ipp.error.CompositeError)
+        expected_engine_info = [
+            {
+                "engine_id": engine_id,
+                "engine_uuid": self.client._engines[engine_id],
+                "method": "apply",
+            }
+            for engine_id in self.client.ids
+        ]
+        engine_infos = [e[-1] for e in exc.elist]
+        assert engine_infos == expected_engine_info
+
+    def test_error_engine_info_execute(self):
+        dv = self.client[:]
+        targets = self.client.ids
+        ar = dv.execute("1 / 0", block=False)
+        try:
+            ar.get()
+        except Exception as e:
+            exc = e
+        else:
+            pytest.fail("Should have raised remote ZeroDivisionError")
+        assert isinstance(exc, ipp.error.CompositeError)
+        expected_engine_info = [
+            {
+                "engine_id": engine_id,
+                "engine_uuid": self.client._engines[engine_id],
+                "method": "execute",
+            }
+            for engine_id in self.client.ids
+        ]
+        engine_infos = [e[-1] for e in exc.elist]
+        assert engine_infos == expected_engine_info