Merge branch 'main' into feature/aqua_smoke

Author: mrDzurb

ads/common/ipython.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
-# Copyright (c) 2022 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2026 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import logging
@@ -64,13 +63,13 @@ def configure_plotting():
 try:
     import IPython
 
-    global orig_ipython_traceback
-    if IPython.core.interactiveshell.InteractiveShell.showtraceback != _log_traceback:
-        orig_ipython_traceback = (
-            IPython.core.interactiveshell.InteractiveShell.showtraceback
-        )
+    shell = IPython.get_ipython()
+    if shell is not None:
+        global orig_ipython_traceback
+        if shell.showtraceback != _log_traceback:
+            orig_ipython_traceback = shell.showtraceback
 
-    # Override the default showtraceback behavior of ipython, to show only the error message and log the stacktrace
-    IPython.core.interactiveshell.InteractiveShell.showtraceback = _log_traceback
+        # Override the default showtraceback behavior of ipython, to show only the error message and log the stacktrace
+        shell.showtraceback = _log_traceback
 except ModuleNotFoundError:
     pass

ads/common/model.py

@@ -633,10 +633,8 @@ def show_in_notebook(self):
                 "display.precision",
                 4,
             ):
-                from IPython.display import HTML
-
+                from IPython.display import HTML, display
                 from ads.common.utils import get_display
-
                 display = get_display()
                 display(HTML(info_df.to_html(index=False, header=False)))
         return info