From 431022daf8ea37685142d38ed9a38f67cc4db7bd Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Tue, 1 Feb 2022 07:59:29 +0100
Subject: [PATCH 1/3] fix the debug modules model

---
 ipykernel/debugger.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ipykernel/debugger.py b/ipykernel/debugger.py
index a80d88b27..daa1b7fe1 100644
--- a/ipykernel/debugger.py
+++ b/ipykernel/debugger.py
@@ -602,7 +602,10 @@ async def modules(self, message):
             module = modules[i]
             filename = getattr(getattr(module, "__spec__", None), "origin", None)
             if filename and filename.endswith(".py"):
-                mods.append({module.__name__: filename})
+                mods.append({
+                    'id': module.__name__,
+                    'name': filename
+                })
 
         reply = {"body": {"modules": mods, "totalModules": len(modules)}}
         return reply

From ab7ed4931a8a73bc034754d544ab4c15b952fe59 Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Tue, 1 Feb 2022 08:41:22 +0100
Subject: [PATCH 2/3] use simple quote in the modules method

---
 ipykernel/debugger.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipykernel/debugger.py b/ipykernel/debugger.py
index daa1b7fe1..fe6b13047 100644
--- a/ipykernel/debugger.py
+++ b/ipykernel/debugger.py
@@ -600,14 +600,14 @@ async def modules(self, message):
         mods = []
         for i in range(startModule, moduleCount):
             module = modules[i]
-            filename = getattr(getattr(module, "__spec__", None), "origin", None)
-            if filename and filename.endswith(".py"):
+            filename = getattr(getattr(module, '__spec__', None), 'origin', None)
+            if filename and filename.endswith('.py'):
                 mods.append({
                     'id': module.__name__,
                     'name': filename
                 })
 
-        reply = {"body": {"modules": mods, "totalModules": len(modules)}}
+        reply = {'body': {'modules': mods, 'totalModules': len(modules)}}
         return reply
 
     async def process_request(self, message):

From 6822ada6648b9b8811ddaa1793f4cb69ed720c28 Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Tue, 1 Feb 2022 16:03:42 +0100
Subject: [PATCH 3/3] use incremental id in the modules response

---
 ipykernel/debugger.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ipykernel/debugger.py b/ipykernel/debugger.py
index fe6b13047..be09a72de 100644
--- a/ipykernel/debugger.py
+++ b/ipykernel/debugger.py
@@ -603,8 +603,9 @@ async def modules(self, message):
             filename = getattr(getattr(module, '__spec__', None), 'origin', None)
             if filename and filename.endswith('.py'):
                 mods.append({
-                    'id': module.__name__,
-                    'name': filename
+                    'id': i,
+                    'name': module.__name__,
+                    'path': filename
                 })
 
         reply = {'body': {'modules': mods, 'totalModules': len(modules)}}