From 8b652ebec146ff5ebf492533d53eeb04b3ec0ac8 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Wed, 27 Apr 2022 17:28:25 +0300
Subject: [PATCH] Fix jupyter notebook cannot be detected

---
 clearml/backend_interface/task/repo/scriptinfo.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/clearml/backend_interface/task/repo/scriptinfo.py b/clearml/backend_interface/task/repo/scriptinfo.py
index d603b788..d58b58db 100644
--- a/clearml/backend_interface/task/repo/scriptinfo.py
+++ b/clearml/backend_interface/task/repo/scriptinfo.py
@@ -556,10 +556,17 @@ class ScriptInfo(object):
         # we can safely assume that we can import the notebook package here
         # noinspection PyBroadException
         try:
-            # noinspection PyPackageRequirements
-            from notebook.notebookapp import list_running_servers
+            # noinspection PyBroadException
+            try:
+                # noinspection PyPackageRequirements
+                from notebook.notebookapp import list_running_servers  # <= Notebook v6
+            except Exception:
+                # noinspection PyPackageRequirements
+                from jupyter_server.serverapp import list_running_servers
+
             import requests
             current_kernel = sys.argv[2].split(os.path.sep)[-1].replace('kernel-', '').replace('.json', '')
+
             # noinspection PyBroadException
             try:
                 server_info = next(list_running_servers())