is_magic_code() method added to repair logic of kernel

Author: OutlyingWest

src/jumper/context.py

@@ -1,8 +1,19 @@
 from dataclasses import dataclass
+from enum import Enum
 
 from jumper.perfdatahandler import PerformanceDataHandler
 
 
+# kernel modes
+class KernelMode(Enum):
+    DEFAULT = (0, "default")
+    MULTICELL = (1, "multicell")
+    WRITEFILE = (2, "writefile")
+
+    def __str__(self):
+        return self.value[1]
+
+
 @dataclass
 class KernelContext:
     # will be set to True as soon as GPU data is received

src/jumper/kernel.py

@@ -10,16 +10,18 @@
 from enum import Enum
 from textwrap import dedent
 from statistics import mean
+from typing import Type
+
 import pandas as pd
+from IPython.core.magic import Magics
 from ipykernel.ipkernel import IPythonKernel
 from itables import show
 
-from jumper.context import kernel_context
+from jumper.context import kernel_context, KernelMode
 from jumper.userpersistence import PersHelper, scorep_script_name
 from jumper.userpersistence import magics_cleanup
 import importlib
-from jumper.perfdatahandler import PerformanceDataHandler
-import jumper.visualization as perfvis
+from magic_extension.magic import KernelMagics
 
 # import jumper.multinode_monitor.slurm_monitor as slurm_monitor
 
@@ -30,16 +32,6 @@
 subprocess_dump = "subprocess_dump.pkl"
 
 
-# kernel modes
-class KernelMode(Enum):
-    DEFAULT = (0, "default")
-    MULTICELL = (1, "multicell")
-    WRITEFILE = (2, "writefile")
-
-    def __str__(self):
-        return self.value[1]
-
-
 class JumperKernel(IPythonKernel):
     implementation = "Python and Score-P"
     implementation_version = "1.0"
@@ -953,8 +945,16 @@ async def do_execute(
                             self.get_perfdata_index(-1, metrics[1:]), nmetrics)
             return self.standard_reply()
         """
-
-        if code.startswith("%%display_code_for_index"):
+        if self.is_magic_code(code, KernelMagics):
+            return await super().do_execute(
+                code,
+                silent,
+                store_history,
+                user_expressions,
+                allow_stdin,
+                cell_id=cell_id,
+            )
+        elif code.startswith("%%display_code_for_index"):
             if len(code.split(" ")) == 1:
                 self.cell_output(
                     "No index specified. Use: %%display_code_for_index index",
@@ -1179,6 +1179,44 @@ async def do_execute(
                     explicit_scorep=False,
                 )
 
+    def is_magic_code(
+            self,
+            code: str,
+            magic_class: Type[Magics]
+    ) -> bool:
+        """
+        Determines whether the given code starts with a cell or line magic
+        defined in the specified magic class.
+
+        Args:
+            code (str): The source code of the cell.
+            magic_class (Type[Magics]): The magic class to filter against (e.g. JumperMagics).
+
+        Returns:
+            bool: True if the code starts with a magic defined in the given class, False otherwise.
+        """
+        code = code.strip()
+        if not code:
+            return False
+
+        first_token = code.split(maxsplit=1)[0]
+
+        mm = self.shell.magics_manager
+        target_magics = set()
+
+        # Collect magic names, which are registered in "magic_class"
+        for magic_type in ('cell', 'line'):
+            for name, func in mm.magics[magic_type].items():
+                if getattr(func, '__self__', None).__class__ == magic_class:
+                    target_magics.add((magic_type, name))
+
+        if first_token.startswith("%%"):
+            return ('cell', first_token[2:]) in target_magics
+        elif first_token.startswith("%"):
+            return ('line', first_token[1:]) in target_magics
+
+        return False
+
     def do_shutdown(self, restart):
         self.pershelper.postprocess()
         return super().do_shutdown(restart)

src/magic_extension/__init__.py

@@ -1,7 +1,8 @@
 """An example magic"""
 __version__ = '0.0.1'
 
-from .magic import KernelMagics
+from magic_extension.magic import KernelMagics
+
 
 def load_ipython_extension(ipython):
     print("magic_extension loaded!")

src/magic_extension/magic.py

@@ -1,12 +1,9 @@
 import sys
 
 from IPython.core.magic import (Magics, magics_class, line_magic, cell_magic)
-from IPython.display import display, Markdown
 
-from jumper.context import kernel_context
-from jumper.kernel import KernelMode
+from jumper.context import kernel_context, KernelMode
 
-from jumper.perfdatahandler import PerformanceDataHandler
 import jumper.visualization as perfvis